"
break_counter = 0
@@ -358,7 +366,7 @@
var/player_cid
var/use_last_connection = FALSE
var/applies_to_admins = FALSE
- var/global_ban = FALSE
+ var/global_ban = TRUE
var/duration
var/interval
var/severity
@@ -372,8 +380,18 @@
var/old_globalban
var/page
var/admin_key
+ var/redact
var/list/changes = list()
var/list/roles_to_ban = list()
+ if(href_list["redactioncheck"])
+ if(check_rights(R_SUPPRESS))
+ if(!edit_id)
+ redact = TRUE
+ else
+ error_state += "Bans may not have their suppression flag edited. If a ban requiring suppression was accidently issued without it, contact [CONFIG_GET(string/hostedby)] immediately."
+ else
+ error_state += "You have attempted to issue a suppressed ban without permission, This incident has been logged."
+ log_admin_private("SUPPRESS: [key_name(usr)] ATTEMPTED TO ISSUE A SUPPRESSED BAN WITHOUT THE REQUISITE RIGHT!")
if(href_list["keycheck"])
player_key = href_list["keytext"]
if(!player_key)
@@ -399,10 +417,14 @@
if(use_last_connection && !ip_check && !cid_check)
error_state += "Use last connection was ticked, but neither IP nor CID was."
if(href_list["applyadmins"])
+ if(redact)
+ error_state += "Admin bans can not be suppressed."
applies_to_admins = TRUE
switch(href_list["radioservban"])
if("local")
global_ban = FALSE
+ if(redact)
+ error_state += "Suppressed bans must be global."
if("global")
global_ban = TRUE
switch(href_list["radioduration"])
@@ -463,20 +485,33 @@
roles_to_ban |= key
else
error_state += "No ban type was selected."
+ if((href_list["radioban"] != "server") && redact)
+ error_state += "Suppression may only be applied to server bans."
if(error_state.len)
to_chat(usr, "Ban not [edit_id ? "edited" : "created"] because the following errors were present:\n[error_state.Join("\n")]")
return
if(edit_id)
edit_ban(edit_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, global_ban, mirror_edit, old_key, old_ip, old_cid, old_applies, old_globalban, page, admin_key, changes)
else
- create_ban(player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, severity, reason, global_ban, roles_to_ban)
+ create_ban(player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, severity, reason, global_ban, roles_to_ban, redact)
-/datum/admins/proc/create_ban(player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, severity, reason, global_ban, list/roles_to_ban)
+/datum/admins/proc/create_ban(player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, severity, reason, global_ban, list/roles_to_ban, redact = 0)
if(!check_rights(R_BAN))
return
if(!SSdbcore.Connect())
to_chat(usr, "Failed to establish database connection.")
return
+
+ if(cid_check && config.protected_cids.Find(player_cid))
+ if(alert(usr, "CID [player_cid] is listed as protected for the following reason: [config.protected_cids[player_cid]], Are you sure you want to restrict this CID? THIS WILL PROBABLY CATCH LEGITIMATE PLAYERS.", "Protected CID", "Yes", "No", "Cancel") != "Yes")
+ return
+ var/kn = key_name(usr)
+ //Log the shit out of this and scream bloody murder to anyone who will listen.
+ send2tgs("CID PROTECTION BYPASS", "[kn] Has overridden CID protection for a ban on CID [player_cid]!")
+ message_admins("[kn] Has overridden CID protection for a ban on CID [player_cid]!")
+ log_admin_private("[kn] Has overridden CID protection for a ban on CID [player_cid]!")
+ if(redact && alert(usr, "You are about to issue a Suppressed ban, This will require direct database editing to revoke, ARE YOU SURE?", "Protected CID", "Yes", "No", "Cancel") != "Yes")
+ return
var/player_ckey = ckey(player_key)
if(player_ckey)
var/datum/DBQuery/query_create_ban_get_player = SSdbcore.NewQuery({"
@@ -553,6 +588,20 @@
"expiration_time" = "IF(? IS NULL, NULL, NOW() + INTERVAL ? [interval])"
)
var/sql_ban = list()
+ //I'm going to crosscheck this one last time because this is playing with fire.
+ if(redact)
+ if(!check_rights(R_SUPPRESS))
+ to_chat(usr, "You have attempted to register a suppressed ban without the correct access, this incident has been logged, and the ban has been aborted.")
+ log_admin_private("SUPPRESS: [key_name(usr)] ATTEMPTED TO ISSUE A SUPPRESSED BAN WITHOUT THE REQUISITE RIGHT!")
+ return
+ if(roles_to_ban[1] != "Server") //This should never happen. Still checking it.
+ to_chat(usr, "You have attempted to directly register a suppressed ban that is not a server ban, this incident has been logged, and the ban has been aborted.")
+ log_admin_private("SUPPRESS: [key_name(usr)] ATTEMPTED TO MANUALLY ISSUE A SUPPRESSED NON-SERVER BAN!")
+ return
+ if(applies_to_admins)
+ to_chat(usr, "You have attempted to directly register a suppressed ban that affects admins, this incident has been logged, and the ban has been aborted.")
+ log_admin_private("SUPPRESS: [key_name(usr)] ATTEMPTED TO MANUALLY ISSUE A SUPPRESSED ADMIN BAN!")
+ return
for(var/role in roles_to_ban)
sql_ban += list(list(
"server_name" = CONFIG_GET(string/serversqlname),
@@ -571,26 +620,36 @@
"a_computerid" = admin_cid,
"who" = who,
"adminwho" = adminwho,
- "global_ban" = global_ban
+ "global_ban" = global_ban,
+ "hidden" = redact
))
if(!SSdbcore.MassInsert(format_table_name("ban"), sql_ban, warn = TRUE, special_columns = special_columns))
return
var/target = ban_target_string(player_key, player_ip, player_cid)
var/msg = "has created a [global_ban ? "global" : "local"] [isnull(duration) ? "permanent" : "temporary [time_message]"] [applies_to_admins ? "admin " : ""][roles_to_ban[1] == "Server" ? "server ban" : "role ban from [roles_to_ban.len] roles"] for [target]."
- log_admin_private("[kn] [msg][roles_to_ban[1] == "Server" ? "" : " Roles: [roles_to_ban.Join(", ")]"] Reason: [reason]")
- message_admins("[kna] [msg][roles_to_ban[1] == "Server" ? "" : " Roles: [roles_to_ban.Join("\n")]"]\nReason: [reason]")
- if(applies_to_admins)
- send2irc("BAN ALERT","[kn] [msg]")
- if(player_ckey)
- create_message("note", player_ckey, admin_ckey, note_reason, null, null, 0, 0, null, 0, severity)
+ if(!redact)
+ log_admin_private("[kn] [msg][roles_to_ban[1] == "Server" ? "" : " Roles: [roles_to_ban.Join(", ")]"] Reason: [reason]")
+ message_admins("[kna] [msg][roles_to_ban[1] == "Server" ? "" : " Roles: [roles_to_ban.Join("\n")]"]\nReason: [reason]")
+ else
+ log_admin_private("SUPPRESS: [kn] has created a suppressed ban.")
+ to_chat(usr, "Ban issued successfuly, This has not been announced to other admins.")
+ if(applies_to_admins && !redact) //Should never happen.
+ send2tgs("BAN ALERT","[kn] [msg]")
+ if(player_ckey && !redact)
+ create_message("note", player_ckey, admin_ckey, note_reason, null, null, 0, 0, null, -1, severity)
var/client/C = GLOB.directory[player_ckey]
var/datum/admin_help/AH = admin_ticket_log(player_ckey, msg)
var/appeal_url = "No ban appeal url set!"
appeal_url = CONFIG_GET(string/banappeals)
var/is_admin = FALSE
+ var/special_prefix = ""
+ if(redact)
+ special_prefix = "hard "
+ if(applies_to_admins)
+ special_prefix = "admin "
if(C)
build_ban_cache(C)
- to_chat(C, "You have been [applies_to_admins ? "admin " : ""]banned by [usr.client.key] from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"].\nReason: [reason]
This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] [global_ban ? "This ban applies to all of our servers." : "This is a single-server ban, and only applies to this server."] The round ID is [GLOB.round_id].
To appeal this ban go to [appeal_url]")
+ to_chat(C, "You have been [special_prefix]banned by [usr.client.key] from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"].\nReason: [reason]
This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] [global_ban ? "This ban applies to all of our servers." : "This is a single-server ban, and only applies to this server."] The round ID is [GLOB.round_id].
[redact ? "This ban may not be appealed." : "To appeal this ban go to [appeal_url]"]")
if(GLOB.admin_datums[C.ckey] || GLOB.deadmins[C.ckey])
is_admin = TRUE
if(roles_to_ban[1] == "Server" && (!is_admin || (is_admin && applies_to_admins)))
@@ -600,7 +659,7 @@
for(var/client/i in GLOB.clients - C)
if(i.address == player_ip || i.computer_id == player_cid)
build_ban_cache(i)
- to_chat(i, "You have been [applies_to_admins ? "admin " : ""]banned by [usr.client.key] from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"].\nReason: [reason]
This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] [global_ban ? "This ban applies to all of our servers." : "This is a single-server ban, and only applies to this server."] The round ID is [GLOB.round_id].
To appeal this ban go to [appeal_url]")
+ to_chat(i, "You have been [special_prefix]banned by [usr.client.key] from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"].\nReason: [reason]
This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] [global_ban ? "This ban applies to all of our servers." : "This is a single-server ban, and only applies to this server."] The round ID is [GLOB.round_id].
To appeal this ban go to [appeal_url]")
if(GLOB.admin_datums[i.ckey] || GLOB.deadmins[i.ckey])
is_admin = TRUE
if(roles_to_ban[1] == "Server" && (!is_admin || (is_admin && applies_to_admins)))
@@ -741,8 +800,7 @@
if(unban_datetime)
output += "
Unbanned by [unban_key] on [unban_datetime] during round #[unban_round_id]."
output += "
BeeStation 13 Codebase
+ + +[](https://forthebadge.com) [](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) +[](https://github.com/BeeStation/BeeStation-Hornet/actions?query=workflow%3A%22Run+tests%22) + + +**Website:** http://beestation13.com +**Code:** https://github.com/beestation/beestation-hornet +**Wiki:** https://wiki.beestation13.com/view/Main_Page + + +## DOWNLOADING + +There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at https://wiki.beestation13.com/view/Downloading_the_source_code + +Option 1: +Follow this: https://wiki.beestation13.com/view/Setting_up_git + +Option 2: Download the source code as a zip by clicking the ZIP button in the +code tab of https://github.com/beestation/beestation-hornet +(note: this will use a lot of bandwidth if you wish to update and is a lot of +hassle if you want to make any changes at all, so it's not recommended.) + +Option 3: Use our docker image that tracks the master branch (See commits for build status. Again, same caveats as option 2) + +``` +docker run -d -pPriority Announcement
" @@ -10,7 +17,7 @@ announcement += "[html_encode(title)]
" else if(type == "Captain") announcement += "Captain Announces
" - GLOB.news_network.SubmitArticle(text, "Captain's Announcement", "Station Announcements", null) + GLOB.news_network.SubmitArticle(html_encode(text), "Captain's Announcement", "Station Announcements", null) else if(!sender_override) @@ -26,8 +33,14 @@ else GLOB.news_network.SubmitArticle(title + "" + text, "Central Command", "Station Announcements", null) - announcement += "
[html_encode(text)]
" + ///If the announcer overrides alert messages, use that message. + if(SSstation.announcer.custom_alert_message && !has_important_message) + announcement += SSstation.announcer.custom_alert_message + else + announcement += "
[html_encode(text)]
" announcement += "
" + if(auth_id) + announcement += "-[auth_id]
" var/s = sound(sound) for(var/mob/M in GLOB.player_list) @@ -36,28 +49,50 @@ if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS) SEND_SOUND(M, s) +/proc/exploration_announce(text, z_value) + var/announcement = "" + announcement += "
[command_name()] Update
" + announcement += "[html_encode(text)]
" + announcement += "
" + + for(var/mob/M in GLOB.player_list) + if(isliving(M)) + var/turf/T = get_turf(M) + if(istype(get_area(M), /area/shuttle/exploration) || T.z == z_value) + to_chat(M, announcement) + if(isobserver(M)) + to_chat(M, announcement) + /proc/print_command_report(text = "", title = null, announce=TRUE) if(!title) title = "Classified [command_name()] Update" if(announce) - priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg') - + priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", SSstation.announcer.get_rand_report_sound(), has_important_message = TRUE) var/datum/comm_message/M = new M.title = title M.content = text SScommunications.send_message(M) -/proc/minor_announce(message, title = "Attention:", alert) +/proc/minor_announce(message, title = "Attention:", alert, from, html_encode = TRUE) if(!message) return + if (html_encode) + title = html_encode(title) + message = html_encode(message) + for(var/mob/M in GLOB.player_list) if(!isnewplayer(M) && M.can_hear()) - to_chat(M, "[html_encode(title)]
[html_encode(message)]
") + var/complete_msg = "[title]
[message]
" + if(from) + complete_msg += "-[from]" + to_chat(M, complete_msg) if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS) if(alert) SEND_SOUND(M, sound('sound/misc/notice1.ogg')) else SEND_SOUND(M, sound('sound/misc/notice2.ogg')) + +#undef DEFAULT_ALERT diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm index bab286bafef0f..bfe09ba370c84 100644 --- a/code/__HELPERS/pronouns.dm +++ b/code/__HELPERS/pronouns.dm @@ -203,62 +203,62 @@ /mob/living/carbon/human/p_they(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() /mob/living/carbon/human/p_their(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() /mob/living/carbon/human/p_them(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() /mob/living/carbon/human/p_have(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() /mob/living/carbon/human/p_are(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() /mob/living/carbon/human/p_were(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() /mob/living/carbon/human/p_do(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() /mob/living/carbon/human/p_s(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() /mob/living/carbon/human/p_es(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_W_UNIFORM in obscured) && skipface) + if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() diff --git a/code/__HELPERS/radiation.dm b/code/__HELPERS/radiation.dm index ce727e6da9d8b..42d30f8b69257 100644 --- a/code/__HELPERS/radiation.dm +++ b/code/__HELPERS/radiation.dm @@ -5,16 +5,20 @@ var/static/list/ignored_things = typecacheof(list( /mob/dead, /mob/camera, + /mob/living/simple_animal/revenant, /obj/effect, /obj/docking_port, /atom/movable/lighting_object, /obj/item/projectile, + /obj/structure/chisel_message )) var/list/processing_list = list(location) . = list() while(processing_list.len) var/atom/thing = processing_list[1] processing_list -= thing + if(thing == null) + continue if(ignored_things[thing.type]) continue . += thing @@ -25,23 +29,23 @@ /proc/radiation_pulse(atom/source, intensity, range_modifier, log=FALSE, can_contaminate=TRUE) if(!SSradiation.can_fire) return - - if(intensity >= RAD_WAVE_MINIMUM) // Don't bother to spawn rad waves if they're just going to immediately go out - for(var/dir in GLOB.cardinals) - new /datum/radiation_wave(source, dir, intensity, range_modifier, can_contaminate) - - var/list/things = get_rad_contents(source) //copypasta because I don't want to put special code in waves to handle their origin + + var/list/things = get_rad_contents(isturf(source) ? source : get_turf(source)) //copypasta because I don't want to put special code in waves to handle their origin for(var/k in 1 to things.len) var/atom/thing = things[k] if(!thing) continue thing.rad_act(intensity) - var/static/last_huge_pulse = 0 - if(intensity > 3000 && world.time > last_huge_pulse + 200) - last_huge_pulse = world.time - log = TRUE - if(log) - var/turf/_source_T = isturf(source) ? source : get_turf(source) - log_game("Radiation pulse with intensity: [intensity] and range modifier: [range_modifier] in [loc_name(_source_T)] ") + if(intensity >= RAD_WAVE_MINIMUM) // Don't bother to spawn rad waves if they're just going to immediately go out + new /datum/radiation_wave(source, intensity, range_modifier, can_contaminate) + + var/static/last_huge_pulse = 0 + if(intensity > 3000 && world.time > last_huge_pulse + 200) + last_huge_pulse = world.time + log = TRUE + if(log) + var/turf/_source_T = isturf(source) ? source : get_turf(source) + log_game("Radiation pulse with intensity: [intensity] and range modifier: [range_modifier] in [loc_name(_source_T)] ") + return TRUE diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 060a5b37aac4a..33dbd59028e20 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -6,73 +6,91 @@ gather_antag_data() record_nuke_disk_location() var/json_file = file("[GLOB.log_directory]/round_end_data.json") + // All but npcs sublists and ghost category contain only mobs with minds var/list/file_data = list("escapees" = list("humans" = list(), "silicons" = list(), "others" = list(), "npcs" = list()), "abandoned" = list("humans" = list(), "silicons" = list(), "others" = list(), "npcs" = list()), "ghosts" = list(), "additional data" = list()) - var/num_survivors = 0 - var/num_escapees = 0 - var/num_shuttle_escapees = 0 + var/num_survivors = 0 //Count of non-brain non-camera mobs with mind that are alive + var/num_escapees = 0 //Above and on centcom z + var/num_shuttle_escapees = 0 //Above and on escape shuttle var/list/area/shuttle_areas if(SSshuttle?.emergency) shuttle_areas = SSshuttle.emergency.shuttle_areas - for(var/mob/m in GLOB.mob_list) - var/escaped - var/category + + for(var/mob/M in GLOB.mob_list) var/list/mob_data = list() - if(isnewplayer(m)) + if(isnewplayer(M)) continue - if(m.mind) - if(m.stat != DEAD && !isbrain(m) && !iscameramob(m)) + + var/escape_status = "abandoned" //default to abandoned + var/category = "npcs" //Default to simple count only bracket + var/count_only = TRUE //Count by name only or full info + + mob_data["name"] = M.name + if(M.mind) + count_only = FALSE + mob_data["ckey"] = M.mind.key + if(M.stat != DEAD && !isbrain(M) && !iscameramob(M)) num_survivors++ - mob_data += list("name" = m.name, "ckey" = ckey(m.mind.key)) - if(isobserver(m)) - escaped = "ghosts" - else if(isliving(m)) - var/mob/living/L = m - mob_data += list("location" = get_area(L), "health" = L.health) + if(EMERGENCY_ESCAPED_OR_ENDGAMED && (M.onCentCom() || M.onSyndieBase())) + num_escapees++ + escape_status = "escapees" + if(shuttle_areas[get_area(M)]) + num_shuttle_escapees++ + if(isliving(M)) + var/mob/living/L = M + mob_data["location"] = get_area(L) + mob_data["health"] = L.health if(ishuman(L)) var/mob/living/carbon/human/H = L category = "humans" - mob_data += list("job" = H.mind.assigned_role, "species" = H.dna.species.name) + if(H.mind) + mob_data["job"] = H.mind.assigned_role + else + mob_data["job"] = "Unknown" + mob_data["species"] = H.dna.species.name else if(issilicon(L)) category = "silicons" if(isAI(L)) - mob_data += list("module" = "AI") - if(isAI(L)) - mob_data += list("module" = "pAI") - if(iscyborg(L)) + mob_data["module"] = "AI" + else if(ispAI(L)) + mob_data["module"] = "pAI" + else if(iscyborg(L)) var/mob/living/silicon/robot/R = L - mob_data += list("module" = R.module) - else - category = "others" - mob_data += list("typepath" = m.type) - if(!escaped) - if(EMERGENCY_ESCAPED_OR_ENDGAMED && (m.onCentCom() || m.onSyndieBase())) - escaped = "escapees" - num_escapees++ - if(shuttle_areas[get_area(m)]) - num_shuttle_escapees++ - else - escaped = "abandoned" - if(!m.mind && (!ishuman(m) || !issilicon(m))) - var/list/npc_nest = file_data["[escaped]"]["npcs"] - if(npc_nest.Find(initial(m.name))) - file_data["[escaped]"]["npcs"]["[initial(m.name)]"] += 1 + mob_data["module"] = R.module.name + else + category = "others" + mob_data["typepath"] = M.type + //Ghosts don't care about minds, but we want to retain ckey data etc + if(isobserver(M)) + count_only = FALSE + escape_status = "ghosts" + if(!M.mind) + mob_data["ckey"] = M.key + category = null //ghosts are one list deep + //All other mindless stuff just gets counts by name + if(count_only) + var/list/npc_nest = file_data["[escape_status]"]["npcs"] + var/name_to_use = initial(M.name) + if(ishuman(M)) + name_to_use = "Unknown Human" //Monkeymen and other mindless corpses + if(npc_nest.Find(name_to_use)) + file_data["[escape_status]"]["npcs"][name_to_use] += 1 else - file_data["[escaped]"]["npcs"]["[initial(m.name)]"] = 1 + file_data["[escape_status]"]["npcs"][name_to_use] = 1 else - if(isobserver(m)) - var/pos = length(file_data["[escaped]"]) + 1 - file_data["[escaped]"]["[pos]"] = mob_data + //Mobs with minds and ghosts get detailed data + if(category) + var/pos = length(file_data["[escape_status]"]["[category]"]) + 1 + file_data["[escape_status]"]["[category]"]["[pos]"] = mob_data else - if(!category) - category = "others" - mob_data += list("name" = m.name, "typepath" = m.type) - var/pos = length(file_data["[escaped]"]["[category]"]) + 1 - file_data["[escaped]"]["[category]"]["[pos]"] = mob_data + var/pos = length(file_data["[escape_status]"]) + 1 + file_data["[escape_status]"]["[pos]"] = mob_data + var/datum/station_state/end_state = new /datum/station_state() end_state.count() var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100) file_data["additional data"]["station integrity"] = station_integrity WRITE_FILE(json_file, json_encode(file_data)) + SSblackbox.record_feedback("nested tally", "round_end_stats", num_survivors, list("survivors", "total")) SSblackbox.record_feedback("nested tally", "round_end_stats", num_escapees, list("escapees", "total")) SSblackbox.record_feedback("nested tally", "round_end_stats", GLOB.joined_player_list.len, list("players", "total")) @@ -193,21 +211,24 @@ for(var/client/C in GLOB.clients) if(C) - C.playtitlemusic(40) - C.process_endround_metacoin() + C?.process_endround_metacoin() + C?.playtitlemusic(40) if(CONFIG_GET(flag/allow_crew_objectives)) - var/mob/M = C.mob + var/mob/M = C?.mob if(M?.mind?.current && LAZYLEN(M.mind.crew_objectives)) for(var/datum/objective/crew/CO in M.mind.crew_objectives) + if(!C) //Yes, the client can be null here. BYOND moment. + break if(CO.check_completion()) - C.inc_metabalance(METACOIN_CO_REWARD, reason="Completed your crew objective!") + C?.inc_metabalance(METACOIN_CO_REWARD, reason="Completed your crew objective!") break to_chat(world, "
The round has ended.") log_game("The round has ended.") + SSstat.send_global_alert("Round Over", "The round has ended, the game will restart soon.") if(LAZYLEN(GLOB.round_end_notifiees)) - send2irc("Notice", "[GLOB.round_end_notifiees.Join(", ")] the round has ended.") + send2tgs("Notice", "[GLOB.round_end_notifiees.Join(", ")] the round has ended.") RollCredits() @@ -227,7 +248,7 @@ //Set news report and mode result mode.set_round_result() - send2irc("Server", "Round just ended.") + send2tgs("Server", "Round just ended.") if(length(CONFIG_GET(keyed_list/cross_server))) send_news_report() @@ -333,10 +354,10 @@ if(istype(SSticker.mode, /datum/game_mode/dynamic)) var/datum/game_mode/dynamic/mode = SSticker.mode parts += "[FOURSPACES]Threat level: [mode.threat_level]" - parts += "[FOURSPACES]Threat left: [mode.threat]" //yes + parts += "[FOURSPACES]Threat left: [mode.mid_round_budget]" parts += "[FOURSPACES]Executed rules:" for(var/datum/dynamic_ruleset/rule in mode.executed_rules) - parts += "[FOURSPACES][FOURSPACES][rule.ruletype] - [rule.name]: -[rule.cost] threat" + parts += "[FOURSPACES][FOURSPACES][rule.ruletype] - [rule.name]: -[rule.cost + rule.scaled_times * rule.scaling_cost] threat" return parts.Join("
") /client/proc/roundend_report_file() @@ -351,7 +372,7 @@ if(!previous) var/list/report_parts = list(personal_report(C), GLOB.common_report) content = report_parts.Join() - C.verbs -= /client/proc/show_previous_roundend_report + C.remove_verb(/client/proc/show_previous_roundend_report) fdel(filename) rustg_file_append(content, filename) else @@ -425,12 +446,11 @@ if (aiPlayer.connected_robots.len) var/borg_num = aiPlayer.connected_robots.len - var/robolist = "
[aiPlayer.real_name]'s minions were: " + parts += "
[aiPlayer.real_name]'s minions were:" for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) borg_num-- if(robo.mind) - robolist += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]
" - parts += "[robolist]" + parts += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]" if(!borg_spacer) borg_spacer = TRUE @@ -666,6 +686,13 @@ discordmsg += "Escapees: [escapees]\n" discordmsg += "Integrity: [integrity]\n" discordmsg += "Gamemode: [SSticker.mode.name]\n" + if(istype(SSticker.mode, /datum/game_mode/dynamic)) + var/datum/game_mode/dynamic/mode = SSticker.mode + discordmsg += "Threat level: [mode.threat_level]\n" + discordmsg += "Threat left: [mode.mid_round_budget]\n" + discordmsg += "Executed rules:\n" + for(var/datum/dynamic_ruleset/rule in mode.executed_rules) + discordmsg += "[rule.ruletype] - [rule.name]: -[rule.cost + rule.scaled_times * rule.scaling_cost] threat\n" discordsendmsg("ooc", discordmsg) discordmsg = "" var/list/ded = SSblackbox.first_death diff --git a/code/__HELPERS/stat_helpers.dm b/code/__HELPERS/stat_helpers.dm new file mode 100644 index 0000000000000..d9762f09181ca --- /dev/null +++ b/code/__HELPERS/stat_helpers.dm @@ -0,0 +1,4 @@ + +#define GENERATE_STAT_TEXT(text_value) list(text=text_value,type=STAT_TEXT) + +#define GENERATE_STAT_DIVIDER (list(type=STAT_DIVIDER)) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 5458bcc8b6ae1..f9fbcfcccbd4f 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -113,6 +113,7 @@ /// Used to get a properly sanitized (html encoded) input, of max_length. no_trim is self explanatory but it prevents the input from being trimed if you intend to parse newlines or whitespace. /proc/stripped_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN, no_trim=FALSE) var/name = input(user, message, title, default) as text|null + if(no_trim) return copytext(html_encode(name), 1, max_length) else @@ -328,10 +329,8 @@ new_text = letter + new_text return new_text -GLOBAL_LIST_INIT(zero_character_only, list("0")) GLOBAL_LIST_INIT(hex_characters, list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f")) GLOBAL_LIST_INIT(alphabet, list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")) -GLOBAL_LIST_INIT(binary, list("0","1")) /// Returns a random string of `length` length and made up of chars from `characters` /proc/random_string(length, list/characters) @@ -667,7 +666,7 @@ GLOBAL_LIST_INIT(binary, list("0","1")) if(fexists(log)) oldjson = json_decode(rustg_file_read(log)) oldentries = oldjson["data"] - if(!isemptylist(oldentries)) + if(length(oldentries)) for(var/string in accepted) for(var/old in oldentries) if(string == old) @@ -677,7 +676,7 @@ GLOBAL_LIST_INIT(binary, list("0","1")) var/list/finalized = list() finalized = accepted.Copy() + oldentries.Copy() //we keep old and unreferenced phrases near the bottom for culling listclearnulls(finalized) - if(!isemptylist(finalized) && length(finalized) > storemax) + if(length(finalized) && (length(finalized) > storemax)) finalized.Cut(storemax + 1) fdel(log) @@ -825,3 +824,25 @@ GLOBAL_LIST_INIT(binary, list("0","1")) #define is_alpha(X) ((text2ascii(X) <= 122) && (text2ascii(X) >= 97)) #define is_digit(X) ((length(X) == 1) && (length(text2num(X)) == 1)) + +/// Slightly expensive proc to scramble a message using equal probabilities of character replacement from a list. DOES NOT SUPPORT HTML! +/proc/scramble_message_replace_chars(original, replaceprob = 25, list/replacementchars = list("$", "@", "!", "#", "%", "^", "&", "*"), replace_letters_only = FALSE, replace_whitespace = FALSE) + var/list/out = list() + var/static/list/whitespace = list(" ", "\n", "\t") + for(var/i in 1 to length(original)) + var/char = original[i] + if(!replace_whitespace && (char in whitespace)) + out += char + continue + if(replace_letters_only && (!ISINRANGE(char, 65, 90) && !ISINRANGE(char, 97, 122))) + out += char + continue + out += prob(replaceprob) ? pick(replacementchars) : char + return out.Join("") + +/proc/num2loadingbar(percent as num, numSquares = 20, reverse = FALSE) + var/loadstring = "" + var/limit = reverse ? numSquares - percent*numSquares : percent*numSquares + for (var/i in 1 to numSquares) + loadstring += i <= limit ? "â–ˆ" : "â–‘" + return "\[[loadstring]\]" diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index 0325af4a31273..f477c35dca416 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -11,15 +11,15 @@ /proc/gameTimestamp(format = "hh:mm:ss", wtime=null) if(!wtime) wtime = world.time - return time2text(wtime - GLOB.timezoneOffset, format) + return time2text(wtime, format, 0) /// Returns the station time in deciseconds /proc/station_time(display_only = FALSE, wtime=world.time) - return ((((wtime - SSticker.round_start_time) * SSticker.station_time_rate_multiplier) + SSticker.gametime_offset) % 864000) - (display_only? GLOB.timezoneOffset : 0) + return (((wtime - SSticker.round_start_time) * SSticker.station_time_rate_multiplier) + SSticker.gametime_offset) % 864000 /// Returns the station time in hh:mm:ss /proc/station_time_timestamp(format = "hh:mm:ss", wtime) - return time2text(station_time(TRUE, wtime), format) + return time2text(station_time(TRUE, wtime), format, 0) /proc/station_time_debug(force_set) if(isnum_safe(force_set)) @@ -48,7 +48,8 @@ GLOBAL_VAR_INIT(midnight_rollovers, 0) GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0) /proc/update_midnight_rollover() if (world.timeofday < GLOB.rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS! - return GLOB.midnight_rollovers++ + GLOB.midnight_rollovers++ + GLOB.rollovercheck_last_timeofday = world.timeofday return GLOB.midnight_rollovers /// Returns which week of the month we are in @@ -93,3 +94,8 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0) if(hour) hourT = " and [hour] hour[(hour != 1)? "s":""]" return "[day] day[(day != 1)? "s":""][hourT][minuteT][secondT]" + + +/// Returns the time in an ISO-8601 friendly format. Used when dumping data into external services such as ElasticSearch +/proc/iso_timestamp(timevar) + return time2text(timevar || world.timeofday, "YYYY-MM-DDThh:mm:ss") diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 05844833c8da7..b2ab4f83ac4f2 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -168,6 +168,8 @@ . += "[seperator]AUTOLOGIN" if(rights & R_DBRANKS) . += "[seperator]DBRANKS" + if(rights & R_SUPPRESS) + . += "[seperator]SUPPRESS" if(!.) . = "NONE" return . @@ -341,25 +343,25 @@ /// Returns the body_zone a given slot appears on /proc/slot2body_zone(slot) switch(slot) - if(SLOT_BACK, SLOT_WEAR_SUIT, SLOT_W_UNIFORM, SLOT_BELT, SLOT_WEAR_ID) + if(ITEM_SLOT_BACK, ITEM_SLOT_OCLOTHING, ITEM_SLOT_ICLOTHING, ITEM_SLOT_BELT, ITEM_SLOT_ID) return BODY_ZONE_CHEST - if(SLOT_GLOVES, SLOT_HANDS, SLOT_HANDCUFFED) + if(ITEM_SLOT_GLOVES, ITEM_SLOT_HANDS, ITEM_SLOT_HANDCUFFED) return pick(BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND) - if(SLOT_HEAD, SLOT_NECK, SLOT_NECK, SLOT_EARS) + if(ITEM_SLOT_HEAD, ITEM_SLOT_NECK, ITEM_SLOT_NECK, ITEM_SLOT_EARS) return BODY_ZONE_HEAD - if(SLOT_WEAR_MASK) + if(ITEM_SLOT_MASK) return BODY_ZONE_PRECISE_MOUTH - if(SLOT_GLASSES) + if(ITEM_SLOT_EYES) return BODY_ZONE_PRECISE_EYES - if(SLOT_SHOES) + if(ITEM_SLOT_FEET) return pick(BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT) - if(SLOT_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) /// adapted from http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/ diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index acbd3cc2972b6..d733e4c5452f8 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -43,10 +43,13 @@ else if(x<0) .+=360 +//Better performant than an artisanal proc and more reliable than Turn(). From TGMC. +#define REVERSE_DIR(dir) ( ((dir & 85) << 1) | ((dir & 170) >> 1) ) + //Returns location. Returns null if no location was found. -/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = FALSE, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0) +/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = FALSE, closed = FALSE, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0) /* -Location where the teleport begins, target that will teleport, distance to go, density checking 0/1(yes/no). +Location where the teleport begins, target that will teleport, distance to go, density checking 0/1(yes/no), closed turf checking. Random error in tile placement x, error in tile placement y, and block offset. Block offset tells the proc how to place the box. Behind teleport location, relative to starting location, forward, etc. Negative values for offset are accepted, think of it in relation to North, -x is west, -y is south. Error defaults to positive. @@ -121,6 +124,8 @@ Turf and target are separate in case you want to teleport some distance from a t for(var/turf/T in block(locate(center.x+b1xerror,center.y+b1yerror,location.z), locate(center.x+b2xerror,center.y+b2yerror,location.z) )) if(density&&T.density) continue//If density was specified. + if(closed&&isclosedturf(T)) + continue//If closed was specified. if(T.x>world.maxx || T.x<1) continue//Don't want them to teleport off the map. if(T.y>world.maxy || T.y<1) @@ -381,14 +386,6 @@ Turf and target are separate in case you want to teleport some distance from a t // means that one unit is 1 kJ. return DisplayJoules(units * SSmachines.wait * 0.1 / GLOB.CELLRATE) -/proc/get_mob_by_ckey(key) - if(!key) - return - var/list/mobs = sortmobs() - for(var/mob/M in mobs) - if(M.ckey == key) - return M - //Returns the atom sitting on the turf. //For example, using this on a disk, which is in a bag, on a mob, will return the mob because it's on the turf. //Optional arg 'type' to stop once it reaches a specific type instead of a turf. @@ -400,6 +397,17 @@ Turf and target are separate in case you want to teleport some distance from a t break return loc +//Returns a list of all locations (except the area) the movable is within. +/proc/get_nested_locs(atom/movable/AM, include_turf = FALSE) + . = list() + var/atom/location = AM.loc + var/turf/turf = get_turf(AM) + while(location && location != turf) + . += location + location = location.loc + if(location && include_turf) //At this point, only the turf is left, provided it exists. + . += location + /// Returns the turf located at the map edge in the specified direction relative to A. Used for mass driver /proc/get_edge_target_turf(atom/A, direction) var/turf/target = locate(A.x, A.y, A.z) @@ -447,7 +455,7 @@ Turf and target are separate in case you want to teleport some distance from a t return locate(x,y,A.z) /// Gets all contents of contents and returns them all in a list. -/atom/proc/GetAllContents(var/T) +/atom/proc/GetAllContents(var/T, ignore_flag_1) var/list/processing_list = list(src) var/list/assembled = list() if(T) @@ -463,7 +471,8 @@ Turf and target are separate in case you want to teleport some distance from a t while(processing_list.len) var/atom/A = processing_list[1] processing_list.Cut(1, 2) - processing_list += A.contents + if(!(A.flags_1 & ignore_flag_1)) + processing_list += A.contents assembled += A return assembled @@ -588,7 +597,7 @@ Takes: Area type as text string or as typepath OR an instance of the area. Returns: A list of all areas of that type in the world. */ -/proc/get_areas(areatype, subtypes=TRUE) +/proc/get_areas(areatype, target_z = 0, subtypes=TRUE) if(istext(areatype)) areatype = text2path(areatype) else if(isarea(areatype)) @@ -599,16 +608,15 @@ Returns: A list of all areas of that type in the world. var/list/areas = list() if(subtypes) - var/list/cache = typecacheof(areatype) - for(var/V in GLOB.sortedAreas) - var/area/A = V - if(cache[A.type]) - areas += V + for(var/area/A as() in GLOB.sortedAreas) + if(istype(A, areatype)) + if(target_z == 0 || A.z == target_z) + areas += A else - for(var/V in GLOB.sortedAreas) - var/area/A = V + for(var/area/A as() in GLOB.sortedAreas) if(A.type == areatype) - areas += V + if(target_z == 0 || A.z == target_z) + areas += A return areas /** @@ -627,17 +635,14 @@ Returns: A list of all turfs in areas of that type of that type in the world. var/list/turfs = list() if(subtypes) - var/list/cache = typecacheof(areatype) - for(var/V in GLOB.sortedAreas) - var/area/A = V - if(!cache[A.type]) + for(var/area/A as() in GLOB.sortedAreas) + if(!istype(A, areatype)) continue for(var/turf/T in A) if(target_z == 0 || target_z == T.z) turfs += T else - for(var/V in GLOB.sortedAreas) - var/area/A = V + for(var/area/A as() in GLOB.sortedAreas) if(A.type != areatype) continue for(var/turf/T in A) @@ -755,22 +760,6 @@ of course mathematically this is just adding `world.icon_size` on again loc = loc.loc return null - -//For objects that should embed, but make no sense being is_sharp or is_pointed() e.g: rods -GLOBAL_LIST_INIT(can_embed_types, typecacheof(list( - /obj/item/stack/rods, - /obj/item/pipe))) - -/proc/can_embed(obj/item/W) - if(W.is_sharp()) - return 1 - if(is_pointed(W)) - return 1 - - if(is_type_in_typecache(W, GLOB.can_embed_types)) - return 1 - - /* Checks if that loc and dir has an item on the wall */ @@ -991,8 +980,7 @@ eg2: `center_image(I, 96,96)` if(orange) turfs -= get_turf(center) . = list() - for(var/V in turfs) - var/turf/T = V + for(var/turf/T as() in turfs) . += T . += T.contents if(areas) @@ -1128,26 +1116,30 @@ eg2: `center_image(I, 96,96)` /proc/get_random_station_turf() return safepick(get_area_turfs(pick(GLOB.the_station_areas))) -/proc/get_safe_random_station_turf() - for (var/i in 1 to 5) - var/list/L = get_area_turfs(pick(GLOB.the_station_areas)) - var/turf/target - while (L.len && !target) - var/I = rand(1, L.len) - var/turf/T = L[I] - if(!T.density) - var/clear = TRUE - for(var/obj/O in T) - if(O.density) - clear = FALSE - break - if(clear) - target = T - if (!target) - L.Cut(I,I+1) - if (target) - return target - +///Gets random safe - which mean clear of dense objects and valid, turf from provided areas that are on station +///Amount 1 makes it return turf, anything else a list of turfs +/proc/get_safe_random_station_turfs(list/areas_to_pick_from = GLOB.the_station_areas, amount = 1) + var/list/picked_turfs = list() + var/list/L + for(var/area/A as() in areas_to_pick_from) + L += get_area_turfs(A) + while(L.len && length(picked_turfs) <= amount) + var/I = rand(1, length(L)) + var/turf/T = L[I] + var/area/X = get_area(T) + if(!T.density && (X.area_flags & VALID_TERRITORY)) + var/clear = TRUE + for(var/obj/O in T) + if(O.density) + clear = FALSE + break + if(clear) + picked_turfs |= T + L.Cut(I,I+1) + CHECK_TICK + if(amount == 1) + return picked_turfs[1] + return picked_turfs /proc/get_closest_atom(type, list, source) var/closest_atom @@ -1166,7 +1158,7 @@ eg2: `center_image(I, 96,96)` return closest_atom -proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types()) +/proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types()) if (value == FALSE) //nothing should be calling us with a number, so this is safe value = input("Enter type to find (blank for all, cancel to cancel)", "Search for type") as null|text if (isnull(value)) @@ -1283,7 +1275,7 @@ Increases delay as the server gets more overloaded, as sleeps aren't cheap and s GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /// Version of view() which ignores darkness, because BYOND doesn't have it (I actually suggested it but it was tagged redundant, BUT HEARERS IS A T- /rant). -/proc/dview(var/range = world.view, var/center, var/invis_flags = 0) +/proc/dview(range = world.view, center, invis_flags = 0) if(!center) return @@ -1602,3 +1594,13 @@ config_setting should be one of the following: /proc/get_final_z(atom/A) var/turf/T = get_turf(A) return T ? T.z : A.z + +/proc/invertDir(var/input_dir) + switch(input_dir) + if(UP) + return DOWN + if(DOWN) + return UP + if(-INFINITY to 0, 11 to INFINITY) + CRASH("Can't turn invalid directions!") + return turn(input_dir, 180) diff --git a/code/__HELPERS/view.dm b/code/__HELPERS/view.dm index ab39b2fb57161..c2cb59a42b7a2 100644 --- a/code/__HELPERS/view.dm +++ b/code/__HELPERS/view.dm @@ -11,6 +11,10 @@ viewY = text2num(viewrangelist[2]) + extra_y return list(viewX, viewY) +/proc/getexpandedview(view, extra_x = 0, extra_y = 0) + var/list/output = getviewsize(view, extra_x, extra_y) + return "[output[1]]x[output[2]]" + /proc/in_view_range(mob/user, atom/A) var/list/view_range = getviewsize(user.client.view) var/turf/source = get_turf(user) diff --git a/code/__HELPERS/virtual_z_level.dm b/code/__HELPERS/virtual_z_level.dm new file mode 100644 index 0000000000000..7bdcbc59f5fe1 --- /dev/null +++ b/code/__HELPERS/virtual_z_level.dm @@ -0,0 +1,22 @@ + +/** + * Gets a unique value for a new virtual z level. + * This is just a number, the game wont slow down if you have a ton of empty ones. + */ +/proc/get_new_virtual_z() + var/static/virtual_value = VIRTUAL_Z_START + return virtual_value ++ + +/** + * Used to get the virtual z-level. + * Will give unique values to each shuttle while it is in a transit level. + * Note: If the user teleports to another virtual z on the same z-level they will need to have reset_virtual_z called. (Teleportations etc.) + */ +/atom/proc/get_virtual_z_level() + var/turf/T = get_turf(src) + if(!T) + return 0 + var/area/A = T.loc + if(!A) + return 0 + return A.get_virtual_z(T) diff --git a/code/__HELPERS/weakref.dm b/code/__HELPERS/weakref.dm new file mode 100644 index 0000000000000..24ebeffa9379b --- /dev/null +++ b/code/__HELPERS/weakref.dm @@ -0,0 +1,2 @@ +/// Checks if potential_weakref is a weakref of thing. +#define IS_WEAKREF_OF(thing, potential_weakref) (istype(thing, /datum) && !isnull(potential_weakref) && thing.weak_reference == potential_weakref) \ No newline at end of file diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 889e056751b60..9e10e24217443 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -11,16 +11,26 @@ #ifdef TESTING #define DATUMVAR_DEBUGGING_MODE -//#define GC_FAILURE_HARD_LOOKUP //makes paths that fail to GC call find_references before del'ing. - //implies FIND_REF_NO_CHECK_TICK +///Method of tracking references. +//#define LEGACY_REFERENCE_TRACKING +#ifdef LEGACY_REFERENCE_TRACKING -//#define FIND_REF_NO_CHECK_TICK //Sets world.loop_checks to false and prevents find references from sleeping +///Should we be logging our findings or not +#define REFERENCE_TRACKING_LOG + +///Use the legacy reference on things hard deleting by default. +//#define GC_FAILURE_HARD_LOOKUP +#ifdef GC_FAILURE_HARD_LOOKUP +#define FIND_REF_NO_CHECK_TICK +#endif //ifdef GC_FAILURE_HARD_LOOKUP + +#endif //ifdef LEGACY_REFERENCE_TRACKING //#define VISUALIZE_ACTIVE_TURFS //Highlights atmos active turfs in green -#endif +#endif //ifdef TESTING -//#define UNIT_TESTS //Enables unit tests via TEST_RUN_PARAMETER +//#define UNIT_TESTS //If this is uncommented, we do a single run though of the game setup and tear down process with unit tests in between #ifndef PRELOAD_RSC //set to: #define PRELOAD_RSC 0 // 0 to allow using external resources or on-demand behaviour; @@ -32,29 +42,59 @@ #endif //Update this whenever you need to take advantage of more recent byond features -#define MIN_COMPILER_VERSION 513 -#define MIN_COMPILER_BUILD 1514 -#if DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD +#define MIN_COMPILER_VERSION 514 +#define MIN_COMPILER_BUILD 1568 +//TODO Remove the SDMM check when it supports 1568 +#if !defined(SPACEMAN_DMM) && (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) //Don't forget to update this part #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. -#error You need version 513.1514 or higher +#error You need version 514.1568 or higher. #endif +//Update this whenever the byond version is stable so people stop updating to hilariously broken versions +#define MAX_COMPILER_VERSION 514 +#define MAX_COMPILER_BUILD 1568 +#if DM_VERSION > MAX_COMPILER_VERSION || DM_BUILD > MAX_COMPILER_BUILD +#warn WARNING: Your BYOND version is over the recommended version (514.1568)! Stability is not guaranteed. +#endif +//Log the full sendmaps profile on 514.1556+, any earlier and we get bugs or it not existing +#if DM_VERSION >= 514 && DM_BUILD >= 1556 +#define SENDMAPS_PROFILE +#endif + + //Additional code for the above flags. #ifdef TESTING #warn compiling in TESTING mode. testing() debug messages will be visible. #endif -#ifdef GC_FAILURE_HARD_LOOKUP -#define FIND_REF_NO_CHECK_TICK -#endif - -#ifdef TRAVISBUILDING +#ifdef CIBUILDING #define UNIT_TESTS #endif -#ifdef TRAVISTESTING +#ifdef CITESTING #define TESTING #endif -#define EXTOOLS (world.system_type == MS_WINDOWS ? "byond-extools.dll" : "libbyond-extools.so") +#ifdef TGS +// TGS performs its own build of dm.exe, but includes a prepended TGS define. +#define CBT +#endif + +#if !defined(CBT) && !defined(SPACEMAN_DMM) +#warn Building with Dream Maker is no longer supported and will result in errors. +#warn In order to build, run BUILD.bat in the root directory. +#warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build. +#endif + +#define AUXMOS (world.system_type == MS_WINDOWS ? "auxtools/auxmos.dll" : __detect_auxmos()) + +/proc/__detect_auxmos() + if (fexists("./libauxmos.so")) + return "./libauxmos.so" + else if (fexists("./auxtools/libauxmos.so")) + return "./auxtools/libauxmos.so" + else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so")) + return "[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so" + else + CRASH("Could not find libauxmos.so") diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 44a76af56a3e6..da5481ffe41f6 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -1,195 +1,253 @@ -GLOBAL_LIST_INIT(bitfields, list( - "appearance_flags" = list( - "LONG_GLIDE" = LONG_GLIDE, - "RESET_COLOR" = RESET_COLOR, - "RESET_ALPHA" = RESET_ALPHA, - "RESET_TRANSFORM" = RESET_TRANSFORM, - "NO_CLIENT_COLOR" = NO_CLIENT_COLOR, - "KEEP_TOGETHER" = KEEP_TOGETHER, - "KEEP_APART" = KEEP_APART, - "PLANE_MASTER" = PLANE_MASTER, - "TILE_BOUND" = TILE_BOUND, - "PIXEL_SCALE" = PIXEL_SCALE - ), - "sight" = list( - "SEE_INFRA" = SEE_INFRA, - "SEE_SELF" = SEE_SELF, - "SEE_MOBS" = SEE_MOBS, - "SEE_OBJS" = SEE_OBJS, - "SEE_TURFS" = SEE_TURFS, - "SEE_PIXELS" = SEE_PIXELS, - "SEE_THRU" = SEE_THRU, - "SEE_BLACKNESS" = SEE_BLACKNESS, - "BLIND" = BLIND - ), - "obj_flags" = list( - "EMAGGED" = EMAGGED, - "IN_USE" = IN_USE, - "CAN_BE_HIT" = CAN_BE_HIT, - "BEING_SHOCKED" = BEING_SHOCKED, - "DANGEROUS_POSSESSION" = DANGEROUS_POSSESSION, - "ON_BLUEPRINTS" = ON_BLUEPRINTS, - "UNIQUE_RENAME" = UNIQUE_RENAME, - "USES_TGUI" = USES_TGUI, - "FROZEN" = FROZEN, - ), - "datum_flags" = list( - "DF_USE_TAG" = DF_USE_TAG, - "DF_VAR_EDITED" = DF_VAR_EDITED, - "DF_ISPROCESSING" = DF_ISPROCESSING, - ), - "item_flags" = list( - "BEING_REMOVED" = BEING_REMOVED, - "IN_INVENTORY" = IN_INVENTORY, - "FORCE_STRING_OVERRIDE" = FORCE_STRING_OVERRIDE, - "NEEDS_PERMIT" = NEEDS_PERMIT, - "SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND, - "NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION, - "DROPDEL" = DROPDEL, - "NOBLUDGEON" = NOBLUDGEON, - "ABSTRACT" = ABSTRACT, - "IN_STORAGE" = IN_STORAGE, - ), - "admin_flags" = list( - "BUILDMODE" = R_BUILD, - "ADMIN" = R_ADMIN, - "BAN" = R_BAN, - "FUN" = R_FUN, - "SERVER" = R_SERVER, - "DEBUG" = R_DEBUG, - "POSSESS" = R_POSSESS, - "PERMISSIONS" = R_PERMISSIONS, - "STEALTH" = R_STEALTH, - "POLL" = R_POLL, - "VAREDIT" = R_VAREDIT, - "SOUNDS" = R_SOUND, - "SPAWN" = R_SPAWN, - "AUTOLOGIN" = R_AUTOADMIN, - "DBRANKS" = R_DBRANKS - ), - "interaction_flags_atom" = list( - "INTERACT_ATOM_REQUIRES_ANCHORED" = INTERACT_ATOM_REQUIRES_ANCHORED, - "INTERACT_ATOM_ATTACK_HAND" = INTERACT_ATOM_ATTACK_HAND, - "INTERACT_ATOM_UI_INTERACT" = INTERACT_ATOM_UI_INTERACT, - "INTERACT_ATOM_REQUIRES_DEXTERITY" = INTERACT_ATOM_REQUIRES_DEXTERITY, - "INTERACT_ATOM_IGNORE_INCAPACITATED" = INTERACT_ATOM_IGNORE_INCAPACITATED, - "INTERACT_ATOM_IGNORE_RESTRAINED" = INTERACT_ATOM_IGNORE_RESTRAINED, - "INTERACT_ATOM_CHECK_GRAB" = INTERACT_ATOM_CHECK_GRAB, - "INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND" = INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND, - "INTERACT_ATOM_NO_FINGERPRINT_INTERACT" = INTERACT_ATOM_NO_FINGERPRINT_INTERACT - ), - "interaction_flags_machine" = list( - "INTERACT_MACHINE_OPEN" = INTERACT_MACHINE_OPEN, - "INTERACT_MACHINE_OFFLINE" = INTERACT_MACHINE_OFFLINE, - "INTERACT_MACHINE_WIRES_IF_OPEN" = INTERACT_MACHINE_WIRES_IF_OPEN, - "INTERACT_MACHINE_ALLOW_SILICON" = INTERACT_MACHINE_ALLOW_SILICON, - "INTERACT_MACHINE_OPEN_SILICON" = INTERACT_MACHINE_OPEN_SILICON, - "INTERACT_MACHINE_REQUIRES_SILICON" = INTERACT_MACHINE_REQUIRES_SILICON, - "INTERACT_MACHINE_SET_MACHINE" = INTERACT_MACHINE_SET_MACHINE - ), - "interaction_flags_item" = list( - "INTERACT_ITEM_ATTACK_HAND_PICKUP" = INTERACT_ITEM_ATTACK_HAND_PICKUP, - ), - "pass_flags" = list( - "PASSTABLE" = PASSTABLE, - "PASSGLASS" = PASSGLASS, - "PASSGRILLE" = PASSGRILLE, - "PASSBLOB" = PASSBLOB, - "PASSMOB" = PASSMOB, - "PASSCLOSEDTURF" = PASSCLOSEDTURF, - "LETPASSTHROW" = LETPASSTHROW - ), - "movement_type" = list( - "GROUND" = GROUND, - "FLYING" = FLYING, - "VENTCRAWLING" = VENTCRAWLING, - "FLOATING" = FLOATING, - "UNSTOPPABLE" = UNSTOPPABLE - ), - "resistance_flags" = list( - "LAVA_PROOF" = LAVA_PROOF, - "FIRE_PROOF" = FIRE_PROOF, - "FLAMMABLE" = FLAMMABLE, - "ON_FIRE" = ON_FIRE, - "UNACIDABLE" = UNACIDABLE, - "ACID_PROOF" = ACID_PROOF, - "INDESTRUCTIBLE" = INDESTRUCTIBLE, - "FREEZE_PROOF" = FREEZE_PROOF - ), - "flags_1" = list( - "NOJAUNT_1" = NOJAUNT_1, - "UNUSED_RESERVATION_TURF_1" = UNUSED_RESERVATION_TURF_1, - "CAN_BE_DIRTY_1" = CAN_BE_DIRTY_1, - "HEAR_1" = HEAR_1, - "CHECK_RICOCHET_1" = CHECK_RICOCHET_1, - "CONDUCT_1" = CONDUCT_1, - "NO_LAVA_GEN_1" = NO_LAVA_GEN_1, - "NODECONSTRUCT_1" = NODECONSTRUCT_1, - "OVERLAY_QUEUED_1" = OVERLAY_QUEUED_1, - "ON_BORDER_1" = ON_BORDER_1, - "NO_RUINS_1" = NO_RUINS_1, - "PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1, - "HOLOGRAM_1" = HOLOGRAM_1, - "TESLA_IGNORE_1" = TESLA_IGNORE_1, - "INITIALIZED_1" = INITIALIZED_1, - "ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1, - ), - "clothing_flags" = list( - "LAVAPROTECT" = LAVAPROTECT, - "STOPSPRESSUREDAMAGE" = STOPSPRESSUREDAMAGE, - "BLOCK_GAS_SMOKE_EFFECT" = BLOCK_GAS_SMOKE_EFFECT, - "MASKINTERNALS" = MASKINTERNALS, - "NOSLIP" = NOSLIP, - "THICKMATERIAL" = THICKMATERIAL, - "VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE, - "VOICEBOX_DISABLED" = VOICEBOX_DISABLED, - "SHOWEROKAY" = SHOWEROKAY, - "SNUG_FIT" = SNUG_FIT, - "EFFECT_HAT" = EFFECT_HAT, - ), - "tesla_flags" = list( - "TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE, - "TESLA_OBJ_DAMAGE" = TESLA_OBJ_DAMAGE, - "TESLA_MOB_STUN" = TESLA_MOB_STUN, - "TESLA_ALLOW_DUPLICATES" = TESLA_ALLOW_DUPLICATES, - "TESLA_MACHINE_EXPLOSIVE" = TESLA_MACHINE_EXPLOSIVE, - ), - "smooth" = list( - "SMOOTH_TRUE" = SMOOTH_TRUE, - "SMOOTH_MORE" = SMOOTH_MORE, - "SMOOTH_DIAGONAL" = SMOOTH_DIAGONAL, - "SMOOTH_BORDER" = SMOOTH_BORDER, - "SMOOTH_QUEUED" = SMOOTH_QUEUED, - ), - "car_traits" = list( - "CAN_KIDNAP" = CAN_KIDNAP, - ), - "mobility_flags" = list( - "MOVE" = MOBILITY_MOVE, - "STAND" = MOBILITY_STAND, - "PICKUP" = MOBILITY_PICKUP, - "USE" = MOBILITY_USE, - "UI" = MOBILITY_UI, - "STORAGE" = MOBILITY_STORAGE, - "PULL" = MOBILITY_PULL, - ), - "rad_flags" = list( - "RAD_PROTECT_CONTENTS" = RAD_PROTECT_CONTENTS, - "RAD_NO_CONTAMINATE" = RAD_NO_CONTAMINATE, - ), - "disease_flags" = list( - "CURABLE" = CURABLE, - "CAN_CARRY" = CAN_CARRY, - "CAN_RESIST" = CAN_RESIST - ), - "vis_flags" = list( - "VIS_INHERIT_ICON" = VIS_INHERIT_ICON, - "VIS_INHERIT_ICON_STATE" = VIS_INHERIT_ICON_STATE, - "VIS_INHERIT_DIR" = VIS_INHERIT_DIR, - "VIS_INHERIT_LAYER" = VIS_INHERIT_LAYER, - "VIS_INHERIT_PLANE" = VIS_INHERIT_PLANE, - "VIS_INHERIT_ID" = VIS_INHERIT_ID, - "VIS_HIDE" = VIS_HIDE, - "VIS_UNDERLAY" = VIS_UNDERLAY, - ) - )) +GLOBAL_LIST_INIT(bitfields, generate_bitfields()) + +/// Specifies a bitfield for smarter debugging +/datum/bitfield + /// The variable name that contains the bitfield + var/variable + + /// An associative list of the readable flag and its true value + var/list/flags + +/// Turns /datum/bitfield subtypes into a list for use in debugging +/proc/generate_bitfields() + var/list/bitfields = list() + for (var/_bitfield in subtypesof(/datum/bitfield)) + var/datum/bitfield/bitfield = new _bitfield + bitfields[bitfield.variable] = bitfield.flags + return bitfields + +DEFINE_BITFIELD(appearance_flags, list( + "LONG_GLIDE" = LONG_GLIDE, + "RESET_COLOR" = RESET_COLOR, + "RESET_ALPHA" = RESET_ALPHA, + "RESET_TRANSFORM" = RESET_TRANSFORM, + "NO_CLIENT_COLOR" = NO_CLIENT_COLOR, + "KEEP_TOGETHER" = KEEP_TOGETHER, + "KEEP_APART" = KEEP_APART, + "PLANE_MASTER" = PLANE_MASTER, + "TILE_BOUND" = TILE_BOUND, + "PIXEL_SCALE" = PIXEL_SCALE +)) + +DEFINE_BITFIELD(area_flags, list( + "VALID_TERRITORY" = VALID_TERRITORY, + "BLOBS_ALLOWED" = BLOBS_ALLOWED, + "CAVES_ALLOWED" = CAVES_ALLOWED, + "FLORA_ALLOWED" = FLORA_ALLOWED, + "MOB_SPAWN_ALLOWED" = MOB_SPAWN_ALLOWED, + "MEGAFAUNA_SPAWN_ALLOWED" = MEGAFAUNA_SPAWN_ALLOWED, + "HIDDEN_AREA" = HIDDEN_AREA, + "UNIQUE_AREA" = UNIQUE_AREA, + "BLOCK_SUICIDE" = BLOCK_SUICIDE, + "XENOBIOLOGY_COMPATIBLE" = XENOBIOLOGY_COMPATIBLE, +)) + +DEFINE_BITFIELD(sight, list( + "SEE_INFRA" = SEE_INFRA, + "SEE_SELF" = SEE_SELF, + "SEE_MOBS" = SEE_MOBS, + "SEE_OBJS" = SEE_OBJS, + "SEE_TURFS" = SEE_TURFS, + "SEE_PIXELS" = SEE_PIXELS, + "SEE_THRU" = SEE_THRU, + "SEE_BLACKNESS" = SEE_BLACKNESS, + "BLIND" = BLIND +)) + +DEFINE_BITFIELD(obj_flags, list( + "EMAGGED" = EMAGGED, + "IN_USE" = IN_USE, + "CAN_BE_HIT" = CAN_BE_HIT, + "BEING_SHOCKED" = BEING_SHOCKED, + "DANGEROUS_POSSESSION" = DANGEROUS_POSSESSION, + "ON_BLUEPRINTS" = ON_BLUEPRINTS, + "UNIQUE_RENAME" = UNIQUE_RENAME, + "USES_TGUI" = USES_TGUI, + "FROZEN" = FROZEN, +)) + +DEFINE_BITFIELD(datum_flags, list( + "DF_USE_TAG" = DF_USE_TAG, + "DF_VAR_EDITED" = DF_VAR_EDITED, + "DF_ISPROCESSING" = DF_ISPROCESSING, +)) + +DEFINE_BITFIELD(item_flags, list( + "BEING_REMOVED" = BEING_REMOVED, + "IN_INVENTORY" = IN_INVENTORY, + "FORCE_STRING_OVERRIDE" = FORCE_STRING_OVERRIDE, + "NEEDS_PERMIT" = NEEDS_PERMIT, + "SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND, + "NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION, + "DROPDEL" = DROPDEL, + "NOBLUDGEON" = NOBLUDGEON, + "ABSTRACT" = ABSTRACT, + "IN_STORAGE" = IN_STORAGE, + "ILLEGAL" = ILLEGAL, +)) + +DEFINE_BITFIELD(admin_flags, list( + "BUILDMODE" = R_BUILD, + "ADMIN" = R_ADMIN, + "BAN" = R_BAN, + "FUN" = R_FUN, + "SERVER" = R_SERVER, + "DEBUG" = R_DEBUG, + "POSSESS" = R_POSSESS, + "PERMISSIONS" = R_PERMISSIONS, + "STEALTH" = R_STEALTH, + "POLL" = R_POLL, + "VAREDIT" = R_VAREDIT, + "SOUNDS" = R_SOUND, + "SPAWN" = R_SPAWN, + "AUTOLOGIN" = R_AUTOADMIN, + "DBRANKS" = R_DBRANKS, + "SUPPRESS" = R_SUPPRESS +)) + +DEFINE_BITFIELD(interaction_flags_atom, list( + "INTERACT_ATOM_REQUIRES_ANCHORED" = INTERACT_ATOM_REQUIRES_ANCHORED, + "INTERACT_ATOM_ATTACK_HAND" = INTERACT_ATOM_ATTACK_HAND, + "INTERACT_ATOM_UI_INTERACT" = INTERACT_ATOM_UI_INTERACT, + "INTERACT_ATOM_REQUIRES_DEXTERITY" = INTERACT_ATOM_REQUIRES_DEXTERITY, + "INTERACT_ATOM_IGNORE_INCAPACITATED" = INTERACT_ATOM_IGNORE_INCAPACITATED, + "INTERACT_ATOM_IGNORE_RESTRAINED" = INTERACT_ATOM_IGNORE_RESTRAINED, + "INTERACT_ATOM_CHECK_GRAB" = INTERACT_ATOM_CHECK_GRAB, + "INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND" = INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND, + "INTERACT_ATOM_NO_FINGERPRINT_INTERACT" = INTERACT_ATOM_NO_FINGERPRINT_INTERACT +)) + +DEFINE_BITFIELD(interaction_flags_machine, list( + "INTERACT_MACHINE_OPEN" = INTERACT_MACHINE_OPEN, + "INTERACT_MACHINE_OFFLINE" = INTERACT_MACHINE_OFFLINE, + "INTERACT_MACHINE_WIRES_IF_OPEN" = INTERACT_MACHINE_WIRES_IF_OPEN, + "INTERACT_MACHINE_ALLOW_SILICON" = INTERACT_MACHINE_ALLOW_SILICON, + "INTERACT_MACHINE_OPEN_SILICON" = INTERACT_MACHINE_OPEN_SILICON, + "INTERACT_MACHINE_REQUIRES_SILICON" = INTERACT_MACHINE_REQUIRES_SILICON, + "INTERACT_MACHINE_SET_MACHINE" = INTERACT_MACHINE_SET_MACHINE +)) + +DEFINE_BITFIELD(interaction_flags_item, list( + "INTERACT_ITEM_ATTACK_HAND_PICKUP" = INTERACT_ITEM_ATTACK_HAND_PICKUP, +)) + +DEFINE_BITFIELD(pass_flags, list( + "PASSTABLE" = PASSTABLE, + "PASSGLASS" = PASSGLASS, + "PASSGRILLE" = PASSGRILLE, + "PASSBLOB" = PASSBLOB, + "PASSMOB" = PASSMOB, + "PASSCLOSEDTURF" = PASSCLOSEDTURF, + "LETPASSTHROW" = LETPASSTHROW +)) + +DEFINE_BITFIELD(movement_type, list( + "GROUND" = GROUND, + "FLYING" = FLYING, + "VENTCRAWLING" = VENTCRAWLING, + "FLOATING" = FLOATING, + "UNSTOPPABLE" = UNSTOPPABLE +)) + +DEFINE_BITFIELD(resistance_flags, list( + "LAVA_PROOF" = LAVA_PROOF, + "FIRE_PROOF" = FIRE_PROOF, + "FLAMMABLE" = FLAMMABLE, + "ON_FIRE" = ON_FIRE, + "UNACIDABLE" = UNACIDABLE, + "ACID_PROOF" = ACID_PROOF, + "INDESTRUCTIBLE" = INDESTRUCTIBLE, + "FREEZE_PROOF" = FREEZE_PROOF +)) + +DEFINE_BITFIELD(flags_1, list( + "NOJAUNT_1" = NOJAUNT_1, + "UNUSED_RESERVATION_TURF_1" = UNUSED_RESERVATION_TURF_1, + "CAN_BE_DIRTY_1" = CAN_BE_DIRTY_1, + "CONDUCT_1" = CONDUCT_1, + "NO_LAVA_GEN_1" = NO_LAVA_GEN_1, + "NODECONSTRUCT_1" = NODECONSTRUCT_1, + "OVERLAY_QUEUED_1" = OVERLAY_QUEUED_1, + "ON_BORDER_1" = ON_BORDER_1, + "NO_RUINS_1" = NO_RUINS_1, + "PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1, + "HOLOGRAM_1" = HOLOGRAM_1, + "TESLA_IGNORE_1" = TESLA_IGNORE_1, + "INITIALIZED_1" = INITIALIZED_1, + "ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1, + "PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1, + "UNPAINTABLE_1" = UNPAINTABLE_1, +)) + +DEFINE_BITFIELD(flags_ricochet, list( + "RICOCHET_SHINY" = RICOCHET_SHINY, + "RICOCHET_HARD" = RICOCHET_HARD +)) + +DEFINE_BITFIELD(clothing_flags, list( + "LAVAPROTECT" = LAVAPROTECT, + "STOPSPRESSUREDAMAGE" = STOPSPRESSUREDAMAGE, + "BLOCK_GAS_SMOKE_EFFECT" = BLOCK_GAS_SMOKE_EFFECT, + "MASKINTERNALS" = MASKINTERNALS, + "NOSLIP" = NOSLIP, + "THICKMATERIAL" = THICKMATERIAL, + "VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE, + "VOICEBOX_DISABLED" = VOICEBOX_DISABLED, + "SHOWEROKAY" = SHOWEROKAY, + "SNUG_FIT" = SNUG_FIT, + "EFFECT_HAT" = EFFECT_HAT, + "SCAN_REAGENTS" = SCAN_REAGENTS, +)) + +DEFINE_BITFIELD(tesla_flags, list( + "TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE, + "TESLA_OBJ_DAMAGE" = TESLA_OBJ_DAMAGE, + "TESLA_MOB_STUN" = TESLA_MOB_STUN, + "TESLA_ALLOW_DUPLICATES" = TESLA_ALLOW_DUPLICATES, + "TESLA_MACHINE_EXPLOSIVE" = TESLA_MACHINE_EXPLOSIVE, +)) + +DEFINE_BITFIELD(smooth, list( + "SMOOTH_TRUE" = SMOOTH_TRUE, + "SMOOTH_MORE" = SMOOTH_MORE, + "SMOOTH_DIAGONAL" = SMOOTH_DIAGONAL, + "SMOOTH_BORDER" = SMOOTH_BORDER, + "SMOOTH_QUEUED" = SMOOTH_QUEUED, +)) + +DEFINE_BITFIELD(car_traits, list( + "CAN_KIDNAP" = CAN_KIDNAP, +)) + +DEFINE_BITFIELD(mobility_flags, list( + "MOVE" = MOBILITY_MOVE, + "STAND" = MOBILITY_STAND, + "PICKUP" = MOBILITY_PICKUP, + "USE" = MOBILITY_USE, + "UI" = MOBILITY_UI, + "STORAGE" = MOBILITY_STORAGE, + "PULL" = MOBILITY_PULL, +)) + +DEFINE_BITFIELD(rad_flags, list( + "RAD_PROTECT_CONTENTS" = RAD_PROTECT_CONTENTS, + "RAD_NO_CONTAMINATE" = RAD_NO_CONTAMINATE, +)) + +DEFINE_BITFIELD(disease_flags, list( + "CURABLE" = CURABLE, + "CAN_CARRY" = CAN_CARRY, + "CAN_RESIST" = CAN_RESIST +)) + +DEFINE_BITFIELD(vis_flags, list( + "VIS_INHERIT_ICON" = VIS_INHERIT_ICON, + "VIS_INHERIT_ICON_STATE" = VIS_INHERIT_ICON_STATE, + "VIS_INHERIT_DIR" = VIS_INHERIT_DIR, + "VIS_INHERIT_LAYER" = VIS_INHERIT_LAYER, + "VIS_INHERIT_PLANE" = VIS_INHERIT_PLANE, + "VIS_INHERIT_ID" = VIS_INHERIT_ID, + "VIS_HIDE" = VIS_HIDE, + "VIS_UNDERLAY" = VIS_UNDERLAY, +)) + diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm index ce13ca935c1ef..dbe8d331409c6 100644 --- a/code/_globalvars/configuration.dm +++ b/code/_globalvars/configuration.dm @@ -16,10 +16,8 @@ GLOBAL_VAR_INIT(shuttle_left, FALSE) GLOBAL_VAR_INIT(tinted_weldhelh, TRUE) -// Debug is used exactly once (in living.dm) but is commented out in a lot of places. It is not set anywhere and only checked. // Debug2 is used in conjunction with a lot of admin verbs and therefore is actually legit. -GLOBAL_VAR_INIT(Debug, FALSE) // global debug switch -GLOBAL_VAR_INIT(Debug2, FALSE) +GLOBAL_VAR_INIT(Debug2, FALSE) //Debug used to exist. It doesn't anymore. Renaming this takes effort. -Franc //This was a define, but I changed it to a variable so it can be changed in-game.(kept the all-caps definition because... code...) -Errorage //Protecting these because the proper way to edit them is with the config/secrets diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm index f38cbd7744886..2d881e2f4d882 100644 --- a/code/_globalvars/game_modes.dm +++ b/code/_globalvars/game_modes.dm @@ -1,4 +1,4 @@ -GLOBAL_VAR_INIT(master_mode, "traitor") //! "extended" +GLOBAL_VAR_INIT(master_mode, "Loading...") //! Stores the current gamemode. Intentionally invalid placeholder is replaced in Ticker. GLOBAL_VAR_INIT(secret_force_mode, "secret") //! if this is anything but "secret", the secret rotation will forceably choose this mode GLOBAL_VAR(common_report) //! Contains common part of roundend report GLOBAL_VAR(survivor_report) //! Contains shared survivor report for roundend report (part of personal report) diff --git a/code/_globalvars/lists/ambience.dm b/code/_globalvars/lists/ambience.dm new file mode 100644 index 0000000000000..96b3bf6ee5a35 --- /dev/null +++ b/code/_globalvars/lists/ambience.dm @@ -0,0 +1,71 @@ +GLOBAL_LIST_INIT(generic_ambience,list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg',\ + 'sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg',\ + 'sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg',\ + 'sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg',\ + 'sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg',\ + 'sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')) + +GLOBAL_LIST_INIT(holy_ambience,list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg',\ + 'sound/ambience/ambicha4.ogg', 'sound/ambience/ambiholy.ogg', 'sound/ambience/ambiholy2.ogg',\ + 'sound/ambience/ambiholy3.ogg')) + +GLOBAL_LIST_INIT(danger_ambience,list( + 'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg')) + +GLOBAL_LIST_INIT(ruins_ambience,list('sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', 'sound/ambience/ambiruin.ogg',\ + 'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\ + 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\ + 'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambitech3.ogg',\ + 'sound/ambience/ambimystery.ogg', 'sound/ambience/ambimaint1.ogg')) + +GLOBAL_LIST_INIT(engi_ambience,list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg',\ + 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg')) + +GLOBAL_LIST_INIT(mining_ambience,list('sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', 'sound/ambience/ambiruin.ogg',\ + 'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\ + 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\ + 'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint1.ogg', 'sound/ambience/ambilava.ogg')) + +GLOBAL_LIST_INIT(medical_ambience,list('sound/ambience/ambinice.ogg')) + +GLOBAL_LIST_INIT(spooky_ambience,list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin6.ogg',\ + 'sound/ambience/ambiodd.ogg', 'sound/ambience/ambimystery.ogg')) + +GLOBAL_LIST_INIT(maint_ambience,list('sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg', 'sound/ambience/ambimaint3.ogg', 'sound/ambience/ambimaint4.ogg',\ + 'sound/ambience/ambimaint5.ogg', 'sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg', 'sound/ambience/ambitech2.ogg')) + +GLOBAL_LIST_INIT(away_ambience,list('sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiruin.ogg',\ + 'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\ + 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\ + 'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint.ogg',\ + 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg', 'sound/ambience/ambiodd.ogg')) + +GLOBAL_LIST_INIT(reebe_ambience,list('sound/ambience/ambireebe1.ogg', 'sound/ambience/ambireebe2.ogg', 'sound/ambience/ambireebe3.ogg')) + +GLOBAL_LIST_INIT(creepy_ambience,list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/heart_beat.ogg', 'sound/effects/screech.ogg',\ + 'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg',\ + 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ + 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ + 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg')) + +GLOBAL_LIST_INIT(ambience_assoc,list( + AMBIENCE_GENERIC = GLOB.generic_ambience, + AMBIENCE_HOLY = GLOB.holy_ambience, + AMBIENCE_DANGER = GLOB.danger_ambience, + AMBIENCE_RUINS = GLOB.ruins_ambience, + AMBIENCE_ENGI = GLOB.engi_ambience, + AMBIENCE_MINING = GLOB.mining_ambience, + AMBIENCE_MEDICAL = GLOB.medical_ambience, + AMBIENCE_SPOOKY = GLOB.spooky_ambience, + AMBIENCE_MAINT = GLOB.maint_ambience, + AMBIENCE_AWAY = GLOB.away_ambience, + AMBIENCE_REEBE = GLOB.reebe_ambience, + AMBIENCE_CREEPY = GLOB.creepy_ambience, + AMBIENCE_NONE = list())) + + +GLOBAL_LIST_INIT(space_ambient_music,list('sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', 'sound/ambience/qwerty/constellations.ogg', 'sound/ambience/qwerty/starlight.ogg')) + +GLOBAL_LIST_INIT(ambient_music_assoc, list( + AMBIENCE_SPACE = GLOB.space_ambient_music +)) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index cb55ce758e427..71a4616e79a2e 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -72,6 +72,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sortList(list( "Murica", "Nanotrasen", "Not Malf", + "Portrait", "President", "Random", "Rainbow", @@ -91,6 +92,10 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sortList(list( else if(input == "Random") input = pick(GLOB.ai_core_display_screens - "Random") + if(input == "Portrait") + var/datum/portrait_picker/tgui = new(usr)//create the datum + tgui.ui_interact(usr)//datum has a tgui component, here we open the window + return "ai-portrait" //just take this until they decide return "ai-[lowertext(input)]" GLOBAL_LIST_INIT(security_depts_prefs, sortList(list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))) @@ -105,6 +110,11 @@ GLOBAL_LIST_INIT(security_depts_prefs, sortList(list(SEC_DEPT_RANDOM, SEC_DEPT_N #define DDUFFELBAG "Department Duffel Bag" GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, GBACKPACK, GSATCHEL, GDUFFELBAG, LSATCHEL)) + //Suit/Skirt +#define PREF_SUIT "Jumpsuit" +#define PREF_SKIRT "Jumpskirt" +GLOBAL_LIST_INIT(jumpsuitlist, list(PREF_SUIT, PREF_SKIRT)) + //Uplink spawn loc #define UPLINK_PDA "PDA" #define UPLINK_RADIO "Radio" @@ -188,8 +198,8 @@ GLOBAL_LIST_INIT(numbers_as_words, world.file2list("strings/numbers_as_words.txt /proc/generate_number_strings() var/list/L[198] for(var/i in 1 to 99) - L += "[i]" - L += "\Roman[i]" + L[i] = "[i]" + L[i+99] = "\Roman[i]" return L GLOBAL_LIST_INIT(station_numerals, greek_letters + phonetic_alphabet + numbers_as_words + generate_number_strings()) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index c66d53a70f3aa..b592dcd92da9c 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/clothing/head/that = 1, /obj/item/clothing/head/ushanka = 1, /obj/item/clothing/head/welding = 1, - /obj/item/clothing/mask/gas = 15, + /obj/item/clothing/mask/gas/old = 15, //greytide /obj/item/clothing/suit/hazardvest = 1, /obj/item/clothing/under/misc/vice_officer = 1, /obj/item/clothing/suit/hooded/flashsuit = 2, @@ -47,6 +47,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/radio/off = 2, /obj/item/t_scanner = 5, /obj/item/airlock_painter = 1, + /obj/item/airlock_painter/decal = 1, /obj/item/stack/cable_coil/random = 4, /obj/item/stack/cable_coil/random/five = 6, /obj/item/stack/medical/bruise_pack = 1, @@ -67,6 +68,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/crowbar = 1, /obj/item/crowbar/red = 1, /obj/item/extinguisher = 11, + /obj/item/stack/sticky_tape = 1, /obj/item/hand_labeler = 1, /obj/item/paper/crumpled = 1, /obj/item/pen = 1, @@ -106,5 +108,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/toy/eightball = 1, /obj/item/reagent_containers/pill/floorpill = 4, /obj/item/reagent_containers/food/snacks/canned/peaches/maint = 1, + /obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1, + /obj/item/reagent_containers/food/snacks/grown/poppy = 10, + /obj/item/throwing_star = 1, "" = 3 )) diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm index b066e936c603f..e3355236237ce 100644 --- a/code/_globalvars/lists/mapping.dm +++ b/code/_globalvars/lists/mapping.dm @@ -37,6 +37,7 @@ GLOBAL_LIST_EMPTY(emergencyresponseteamspawn) GLOBAL_LIST_EMPTY(servant_spawns) //Servants of Ratvar spawn here GLOBAL_LIST_EMPTY(city_of_cogs_spawns) //Anyone entering the City of Cogs spawns here GLOBAL_LIST_EMPTY(ruin_landmarks) +GLOBAL_LIST_EMPTY(bar_areas) //away missions GLOBAL_LIST_EMPTY(awaydestinations) //a list of landmarks that the warpgate can take you to @@ -48,3 +49,6 @@ GLOBAL_LIST_EMPTY(sortedAreas) GLOBAL_LIST_EMPTY_TYPED(areas_by_type, /area) GLOBAL_LIST_EMPTY(all_abstract_markers) + +/// Global list of megafauna spawns on cave gen +GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = 6)) diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index fdeb2ae0367e4..ec44dc6dae8fc 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -6,6 +6,14 @@ GLOBAL_LIST_EMPTY(deadmins) //all ckeys who have used the de-admin verb. GLOBAL_LIST_EMPTY(directory) //all ckeys with associated client GLOBAL_LIST_EMPTY(stealthminID) //reference list with IDs that store ckeys, for stealthmins + +GLOBAL_LIST_INIT(dangerous_turfs, typecacheof(list( + /turf/open/lava, + /turf/open/chasm, + /turf/open/space, + /turf/open/openspace))) + + //Since it didn't really belong in any other category, I'm putting this here //This is for procs to replace all the goddamn 'in world's that are chilling around the code @@ -27,7 +35,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) GLOBAL_LIST_INIT(simple_animals, list(list(),list(),list(),list())) // One for each AI_* status define GLOBAL_LIST_EMPTY(spidermobs) //all sentient spider mobs GLOBAL_LIST_EMPTY(bots_list) -GLOBAL_LIST_EMPTY(aiEyes) +GLOBAL_LIST_EMPTY(ai_eyes) GLOBAL_LIST_EMPTY(language_datum_instances) GLOBAL_LIST_EMPTY(all_languages) diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 81769865c1e36..001306ef7525c 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -27,6 +27,8 @@ GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt") GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt")) GLOBAL_LIST_INIT(megacarp_first_names, world.file2list("strings/names/megacarp1.txt")) GLOBAL_LIST_INIT(megacarp_last_names, world.file2list("strings/names/megacarp2.txt")) +GLOBAL_LIST_INIT(oozeling_first_names, world.file2list("strings/names/ooze_first.txt")) +GLOBAL_LIST_INIT(oozeling_last_names, world.file2list("strings/names/ooze_last.txt")) GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt")) GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt")) diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 6a4d8546f30d3..0c878226656df 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -4,7 +4,7 @@ GLOBAL_LIST_EMPTY(airlocks) //list of all airlocks GLOBAL_LIST_EMPTY(mechas_list) //list of all mechs. Used by hostile mobs target tracking. GLOBAL_LIST_EMPTY(shuttle_caller_list) //list of all communication consoles and AIs, for automatic shuttle calls when there are none. GLOBAL_LIST_EMPTY(machines) //NOTE: this is a list of ALL machines now. The processing machines list is SSmachine.processing ! -GLOBAL_LIST_EMPTY(navigation_computers) //list of all /obj/machinery/computer/camera_advanced/shuttle_docker +GLOBAL_LIST_EMPTY(navigation_computers) //list of all /obj/machinery/computer/shuttle_flight GLOBAL_LIST_EMPTY(syndicate_shuttle_boards) //important to keep track of for managing nukeops war declarations. GLOBAL_LIST_EMPTY(navbeacons) //list of all bot nagivation beacons, used for patrolling. GLOBAL_LIST_EMPTY(teleportbeacons) //list of all tracking beacons used by teleporters @@ -16,7 +16,6 @@ GLOBAL_LIST_EMPTY(singularities) //list of all singularities on the stati GLOBAL_LIST(chemical_reactions_list) //list of all /datum/chemical_reaction datums. Used during chemical reactions GLOBAL_LIST(chemical_reagents_list) //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff -GLOBAL_LIST_EMPTY(materials_list) //list of all /datum/material datums indexed by material id. GLOBAL_LIST_EMPTY(tech_list) //list of all /datum/tech datums indexed by id. GLOBAL_LIST_EMPTY(surgeries_list) //list of all surgeries by name, associated with their path. GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes @@ -39,6 +38,4 @@ GLOBAL_LIST_EMPTY(ai_status_displays) GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert - -GLOBAL_LIST_EMPTY(ic_jammers) // circuit stuff -GLOBAL_LIST_EMPTY(ic_speakers) // circuit stuff +GLOBAL_LIST_INIT(alarms, list("Fire" = list(), "Atmosphere" = list(), "Power" = list())) //all engineering alerts for station alert consoles and alarm manager diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index 23566cfbf9a92..443005cad6a0b 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -56,6 +56,8 @@ GLOBAL_PROTECT(lastsignalers) GLOBAL_LIST_EMPTY(lawchanges) //! Stores who uploaded laws to which silicon-based lifeform, and what the law was GLOBAL_PROTECT(lawchanges) +GLOBAL_VAR(perf_log) +GLOBAL_PROTECT(perf_log) GLOBAL_LIST_EMPTY(combatlog) GLOBAL_PROTECT(combatlog) GLOBAL_LIST_EMPTY(IClog) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index d7d4c4f60edcc..84ca967ccb634 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -1,7 +1,5 @@ GLOBAL_VAR_INIT(admin_notice, "") //! Admin notice that all clients see when joining the server -GLOBAL_VAR_INIT(timezoneOffset, 0) //! The difference betwen midnight (of the host computer) and 0 world.ticks. - GLOBAL_VAR_INIT(fileaccess_timer, 0) //! For FTP requests. (i.e. downloading runtime logs.) However it'd be ok to use for accessing attack logs and such too, which are even laggier. GLOBAL_VAR_INIT(TAB, " ") @@ -17,7 +15,6 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE) //! BSA unlocked by head ID swipes GLOBAL_LIST_EMPTY(player_details) //! ckey -> /datum/player_details -GLOBAL_VAR_INIT(remote_control, TRUE) //! circuit shit ///All currently running polls held as datums GLOBAL_LIST_EMPTY(polls) GLOBAL_PROTECT(polls) @@ -26,18 +23,18 @@ GLOBAL_PROTECT(polls) GLOBAL_LIST_EMPTY(poll_options) GLOBAL_PROTECT(poll_options) -// All religion stuff -GLOBAL_VAR(religion) -GLOBAL_VAR(deity) -GLOBAL_VAR(bible_name) -GLOBAL_VAR(bible_icon_state) -GLOBAL_VAR(bible_item_state) -GLOBAL_VAR(holy_weapon_type) -GLOBAL_VAR(holy_armor_type) - // Monkeycube/chicken/slime spam prevention GLOBAL_VAR_INIT(total_cube_monkeys, 0) GLOBAL_VAR_INIT(total_chickens, 0) GLOBAL_VAR_INIT(total_slimes, 0) -GLOBAL_VAR_INIT(internal_tick_usage, 0.2 * world.tick_lag) //This var is updated every tick by a DLL if present, used to reduce lag +///Global var for insecure comms key rate limiting +GLOBAL_VAR_INIT(topic_cooldown, 0) + +// Topic stuff +GLOBAL_LIST_EMPTY(topic_commands) +GLOBAL_PROTECT(topic_commands) +GLOBAL_LIST_EMPTY(topic_tokens) +GLOBAL_PROTECT(topic_tokens) +GLOBAL_LIST_EMPTY(topic_servers) +GLOBAL_PROTECT(topic_servers) diff --git a/code/_globalvars/religion.dm b/code/_globalvars/religion.dm new file mode 100644 index 0000000000000..4eb08d4384941 --- /dev/null +++ b/code/_globalvars/religion.dm @@ -0,0 +1,14 @@ +// All religion stuff +GLOBAL_VAR(religion) +GLOBAL_VAR(deity) +GLOBAL_DATUM(religious_sect, /datum/religion_sect) +GLOBAL_VAR(favor) + +//bible +GLOBAL_VAR(bible_name) +GLOBAL_VAR(bible_icon_state) +GLOBAL_VAR(bible_item_state) + +//gear +GLOBAL_VAR(holy_weapon_type) +GLOBAL_VAR(holy_armor_type) diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm new file mode 100644 index 0000000000000..706a09e82de48 --- /dev/null +++ b/code/_globalvars/traits.dm @@ -0,0 +1,139 @@ +/* + FUN ZONE OF ADMIN LISTINGS + Try to keep this in sync with __DEFINES/traits.dm + quirks have it's own panel so we don't need them here. +*/ +GLOBAL_LIST_INIT(traits_by_type, list( + /mob = list( + "TRAIT_BLIND" = TRAIT_BLIND, + "TRAIT_MUTE" = TRAIT_MUTE, + "TRAIT_EMOTEMUTE " = TRAIT_EMOTEMUTE, + "TRAIT_DEAF" = TRAIT_DEAF, + "TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT, + "TRAIT_FAT" = TRAIT_FAT, + "TRAIT_HUSK" = TRAIT_HUSK, + "TRAIT_BADDNA" = TRAIT_BADDNA, + "TRAIT_CLUMSY" = TRAIT_CLUMSY, + "TRAIT_DUMB" = TRAIT_DUMB, + "TRAIT_MONKEYLIKE" = TRAIT_MONKEYLIKE, + "TRAIT_PACIFISM" = TRAIT_PACIFISM, + "TRAIT_IGNORESLOWDOWN" = TRAIT_IGNORESLOWDOWN, + "TRAIT_IGNOREDAMAGESLOWDOWN" = TRAIT_IGNOREDAMAGESLOWDOWN, + "TRAIT_DEATHCOMA" = TRAIT_DEATHCOMA, + "TRAIT_REGEN_COMA" = TRAIT_REGEN_COMA, + "TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH, + "TRAIT_DISFIGURED" = TRAIT_DISFIGURED, + "TRAIT_XENO_HOST" = TRAIT_XENO_HOST, + "TRAIT_STUNIMMUNE" = TRAIT_STUNIMMUNE, + "TRAIT_STUNRESISTANCE" = TRAIT_STUNRESISTANCE, + "TRAIT_CONFUSEIMMUNE" = TRAIT_CONFUSEIMMUNE, + "TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE, + "TRAIT_PUSHIMMUNE" = TRAIT_PUSHIMMUNE, + "TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE, + "TRAIT_STABLEHEART" = TRAIT_STABLEHEART, + "TRAIT_STABLELIVER" = TRAIT_STABLELIVER, + "TRAIT_RESISTHEAT" = TRAIT_RESISTHEAT, + "TRAIT_RESISTHEATHANDS" = TRAIT_RESISTHEATHANDS, + "TRAIT_RESISTCOLD" = TRAIT_RESISTCOLD, + "TRAIT_RESISTHIGHPRESSURE" = TRAIT_RESISTHIGHPRESSURE, + "TRAIT_RESISTLOWPRESSURE" = TRAIT_RESISTLOWPRESSURE, + "TRAIT_RADIMMUNE" = TRAIT_RADIMMUNE, + "TRAIT_VIRUSIMMUNE" = TRAIT_VIRUSIMMUNE, + "TRAIT_PIERCEIMMUNE" = TRAIT_PIERCEIMMUNE, + "TRAIT_NODISMEMBER" = TRAIT_NODISMEMBER, + "TRAIT_NOFIRE" = TRAIT_NOFIRE, + "TRAIT_NOGUNS" = TRAIT_NOGUNS, + "TRAIT_NOHUNGER" = TRAIT_NOHUNGER, + "TRAIT_NOMETABOLISM" = TRAIT_NOMETABOLISM, + "TRAIT_POWERHUNGRY" = TRAIT_POWERHUNGRY, + "TRAIT_NOCLONELOSS" = TRAIT_NOCLONELOSS, + "TRAIT_TOXIMMUNE" = TRAIT_TOXIMMUNE, + "TRAIT_EASYDISMEMBER" = TRAIT_EASYDISMEMBER, + "TRAIT_LIMBATTACHMENT" = TRAIT_LIMBATTACHMENT, + "TRAIT_NOLIMBDISABLE" = TRAIT_NOLIMBDISABLE, + "TRAIT_EASYLIMBDISABLE" = TRAIT_EASYLIMBDISABLE, + "TRAIT_TOXINLOVER" = TRAIT_TOXINLOVER, + "TRAIT_NOBREATH" = TRAIT_NOBREATH, + "TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC, + "TRAIT_HOLY" = TRAIT_HOLY, + "TRAIT_DEPRESSION" = TRAIT_DEPRESSION, + "TRAIT_JOLLY" = TRAIT_JOLLY, + "TRAIT_NOCRITDAMAGE" = TRAIT_NOCRITDAMAGE, + "TRAIT_NOSLIPWATER" = TRAIT_NOSLIPWATER, + "TRAIT_NOSLIPALL" = TRAIT_NOSLIPALL, + "TRAIT_NODEATH" = TRAIT_NODEATH, + "TRAIT_NOHARDCRIT" = TRAIT_NOHARDCRIT, + "TRAIT_NOSOFTCRIT" = TRAIT_NOSOFTCRIT, + "TRAIT_NOSTAMCRIT" = TRAIT_NOSTAMCRIT, + "TRAIT_MINDSHIELD" = TRAIT_MINDSHIELD, + "TRAIT_DISSECTED" = TRAIT_DISSECTED, + "TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE, + "TRAIT_FEARLESS" = TRAIT_FEARLESS, + "TRAIT_PARALYSIS_L_ARM" = TRAIT_PARALYSIS_L_ARM, + "TRAIT_PARALYSIS_R_ARM" = TRAIT_PARALYSIS_R_ARM, + "TRAIT_PARALYSIS_L_LEG" = TRAIT_PARALYSIS_L_LEG, + "TRAIT_PARALYSIS_R_LEG" = TRAIT_PARALYSIS_R_LEG, + "TRAIT_CANNOT_OPEN_PRESENTS" = TRAIT_CANNOT_OPEN_PRESENTS, + "TRAIT_PRESENT_VISION" = TRAIT_PRESENT_VISION, + "TRAIT_DISK_VERIFIER" = TRAIT_DISK_VERIFIER, + "TRAIT_MULTILINGUAL" = TRAIT_MULTILINGUAL, + "TRAIT_NOMOBSWAP" = TRAIT_NOMOBSWAP, + "TRAIT_XRAY_VISION" = TRAIT_XRAY_VISION, + "TRAIT_THERMAL_VISION" = TRAIT_THERMAL_VISION, + "TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING, + "TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING, + "TRAIT_SURGEON" = TRAIT_SURGEON, + "TRAIT_STRONG_GRABBER" = TRAIT_STRONG_GRABBER, + "TRAIT_CALCIUM_HEALER" = TRAIT_CALCIUM_HEALER, + "TRAIT_MAGIC_CHOKE" = TRAIT_MAGIC_CHOKE, + "TRAIT_SOOTHED_THROAT" = TRAIT_SOOTHED_THROAT, + "TRAIT_LAW_ENFORCEMENT_METABOLISM" = TRAIT_LAW_ENFORCEMENT_METABOLISM, + "TRAIT_ALWAYS_CLEAN" = TRAIT_ALWAYS_CLEAN, + "TRAIT_BOOZE_SLIDER" = TRAIT_BOOZE_SLIDER, + "TRAIT_QUICK_CARRY" = TRAIT_QUICK_CARRY, + "TRAIT_QUICKER_CARRY" = TRAIT_QUICKER_CARRY, + "TRAIT_UNINTELLIGIBLE_SPEECH" = TRAIT_UNINTELLIGIBLE_SPEECH, + "TRAIT_UNSTABLE" = TRAIT_UNSTABLE, + "TRAIT_XENO_IMMUNE" = TRAIT_XENO_IMMUNE, + "TRAIT_NECROPOLIS_INFECTED" = TRAIT_NECROPOLIS_INFECTED, + "TRAIT_BEEFRIEND" = TRAIT_BEEFRIEND, + "TRAIT_MEDICAL_HUD" = TRAIT_MEDICAL_HUD, + "TRAIT_SECURITY_HUD" = TRAIT_SECURITY_HUD, + "TRAIT_MEDIBOTCOMINGTHROUGH" = TRAIT_MEDIBOTCOMINGTHROUGH, + "TRAIT_PASSTABLE" = TRAIT_PASSTABLE, + "TRAIT_ONEWAYROAD" = TRAIT_ONEWAYROAD, + "TRAIT_APPRAISAL" = TRAIT_APPRAISAL, + "TRAIT_NOBLOCK" = TRAIT_NOBLOCK, + "TRAIT_NANITECOMPATIBLE" = TRAIT_NANITECOMPATIBLE, + "TRAIT_WARDED" = TRAIT_WARDED, + "TRAIT_NONECRODISEASE" = TRAIT_NONECRODISEASE, + "TRAIT_DIGICAMO" = TRAIT_DIGICAMO, + "TRAIT_DIGINVIS" = TRAIT_DIGINVIS, + "TRAIT_NICE_SHOT" = TRAIT_NICE_SHOT, + "TRAIT_ALWAYS_STUBS" = TRAIT_ALWAYS_STUBS + ), + /obj/item/bodypart = list( + "TRAIT_PARALYSIS" = TRAIT_PARALYSIS + ), + /obj/item = list( + "TRAIT_NODROP" = TRAIT_NODROP, + "TRAIT_NO_STORAGE_INSERT" = TRAIT_NO_STORAGE_INSERT, + "TRAIT_SPRAYPAINTED" = TRAIT_SPRAYPAINTED, + "TRAIT_T_RAY_VISIBLE" = TRAIT_T_RAY_VISIBLE, + "TRAIT_NO_TELEPORT" = TRAIT_NO_TELEPORT, + "TRAIT_STARGAZED" = TRAIT_STARGAZED, + "TRAIT_DOOR_PRYER" = TRAIT_DOOR_PRYER, + "TRAIT_FISH_SAFE_STORAGE" = TRAIT_FISH_SAFE_STORAGE, + "TRAIT_FISH_CASE_COMPATIBILE" = TRAIT_FISH_CASE_COMPATIBILE + ) + )) + +/// value -> trait name, generated on use from trait_by_type global +GLOBAL_LIST(trait_name_map) + +/proc/generate_trait_name_map() + . = list() + for(var/key in GLOB.traits_by_type) + for(var/tname in GLOB.traits_by_type[key]) + var/val = GLOB.traits_by_type[key][tname] + .[val] = tname diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 4ddcd9e3a35af..339aa276a8bfd 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -29,7 +29,7 @@ if(multicam_on) var/turf/T = get_turf(A) if(T) - for(var/obj/screen/movable/pic_in_pic/ai/P in T.vis_locs) + for(var/atom/movable/screen/movable/pic_in_pic/ai/P in T.vis_locs) if(P.ai == src) P.Click(params) break @@ -51,7 +51,7 @@ log_admin(message) if(REALTIMEOFDAY >= chnotify + 9000) chnotify = REALTIMEOFDAY - send2irc_adminless_only("NOCHEAT", message) + send2tgs_adminless_only("NOCHEAT", message) return var/list/modifiers = params2list(params) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 2564fae27b4e3..49c99096ecce3 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -118,8 +118,7 @@ RestrainedClickOn(A) return - if(in_throw_mode) - throw_item(A) + if(in_throw_mode && throw_item(A)) return var/obj/item/W = get_active_held_item() @@ -366,14 +365,14 @@ var/turf/T = get_turf(src) if(T && user.TurfAdjacent(T)) user.listed_turf = T - user.client.statpanel = T.name + user.set_stat_tab(T.name) // Use this instead of /mob/proc/AltClickOn(atom/A) where you only want turf content listing without additional atom alt-click interaction /atom/proc/AltClickNoInteract(mob/user, atom/A) var/turf/T = get_turf(A) if(T && user.TurfAdjacent(T)) user.listed_turf = T - user.client.statpanel = T.name + user.set_stat_tab(T.name) /mob/proc/TurfAdjacent(turf/T) return T.Adjacent(src) @@ -412,7 +411,7 @@ playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1) LE.firer = src - LE.def_zone = get_organ_target() + LE.def_zone = ran_zone(zone_selected) LE.preparePixelProjectile(A, src, params) LE.fire() @@ -445,14 +444,14 @@ setDir(WEST) //debug -/obj/screen/proc/scale_to(x1,y1) +/atom/movable/screen/proc/scale_to(x1,y1) if(!y1) y1 = x1 var/matrix/M = new M.Scale(x1,y1) transform = M -/obj/screen/click_catcher +/atom/movable/screen/click_catcher icon = 'icons/mob/screen_gen.dmi' icon_state = "catcher" plane = CLICKCATCHER_PLANE @@ -462,7 +461,7 @@ #define MAX_SAFE_BYOND_ICON_SCALE_TILES (MAX_SAFE_BYOND_ICON_SCALE_PX / world.icon_size) #define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose. -/obj/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15) +/atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15) var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher") var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x) var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y) @@ -477,7 +476,7 @@ M.Scale(px/sx, py/sy) transform = M -/obj/screen/click_catcher/Click(location, control, params) +/atom/movable/screen/click_catcher/Click(location, control, params) var/list/modifiers = params2list(params) if(modifiers["middle"] && iscarbon(usr)) var/mob/living/carbon/C = usr diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index 3eae7d9bc32d0..5e59c17fcb95c 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -23,14 +23,8 @@ SEND_SIGNAL(src, COMSIG_MOUSEDROPPED_ONTO, dropping, user) return - /client - var/list/atom/selected_target[2] var/obj/item/active_mousedown_item = null - var/mouseParams = "" - var/mouseLocation = null - var/mouseObject = null - var/mouseControlObject = null var/middragtime = 0 var/atom/middragatom @@ -44,7 +38,6 @@ /client/MouseUp(object, location, control, params) if (mouse_up_icon) mouse_pointer_icon = mouse_up_icon - selected_target[1] = null if(active_mousedown_item) active_mousedown_item.onMouseUp(object, location, params, mob) active_mousedown_item = null @@ -89,26 +82,12 @@ /atom/proc/IsAutoclickable() . = 1 -/obj/screen/IsAutoclickable() +/atom/movable/screen/IsAutoclickable() . = 0 -/obj/screen/click_catcher/IsAutoclickable() +/atom/movable/screen/click_catcher/IsAutoclickable() . = 1 -//Please don't roast me too hard -/client/MouseMove(object,location,control,params) - mouseParams = params - mouseLocation = location - mouseObject = object - mouseControlObject = control - if(mob && LAZYLEN(mob.mousemove_intercept_objects)) - for(var/datum/D in mob.mousemove_intercept_objects) - D.onMouseMove(object, location, control, params) - ..() - -/datum/proc/onMouseMove(object, location, control, params) - return - /client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params) var/list/L = params2list(params) if (L["middle"]) @@ -118,17 +97,9 @@ else middragtime = 0 middragatom = null - mouseParams = params - mouseLocation = over_location - mouseObject = over_object - mouseControlObject = over_control - if(selected_target[1] && over_object && over_object.IsAutoclickable()) - selected_target[1] = over_object - selected_target[2] = params if(active_mousedown_item) active_mousedown_item.onMouseDrag(src_object, over_object, src_location, over_location, params, mob) - /obj/item/proc/onMouseDrag(src_object, over_object, src_location, over_location, params, mob) return @@ -136,4 +107,4 @@ if (middragatom == src_object) middragtime = 0 middragatom = null - ..() \ No newline at end of file + ..() diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index ed7c78072198d..ce59f95448f04 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -138,8 +138,11 @@ #define ui_ai_take_picture "SOUTH:6,WEST+12" #define ui_ai_view_images "SOUTH:6,WEST+13" #define ui_ai_sensor "SOUTH:6,WEST+14" -#define ui_ai_multicam "SOUTH+1:6,WEST+13" -#define ui_ai_add_multicam "SOUTH+1:6,WEST+14" +#define ui_ai_multicam "SOUTH:6,WEST+15" +#define ui_ai_add_multicam "SOUTH:6,WEST+16" +#define ui_ai_language_menu "CENTER+7:32,SOUTH+1:5" +#define ui_ai_move_up "SOUTH:5+1,WEST+14" +#define ui_ai_move_down "SOUTH:5+1,WEST+15" // pAI @@ -177,3 +180,7 @@ #define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24" #define ui_ghost_teleport "SOUTH:6,CENTER+1:24" #define ui_ghost_pai "SOUTH: 6, CENTER+2:24" + +//Team finder + +#define ui_team_finder "CENTER,CENTER" diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index eaf561ea0d588..ff85a51a515d9 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -1,6 +1,6 @@ #define ACTION_BUTTON_DEFAULT_BACKGROUND "default" -/obj/screen/movable/action_button +/atom/movable/screen/movable/action_button var/datum/action/linked_action var/actiontooltipstyle = "" screen_loc = null @@ -11,10 +11,10 @@ var/id var/ordered = TRUE //If the button gets placed into the default bar. -/obj/screen/movable/action_button/Destroy() +/atom/movable/screen/movable/action_button/Destroy() . = ..() -/obj/screen/movable/action_button/proc/can_use(mob/user) +/atom/movable/screen/movable/action_button/proc/can_use(mob/user) if (linked_action) return linked_action.owner == user else if (isobserver(user)) @@ -23,14 +23,14 @@ else return TRUE -/obj/screen/movable/action_button/MouseDrop(over_object) +/atom/movable/screen/movable/action_button/MouseDrop(over_object) if(!can_use(usr)) return - if((istype(over_object, /obj/screen/movable/action_button) && !istype(over_object, /obj/screen/movable/action_button/hide_toggle))) + if((istype(over_object, /atom/movable/screen/movable/action_button) && !istype(over_object, /atom/movable/screen/movable/action_button/hide_toggle))) if(locked) to_chat(usr, "Action button \"[name]\" is locked, unlock it first.") return - var/obj/screen/movable/action_button/B = over_object + var/atom/movable/screen/movable/action_button/B = over_object var/list/actions = usr.actions actions.Swap(actions.Find(src.linked_action), actions.Find(B.linked_action)) moved = FALSE @@ -41,7 +41,7 @@ else return ..() -/obj/screen/movable/action_button/Click(location,control,params) +/atom/movable/screen/movable/action_button/Click(location,control,params) if (!can_use(usr)) return @@ -70,7 +70,7 @@ return TRUE //Hide/Show Action Buttons ... Button -/obj/screen/movable/action_button/hide_toggle +/atom/movable/screen/movable/action_button/hide_toggle name = "Hide Buttons" desc = "Shift-click any button to reset its position, and Control-click it to lock it in place. Alt-click this button to reset all buttons to their default positions." icon = 'icons/mob/actions.dmi' @@ -80,7 +80,7 @@ var/hide_state = "hide" var/show_state = "show" -/obj/screen/movable/action_button/hide_toggle/Click(location,control,params) +/atom/movable/screen/movable/action_button/hide_toggle/Click(location,control,params) if (!can_use(usr)) return @@ -101,7 +101,7 @@ if(modifiers["alt"]) for(var/V in usr.actions) var/datum/action/A = V - var/obj/screen/movable/action_button/B = A.button + var/atom/movable/screen/movable/action_button/B = A.button B.moved = FALSE if(B.id && usr.client) usr.client.prefs.action_buttons_screen_locs["[B.name]_[B.id]"] = null @@ -123,10 +123,10 @@ update_icon() usr.update_action_buttons() -/obj/screen/movable/action_button/hide_toggle/AltClick(mob/user) +/atom/movable/screen/movable/action_button/hide_toggle/AltClick(mob/user) for(var/V in user.actions) var/datum/action/A = V - var/obj/screen/movable/action_button/B = A.button + var/atom/movable/screen/movable/action_button/B = A.button B.moved = FALSE if(moved) moved = FALSE @@ -134,7 +134,7 @@ to_chat(user, "Action button positions have been reset.") -/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud) +/atom/movable/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud) var/settings = owner_hud.get_action_buttons_icons() icon = settings["bg_icon"] icon_state = settings["bg_state"] @@ -143,17 +143,17 @@ show_state = settings["toggle_show"] update_icon() -/obj/screen/movable/action_button/hide_toggle/update_icon() +/atom/movable/screen/movable/action_button/hide_toggle/update_icon() cut_overlays() add_overlay(mutable_appearance(hide_icon, hidden ? show_state : hide_state)) -/obj/screen/movable/action_button/MouseEntered(location,control,params) +/atom/movable/screen/movable/action_button/MouseEntered(location,control,params) if(!QDELETED(src)) openToolTip(usr,src,params,title = name,content = desc,theme = actiontooltipstyle) -/obj/screen/movable/action_button/MouseExited() +/atom/movable/screen/movable/action_button/MouseExited() closeToolTip(usr) /datum/hud/proc/get_action_buttons_icons() @@ -191,7 +191,7 @@ else for(var/datum/action/A in actions) A.UpdateButtonIcon() - var/obj/screen/movable/action_button/B = A.button + var/atom/movable/screen/movable/action_button/B = A.button if(B.ordered) button_number++ if(B.moved) @@ -227,7 +227,7 @@ return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:-6" -/datum/hud/proc/SetButtonCoords(obj/screen/button,number) +/datum/hud/proc/SetButtonCoords(atom/movable/screen/button,number) var/row = round((number-1)/AB_MAX_COLUMNS) var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1 var/x_offset = 32*(col-1) + 4 + 2*col diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index 93c3b63d1e58d..f30c1bea0620e 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -1,136 +1,136 @@ -/obj/screen/ai +/atom/movable/screen/ai icon = 'icons/mob/screen_ai.dmi' -/obj/screen/ai/Click() +/atom/movable/screen/ai/Click() if(isobserver(usr) || usr.incapacitated()) return TRUE -/obj/screen/ai/aicore +/atom/movable/screen/ai/aicore name = "AI core" icon_state = "ai_core" -/obj/screen/ai/aicore/Click() +/atom/movable/screen/ai/aicore/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.view_core() -/obj/screen/ai/camera_list +/atom/movable/screen/ai/camera_list name = "Show Camera List" icon_state = "camera" -/obj/screen/ai/camera_list/Click() +/atom/movable/screen/ai/camera_list/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.show_camera_list() -/obj/screen/ai/camera_track +/atom/movable/screen/ai/camera_track name = "Track With Camera" icon_state = "track" -/obj/screen/ai/camera_track/Click() +/atom/movable/screen/ai/camera_track/Click() if(..()) return var/mob/living/silicon/ai/AI = usr var/target_name = input(AI, "Choose who you want to track", "Tracking") as null|anything in AI.trackable_mobs() AI.ai_camera_track(target_name) -/obj/screen/ai/camera_light +/atom/movable/screen/ai/camera_light name = "Toggle Camera Light" icon_state = "camera_light" -/obj/screen/ai/camera_light/Click() +/atom/movable/screen/ai/camera_light/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.toggle_camera_light() -/obj/screen/ai/crew_monitor +/atom/movable/screen/ai/crew_monitor name = "Crew Monitoring Console" icon_state = "crew_monitor" -/obj/screen/ai/crew_monitor/Click() +/atom/movable/screen/ai/crew_monitor/Click() if(..()) return var/mob/living/silicon/ai/AI = usr GLOB.crewmonitor.show(AI,AI) -/obj/screen/ai/crew_manifest +/atom/movable/screen/ai/crew_manifest name = "Crew Manifest" icon_state = "manifest" -/obj/screen/ai/crew_manifest/Click() +/atom/movable/screen/ai/crew_manifest/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.ai_roster() -/obj/screen/ai/alerts +/atom/movable/screen/ai/alerts name = "Show Alerts" icon_state = "alerts" -/obj/screen/ai/alerts/Click() +/atom/movable/screen/ai/alerts/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.ai_alerts() -/obj/screen/ai/announcement +/atom/movable/screen/ai/announcement name = "Make Vox Announcement" icon_state = "announcement" -/obj/screen/ai/announcement/Click() +/atom/movable/screen/ai/announcement/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.announcement() -/obj/screen/ai/call_shuttle +/atom/movable/screen/ai/call_shuttle name = "Call Emergency Shuttle" icon_state = "call_shuttle" -/obj/screen/ai/call_shuttle/Click() +/atom/movable/screen/ai/call_shuttle/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.ai_call_shuttle() -/obj/screen/ai/state_laws +/atom/movable/screen/ai/state_laws name = "State Laws" icon_state = "state_laws" -/obj/screen/ai/state_laws/Click() +/atom/movable/screen/ai/state_laws/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.checklaws() -/obj/screen/ai/pda_msg_send +/atom/movable/screen/ai/pda_msg_send name = "PDA - Send Message" icon_state = "pda_send" -/obj/screen/ai/pda_msg_send/Click() +/atom/movable/screen/ai/pda_msg_send/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.cmd_send_pdamesg(usr) -/obj/screen/ai/pda_msg_show +/atom/movable/screen/ai/pda_msg_show name = "PDA - Show Message Log" icon_state = "pda_receive" -/obj/screen/ai/pda_msg_show/Click() +/atom/movable/screen/ai/pda_msg_show/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.cmd_show_message_log(usr) -/obj/screen/ai/image_take +/atom/movable/screen/ai/image_take name = "Take Image" icon_state = "take_picture" -/obj/screen/ai/image_take/Click() +/atom/movable/screen/ai/image_take/Click() if(..()) return if(isAI(usr)) @@ -140,11 +140,11 @@ var/mob/living/silicon/robot/R = usr R.aicamera.toggle_camera_mode(usr) -/obj/screen/ai/image_view +/atom/movable/screen/ai/image_view name = "View Images" icon_state = "view_images" -/obj/screen/ai/image_view/Click() +/atom/movable/screen/ai/image_view/Click() if(..()) return if(isAI(usr)) @@ -154,148 +154,182 @@ var/mob/living/silicon/robot/R = usr R.aicamera.viewpictures(usr) -/obj/screen/ai/sensors +/atom/movable/screen/ai/sensors name = "Sensor Augmentation" icon_state = "ai_sensor" -/obj/screen/ai/sensors/Click() +/atom/movable/screen/ai/sensors/Click() if(..()) return var/mob/living/silicon/S = usr S.toggle_sensors() -/obj/screen/ai/multicam +/atom/movable/screen/ai/multicam name = "Multicamera Mode" icon_state = "multicam" -/obj/screen/ai/multicam/Click() +/atom/movable/screen/ai/multicam/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.toggle_multicam() -/obj/screen/ai/add_multicam +/atom/movable/screen/ai/add_multicam name = "New Camera" icon_state = "new_cam" -/obj/screen/ai/add_multicam/Click() +/atom/movable/screen/ai/add_multicam/Click() if(..()) return var/mob/living/silicon/ai/AI = usr AI.drop_new_multicam() +/atom/movable/screen/ai/move_z + name = "View Above" + icon_state = "move_up" + var/upwards = TRUE + +/atom/movable/screen/ai/move_z/Click() + if(..()) + return + var/mob/living/silicon/ai/AI = usr + var/turf/T = get_turf(AI.eyeobj) + var/turf/target = upwards ? T.above() : T.below() + if(isturf(target)) + AI.eyeobj.forceMove(target) + AI.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static) + AI.clear_fullscreen("flash", 5) + else + to_chat(AI, "There is nothing in that direction!") + +/atom/movable/screen/ai/move_z/down + name = "View Below" + icon_state = "move_down" + upwards = FALSE /datum/hud/ai ui_style = 'icons/mob/screen_ai.dmi' /datum/hud/ai/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using // Language menu - using = new /obj/screen/language_menu - using.screen_loc = ui_borg_language_menu + using = new /atom/movable/screen/language_menu + using.screen_loc = ui_ai_language_menu using.hud = src static_inventory += using //AI core - using = new /obj/screen/ai/aicore() + using = new /atom/movable/screen/ai/aicore() using.screen_loc = ui_ai_core using.hud = src static_inventory += using //Camera list - using = new /obj/screen/ai/camera_list() + using = new /atom/movable/screen/ai/camera_list() using.screen_loc = ui_ai_camera_list using.hud = src static_inventory += using //Track - using = new /obj/screen/ai/camera_track() + using = new /atom/movable/screen/ai/camera_track() using.screen_loc = ui_ai_track_with_camera using.hud = src static_inventory += using //Camera light - using = new /obj/screen/ai/camera_light() + using = new /atom/movable/screen/ai/camera_light() using.screen_loc = ui_ai_camera_light using.hud = src static_inventory += using //Crew Monitoring - using = new /obj/screen/ai/crew_monitor() + using = new /atom/movable/screen/ai/crew_monitor() using.screen_loc = ui_ai_crew_monitor using.hud = src static_inventory += using //Crew Manifest - using = new /obj/screen/ai/crew_manifest() + using = new /atom/movable/screen/ai/crew_manifest() using.screen_loc = ui_ai_crew_manifest using.hud = src static_inventory += using //Alerts - using = new /obj/screen/ai/alerts() + using = new /atom/movable/screen/ai/alerts() using.screen_loc = ui_ai_alerts using.hud = src static_inventory += using //Announcement - using = new /obj/screen/ai/announcement() + using = new /atom/movable/screen/ai/announcement() using.screen_loc = ui_ai_announcement using.hud = src static_inventory += using //Shuttle - using = new /obj/screen/ai/call_shuttle() + using = new /atom/movable/screen/ai/call_shuttle() using.screen_loc = ui_ai_shuttle using.hud = src static_inventory += using //Laws - using = new /obj/screen/ai/state_laws() + using = new /atom/movable/screen/ai/state_laws() using.screen_loc = ui_ai_state_laws using.hud = src static_inventory += using //PDA message - using = new /obj/screen/ai/pda_msg_send() + using = new /atom/movable/screen/ai/pda_msg_send() using.screen_loc = ui_ai_pda_send using.hud = src static_inventory += using //PDA log - using = new /obj/screen/ai/pda_msg_show() + using = new /atom/movable/screen/ai/pda_msg_show() using.screen_loc = ui_ai_pda_log using.hud = src static_inventory += using //Take image - using = new /obj/screen/ai/image_take() + using = new /atom/movable/screen/ai/image_take() using.screen_loc = ui_ai_take_picture using.hud = src static_inventory += using //View images - using = new /obj/screen/ai/image_view() + using = new /atom/movable/screen/ai/image_view() using.screen_loc = ui_ai_view_images using.hud = src static_inventory += using //Medical/Security sensors - using = new /obj/screen/ai/sensors() + using = new /atom/movable/screen/ai/sensors() using.screen_loc = ui_ai_sensor using.hud = src static_inventory += using //Multicamera mode - using = new /obj/screen/ai/multicam() + using = new /atom/movable/screen/ai/multicam() using.screen_loc = ui_ai_multicam using.hud = src static_inventory += using //Add multicamera camera - using = new /obj/screen/ai/add_multicam() + using = new /atom/movable/screen/ai/add_multicam() using.screen_loc = ui_ai_add_multicam using.hud = src static_inventory += using + +//Add multi z up + using = new /atom/movable/screen/ai/move_z() + using.screen_loc = ui_ai_move_up + using.hud = src + static_inventory += using + +//Add multi z down + using = new /atom/movable/screen/ai/move_z/down() + using.screen_loc = ui_ai_move_down + using.hud = src + static_inventory += using diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 7de104a9a805a..17ac61198fd6c 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -18,7 +18,7 @@ if(!category || QDELETED(src)) return - var/obj/screen/alert/thealert + var/atom/movable/screen/alert/thealert if(alerts[category]) thealert = alerts[category] if(thealert.override_alerts) @@ -69,13 +69,13 @@ thealert.timeout = world.time + thealert.timeout - world.tick_lag return thealert -/mob/proc/alert_timeout(obj/screen/alert/alert, category) +/mob/proc/alert_timeout(atom/movable/screen/alert/alert, category) if(alert.timeout && alerts[category] == alert && world.time >= alert.timeout) clear_alert(category) // Proc to clear an existing alert. /mob/proc/clear_alert(category, clear_override = FALSE) - var/obj/screen/alert/alert = alerts[category] + var/atom/movable/screen/alert/alert = alerts[category] if(!alert) return 0 if(alert.override_alerts && !clear_override) @@ -87,7 +87,7 @@ client.screen -= alert qdel(alert) -/obj/screen/alert +/atom/movable/screen/alert icon = 'icons/mob/screen_alert.dmi' icon_state = "default" name = "Alert" @@ -100,154 +100,154 @@ var/mob/owner //Alert owner -/obj/screen/alert/MouseEntered(location,control,params) +/atom/movable/screen/alert/MouseEntered(location,control,params) if(!QDELETED(src)) openToolTip(usr,src,params,title = name,content = desc,theme = alerttooltipstyle) -/obj/screen/alert/MouseExited() +/atom/movable/screen/alert/MouseExited() closeToolTip(usr) //Gas alerts -/obj/screen/alert/not_enough_oxy +/atom/movable/screen/alert/not_enough_oxy name = "Choking (No O2)" desc = "You're not getting enough oxygen. Find some good air before you pass out! The box in your backpack has an oxygen tank and breath mask in it." icon_state = "not_enough_oxy" -/obj/screen/alert/too_much_oxy +/atom/movable/screen/alert/too_much_oxy name = "Choking (O2)" desc = "There's too much oxygen in the air, and you're breathing it in! Find some good air before you pass out!" icon_state = "too_much_oxy" -/obj/screen/alert/not_enough_nitro +/atom/movable/screen/alert/not_enough_nitro name = "Choking (No N2)" desc = "You're not getting enough nitrogen. Find some good air before you pass out!" icon_state = "not_enough_nitro" -/obj/screen/alert/too_much_nitro +/atom/movable/screen/alert/too_much_nitro name = "Choking (N2)" desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!" icon_state = "too_much_nitro" -/obj/screen/alert/not_enough_co2 +/atom/movable/screen/alert/not_enough_co2 name = "Choking (No CO2)" desc = "You're not getting enough carbon dioxide. Find some good air before you pass out!" icon_state = "not_enough_co2" -/obj/screen/alert/too_much_co2 +/atom/movable/screen/alert/too_much_co2 name = "Choking (CO2)" desc = "There's too much carbon dioxide in the air, and you're breathing it in! Find some good air before you pass out!" icon_state = "too_much_co2" -/obj/screen/alert/not_enough_tox +/atom/movable/screen/alert/not_enough_tox name = "Choking (No Plasma)" desc = "You're not getting enough plasma. Find some good air before you pass out!" icon_state = "not_enough_tox" -/obj/screen/alert/too_much_tox +/atom/movable/screen/alert/too_much_tox name = "Choking (Plasma)" desc = "There's highly flammable, toxic plasma in the air and you're breathing it in. Find some fresh air. The box in your backpack has an oxygen tank and gas mask in it." icon_state = "too_much_tox" //End gas alerts -/obj/screen/alert/fat +/atom/movable/screen/alert/fat name = "Fat" desc = "You ate too much food, lardass. Run around the station and lose some weight." icon_state = "fat" -/obj/screen/alert/hungry +/atom/movable/screen/alert/hungry name = "Hungry" desc = "Some food would be good right about now." icon_state = "hungry" -/obj/screen/alert/starving +/atom/movable/screen/alert/starving name = "Starving" desc = "You're severely malnourished. The hunger pains make moving around a chore." icon_state = "starving" -/obj/screen/alert/gross +/atom/movable/screen/alert/gross name = "Grossed out." desc = "That was kind of gross..." icon_state = "gross" -/obj/screen/alert/verygross +/atom/movable/screen/alert/verygross name = "Very grossed out." desc = "You're not feeling very well..." icon_state = "gross2" -/obj/screen/alert/disgusted +/atom/movable/screen/alert/disgusted name = "DISGUSTED" desc = "ABSOLUTELY DISGUSTIN'" icon_state = "gross3" -/obj/screen/alert/hot +/atom/movable/screen/alert/hot name = "Too Hot" desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit." icon_state = "hot" -/obj/screen/alert/cold +/atom/movable/screen/alert/cold name = "Too Cold" desc = "You're freezing cold! Get somewhere warmer and take off any insulating clothing like a space suit." icon_state = "cold" -/obj/screen/alert/lowpressure +/atom/movable/screen/alert/lowpressure name = "Low Pressure" desc = "The air around you is hazardously thin. A space suit would protect you." icon_state = "lowpressure" -/obj/screen/alert/highpressure +/atom/movable/screen/alert/highpressure name = "High Pressure" desc = "The air around you is hazardously thick. A fire suit would protect you." icon_state = "highpressure" -/obj/screen/alert/blind +/atom/movable/screen/alert/blind name = "Blind" desc = "You can't see! This may be caused by a genetic defect, eye trauma, being unconscious, \ or something covering your eyes." icon_state = "blind" -/obj/screen/alert/high +/atom/movable/screen/alert/high name = "High" desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already." icon_state = "high" -/obj/screen/alert/hypnosis +/atom/movable/screen/alert/hypnosis name = "Hypnosis" desc = "Something's hypnotizing you, but you're not really sure about what." icon_state = "hypnosis" var/phrase -/obj/screen/alert/mind_control +/atom/movable/screen/alert/mind_control name = "Mind Control" desc = "Your mind has been hijacked! Click to view the mind control command." icon_state = "mind_control" var/command -/obj/screen/alert/mind_control/Click() +/atom/movable/screen/alert/mind_control/Click() var/mob/living/L = usr if(L != owner) return to_chat(L, "[command]") -/obj/screen/alert/drunk //Not implemented +/atom/movable/screen/alert/drunk //Not implemented name = "Drunk" desc = "All that alcohol you've been drinking is impairing your speech, motor skills, and mental cognition. Make sure to act like it." icon_state = "drunk" -/obj/screen/alert/embeddedobject +/atom/movable/screen/alert/embeddedobject name = "Embedded Object" desc = "Something got lodged into your flesh and is causing major bleeding. It might fall out with time, but surgery is the safest way. \ If you're feeling frisky, examine yourself and click the underlined item to pull the object out." icon_state = "embeddedobject" -/obj/screen/alert/embeddedobject/Click() +/atom/movable/screen/alert/embeddedobject/Click() if(isliving(usr) && usr == owner) - var/mob/living/carbon/human/M = usr + var/mob/living/carbon/M = usr return M.help_shake_act(M) -/obj/screen/alert/weightless +/atom/movable/screen/alert/weightless name = "Weightless" desc = "Gravity has ceased affecting you, and you're floating around aimlessly. You'll need something large and heavy, like a \ wall or lattice, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of \ @@ -255,22 +255,22 @@ magboots would let you walk around normally on the floor. Barring those, you can or shoot a gun to move around via Newton's 3rd Law of Motion." icon_state = "weightless" -/obj/screen/alert/highgravity +/atom/movable/screen/alert/highgravity name = "High Gravity" desc = "You're getting crushed by high gravity, picking up items and movement will be slowed." icon_state = "paralysis" -/obj/screen/alert/veryhighgravity +/atom/movable/screen/alert/veryhighgravity name = "Crushing Gravity" desc = "You're getting crushed by high gravity, picking up items and movement will be slowed. You'll also accumulate brute damage!" icon_state = "paralysis" -/obj/screen/alert/fire +/atom/movable/screen/alert/fire name = "On Fire" desc = "You're on fire. Stop, drop and roll to put the fire out or move to a vacuum area." icon_state = "fire" -/obj/screen/alert/fire/Click() +/atom/movable/screen/alert/fire/Click() var/mob/living/L = usr if(!istype(L) || !L.can_resist() || L != owner) return @@ -278,23 +278,70 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." if(L.mobility_flags & MOBILITY_MOVE) return L.resist_fire() //I just want to start a flame in your hearrrrrrtttttt. +/** + * Handles assigning most of the variables for the alert that pops up when an item is offered + * + * Handles setting the name, description and icon of the alert and tracking the person giving + * and the item being offered, also registers a signal that removes the alert from anyone who moves away from the giver + * Arguments: + * * taker - The person receiving the alert + * * giver - The person giving the alert and item + * * receiving - The item being given by the giver + */ + +/atom/movable/screen/alert/give // information set when the give alert is made + icon_state = "default" + var/mob/living/carbon/giver + var/mob/living/carbon/taker + var/obj/item/receiving + +/atom/movable/screen/alert/give/proc/setup(mob/living/carbon/taker, mob/living/carbon/giver, obj/item/receiving) + name = "[giver] is offering [receiving]" + desc = "[giver] is offering [receiving]. Click this alert to take it." + icon_state = "template" + cut_overlays() + add_overlay(receiving) + src.receiving = receiving + src.giver = giver + src.taker = taker + RegisterSignal(giver, COMSIG_MOVABLE_MOVED, .proc/check_in_range) + RegisterSignal(taker, COMSIG_MOVABLE_MOVED, .proc/check_in_range) + +/atom/movable/screen/alert/give/proc/check_in_range() + SIGNAL_HANDLER // doesn't actually sleep since the only thing below which can sleep is CheckToolReach() which returns FALSE before coming that far. + + + if (!usr.CanReach(giver)) + to_chat(giver, "[taker] moved out of range of you!") + to_chat(taker, "You moved out of range of [giver]!") + owner.clear_alert("[giver]") + else if (!usr.CanReach(taker)) + to_chat(giver, "You moved out of range of [taker]!") + to_chat(taker, "[giver] moved out of range of you!") + owner.clear_alert("[giver]") + +/atom/movable/screen/alert/give/Click(location, control, params) + . = ..() + if(!iscarbon(usr)) + CRASH("User for [src] is of type \[[usr.type]\]. This should never happen.") + taker.take(giver, receiving) //ALIENS -/obj/screen/alert/alien_tox +/atom/movable/screen/alert/alien_tox name = "Plasma" desc = "There's flammable plasma in the air. If it lights up, you'll be toast." icon_state = "alien_tox" alerttooltipstyle = "alien" -/obj/screen/alert/alien_fire +/atom/movable/screen/alert/alien_fire // This alert is temporarily gonna be thrown for all hot air but one day it will be used for literally being on fire name = "Too Hot" desc = "It's too hot! Flee to space or at least away from the flames. Standing on weeds will heal you." icon_state = "alien_fire" alerttooltipstyle = "alien" -/obj/screen/alert/alien_vulnerable +/atom/movable/screen/alert/alien_vulnerable name = "Severed Matriarchy" desc = "Your queen has been killed, you will suffer movement penalties and loss of hivemind. A new queen cannot be made until you recover." icon_state = "alien_noqueen" @@ -302,7 +349,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." //BLOBS -/obj/screen/alert/nofactory +/atom/movable/screen/alert/nofactory name = "No Factory" desc = "You have no factory, and are slowly dying!" icon_state = "blobbernaut_nofactory" @@ -310,7 +357,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." // BLOODCULT -/obj/screen/alert/bloodsense +/atom/movable/screen/alert/bloodsense name = "Blood Sense" desc = "Allows you to sense blood that is manipulated by dark magicks." icon_state = "cult_sense" @@ -319,17 +366,17 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." var/angle = 0 var/mob/living/simple_animal/hostile/construct/Cviewer = null -/obj/screen/alert/bloodsense/Initialize() +/atom/movable/screen/alert/bloodsense/Initialize() . = ..() narnar = new('icons/mob/screen_alert.dmi', "mini_nar") START_PROCESSING(SSprocessing, src) -/obj/screen/alert/bloodsense/Destroy() +/atom/movable/screen/alert/bloodsense/Destroy() Cviewer = null STOP_PROCESSING(SSprocessing, src) return ..() -/obj/screen/alert/bloodsense/process() +/atom/movable/screen/alert/bloodsense/process() var/atom/blood_target if(!owner.mind) @@ -373,7 +420,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." return var/turf/P = get_turf(blood_target) var/turf/Q = get_turf(owner) - if(!P || !Q || (P.z != Q.z)) //The target is on a different Z level, we cannot sense that far. + if(!P || !Q || (P.get_virtual_z_level()!= Q.get_virtual_z_level())) //The target is on a different Z level, we cannot sense that far. icon_state = "runed_sense2" desc = "You can no longer sense your target's presence." return @@ -417,21 +464,21 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." animate(src, transform = final, time = 5, loop = 0) //CLOCKCULT -/obj/screen/alert/clockwork/clocksense +/atom/movable/screen/alert/clockwork/clocksense name = "The Ark of the Clockwork Justicar" desc = "Shows infomation about the Ark of the Clockwork Justicar" icon_state = "clockinfo" alerttooltipstyle = "clockcult" -/obj/screen/alert/clockwork/clocksense/Initialize() +/atom/movable/screen/alert/clockwork/clocksense/Initialize() . = ..() START_PROCESSING(SSprocessing, src) -/obj/screen/alert/clockwork/clocksense/Destroy() - . = ..() +/atom/movable/screen/alert/clockwork/clocksense/Destroy() STOP_PROCESSING(SSprocessing, src) + return ..() -/obj/screen/alert/clockwork/clocksense/process() +/atom/movable/screen/alert/clockwork/clocksense/process() var/datum/antagonist/servant_of_ratvar/servant_antagonist = is_servant_of_ratvar(owner) if(!(servant_antagonist?.team)) return @@ -442,26 +489,26 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." desc += "The Ark is preparing to open, it will activate in [round((GLOB.ratvar_arrival_tick - world.time - 6000) / 10)] seconds.
" else desc += "Ratvar will rise in [round((GLOB.ratvar_arrival_tick - world.time) / 10)] seconds, protect the Ark with your life!
" - if(GLOB.servants_of_ratvar) - desc += "There [GLOB.servants_of_ratvar.len == 1?"is" : "are"] currently [GLOB.servants_of_ratvar.len] loyal servant[GLOB.servants_of_ratvar.len == 1 ? "" : "s"].
" + if(GLOB.human_servants_of_ratvar) + desc += "There [GLOB.human_servants_of_ratvar.len == 1?"is" : "are"] currently [GLOB.human_servants_of_ratvar.len] loyal servant\s.
" if(GLOB.critical_servant_count) - desc += "Upon reaching [GLOB.critical_servant_count] the Ark will open, or it can be opened immediately by invoking Gateway Activation with 6 servants." + desc += "Upon reaching [GLOB.critical_servant_count] servants, the Ark will open, or it can be opened immediately by invoking Gateway Activation with 6 servants." //GUARDIANS -/obj/screen/alert/cancharge +/atom/movable/screen/alert/cancharge name = "Charge Ready" desc = "You are ready to charge at a location!" icon_state = "guardian_charge" alerttooltipstyle = "parasite" -/obj/screen/alert/canstealth +/atom/movable/screen/alert/canstealth name = "Stealth Ready" desc = "You are ready to enter stealth!" icon_state = "guardian_canstealth" alerttooltipstyle = "parasite" -/obj/screen/alert/instealth +/atom/movable/screen/alert/instealth name = "In Stealth" desc = "You are in stealth and your next attack will do bonus damage!" icon_state = "guardian_instealth" @@ -469,54 +516,54 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." //SILICONS -/obj/screen/alert/nocell +/atom/movable/screen/alert/nocell name = "Missing Power Cell" desc = "Unit has no power cell. No modules available until a power cell is reinstalled. Robotics may provide assistance." icon_state = "nocell" -/obj/screen/alert/emptycell +/atom/movable/screen/alert/emptycell name = "Out of Power" desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \ Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." icon_state = "emptycell" -/obj/screen/alert/lowcell +/atom/movable/screen/alert/lowcell name = "Low Charge" desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." icon_state = "lowcell" //Ethereal -/obj/screen/alert/etherealcharge +/atom/movable/screen/alert/etherealcharge name = "Low Blood Charge" desc = "Your blood's electric charge is running low, find a source of charge for your blood. Use a recharging station found in robotics or the dormitory bathrooms, or eat some Ethereal-friendly food." icon_state = "etherealcharge" //Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg -/obj/screen/alert/hacked +/atom/movable/screen/alert/hacked name = "Hacked" desc = "Hazardous non-standard equipment detected. Please ensure any usage of this equipment is in line with unit's laws, if any." icon_state = "hacked" -/obj/screen/alert/ratvar +/atom/movable/screen/alert/ratvar name = "Eternal Servitude" desc = "Hazardous functions detected, sentience prohibation drivers offline. Glory to Rat'var." icon_state = "ratvar_hack" -/obj/screen/alert/locked +/atom/movable/screen/alert/locked name = "Locked Down" desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the Research Director's \ office by your AI master or any qualified human may resolve this matter. Robotics may provide further assistance if necessary." icon_state = "locked" -/obj/screen/alert/newlaw +/atom/movable/screen/alert/newlaw name = "Law Update" desc = "Laws have potentially been uploaded to or removed from this unit. Please be aware of any changes \ so as to remain in compliance with the most up-to-date laws." icon_state = "newlaw" timeout = 300 -/obj/screen/alert/hackingapc +/atom/movable/screen/alert/hackingapc name = "Hacking APC" desc = "An Area Power Controller is being hacked. When the process is \ complete, you will have exclusive control of it, and you will gain \ @@ -525,7 +572,7 @@ so as to remain in compliance with the most up-to-date laws." timeout = 600 var/atom/target = null -/obj/screen/alert/hackingapc/Click() +/atom/movable/screen/alert/hackingapc/Click() if(!usr || !usr.client || usr != owner) return if(!target) @@ -537,7 +584,7 @@ so as to remain in compliance with the most up-to-date laws." //MECHS -/obj/screen/alert/low_mech_integrity +/atom/movable/screen/alert/low_mech_integrity name = "Mech Damaged" desc = "Mech integrity is low." icon_state = "low_mech_integrity" @@ -545,19 +592,19 @@ so as to remain in compliance with the most up-to-date laws." //GHOSTS //TODO: expand this system to replace the pollCandidates/CheckAntagonist/"choose quickly"/etc Yes/No messages -/obj/screen/alert/notify_cloning +/atom/movable/screen/alert/notify_cloning name = "Revival" desc = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!" icon_state = "template" timeout = 300 -/obj/screen/alert/notify_cloning/Click() +/atom/movable/screen/alert/notify_cloning/Click() if(!usr || !usr.client || usr != owner) return var/mob/dead/observer/G = usr G.reenter_corpse() -/obj/screen/alert/notify_action +/atom/movable/screen/alert/notify_action name = "Body created" desc = "A body was created. You can enter it." icon_state = "template" @@ -565,7 +612,7 @@ so as to remain in compliance with the most up-to-date laws." var/atom/target = null var/action = NOTIFY_JUMP -/obj/screen/alert/notify_action/Click() +/atom/movable/screen/alert/notify_action/Click() if(!usr || !usr.client || usr != owner) return if(!target) @@ -585,20 +632,20 @@ so as to remain in compliance with the most up-to-date laws." //OBJECT-BASED -/obj/screen/alert/restrained/buckled +/atom/movable/screen/alert/restrained/buckled name = "Buckled" desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed." icon_state = "buckled" -/obj/screen/alert/restrained/handcuffed +/atom/movable/screen/alert/restrained/handcuffed name = "Handcuffed" desc = "You're handcuffed and can't act. If anyone drags you, you won't be able to move. Click the alert to free yourself." -/obj/screen/alert/restrained/legcuffed +/atom/movable/screen/alert/restrained/legcuffed name = "Legcuffed" desc = "You're legcuffed, which slows you down considerably. Click the alert to free yourself." -/obj/screen/alert/restrained/Click() +/atom/movable/screen/alert/restrained/Click() var/mob/living/L = usr if(!istype(L) || !L.can_resist() || L != owner) return @@ -606,7 +653,7 @@ so as to remain in compliance with the most up-to-date laws." if((L.mobility_flags & MOBILITY_MOVE) && (L.last_special <= world.time)) return L.resist_restraints() -/obj/screen/alert/restrained/buckled/Click() +/atom/movable/screen/alert/restrained/buckled/Click() var/mob/living/L = usr if(!istype(L) || !L.can_resist() || L != owner) return @@ -627,7 +674,7 @@ so as to remain in compliance with the most up-to-date laws." screenmob.client.screen -= alerts[alerts[i]] return 1 for(var/i = 1, i <= alerts.len, i++) - var/obj/screen/alert/alert = alerts[alerts[i]] + var/atom/movable/screen/alert/alert = alerts[alerts[i]] if(alert.icon_state == "template") alert.icon = ui_style switch(i) @@ -651,9 +698,9 @@ so as to remain in compliance with the most up-to-date laws." return 1 /mob - var/list/alerts = list() // contains /obj/screen/alert only // On /mob so clientless mobs will throw alerts properly + var/list/alerts = list() // contains /atom/movable/screen/alert only // On /mob so clientless mobs will throw alerts properly -/obj/screen/alert/Click(location, control, params) +/atom/movable/screen/alert/Click(location, control, params) if(!usr || !usr.client) return var/paramslist = params2list(params) @@ -665,9 +712,8 @@ so as to remain in compliance with the most up-to-date laws." if(master) return usr.client.Click(master, location, control, params) -/obj/screen/alert/Destroy() - . = ..() +/atom/movable/screen/alert/Destroy() severity = 0 - master = null owner = null screen_loc = "" + return ..() diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm index 97f3e5f567f48..8343a4a1ba534 100644 --- a/code/_onclick/hud/alien.dm +++ b/code/_onclick/hud/alien.dm @@ -1,23 +1,23 @@ -/obj/screen/alien +/atom/movable/screen/alien icon = 'icons/mob/screen_alien.dmi' -/obj/screen/alien/leap +/atom/movable/screen/alien/leap name = "toggle leap" icon_state = "leap_off" -/obj/screen/alien/leap/Click() +/atom/movable/screen/alien/leap/Click() if(isalienhunter(usr)) var/mob/living/carbon/alien/humanoid/hunter/AH = usr AH.toggle_leap() -/obj/screen/alien/plasma_display +/atom/movable/screen/alien/plasma_display icon = 'icons/mob/screen_gen.dmi' icon_state = "power_display2" name = "plasma stored" screen_loc = ui_alienplasmadisplay -/obj/screen/alien/alien_queen_finder +/atom/movable/screen/alien/alien_queen_finder icon = 'icons/mob/screen_alien.dmi' icon_state = "queen_finder" name = "queen sense" @@ -30,7 +30,7 @@ /datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using //equippable shit @@ -39,21 +39,21 @@ //begin buttons - using = new /obj/screen/swap_hand() + using = new /atom/movable/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_1" using.screen_loc = ui_swaphand_position(owner,1) using.hud = src static_inventory += using - using = new /obj/screen/swap_hand() + using = new /atom/movable/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_2" using.screen_loc = ui_swaphand_position(owner,2) using.hud = src static_inventory += using - using = new /obj/screen/act_intent/alien() + using = new /atom/movable/screen/act_intent/alien() using.icon_state = mymob.a_intent using.hud = src static_inventory += using @@ -61,34 +61,34 @@ if(isalienhunter(mymob)) var/mob/living/carbon/alien/humanoid/hunter/H = mymob - H.leap_icon = new /obj/screen/alien/leap() + H.leap_icon = new /atom/movable/screen/alien/leap() H.leap_icon.screen_loc = ui_alien_storage_r static_inventory += H.leap_icon - using = new/obj/screen/language_menu + using = new/atom/movable/screen/language_menu using.screen_loc = ui_alien_language_menu using.hud = src static_inventory += using - using = new /obj/screen/drop() + using = new /atom/movable/screen/drop() using.icon = ui_style using.screen_loc = ui_drop_throw using.hud = src static_inventory += using - using = new /obj/screen/resist() + using = new /atom/movable/screen/resist() using.icon = ui_style using.screen_loc = ui_above_movement using.hud = src hotkeybuttons += using - throw_icon = new /obj/screen/throw_catch() + throw_icon = new /atom/movable/screen/throw_catch() throw_icon.icon = ui_style throw_icon.screen_loc = ui_drop_throw throw_icon.hud = src hotkeybuttons += throw_icon - pull_icon = new /obj/screen/pull() + pull_icon = new /atom/movable/screen/pull() pull_icon.icon = ui_style pull_icon.update_icon() pull_icon.screen_loc = ui_above_movement @@ -97,28 +97,28 @@ //begin indicators - healths = new /obj/screen/healths/alien() + healths = new /atom/movable/screen/healths/alien() healths.hud = src infodisplay += healths - alien_plasma_display = new /obj/screen/alien/plasma_display() + alien_plasma_display = new /atom/movable/screen/alien/plasma_display() alien_plasma_display.hud = src infodisplay += alien_plasma_display if(!isalienqueen(mymob)) - alien_queen_finder = new /obj/screen/alien/alien_queen_finder + alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder alien_queen_finder.hud = src infodisplay += alien_queen_finder - zone_select = new /obj/screen/zone_sel/alien() + zone_select = new /atom/movable/screen/zone_sel/alien() zone_select.hud = src zone_select.update_icon() static_inventory += zone_select - for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) + for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src - inv_slots[inv.slot_id] = inv + inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv inv.update_icon() /datum/hud/alien/persistent_inventory_update() diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index f9ac0a58e0473..b12f5503a60b9 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -3,35 +3,35 @@ /datum/hud/larva/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - using = new /obj/screen/act_intent/alien() + using = new /atom/movable/screen/act_intent/alien() using.icon_state = mymob.a_intent using.hud = src static_inventory += using action_intent = using - healths = new /obj/screen/healths/alien() + healths = new /atom/movable/screen/healths/alien() healths.hud = src infodisplay += healths - alien_queen_finder = new /obj/screen/alien/alien_queen_finder() + alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder() alien_queen_finder.hud = src infodisplay += alien_queen_finder - - pull_icon = new /obj/screen/pull() + + pull_icon = new /atom/movable/screen/pull() pull_icon.icon = 'icons/mob/screen_alien.dmi' pull_icon.update_icon() pull_icon.screen_loc = ui_above_movement pull_icon.hud = src hotkeybuttons += pull_icon - using = new/obj/screen/language_menu + using = new/atom/movable/screen/language_menu using.screen_loc = ui_alien_language_menu using.hud = src static_inventory += using - zone_select = new /obj/screen/zone_sel/alien() + zone_select = new /atom/movable/screen/zone_sel/alien() zone_select.update_icon() zone_select.hud = src static_inventory += zone_select diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index d633c3e3c5123..b1da33635fdd0 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -1,39 +1,39 @@ -/obj/screen/blob +/atom/movable/screen/blob icon = 'icons/mob/blob.dmi' -/obj/screen/blob/MouseEntered(location,control,params) +/atom/movable/screen/blob/MouseEntered(location,control,params) openToolTip(usr,src,params,title = name,content = desc, theme = "blob") -/obj/screen/blob/MouseExited() +/atom/movable/screen/blob/MouseExited() closeToolTip(usr) -/obj/screen/blob/BlobHelp +/atom/movable/screen/blob/BlobHelp icon_state = "ui_help" name = "Blob Help" desc = "Help on playing blob!" -/obj/screen/blob/BlobHelp/Click() +/atom/movable/screen/blob/BlobHelp/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.blob_help() -/obj/screen/blob/JumpToNode +/atom/movable/screen/blob/JumpToNode icon_state = "ui_tonode" name = "Jump to Node" desc = "Moves your camera to a selected blob node." -/obj/screen/blob/JumpToNode/Click() +/atom/movable/screen/blob/JumpToNode/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.jump_to_node() -/obj/screen/blob/JumpToCore +/atom/movable/screen/blob/JumpToCore icon_state = "ui_tocore" name = "Jump to Core" desc = "Moves your camera to your blob core." -/obj/screen/blob/JumpToCore/MouseEntered(location,control,params) +/atom/movable/screen/blob/JumpToCore/MouseEntered(location,control,params) if(hud?.mymob && isovermind(hud.mymob)) var/mob/camera/blob/B = hud.mymob if(!B.placed) @@ -44,89 +44,89 @@ desc = initial(desc) ..() -/obj/screen/blob/JumpToCore/Click() +/atom/movable/screen/blob/JumpToCore/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr if(!B.placed) B.place_blob_core(0) B.transport_core() -/obj/screen/blob/Blobbernaut +/atom/movable/screen/blob/Blobbernaut icon_state = "ui_blobbernaut" name = "Produce Blobbernaut (40)" desc = "Produces a strong, smart blobbernaut from a factory blob for 40 resources.
The factory blob used will become fragile and unable to produce spores." -/obj/screen/blob/Blobbernaut/Click() +/atom/movable/screen/blob/Blobbernaut/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_blobbernaut() -/obj/screen/blob/ResourceBlob +/atom/movable/screen/blob/ResourceBlob icon_state = "ui_resource" name = "Produce Resource Blob (40)" desc = "Produces a resource blob for 40 resources.
Resource blobs will give you resources every few seconds." -/obj/screen/blob/ResourceBlob/Click() +/atom/movable/screen/blob/ResourceBlob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_resource() -/obj/screen/blob/NodeBlob +/atom/movable/screen/blob/NodeBlob icon_state = "ui_node" name = "Produce Node Blob (50)" desc = "Produces a node blob for 50 resources.
Node blobs will expand and activate nearby resource and factory blobs." -/obj/screen/blob/NodeBlob/Click() +/atom/movable/screen/blob/NodeBlob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_node() -/obj/screen/blob/FactoryBlob +/atom/movable/screen/blob/FactoryBlob icon_state = "ui_factory" name = "Produce Factory Blob (60)" desc = "Produces a factory blob for 60 resources.
Factory blobs will produce spores every few seconds." -/obj/screen/blob/FactoryBlob/Click() +/atom/movable/screen/blob/FactoryBlob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_factory() -/obj/screen/blob/ReadaptStrain +/atom/movable/screen/blob/ReadaptStrain icon_state = "ui_chemswap" - name = "Readapt Strain (40)" + name = "Readapt Strain" desc = "Allows you to choose a new strain from 4 random choices for 40 resources." -/obj/screen/blob/ReadaptStrain/MouseEntered(location,control,params) +/atom/movable/screen/blob/ReadaptStrain/MouseEntered(location,control,params) if(hud && hud.mymob && isovermind(hud.mymob)) var/mob/camera/blob/B = hud.mymob if(B.free_strain_rerolls) - name = "Readapt Strain (FREE)" + name = "[initial(name)] (FREE)" desc = "Randomly rerolls your strain for free." else - name = initial(name) + name = "[initial(name)] ([BLOB_REROLL_COST])" desc = initial(desc) ..() -/obj/screen/blob/ReadaptStrain/Click() +/atom/movable/screen/blob/ReadaptStrain/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.strain_reroll() -/obj/screen/blob/RelocateCore +/atom/movable/screen/blob/RelocateCore icon_state = "ui_swap" name = "Relocate Core (80)" desc = "Swaps a node and your core for 80 resources." -/obj/screen/blob/RelocateCore/Click() +/atom/movable/screen/blob/RelocateCore/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.relocate_core() /datum/hud/blob_overmind/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - blobpwrdisplay = new /obj/screen() + blobpwrdisplay = new /atom/movable/screen() blobpwrdisplay.name = "blob power" blobpwrdisplay.icon_state = "block" blobpwrdisplay.screen_loc = ui_health @@ -136,51 +136,51 @@ blobpwrdisplay.hud = src infodisplay += blobpwrdisplay - healths = new /obj/screen/healths/blob() + healths = new /atom/movable/screen/healths/blob() healths.hud = src infodisplay += healths - using = new /obj/screen/blob/BlobHelp() + using = new /atom/movable/screen/blob/BlobHelp() using.screen_loc = "WEST:6,NORTH:-3" using.hud = src static_inventory += using - using = new /obj/screen/blob/JumpToNode() + using = new /atom/movable/screen/blob/JumpToNode() using.screen_loc = ui_inventory using.hud = src static_inventory += using - using = new /obj/screen/blob/JumpToCore() + using = new /atom/movable/screen/blob/JumpToCore() using.screen_loc = ui_zonesel using.hud = src static_inventory += using - using = new /obj/screen/blob/Blobbernaut() + using = new /atom/movable/screen/blob/Blobbernaut() using.screen_loc = ui_belt using.hud = src static_inventory += using - using = new /obj/screen/blob/ResourceBlob() + using = new /atom/movable/screen/blob/ResourceBlob() using.screen_loc = ui_back using.hud = src static_inventory += using - using = new /obj/screen/blob/NodeBlob() + using = new /atom/movable/screen/blob/NodeBlob() using.screen_loc = ui_hand_position(2) using.hud = src static_inventory += using - using = new /obj/screen/blob/FactoryBlob() + using = new /atom/movable/screen/blob/FactoryBlob() using.screen_loc = ui_hand_position(1) using.hud = src static_inventory += using - using = new /obj/screen/blob/ReadaptStrain() + using = new /atom/movable/screen/blob/ReadaptStrain() using.screen_loc = ui_storage1 using.hud = src static_inventory += using - using = new /obj/screen/blob/RelocateCore() + using = new /atom/movable/screen/blob/RelocateCore() using.screen_loc = ui_storage2 using.hud = src static_inventory += using diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm index ed45d5b1f6f26..430e8e81e7f89 100644 --- a/code/_onclick/hud/blobbernauthud.dm +++ b/code/_onclick/hud/blobbernauthud.dm @@ -2,10 +2,10 @@ /datum/hud/blobbernaut/New(mob/owner) ..() - blobpwrdisplay = new /obj/screen/healths/blob/naut/core() + blobpwrdisplay = new /atom/movable/screen/healths/blob/naut/core() blobpwrdisplay.hud = src infodisplay += blobpwrdisplay - healths = new /obj/screen/healths/blob/naut() + healths = new /atom/movable/screen/healths/blob/naut() healths.hud = src infodisplay += healths diff --git a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm index d896101300301..9a5babbdb8bed 100644 --- a/code/_onclick/hud/constructs.dm +++ b/code/_onclick/hud/constructs.dm @@ -3,13 +3,13 @@ /datum/hud/constructs/New(mob/owner) ..() - pull_icon = new /obj/screen/pull() + pull_icon = new /atom/movable/screen/pull() pull_icon.icon = ui_style pull_icon.update_icon() pull_icon.screen_loc = ui_construct_pull pull_icon.hud = src static_inventory += pull_icon - healths = new /obj/screen/healths/construct() + healths = new /atom/movable/screen/healths/construct() healths.hud = src infodisplay += healths diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm index 14a9dc2919e2f..f008114aa192a 100644 --- a/code/_onclick/hud/credits.dm +++ b/code/_onclick/hud/credits.dm @@ -12,6 +12,14 @@ GLOBAL_LIST(end_titles) GLOB.end_titles += "
" GLOB.end_titles += "
" + if(GLOB.soundtrack_this_round.len) + GLOB.end_titles += "
Music Credits
" + for(var/song_path in GLOB.soundtrack_this_round) + var/datum/soundtrack_song/song = song_path + GLOB.end_titles += "[sanitize(initial(song.artist))] - \"[sanitize(initial(song.title))]\" ([sanitize(initial(song.album))])
" + GLOB.end_titles += "" + GLOB.end_titles += "
" + if(GLOB.patrons.len) GLOB.end_titles += "
Thank you to our patrons!
" for(var/patron in GLOB.patrons) @@ -30,7 +38,7 @@ GLOBAL_LIST(end_titles) GLOB.end_titles += "Thanks for playing!
" for(var/client/C in GLOB.clients) if(C.prefs.show_credits) - C.screen += new /obj/screen/credit/title_card(null, null, SSticker.mode.title_icon) + C.screen += new /atom/movable/screen/credit/title_card(null, null, SSticker.mode.title_icon) sleep(CREDIT_SPAWN_SPEED * 3) for(var/i in 1 to GLOB.end_titles.len) var/C = GLOB.end_titles[i] @@ -42,9 +50,9 @@ GLOBAL_LIST(end_titles) /proc/create_credit(credit) - new /obj/screen/credit(null, credit) + new /atom/movable/screen/credit(null, credit) -/obj/screen/credit +/atom/movable/screen/credit icon_state = "blank" mouse_opacity = MOUSE_OPACITY_TRANSPARENT alpha = 0 @@ -52,9 +60,9 @@ GLOBAL_LIST(end_titles) layer = SPLASHSCREEN_LAYER var/matrix/target -/obj/screen/credit/Initialize(mapload, credited) +/atom/movable/screen/credit/Initialize(mapload, credited) . = ..() - maptext = "[credited]" + maptext = MAPTEXT("[credited]") maptext_height = world.icon_size * 2 maptext_width = world.icon_size * 13 var/matrix/M = matrix(transform) @@ -65,20 +73,20 @@ GLOBAL_LIST(end_titles) INVOKE_ASYNC(src, .proc/add_to_clients) QDEL_IN(src, CREDIT_ROLL_SPEED) -/obj/screen/credit/proc/add_to_clients() +/atom/movable/screen/credit/proc/add_to_clients() for(var/client/C in GLOB.clients) if(C.prefs.show_credits) C.screen += src -/obj/screen/credit/Destroy() +/atom/movable/screen/credit/Destroy() screen_loc = null return ..() -/obj/screen/credit/title_card +/atom/movable/screen/credit/title_card icon = 'icons/title_cards.dmi' screen_loc = "4,1" -/obj/screen/credit/title_card/Initialize(mapload, credited, title_icon_state) +/atom/movable/screen/credit/title_card/Initialize(mapload, credited, title_icon_state) icon_state = title_icon_state . = ..() maptext = null diff --git a/code/_onclick/hud/devil.dm b/code/_onclick/hud/devil.dm index 900c807a7afed..7588a4abfcb88 100644 --- a/code/_onclick/hud/devil.dm +++ b/code/_onclick/hud/devil.dm @@ -4,15 +4,15 @@ /datum/hud/devil/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - using = new /obj/screen/drop() + using = new /atom/movable/screen/drop() using.icon = ui_style using.screen_loc = ui_drone_drop using.hud = src static_inventory += using - pull_icon = new /obj/screen/pull() + pull_icon = new /atom/movable/screen/pull() pull_icon.icon = ui_style pull_icon.update_icon() pull_icon.screen_loc = ui_drone_pull @@ -21,7 +21,7 @@ build_hand_slots() - using = new /obj/screen/inventory() + using = new /atom/movable/screen/inventory() using.name = "hand" using.icon = ui_style using.icon_state = "swap_1_m" @@ -31,7 +31,7 @@ using.hud = src static_inventory += using - using = new /obj/screen/inventory() + using = new /atom/movable/screen/inventory() using.name = "hand" using.icon = ui_style using.icon_state = "swap_2" @@ -41,15 +41,15 @@ using.hud = src static_inventory += using - zone_select = new /obj/screen/zone_sel() + zone_select = new /atom/movable/screen/zone_sel() zone_select.icon = ui_style zone_select.hud = src zone_select.update_icon() - lingchemdisplay = new /obj/screen/ling/chems() + lingchemdisplay = new /atom/movable/screen/ling/chems() lingchemdisplay.hud = src - devilsouldisplay = new /obj/screen/devil/soul_counter + devilsouldisplay = new /atom/movable/screen/devil/soul_counter devilsouldisplay.hud = src infodisplay += devilsouldisplay diff --git a/code/_onclick/hud/drones.dm b/code/_onclick/hud/drones.dm index 3a6b7511136ab..06d6e239df7e8 100644 --- a/code/_onclick/hud/drones.dm +++ b/code/_onclick/hud/drones.dm @@ -1,31 +1,31 @@ /datum/hud/dextrous/drone/New(mob/owner) ..() - var/obj/screen/inventory/inv_box + var/atom/movable/screen/inventory/inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "internal storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" // inv_box.icon_full = "template" inv_box.screen_loc = ui_drone_storage - inv_box.slot_id = SLOT_GENERC_DEXTROUS_STORAGE + inv_box.slot_id = ITEM_SLOT_DEX_STORAGE inv_box.hud = src static_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "head/mask" inv_box.icon = ui_style inv_box.icon_state = "mask" // inv_box.icon_full = "template" inv_box.screen_loc = ui_drone_head - inv_box.slot_id = SLOT_HEAD + inv_box.slot_id = ITEM_SLOT_HEAD inv_box.hud = src static_inventory += inv_box - for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) + for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src - inv_slots[inv.slot_id] = inv + inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv inv.update_icon() diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 10317125b4d0d..c4f9275883757 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -3,7 +3,7 @@ var/list/screens = list() /mob/proc/overlay_fullscreen(category, type, severity) - var/obj/screen/fullscreen/screen = screens[category] + var/atom/movable/screen/fullscreen/screen = screens[category] if (!screen || screen.type != type) // needs to be recreated clear_fullscreen(category, FALSE) @@ -21,7 +21,7 @@ return screen /mob/proc/clear_fullscreen(category, animated = 10) - var/obj/screen/fullscreen/screen = screens[category] + var/atom/movable/screen/fullscreen/screen = screens[category] if(!screen) return @@ -35,7 +35,7 @@ client.screen -= screen qdel(screen) -/mob/proc/clear_fullscreen_after_animate(obj/screen/fullscreen/screen) +/mob/proc/clear_fullscreen_after_animate(atom/movable/screen/fullscreen/screen) if(client) client.screen -= screen qdel(screen) @@ -51,7 +51,7 @@ /mob/proc/reload_fullscreen() if(client) - var/obj/screen/fullscreen/screen + var/atom/movable/screen/fullscreen/screen for(var/category in screens) screen = screens[category] if(screen.should_show_to(src)) @@ -60,7 +60,7 @@ else client.screen -= screen -/obj/screen/fullscreen +/atom/movable/screen/fullscreen icon = 'icons/mob/screen_full.dmi' icon_state = "default" screen_loc = "CENTER-7,CENTER-7" @@ -71,94 +71,94 @@ var/severity = 0 var/show_when_dead = FALSE -/obj/screen/fullscreen/proc/update_for_view(client_view) +/atom/movable/screen/fullscreen/proc/update_for_view(client_view) if (screen_loc == "CENTER-7,CENTER-7" && view != client_view) var/list/actualview = getviewsize(client_view) view = client_view transform = matrix(actualview[1]/FULLSCREEN_OVERLAY_RESOLUTION_X, 0, 0, 0, actualview[2]/FULLSCREEN_OVERLAY_RESOLUTION_Y, 0) -/obj/screen/fullscreen/proc/should_show_to(mob/mymob) +/atom/movable/screen/fullscreen/proc/should_show_to(mob/mymob) if(!show_when_dead && mymob.stat == DEAD) return FALSE return TRUE -/obj/screen/fullscreen/Destroy() +/atom/movable/screen/fullscreen/Destroy() severity = 0 . = ..() -/obj/screen/fullscreen/brute +/atom/movable/screen/fullscreen/brute icon_state = "brutedamageoverlay" layer = UI_DAMAGE_LAYER plane = FULLSCREEN_PLANE -/obj/screen/fullscreen/oxy +/atom/movable/screen/fullscreen/oxy icon_state = "oxydamageoverlay" layer = UI_DAMAGE_LAYER plane = FULLSCREEN_PLANE -/obj/screen/fullscreen/crit +/atom/movable/screen/fullscreen/crit icon_state = "passage" layer = CRIT_LAYER plane = FULLSCREEN_PLANE -/obj/screen/fullscreen/crit/vision +/atom/movable/screen/fullscreen/crit/vision icon_state = "oxydamageoverlay" layer = BLIND_LAYER -/obj/screen/fullscreen/blind +/atom/movable/screen/fullscreen/blind icon_state = "blackimageoverlay" layer = BLIND_LAYER plane = FULLSCREEN_PLANE -/obj/screen/fullscreen/curse +/atom/movable/screen/fullscreen/curse icon_state = "curse" layer = CURSE_LAYER plane = FULLSCREEN_PLANE -/obj/screen/fullscreen/hive_mc +/atom/movable/screen/fullscreen/hive_mc icon_state = "hive_mc" layer = CURSE_LAYER plane = FULLSCREEN_PLANE -/obj/screen/fullscreen/hive_eyes +/atom/movable/screen/fullscreen/hive_eyes icon_state = "hive_eyes" layer = CURSE_LAYER plane = FULLSCREEN_PLANE -/obj/screen/fullscreen/impaired +/atom/movable/screen/fullscreen/impaired icon_state = "impairedoverlay" -/obj/screen/fullscreen/flash +/atom/movable/screen/fullscreen/flash icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "flash" -/obj/screen/fullscreen/flash/static +/atom/movable/screen/fullscreen/flash/static icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "noise" -/obj/screen/fullscreen/high +/atom/movable/screen/fullscreen/high icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "druggy" -/obj/screen/fullscreen/color_vision +/atom/movable/screen/fullscreen/color_vision icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "flash" alpha = 80 -/obj/screen/fullscreen/color_vision/green +/atom/movable/screen/fullscreen/color_vision/green color = "#00ff00" -/obj/screen/fullscreen/color_vision/red +/atom/movable/screen/fullscreen/color_vision/red color = "#ff0000" -/obj/screen/fullscreen/color_vision/blue +/atom/movable/screen/fullscreen/color_vision/blue color = "#0000ff" -/obj/screen/fullscreen/lighting_backdrop +/atom/movable/screen/fullscreen/lighting_backdrop icon = 'icons/mob/screen_gen.dmi' icon_state = "flash" transform = matrix(200, 0, 0, 0, 200, 0) @@ -167,18 +167,18 @@ show_when_dead = TRUE //Provides darkness to the back of the lighting plane -/obj/screen/fullscreen/lighting_backdrop/lit +/atom/movable/screen/fullscreen/lighting_backdrop/lit invisibility = INVISIBILITY_LIGHTING layer = BACKGROUND_LAYER+21 color = "#000" show_when_dead = TRUE //Provides whiteness in case you don't see lights so everything is still visible -/obj/screen/fullscreen/lighting_backdrop/unlit +/atom/movable/screen/fullscreen/lighting_backdrop/unlit layer = BACKGROUND_LAYER+20 show_when_dead = TRUE -/obj/screen/fullscreen/see_through_darkness +/atom/movable/screen/fullscreen/see_through_darkness icon_state = "nightvision" plane = LIGHTING_PLANE layer = LIGHTING_LAYER diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm index d018c187f2826..c0e6e6a785eee 100644 --- a/code/_onclick/hud/generic_dextrous.dm +++ b/code/_onclick/hud/generic_dextrous.dm @@ -1,15 +1,15 @@ //Used for normal mobs that have hands. /datum/hud/dextrous/New(mob/living/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - using = new /obj/screen/drop() + using = new /atom/movable/screen/drop() using.icon = ui_style using.screen_loc = ui_drone_drop using.hud = src static_inventory += using - pull_icon = new /obj/screen/pull() + pull_icon = new /atom/movable/screen/pull() pull_icon.icon = ui_style pull_icon.update_icon() pull_icon.screen_loc = ui_drone_pull @@ -18,14 +18,14 @@ build_hand_slots() - using = new /obj/screen/swap_hand() + using = new /atom/movable/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_1_m" using.screen_loc = ui_swaphand_position(owner,1) using.hud = src static_inventory += using - using = new /obj/screen/swap_hand() + using = new /atom/movable/screen/swap_hand() using.icon = ui_style using.icon_state = "swap_2" using.screen_loc = ui_swaphand_position(owner,2) @@ -35,32 +35,32 @@ if(mymob.possible_a_intents) if(mymob.possible_a_intents.len == 4) // All possible intents - full intent selector - action_intent = new /obj/screen/act_intent/segmented + action_intent = new /atom/movable/screen/act_intent/segmented else - action_intent = new /obj/screen/act_intent + action_intent = new /atom/movable/screen/act_intent action_intent.icon = ui_style action_intent.icon_state = mymob.a_intent action_intent.hud = src static_inventory += action_intent - zone_select = new /obj/screen/zone_sel() + zone_select = new /atom/movable/screen/zone_sel() zone_select.icon = ui_style zone_select.update_icon() zone_select.hud = src static_inventory += zone_select - using = new /obj/screen/area_creator + using = new /atom/movable/screen/area_creator using.icon = ui_style using.hud = src static_inventory += using mymob.client.screen = list() - for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) + for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src - inv_slots[inv.slot_id] = inv + inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv inv.update_icon() /datum/hud/dextrous/persistent_inventory_update() diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index f67c922404e61..c5de8c24396c4 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -1,79 +1,79 @@ -/obj/screen/ghost +/atom/movable/screen/ghost icon = 'icons/mob/screen_ghost.dmi' -/obj/screen/ghost/MouseEntered() +/atom/movable/screen/ghost/MouseEntered() flick(icon_state + "_anim", src) -/obj/screen/ghost/jumptomob +/atom/movable/screen/ghost/jumptomob name = "Jump to mob" icon_state = "jumptomob" -/obj/screen/ghost/jumptomob/Click() +/atom/movable/screen/ghost/jumptomob/Click() var/mob/dead/observer/G = usr G.jumptomob() -/obj/screen/ghost/orbit +/atom/movable/screen/ghost/orbit name = "Orbit" icon_state = "orbit" -/obj/screen/ghost/orbit/Click() +/atom/movable/screen/ghost/orbit/Click() var/mob/dead/observer/G = usr G.follow() -/obj/screen/ghost/reenter_corpse +/atom/movable/screen/ghost/reenter_corpse name = "Reenter corpse" icon_state = "reenter_corpse" -/obj/screen/ghost/reenter_corpse/Click() +/atom/movable/screen/ghost/reenter_corpse/Click() var/mob/dead/observer/G = usr G.reenter_corpse() -/obj/screen/ghost/teleport +/atom/movable/screen/ghost/teleport name = "Teleport" icon_state = "teleport" -/obj/screen/ghost/teleport/Click() +/atom/movable/screen/ghost/teleport/Click() var/mob/dead/observer/G = usr G.dead_tele() -/obj/screen/ghost/pai +/atom/movable/screen/ghost/pai name = "pAI Candidate" icon_state = "pai" -/obj/screen/ghost/pai/Click() +/atom/movable/screen/ghost/pai/Click() var/mob/dead/observer/G = usr G.register_pai() /datum/hud/ghost/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - using = new /obj/screen/ghost/jumptomob() + using = new /atom/movable/screen/ghost/jumptomob() using.screen_loc = ui_ghost_jumptomob using.hud = src static_inventory += using - using = new /obj/screen/ghost/orbit() + using = new /atom/movable/screen/ghost/orbit() using.screen_loc = ui_ghost_orbit using.hud = src static_inventory += using - using = new /obj/screen/ghost/reenter_corpse() + using = new /atom/movable/screen/ghost/reenter_corpse() using.screen_loc = ui_ghost_reenter_corpse using.hud = src static_inventory += using - using = new /obj/screen/ghost/teleport() + using = new /atom/movable/screen/ghost/teleport() using.screen_loc = ui_ghost_teleport using.hud = src static_inventory += using - using = new /obj/screen/ghost/pai() + using = new /atom/movable/screen/ghost/pai() using.screen_loc = ui_ghost_pai using.hud = src static_inventory += using - using = new /obj/screen/language_menu + using = new /atom/movable/screen/language_menu using.icon = ui_style using.hud = src static_inventory += using diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm index 47ad1117981f2..45ef8d9cf5767 100644 --- a/code/_onclick/hud/guardian.dm +++ b/code/_onclick/hud/guardian.dm @@ -1,18 +1,18 @@ /datum/hud/guardian/New(mob/living/simple_animal/hostile/guardian/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - healths = new /obj/screen/healths/guardian() + healths = new /atom/movable/screen/healths/guardian() healths.hud = src infodisplay += healths - using = new /obj/screen/guardian/Manifest() + using = new /atom/movable/screen/guardian/Manifest() using.screen_loc = ui_hand_position(2) using.hud = src static_inventory += using - using = new /obj/screen/guardian/Recall() + using = new /atom/movable/screen/guardian/Recall() using.screen_loc = ui_hand_position(1) using.hud = src static_inventory += using @@ -22,12 +22,12 @@ using.hud = src static_inventory += using - using = new /obj/screen/guardian/ToggleLight() + using = new /atom/movable/screen/guardian/ToggleLight() using.screen_loc = ui_inventory using.hud = src static_inventory += using - using = new /obj/screen/guardian/Communicate() + using = new /atom/movable/screen/guardian/Communicate() using.screen_loc = ui_back using.hud = src static_inventory += using @@ -35,41 +35,41 @@ /* /datum/hud/dextrous/guardian/New(mob/living/simple_animal/hostile/guardian/owner) //for a dextrous guardian ..() - var/obj/screen/using + var/atom/movable/screen/using if(istype(owner, /mob/living/simple_animal/hostile/guardian/dextrous)) - var/obj/screen/inventory/inv_box + var/atom/movable/screen/inventory/inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "internal storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" inv_box.screen_loc = ui_id - inv_box.slot_id = SLOT_GENERC_DEXTROUS_STORAGE + inv_box.slot_id = ITEM_SLOT_DEX_STORAGE inv_box.hud = src static_inventory += inv_box - using = new /obj/screen/guardian/Communicate() + using = new /atom/movable/screen/guardian/Communicate() using.screen_loc = ui_sstore1 using.hud = src static_inventory += using else - using = new /obj/screen/guardian/Communicate() + using = new /atom/movable/screen/guardian/Communicate() using.screen_loc = ui_id using.hud = src static_inventory += using - healths = new /obj/screen/healths/guardian() + healths = new /atom/movable/screen/healths/guardian() healths.hud = src infodisplay += healths - using = new /obj/screen/guardian/Manifest() + using = new /atom/movable/screen/guardian/Manifest() using.screen_loc = ui_belt using.hud = src static_inventory += using - using = new /obj/screen/guardian/Recall() + using = new /atom/movable/screen/guardian/Recall() using.screen_loc = ui_back using.hud = src static_inventory += using @@ -79,7 +79,7 @@ using.hud = src static_inventory += using - using = new /obj/screen/guardian/ToggleLight() + using = new /atom/movable/screen/guardian/ToggleLight() using.screen_loc = ui_inventory using.hud = src static_inventory += using @@ -101,65 +101,65 @@ ..() */ -/obj/screen/guardian +/atom/movable/screen/guardian icon = 'icons/mob/guardian.dmi' -/obj/screen/guardian/Manifest +/atom/movable/screen/guardian/Manifest icon_state = "manifest" name = "Manifest" desc = "Spring forth into battle!" -/obj/screen/guardian/Manifest/Click() +/atom/movable/screen/guardian/Manifest/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Manifest() -/obj/screen/guardian/Recall +/atom/movable/screen/guardian/Recall icon_state = "recall" name = "Recall" desc = "Return to your user." -/obj/screen/guardian/Recall/Click() +/atom/movable/screen/guardian/Recall/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Recall() -/obj/screen/guardian/ToggleMode +/atom/movable/screen/guardian/ToggleMode icon_state = "toggle" name = "Toggle Mode" desc = "Switch between ability modes." -/obj/screen/guardian/ToggleMode/Click() +/atom/movable/screen/guardian/ToggleMode/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.ToggleMode() -/obj/screen/guardian/ToggleMode/Inactive +/atom/movable/screen/guardian/ToggleMode/Inactive icon_state = "notoggle" //greyed out so it doesn't look like it'll work -/obj/screen/guardian/ToggleMode/Assassin +/atom/movable/screen/guardian/ToggleMode/Assassin icon_state = "stealth" name = "Toggle Stealth" desc = "Enter or exit stealth." -/obj/screen/guardian/Communicate +/atom/movable/screen/guardian/Communicate icon_state = "communicate" name = "Communicate" desc = "Communicate telepathically with your user." -/obj/screen/guardian/Communicate/Click() +/atom/movable/screen/guardian/Communicate/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Communicate() -/obj/screen/guardian/ToggleLight +/atom/movable/screen/guardian/ToggleLight icon_state = "light" name = "Toggle Light" desc = "Glow like star dust." -/obj/screen/guardian/ToggleLight/Click() +/atom/movable/screen/guardian/ToggleLight/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.ToggleLight() diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 97cfbed381a38..d451ff2b9a763 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -25,38 +25,41 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( var/inventory_shown = FALSE //Equipped item inventory var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) - var/obj/screen/ling/chems/lingchemdisplay - var/obj/screen/ling/sting/lingstingdisplay + var/atom/movable/screen/ling/chems/lingchemdisplay + var/atom/movable/screen/ling/sting/lingstingdisplay - var/obj/screen/blobpwrdisplay + var/atom/movable/screen/blobpwrdisplay - var/obj/screen/alien_plasma_display - var/obj/screen/alien_queen_finder + var/atom/movable/screen/alien_plasma_display + var/atom/movable/screen/alien_queen_finder - var/obj/screen/devil/soul_counter/devilsouldisplay + var/atom/movable/screen/devil/soul_counter/devilsouldisplay - var/obj/screen/action_intent - var/obj/screen/zone_select - var/obj/screen/pull_icon - var/obj/screen/rest_icon - var/obj/screen/throw_icon - var/obj/screen/module_store_icon + var/atom/movable/screen/action_intent + var/atom/movable/screen/zone_select + var/atom/movable/screen/pull_icon + var/atom/movable/screen/rest_icon + var/atom/movable/screen/throw_icon + var/atom/movable/screen/module_store_icon var/list/static_inventory = list() //the screen objects which are static var/list/toggleable_inventory = list() //the screen objects which can be hidden - var/list/obj/screen/hotkeybuttons = list() //the buttons that can be used via hotkeys + var/list/atom/movable/screen/hotkeybuttons = list() //the buttons that can be used via hotkeys var/list/infodisplay = list() //the screen objects that display mob info (health, alien plasma, etc...) var/list/screenoverlays = list() //the screen objects used as whole screen overlays (flash, damageoverlay, etc...) - var/list/inv_slots[SLOTS_AMT] // /obj/screen/inventory objects, ordered by their slot ID. - var/list/hand_slots // /obj/screen/inventory/hand objects, assoc list of "[held_index]" = object - var/list/obj/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object - - var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle + var/list/inv_slots[SLOTS_AMT] // /atom/movable/screen/inventory objects, ordered by their slot ID. + var/list/hand_slots // /atom/movable/screen/inventory/hand objects, assoc list of "[held_index]" = object + var/list/atom/movable/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object + ///Assoc list of controller groups, associated with key string group name with value of the plane master controller ref + var/list/atom/movable/plane_master_controller/plane_master_controllers = list() + var/list/team_finder_arrows = list() + + var/atom/movable/screen/movable/action_button/hide_toggle/hide_actions_toggle var/action_buttons_hidden = FALSE - var/obj/screen/healths - var/obj/screen/healthdoll - var/obj/screen/internals + var/atom/movable/screen/healths + var/atom/movable/screen/healthdoll + var/atom/movable/screen/internals // subtypes can override this to force a specific UI style var/ui_style @@ -75,11 +78,16 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( hand_slots = list() - for(var/mytype in subtypesof(/obj/screen/plane_master)) - var/obj/screen/plane_master/instance = new mytype() + for(var/mytype in subtypesof(/atom/movable/screen/plane_master)) + var/atom/movable/screen/plane_master/instance = new mytype() plane_masters["[instance.plane]"] = instance instance.backdrop(mymob) + for(var/mytype in subtypesof(/atom/movable/plane_master_controller)) + var/atom/movable/plane_master_controller/controller_instance = new mytype(src) + plane_master_controllers[controller_instance.name] = controller_instance + + /datum/hud/Destroy() if(mymob.hud_used == src) mymob.hud_used = null @@ -87,6 +95,7 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( QDEL_NULL(hide_actions_toggle) QDEL_NULL(module_store_icon) QDEL_LIST(static_inventory) + QDEL_LIST(team_finder_arrows) inv_slots.Cut() action_intent = null @@ -109,6 +118,7 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( alien_queen_finder = null QDEL_LIST_ASSOC_VAL(plane_masters) + QDEL_LIST_ASSOC_VAL(plane_master_controllers) QDEL_LIST(screenoverlays) mymob = null @@ -152,6 +162,8 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( screenmob.client.screen += hotkeybuttons if(infodisplay.len) screenmob.client.screen += infodisplay + if(team_finder_arrows.len) + screenmob.client.screen += team_finder_arrows screenmob.client.screen += hide_actions_toggle @@ -162,6 +174,8 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( hud_shown = FALSE //Governs behavior of other procs if(static_inventory.len) screenmob.client.screen -= static_inventory + if(team_finder_arrows.len) + screenmob.client.screen += team_finder_arrows if(toggleable_inventory.len) screenmob.client.screen -= toggleable_inventory if(hotkeybuttons.len) @@ -171,7 +185,7 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( //These ones are a part of 'static_inventory', 'toggleable_inventory' or 'hotkeybuttons' but we want them to stay for(var/h in hand_slots) - var/obj/screen/hand = hand_slots[h] + var/atom/movable/screen/hand = hand_slots[h] if(hand) screenmob.client.screen += hand if(action_intent) @@ -188,6 +202,8 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( screenmob.client.screen -= hotkeybuttons if(infodisplay.len) screenmob.client.screen -= infodisplay + if(team_finder_arrows.len) + screenmob.client.screen -= team_finder_arrows hud_version = display_hud_version persistent_inventory_update(screenmob) @@ -209,7 +225,7 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( /datum/hud/proc/plane_masters_update() // Plane masters are always shown to OUR mob, never to observers for(var/thing in plane_masters) - var/obj/screen/plane_master/PM = plane_masters[thing] + var/atom/movable/screen/plane_master/PM = plane_masters[thing] PM.backdrop(mymob) mymob.client.screen += PM @@ -263,13 +279,13 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( //9/10 this is only called once per mob and only for 2 hands /datum/hud/proc/build_hand_slots() for(var/h in hand_slots) - var/obj/screen/inventory/hand/H = hand_slots[h] + var/atom/movable/screen/inventory/hand/H = hand_slots[h] if(H) static_inventory -= H hand_slots = list() - var/obj/screen/inventory/hand/hand_box + var/atom/movable/screen/inventory/hand/hand_box for(var/i in 1 to mymob.held_items.len) - hand_box = new /obj/screen/inventory/hand() + hand_box = new /atom/movable/screen/inventory/hand() hand_box.name = mymob.get_held_index_name(i) hand_box.icon = ui_style hand_box.icon_state = "hand_[mymob.held_index_to_dir(i)]" @@ -281,10 +297,10 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( hand_box.update_icon() var/i = 1 - for(var/obj/screen/swap_hand/SH in static_inventory) + for(var/atom/movable/screen/swap_hand/SH in static_inventory) SH.screen_loc = ui_swaphand_position(mymob,!(i % 2) ? 2: 1) i++ - for(var/obj/screen/human/equip/E in static_inventory) + for(var/atom/movable/screen/human/equip/E in static_inventory) E.screen_loc = ui_equip_position(mymob) if(ismob(mymob) && mymob.hud_used == src) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 20140b49acd2f..047943f9bdef7 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -1,11 +1,11 @@ -/obj/screen/human +/atom/movable/screen/human icon = 'icons/mob/screen_midnight.dmi' -/obj/screen/human/toggle +/atom/movable/screen/human/toggle name = "toggle" icon_state = "toggle" -/obj/screen/human/toggle/Click() +/atom/movable/screen/human/toggle/Click() var/mob/targetmob = usr @@ -23,28 +23,28 @@ targetmob.hud_used.hidden_inventory_update(usr) -/obj/screen/human/equip +/atom/movable/screen/human/equip name = "equip" icon_state = "act_equip" -/obj/screen/human/equip/Click() +/atom/movable/screen/human/equip/Click() if(ismecha(usr.loc)) // stops inventory actions in a mech return 1 var/mob/living/carbon/human/H = usr H.quick_equip() -/obj/screen/devil +/atom/movable/screen/devil invisibility = INVISIBILITY_ABSTRACT -/obj/screen/devil/soul_counter +/atom/movable/screen/devil/soul_counter icon = 'icons/mob/screen_gen.dmi' name = "souls owned" icon_state = "Devil-6" screen_loc = ui_devilsouldisplay -/obj/screen/devil/soul_counter/proc/update_counter(souls = 0) +/atom/movable/screen/devil/soul_counter/proc/update_counter(souls = 0) invisibility = 0 - maptext = "[souls]
"
+ maptext = MAPTEXT("[souls]
")
switch(souls)
if(0,null)
icon_state = "Devil-1"
@@ -59,73 +59,73 @@
else
icon_state = "Devil-6"
-/obj/screen/devil/soul_counter/proc/clear()
+/atom/movable/screen/devil/soul_counter/proc/clear()
invisibility = INVISIBILITY_ABSTRACT
-/obj/screen/ling
+/atom/movable/screen/ling
invisibility = INVISIBILITY_ABSTRACT
-/obj/screen/ling/sting
+/atom/movable/screen/ling/sting
name = "current sting"
screen_loc = ui_lingstingdisplay
-/obj/screen/ling/sting/Click()
+/atom/movable/screen/ling/sting/Click()
if(isobserver(usr))
return
var/mob/living/carbon/U = usr
U.unset_sting()
-/obj/screen/ling/chems
+/atom/movable/screen/ling/chems
name = "chemical storage"
icon_state = "power_display"
screen_loc = ui_lingchemdisplay
/datum/hud/human/New(mob/living/carbon/human/owner)
..()
- owner.overlay_fullscreen("see_through_darkness", /obj/screen/fullscreen/see_through_darkness)
+ owner.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/see_through_darkness)
- var/obj/screen/using
- var/obj/screen/inventory/inv_box
+ var/atom/movable/screen/using
+ var/atom/movable/screen/inventory/inv_box
- using = new/obj/screen/language_menu
+ using = new/atom/movable/screen/language_menu
using.icon = ui_style
static_inventory += using
- using = new /obj/screen/area_creator
+ using = new /atom/movable/screen/area_creator
using.icon = ui_style
static_inventory += using
- action_intent = new /obj/screen/act_intent/segmented
+ action_intent = new /atom/movable/screen/act_intent/segmented
action_intent.icon_state = mymob.a_intent
action_intent.hud = src
static_inventory += action_intent
- using = new /obj/screen/mov_intent
+ using = new /atom/movable/screen/mov_intent
using.icon = ui_style
using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking")
using.screen_loc = ui_movi
using.hud = src
static_inventory += using
- using = new /obj/screen/drop()
+ using = new /atom/movable/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drop_throw
using.hud = src
static_inventory += using
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "i_clothing"
inv_box.icon = ui_style
- inv_box.slot_id = SLOT_W_UNIFORM
+ inv_box.slot_id = ITEM_SLOT_ICLOTHING
inv_box.icon_state = "uniform"
inv_box.screen_loc = ui_iclothing
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "o_clothing"
inv_box.icon = ui_style
- inv_box.slot_id = SLOT_WEAR_SUIT
+ inv_box.slot_id = ITEM_SLOT_OCLOTHING
inv_box.icon_state = "suit"
inv_box.screen_loc = ui_oclothing
inv_box.hud = src
@@ -133,209 +133,209 @@
build_hand_slots()
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_1"
using.screen_loc = ui_swaphand_position(owner,1)
using.hud = src
static_inventory += using
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
using.hud = src
static_inventory += using
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "id"
inv_box.icon = ui_style
inv_box.icon_state = "id"
inv_box.screen_loc = ui_id
- inv_box.slot_id = SLOT_WEAR_ID
+ inv_box.slot_id = ITEM_SLOT_ID
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "mask"
inv_box.icon = ui_style
inv_box.icon_state = "mask"
inv_box.screen_loc = ui_mask
- inv_box.slot_id = SLOT_WEAR_MASK
+ inv_box.slot_id = ITEM_SLOT_MASK
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "neck"
inv_box.icon = ui_style
inv_box.icon_state = "neck"
inv_box.screen_loc = ui_neck
- inv_box.slot_id = SLOT_NECK
+ inv_box.slot_id = ITEM_SLOT_NECK
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "back"
inv_box.icon = ui_style
inv_box.icon_state = "back"
inv_box.screen_loc = ui_back
- inv_box.slot_id = SLOT_BACK
+ inv_box.slot_id = ITEM_SLOT_BACK
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "storage1"
inv_box.icon = ui_style
inv_box.icon_state = "pocket"
inv_box.screen_loc = ui_storage1
- inv_box.slot_id = SLOT_L_STORE
+ inv_box.slot_id = ITEM_SLOT_LPOCKET
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "storage2"
inv_box.icon = ui_style
inv_box.icon_state = "pocket"
inv_box.screen_loc = ui_storage2
- inv_box.slot_id = SLOT_R_STORE
+ inv_box.slot_id = ITEM_SLOT_RPOCKET
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "suit storage"
inv_box.icon = ui_style
inv_box.icon_state = "suit_storage"
inv_box.screen_loc = ui_sstore1
- inv_box.slot_id = SLOT_S_STORE
+ inv_box.slot_id = ITEM_SLOT_SUITSTORE
inv_box.hud = src
static_inventory += inv_box
- using = new /obj/screen/resist()
+ using = new /atom/movable/screen/resist()
using.icon = ui_style
using.screen_loc = ui_above_intent
using.hud = src
hotkeybuttons += using
- using = new /obj/screen/human/toggle()
+ using = new /atom/movable/screen/human/toggle()
using.icon = ui_style
using.screen_loc = ui_inventory
using.hud = src
static_inventory += using
- using = new /obj/screen/human/equip()
+ using = new /atom/movable/screen/human/equip()
using.icon = ui_style
using.screen_loc = ui_equip_position(mymob)
using.hud = src
static_inventory += using
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "gloves"
inv_box.icon = ui_style
inv_box.icon_state = "gloves"
inv_box.screen_loc = ui_gloves
- inv_box.slot_id = SLOT_GLOVES
+ inv_box.slot_id = ITEM_SLOT_GLOVES
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "eyes"
inv_box.icon = ui_style
inv_box.icon_state = "glasses"
inv_box.screen_loc = ui_glasses
- inv_box.slot_id = SLOT_GLASSES
+ inv_box.slot_id = ITEM_SLOT_EYES
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "ears"
inv_box.icon = ui_style
inv_box.icon_state = "ears"
inv_box.screen_loc = ui_ears
- inv_box.slot_id = SLOT_EARS
+ inv_box.slot_id = ITEM_SLOT_EARS
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "head"
inv_box.icon = ui_style
inv_box.icon_state = "head"
inv_box.screen_loc = ui_head
- inv_box.slot_id = SLOT_HEAD
+ inv_box.slot_id = ITEM_SLOT_HEAD
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "shoes"
inv_box.icon = ui_style
inv_box.icon_state = "shoes"
inv_box.screen_loc = ui_shoes
- inv_box.slot_id = SLOT_SHOES
+ inv_box.slot_id = ITEM_SLOT_FEET
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "belt"
inv_box.icon = ui_style
inv_box.icon_state = "belt"
// inv_box.icon_full = "template_small"
inv_box.screen_loc = ui_belt
- inv_box.slot_id = SLOT_BELT
+ inv_box.slot_id = ITEM_SLOT_BELT
inv_box.hud = src
static_inventory += inv_box
- throw_icon = new /obj/screen/throw_catch()
+ throw_icon = new /atom/movable/screen/throw_catch()
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
throw_icon.hud = src
hotkeybuttons += throw_icon
- rest_icon = new /obj/screen/rest()
+ rest_icon = new /atom/movable/screen/rest()
rest_icon.icon = ui_style
rest_icon.screen_loc = ui_above_movement
rest_icon.hud = src
static_inventory += rest_icon
- internals = new /obj/screen/internals()
+ internals = new /atom/movable/screen/internals()
internals.hud = src
infodisplay += internals
- healths = new /obj/screen/healths()
+ healths = new /atom/movable/screen/healths()
healths.hud = src
infodisplay += healths
- healthdoll = new /obj/screen/healthdoll()
+ healthdoll = new /atom/movable/screen/healthdoll()
healthdoll.hud = src
infodisplay += healthdoll
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_above_intent
pull_icon.hud = src
static_inventory += pull_icon
- lingchemdisplay = new /obj/screen/ling/chems()
+ lingchemdisplay = new /atom/movable/screen/ling/chems()
lingchemdisplay.hud = src
infodisplay += lingchemdisplay
- lingstingdisplay = new /obj/screen/ling/sting()
+ lingstingdisplay = new /atom/movable/screen/ling/sting()
lingstingdisplay.hud = src
infodisplay += lingstingdisplay
- devilsouldisplay = new /obj/screen/devil/soul_counter
+ devilsouldisplay = new /atom/movable/screen/devil/soul_counter
devilsouldisplay.hud = src
infodisplay += devilsouldisplay
- zone_select = new /obj/screen/zone_sel()
+ zone_select = new /atom/movable/screen/zone_sel()
zone_select.icon = ui_style
zone_select.update_icon()
zone_select.hud = src
static_inventory += zone_select
- for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
+ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
- inv_slots[inv.slot_id] = inv
+ inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
inv.update_icon()
update_locked_slots()
@@ -347,7 +347,7 @@
if(!istype(H) || !H.dna.species)
return
var/datum/species/S = H.dna.species
- for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
+ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
if(inv.slot_id in S.no_equip)
inv.alpha = 128
diff --git a/code/_onclick/hud/lavaland_elite.dm b/code/_onclick/hud/lavaland_elite.dm
index 480e0e398e0b1..81cbb4174827e 100644
--- a/code/_onclick/hud/lavaland_elite.dm
+++ b/code/_onclick/hud/lavaland_elite.dm
@@ -3,5 +3,5 @@
/datum/hud/lavaland_elite/New(mob/living/simple_animal/hostile/asteroid/elite)
..()
- healths = new /obj/screen/healths/lavaland_elite()
+ healths = new /atom/movable/screen/healths/lavaland_elite()
infodisplay += healths
diff --git a/code/_onclick/hud/map_popups.dm b/code/_onclick/hud/map_popups.dm
index dc9e255cba931..3766b74dd39b3 100644
--- a/code/_onclick/hud/map_popups.dm
+++ b/code/_onclick/hud/map_popups.dm
@@ -3,11 +3,11 @@
* Assoc list with all the active maps - when a screen obj is added to
* a map, it's put in here as well.
*
- * Format: list(The spare ID can be found in its dedicated safe on the bridge." + +/datum/controller/subsystem/job/proc/promote_to_captain(var/mob/dead/new_player/new_captain, acting_captain = FALSE) + var/mob/living/carbon/human/H = new_captain.new_character + if(!new_captain) + CRASH("Cannot promote [new_captain.ckey], there is no new_character attached to him.") + + if(!spare_id_safe_code) + CRASH("Cannot promote [H.real_name] to Captain, there is no spare_id_safe_code.") + + var/paper = new /obj/item/paper/fluff/spare_id_safe_code(H.loc) + var/list/slots = list( + "in your left pocket" = ITEM_SLOT_LPOCKET, + "in your right pocket" = ITEM_SLOT_RPOCKET, + "in your backpack" = ITEM_SLOT_BACKPACK, + "in your hands" = ITEM_SLOT_HANDS + ) + var/where = H.equip_in_one_of_slots(paper, slots, FALSE) || "at your feet" + + if(acting_captain) + to_chat(new_captain, "Due to your position in the chain of command, you have been granted access to captain's spare ID. You can find in important note about this [where].") + else + to_chat(new_captain, "You can find the code to obtain your spare ID from the secure safe on the Bridge [where].") + + // Force-give their ID card bridge access. + if(H.wear_id?.GetID()) + var/obj/item/card/id/id_card = H.wear_id + if(!(ACCESS_HEADS in id_card.access)) + LAZYADD(id_card.access, ACCESS_HEADS) diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index ab16a633819fe..98fe2315455c8 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -9,8 +9,15 @@ SUBSYSTEM_DEF(lighting) flags = SS_TICKER /datum/controller/subsystem/lighting/stat_entry() - ..("L:[GLOB.lighting_update_lights.len]|C:[GLOB.lighting_update_corners.len]|O:[GLOB.lighting_update_objects.len]") - + . = ..("L:[GLOB.lighting_update_lights.len]|C:[GLOB.lighting_update_corners.len]|O:[GLOB.lighting_update_objects.len]") + +/datum/controller/subsystem/lighting/get_metrics() + . = ..() + var/list/cust = list() + cust["sources_queue"] = length(GLOB.lighting_update_lights) + cust["corners_queue"] = length(GLOB.lighting_update_corners) + cust["objects_queue"] = length(GLOB.lighting_update_objects) + .["custom"] = cust /datum/controller/subsystem/lighting/Initialize(timeofday) if(!initialized) diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm index c4b09d1b87410..e382e07b0842e 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -2,6 +2,7 @@ SUBSYSTEM_DEF(machines) name = "Machines" init_order = INIT_ORDER_MACHINES flags = SS_KEEP_TIMING + wait = 2 SECONDS var/list/processing = list() var/list/currentrun = list() var/list/powernets = list() @@ -11,6 +12,13 @@ SUBSYSTEM_DEF(machines) fire() return ..() + +/datum/controller/subsystem/machines/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust + /datum/controller/subsystem/machines/proc/makepowernets() for(var/datum/powernet/PN in powernets) qdel(PN) @@ -23,7 +31,7 @@ SUBSYSTEM_DEF(machines) propagate_network(PC,PC.powernet) /datum/controller/subsystem/machines/stat_entry() - ..("M:[processing.len]|PN:[powernets.len]") + . = ..("M:[processing.len]|PN:[powernets.len]") /datum/controller/subsystem/machines/fire(resumed = 0) @@ -35,11 +43,10 @@ SUBSYSTEM_DEF(machines) //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun - var/seconds = wait * 0.1 while(currentrun.len) var/obj/machinery/thing = currentrun[currentrun.len] currentrun.len-- - if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL) + if(!QDELETED(thing) && thing.process(wait * 0.1) != PROCESS_KILL) if(thing.use_power) thing.auto_use_power() //add back the power state else diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 8b398130c03e8..93c8f9de00e1a 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -1,3 +1,5 @@ +//#define FORCE_MAP "_maps/boxstation.json" + SUBSYSTEM_DEF(mapping) name = "Mapping" init_order = INIT_ORDER_MAPPING @@ -19,7 +21,9 @@ SUBSYSTEM_DEF(mapping) var/list/shuttle_templates = list() var/list/shelter_templates = list() + var/list/random_room_templates = list() + var/list/holodeck_templates = list() var/list/areas_in_z = list() @@ -28,6 +32,10 @@ SUBSYSTEM_DEF(mapping) var/list/datum/turf_reservations //list of turf reservations var/list/used_turfs = list() //list of turf = datum/turf_reservation + ///All possible biomes in assoc list as type || instance + var/list/biomes = list() + + var/clearing_reserved_turfs = FALSE // Z-manager stuff @@ -57,19 +65,21 @@ SUBSYSTEM_DEF(mapping) if(!config || config.defaulted) to_chat(world, "Unable to load next or default map config, defaulting to Box Station") config = old_config + initialize_biomes() loadWorld() repopulate_sorted_areas() process_teleport_locs() //Sets up the wizard teleport locations preloadTemplates() + #ifndef LOWMEMORYMODE // Create space ruin levels while (space_levels_so_far < config.space_ruin_levels) ++space_levels_so_far - add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE) + LAZYADD(SSzclear.free_levels, add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE, orbital_body_type = null)) // and one level with no ruins for (var/i in 1 to config.space_empty_levels) ++space_levels_so_far - empty_space = add_new_zlevel("Empty Area [space_levels_so_far]", list(ZTRAIT_LINKAGE = CROSSLINKED)) + empty_space = add_new_zlevel("Empty Area [space_levels_so_far]", list(ZTRAIT_LINKAGE = CROSSLINKED), orbital_body_type = /datum/orbital_object/z_linked/beacon/weak) // and the transit level transit = add_new_zlevel("Transit/Reserved", list(ZTRAIT_RESERVED = TRUE)) @@ -90,13 +100,10 @@ SUBSYSTEM_DEF(mapping) seedRuins(lava_ruins, CONFIG_GET(number/lavaland_budget), /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates) for (var/lava_z in lava_ruins) spawn_rivers(lava_z) - - // Generate deep space ruins - var/list/space_ruins = levels_by_trait(ZTRAIT_SPACE_RUINS) - if (space_ruins.len) - seedRuins(space_ruins, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates) loading_ruins = FALSE #endif + // Run map generation after ruin generation to prevent issues + run_map_generation() repopulate_sorted_areas() // Set up Z-level transitions. setup_map_transitions() @@ -134,7 +141,7 @@ SUBSYSTEM_DEF(mapping) qdel(T, TRUE) /* Nuke threats, for making the blue tiles on the station go RED - Used by the AI doomsday and the self destruct nuke. + Used by the AI doomsday and the self-destruct nuke. */ /datum/controller/subsystem/mapping/proc/add_nuke_threat(datum/nuke) @@ -167,6 +174,7 @@ SUBSYSTEM_DEF(mapping) unused_turfs = SSmapping.unused_turfs turf_reservations = SSmapping.turf_reservations used_turfs = SSmapping.used_turfs + holodeck_templates = SSmapping.holodeck_templates config = SSmapping.config next_map_config = SSmapping.next_map_config @@ -176,7 +184,7 @@ SUBSYSTEM_DEF(mapping) z_list = SSmapping.z_list #define INIT_ANNOUNCE(X) to_chat(world, "[X]"); log_world(X) -/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) +/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, orbital_body_type) . = list() var/start_time = REALTIMEOFDAY @@ -209,15 +217,22 @@ SUBSYSTEM_DEF(mapping) // preload the relevant space_level datums var/start_z = world.maxz + 1 var/i = 0 + var/list/datum/space_level/space_levels = list() for (var/level in traits) - add_new_zlevel("[name][i ? " [i + 1]" : ""]", level) + space_levels += add_new_zlevel("[name][i ? " [i + 1]" : ""]", level) ++i + //Shared orbital body + var/datum/orbital_object/z_linked/orbital_body = new orbital_body_type() + for(var/datum/space_level/level as() in space_levels) + level.orbital_body = orbital_body + orbital_body.link_to_z(level) // load the maps for (var/P in parsed_maps) var/datum/parsed_map/pm = P if (!pm.load(1, 1, start_z + parsed_maps[P], no_changeturf = TRUE)) errorList |= pm.original_path + if(!silent) INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!") return parsed_maps @@ -232,7 +247,7 @@ SUBSYSTEM_DEF(mapping) // load the station station_start = world.maxz + 1 INIT_ANNOUNCE("Loading [config.map_name]...") - LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION) + LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION, orbital_body_type = /datum/orbital_object/z_linked/station) if(SSdbcore.Connect()) var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery({" @@ -245,11 +260,11 @@ SUBSYSTEM_DEF(mapping) // TODO: remove this when the DB is prepared for the z-levels getting reordered while (world.maxz < (5 - 1) && space_levels_so_far < config.space_ruin_levels) ++space_levels_so_far - add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE) + LAZYADD(SSzclear.free_levels, add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE, orbital_body_type = null)) // load mining if(config.minetype == "lavaland") - LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND) + LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND, orbital_body_type = /datum/orbital_object/z_linked/lavaland) else if (!isnull(config.minetype)) INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!") #endif @@ -267,10 +282,10 @@ GLOBAL_LIST_EMPTY(the_station_areas) /datum/controller/subsystem/mapping/proc/generate_station_area_list() var/list/station_areas_blacklist = typecacheof(list(/area/space, /area/mine, /area/ruin, /area/asteroid/nearstation)) - for(var/area/A in world) + for(var/area/A in GLOB.sortedAreas) if (is_type_in_typecache(A, station_areas_blacklist)) continue - if (!A.contents.len || !A.unique) + if (!A.contents.len || !(A.area_flags & UNIQUE_AREA)) continue var/turf/picked = A.contents[1] if (is_station_level(picked.z)) @@ -279,6 +294,10 @@ GLOBAL_LIST_EMPTY(the_station_areas) if(!GLOB.the_station_areas.len) log_world("ERROR: Station areas list failed to generate!") +/datum/controller/subsystem/mapping/proc/run_map_generation() + for(var/area/A in world) + A.RunGeneration() + /datum/controller/subsystem/mapping/proc/maprotate() if(map_voted) map_voted = FALSE @@ -352,6 +371,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) preloadShuttleTemplates() preloadShelterTemplates() preloadRandomRoomTemplates() + preloadHolodeckTemplates() /datum/controller/subsystem/mapping/proc/preloadRandomRoomTemplates() for(var/item in subtypesof(/datum/map_template/random_room)) @@ -386,7 +406,8 @@ GLOBAL_LIST_EMPTY(the_station_areas) space_ruins_templates[R.name] = R /datum/controller/subsystem/mapping/proc/preloadShuttleTemplates() - var/list/unbuyable = generateMapList("[global.config.directory]/unbuyableshuttles.txt") + var/list/unbuyable = generateMapList("[global.config.directory]/shuttles_unbuyable.txt") + var/list/illegal = generateMapList("[global.config.directory]/shuttles_illegal.txt") for(var/item in subtypesof(/datum/map_template/shuttle)) var/datum/map_template/shuttle/shuttle_type = item @@ -396,6 +417,8 @@ GLOBAL_LIST_EMPTY(the_station_areas) var/datum/map_template/shuttle/S = new shuttle_type() if(unbuyable.Find(S.mappath)) S.can_be_bought = FALSE + if(illegal.Find(S.mappath)) + S.illegal_shuttle = TRUE shuttle_templates[S.shuttle_id] = S map_templates[S.shuttle_id] = S @@ -410,6 +433,15 @@ GLOBAL_LIST_EMPTY(the_station_areas) shelter_templates[S.shelter_id] = S map_templates[S.shelter_id] = S +/datum/controller/subsystem/mapping/proc/preloadHolodeckTemplates() + for(var/item in subtypesof(/datum/map_template/holodeck)) + var/datum/map_template/holodeck/holodeck_type = item + if(!(initial(holodeck_type.mappath))) + continue + var/datum/map_template/holodeck/holo_template = new holodeck_type() + + holodeck_templates[holo_template.template_id] = holo_template + //Manual loading of away missions. /client/proc/admin_away() set name = "Load Away Mission" @@ -530,7 +562,10 @@ GLOBAL_LIST_EMPTY(the_station_areas) used_turfs.Cut() reserve_turfs(clearing) - +/datum/controller/subsystem/mapping/proc/initialize_biomes() + for(var/biome_path in subtypesof(/datum/biome)) + var/datum/biome/biome_instance = new biome_path() + biomes[biome_path] += biome_instance /datum/controller/subsystem/mapping/proc/reg_in_areas_in_z(list/areas) for(var/B in areas) diff --git a/code/controllers/subsystem/metrics.dm b/code/controllers/subsystem/metrics.dm new file mode 100644 index 0000000000000..0c9f2dfd27572 --- /dev/null +++ b/code/controllers/subsystem/metrics.dm @@ -0,0 +1,63 @@ +/* + + Ok listen up + + This thing ingests data to ElasticSearch in a VERY SPECIFIC FORMAT + Not only is changing this a very bad idea due to elasticsearch being very finnicky with data formatting, + but if you edit this subsystem and its fields, you invalidate a lot of existing data + + Dont touch this shit without speaking to crossed or AA07 first + +*/ +SUBSYSTEM_DEF(metrics) + name = "Metrics" + wait = 30 SECONDS + runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // ALL THE LEVELS + flags = SS_KEEP_TIMING // This needs to ingest every 30 IRL seconds, not ingame seconds. + /// The real time of day the server started. Used to calculate time drift + var/world_init_time = 0 // Not set in here. Set in world/New() + +/datum/controller/subsystem/metrics/Initialize(start_timeofday) + if(!CONFIG_GET(flag/elasticsearch_metrics_enabled)) + flags |= SS_NO_FIRE // Disable firing to save CPU + return ..() + + +/datum/controller/subsystem/metrics/fire(resumed) + var/datum/http_request/request = new() + request.prepare(RUSTG_HTTP_METHOD_POST, CONFIG_GET(string/elasticsearch_metrics_endpoint), get_metrics_json(), list( + "Authorization" = "ApiKey [CONFIG_GET(string/elasticsearch_metrics_apikey)]", + "Content-Type" = "application/json" + )) + request.begin_async() // Fire and forget who gives a shit + +/datum/controller/subsystem/metrics/proc/get_metrics_json() + var/list/out = list() + out["@timestamp"] = iso_timestamp() // This is required by ElasticSearch, complete with this name. DO NOT REMOVE THIS. + out["cpu"] = world.cpu + out["maptick"] = world.map_cpu + out["elapsed_processed"] = world.time + out["elapsed_real"] = (REALTIMEOFDAY - world_init_time) + out["client_count"] = length(GLOB.clients) + out["round_id"] = text2num(GLOB.round_id) // This is so we can filter the metrics by a single round ID + + var/server_name = CONFIG_GET(string/serversqlname) + if(server_name) + out["server_name"] = server_name + + // Funnel in all SS metrics + var/list/ss_data = list() + for(var/datum/controller/subsystem/SS in Master.subsystems) + ss_data[SS.ss_id] = SS.get_metrics() + + out["subsystems"] = ss_data + // And send it all + return json_encode(out) + +/* + +// Uncomment this if you add new metrics to verify how the JSON formats + +/client/verb/debug_metrics() + usr << browse(SSmetrics.get_metrics_json(), "window=aadebug") +*/ diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index f783aca919693..c91afcdf7aa9d 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -3,14 +3,23 @@ SUBSYSTEM_DEF(mobs) priority = FIRE_PRIORITY_MOBS flags = SS_KEEP_TIMING | SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + wait = 2 SECONDS var/list/currentrun = list() var/static/list/clients_by_zlevel[][] var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when z2 is created and new_players can login before that. var/static/list/cubemonkeys = list() + var/datum/spawners_menu/spawner_menu + /datum/controller/subsystem/mobs/stat_entry() - ..("P:[GLOB.mob_living_list.len]") + . = ..("P:[GLOB.mob_living_list.len]") + +/datum/controller/subsystem/mobs/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(GLOB.mob_living_list) + .["custom"] = cust /datum/controller/subsystem/mobs/proc/MaxZChanged() if (!islist(clients_by_zlevel)) @@ -22,8 +31,7 @@ SUBSYSTEM_DEF(mobs) dead_players_by_zlevel.len++ dead_players_by_zlevel[dead_players_by_zlevel.len] = list() -/datum/controller/subsystem/mobs/fire(resumed = 0) - var/seconds = wait * 0.1 +/datum/controller/subsystem/mobs/fire(resumed = FALSE) if (!resumed) src.currentrun = GLOB.mob_living_list.Copy() @@ -47,7 +55,7 @@ SUBSYSTEM_DEF(mobs) break var/msg = "[ADMIN_LOOKUPFLW(M)] was found to have no .loc with an attached client, if the cause is unknown it would be wise to ask how this was accomplished." message_admins(msg) - send2irc_adminless_only("Mob", msg, R_ADMIN) + send2tgs_adminless_only("Mob", msg, R_ADMIN) log_game("[key_name(M)] was found to have no .loc with an attached client.") // This is a temporary error tracker to make sure we've caught everything @@ -62,8 +70,13 @@ SUBSYSTEM_DEF(mobs) var/mob/living/L = currentrun[currentrun.len] currentrun.len-- if(L) - L.Life(seconds, times_fired) + L.Life(wait * 0.1, times_fired) else GLOB.mob_living_list.Remove(L) if (MC_TICK_CHECK) return + +/datum/controller/subsystem/mobs/proc/update_spawners() + if(!spawner_menu) + return + spawner_menu.ui_update() diff --git a/code/controllers/subsystem/moods.dm b/code/controllers/subsystem/moods.dm index f6b6ffcb40453..20111747bdb2d 100644 --- a/code/controllers/subsystem/moods.dm +++ b/code/controllers/subsystem/moods.dm @@ -2,3 +2,4 @@ PROCESSING_SUBSYSTEM_DEF(mood) name = "Mood" flags = SS_NO_INIT | SS_BACKGROUND priority = 20 + wait = 1 SECONDS diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index ec416a3632900..8bae5bcec617b 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -28,6 +28,11 @@ SUBSYSTEM_DEF(nightshift) var/announcing = TRUE var/time = station_time() var/night_time = (time < nightshift_end_time) || (time > nightshift_start_time) + if(!SSmapping.config.allow_night_lighting) + if(night_time) + night_time = FALSE + update_nightshift(night_time, FALSE) + return if(high_security_mode != emergency) high_security_mode = emergency if(night_time) @@ -35,7 +40,7 @@ SUBSYSTEM_DEF(nightshift) if(!emergency) announce("Restoring night lighting configuration to normal operation.") else - announce("Disabling night lighting: Station is in a state of emergency.") + announce("Disabling night lighting: Station is in a state of emergency.") if(emergency) night_time = FALSE if(nightshift_active != night_time) diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index 611ca56b1d6a4..5ce747e717064 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(npcpool) /datum/controller/subsystem/npcpool/stat_entry() var/list/activelist = GLOB.simple_animals[AI_ON] - ..("NPCS:[activelist.len]") + . = ..("NPCS:[activelist.len]") /datum/controller/subsystem/npcpool/fire(resumed = FALSE) @@ -23,6 +23,11 @@ SUBSYSTEM_DEF(npcpool) var/mob/living/simple_animal/SA = currentrun[currentrun.len] --currentrun.len + if(!SA) + stack_trace("Null entry found at GLOB.simple_animals\[AI_ON\]. Null entries will be purged. Yell at coderbus. Subsystem will try to continue.") + removeNullsFromList(GLOB.simple_animals[AI_ON]) + continue + if(!SA.ckey && !SA.notransform) if(SA.stat != DEAD) SA.handle_automated_movement() @@ -31,11 +36,6 @@ SUBSYSTEM_DEF(npcpool) if(SA.stat != DEAD) SA.handle_automated_speech() if(SA.special_process) - var/mob/living/simple_animal/slime/S = SA - if(istype(S)) - S.special_process = FALSE - S.AIprocess() - else - SA.process() + SA.process() if (MC_TICK_CHECK) return diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index b7c424fb84122..535cc71a0d9b6 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(overlays) /datum/controller/subsystem/overlays/stat_entry() - ..("Ov:[length(queue)]") + . = ..("Ov:[length(queue)]") /datum/controller/subsystem/overlays/Shutdown() diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 8edcf8fd1192e..a0cda6a09f075 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -141,6 +141,9 @@ SUBSYSTEM_DEF(pai) return FALSE /datum/controller/subsystem/pai/proc/findPAI(obj/item/paicard/p, mob/user) + if(!(GLOB.ghost_role_flags & GHOSTROLE_SILICONS)) + to_chat(user, "Due to growing incidents of SELF corrupted independent artificial intelligences, freeform personality devices have been temporarily banned in this sector.") + return if(!ghost_spam) ghost_spam = TRUE for(var/mob/dead/observer/G in GLOB.player_list) diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index af5b13cea669f..492b41a915f63 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(parallax) /datum/controller/subsystem/parallax/PreInit() . = ..() if(prob(70)) //70% chance to pick a special extra layer - random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids) + random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids) random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color. planet_y_offset = rand(100, 160) planet_x_offset = rand(100, 160) diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm index 8e1cf946ae19d..26f54245732e1 100644 --- a/code/controllers/subsystem/pathfinder.dm +++ b/code/controllers/subsystem/pathfinder.dm @@ -3,13 +3,11 @@ SUBSYSTEM_DEF(pathfinder) init_order = INIT_ORDER_PATH flags = SS_NO_FIRE var/datum/flowcache/mobs - var/datum/flowcache/circuits var/static/space_type_cache /datum/controller/subsystem/pathfinder/Initialize() space_type_cache = typecacheof(/turf/open/space) mobs = new(10) - circuits = new(3) return ..() /datum/flowcache @@ -18,7 +16,7 @@ SUBSYSTEM_DEF(pathfinder) var/free var/list/flow -/datum/flowcache/New(var/n) +/datum/flowcache/New(n) . = ..() lcount = n run = 0 diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index c7f33c232531d..3bd76a94d1306 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -13,7 +13,9 @@ SUBSYSTEM_DEF(persistence) var/list/antag_rep_change = list() var/list/picture_logging_information = list() var/list/obj/structure/sign/picture_frame/photo_frames + var/list/obj/structure/sign/painting/painting_frames = list() var/list/obj/item/storage/photo_album/photo_albums + var/list/paintings = list() /datum/controller/subsystem/persistence/Initialize() LoadPoly() @@ -23,6 +25,7 @@ SUBSYSTEM_DEF(persistence) LoadPhotoPersistence() if(CONFIG_GET(flag/use_antag_rep)) LoadAntagReputation() + LoadPaintings() return ..() /datum/controller/subsystem/persistence/proc/LoadPoly() @@ -127,7 +130,7 @@ SUBSYSTEM_DEF(persistence) var/list/chosen_trophy = trophy_data - if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed + if(!chosen_trophy || !length(chosen_trophy)) //Malformed continue var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null @@ -146,6 +149,7 @@ SUBSYSTEM_DEF(persistence) SavePhotoPersistence() //THIS IS PERSISTENCE, NOT THE LOGGING PORTION. if(CONFIG_GET(flag/use_antag_rep)) CollectAntagReputation() + SavePaintings() /datum/controller/subsystem/persistence/proc/GetPhotoAlbums() var/album_path = file("data/photo_albums.json") @@ -282,3 +286,18 @@ SUBSYSTEM_DEF(persistence) fdel(FILE_ANTAG_REP) rustg_file_append(json_encode(antag_rep), FILE_ANTAG_REP) +/datum/controller/subsystem/persistence/proc/LoadPaintings() + var/json_file = file("data/paintings.json") + if(fexists(json_file)) + paintings = json_decode(file2text(json_file)) + + for(var/obj/structure/sign/painting/P in painting_frames) + P.load_persistent() + +/datum/controller/subsystem/persistence/proc/SavePaintings() + for(var/obj/structure/sign/painting/P in painting_frames) + P.save_persistent() + + var/json_file = file("data/paintings.json") + fdel(json_file) + WRITE_FILE(json_file, json_encode(paintings)) diff --git a/code/controllers/subsystem/processing/ai_basic_avoidance.dm b/code/controllers/subsystem/processing/ai_basic_avoidance.dm new file mode 100644 index 0000000000000..2a3fe992f4473 --- /dev/null +++ b/code/controllers/subsystem/processing/ai_basic_avoidance.dm @@ -0,0 +1,4 @@ +PROCESSING_SUBSYSTEM_DEF(basic_avoidance) + name = "Basic Avoidance" + flags = SS_NO_INIT + wait = 2 SECONDS diff --git a/code/controllers/subsystem/processing/ai_behaviors.dm b/code/controllers/subsystem/processing/ai_behaviors.dm new file mode 100644 index 0000000000000..4c98567405cc4 --- /dev/null +++ b/code/controllers/subsystem/processing/ai_behaviors.dm @@ -0,0 +1,20 @@ +/// The subsystem used to tick [/datum/ai_behavior] instances. Handling the individual actions an AI can take like punching someone in the fucking NUTS +PROCESSING_SUBSYSTEM_DEF(ai_behaviors) + name = "AI Behavior Ticker" + flags = SS_POST_FIRE_TIMING|SS_BACKGROUND + priority = FIRE_PRIORITY_NPC_ACTIONS + runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + init_order = INIT_ORDER_AI_CONTROLLERS + wait = 1 + ///List of all ai_behavior singletons, key is the typepath while assigned value is a newly created instance of the typepath. See SetupAIBehaviors() + var/list/ai_behaviors + +/datum/controller/subsystem/processing/ai_behaviors/Initialize(timeofday) + SetupAIBehaviors() + return ..() + +/datum/controller/subsystem/processing/ai_behaviors/proc/SetupAIBehaviors() + ai_behaviors = list() + for(var/behavior_type in subtypesof(/datum/ai_behavior)) + var/datum/ai_behavior/ai_behavior = new behavior_type + ai_behaviors[behavior_type] = ai_behavior diff --git a/code/controllers/subsystem/processing/ai_controllers.dm b/code/controllers/subsystem/processing/ai_controllers.dm new file mode 100644 index 0000000000000..5319d7316fb9b --- /dev/null +++ b/code/controllers/subsystem/processing/ai_controllers.dm @@ -0,0 +1,33 @@ +/// The subsystem used to tick [/datum/ai_controllers] instances. Handling the re-checking of plans. +SUBSYSTEM_DEF(ai_controllers) + name = "AI Controller Ticker" + flags = SS_POST_FIRE_TIMING|SS_BACKGROUND + priority = FIRE_PRIORITY_NPC + runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + init_order = INIT_ORDER_AI_CONTROLLERS + wait = 0.5 SECONDS //Plan every half second if required, not great not terrible. + + ///List of all ai_subtree singletons, key is the typepath while assigned value is a newly created instance of the typepath. See setup_subtrees() + var/list/ai_subtrees = list() + ///List of all ai controllers currently running + var/list/active_ai_controllers = list() + +/datum/controller/subsystem/ai_controllers/Initialize(timeofday) + setup_subtrees() + return ..() + +/datum/controller/subsystem/ai_controllers/proc/setup_subtrees() + ai_subtrees = list() + for(var/subtree_type in subtypesof(/datum/ai_planning_subtree)) + var/datum/ai_planning_subtree/subtree = new subtree_type + ai_subtrees[subtree_type] = subtree + +/datum/controller/subsystem/ai_controllers/fire(resumed) + for(var/datum/ai_controller/ai_controller as anything in active_ai_controllers) + if(!COOLDOWN_FINISHED(ai_controller, failed_planning_cooldown)) + continue + + if(!LAZYLEN(ai_controller.current_behaviors)) + ai_controller.SelectBehaviors(wait * 0.1) + if(!LAZYLEN(ai_controller.current_behaviors)) //Still no plan + COOLDOWN_START(ai_controller, failed_planning_cooldown, AI_FAILED_PLANNING_COOLDOWN) diff --git a/code/controllers/subsystem/processing/ai_movement.dm b/code/controllers/subsystem/processing/ai_movement.dm new file mode 100644 index 0000000000000..6a6d64548ca78 --- /dev/null +++ b/code/controllers/subsystem/processing/ai_movement.dm @@ -0,0 +1,21 @@ +/// The subsystem used to tick [/datum/ai_movement] instances. Handling the movement of individual AI instances +PROCESSING_SUBSYSTEM_DEF(ai_movement) + name = "AI movement" + flags = SS_KEEP_TIMING|SS_BACKGROUND + priority = FIRE_PRIORITY_NPC_MOVEMENT + runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + init_order = INIT_ORDER_AI_MOVEMENT + wait = 1 + + ///an assoc list of all ai_movement types. Assoc type to instance + var/list/movement_types + +/datum/controller/subsystem/processing/ai_movement/Initialize(timeofday) + SetupAIMovementInstances() + return ..() + +/datum/controller/subsystem/processing/ai_movement/proc/SetupAIMovementInstances() + movement_types = list() + for(var/key as anything in subtypesof(/datum/ai_movement)) + var/datum/ai_movement/ai_movement = new key + movement_types[key] = ai_movement diff --git a/code/controllers/subsystem/processing/circuit.dm b/code/controllers/subsystem/processing/circuit.dm deleted file mode 100644 index 96bf274fd26ee..0000000000000 --- a/code/controllers/subsystem/processing/circuit.dm +++ /dev/null @@ -1,91 +0,0 @@ -PROCESSING_SUBSYSTEM_DEF(circuit) - name = "Circuit" - stat_tag = "CIR" - init_order = INIT_ORDER_CIRCUIT - flags = NONE - - var/cipherkey - - var/list/all_components = list() // Associative list of [component_name]:[component_path] pairs - var/list/cached_components = list() // Associative list of [component_path]:[component] pairs - var/list/all_assemblies = list() // Associative list of [assembly_name]:[assembly_path] pairs - var/list/cached_assemblies = list() // Associative list of [assembly_path]:[assembly] pairs - var/list/all_circuits = list() // Associative list of [circuit_name]:[circuit_path] pairs - var/list/circuit_fabricator_recipe_list = list() // Associative list of [category_name]:[list_of_circuit_paths] pairs - var/cost_multiplier = MINERAL_MATERIAL_AMOUNT / 10 // Each circuit cost unit is 200cm3 - -/datum/controller/subsystem/processing/circuit/Initialize(start_timeofday) - SScircuit.cipherkey = uppertext(random_string(2000+rand(0,10), GLOB.alphabet)) - circuits_init() - return ..() - -/datum/controller/subsystem/processing/circuit/proc/circuits_init() - //Cached lists for free performance - for(var/path in typesof(/obj/item/integrated_circuit)) - var/obj/item/integrated_circuit/IC = path - var/name = initial(IC.name) - all_components[name] = path // Populating the component lists - cached_components[IC] = new path - - if(!(initial(IC.spawn_flags) & (IC_SPAWN_DEFAULT | IC_SPAWN_RESEARCH))) - continue - - var/category = initial(IC.category_text) - if(!circuit_fabricator_recipe_list[category]) - circuit_fabricator_recipe_list[category] = list() - var/list/category_list = circuit_fabricator_recipe_list[category] - category_list += IC // Populating the fabricator categories - - for(var/path in typesof(/obj/item/electronic_assembly)) - var/obj/item/electronic_assembly/A = path - var/name = initial(A.name) - all_assemblies[name] = path - cached_assemblies[A] = new path - - - circuit_fabricator_recipe_list["Assemblies"] = list( - /obj/item/electronic_assembly/default, - /obj/item/electronic_assembly/calc, - /obj/item/electronic_assembly/clam, - /obj/item/electronic_assembly/simple, - /obj/item/electronic_assembly/hook, - /obj/item/electronic_assembly/pda, - /obj/item/electronic_assembly/small/default, - /obj/item/electronic_assembly/small/cylinder, - /obj/item/electronic_assembly/small/scanner, - /obj/item/electronic_assembly/small/hook, - /obj/item/electronic_assembly/small/box, - /obj/item/electronic_assembly/medium/default, - /obj/item/electronic_assembly/medium/box, - /obj/item/electronic_assembly/medium/clam, - /obj/item/electronic_assembly/medium/medical, - /obj/item/electronic_assembly/medium/gun, - /obj/item/electronic_assembly/medium/radio, - /obj/item/electronic_assembly/large/default, - /obj/item/electronic_assembly/large/scope, - /obj/item/electronic_assembly/large/terminal, - /obj/item/electronic_assembly/large/arm, - /obj/item/electronic_assembly/large/tall, - /obj/item/electronic_assembly/large/industrial, - /obj/item/electronic_assembly/drone/default, - /obj/item/electronic_assembly/drone/arms, - /obj/item/electronic_assembly/drone/secbot, - /obj/item/electronic_assembly/drone/medbot, - /obj/item/electronic_assembly/drone/genbot, - /obj/item/electronic_assembly/drone/android, - /obj/item/electronic_assembly/wallmount/tiny, - /obj/item/electronic_assembly/wallmount/light, - /obj/item/electronic_assembly/wallmount, - /obj/item/electronic_assembly/wallmount/heavy - ///obj/item/weapon/implant/integrated_circuit - ) - - circuit_fabricator_recipe_list["Tools"] = list( - /obj/item/integrated_electronics/wirer, - /obj/item/integrated_electronics/debugger, - /obj/item/integrated_electronics/analyzer, - /obj/item/integrated_electronics/detailer, - /obj/item/card/data, - /obj/item/card/data/full_color, - /obj/item/card/data/disk - ) diff --git a/code/controllers/subsystem/processing/clock_component.dm b/code/controllers/subsystem/processing/clock_component.dm new file mode 100644 index 0000000000000..d07acaa6d7932 --- /dev/null +++ b/code/controllers/subsystem/processing/clock_component.dm @@ -0,0 +1,5 @@ +/// The subsystem used to tick [/datum/component/acid] instances. +PROCESSING_SUBSYSTEM_DEF(clock_component) + name = "Clock Component" + flags = SS_NO_INIT|SS_BACKGROUND|SS_KEEP_TIMING + wait = COMP_CLOCK_DELAY diff --git a/code/controllers/subsystem/processing/fastprocess.dm b/code/controllers/subsystem/processing/fastprocess.dm index 9622e02146924..1b30ca44c240a 100644 --- a/code/controllers/subsystem/processing/fastprocess.dm +++ b/code/controllers/subsystem/processing/fastprocess.dm @@ -1,6 +1,4 @@ -//Fires five times every second. - PROCESSING_SUBSYSTEM_DEF(fastprocess) name = "Fast Processing" - wait = 2 + wait = 0.2 SECONDS stat_tag = "FP" diff --git a/code/controllers/subsystem/processing/instruments.dm b/code/controllers/subsystem/processing/instruments.dm new file mode 100644 index 0000000000000..3e1ed85559865 --- /dev/null +++ b/code/controllers/subsystem/processing/instruments.dm @@ -0,0 +1,56 @@ +PROCESSING_SUBSYSTEM_DEF(instruments) + name = "Instruments" + wait = 0.5 + init_order = INIT_ORDER_INSTRUMENTS + flags = SS_KEEP_TIMING + priority = FIRE_PRIORITY_INSTRUMENTS + /// List of all instrument data, associative id = datum + var/static/list/datum/instrument/instrument_data = list() + /// List of all song datums. + var/static/list/datum/song/songs = list() + /// Max lines in songs + var/static/musician_maxlines = 600 + /// Max characters per line in songs + var/static/musician_maxlinechars = 300 + /// Deciseconds between hearchecks. Too high and instruments seem to lag when people are moving around in terms of who can hear it. Too low and the server lags from this. + var/static/musician_hearcheck_mindelay = 5 + /// Maximum instrument channels total instruments are allowed to use. This is so you don't have instruments deadlocking all sound channels. + var/static/max_instrument_channels = MAX_INSTRUMENT_CHANNELS + /// Current number of channels allocated for instruments + var/static/current_instrument_channels = 0 + /// Single cached list for synthesizer instrument ids, so you don't have to have a new list with every synthesizer. + var/static/list/synthesizer_instrument_ids + +/datum/controller/subsystem/processing/instruments/Initialize() + initialize_instrument_data() + synthesizer_instrument_ids = get_allowed_instrument_ids() + return ..() + +/datum/controller/subsystem/processing/instruments/proc/on_song_new(datum/song/S) + songs += S + +/datum/controller/subsystem/processing/instruments/proc/on_song_del(datum/song/S) + songs -= S + +/datum/controller/subsystem/processing/instruments/proc/initialize_instrument_data() + for(var/path in subtypesof(/datum/instrument)) + var/datum/instrument/I = path + if(initial(I.abstract_type) == path) + continue + I = new path + I.Initialize() + if(!I.id) + qdel(I) + continue + instrument_data[I.id] = I + CHECK_TICK + +/datum/controller/subsystem/processing/instruments/proc/get_instrument(id_or_path) + return instrument_data["[id_or_path]"] + +/datum/controller/subsystem/processing/instruments/proc/reserve_instrument_channel(datum/instrument/I) + if(current_instrument_channels > max_instrument_channels) + return + . = SSsounds.reserve_sound_channel(I) + if(!isnull(.)) + current_instrument_channels++ \ No newline at end of file diff --git a/code/controllers/subsystem/processing/nanites.dm b/code/controllers/subsystem/processing/nanites.dm index c34e7f78066cc..8a55491f5fa4d 100644 --- a/code/controllers/subsystem/processing/nanites.dm +++ b/code/controllers/subsystem/processing/nanites.dm @@ -1,7 +1,7 @@ PROCESSING_SUBSYSTEM_DEF(nanites) name = "Nanites" flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT - wait = 10 + wait = 1 SECONDS var/list/datum/nanite_cloud_backup/cloud_backups = list() var/list/mob/living/nanite_monitored_mobs = list() diff --git a/code/controllers/subsystem/processing/obj.dm b/code/controllers/subsystem/processing/obj.dm index 26021fb267a17..3566e8a4dc221 100644 --- a/code/controllers/subsystem/processing/obj.dm +++ b/code/controllers/subsystem/processing/obj.dm @@ -2,4 +2,4 @@ PROCESSING_SUBSYSTEM_DEF(obj) name = "Objects" priority = FIRE_PRIORITY_OBJ flags = SS_NO_INIT - wait = 20 + wait = 2 SECONDS diff --git a/code/controllers/subsystem/processing/orbits.dm b/code/controllers/subsystem/processing/orbits.dm new file mode 100644 index 0000000000000..f5edc16d5fc8c --- /dev/null +++ b/code/controllers/subsystem/processing/orbits.dm @@ -0,0 +1,153 @@ +PROCESSING_SUBSYSTEM_DEF(orbits) + name = "Orbits" + flags = SS_KEEP_TIMING + init_order = INIT_ORDER_ORBITS + priority = FIRE_PRIORITY_ORBITS + wait = ORBITAL_UPDATE_RATE + + //The primary orbital map. + var/list/orbital_maps = list() + + var/datum/orbital_map_tgui/orbital_map_tgui = new() + + var/initial_space_ruins = 2 + var/initial_objective_beacons = 3 + var/initial_asteroids = 6 + + var/orbits_setup = FALSE + + var/list/datum/orbital_objective/possible_objectives = list() + + var/datum/orbital_objective/current_objective + + var/list/datum/ruin_event/ruin_events = list() + + var/list/runnable_events + + var/event_probability = 60 + + //key = port_id + //value = orbital shuttle object + var/list/assoc_shuttles = list() + + //Key = port_id + //value = world time of next launch + var/list/interdicted_shuttles = list() + + var/next_objective_time = 0 + + //Research disks + var/list/research_disks = list() + + var/list/datum/tgui/open_orbital_maps = list() + + //The station + var/datum/orbital_object/station_instance + + //Ruin level count + var/ruin_levels = 0 + +/datum/controller/subsystem/processing/orbits/Initialize(start_timeofday) + . = ..() + setup_event_list() + //Create the main orbital map. + orbital_maps[PRIMARY_ORBITAL_MAP] = new /datum/orbital_map() + +/datum/controller/subsystem/processing/orbits/proc/setup_event_list() + runnable_events = list() + for(var/ruin_event in subtypesof(/datum/ruin_event)) + var/datum/ruin_event/instanced = new ruin_event() + runnable_events[instanced] = instanced.probability + +/datum/controller/subsystem/processing/orbits/proc/get_event() + if(!event_probability) + return null + return pickweight(runnable_events) + +/datum/controller/subsystem/processing/orbits/proc/post_load_init() + for(var/map_key in orbital_maps) + var/datum/orbital_map/orbital_map = orbital_maps[map_key] + orbital_map.post_setup() + orbits_setup = TRUE + //Create initial ruins + for(var/i in 1 to initial_space_ruins) + new /datum/orbital_object/z_linked/beacon/ruin/spaceruin() + for(var/i in 1 to initial_objective_beacons) + new /datum/orbital_object/z_linked/beacon/ruin() + //Create asteroid belt + for(var/i in 1 to initial_asteroids) + new /datum/orbital_object/z_linked/beacon/ruin/asteroid() + +/datum/controller/subsystem/processing/orbits/fire(resumed) + if(resumed) + . = ..() + if(MC_TICK_CHECK) + return + //Update UIs + for(var/datum/tgui/tgui as() in open_orbital_maps) + tgui.send_update() + //Check creating objectives / missions. + if(next_objective_time < world.time && length(possible_objectives) < 6) + create_objective() + next_objective_time = world.time + rand(30 SECONDS, 5 MINUTES) + //Check space ruin count + if(ruin_levels < 2 && prob(5)) + new /datum/orbital_object/z_linked/beacon/ruin/spaceruin() + //Check objective + if(current_objective) + if(current_objective.check_failed()) + priority_announce("Central Command priority objective failed.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) + QDEL_NULL(current_objective) + //Process events + for(var/datum/ruin_event/ruin_event as() in ruin_events) + if(!ruin_event.update()) + ruin_events.Remove(ruin_event) + //Do processing. + if(!resumed) + . = ..() + if(MC_TICK_CHECK) + return + //Update UIs + for(var/datum/tgui/tgui as() in open_orbital_maps) + tgui.send_update() + +/mob/dead/observer/verb/open_orbit_ui() + set name = "View Orbits" + set category = "Ghost" + SSorbits.orbital_map_tgui.ui_interact(src) + +/datum/controller/subsystem/processing/orbits/proc/create_objective() + var/static/list/valid_objectives = list( + /datum/orbital_objective/recover_blackbox = 3, + /datum/orbital_objective/nuclear_bomb = 1, + /datum/orbital_objective/artifact = 1, + /datum/orbital_objective/vip_recovery = 1 + ) + if(!length(possible_objectives)) + priority_announce("Priority station objective recieved - Details transmitted to all available objective consoles. \ + [GLOB.station_name] will have funds distributed upon objective completion.", "Central Command Report", SSstation.announcer.get_rand_report_sound()) + var/chosen = pickweight(valid_objectives) + if(!chosen) + return + var/datum/orbital_objective/objective = new chosen() + objective.generate_payout() + possible_objectives += objective + update_objective_computers() + +/datum/controller/subsystem/processing/orbits/proc/assign_objective(objective_computer, datum/orbital_objective/objective) + if(!possible_objectives.Find(objective)) + return "Selected objective is no longer available or has been claimed already." + if(current_objective) + return "An objective has already been selected and must be completed first." + objective.on_assign(objective_computer) + objective.generate_attached_beacon() + objective.announce() + current_objective = objective + possible_objectives.Remove(objective) + update_objective_computers() + return "Objective selected, good luck." + +/datum/controller/subsystem/processing/orbits/proc/update_objective_computers() + for(var/obj/machinery/computer/objective/computer as() in GLOB.objective_computers) + for(var/M in computer.viewing_mobs) + computer.update_static_data(M) diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm index c5d6dfa126838..70f44822be27c 100644 --- a/code/controllers/subsystem/processing/processing.dm +++ b/code/controllers/subsystem/processing/processing.dm @@ -1,17 +1,23 @@ -//Used to process objects. Fires once every second. +//Used to process objects. SUBSYSTEM_DEF(processing) name = "Processing" priority = FIRE_PRIORITY_PROCESS flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT - wait = 10 + wait = 1 SECONDS var/stat_tag = "P" //Used for logging var/list/processing = list() var/list/currentrun = list() /datum/controller/subsystem/processing/stat_entry() - ..("[stat_tag]:[processing.len]") + . = ..("[stat_tag]:[processing.len]") + +/datum/controller/subsystem/processing/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust /datum/controller/subsystem/processing/fire(resumed = 0) if (!resumed) @@ -24,12 +30,25 @@ SUBSYSTEM_DEF(processing) current_run.len-- if(QDELETED(thing)) processing -= thing - else if(thing.process(wait) == PROCESS_KILL) + else if(thing.process(wait * 0.1) == PROCESS_KILL) // fully stop so that a future START_PROCESSING will work STOP_PROCESSING(src, thing) if (MC_TICK_CHECK) return -/datum/proc/process() - set waitfor = 0 +/** + * This proc is called on a datum on every "cycle" if it is being processed by a subsystem. The time between each cycle is determined by the subsystem's "wait" setting. + * You can start and stop processing a datum using the START_PROCESSING and STOP_PROCESSING defines. + * + * Since the wait setting of a subsystem can be changed at any time, it is important that any rate-of-change that you implement in this proc is multiplied by the delta_time that is sent as a parameter, + * Additionally, any "prob" you use in this proc should instead use the DT_PROB define to make sure that the final probability per second stays the same even if the subsystem's wait is altered. + * Examples where this must be considered: + * - Implementing a cooldown timer, use `mytimer -= delta_time`, not `mytimer -= 1`. This way, `mytimer` will always have the unit of seconds + * - Damaging a mob, do `L.adjustFireLoss(20 * delta_time)`, not `L.adjustFireLoss(20)`. This way, the damage per second stays constant even if the wait of the subsystem is changed + * - Probability of something happening, do `if(DT_PROB(25, delta_time))`, not `if(prob(25))`. This way, if the subsystem wait is e.g. lowered, there won't be a higher chance of this event happening per second + * + * If you override this do not call parent, as it will return PROCESS_KILL. This is done to prevent objects that dont override process() from staying in the processing list + */ +/datum/proc/process(delta_time) + set waitfor = FALSE return PROCESS_KILL diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index ce3ab89472e7e..8a67d2bcb5899 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -5,13 +5,13 @@ PROCESSING_SUBSYSTEM_DEF(quirks) name = "Quirks" init_order = INIT_ORDER_QUIRKS flags = SS_BACKGROUND - wait = 10 runlevels = RUNLEVEL_GAME + wait = 1 SECONDS var/list/quirks = list() //Assoc. list of all roundstart quirk datum types; "name" = /path/ var/list/quirk_points = list() //Assoc. list of quirk names and their "point cost"; positive numbers are good traits, and negative ones are bad var/list/quirk_objects = list() //A list of all quirk objects in the game, since some may process - var/list/quirk_blacklist = list() //A list a list of quirks that can not be used with each other. Format: list(quirk1,quirk2),list(quirk3,quirk4) + var/list/quirk_blacklist = list() //A list of quirks that can not be used with each other. Format: list(quirk1,quirk2),list(quirk3,quirk4) /datum/controller/subsystem/processing/quirks/Initialize(timeofday) if(!quirks.len) diff --git a/code/controllers/subsystem/processing/station.dm b/code/controllers/subsystem/processing/station.dm new file mode 100644 index 0000000000000..d5636f0571509 --- /dev/null +++ b/code/controllers/subsystem/processing/station.dm @@ -0,0 +1,84 @@ +#define REPORT_WAIT_TIME_MINIMUM 600 +#define REPORT_WAIT_TIME_MAXIMUM 1500 + +PROCESSING_SUBSYSTEM_DEF(station) + name = "Station" + init_order = INIT_ORDER_STATION + flags = SS_BACKGROUND + runlevels = RUNLEVEL_GAME + wait = 5 SECONDS + + ///A list of currently active station traits + var/list/station_traits + ///Assoc list of trait type || assoc list of traits with weighted value. Used for picking traits from a specific category. + var/list/selectable_traits_by_types + ///Currently active announcer. Starts as a type but gets initialized after traits are selected + var/datum/centcom_announcer/announcer = /datum/centcom_announcer/default + +/datum/controller/subsystem/processing/station/Initialize(timeofday) + + station_traits = list() + selectable_traits_by_types = list(STATION_TRAIT_POSITIVE = list(), STATION_TRAIT_NEUTRAL = list(), STATION_TRAIT_NEGATIVE = list()) + + //If doing unit tests we don't do none of that trait shit ya know? + #ifndef UNIT_TESTS + if(CONFIG_GET(flag/station_traits)) + SetupTraits() + PrepareReport() + #endif + + announcer = new announcer() //Initialize the station's announcer datum + + return ..() + +///Rolls for the amount of traits and adds them to the traits list +/datum/controller/subsystem/processing/station/proc/SetupTraits() + for(var/i in subtypesof(/datum/station_trait)) + var/datum/station_trait/trait_typepath = i + if(initial(trait_typepath.trait_flags) & STATION_TRAIT_ABSTRACT) + continue //Dont add abstract ones to it + selectable_traits_by_types[initial(trait_typepath.trait_type)][trait_typepath] = initial(trait_typepath.weight) + + var/positive_trait_count = pick(20;0, 5;1, 1;2) + var/neutral_trait_count = pick(10;0, 10;1, 3;2) + var/negative_trait_count = pick(20;0, 5;1, 1;2) + + pick_traits(STATION_TRAIT_POSITIVE, positive_trait_count) + pick_traits(STATION_TRAIT_NEUTRAL, neutral_trait_count) + pick_traits(STATION_TRAIT_NEGATIVE, negative_trait_count) + + +///Picks traits of a specific category (e.g. bad or good) and a specified amount, then initializes them and adds them to the list of traits. +/datum/controller/subsystem/processing/station/proc/pick_traits(trait_type, amount) + if(!amount) + return + for(var/iterator in 1 to amount) + var/datum/station_trait/picked_trait = pickweight(selectable_traits_by_types[trait_type]) //Rolls from the table for the specific trait type + if(!picked_trait) + return + picked_trait = new picked_trait() + station_traits += picked_trait + selectable_traits_by_types[picked_trait.trait_type] -= picked_trait.type //We don't want it to roll trait twice + if(!picked_trait.blacklist) + continue + for(var/i in picked_trait.blacklist) + var/datum/station_trait/trait_to_remove = i + selectable_traits_by_types[initial(trait_to_remove.trait_type)] -= trait_to_remove + +/datum/controller/subsystem/processing/station/proc/PrepareReport() + if(!station_traits.len) //no active traits why bother + return + + var/report = "Central Command Divergency Report
" + + for(var/datum/station_trait/trait as() in station_traits) + if(trait.trait_flags & STATION_TRAIT_ABSTRACT) + continue + if(!trait.report_message || !trait.show_in_report) + continue + report += "[trait.get_report()]
" + + addtimer(CALLBACK(GLOBAL_PROC, .proc/print_command_report, report, "Central Command Divergency Report", FALSE), rand(REPORT_WAIT_TIME_MINIMUM, REPORT_WAIT_TIME_MAXIMUM)) + +#undef REPORT_WAIT_TIME_MINIMUM +#undef REPORT_WAIT_TIME_MAXIMUM diff --git a/code/controllers/subsystem/profiler.dm b/code/controllers/subsystem/profiler.dm index c9c8013fbc601..4c00a98df86a4 100644 --- a/code/controllers/subsystem/profiler.dm +++ b/code/controllers/subsystem/profiler.dm @@ -1,10 +1,23 @@ #define PROFILER_FILENAME "profiler.json" +#ifdef SENDMAPS_PROFILE +#define SENDMAPS_FILENAME "sendmaps.json" +GLOBAL_REAL_VAR(world_init_maptick_profiler) = world.Profile(PROFILE_RESTART, type = "sendmaps") +#endif + SUBSYSTEM_DEF(profiler) name = "Profiler" init_order = INIT_ORDER_PROFILER runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY - wait = 600 + wait = 3000 + flags = SS_NO_TICK_CHECK + var/fetch_cost = 0 + var/write_cost = 0 + +/datum/controller/subsystem/profiler/stat_entry(msg) + msg += "F:[round(fetch_cost,1)]ms" + msg += "|W:[round(write_cost,1)]ms" + ..(msg) /datum/controller/subsystem/profiler/Initialize() if(CONFIG_GET(flag/auto_profile)) @@ -20,19 +33,54 @@ SUBSYSTEM_DEF(profiler) /datum/controller/subsystem/profiler/Shutdown() if(CONFIG_GET(flag/auto_profile)) DumpFile() +#ifdef SENDMAPS_PROFILE + world.Profile(PROFILE_CLEAR, type = "sendmaps") +#endif return ..() /datum/controller/subsystem/profiler/proc/StartProfiling() world.Profile(PROFILE_START) +#ifdef SENDMAPS_PROFILE + world.Profile(PROFILE_START, type = "sendmaps") +#endif + /datum/controller/subsystem/profiler/proc/StopProfiling() world.Profile(PROFILE_STOP) +#ifdef SENDMAPS_PROFILE + world.Profile(PROFILE_STOP, type = "sendmaps") +#endif /datum/controller/subsystem/profiler/proc/DumpFile() - var/current_profile_data = world.Profile(PROFILE_REFRESH,format="json") +#if DM_BUILD < 1506 + stack_trace("Auto profiling unsupported on this byond version") + CONFIG_SET(flag/auto_profile, FALSE) +#else + var/timer = TICK_USAGE_REAL + var/current_profile_data = world.Profile(PROFILE_REFRESH, format = "json") +#ifdef SENDMAPS_PROFILE + var/current_sendmaps_data = world.Profile(PROFILE_REFRESH, type = "sendmaps", format="json") +#endif + fetch_cost = MC_AVERAGE(fetch_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + CHECK_TICK + if(!length(current_profile_data)) //Would be nice to have explicit proc to check this stack_trace("Warning, profiling stopped manually before dump.") - var/json_file = file("[GLOB.log_directory]/[PROFILER_FILENAME]") - if(fexists(json_file)) - fdel(json_file) - WRITE_FILE(json_file, current_profile_data) + var/prof_file = file("[GLOB.log_directory]/[PROFILER_FILENAME]") + if(fexists(prof_file)) + fdel(prof_file) +#ifdef SENDMAPS_PROFILE + if(!length(current_sendmaps_data)) //Would be nice to have explicit proc to check this + stack_trace("Warning, sendmaps profiling stopped manually before dump.") + var/sendmaps_file = file("[GLOB.log_directory]/[SENDMAPS_FILENAME]") + if(fexists(sendmaps_file)) + fdel(sendmaps_file) +#endif + + timer = TICK_USAGE_REAL + WRITE_FILE(prof_file, current_profile_data) +#ifdef SENDMAPS_PROFILE + WRITE_FILE(sendmaps_file, current_sendmaps_data) +#endif + write_cost = MC_AVERAGE(write_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) +#endif diff --git a/code/controllers/subsystem/radiation.dm b/code/controllers/subsystem/radiation.dm index 2f7d27aca99f6..2d764d84ddb64 100644 --- a/code/controllers/subsystem/radiation.dm +++ b/code/controllers/subsystem/radiation.dm @@ -1,6 +1,7 @@ PROCESSING_SUBSYSTEM_DEF(radiation) name = "Radiation" flags = SS_NO_INIT | SS_BACKGROUND + wait = 1 SECONDS var/list/warned_atoms = list() diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 3263047ec1500..4b734ff6e0f9e 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -44,6 +44,15 @@ SUBSYSTEM_DEF(research) initialize_all_techweb_designs() initialize_all_techweb_nodes() science_tech = new /datum/techweb/science + //Some points to get you started. + //Points can be gained by + // 1) Exploration team going to ruins + // 2) Scientists using their shuttle to go to ruins + // 3) Giving miners a scanner + // 4) Scanning station pets + // 5) Using the experimentor on maint devices + // (probably more added since this comment was written.) + science_tech.add_point_type(TECHWEB_POINT_TYPE_DISCOVERY, 2500) admin_tech = new /datum/techweb/admin autosort_categories() error_design = new diff --git a/code/controllers/subsystem/runechat.dm b/code/controllers/subsystem/runechat.dm new file mode 100644 index 0000000000000..0bd75e326144d --- /dev/null +++ b/code/controllers/subsystem/runechat.dm @@ -0,0 +1,237 @@ +/// Controls how many buckets should be kept, each representing a tick. (30 seconds worth) +#define BUCKET_LEN (world.fps * 1 * 30) +/// Helper for getting the correct bucket for a given chatmessage +#define BUCKET_POS(scheduled_destruction) (((round((scheduled_destruction - SSrunechat.head_offset) / world.tick_lag) + 1) % BUCKET_LEN) || BUCKET_LEN) +/// Gets the maximum time at which messages will be handled in buckets, used for deferring to secondary queue +#define BUCKET_LIMIT (world.time + TICKS2DS(min(BUCKET_LEN - (SSrunechat.practical_offset - DS2TICKS(world.time - SSrunechat.head_offset)) - 1, BUCKET_LEN - 1))) +/** + * # Runechat Subsystem + * + * Maintains a timer-like system to handle destruction of runechat messages and balloon alerts. Much of this code is modeled + * after or adapted from the timer subsystem. + * + * Note that this has the same structure for storing and queueing messages as the timer subsystem does + * for handling timers: the bucket_list is a list of chatmessage datums, each of which are the head + * of a circularly linked list. Any given index in bucket_list could be null, representing an empty bucket. + */ +SUBSYSTEM_DEF(runechat) + name = "Runechat" + flags = SS_TICKER | SS_NO_INIT + wait = 1 + priority = FIRE_PRIORITY_RUNECHAT + + /// world.time of the first entry in the bucket list, effectively the 'start time' of the current buckets + var/head_offset = 0 + /// Index of the first non-empty bucket + var/practical_offset = 1 + /// world.tick_lag the bucket was designed for + var/bucket_resolution = 0 + /// How many messages are in the buckets + var/bucket_count = 0 + /// List of buckets, each bucket holds every message that has to be killed that byond tick + var/list/bucket_list = list() + /// Queue used for storing messages that are scheduled for deletion too far in the future for the buckets + var/list/datum/chatmessage/second_queue = list() + +/datum/controller/subsystem/runechat/PreInit() + bucket_list.len = BUCKET_LEN + head_offset = world.time + bucket_resolution = world.tick_lag + +/datum/controller/subsystem/runechat/stat_entry(msg) + . = ..("ActMsgs:[bucket_count] SecQueue:[length(second_queue)]") + +/datum/controller/subsystem/runechat/fire(resumed = FALSE) + // Store local references to datum vars as it is faster to access them this way + var/list/bucket_list = src.bucket_list + + if (MC_TICK_CHECK) + return + + // Check for when we need to loop the buckets, this occurs when + // the head_offset is approaching BUCKET_LEN ticks in the past + if (practical_offset > BUCKET_LEN) + head_offset += TICKS2DS(BUCKET_LEN) + practical_offset = 1 + resumed = FALSE + + // Check for when we have to reset buckets, typically from auto-reset + if ((length(bucket_list) != BUCKET_LEN) || (world.tick_lag != bucket_resolution)) + reset_buckets() + bucket_list = src.bucket_list + resumed = FALSE + + // Store a reference to the 'working' chatmessage so that we can resume if the MC + // has us stop mid-way through processing + var/static/datum/chatmessage/cm + if (!resumed) + cm = null + + // Iterate through each bucket starting from the practical offset + while (practical_offset <= BUCKET_LEN && head_offset + ((practical_offset - 1) * world.tick_lag) <= world.time) + var/datum/chatmessage/bucket_head = bucket_list[practical_offset] + if (!cm || !bucket_head || cm == bucket_head) + bucket_head = bucket_list[practical_offset] + cm = bucket_head + + while (cm) + // If the chatmessage hasn't yet had its life ended then do that now + var/datum/chatmessage/next = cm.next + if (!cm.eol_complete) + cm.end_of_life() + else if (!QDELETED(cm)) // otherwise if we haven't deleted it yet, do so (this is after EOL completion) + qdel(cm) + + if (MC_TICK_CHECK) + return + + // Break once we've processed the entire bucket + cm = next + if (cm == bucket_head) + break + + // Empty the bucket, check if anything in the secondary queue should be shifted to this bucket + bucket_list[practical_offset++] = null + var/i = 0 + for (i in 1 to length(second_queue)) + cm = second_queue[i] + if (cm.scheduled_destruction >= BUCKET_LIMIT) + i-- + break + + // Transfer the message into the bucket, performing necessary circular doubly-linked list operations + bucket_count++ + var/bucket_pos = max(1, BUCKET_POS(cm.scheduled_destruction)) + var/datum/timedevent/head = bucket_list[bucket_pos] + if (!head) + bucket_list[bucket_pos] = cm + cm.next = null + cm.prev = null + continue + + if (!head.prev) + head.prev = head + cm.next = head + cm.prev = head.prev + cm.next.prev = cm + cm.prev.next = cm + if (i) + second_queue.Cut(1, i + 1) + cm = null + +/datum/controller/subsystem/runechat/Recover() + bucket_list |= SSrunechat.bucket_list + second_queue |= SSrunechat.second_queue + +/datum/controller/subsystem/runechat/proc/reset_buckets() + bucket_list.len = BUCKET_LEN + head_offset = world.time + bucket_resolution = world.tick_lag + +/** + * Enters the runechat subsystem with this chatmessage, inserting it into the end-of-life queue + * + * This will also account for a chatmessage already being registered, and in which case + * the position will be updated to remove it from the previous location if necessary + * + * Arguments: + * * new_sched_destruction Optional, when provided is used to update an existing message with the new specified time + */ +/datum/chatmessage/proc/enter_subsystem(new_sched_destruction = 0) + // Get local references from subsystem as they are faster to access than the datum references + var/list/bucket_list = SSrunechat.bucket_list + var/list/second_queue = SSrunechat.second_queue + + // When necessary, de-list the chatmessage from its previous position + if (new_sched_destruction) + if (scheduled_destruction >= BUCKET_LIMIT) + second_queue -= src + else + SSrunechat.bucket_count-- + var/bucket_pos = BUCKET_POS(scheduled_destruction) + if (bucket_pos > 0) + var/datum/chatmessage/bucket_head = bucket_list[bucket_pos] + if (bucket_head == src) + bucket_list[bucket_pos] = next + if (prev != next) + prev.next = next + next.prev = prev + else + prev?.next = null + next?.prev = null + prev = next = null + scheduled_destruction = new_sched_destruction + + // Ensure the scheduled destruction time is properly bound to avoid missing a scheduled event + scheduled_destruction = max(CEILING(scheduled_destruction, world.tick_lag), world.time + world.tick_lag) + + // Handle insertion into the secondary queue if the required time is outside our tracked amounts + if (scheduled_destruction >= BUCKET_LIMIT) + BINARY_INSERT(src, SSrunechat.second_queue, /datum/chatmessage, src, scheduled_destruction, COMPARE_KEY) + return + + // Get bucket position and a local reference to the datum var, it's faster to access this way + var/bucket_pos = BUCKET_POS(scheduled_destruction) + + // Get the bucket head for that bucket, increment the bucket count + var/datum/chatmessage/bucket_head = bucket_list[bucket_pos] + SSrunechat.bucket_count++ + + // If there is no existing head of this bucket, we can set this message to be that head + if (!bucket_head) + bucket_list[bucket_pos] = src + return + + // Otherwise it's a simple insertion into the circularly doubly-linked list + if (!bucket_head.prev) + bucket_head.prev = bucket_head + next = bucket_head + prev = bucket_head.prev + next.prev = src + prev.next = src + + +/** + * Removes this chatmessage datum from the runechat subsystem + */ +/datum/chatmessage/proc/leave_subsystem() + // Attempt to find the bucket that contains this chat message + var/bucket_pos = BUCKET_POS(scheduled_destruction) + + // Get local references to the subsystem's vars, faster than accessing on the datum + var/list/bucket_list = SSrunechat.bucket_list + var/list/second_queue = SSrunechat.second_queue + + // Attempt to get the head of the bucket + var/datum/chatmessage/bucket_head + if (bucket_pos > 0) + bucket_head = bucket_list[bucket_pos] + + // Decrement the number of messages in buckets if the message is + // the head of the bucket, or has a SD less than BUCKET_LIMIT implying it fits + // into an existing bucket, or is otherwise not present in the secondary queue + if(bucket_head == src) + bucket_list[bucket_pos] = next + SSrunechat.bucket_count-- + else if(scheduled_destruction < BUCKET_LIMIT) + SSrunechat.bucket_count-- + else + var/l = length(second_queue) + second_queue -= src + if(l == length(second_queue)) + SSrunechat.bucket_count-- + + // Remove the message from the bucket, ensuring to maintain + // the integrity of the bucket's list if relevant + if(prev != next) + prev.next = next + next.prev = prev + else + prev?.next = null + next?.prev = null + prev = next = null + + +#undef BUCKET_LEN +#undef BUCKET_POS +#undef BUCKET_LIMIT diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 37f8f5b8aeb38..b5cf7f94dd791 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -26,6 +26,7 @@ SUBSYSTEM_DEF(shuttle) var/emergencyCallAmount = 0 //how many times the escape shuttle was called var/emergencyNoEscape var/emergencyNoRecall = FALSE + var/adminEmergencyNoRecall = FALSE var/list/hostileEnvironments = list() //Things blocking escape shuttle from leaving var/list/tradeBlockade = list() //Things blocking cargo from leaving. var/supplyBlocked = FALSE @@ -148,7 +149,7 @@ SUBSYSTEM_DEF(shuttle) message_admins(msg) log_game("[msg] Alive: [alive], Roundstart: [total], Threshold: [threshold]") emergencyNoRecall = TRUE - priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.") + priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.", sound = SSstation.announcer.get_rand_alert_sound()) if(emergency.timeLeft(1) > emergencyCallTime * 0.4) emergency.request(null, set_coefficient = 0.4) @@ -378,7 +379,7 @@ SUBSYSTEM_DEF(shuttle) emergency.setTimer(emergencyDockTime) priority_announce("Hostile environment resolved. \ You have 3 minutes to board the Emergency Shuttle.", - null, 'sound/ai/shuttledock.ogg', "Priority") + null, ANNOUNCER_SHUTTLEDOCK, "Priority") //try to move/request to dockHome if possible, otherwise dockAway. Mainly used for admin buttons /datum/controller/subsystem/shuttle/proc/toggleShuttle(shuttleId, dockHome, dockAway, timed) @@ -636,7 +637,7 @@ SUBSYSTEM_DEF(shuttle) hidden_shuttle_turf_images += add_images for(var/V in GLOB.navigation_computers) - var/obj/machinery/computer/camera_advanced/shuttle_docker/C = V + var/obj/machinery/computer/shuttle_flight/C = V C.update_hidden_docking_ports(remove_images, add_images) QDEL_LIST(remove_images) @@ -698,6 +699,8 @@ SUBSYSTEM_DEF(shuttle) preview_shuttle.register() + preview_shuttle.reset_air() + // TODO indicate to the user that success happened, rather than just // blanking the modification tab preview_shuttle = null @@ -760,6 +763,7 @@ SUBSYSTEM_DEF(shuttle) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "ShuttleManipulator") + ui.set_autoupdate(TRUE) ui.open() diff --git a/code/controllers/subsystem/sound.dm b/code/controllers/subsystem/sound.dm new file mode 100644 index 0000000000000..85855c3998f3e --- /dev/null +++ b/code/controllers/subsystem/sound.dm @@ -0,0 +1,127 @@ +/* + * Sound subsystem: + * Used for things that need constant updating (sound fading in / out) +*/ + +SUBSYSTEM_DEF(sound_effects) + name = "Sound" + wait = 1 + priority = FIRE_PRIORITY_AMBIENCE + flags = SS_NO_INIT + //Note: Make sure you update this if you use sound fading pre-game + runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + + var/list/acting_effects = list() //key = sound, value = datum + var/list/currentrun = list() + +/datum/controller/subsystem/sound_effects/fire(resumed = 0) + if (!resumed) + src.currentrun = acting_effects.Copy() + + //cache for sanic speed (lists are references anyways) + var/list/currentrun = src.currentrun + + while(LAZYLEN(currentrun)) + var/datum/sound_effect/sound_effect = currentrun[currentrun[currentrun.len]] + currentrun.len-- + + sound_effect.update_effect() + + if(world.time > sound_effect.end_tick) + sound_effect.end_effect() + acting_effects -= sound_effect.effect_id + + if (MC_TICK_CHECK) + return + +// ===== Sound effect procs ===== + +/proc/sound_fade(sound/S, start_volume = 100, end_volume = 0, time = 10, var/listeners) + //Check basics + if(!S) + CRASH("sound_fade called without a sound file.") + if(!listeners) + return + //Check in list format + var/listeners_list = listeners + if(!islist(listeners_list)) + listeners_list = list(listeners) + //Create datum + new /datum/sound_effect/fade(S, listeners_list, time, start_volume, end_volume) + +// ===== Sound effect datum ===== + +/datum/sound_effect + var/name = "null" + var/sound/sound + var/list/listeners + var/start_tick + var/end_tick + var/effect_id + +/datum/sound_effect/New(S, list/_listeners, time) + . = ..() + sound = S + listeners = _listeners + start_tick = world.time + end_tick = world.time + time + effect_id = generate_id() + start_sound() + +/datum/sound_effect/proc/generate_id() + var/id = "[name][sound.file]" + for(var/A in listeners) + id = "[id][REF(A)]" + return id + +/datum/sound_effect/proc/send_sound() + for(var/reciever in listeners) + SEND_SOUND(reciever, sound) + +/datum/sound_effect/proc/update_effect() + return //Not implemented + +/datum/sound_effect/proc/end_effect() + return //Not implemented + +// Send the sound to the person it's affecting and add it to the sound subsystem. +// Should be overridden to account for if an effect is already playing for that sound. +/datum/sound_effect/proc/start_sound() + send_sound() + SSsound_effects.acting_effects[effect_id] = src + +//============== Fade ============= + +/datum/sound_effect/fade + name = "fade" + var/in_vol + var/out_vol + //Calculated + var/current_vol + +/datum/sound_effect/fade/New(S, list/_listeners, time, start_vol, end_vol) + in_vol = start_vol + out_vol = end_vol + . = ..(S, _listeners, time) + +/datum/sound_effect/fade/start_sound() + //If the sound is already playing, make it fade from the current point + if(SSsound_effects.acting_effects[effect_id]) + var/datum/sound_effect/fade/old_sound = SSsound_effects.acting_effects[effect_id] + in_vol = old_sound.current_vol + else + send_sound() + SSsound_effects.acting_effects[effect_id] = src + +/datum/sound_effect/fade/update_effect() + var/time_multiplier = CLAMP((world.time - start_tick) / (end_tick - start_tick), 0, 1) + current_vol = (time_multiplier * out_vol) + ((1-time_multiplier) * in_vol) + sound.status = SOUND_UPDATE + sound.volume = current_vol + + for(var/reciever in listeners) + SEND_SOUND(reciever, sound) + +/datum/sound_effect/fade/end_effect() + if(!out_vol) + sound.repeat = FALSE diff --git a/code/controllers/subsystem/sound_loops.dm b/code/controllers/subsystem/sound_loops.dm new file mode 100644 index 0000000000000..46b916603f943 --- /dev/null +++ b/code/controllers/subsystem/sound_loops.dm @@ -0,0 +1,3 @@ +TIMER_SUBSYSTEM_DEF(sound_loops) + name = "Sound Loops" + priority = FIRE_PRIORITY_SOUND_LOOPS diff --git a/code/controllers/subsystem/sounds.dm b/code/controllers/subsystem/sounds.dm new file mode 100644 index 0000000000000..6095cf711405c --- /dev/null +++ b/code/controllers/subsystem/sounds.dm @@ -0,0 +1,135 @@ +#define DATUMLESS "NO_DATUM" + +SUBSYSTEM_DEF(sounds) + name = "Sound Channels" + flags = SS_NO_FIRE + init_order = INIT_ORDER_SOUNDS + var/static/using_channels_max = CHANNEL_HIGHEST_AVAILABLE //BYOND max channels + /// Amount of channels to reserve for random usage rather than reservations being allowed to reserve all channels. Also a nice safeguard for when someone screws up. + var/static/random_channels_min = 50 + + // Hey uh these two needs to be initialized fast because the whole "things get deleted before init" thing. + /// Assoc list, "[channel]" = either the datum using it or TRUE for an unsafe-reserved (datumless reservation) channel + var/list/using_channels + /// Assoc list datum = list(channel1, channel2, ...) for what channels something reserved. + var/list/using_channels_by_datum + // Special datastructure for fast channel management + /// List of all channels as numbers + var/list/channel_list + /// Associative list of all reserved channels associated to their position. "[channel_number]" = index as number + var/list/reserved_channels + /// lower iteration position - Incremented and looped to get "random" sound channels for normal sounds. The channel at this index is returned when asking for a random channel. + var/channel_random_low + /// higher reserve position - decremented and incremented to reserve sound channels, anything above this is reserved. The channel at this index is the highest unreserved channel. + var/channel_reserve_high + +/datum/controller/subsystem/sounds/Initialize() + setup_available_channels() + return ..() + +/datum/controller/subsystem/sounds/proc/setup_available_channels() + channel_list = list() + reserved_channels = list() + using_channels = list() + using_channels_by_datum = list() + for(var/i in 1 to using_channels_max) + channel_list += i + channel_random_low = 1 + channel_reserve_high = length(channel_list) + +/// Removes a channel from using list. +/datum/controller/subsystem/sounds/proc/free_sound_channel(channel) + var/text_channel = num2text(channel) + var/using = using_channels[text_channel] + using_channels -= text_channel + if(using != TRUE) // datum channel + using_channels_by_datum[using] -= channel + if(!length(using_channels_by_datum[using])) + using_channels_by_datum -= using + free_channel(channel) + +/// Frees all the channels a datum is using. +/datum/controller/subsystem/sounds/proc/free_datum_channels(datum/D) + var/list/L = using_channels_by_datum[D] + if(!L) + return + for(var/channel in L) + using_channels -= num2text(channel) + free_channel(channel) + using_channels_by_datum -= D + +/// Frees all datumless channels +/datum/controller/subsystem/sounds/proc/free_datumless_channels() + free_datum_channels(DATUMLESS) + +/// NO AUTOMATIC CLEANUP - If you use this, you better manually free it later! Returns an integer for channel. +/datum/controller/subsystem/sounds/proc/reserve_sound_channel_datumless() + . = reserve_channel() + if(!.) //oh no.. + return FALSE + var/text_channel = num2text(.) + using_channels[text_channel] = DATUMLESS + LAZYINITLIST(using_channels_by_datum[DATUMLESS]) + using_channels_by_datum[DATUMLESS] += . + +/// Reserves a channel for a datum. Automatic cleanup only when the datum is deleted. Returns an integer for channel. +/datum/controller/subsystem/sounds/proc/reserve_sound_channel(datum/D) + if(!D) //i don't like typechecks but someone will fuck it up + CRASH("Attempted to reserve sound channel without datum using the managed proc.") + .= reserve_channel() + if(!.) + return FALSE + var/text_channel = num2text(.) + using_channels[text_channel] = D + LAZYINITLIST(using_channels_by_datum[D]) + using_channels_by_datum[D] += . + +/** + * Reserves a channel and updates the datastructure. Private proc. + */ +/datum/controller/subsystem/sounds/proc/reserve_channel() + PRIVATE_PROC(TRUE) + if(channel_reserve_high <= random_channels_min) // out of channels + return + var/channel = channel_list[channel_reserve_high] + reserved_channels[num2text(channel)] = channel_reserve_high-- + return channel + +/** + * Frees a channel and updates the datastructure. Private proc. + */ +/datum/controller/subsystem/sounds/proc/free_channel(number) + PRIVATE_PROC(TRUE) + var/text_channel = num2text(number) + var/index = reserved_channels[text_channel] + if(!index) + CRASH("Attempted to (internally) free a channel that wasn't reserved.") + reserved_channels -= text_channel + // push reserve index up, which makes it now on a channel that is reserved + channel_reserve_high++ + // swap the reserved channel wtih the unreserved channel so the reserve index is now on an unoccupied channel and the freed channel is next to be used. + channel_list.Swap(channel_reserve_high, index) + // now, an existing reserved channel will likely (exception: unreserving last reserved channel) be at index + // get it, and update position. + var/text_reserved = num2text(channel_list[index]) + if(!reserved_channels[text_reserved]) //if it isn't already reserved make sure we don't accidently mistakenly put it on reserved list! + return + reserved_channels[text_reserved] = index + +/// Random available channel, returns text. +/datum/controller/subsystem/sounds/proc/random_available_channel_text() + if(channel_random_low > channel_reserve_high) + channel_random_low = 1 + . = "[channel_list[channel_random_low++]]" + +/// Random available channel, returns number +/datum/controller/subsystem/sounds/proc/random_available_channel() + if(channel_random_low > channel_reserve_high) + channel_random_low = 1 + . = channel_list[channel_random_low++] + +/// How many channels we have left. +/datum/controller/subsystem/sounds/proc/available_channels_left() + return length(channel_list) - random_channels_min + +#undef DATUMLESS \ No newline at end of file diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm index c251492227ac4..327fc03bd5804 100644 --- a/code/controllers/subsystem/spacedrift.dm +++ b/code/controllers/subsystem/spacedrift.dm @@ -9,8 +9,13 @@ SUBSYSTEM_DEF(spacedrift) var/list/processing = list() /datum/controller/subsystem/spacedrift/stat_entry() - ..("P:[processing.len]") + . = ..("P:[processing.len]") +/datum/controller/subsystem/spacedrift/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust /datum/controller/subsystem/spacedrift/fire(resumed = 0) if (!resumed) diff --git a/code/controllers/subsystem/stat.dm b/code/controllers/subsystem/stat.dm new file mode 100644 index 0000000000000..6542b3c80e0de --- /dev/null +++ b/code/controllers/subsystem/stat.dm @@ -0,0 +1,155 @@ +#define FLAT_ICON_CACHE_MAX_SIZE 250 + +SUBSYSTEM_DEF(stat) + name = "Stat" + wait = 1 SECONDS + priority = FIRE_PRIORITY_STAT + runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME //RUNLEVEL_INIT doesn't work, so the stat panel will not auto update during this time (But that is good since we don't want to waste processing time during that phase). + init_order = INIT_ORDER_STAT + flags = SS_NO_INIT | SS_BACKGROUND + + var/list/flat_icon_cache = list() //Assoc list, datum = flat icon + + //The run of clients updating normally + var/list/currentrun = list() + //The run of clients updating alt clicked turfs + var/list/currentrun_listed = list() + //List of icon requests + var/list/icon_requests = list() + //List of people who need re-updating after icon requests are processed + var/list/currentrun_aftericon = list() + +/datum/controller/subsystem/stat/fire(resumed = 0) + if (!resumed) + src.currentrun = GLOB.clients.Copy() + + //cache for sanic speed (lists are references anyways) + var/list/currentrun = src.currentrun + var/list/currentrun_listed = src.currentrun_listed + var/list/icon_requests = src.icon_requests + var/list/currentrun_aftericon = src.currentrun_aftericon + + while(currentrun.len) + var/client/C = currentrun[currentrun.len] + currentrun.len-- + + if (C) + var/mob/M = C.mob + if(M) + //Handle listed turfs seperately + if(sanitize(M.listed_turf?.name) == C.selected_stat_tab) + currentrun_listed += C + else + //Auto-update, not forced + M.UpdateMobStat(FALSE) + + if (MC_TICK_CHECK) + src.currentrun_listed = currentrun_listed + return + + if(MC_TICK_CHECK) + src.currentrun_listed = currentrun_listed + return + + //Handle clients on listed turfs as low priority, if they run over then we will give our processing time + //back to the people not on listed turfs (listed turfs is slightly more laggy) + while(currentrun_listed.len) + var/client/C = currentrun_listed[currentrun_listed.len] + currentrun_listed.len-- + + if (C) + var/mob/M = C.mob + if(M) + //Auto-update, not forced + M.UpdateMobStat(FALSE) + + if (MC_TICK_CHECK) + return + + if(MC_TICK_CHECK) + return + + //Process icon requests + while(icon_requests.len) + var/A_name = icon_requests[icon_requests.len] + var/datum/weakref/A_ref = icon_requests[A_name] + var/atom/A = A_ref.resolve() + var/directionless = TRUE + if(ispipewire(A)) + directionless = FALSE + icon_requests.len-- + + //Adding a new icon + //If the list gets too big just remove the first thing + if(flat_icon_cache.len > FLAT_ICON_CACHE_MAX_SIZE) + flat_icon_cache.Cut(1, 2) + //We are only going to apply overlays to mobs. + //Massively faster, getFlatIcon is a bit of a sucky proc. + flat_icon_cache[A_name] = icon2base64(getStillIcon(A, directionless)) + + if (MC_TICK_CHECK) + return + + //Process clients that just got an item and need to update now. + //Client list will empty if the system overruns, since they will get updated anyway. + if(MC_TICK_CHECK) + src.currentrun_aftericon = list() + return + + while(currentrun_aftericon.len) + var/client/C = currentrun_aftericon[currentrun_aftericon.len] + currentrun_aftericon.len-- + + if (C) + var/mob/M = C.mob + if(M) + //Auto-update, not forced + M.UpdateMobStat(FALSE) + + if (MC_TICK_CHECK) + src.currentrun_aftericon = list() + return + + if(MC_TICK_CHECK) + src.currentrun_aftericon = list() + return + +//Note: Doesn't account for decals on items. +//Whoever examins an item with a decal first, everyone else will see that items decals. +//Significantly reduces server lag though, like MASSIVELY! +/datum/controller/subsystem/stat/proc/get_flat_icon(client/requester, atom/A) + var/directionless = TRUE + if(ispipewire(A)) + directionless = FALSE + var/what_to_search = "[A.type][directionless ? 0 : A.dir][(istext(A.icon_state) && length(A.icon_state)) ? A.icon_state[1] : "*"]" + //Mobs are more important than items. + //Mob icons will change if their name changes, their type changes or their overlays change. + if(istype(A, /mob)) + var/mob/M = A + var/overlay_hash = "" + for(var/image/I as() in M.overlays) + if(istext(I.icon_state) && length(I.icon_state) >= 1) + overlay_hash = "[overlay_hash][I.icon_state[1]]" + else + overlay_hash = "[overlay_hash]*" //Just to make changes known when lengths change. Doesn't have to be accurate per-say. + what_to_search = "[M.type][M.name][overlay_hash]" + //Makes it shorter + var/thing = flat_icon_cache[what_to_search] + if(thing) + return thing + //Start queuing with the subsystem. + icon_requests["[what_to_search]"] = WEAKREF(A) + src.currentrun_aftericon |= requester + return null + +/datum/controller/subsystem/stat/proc/send_global_alert(title, message) + for(var/client/C in GLOB.clients) + if(C?.tgui_panel) + C.tgui_panel.give_alert_popup(title, message) + +/datum/controller/subsystem/stat/proc/clear_global_alert() + for(var/client/C in GLOB.clients) + if(C?.tgui_panel) + C.tgui_panel.clear_alert_popup() + +#undef FLAT_ICON_CACHE_MAX_SIZE diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm index 7a3528cc3d9fc..5975f6faa7e6f 100644 --- a/code/controllers/subsystem/sun.dm +++ b/code/controllers/subsystem/sun.dm @@ -15,7 +15,7 @@ SUBSYSTEM_DEF(sun) rate = -rate /datum/controller/subsystem/sun/stat_entry(msg) - ..("P:[solars.len]") + . = ..("P:[solars.len]") /datum/controller/subsystem/sun/fire() angle = (360 + angle + rate * 6) % 360 // increase/decrease the angle to the sun, adjusted by the rate diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index 3efdd1a20257c..572cf5c502ac4 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -29,8 +29,16 @@ SUBSYSTEM_DEF(tgui) /datum/controller/subsystem/tgui/Shutdown() close_all_uis() + +/datum/controller/subsystem/tgui/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(open_uis) + .["custom"] = cust + + /datum/controller/subsystem/tgui/stat_entry() - ..("P:[open_uis.len]") + . = ..("P:[open_uis.len]") /datum/controller/subsystem/tgui/fire(resumed = 0) if(!resumed) @@ -42,7 +50,7 @@ SUBSYSTEM_DEF(tgui) current_run.len-- // TODO: Move user/src_object check to process() if(ui && ui.user && ui.src_object) - ui.process() + ui.process(wait * 0.1) else open_uis.Remove(ui) if(MC_TICK_CHECK) @@ -172,6 +180,18 @@ SUBSYSTEM_DEF(tgui) return ui return null +/** + * public + * + * Gets all open UIs on a src object + */ +/datum/controller/subsystem/tgui/proc/get_all_open_uis(datum/src_object) + var/key = "[REF(src_object)]" + // No UIs opened for this src_object + if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list)) + return list() + return open_uis_by_src[key] + /** * public * @@ -190,7 +210,7 @@ SUBSYSTEM_DEF(tgui) for(var/datum/tgui/ui in open_uis_by_src[key]) // Check if UI is valid. if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) - ui.process(force = 1) + ui.process(wait * 0.1, force = 1) count++ return count @@ -249,7 +269,7 @@ SUBSYSTEM_DEF(tgui) return count for(var/datum/tgui/ui in user.tgui_open_uis) if(isnull(src_object) || ui.src_object == src_object) - ui.process(force = 1) + ui.process(wait * 0.1, force = 1) count++ return count diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 76a4f332fda4d..d64c2e96a782d 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -12,8 +12,13 @@ SUBSYSTEM_DEF(throwing) var/list/processing = list() /datum/controller/subsystem/throwing/stat_entry() - ..("P:[processing.len]") + . = ..("P:[processing.len]") +/datum/controller/subsystem/throwing/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust /datum/controller/subsystem/throwing/fire(resumed = 0) if (!resumed) @@ -41,8 +46,8 @@ SUBSYSTEM_DEF(throwing) /datum/thrownthing var/atom/movable/thrownthing - var/atom/target var/turf/target_turf + var/datum/weakref/initial_target var/target_zone var/init_dir var/maxrange @@ -63,15 +68,43 @@ SUBSYSTEM_DEF(throwing) var/delayed_time = 0 var/last_move = 0 + +/datum/thrownthing/New(thrownthing, target, init_dir, maxrange, speed, thrower, diagonals_first, force, callback, target_zone) + . = ..() + src.thrownthing = thrownthing + RegisterSignal(thrownthing, COMSIG_PARENT_QDELETING, .proc/on_thrownthing_qdel) + src.target_turf = get_turf(target) + if(target_turf != target) + src.initial_target = WEAKREF(target) + src.init_dir = init_dir + src.maxrange = maxrange + src.speed = speed + src.thrower = thrower + src.diagonals_first = diagonals_first + src.force = force + src.callback = callback + src.target_zone = target_zone + + /datum/thrownthing/Destroy() SSthrowing.processing -= thrownthing + SSthrowing.currentrun -= thrownthing thrownthing.throwing = null thrownthing = null - target = null thrower = null - callback = null + initial_target = null + if(callback) + QDEL_NULL(callback) //It stores a reference to the thrownthing, its source. Let's clean that. return ..() + +///Defines the datum behavior on the thrownthing's qdeletion event. +/datum/thrownthing/proc/on_thrownthing_qdel(atom/movable/source, force) + SIGNAL_HANDLER + + qdel(src) + + /datum/thrownthing/proc/tick() var/atom/movable/AM = thrownthing if (!isturf(AM.loc) || !AM.throwing) @@ -82,9 +115,15 @@ SUBSYSTEM_DEF(throwing) delayed_time += world.time - last_move return - if (dist_travelled && hitcheck()) //to catch sneaky things moving on our tile while we slept - finalize() - return + var/atom/movable/actual_target = initial_target?.resolve() + + if(dist_travelled) //to catch sneaky things moving on our tile while we slept + for(var/atom/movable/obstacle as anything in get_turf(thrownthing)) + if (obstacle == thrownthing || (obstacle == thrower && !ismob(thrownthing))) + continue + if (obstacle == actual_target || (obstacle.density && !(obstacle.flags_1 & ON_BORDER_1))) + finalize(TRUE, obstacle) + return var/atom/step @@ -111,14 +150,17 @@ SUBSYSTEM_DEF(throwing) finalize() return - AM.Move(step, get_dir(AM, step)) - - if (!AM.throwing) // we hit something during our move - finalize(hit = TRUE) + if(!AM.Move(step, get_dir(AM, step))) // we hit something during our move... + if(AM.throwing) // ...but finalize() wasn't called on Bump() because of a higher level definition that doesn't always call parent. + finalize() return dist_travelled++ + if(actual_target && !(actual_target.pass_flags & LETPASSTHROW) && actual_target.loc == AM.loc) // we crossed a movable with no density (e.g. a mouse or APC) we intend to hit anyway. + finalize(TRUE, actual_target) + return + if (dist_travelled > MAX_THROWING_DIST) finalize() return @@ -130,39 +172,36 @@ SUBSYSTEM_DEF(throwing) return thrownthing.throwing = null if (!hit) - for (var/thing in get_turf(thrownthing)) //looking for our target on the turf we land on. - var/atom/A = thing - if (A == target) + for (var/atom/movable/obstacle as anything in get_turf(thrownthing)) //looking for our target on the turf we land on. + if (obstacle == target) hit = TRUE - thrownthing.throw_impact(A, src) + thrownthing.throw_impact(obstacle, src) + if(QDELETED(thrownthing)) //throw_impact can delete things, such as glasses smashing + return //deletion should already be handled by on_thrownthing_qdel() break if (!hit) thrownthing.throw_impact(get_turf(thrownthing), src) // we haven't hit something yet and we still must, let's hit the ground. + if(QDELETED(thrownthing)) //throw_impact can delete things, such as glasses smashing + return //deletion should already be handled by on_thrownthing_qdel() thrownthing.newtonian_move(init_dir) else thrownthing.newtonian_move(init_dir) if(target) thrownthing.throw_impact(target, src) + if(QDELETED(thrownthing)) //throw_impact can delete things, such as glasses smashing + return //deletion should already be handled by on_thrownthing_qdel() if (callback) callback.Invoke() - + if(!thrownthing.zfalling) // I don't think you can zfall while thrown but hey, just in case. var/turf/T = get_turf(thrownthing) if(T && thrownthing.has_gravity(T)) T.zFall(thrownthing) - qdel(src) - -/datum/thrownthing/proc/hit_atom(atom/A) - finalize(hit=TRUE, target=A) + if(thrownthing) + SEND_SIGNAL(thrownthing, COMSIG_MOVABLE_THROW_LANDED, src) + thrownthing.movement_type &= ~THROWN -/datum/thrownthing/proc/hitcheck() - for (var/thing in get_turf(thrownthing)) - var/atom/movable/AM = thing - if (AM == thrownthing || (AM == thrower && !ismob(thrownthing))) - continue - if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags_1 & ON_BORDER_1)) - finalize(hit=TRUE, target=AM) - return TRUE + qdel(src) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 7549f08982602..cfdd9e63c3480 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -45,6 +45,8 @@ SUBSYSTEM_DEF(ticker) var/maprotatechecked = 0 + var/list/datum/game_mode/runnable_modes //list of runnable gamemodes + var/news_report var/late_join_disabled @@ -57,6 +59,12 @@ SUBSYSTEM_DEF(ticker) var/mode_result = "undefined" var/end_state = "undefined" + //Gamemode setup + var/gamemode_hotswap_disabled = FALSE + var/pre_setup_completed = FALSE + var/fail_counter + var/emergency_start = FALSE + //Crew Objective stuff var/list/crewobjlist = list() var/list/crewobjjobs = list() @@ -113,7 +121,7 @@ SUBSYSTEM_DEF(ticker) continue music -= S - if(isemptylist(music)) + if(!length(music)) music = world.file2list(ROUND_START_MUSIC_LIST, "\n") login_music = pick(music) else @@ -187,6 +195,13 @@ SUBSYSTEM_DEF(ticker) send_tip_of_the_round() tipped = TRUE + if(timeLeft <= 300 && !pre_setup_completed) + //Setup gamemode maps 30 seconds before roundstart. + if(!pre_setup()) + fail_setup() + return + pre_setup_completed = TRUE + if(timeLeft <= 0) current_state = GAME_STATE_SETTING_UP Master.SetRunLevel(RUNLEVEL_SETUP) @@ -194,12 +209,19 @@ SUBSYSTEM_DEF(ticker) fire() if(GAME_STATE_SETTING_UP) + if(!pre_setup_completed) + if(!pre_setup()) + fail_setup() + return + else + message_admins("Pre-setup completed successfully, however was run late. Likely due to start-now or a bug.") + log_game("Pre-setup completed successfully, however was run late. Likely due to start-now or a bug.") + pre_setup_completed = TRUE + //Attempt normal setup if(!setup()) - //setup failed - current_state = GAME_STATE_STARTUP - start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) - timeLeft = null - Master.SetRunLevel(RUNLEVEL_LOBBY) + fail_setup() + else + fail_counter = null if(GAME_STATE_PLAYING) mode.process(wait * 0.1) @@ -213,12 +235,35 @@ SUBSYSTEM_DEF(ticker) declare_completion(force_ending) Master.SetRunLevel(RUNLEVEL_POSTGAME) - -/datum/controller/subsystem/ticker/proc/setup() - message_admins("Setting up game.") - var/init_start = world.timeofday - //Create and announce mode - var/list/datum/game_mode/runnable_modes +//Reverts the game to the lobby +/datum/controller/subsystem/ticker/proc/fail_setup() + if(fail_counter >= 2) + log_game("Failed setting up [GLOB.master_mode] [fail_counter + 1] times, defaulting to extended.") + message_admins("Failed setting up [GLOB.master_mode] [fail_counter + 1] times, defaulting to extended.") + //This has failed enough, lets just get on with extended. + failsafe_pre_setup() + return + //Let's try this again. + fail_counter++ + current_state = GAME_STATE_STARTUP + start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 5) + timeLeft = null + Master.SetRunLevel(RUNLEVEL_LOBBY) + pre_setup_completed = FALSE + //Return to default mode + load_mode() + message_admins("Failed to setup. Failures: ([fail_counter] / 3).") + log_game("Setup failed.") + +//Fallback presetup that sets up extended. +/datum/controller/subsystem/ticker/proc/failsafe_pre_setup() + //Emergerncy start extended. + emergency_start = TRUE + pre_setup_completed = TRUE + mode = config.pick_mode("extended") + +//Select gamemode and load any maps associated with it +/datum/controller/subsystem/ticker/proc/pre_setup() if(GLOB.master_mode == "random" || GLOB.master_mode == "secret") runnable_modes = config.get_runnable_modes() @@ -234,7 +279,7 @@ SUBSYSTEM_DEF(ticker) if(!mode) if(!runnable_modes.len) to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.") - return 0 + return FALSE mode = pickweight(runnable_modes) if(!mode) //too few roundtypes all run too recently mode = pick(runnable_modes) @@ -246,24 +291,30 @@ SUBSYSTEM_DEF(ticker) qdel(mode) mode = null SSjob.ResetOccupations() - return 0 + return FALSE + + return mode.setup_maps() + +/datum/controller/subsystem/ticker/proc/setup() + message_admins("Setting up game.") + var/init_start = world.timeofday CHECK_TICK //Configure mode and assign player to special mode stuff var/can_continue = 0 can_continue = src.mode.pre_setup() //Choose antagonists CHECK_TICK - can_continue = can_continue && SSjob.DivideOccupations() //Distribute jobs + can_continue = can_continue && SSjob.DivideOccupations(mode.required_jobs) //Distribute jobs CHECK_TICK to_chat(world, "Starting game...") - if(!GLOB.Debug2) + if(!GLOB.Debug2 && !emergency_start) if(!can_continue) log_game("[mode.name] failed pre_setup, cause: [mode.setup_error]") QDEL_NULL(mode) to_chat(world, "Error setting up [GLOB.master_mode]. Reverting to pre-game lobby.") SSjob.ResetOccupations() - return 0 + return FALSE else message_admins("DEBUG: Bypassing prestart checks...") @@ -300,7 +351,7 @@ SUBSYSTEM_DEF(ticker) SSdbcore.SetRoundStart() to_chat(world, "Welcome to [station_name()], enjoy your stay!") - SEND_SOUND(world, sound('sound/ai/welcome.ogg')) + SEND_SOUND(world, sound(SSstation.announcer.get_rand_welcome_sound())) current_state = GAME_STATE_PLAYING Master.SetRunLevel(RUNLEVEL_GAME) @@ -311,7 +362,11 @@ SUBSYSTEM_DEF(ticker) var/datum/holiday/holiday = SSevents.holidays[holidayname] to_chat(world, "
[holiday.greet()]
") + //Setup orbits. + SSorbits.post_load_init() + PostSetup() + SSstat.clear_global_alert() return TRUE @@ -323,7 +378,7 @@ SUBSYSTEM_DEF(ticker) var/list/adm = get_admin_counts() var/list/allmins = adm["present"] - send2irc("Server", "Round [GLOB.round_id ? "#[GLOB.round_id]:" : "of"] [hide_mode ? "secret":"[mode.name]"] has started[allmins.len ? ".":" with no active admins online!"]") + send2tgs("Server", "Round [GLOB.round_id ? "#[GLOB.round_id]:" : "of"] [hide_mode ? "secret":"[mode.name]"] has started[allmins.len ? ".":" with no active admins online!"]") setup_done = TRUE for(var/i in GLOB.start_landmarks_list) @@ -350,10 +405,11 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/station_explosion_detonation(atom/bomb) if(bomb) //BOOM - var/turf/epi = bomb.loc qdel(bomb) - if(epi) - explosion(epi, 0, 256, 512, 0, TRUE, TRUE, 0, TRUE) + for(var/mob/M in GLOB.mob_list) + var/turf/T = get_turf(M) + if(T && is_station_level(T.z) && !istype(M.loc, /obj/structure/closet/secure_closet/freezer)) //protip: freezers protect you from nukes + M.gib(TRUE) /datum/controller/subsystem/ticker/proc/create_characters() for(var/mob/dead/new_player/player in GLOB.player_list) @@ -372,22 +428,43 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/equip_characters() - var/captainless=1 + var/captainless = TRUE + var/list/spare_id_candidates = list() + var/highest_rank = length(SSjob.chain_of_command) + 1 + var/enforce_coc = CONFIG_GET(flag/spare_enforce_coc) + for(var/mob/dead/new_player/N in GLOB.player_list) var/mob/living/carbon/human/player = N.new_character if(istype(player) && player.mind && player.mind.assigned_role) if(player.mind.assigned_role == "Captain") - captainless=0 + captainless = FALSE + spare_id_candidates += N + else if(captainless && (player.mind.assigned_role in GLOB.command_positions) && !(is_banned_from(N.ckey, "Captain"))) + if(!enforce_coc) + spare_id_candidates += N + else + var/spare_id_priority = SSjob.chain_of_command[player.mind.assigned_role] + if(spare_id_priority) + if(spare_id_priority < highest_rank) + spare_id_candidates.Cut() + spare_id_candidates += N + highest_rank = spare_id_priority + else if(spare_id_priority == highest_rank) + spare_id_candidates += N if(player.mind.assigned_role != player.mind.special_role) - SSjob.EquipRank(N, player.mind.assigned_role, 0) + SSjob.EquipRank(N, player.mind.assigned_role, FALSE) if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character)) SSquirks.AssignQuirks(N.new_character, N.client, TRUE) CHECK_TICK - if(captainless) - for(var/mob/dead/new_player/N in GLOB.player_list) - if(N.new_character) - to_chat(N, "Captainship not forced on anyone.") - CHECK_TICK + if(length(spare_id_candidates)) //No captain, time to choose acting captain + if(!enforce_coc) + for(var/mob/dead/new_player/player in spare_id_candidates) + SSjob.promote_to_captain(player, captainless) + + else + SSjob.promote_to_captain(pick(spare_id_candidates), captainless) //This is just in case 2 heads of the same priority spawn + CHECK_TICK + /datum/controller/subsystem/ticker/proc/transfer_characters() var/list/livings = list() @@ -397,7 +474,7 @@ SUBSYSTEM_DEF(ticker) qdel(player) living.notransform = TRUE if(living.client) - var/obj/screen/splash/S = new(living.client, TRUE) + var/atom/movable/screen/splash/S = new(living.client, TRUE) S.Fade(TRUE) livings += living if(livings.len) @@ -551,7 +628,7 @@ SUBSYSTEM_DEF(ticker) if(WIZARD_KILLED) news_message = "Tensions have flared with the Space Wizard Federation following the death of one of their members aboard [station_name()]." if(STATION_NUKED) - news_message = "[station_name()] activated its self destruct device for unknown reasons. Attempts to clone the Captain so he can be arrested and executed are underway." + news_message = "[station_name()] activated its self-destruct device for unknown reasons. Attempts to clone the Captain so he can be arrested and executed are underway." if(CLOCK_SUMMON) news_message = "The garbled messages about hailing a mouse and strange energy readings from [station_name()] have been discovered to be an ill-advised, if thorough, prank by a clown." if(CLOCK_SILICONS) @@ -562,7 +639,7 @@ SUBSYSTEM_DEF(ticker) news_message = "During routine evacuation procedures, the emergency shuttle of [station_name()] had its navigation protocols corrupted and went off course, but was recovered shortly after." if(news_message) - send2otherserver(news_source, news_message,"News_Report") + SStopic.crosscomms_send("news_report", news_message, news_source) /datum/controller/subsystem/ticker/proc/GetTimeLeft() if(isnull(SSticker.timeLeft)) @@ -583,17 +660,17 @@ SUBSYSTEM_DEF(ticker) addtimer(CALLBACK(player, /mob/dead/new_player.proc/make_me_an_observer), 1) /datum/controller/subsystem/ticker/proc/load_mode() - var/mode = trim(rustg_file_read("data/mode.txt")) + var/mode = CONFIG_GET(string/master_mode) if(mode) GLOB.master_mode = mode else GLOB.master_mode = "extended" - log_game("Saved mode is '[GLOB.master_mode]'") + log_game("Master mode is '[GLOB.master_mode]'") + log_config("Master mode is '[GLOB.master_mode]'") -/datum/controller/subsystem/ticker/proc/save_mode(the_mode) - var/F = file("data/mode.txt") - fdel(F) - WRITE_FILE(F, the_mode) +/// Returns if either the master mode or the forced secret ruleset matches the mode name. +/datum/controller/subsystem/ticker/proc/is_mode(mode_name) + return GLOB.master_mode == mode_name || GLOB.secret_force_mode == mode_name /datum/controller/subsystem/ticker/proc/SetRoundEndSound(the_sound) set waitfor = FALSE diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm index 3b19ae31cdf6d..44dd26affe1da 100644 --- a/code/controllers/subsystem/time_track.dm +++ b/code/controllers/subsystem/time_track.dm @@ -1,7 +1,8 @@ SUBSYSTEM_DEF(time_track) name = "Time Tracking" - wait = 600 - flags = SS_NO_INIT|SS_NO_TICK_CHECK + wait = 100 + flags = SS_NO_TICK_CHECK + init_order = INIT_ORDER_TIMETRACK runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT var/time_dilation_current = 0 @@ -15,6 +16,74 @@ SUBSYSTEM_DEF(time_track) var/last_tick_realtime = 0 var/last_tick_byond_time = 0 var/last_tick_tickcount = 0 +#ifdef SENDMAPS_PROFILE + var/list/sendmaps_names_map = list( + "SendMaps" = "send_maps", + "SendMaps: Initial housekeeping" = "initial_house", + "SendMaps: Cleanup" = "cleanup", + "SendMaps: Client loop" = "client_loop", + "SendMaps: Per client" = "per_client", + "SendMaps: Per client: Deleted images" = "deleted_images", + "SendMaps: Per client: HUD update" = "hud_update", + "SendMaps: Per client: Statpanel update" = "statpanel_update", + "SendMaps: Per client: Map data" = "map_data", + "SendMaps: Per client: Map data: Check eye position" = "check_eye_pos", + "SendMaps: Per client: Map data: Update chunks" = "update_chunks", + "SendMaps: Per client: Map data: Send turfmap updates" = "turfmap_updates", + "SendMaps: Per client: Map data: Send changed turfs" = "changed_turfs", + "SendMaps: Per client: Map data: Send turf chunk info" = "turf_chunk_info", + "SendMaps: Per client: Map data: Send obj changes" = "obj_changes", + "SendMaps: Per client: Map data: Send mob changes" = "mob_changes", + "SendMaps: Per client: Map data: Send notable turf visual contents" = "send_turf_vis_conts", + "SendMaps: Per client: Map data: Send pending animations" = "pending_animations", + "SendMaps: Per client: Map data: Look for movable changes" = "look_for_movable_changes", + "SendMaps: Per client: Map data: Look for movable changes: Check notable turf visual contents" = "check_turf_vis_conts", + "SendMaps: Per client: Map data: Look for movable changes: Check HUD/image visual contents" = "check_hud/image_vis_contents", + "SendMaps: Per client: Map data: Look for movable changes: Loop through turfs in range" = "turfs_in_range", + "SendMaps: Per client: Map data: Look for movable changes: Movables examined" = "movables_examined", + ) +#endif + +/datum/controller/subsystem/time_track/Initialize(start_timeofday) + . = ..() + GLOB.perf_log = "[GLOB.log_directory]/perf-[GLOB.round_id ? GLOB.round_id : "NULL"]-[SSmapping.config?.map_name].csv" +#ifdef SENDMAPS_PROFILE + world.Profile(PROFILE_RESTART, type = "sendmaps") + //Need to do the sendmaps stuff in its own file, since it works different then everything else + var/list/sendmaps_shorthands = list() + for(var/proper_name in sendmaps_names_map) + sendmaps_shorthands += sendmaps_names_map[proper_name] + sendmaps_shorthands += "[sendmaps_names_map[proper_name]]_count" +#endif + log_perf( + list( + "time", + "players", + "tidi", + "tidi_fastavg", + "tidi_avg", + "tidi_slowavg", + "maptick", + "num_timers", + "air_turf_cost", + "air_eg_cost", + "air_highpressure_cost", + "air_hotspots_cost", + "air_superconductivity_cost", + "air_pipenets_cost", + "air_rebuilds_cost", + "air_turf_count", + "air_eg_count", + "air_hotspot_count", + "air_network_count", + "air_delta_count", + "air_superconductive_count" +#ifdef SENDMAPS_PROFILE + ) + sendmaps_shorthands +#else + ) +#endif + ) /datum/controller/subsystem/time_track/fire() @@ -35,4 +104,57 @@ SUBSYSTEM_DEF(time_track) last_tick_realtime = current_realtime last_tick_byond_time = current_byondtime last_tick_tickcount = current_tickcount + +#ifdef SENDMAPS_PROFILE + var/sendmaps_json = world.Profile(PROFILE_REFRESH, type = "sendmaps", format="json") + var/list/send_maps_data = json_decode(sendmaps_json) + var/send_maps_sort = send_maps_data.Copy() //Doing it like this guarentees us a properly sorted list + + for(var/list/packet in send_maps_data) + send_maps_sort[packet["name"]] = packet + + var/list/send_maps_values = list() + for(var/list/packet in send_maps_sort) + send_maps_values += packet["value"] + send_maps_values += packet["calls"] +#endif + SSblackbox.record_feedback("associative", "time_dilation_current", 1, list("[SQLtime()]" = list("current" = "[time_dilation_current]", "avg_fast" = "[time_dilation_avg_fast]", "avg" = "[time_dilation_avg]", "avg_slow" = "[time_dilation_avg_slow]"))) + log_perf( + list( + world.time, + length(GLOB.clients), + time_dilation_current, + time_dilation_avg_fast, + time_dilation_avg, + time_dilation_avg_slow, + MAPTICK_LAST_INTERNAL_TICK_USAGE, + length(SStimer.timer_id_dict), + SSair.cost_turfs, + SSair.cost_groups, + SSair.cost_highpressure, + SSair.cost_hotspots, + SSair.cost_superconductivity, + SSair.cost_pipenets, + SSair.cost_rebuilds, + length(SSair.hotspots), + length(SSair.networks), + length(SSair.high_pressure_delta), +#ifdef SENDMAPS_PROFILE + ) + send_maps_values +#else + ) +#endif + ) + +#ifdef SENDMAPS_PROFILE +/datum/controller/subsystem/time_track/proc/scream_maptick_data() + var/current_profile_data = world.Profile(PROFILE_REFRESH, type = "sendmaps", format="json") + log_world(current_profile_data) + current_profile_data = json_decode(current_profile_data) + var/output = "" + for(var/list/entry in current_profile_data) + output += "[entry["name"]],[entry["value"]],[entry["calls"]]\n" + log_world(output) + return output +#endif diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index a271e5f5428d0..2c8a1cba37ce7 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -1,52 +1,81 @@ -#define BUCKET_LEN (world.fps*1*60) //how many ticks should we keep in the bucket. (1 minutes worth) -#define BUCKET_POS(timer) (((round((timer.timeToRun - SStimer.head_offset) / world.tick_lag)+1) % BUCKET_LEN)||BUCKET_LEN) -#define TIMER_MAX (world.time + TICKS2DS(min(BUCKET_LEN-(SStimer.practical_offset-DS2TICKS(world.time - SStimer.head_offset))-1, BUCKET_LEN-1))) -#define TIMER_ID_MAX (2**24) //max float with integer precision - +/// Controls how many buckets should be kept, each representing a tick. (1 minutes worth) +#define BUCKET_LEN (world.fps*1*60) +/// Helper for getting the correct bucket for a given timer +#define BUCKET_POS(timer) (((round((timer.timeToRun - timer.timer_subsystem.head_offset) / world.tick_lag)+1) % BUCKET_LEN)||BUCKET_LEN) +/// Gets the maximum time at which timers will be invoked from buckets, used for deferring to secondary queue +#define TIMER_MAX(timer_ss) (world.time + TICKS2DS(min(BUCKET_LEN-(timer_ss.practical_offset-DS2TICKS(world.time - timer_ss.head_offset))-1, BUCKET_LEN-1))) +/// Max float with integer precision +#define TIMER_ID_MAX (2**24) + +/** + * # Timer Subsystem + * + * Handles creation, callbacks, and destruction of timed events. + * + * It is important to understand the 'buckets' used in the timer subsystem are really a timed event. Each bucket is a + * circular doubly-linked list wherein the timed event at position n in the bucket list is a single timed event + * in that bucket's circular list; this can be considered the entry point to that list. + */ SUBSYSTEM_DEF(timer) name = "Timer" - wait = 1 //SS_TICKER subsystem, so wait is in ticks + wait = 1 // SS_TICKER subsystem, so wait is in ticks init_order = INIT_ORDER_TIMER flags = SS_TICKER|SS_NO_INIT var/list/datum/timedevent/second_queue = list() //awe, yes, you've had first queue, but what about second queue? var/list/hashes = list() - - var/head_offset = 0 //world.time of the first entry in the the bucket. - var/practical_offset = 1 //index of the first non-empty item in the bucket. - var/bucket_resolution = 0 //world.tick_lag the bucket was designed for - var/bucket_count = 0 //how many timers are in the buckets - - var/list/bucket_list = list() //list of buckets, each bucket holds every timer that has to run that byond tick. - - var/list/timer_id_dict = list() //list of all active timers assoicated to their timer id (for easy lookup) - - var/list/clienttime_timers = list() //special snowflake timers that run on fancy pansy "client time" - + /// world.time of the first entry in the bucket list, effectively the 'start time' of the current buckets + var/head_offset = 0 + /// Index of the first non-empty bucket + var/practical_offset = 1 + /// world.tick_lag the bucket was designed for + var/bucket_resolution = 0 + /// How many timers are in the buckets + var/bucket_count = 0 + /// List of buckets, each bucket holds every timer that has to run that byond tick + var/list/bucket_list = list() + /// List of all active timers associated to their timer ID (for easy lookup) + var/list/timer_id_dict = list() + /// Special timers that run in real-time, not BYOND time; these are more expensive to run and maintain + var/list/clienttime_timers = list() + /// Contains the last time that a timer's callback was invoked, or the last tick the SS fired if no timers are being processed var/last_invoke_tick = 0 + /// Keeps track of the next index to work on for client timers + var/next_clienttime_timer_index = 0 + /// Contains the last time that a warning was issued for not invoking callbacks var/static/last_invoke_warning = 0 var/static/bucket_auto_reset = TRUE +/datum/controller/subsystem/timer/get_metrics() + . = ..() + var/list/cust = list() + cust["bucket_count"] = bucket_count + .["custom"] = cust + /datum/controller/subsystem/timer/PreInit() bucket_list.len = BUCKET_LEN head_offset = world.time bucket_resolution = world.tick_lag /datum/controller/subsystem/timer/stat_entry(msg) - ..("B:[bucket_count] P:[length(second_queue)] H:[length(hashes)] C:[length(clienttime_timers)] S:[length(timer_id_dict)]") + . = ..("B:[bucket_count] P:[length(second_queue)] H:[length(hashes)] C:[length(clienttime_timers)] S:[length(timer_id_dict)]") /datum/controller/subsystem/timer/fire(resumed = FALSE) + // Store local references to datum vars as it is faster to access them var/lit = last_invoke_tick - var/last_check = world.time - TICKS2DS(BUCKET_LEN*1.5) var/list/bucket_list = src.bucket_list + var/last_check = world.time - TICKS2DS(BUCKET_LEN * 1.5) + // If there are no timers being tracked, then consider now to be the last invoked time if(!bucket_count) last_invoke_tick = world.time + // Check that we have invoked a callback in the last 1.5 minutes of BYOND time, + // and throw a warning and reset buckets if this is true if(lit && lit < last_check && head_offset < last_check && last_invoke_warning < last_check) last_invoke_warning = world.time - var/msg = "No regular timers processed in the last [BUCKET_LEN*1.5] ticks[bucket_auto_reset ? ", resetting buckets" : ""]!" + var/msg = "No regular timers processed in the last [BUCKET_LEN * 1.5] ticks[bucket_auto_reset ? ", resetting buckets" : ""]!" message_admins(msg) WARNING(msg) if(bucket_auto_reset) @@ -59,7 +88,6 @@ SUBSYSTEM_DEF(timer) continue log_world("Active timers at index [i]:") - var/datum/timedevent/bucket_node = bucket_head var/anti_loop_check = 1000 do @@ -71,10 +99,11 @@ SUBSYSTEM_DEF(timer) for(var/I in second_queue) log_world(get_timer_debug_string(I)) - var/next_clienttime_timer_index = 0 - var/len = length(clienttime_timers) - - for (next_clienttime_timer_index in 1 to len) + // Process client-side timers + if (next_clienttime_timer_index) + clienttime_timers.Cut(1, next_clienttime_timer_index + 1) + next_clienttime_timer_index = 0 + for (next_clienttime_timer_index in 1 to length(clienttime_timers)) if (MC_TICK_CHECK) next_clienttime_timer_index-- break @@ -85,7 +114,6 @@ SUBSYSTEM_DEF(timer) var/datum/callback/callBack = ctime_timer.callBack if (!callBack) - clienttime_timers.Cut(next_clienttime_timer_index,next_clienttime_timer_index+1) CRASH("Invalid timer: [get_timer_debug_string(ctime_timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset], REALTIMEOFDAY: [REALTIMEOFDAY]") ctime_timer.spent = REALTIMEOFDAY @@ -94,19 +122,16 @@ SUBSYSTEM_DEF(timer) if(ctime_timer.flags & TIMER_LOOP) ctime_timer.spent = 0 ctime_timer.timeToRun = REALTIMEOFDAY + ctime_timer.wait - BINARY_INSERT(ctime_timer, clienttime_timers, datum/timedevent, timeToRun) + BINARY_INSERT(ctime_timer, clienttime_timers, /datum/timedevent, ctime_timer, timeToRun, COMPARE_KEY) else qdel(ctime_timer) - + // Remove invoked client-time timers if (next_clienttime_timer_index) - clienttime_timers.Cut(1, next_clienttime_timer_index+1) - - if (MC_TICK_CHECK) - return + clienttime_timers.Cut(1, next_clienttime_timer_index + 1) + next_clienttime_timer_index = 0 - var/static/list/spent = list() - var/static/datum/timedevent/timer + var/static/list/invoked_timers = list() if (practical_offset > BUCKET_LEN) head_offset += TICKS2DS(BUCKET_LEN) practical_offset = 1 @@ -118,111 +143,67 @@ SUBSYSTEM_DEF(timer) resumed = FALSE - if (!resumed) - timer = null - - while (practical_offset <= BUCKET_LEN && head_offset + ((practical_offset-1)*world.tick_lag) <= world.time) - var/datum/timedevent/head = bucket_list[practical_offset] - if (!timer || !head || timer == head) - head = bucket_list[practical_offset] - timer = head - while (timer) + // Iterate through each bucket starting from the practical offset + while (practical_offset <= BUCKET_LEN && head_offset + ((practical_offset - 1) * world.tick_lag) <= world.time) + var/datum/timedevent/timer + while ((timer = bucket_list[practical_offset])) var/datum/callback/callBack = timer.callBack if (!callBack) - bucket_resolution = null //force bucket recreation - CRASH("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]") + bucket_resolution = null // force bucket recreation + CRASH("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], \ + head_offset: [head_offset], practical_offset: [practical_offset]") + + timer.bucketEject() //pop the timer off of the bucket list. + // Invoke callback if possible if (!timer.spent) - spent += timer timer.spent = world.time callBack.InvokeAsync() last_invoke_tick = world.time - if (MC_TICK_CHECK) - return - - timer = timer.next - if (timer == head) - break - - - bucket_list[practical_offset++] = null + if (timer.flags & TIMER_LOOP) // Prepare looping timers to re-enter the queue + timer.spent = 0 + timer.timeToRun = world.time + timer.wait + timer.bucketJoin() + else + qdel(timer) - //we freed up a bucket, lets see if anything in second_queue needs to be shifted to that bucket. - var/i = 0 - var/L = length(second_queue) - for (i in 1 to L) - timer = second_queue[i] - if (timer.timeToRun >= TIMER_MAX) - i-- + if (MC_TICK_CHECK) break - if (timer.timeToRun < head_offset) - bucket_resolution = null //force bucket recreation - stack_trace("[i] Invalid timer state: Timer in long run queue with a time to run less then head_offset. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]") - - if (timer.callBack && !timer.spent) - timer.callBack.InvokeAsync() - spent += timer - bucket_count++ - else if(!QDELETED(timer)) - qdel(timer) - continue - - if (timer.timeToRun < head_offset + TICKS2DS(practical_offset-1)) - bucket_resolution = null //force bucket recreation - stack_trace("[i] Invalid timer state: Timer in long run queue that would require a backtrack to transfer to short run queue. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]") - if (timer.callBack && !timer.spent) - timer.callBack.InvokeAsync() - spent += timer - bucket_count++ - else if(!QDELETED(timer)) - qdel(timer) - continue - - bucket_count++ - var/bucket_pos = max(1, BUCKET_POS(timer)) - - var/datum/timedevent/bucket_head = bucket_list[bucket_pos] - if (!bucket_head) - bucket_list[bucket_pos] = timer - timer.next = null - timer.prev = null - continue - - if (!bucket_head.prev) - bucket_head.prev = bucket_head - timer.next = bucket_head - timer.prev = bucket_head.prev - timer.next.prev = timer - timer.prev.next = timer - if (i) - second_queue.Cut(1, i+1) - - timer = null - - bucket_count -= length(spent) - - for (var/i in spent) - var/datum/timedevent/qtimer = i - if(QDELETED(qtimer)) - bucket_count++ - continue - if(!(qtimer.flags & TIMER_LOOP)) - qdel(qtimer) - else - bucket_count++ - qtimer.spent = 0 - qtimer.bucketEject() - if(qtimer.flags & TIMER_CLIENT_TIME) - qtimer.timeToRun = REALTIMEOFDAY + qtimer.wait - else - qtimer.timeToRun = world.time + qtimer.wait - qtimer.bucketJoin() - - spent.len = 0 + if (!bucket_list[practical_offset]) + // Empty the bucket, check if anything in the secondary queue should be shifted to this bucket + bucket_list[practical_offset++] = null + var/i = 0 + for (i in 1 to length(second_queue)) + timer = second_queue[i] + if (timer.timeToRun >= TIMER_MAX(src)) + i-- + break + + // Check for timers that are scheduled to run in the past + if (timer.timeToRun < head_offset) + bucket_resolution = null // force bucket recreation + stack_trace("[i] Invalid timer state: Timer in long run queue with a time to run less then head_offset. \ + [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]") + break + + // Check for timers that are not capable of being scheduled to run without rebuilding buckets + if (timer.timeToRun < head_offset + TICKS2DS(practical_offset - 1)) + bucket_resolution = null // force bucket recreation + stack_trace("[i] Invalid timer state: Timer in long run queue that would require a backtrack to transfer to \ + short run queue. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]") + break + + timer.bucketJoin() + if (i) + second_queue.Cut(1, i+1) + if (MC_TICK_CHECK) + break -//formated this way to be runtime resistant +/** + * Generates a string with details about the timed event for debugging purposes + */ /datum/controller/subsystem/timer/proc/get_timer_debug_string(datum/timedevent/TE) . = "Timer: [TE]" . += "Prev: [TE.prev ? TE.prev : "NULL"], Next: [TE.next ? TE.next : "NULL"]" @@ -233,12 +214,16 @@ SUBSYSTEM_DEF(timer) if(!TE.callBack) . += ", NO CALLBACK" +/** + * Destroys the existing buckets and creates new buckets from the existing timed events + */ /datum/controller/subsystem/timer/proc/reset_buckets() - var/list/bucket_list = src.bucket_list + var/list/bucket_list = src.bucket_list // Store local reference to datum var, this is faster var/list/alltimers = list() - //collect the timers currently in the bucket + + // Get all timers currently in the buckets for (var/bucket_head in bucket_list) - if (!bucket_head) + if (!bucket_head) // if bucket is empty for this tick continue var/datum/timedevent/bucket_node = bucket_head do @@ -246,25 +231,38 @@ SUBSYSTEM_DEF(timer) bucket_node = bucket_node.next while(bucket_node && bucket_node != bucket_head) + // Empty the list by zeroing and re-assigning the length bucket_list.len = 0 bucket_list.len = BUCKET_LEN + // Reset values for the subsystem to their initial values practical_offset = 1 bucket_count = 0 head_offset = world.time bucket_resolution = world.tick_lag + // Add all timed events from the secondary queue as well alltimers += second_queue + + // If there are no timers being tracked by the subsystem, + // there is no need to do any further rebuilding if (!length(alltimers)) return + // Sort all timers by time to run sortTim(alltimers, .proc/cmp_timer) + // Get the earliest timer, and if the TTR is earlier than the current world.time, + // then set the head offset appropriately to be the earliest time tracked by the + // current set of buckets var/datum/timedevent/head = alltimers[1] - if (head.timeToRun < head_offset) head_offset = head.timeToRun + // Iterate through each timed event and insert it into an appropriate bucket, + // up unto the point that we can no longer insert into buckets as the TTR + // is outside the range we are tracking, then insert the remainder into the + // secondary queue var/new_bucket_count var/i = 1 for (i in 1 to length(alltimers)) @@ -272,34 +270,37 @@ SUBSYSTEM_DEF(timer) if (!timer) continue - var/bucket_pos = BUCKET_POS(timer) - if (timer.timeToRun >= TIMER_MAX) + // Check that the TTR is within the range covered by buckets, when exceeded we've finished + if (timer.timeToRun >= TIMER_MAX(src)) i-- break - + // Check that timer has a valid callback and hasn't been invoked if (!timer.callBack || timer.spent) WARNING("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]") if (timer.callBack) qdel(timer) continue + // Insert the timer into the bucket, and perform necessary circular doubly-linked list operations new_bucket_count++ + var/bucket_pos = BUCKET_POS(timer) var/datum/timedevent/bucket_head = bucket_list[bucket_pos] if (!bucket_head) bucket_list[bucket_pos] = timer timer.next = null timer.prev = null continue - if (!bucket_head.prev) bucket_head.prev = bucket_head timer.next = bucket_head timer.prev = bucket_head.prev timer.next.prev = timer timer.prev.next = timer + + // Cut the timers that are tracked by the buckets from the secondary queue if (i) - alltimers.Cut(1, i+1) + alltimers.Cut(1, i + 1) second_queue = alltimers bucket_count = new_bucket_count @@ -310,46 +311,68 @@ SUBSYSTEM_DEF(timer) timer_id_dict |= SStimer.timer_id_dict bucket_list |= SStimer.bucket_list +/** + * # Timed Event + * + * This is the actual timer, it contains the callback and necessary data to maintain + * the timer. + * + * See the documentation for the timer subsystem for an explanation of the buckets referenced + * below in next and prev + */ /datum/timedevent + /// ID used for timers when the TIMER_STOPPABLE flag is present var/id + /// The callback to invoke after the timer completes var/datum/callback/callBack + /// The time at which the callback should be invoked at var/timeToRun + /// The length of the timer var/wait + /// Unique hash generated when TIMER_UNIQUE flag is present var/hash + /// The source of the timedevent, whatever called addtimer + var/source + /// Flags associated with the timer, see _DEFINES/subsystems.dm var/list/flags - var/spent = 0 //time we ran the timer. - var/name //for easy debugging. - //cicular doublely linked list + /// Time at which the timer was invoked or destroyed + var/spent = 0 + /// An informative name generated for the timer, useful for bugging + var/name + /// Next timed event in the bucket var/datum/timedevent/next + /// Previous timed event in the bucket var/datum/timedevent/prev + /// The timer subsystem this event is associated with + var/datum/controller/subsystem/timer/timer_subsystem -/datum/timedevent/New(datum/callback/callBack, wait, flags, hash) +/datum/timedevent/New(datum/callback/callBack, wait, flags, datum/controller/subsystem/timer/timer_subsystem, hash, source) var/static/nextid = 1 id = TIMER_ID_NULL src.callBack = callBack src.wait = wait src.flags = flags src.hash = hash + src.source = source + src.timer_subsystem = timer_subsystem || SStimer - if (flags & TIMER_CLIENT_TIME) - timeToRun = REALTIMEOFDAY + wait - else - timeToRun = world.time + wait + // Determine time at which the timer's callback should be invoked + timeToRun = (flags & TIMER_CLIENT_TIME ? REALTIMEOFDAY : world.time) + wait + // Include the timer in the hash table if the timer is unique if (flags & TIMER_UNIQUE) - SStimer.hashes[hash] = src + timer_subsystem.hashes[hash] = src + // Generate ID for the timer if the timer is stoppable, include in the timer id dictionary if (flags & TIMER_STOPPABLE) id = num2text(nextid, 100) if (nextid >= SHORT_REAL_LIMIT) - nextid += min(1, 2**round(nextid/SHORT_REAL_LIMIT)) + nextid += min(1, 2 ** round(nextid / SHORT_REAL_LIMIT)) else nextid++ - SStimer.timer_id_dict[id] = src + timer_subsystem.timer_id_dict[id] = src - name = "Timer: [id] (\ref[src]), TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT", "TIMER_LOOP")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])" - - if ((timeToRun < world.time || timeToRun < SStimer.head_offset) && !(flags & TIMER_CLIENT_TIME)) + if ((timeToRun < world.time || timeToRun < timer_subsystem.head_offset) && !(flags & TIMER_CLIENT_TIME)) CRASH("Invalid timer state: Timer created that would require a backtrack to run (addtimer would never let this happen): [SStimer.get_timer_debug_string(src)]") if (callBack.object != GLOBAL_PROC && !QDESTROYING(callBack.object)) @@ -360,7 +383,7 @@ SUBSYSTEM_DEF(timer) /datum/timedevent/Destroy() ..() if (flags & TIMER_UNIQUE && hash) - SStimer.hashes -= hash + timer_subsystem.hashes -= hash if (callBack && callBack.object && callBack.object != GLOBAL_PROC && callBack.object.active_timers) callBack.object.active_timers -= src @@ -369,12 +392,12 @@ SUBSYSTEM_DEF(timer) callBack = null if (flags & TIMER_STOPPABLE) - SStimer.timer_id_dict -= id + timer_subsystem.timer_id_dict -= id if (flags & TIMER_CLIENT_TIME) if (!spent) spent = world.time - SStimer.clienttime_timers -= src + timer_subsystem.clienttime_timers -= src return QDEL_HINT_IWILLGC if (!spent) @@ -389,23 +412,39 @@ SUBSYSTEM_DEF(timer) prev = null return QDEL_HINT_IWILLGC +/** + * Removes this timed event from any relevant buckets, or the secondary queue + */ /datum/timedevent/proc/bucketEject() + // Attempt to find bucket that contains this timed event var/bucketpos = BUCKET_POS(src) - var/list/bucket_list = SStimer.bucket_list - var/list/second_queue = SStimer.second_queue + + // Store local references for the bucket list and secondary queue + // This is faster than referencing them from the datum itself + var/list/bucket_list = timer_subsystem.bucket_list + var/list/second_queue = timer_subsystem.second_queue + + // Attempt to get the head of the bucket var/datum/timedevent/buckethead if(bucketpos > 0) buckethead = bucket_list[bucketpos] + + // Decrement the number of timers in buckets if the timed event is + // the head of the bucket, or has a TTR less than TIMER_MAX implying it fits + // into an existing bucket, or is otherwise not present in the secondary queue if(buckethead == src) bucket_list[bucketpos] = next - SStimer.bucket_count-- - else if(timeToRun < TIMER_MAX || next || prev) - SStimer.bucket_count-- + timer_subsystem.bucket_count-- + else if(timeToRun < TIMER_MAX(timer_subsystem)) + timer_subsystem.bucket_count-- else var/l = length(second_queue) second_queue -= src if(l == length(second_queue)) - SStimer.bucket_count-- + timer_subsystem.bucket_count-- + + // Remove the timed event from the bucket, ensuring to maintain + // the integrity of the bucket's list if relevant if(prev != next) prev.next = next next.prev = prev @@ -414,32 +453,47 @@ SUBSYSTEM_DEF(timer) next?.prev = null prev = next = null +/** + * Attempts to add this timed event to a bucket, will enter the secondary queue + * if there are no appropriate buckets at this time. + * + * Secondary queueing of timed events will occur when the timespan covered by the existing + * buckets is exceeded by the time at which this timed event is scheduled to be invoked. + * If the timed event is tracking client time, it will be added to a special bucket. + */ /datum/timedevent/proc/bucketJoin() - var/list/L + // Generate debug-friendly name for timer + var/static/list/bitfield_flags = list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT", "TIMER_LOOP") + name = "Timer: [id] (\ref[src]), TTR: [timeToRun], wait:[wait] Flags: [jointext(bitfield2list(flags, bitfield_flags), ", ")], \ + callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), \ + callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""]), source: [source]" + // Check if this timed event should be diverted to the client time bucket, or the secondary queue + var/list/L if (flags & TIMER_CLIENT_TIME) - L = SStimer.clienttime_timers - else if (timeToRun >= TIMER_MAX) - L = SStimer.second_queue - + L = timer_subsystem.clienttime_timers + else if (timeToRun >= TIMER_MAX(timer_subsystem)) + L = timer_subsystem.second_queue if(L) - BINARY_INSERT(src, L, datum/timedevent, timeToRun) + BINARY_INSERT(src, L, /datum/timedevent, src, timeToRun, COMPARE_KEY) return - //get the list of buckets - var/list/bucket_list = SStimer.bucket_list + // Get a local reference to the bucket list, this is faster than referencing the datum + var/list/bucket_list = timer_subsystem.bucket_list - //calculate our place in the bucket list + // Find the correct bucket for this timed event var/bucket_pos = BUCKET_POS(src) - - //get the bucket for our tick var/datum/timedevent/bucket_head = bucket_list[bucket_pos] - SStimer.bucket_count++ - //empty bucket, we will just add ourselves + timer_subsystem.bucket_count++ + + // If there is no timed event at this position, then the bucket is 'empty' + // and we can just set this event to that position if (!bucket_head) bucket_list[bucket_pos] = src return - //other wise, lets do a simplified linked list add. + + // Otherwise, we merely add this timed event into the bucket, which is a + // circularly doubly-linked list if (!bucket_head.prev) bucket_head.prev = bucket_head next = bucket_head @@ -447,6 +501,9 @@ SUBSYSTEM_DEF(timer) next.prev = src prev.next = src +/** + * Returns a string of the type of the callback for this timer + */ /datum/timedevent/proc/getcallingtype() . = "ERROR" if (callBack.object == GLOBAL_PROC) @@ -454,8 +511,16 @@ SUBSYSTEM_DEF(timer) else . = "[callBack.object.type]" -/proc/addtimer(datum/callback/callback, wait = 0, flags = 0) - +/** + * Create a new timer and insert it in the queue. + * You should not call this directly, and should instead use the addtimer macro, which includes source information. + * + * Arguments: + * * callback the callback to call on timer finish + * * wait deciseconds to run the timer for + * * flags flags for this timer, see: code\__DEFINES\subsystems.dm + */ +/proc/_addtimer(datum/callback/callback, wait = 0, flags = 0, datum/controller/subsystem/timer/timer_subsystem, file, line) if (!callback) CRASH("addtimer called without a callback") @@ -470,8 +535,10 @@ SUBSYSTEM_DEF(timer) if(wait >= INFINITY) CRASH("Attempted to create timer with INFINITY delay") - var/hash + timer_subsystem = timer_subsystem || SStimer + // Generate hash if relevant for timed events with the TIMER_UNIQUE flag + var/hash if (flags & TIMER_UNIQUE) var/list/hashlist if(flags & TIMER_NO_HASH_WAIT) @@ -481,13 +548,13 @@ SUBSYSTEM_DEF(timer) hashlist += callback.arguments hash = hashlist.Join("|||||||") - var/datum/timedevent/hash_timer = SStimer.hashes[hash] + var/datum/timedevent/hash_timer = timer_subsystem.hashes[hash] if(hash_timer) - if (hash_timer.spent) //it's pending deletion, pretend it doesn't exist. - hash_timer.hash = null //but keep it from accidentally deleting us + if (hash_timer.spent) // it's pending deletion, pretend it doesn't exist. + hash_timer.hash = null // but keep it from accidentally deleting us else if (flags & TIMER_OVERRIDE) - hash_timer.hash = null //no need having it delete it's hash if we are going to replace it + hash_timer.hash = null // no need having it delete it's hash if we are going to replace it qdel(hash_timer) else if (hash_timer.flags & TIMER_STOPPABLE) @@ -496,10 +563,16 @@ SUBSYSTEM_DEF(timer) else if(flags & TIMER_OVERRIDE) stack_trace("TIMER_OVERRIDE used without TIMER_UNIQUE") - var/datum/timedevent/timer = new(callback, wait, flags, hash) + var/datum/timedevent/timer = new(callback, wait, flags, timer_subsystem, hash, file && "[file]:[line]") return timer.id -/proc/deltimer(id) +/** + * Delete a timer + * + * Arguments: + * * id a timerid or a /datum/timedevent + */ +/proc/deltimer(id, datum/controller/subsystem/timer/timer_subsystem) if (!id) return FALSE if (id == TIMER_ID_NULL) @@ -508,13 +581,34 @@ SUBSYSTEM_DEF(timer) if (istype(id, /datum/timedevent)) qdel(id) return TRUE + timer_subsystem = timer_subsystem || SStimer //id is string - var/datum/timedevent/timer = SStimer.timer_id_dict[id] + var/datum/timedevent/timer = timer_subsystem.timer_id_dict[id] if (timer && !timer.spent) qdel(timer) return TRUE return FALSE +/** + * Get the remaining deciseconds on a timer + * + * Arguments: + * * id a timerid or a /datum/timedevent + */ +/proc/timeleft(id, datum/controller/subsystem/timer/timer_subsystem) + if (!id) + return null + if (id == TIMER_ID_NULL) + CRASH("Tried to get timeleft of a null timerid. Use TIMER_STOPPABLE flag") + if (istype(id, /datum/timedevent)) + var/datum/timedevent/timer = id + return timer.timeToRun - world.time + timer_subsystem = timer_subsystem || SStimer + //id is string + var/datum/timedevent/timer = timer_subsystem.timer_id_dict[id] + if (timer && !timer.spent) + return timer.timeToRun - world.time + return null #undef BUCKET_LEN #undef BUCKET_POS diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index a8fb5e8334705..6ff7db35a5019 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(title) if(length(provisional_title_screens)) file_path = "[global.config.directory]/title_screens/images/[pick(provisional_title_screens)]" else - file_path = "icons/default_title.dmi" + file_path = "icons/runtime/default_title.dmi" ASSERT(fexists(file_path)) @@ -50,7 +50,7 @@ SUBSYSTEM_DEF(title) for(var/thing in GLOB.clients) if(!thing) continue - var/obj/screen/splash/S = new(thing, FALSE) + var/atom/movable/screen/splash/S = new(thing, FALSE) S.Fade(FALSE,FALSE) /datum/controller/subsystem/title/Recover() diff --git a/code/controllers/subsystem/topic.dm b/code/controllers/subsystem/topic.dm new file mode 100644 index 0000000000000..6d168bd40a53d --- /dev/null +++ b/code/controllers/subsystem/topic.dm @@ -0,0 +1,128 @@ +SUBSYSTEM_DEF(topic) + name = "Topic" + init_order = INIT_ORDER_TOPIC + flags = SS_NO_FIRE + +/datum/controller/subsystem/topic/Initialize(timeofday) + // Initialize topic datums + var/list/anonymous_functions = list() + for(var/path in subtypesof(/datum/world_topic)) + var/datum/world_topic/T = new path() + if(T.anonymous) + anonymous_functions[T.key] = TRUE + GLOB.topic_commands[T.key] = T + + // Setup the anonymous access token + GLOB.topic_tokens["anonymous"] = anonymous_functions + // Parse and setup authed tokens from config + var/list/tokens = CONFIG_GET(keyed_list/comms_key) + for(var/token in tokens) + var/list/keys = list() + if(tokens[token] == "all") + for(var/key in GLOB.topic_commands) + keys[key] = TRUE + else + for(var/key in splittext(tokens[token], ",")) + keys[trim(key)] = TRUE + // Grant access to anonymous topic calls (version, authed functions etc.) by default + keys |= anonymous_functions + GLOB.topic_tokens[token] = keys + + var/list/servers = CONFIG_GET(keyed_list/cross_server) + for(var/server in servers) + handshake_server(server, servers[server]) + + return ..() + +/* + A bit of background for future coders maintaining this: + When we contact a server or we contact a server to handshake, there are two outcomes to account for: + + First, if the server being contacted has freshly rebooted, they will have no knowledge of us, + and as such will need to store our server details too by sending a handshake request back to us for information. + + Second, if we rebooted while the other server was mid-round, they simply can send back the current details they have about us, + and don't need to get any additional information of their own. + + Code for handling requests is in world_topic.dm + + Basically, this proc exists to allow servers to make ad-hoc connections, going offline and coming back up without interrupting anything. +*/ +/datum/controller/subsystem/topic/proc/handshake_server(addr, key) + set waitfor = FALSE + var/logging = CONFIG_GET(flag/log_world_topic) + var/request = list("query" = "api_do_handshake", "auth" = key, "source" = CONFIG_GET(string/cross_comms_name)) + var/response_raw = world.Export("[addr]?[json_encode(request)]") + request["auth"] = "***[copytext(request["auth"], -4)]" + if(!response_raw) + if(logging) + log_topic("Topic handshake with [addr] failed. Server did not return a response. Payload: \"[json_encode(request)]\"") + return + var/response = json_decode(response_raw) + if(response["statuscode"] != 200) + if(logging) + log_topic("Topic handshake with [addr] failed. Payload: \"[json_encode(request)]\", Response: \"[response_raw]\"") + return + var/list/local_funcs = GLOB.topic_tokens[LAZYACCESS(response["data"], "token")] + var/list/remote_funcs = LAZYACCESS(response["data"], "functions") + if(!local_funcs || !remote_funcs) + if(logging) + log_topic("Topic handshake with [addr] completed, but no mutual functions were found. Payload: \"[json_encode(request)]\", Response: \"[response_raw]\"") + return + var/list/functions = list() + // Both servers need to have a function available to each other for it to be valid + for(var/func in remote_funcs) + if(local_funcs[func]) + functions[func] = TRUE + GLOB.topic_servers[addr] = functions + if(logging) + log_topic("Handshake with [addr] successful.") + +/** + * Wrapper proc for world.Export() that adds additional params and handles auth. + * + * Params: + * + * * addr: address of the recieving BYOND server (*including* the byond://) + * * query: name of the topic endpoint to request + * * params: associated list of parameters to send to the recieving server + * * anonymous: TRUE or FALSE whether to use anonymous token for the request *(default: FALSE)* + * Note that request will fail if a token cannot be found for the target server and anonymous is not set. + * * nocheck: TRUE or FALSE whether to check if the recieving server is authorized to get the topic call *(default: FALSE)* +*/ +/datum/controller/subsystem/topic/proc/export(addr, query, list/params, anonymous = FALSE, nocheck = FALSE) + var/list/request = list() + request["query"] = query + + if(anonymous) + var/datum/world_topic/topic = GLOB.topic_commands[query] + if((!istype(topic) || !topic.anonymous) && !nocheck) + return + request["auth"] = "anonymous" + else + var/list/servers = CONFIG_GET(keyed_list/cross_server) + if(!servers[addr] || (!LAZYACCESS(GLOB.topic_servers[addr], query) && !nocheck)) + return // Couldn't find an authorized key, or trying to send secure data to unsecure server + request["auth"] = servers[addr] + + request.Add(params) + request["source"] = CONFIG_GET(string/cross_comms_name) + var/result = world.Export("[addr]?[rustg_url_encode(json_encode(request))]") + if(CONFIG_GET(flag/log_world_topic)) + request["auth"] = "***[copytext(request["auth"], -4)]" + log_topic("outgoing: \"[json_encode(request)]\", response: \"[result]\", auth: [request["auth"]], to: [addr], anonymous: [anonymous]") + +/** + * Broadcast topic to all known authorized servers for things like comms consoles or ahelps. + * Follows a set topic format for ease of use, and is therefore incompatible with other topic endpoints. + * + * Params: + * + * * query: name of the topic endpoint for the requests + * * msg: message text to send + * * sender: name of the sending entity (station name, ckey etc) +*/ +/datum/controller/subsystem/topic/proc/crosscomms_send(query, msg, sender) + var/list/servers = CONFIG_GET(keyed_list/cross_server) + for(var/I in servers) + export(I, query, list("message" = msg, "message_sender" = sender)) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index cbe52b6218246..76c967f4c8b8c 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -68,7 +68,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/pda/clown, /obj/item/grown/bananapeel)), "greytide" = typecacheof(list(/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod, - /obj/item/twohanded/spear, /obj/item/clothing/mask/gas)), + /obj/item/spear, /obj/item/clothing/mask/gas/old)), "lizards" = typecacheof(list(/obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail, /obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)), @@ -109,7 +109,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)), "the supernatural" = typecacheof(list(/obj/structure/destructible/cult, /obj/item/tome, - /obj/item/melee/cultblade, /obj/item/twohanded/required/cult_bastard, /obj/item/restraints/legcuffs/bola/cult, + /obj/item/melee/cultblade, /obj/item/cult_bastard, /obj/item/restraints/legcuffs/bola/cult, /obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/hardsuit/cult, /obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune, /obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie, @@ -139,7 +139,7 @@ SUBSYSTEM_DEF(traumas) "anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi, /obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja, - /obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/twohanded/vibro_weapon, + /obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/vibro_weapon, /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)) ) @@ -153,7 +153,7 @@ SUBSYSTEM_DEF(traumas) phobia_species = list("lizards" = typecacheof(list(/datum/species/lizard)), "skeletons" = typecacheof(list(/datum/species/skeleton, /datum/species/plasmaman)), - "conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard, /datum/species/synth)), + "conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard)), "robots" = typecacheof(list(/datum/species/android)), "the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /datum/species/golem/runic)), "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/jelly, /datum/species/pod, diff --git a/code/controllers/subsystem/vis_overlays.dm b/code/controllers/subsystem/vis_overlays.dm index d67ce85bce9fa..65805d4faf7cc 100644 --- a/code/controllers/subsystem/vis_overlays.dm +++ b/code/controllers/subsystem/vis_overlays.dm @@ -26,6 +26,7 @@ SUBSYSTEM_DEF(vis_overlays) overlay.unused = world.time else if(overlay.unused && overlay.unused + overlay.cache_expiration < world.time) vis_overlay_cache -= key + unique_vis_overlays -= overlay qdel(overlay) if(MC_TICK_CHECK) return @@ -81,6 +82,8 @@ SUBSYSTEM_DEF(vis_overlays) UnregisterSignal(thing, COMSIG_ATOM_DIR_CHANGE) /datum/controller/subsystem/vis_overlays/proc/rotate_vis_overlay(atom/thing, old_dir, new_dir) + SIGNAL_HANDLER + if(old_dir == new_dir) return var/rotation = dir2angle(old_dir) - dir2angle(new_dir) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 0a05cd0bdf1bd..6a0a296ac578e 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -6,42 +6,36 @@ SUBSYSTEM_DEF(vote) runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT - var/initiator = null - var/started_time = null + var/mode + var/question + var/initiator + var/started_time var/time_remaining = 0 - var/mode = null - var/question = null - var/list/choices = list() var/list/voted = list() var/list/voting = list() + var/list/choices = list() + var/list/choice_by_ckey = list() var/list/generated_actions = list() /datum/controller/subsystem/vote/fire() //called by master_controller - if(mode) - time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10) - - if(time_remaining < 0) - result() - for(var/client/C in voting) - C << browse(null, "window=vote;can_close=0") - reset() - else - var/datum/browser/client_popup - for(var/client/C in voting) - client_popup = new(C, "vote", "Voting Panel") - client_popup.set_window_options("can_close=0") - client_popup.set_content(interface(C)) - client_popup.open(FALSE) - + if(!mode) + return + time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10) + if(time_remaining < 0) + result() + SStgui.close_uis(src) + reset() /datum/controller/subsystem/vote/proc/reset() - initiator = null - time_remaining = 0 mode = null - question = null - choices.Cut() voted.Cut() voting.Cut() + choices.Cut() + question = null + initiator = null + time_remaining = 0 + choice_by_ckey.Cut() + remove_action_buttons() /datum/controller/subsystem/vote/proc/get_result() @@ -135,18 +129,15 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/proc/result() . = announce_result() - var/restart = 0 + var/restart = FALSE if(.) switch(mode) if("restart") if(. == "Restart Round") - restart = 1 + restart = TRUE if("gamemode") if(GLOB.master_mode != .) - SSticker.save_mode(.) - if(SSticker.HasRoundStarted()) - restart = 1 - else + if(!SSticker.HasRoundStarted()) GLOB.master_mode = . if("map") SSmapping.changemap(global.config.maplist[.]) @@ -154,14 +145,15 @@ SUBSYSTEM_DEF(vote) if("transfer") if(. == "Initiate Crew Transfer") SSshuttle.requestEvac(null, "Crew Transfer Requested.") + SSshuttle.emergencyNoRecall = TRUE //Prevent Recall. var/obj/machinery/computer/communications/C = locate() in GLOB.machines if(C) C.post_status("shuttle") if(restart) - var/active_admins = 0 - for(var/client/C in GLOB.admins) + var/active_admins = FALSE + for(var/client/C in GLOB.admins+GLOB.deadmins) if(!C.is_afk() && check_rights_for(C, R_SERVER)) - active_admins = 1 + active_admins = TRUE break if(!active_admins) SSticker.Reboot("Restart vote successful.", "restart vote") @@ -172,15 +164,21 @@ SUBSYSTEM_DEF(vote) return . /datum/controller/subsystem/vote/proc/submit_vote(vote) - if(mode) - if(CONFIG_GET(flag/no_dead_vote) && (usr.stat == DEAD && !isnewplayer(usr)) && !usr.client.holder && mode != "map") - return 0 - if(!(usr.ckey in voted)) - if(vote && 1<=vote && vote<=choices.len) - voted += usr.ckey - choices[choices[vote]]++ //check this - return vote - return 0 + if(!mode) + return FALSE + if(CONFIG_GET(flag/no_dead_vote) && (usr.stat == DEAD && !isnewplayer(usr)) && !usr.client.holder && mode != "map") + return FALSE + if(!(vote && 1<=vote && vote<=choices.len)) + return FALSE + // If user has already voted + if(usr.ckey in voted) + choices[choices[choice_by_ckey[usr.ckey]]]-- + else + voted += usr.ckey + + choice_by_ckey[usr.ckey] = vote + choices[choices[vote]]++ //check this + return vote /datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, forced=FALSE, popup=FALSE) if(!mode) @@ -190,12 +188,12 @@ SUBSYSTEM_DEF(vote) to_chat(usr, "There is already a vote in progress! please wait for it to finish.") return 0 - var/admin = FALSE + var/lower_admin = FALSE var/ckey = ckey(initiator_key) if(GLOB.admin_datums[ckey] || forced) - admin = TRUE + lower_admin = TRUE - if(next_allowed_time > world.time && !admin) + if(next_allowed_time > world.time && !lower_admin) to_chat(usr, "A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!") return 0 @@ -237,7 +235,7 @@ SUBSYSTEM_DEF(vote) text += "\n[question]" log_vote(text) var/vp = CONFIG_GET(number/vote_period) - to_chat(world, "\n[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote.") + to_chat(world, "\n[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote.") time_remaining = round(vp/10) for(var/c in GLOB.clients) var/client/C = c @@ -254,95 +252,80 @@ SUBSYSTEM_DEF(vote) return 1 return 0 -/datum/controller/subsystem/vote/proc/interface(client/C) - if(!C) - return - var/admin = 0 - var/trialmin = 0 - if(C.holder) - admin = 1 - if(check_rights_for(C, R_ADMIN)) - trialmin = 1 - voting |= C - - if(mode) - if(question) - . += "Vote: '[question]'
" - else - . += "Vote: [capitalize(mode)]
" - . += "Time Left: [time_remaining] s- "
- for(var/i=1,i<=choices.len,i++)
- var/votes = choices[choices[i]]
- if(!votes)
- votes = 0
- . += "
- [choices[i]] ([votes] votes) " - . += "
" - if(admin) - . += "(Cancel Vote) " - else - . += "
Start a vote:
- " - //restart - var/avr = CONFIG_GET(flag/allow_vote_restart) - if(trialmin || avr) - . += "Restart" - else - . += "Restart (Disallowed)" - if(trialmin) - . += "\t([avr ? "Allowed" : "Disallowed"])" - . += "
- " - //gamemode - var/avm = CONFIG_GET(flag/allow_vote_mode) - if(trialmin || avm) - . += "GameMode" - else - . += "GameMode (Disallowed)" - if(trialmin) - . += "\t([avm ? "Allowed" : "Disallowed"])" - - . += " " - //map - var/avmap = CONFIG_GET(flag/allow_vote_map) - if(trialmin || avmap) - . += "Map" - else - . += "Map (Disallowed)" - if(trialmin) - . += "\t([avmap ? "Allowed" : "Disallowed"])" - - . += "" - //custom - if(trialmin) - . += "
- Custom " - . += "
" - . += "Close" - return . - +/datum/controller/subsystem/vote/proc/remove_action_buttons() + for(var/v in generated_actions) + var/datum/action/vote/V = v + if(!QDELETED(V)) + V.remove_from_client() + V.Remove(V.owner) + generated_actions = list() -/datum/controller/subsystem/vote/Topic(href,href_list[],hsrc) - if(!usr || !usr.client) - return //not necessary but meh...just in-case somebody does something stupid +/mob/verb/vote() + set category = "OOC" + set name = "Vote" + SSvote.ui_interact(usr) + +/datum/controller/subsystem/vote/ui_state() + return GLOB.always_state + +/datum/controller/subsystem/vote/ui_interact(mob/user, datum/tgui/ui) + // Tracks who is voting + if(!(user.client?.ckey in voting)) + voting += user.client?.ckey + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Vote") + ui.open() + +/datum/controller/subsystem/vote/ui_data(mob/user) + var/list/data = list( + "mode" = mode, + "voted" = voted, + "voting" = voting, + "choices" = list(), + "question" = question, + "initiator" = initiator, + "started_time" = started_time, + "time_remaining" = time_remaining, + "lower_admin" = !!user.client?.holder, + "generated_actions" = generated_actions, + "avm" = CONFIG_GET(flag/allow_vote_mode), + "avmap" = CONFIG_GET(flag/allow_vote_map), + "avr" = CONFIG_GET(flag/allow_vote_restart), + "selectedChoice" = choice_by_ckey[user.client?.ckey], + "upper_admin" = check_rights_for(user.client, R_ADMIN), + ) + + for(var/key in choices) + data["choices"] += list(list( + "name" = key, + "votes" = choices[key] || 0 + )) + + return data + +/datum/controller/subsystem/vote/ui_act(action, params) + . = ..() + if(.) + return - var/trialmin = 0 + var/upper_admin = 0 if(usr.client.holder) if(check_rights_for(usr.client, R_ADMIN)) - trialmin = 1 + upper_admin = 1 - switch(href_list["vote"]) - if("close") - voting -= usr.client - usr << browse(null, "window=vote") - return + switch(action) if("cancel") if(usr.client.holder) reset() if("toggle_restart") - if(usr.client.holder && trialmin) + if(usr.client.holder && upper_admin) CONFIG_SET(flag/allow_vote_restart, !CONFIG_GET(flag/allow_vote_restart)) if("toggle_gamemode") - if(usr.client.holder && trialmin) + if(usr.client.holder && upper_admin) CONFIG_SET(flag/allow_vote_mode, !CONFIG_GET(flag/allow_vote_mode)) if("toggle_map") - if(usr.client.holder && trialmin) + if(usr.client.holder && upper_admin) CONFIG_SET(flag/allow_vote_map, !CONFIG_GET(flag/allow_vote_map)) if("restart") if(CONFIG_GET(flag/allow_vote_restart) || usr.client.holder) @@ -356,26 +339,12 @@ SUBSYSTEM_DEF(vote) if("custom") if(usr.client.holder) initiate_vote("custom",usr.key) - else - submit_vote(round(text2num(href_list["vote"]))) - usr.vote() - -/datum/controller/subsystem/vote/proc/remove_action_buttons() - for(var/v in generated_actions) - var/datum/action/vote/V = v - if(!QDELETED(V)) - V.remove_from_client() - V.Remove(V.owner) - generated_actions = list() - -/mob/verb/vote() - set category = "OOC" - set name = "Vote" + if("vote") + submit_vote(round(text2num(params["index"]))) + return TRUE - var/datum/browser/popup = new(src, "vote", "Voting Panel") - popup.set_window_options("can_close=0") - popup.set_content(SSvote.interface(client)) - popup.open(FALSE) +/datum/controller/subsystem/vote/ui_close(mob/user, datum/tgui/tgui) + voting -= user.client?.ckey /datum/action/vote name = "Vote!" diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 21df62172ee3c..4b036038663c5 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -34,6 +34,13 @@ SUBSYSTEM_DEF(weather) addtimer(CALLBACK(src, .proc/make_eligible, z, possible_weather), randTime + initial(W.weather_duration_upper), TIMER_UNIQUE) //Around 5-10 minutes between weathers next_hit_by_zlevel["[z]"] = world.time + randTime + initial(W.telegraph_duration) + +/datum/controller/subsystem/weather/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust + /datum/controller/subsystem/weather/Initialize(start_timeofday) for(var/V in subtypesof(/datum/weather)) var/datum/weather/W = V diff --git a/code/controllers/subsystem/zclear.dm b/code/controllers/subsystem/zclear.dm new file mode 100644 index 0000000000000..311a178467f65 --- /dev/null +++ b/code/controllers/subsystem/zclear.dm @@ -0,0 +1,327 @@ +#define CLEAR_TURF_PROCESSING_TIME (120 SECONDS) //Time it takes to clear all turfs +#define CHECK_ZLEVEL_TICKS (5 SECONDS) //Every 5 seconds check if a tracked z-level is free. + +GLOBAL_LIST_EMPTY(zclear_atoms) +GLOBAL_LIST_EMPTY(zclear_blockers) + +SUBSYSTEM_DEF(zclear) + name = "Z-Clear" + wait = 1 + + flags = SS_NO_INIT + runlevels = RUNLEVEL_GAME + + //List of z-levels to be auto-wiped when they are left + //Assoc list + var/list/datum/space_level/autowipe + + //List of free, empty z-levels. + var/list/datum/space_level/free_levels + + //List of processing Z-Levels + var/list/datum/zclear_data/processing_levels + + //List of atoms to ignore + var/list/ignored_atoms = null + + //List of nullspaced mobs to replace in ruins + var/list/nullspaced_mobs = list() + + //List of z-levels being docked with + var/list/docking_levels = list() + + //Announced zombie levels + var/list/announced_zombie_levels = list() + +/datum/controller/subsystem/zclear/New() + . = ..() + ignored_atoms = typecacheof(list(/mob/dead, /mob/camera, /mob/dview, /atom/movable/lighting_object, /obj/effect/abstract/mirage_holder)) + +/datum/controller/subsystem/zclear/fire(resumed) + if(times_fired % CHECK_ZLEVEL_TICKS == 0) + check_for_empty_levels() + for(var/datum/zclear_data/cleardata as() in processing_levels) + continue_wipe(cleardata) + +/* + * Checks for empty z-levels and wipes them. +*/ +/datum/controller/subsystem/zclear/proc/check_for_empty_levels() + var/list/active_levels = list() + //Levels that have living mobs + var/list/living_levels = list() + //Levels with mobs dead/alive + var/list/mob_levels = list() + //Check active mobs + for(var/mob/living/L as () in GLOB.mob_list) + if(!L) + continue + //Dead mobs get sent to new ruins + if(L.ckey || L.mind || L.client) + var/turf/T = get_turf(L) + mob_levels["[T.z]"] = TRUE + if(L.stat != DEAD) + active_levels["[T.z]"] = TRUE + living_levels["[T.z]"] = TRUE + //Check active nukes + for(var/obj/machinery/nuclearbomb/decomission/bomb in GLOB.decomission_bombs) + if(bomb.timing) + active_levels["[bomb.z]"] = TRUE + living_levels["[bomb.z]"] = TRUE //Dont perform mob saving actions on mobs about to be blown to smitherines. + //Block z-clear from these levels. + for(var/atom/A as() in GLOB.zclear_blockers) + active_levels["[A.z]"] = TRUE + //Check for shuttles + for(var/obj/docking_port/mobile/M in SSshuttle.mobile) + active_levels["[M.z]"] = TRUE + //Check shuttle destination + if(M.destination) + active_levels["[M.destination.z]"] = TRUE + living_levels["[M.destination.z]"] = TRUE + //Check for shuttles docking + for(var/port_id in SSorbits.assoc_shuttles) + var/datum/orbital_object/shuttle/shuttle = SSorbits.assoc_shuttles[port_id] + if(shuttle.docking_target) + for(var/datum/space_level/level in shuttle.docking_target.linked_z_level) + active_levels["[level.z_value]"] = TRUE + living_levels["[level.z_value]"] = TRUE + //Check for shuttles coming in + for(var/docking_level in docking_levels) + active_levels["[docking_level]"] = TRUE + living_levels["[docking_level]"] = TRUE + + for(var/datum/space_level/level as() in autowipe) + //Check if free + if(active_levels["[level.z_value]"]) + if(!living_levels["[level.z_value]"] && mob_levels["[level.z_value]"] && !announced_zombie_levels["[level.z_value]"]) + //Zombie level detected. + announced_zombie_levels["[level.z_value]"] = TRUE + if(level.orbital_body) + priority_announce("Nanotrasen long ranged sensors have indicated that all sentient life forms at priority waypoint [level.orbital_body.name] have ceased life functions. Command is recommended to establish a rescue operation to recover the bodies. Due to the nature of the threat at this location, security personnel armed with lethal weaponry is recommended to accompany the rescue team.", "Nanotrasen Long Range Sensors") + continue + //Level is free, do the wiping thing. + LAZYREMOVE(autowipe, level) + //Reset orbital body. + QDEL_NULL(level.orbital_body) + //Continue tracking after + wipe_z_level(level.z_value, TRUE) + +//Temporarily stops a z from being wiped for 30 seconds. +/datum/controller/subsystem/zclear/proc/temp_keep_z(z_level) + docking_levels |= z_level + addtimer(CALLBACK(src, .proc/unkeep_z, z_level), 2 MINUTES) + +/datum/controller/subsystem/zclear/proc/unkeep_z(z_level) + docking_levels -= z_level + +/* + * Returns a free space level. + * After a 60 second grace period of allocation, the z-level will be put back into the pool of z-levels to clear. + * Will create a new z-level if none are available. +*/ +/datum/controller/subsystem/zclear/proc/get_free_z_level() + while(LAZYLEN(free_levels)) + var/datum/space_level/picked_level = pick(free_levels) + LAZYREMOVE(free_levels, picked_level) + //In 1 minute we will begine tracking when all mobs have left the z-level. + //Begin tracking. In the rare case that someone got into a free z-level then just allow them to float there with no ruins. Space is pretty empty you know. + addtimer(CALLBACK(src, .proc/begin_tracking, picked_level), 60 SECONDS) + //Check if the z-level is actually free. (Someone might have drifted into the z-level.) + var/free = TRUE + for(var/mob/living/L in GLOB.player_list) + var/turf/T = get_turf(L) + if(T.z == picked_level.z_value) + free = FALSE + break + if(free) + return picked_level + //Create a new z-level + var/datum/space_level/picked_level = SSmapping.add_new_zlevel("Dynamic free level [LAZYLEN(free_levels)]", ZTRAITS_SPACE, orbital_body_type = null) + addtimer(CALLBACK(src, .proc/begin_tracking, picked_level), 60 SECONDS) + message_admins("SSORBITS: Created a new dynamic free level ([LAZYLEN(free_levels)] now created) as none were available at the time.") + return picked_level + +/datum/controller/subsystem/zclear/proc/begin_tracking(datum/space_level/sl) + LAZYOR(autowipe, sl) + + +/* + * Adds a z-level to the queue to be deleted. + * If tracking is TRUE, then we will re-wipe the z-level when mobs leave it again. +*/ +/datum/controller/subsystem/zclear/proc/wipe_z_level(z_level, tracking = FALSE, datum/callback/completion_callback) + if(!z_level) + return + + SSair.pause_z(z_level) + + var/list/turfs = block(locate(1, 1, z_level), locate(world.maxx, world.maxy, z_level)) + var/list/divided_turfs = list() + var/section_process_time = CLEAR_TURF_PROCESSING_TIME * 0.5 //There are 3 processes, cleaing atoms, cleaing turfs and then reseting atmos + + //Divide the turfs into groups + var/group_size = CEILING(turfs.len / section_process_time, 1) + var/list/current_group = list() + for(var/i in 1 to turfs.len) + var/turf/T = turfs[i] + current_group += T + if(i % group_size == 0) + divided_turfs += list(current_group) + current_group = list() + divided_turfs += list(current_group) + + //Create the wipe data datum + var/datum/zclear_data/data = new() + data.zvalue = z_level + data.divided_turfs = divided_turfs + data.process_num = 0 + data.completion_callback = completion_callback + data.tracking = tracking + + //Add the thing to the wiping levels list. + LAZYADD(processing_levels, data) + + //Pre-clear anything that needs to be cleared first (Air alarms.) + for(var/atom/A in GLOB.zclear_atoms) + if(A.z == z_level) + qdel(A, TRUE) + + //Unannounce zombie level + announced_zombie_levels["[z_level]"] = FALSE + +/* + * Continues the process of wiping a z-level. +*/ +/datum/controller/subsystem/zclear/proc/continue_wipe(datum/zclear_data/cleardata) + var/list_element = (cleardata.process_num % (CLEAR_TURF_PROCESSING_TIME * 0.5)) + 1 + switch(cleardata.process_num) + if(0 to (CLEAR_TURF_PROCESSING_TIME*0.5)-1) + if(list_element <= length(cleardata.divided_turfs)) + reset_turfs(cleardata.divided_turfs[list_element]) + if((CLEAR_TURF_PROCESSING_TIME*0.5) to (CLEAR_TURF_PROCESSING_TIME-1)) + if(list_element <= length(cleardata.divided_turfs)) + clear_turf_atoms(cleardata.divided_turfs[list_element]) + else + //Done + LAZYREMOVE(processing_levels, cleardata) + //Finalize area + SSair.unpause_z(cleardata.zvalue) + var/area/spaceA = GLOB.areas_by_type[/area/space] + spaceA.reg_in_areas_in_z() //<< Potentially slow proc + if(cleardata.completion_callback) + cleardata.completion_callback.Invoke(cleardata.zvalue) + if(cleardata.tracking) + LAZYADD(free_levels, SSmapping.z_list[cleardata.zvalue]) + if(length(nullspaced_mobs)) + var/nullspaced_mob_names = "" + var/valid = FALSE + for(var/mob/M as() in nullspaced_mobs) + if(M.key || M.get_ghost(FALSE, TRUE)) + nullspaced_mob_names += " - [M.name]\n" + valid = TRUE + if(valid) + priority_announce("Sensors indicate that multiple crewmembers have been lost at an abandoned station. They can potentially be recovered by flying to the nearest derelict station and locating their bodies.\n[nullspaced_mob_names]") + cleardata.process_num ++ + +/* + * Deletes all the atoms within a given turf. +*/ +/datum/controller/subsystem/zclear/proc/clear_turf_atoms(list/turfs) + //Clear atoms + for(var/turf/T as() in turfs) + // Remove all atoms except abstract mobs + var/list/allowed_contents = T.GetAllContentsIgnoring(ignored_atoms) + allowed_contents -= T + for(var/i in 1 to allowed_contents.len) + var/thing = allowed_contents[i] + //Remove powernet to prevent massive amounts of propagate networks, everythings getting deleted so who cares. + if(istype(thing, /obj/structure/cable)) + var/obj/structure/cable/cable = thing + cable.powernet = null + if(ismob(thing)) + if(!isliving(thing)) + continue + var/mob/living/M = thing + if(M.mind || M.key) + if(M.stat == DEAD) + //Store them for later + M.ghostize(TRUE) + M.forceMove(null) + nullspaced_mobs += M + else + //If the mob has a key (but is DC) then teleport them to a safe z-level where they can potentially be retrieved. + //Since the wiping takes 90 seconds they could potentially still be on the z-level as it is wiping if they reconnect in time + random_teleport_atom(M) + M.Knockdown(5) + to_chat(M, "You feel sick as your body lurches through space and time, the ripples of the starship that brought you here eminate no more and you get the horrible feeling that you have been left behind.") + else + delete_atom(thing) + else + delete_atom(thing) + +/* + * DELETES AN ATOM OR TELEPORTS IT TO A RANDOM LOCATION IF IT IS INDESTRUCTIBLE +*/ +/datum/controller/subsystem/zclear/proc/delete_atom(atom/A) + //Dont delete indestructible items, but indestructible structures can go + if(isitem(A)) + var/obj/O = A + //Handled by the mob + if(ismob(O.loc)) + return + if(O.resistance_flags & INDESTRUCTIBLE) + random_teleport_atom(A) + return + //Force delete effects and docking ports, normal delete everything else. + //Probably gunna cause problems in testing. + qdel(A, force = (iseffect(A) || istype(A, /obj/docking_port))) + +/* + * Randomly teleports an atom to a random z-level + * Copy and paste of turf/open/space/transit, could probably be a global proc +*/ +/datum/controller/subsystem/zclear/proc/random_teleport_atom(atom/movable/AM) + set waitfor = FALSE + if(!AM || istype(AM, /obj/docking_port)) + return + if(AM.loc != get_turf(AM)) // Multi-tile objects are "in" multiple locs but its loc is it's true placement. + return // Don't move multi tile objects if their origin isnt in transit + var/max = world.maxx-TRANSITIONEDGE + var/min = 1+TRANSITIONEDGE + + var/list/possible_transtitons = list() + for(var/datum/space_level/D as() in SSmapping.z_list) + if (D.linkage == CROSSLINKED) + possible_transtitons += D.z_value + var/_z = pick(possible_transtitons) + + //now select coordinates for a border turf + var/_x = rand(min,max) + var/_y = rand(min,max) + + var/turf/T = locate(_x, _y, _z) + AM.forceMove(T) + +/datum/controller/subsystem/zclear/proc/reset_turfs(list/turfs) + var/list/new_turfs = list() + for(var/turf/T as() in turfs) + var/turf/newT + if(istype(T, /turf/open/space)) + newT = T + else + newT = T.ChangeTurf(/turf/open/space, flags = CHANGETURF_IGNORE_AIR | CHANGETURF_DEFER_CHANGE) + if(!istype(newT.loc, /area/space)) + var/area/newA = GLOB.areas_by_type[/area/space] + newA.contents += newT + newT.change_area(newT.loc, newA) + newT.flags_1 &= ~NO_RUINS_1 + new_turfs += newT + return new_turfs + +/datum/zclear_data + var/zvalue + var/list/divided_turfs + var/process_num + var/tracking + //Callback when completed, z value passed as parameters + var/datum/callback/completion_callback diff --git a/code/datums/action.dm b/code/datums/action.dm index d7345703a7da4..020b41302ead7 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -9,7 +9,7 @@ var/obj/target = null var/check_flags = NONE var/processing = FALSE - var/obj/screen/movable/action_button/button = null + var/atom/movable/screen/movable/action_button/button = null var/buttontooltipstyle = "" var/transparent_when_unavailable = TRUE @@ -38,8 +38,7 @@ if(owner) Remove(owner) target = null - qdel(button) - button = null + QDEL_NULL(button) return ..() /datum/action/proc/Grant(mob/M) @@ -49,6 +48,7 @@ return Remove(owner) owner = M + RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/owner_deleted) //button id generation var/counter = 0 @@ -70,17 +70,27 @@ M.client.screen += button button.locked = M.client.prefs.buttons_locked || button.id ? M.client.prefs.action_buttons_screen_locs["[name]_[button.id]"] : FALSE //even if it's not defaultly locked we should remember we locked it before button.moved = button.id ? M.client.prefs.action_buttons_screen_locs["[name]_[button.id]"] : FALSE + var/obj/effect/proc_holder/spell/spell_proc_holder = button.linked_action.target + if(istype(spell_proc_holder) && spell_proc_holder.text_overlay) + M.client.images += spell_proc_holder.text_overlay M.update_action_buttons() else Remove(owner) +/datum/action/proc/owner_deleted(datum/source) + SIGNAL_HANDLER + + Remove(owner) + /datum/action/proc/Remove(mob/M) if(M) if(M.client) M.client.screen -= button M.actions -= src M.update_action_buttons() - owner = null + if(owner) + UnregisterSignal(owner, COMSIG_PARENT_QDELETING) + owner = null button.moved = FALSE //so the button appears in its normal position when given to another owner. button.locked = FALSE button.id = null @@ -92,9 +102,6 @@ return FALSE return TRUE -/datum/action/proc/Process() - return - /datum/action/proc/IsAvailable() if(!owner) return FALSE @@ -141,7 +148,7 @@ button.color = rgb(255,255,255,255) return 1 -/datum/action/proc/ApplyIcon(obj/screen/movable/action_button/current_button, force = FALSE) +/datum/action/proc/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force = FALSE) if(icon_icon && button_icon_state && ((current_button.button_icon_state != button_icon_state) || force)) current_button.cut_overlays(TRUE) current_button.add_overlay(mutable_appearance(icon_icon, button_icon_state)) @@ -175,7 +182,7 @@ I.ui_action_click(owner, src) return 1 -/datum/action/item_action/ApplyIcon(obj/screen/movable/action_button/current_button, force) +/datum/action/item_action/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force) if(button_icon && button_icon_state) // If set, use the custom icon that we set instead // of the item appearence @@ -304,16 +311,6 @@ name = "Toggle Friendly Fire \[ON\]" ..() -/datum/action/item_action/synthswitch - name = "Change Synthesizer Instrument" - desc = "Change the type of instrument your synthesizer is playing as." - -/datum/action/item_action/synthswitch/Trigger() - if(istype(target, /obj/item/instrument/piano_synth)) - var/obj/item/instrument/piano_synth/synth = target - return synth.selectInstrument() - return ..() - /datum/action/item_action/vortex_recall name = "Vortex Recall" desc = "Recall yourself, and anyone nearby, to an attuned hierophant beacon at any time.
If the beacon is still attached, will detach it." @@ -343,6 +340,21 @@ /datum/action/item_action/toggle_helmet_mode name = "Toggle Helmet Mode" +/datum/action/item_action/toggle_beacon + name = "Toggle Hardsuit Locator Beacon" + icon_icon = 'icons/mob/actions.dmi' + button_icon_state = "toggle-transmission" + +/datum/action/item_action/toggle_beacon_hud + name = "Toggle Hardsuit Locator HUD" + icon_icon = 'icons/mob/actions.dmi' + button_icon_state = "toggle-hud" + +/datum/action/item_action/toggle_beacon_frequency + name = "Toggle Hardsuit Locator Frequency" + icon_icon = 'icons/mob/actions.dmi' + button_icon_state = "change-code" + /datum/action/item_action/crew_monitor name = "Interface With Crew Monitor" @@ -452,6 +464,10 @@ return return ..() +/datum/action/item_action/activate_remote_view + name = "Activate Remote View" + desc = "Activates the Remote View of your spy sunglasses." + /datum/action/item_action/organ_action check_flags = AB_CHECK_CONSCIOUS @@ -493,7 +509,7 @@ H.attack_self(owner) return var/obj/item/I = target - if(owner.can_equip(I, SLOT_HANDS)) + if(owner.can_equip(I, ITEM_SLOT_HANDS)) owner.temporarilyRemoveItemFromInventory(I) owner.put_in_hands(I) I.attack_self(owner) @@ -511,10 +527,9 @@ background_icon_state = "bg_agent" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "deploy_box" - ///Cooldown between deploys. Uses world.time - var/cooldown = 0 ///The type of closet this action spawns. var/boxtype = /obj/structure/closet/cardboard/agent + COOLDOWN_DECLARE(box_cooldown) ///Handles opening and closing the box. /datum/action/item_action/agent_box/Trigger() @@ -530,11 +545,12 @@ if(!isturf(owner.loc)) //Don't let the player use this to escape mechs/welded closets. to_chat(owner, "You need more space to activate this implant.") return - if(cooldown < world.time - 100) - var/box = new boxtype(owner.drop_location()) - owner.forceMove(box) - cooldown = world.time - owner.playsound_local(box, 'sound/misc/box_deploy.ogg', 50, TRUE) + if(!COOLDOWN_FINISHED(src, box_cooldown)) + return + COOLDOWN_START(src, box_cooldown, 10 SECONDS) + var/box = new boxtype(owner.drop_location()) + owner.forceMove(box) + owner.playsound_local(box, 'sound/misc/box_deploy.ogg', 50, TRUE) //Preset for spells /datum/action/spell_action @@ -633,21 +649,21 @@ /datum/action/cooldown/proc/StartCooldown() next_use_time = world.time + cooldown_time - button.maptext = "[round(cooldown_time/10, 0.1)]" + button.maptext = MAPTEXT("[round(cooldown_time/10, 0.1)]") UpdateButtonIcon() START_PROCESSING(SSfastprocess, src) /datum/action/cooldown/process() if(!owner) button.maptext = "" - STOP_PROCESSING(SSfastprocess, src) + return PROCESS_KILL var/timeleft = max(next_use_time - world.time, 0) if(timeleft == 0) button.maptext = "" UpdateButtonIcon() - STOP_PROCESSING(SSfastprocess, src) + return PROCESS_KILL else - button.maptext = "[round(timeleft/10, 0.1)]" + button.maptext = MAPTEXT("[round(timeleft/10, 0.1)]") /datum/action/cooldown/Grant(mob/M) ..() @@ -671,12 +687,6 @@ icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "jetboot" -/datum/action/item_action/bhop/apid - name = "Apid Dash" - desc = "Uses your wings to dash forward 6 tiles." - icon_icon = 'icons/mob/neck.dmi' - button_icon_state = "apid_wings" - /datum/action/language_menu name = "Language Menu" desc = "Open the language menu to review your languages, their keys, and select your default language." @@ -759,7 +769,7 @@ icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "storage_gather_switch" -/datum/action/item_action/storage_gather_mode/ApplyIcon(obj/screen/movable/action_button/current_button) +/datum/action/item_action/storage_gather_mode/ApplyIcon(atom/movable/screen/movable/action_button/current_button) . = ..() var/old_layer = target.layer var/old_plane = target.plane diff --git a/code/datums/ai/README.md b/code/datums/ai/README.md new file mode 100644 index 0000000000000..f219b11bb2471 --- /dev/null +++ b/code/datums/ai/README.md @@ -0,0 +1,21 @@ +# AI controllers + +## Introduction + +Our AI controller system is an attempt at making it possible to create modularized AI that stores its behavior in datums, while keeping state and decision making in a controller. This allows a more versatile way of creating AI that doesn't rely on OOP as much, and doesn't clutter up the Life() code in Mobs. + +## AI Controllers + +A datum that can be added to any atom in the game. Similarly to components, they might only support a given subtype (e.g. /mob/living), but the idea is that theoretically, you could apply a specific AI controller to a big a group of different types as possible and it would still work. + +These datums handle both the normal movement of mobs, but also their decision making, deciding which actions they will take based on the checks you put into their SelectBehaviors proc. + +If behaviors are selected, and the AI is in range, it will try to perform them. It runs all the behaviors it currently has in parallel; allowing for it to for example screech at someone while trying to attack them. Aslong as it has behaviors running, it will not try to generate new plans, making it not waste CPU when it already has an active goal. + +They also hold data for any of the actions they might need to use, such as cooldowns, whether or not they're currently fighting, etcetera this is stored in the blackboard, more information on that below. + +### Blackboard +The blackboard is an associated list keyed with strings and with values of whatever you want. These store information the mob has such as "Am I attacking someone", "Do I have a weapon". By using an associated list like this, no data needs to be stored on the actions themselves, and you could make actions that work on multiple ai controllers if you so pleased by making the key to use a variable. + +## AI Behavior +AI behaviors are the actions an AI can take. These can range from "Do an emote" to "Attack this target until he is dead". They are singletons and should contain nothing but static data. Any dynamic data should be stored in the blackboard, to allow different controllers to use the same behaviors. diff --git a/code/datums/ai/_ai_behavior.dm b/code/datums/ai/_ai_behavior.dm new file mode 100644 index 0000000000000..ebec87b18c40d --- /dev/null +++ b/code/datums/ai/_ai_behavior.dm @@ -0,0 +1,26 @@ +///Abstract class for an action an AI can take, can range from movement to grabbing a nearby weapon. +/datum/ai_behavior + ///What distance you need to be from the target to perform the action + var/required_distance = 1 + ///Flags for extra behavior + var/behavior_flags = NONE + ///Cooldown between actions performances, defaults to the value of CLICK_CD_MELEE because that seemed like a nice standard for the speed of AI behavior + var/action_cooldown = CLICK_CD_MELEE + +/// Called by the ai controller when first being added. Additional arguments depend on the behavior type. +/// Return FALSE to cancel +/datum/ai_behavior/proc/setup(datum/ai_controller/controller, ...) + return TRUE + +///Called by the AI controller when this action is performed +/datum/ai_behavior/proc/perform(delta_time, datum/ai_controller/controller, ...) + controller.behavior_cooldowns[src] = world.time + action_cooldown + return + +///Called when the action is finished. This needs the same args as perform besides the default ones +/datum/ai_behavior/proc/finish_action(datum/ai_controller/controller, succeeded, ...) + LAZYREMOVE(controller.current_behaviors, src) + controller.behavior_args -= type + if(behavior_flags & AI_BEHAVIOR_REQUIRE_MOVEMENT) //If this was a movement task, reset our movement target. + controller.current_movement_target = null + controller.ai_movement.stop_moving_towards(controller) diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm new file mode 100644 index 0000000000000..a53e0828cfe9f --- /dev/null +++ b/code/datums/ai/_ai_controller.dm @@ -0,0 +1,261 @@ +/* +AI controllers are a datumized form of AI that simulates the input a player would otherwise give to a atom. What this means is that these datums +have ways of interacting with a specific atom and control it. They posses a blackboard with the information the AI knows and has, and will plan behaviors it will try to execute through +multiple modular subtrees with behaviors +*/ + +/datum/ai_controller + ///The atom this controller is controlling + var/atom/pawn + ///Bitfield of traits for this AI to handle extra behavior + var/ai_traits + ///Current actions being performed by the AI. + var/list/current_behaviors + ///Current actions and their respective last time ran as an assoc list. + var/list/behavior_cooldowns = list() + ///Current status of AI (OFF/ON) + var/ai_status + ///Current movement target of the AI, generally set by decision making. + var/atom/current_movement_target + ///This is a list of variables the AI uses and can be mutated by actions. When an action is performed you pass this list and any relevant keys for the variables it can mutate. + var/list/blackboard = list() + ///Stored arguments for behaviors given during their initial creation + var/list/behavior_args = list() + ///Tracks recent pathing attempts, if we fail too many in a row we fail our current plans. + var/pathing_attempts + ///Can the AI remain in control if there is a client? + var/continue_processing_when_client = FALSE + ///distance to give up on target + var/max_target_distance = 14 + ///Cooldown for new plans, to prevent AI from going nuts if it can't think of new plans and looping on end + COOLDOWN_DECLARE(failed_planning_cooldown) + ///All subtrees this AI has available, will run them in order, so make sure they're in the order you want them to run. On initialization of this type, it will start as a typepath(s) and get converted to references of ai_subtrees found in SSai_controllers when init_subtrees() is called + var/list/planning_subtrees + + // Movement related things here + ///Reference to the movement datum we use. Is a type on initialize but becomes a ref afterwards. + var/datum/ai_movement/ai_movement = /datum/ai_movement/dumb + ///Cooldown until next movement + COOLDOWN_DECLARE(movement_cooldown) + ///Delay between movements. This is on the controller so we can keep the movement datum singleton + var/movement_delay = 0.1 SECONDS + + // The variables below are fucking stupid and should be put into the blackboard at some point. + ///A list for the path we're currently following, if we're using JPS pathing + var/list/movement_path + ///Cooldown for JPS movement, how often we're allowed to try making a new path + COOLDOWN_DECLARE(repath_cooldown) + ///AI paused time + var/paused_until = 0 + +/datum/ai_controller/New(atom/new_pawn) + change_ai_movement_type(ai_movement) + init_subtrees() + + PossessPawn(new_pawn) + +/datum/ai_controller/Destroy(force, ...) + set_ai_status(AI_STATUS_OFF) + UnpossessPawn(FALSE) + return ..() + +///Overrides the current ai_movement of this controller with a new one +/datum/ai_controller/proc/change_ai_movement_type(datum/ai_movement/new_movement) + ai_movement = SSai_movement.movement_types[new_movement] + +///Completely replaces the planning_subtrees with a new set based on argument provided, list provided must contain specifically typepaths +/datum/ai_controller/proc/replace_planning_subtrees(list/typepaths_of_new_subtrees) + planning_subtrees = typepaths_of_new_subtrees + init_subtrees() + +///Loops over the subtrees in planning_subtrees and looks at the ai_controllers to grab a reference, ENSURE planning_subtrees ARE TYPEPATHS AND NOT INSTANCES/REFERENCES BEFORE EXECUTING THIS +/datum/ai_controller/proc/init_subtrees() + if(!LAZYLEN(planning_subtrees)) + return + var/list/temp_subtree_list = list() + for(var/subtree in planning_subtrees) + var/subtree_instance = SSai_controllers.ai_subtrees[subtree] + temp_subtree_list += subtree_instance + planning_subtrees = temp_subtree_list + +///Proc to move from one pawn to another, this will destroy the target's existing controller. +/datum/ai_controller/proc/PossessPawn(atom/new_pawn) + if(pawn) //Reset any old signals + UnpossessPawn(FALSE) + + if(istype(new_pawn.ai_controller)) //Existing AI, kill it. + QDEL_NULL(new_pawn.ai_controller) + + if(TryPossessPawn(new_pawn) & AI_CONTROLLER_INCOMPATIBLE) + qdel(src) + CRASH("[src] attached to [new_pawn] but these are not compatible!") + + pawn = new_pawn + pawn.ai_controller = src + + if(!continue_processing_when_client && istype(new_pawn, /mob)) + var/mob/possible_client_holder = new_pawn + if(possible_client_holder.client) + set_ai_status(AI_STATUS_OFF) + else + set_ai_status(AI_STATUS_ON) + else + set_ai_status(AI_STATUS_ON) + + RegisterSignal(pawn, COMSIG_MOB_LOGIN, .proc/on_sentience_gained) + +///Abstract proc for initializing the pawn to the new controller +/datum/ai_controller/proc/TryPossessPawn(atom/new_pawn) + return + +///Proc for deinitializing the pawn to the old controller +/datum/ai_controller/proc/UnpossessPawn(destroy) + UnregisterSignal(pawn, list(COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT)) + pawn.ai_controller = null + pawn = null + if(destroy) + qdel(src) + return + +///Returns TRUE if the ai controller can actually run at the moment. +/datum/ai_controller/proc/able_to_run() + if(world.time < paused_until) + return FALSE + return TRUE + + +///Runs any actions that are currently running +/datum/ai_controller/process(delta_time) + if(!able_to_run()) + walk(pawn, 0) //stop moving + return //this should remove them from processing in the future through event-based stuff. + + if(!LAZYLEN(current_behaviors)) + PerformIdleBehavior(delta_time) //Do some stupid shit while we have nothing to do + return + + if(current_movement_target && get_dist(pawn, current_movement_target) > max_target_distance) //The distance is out of range + CancelActions() + return + + for(var/i in current_behaviors) + var/datum/ai_behavior/current_behavior = i + + + // Convert the current behaviour action cooldown to realtime seconds from deciseconds.current_behavior + // Then pick the max of this and the delta_time passed to ai_controller.process() + // Action cooldowns cannot happen faster than delta_time, so delta_time should be the value used in this scenario. + var/action_delta_time = max(current_behavior.action_cooldown * 0.1, delta_time) + + if(current_behavior.behavior_flags & AI_BEHAVIOR_REQUIRE_MOVEMENT) //Might need to move closer + if(!current_movement_target) + stack_trace("[pawn] wants to perform action type [current_behavior.type] which requires movement, but has no current movement target!") + return //This can cause issues, so don't let these slide. + if(current_behavior.required_distance >= get_dist(pawn, current_movement_target)) ///Are we close enough to engage? + if(ai_movement.moving_controllers[src] == current_movement_target) //We are close enough, if we're moving stop. + ai_movement.stop_moving_towards(src) + + if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown + continue + ProcessBehavior(action_delta_time, current_behavior) + return + + else if(ai_movement.moving_controllers[src] != current_movement_target) //We're too far, if we're not already moving start doing it. + ai_movement.start_moving_towards(src, current_movement_target, current_behavior.required_distance) //Then start moving + + if(current_behavior.behavior_flags & AI_BEHAVIOR_MOVE_AND_PERFORM) //If we can move and perform then do so. + if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown + continue + ProcessBehavior(action_delta_time, current_behavior) + return + else //No movement required + if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown + continue + ProcessBehavior(action_delta_time, current_behavior) + return + +///Perform some dumb idle behavior. +/datum/ai_controller/proc/PerformIdleBehavior(delta_time) + return + +///This is where you decide what actions are taken by the AI. +/datum/ai_controller/proc/SelectBehaviors(delta_time) + SHOULD_NOT_SLEEP(TRUE) //Fuck you don't sleep in procs like this. + if(!COOLDOWN_FINISHED(src, failed_planning_cooldown)) + return FALSE + + LAZYINITLIST(current_behaviors) + + if(LAZYLEN(planning_subtrees)) + for(var/datum/ai_planning_subtree/subtree as anything in planning_subtrees) + if(subtree.SelectBehaviors(src, delta_time) == SUBTREE_RETURN_FINISH_PLANNING) + break + +///This proc handles changing ai status, and starts/stops processing if required. +/datum/ai_controller/proc/set_ai_status(new_ai_status) + if(ai_status == new_ai_status) + return FALSE //no change + + ai_status = new_ai_status + switch(ai_status) + if(AI_STATUS_ON) + SSai_controllers.active_ai_controllers += src + START_PROCESSING(SSai_behaviors, src) + if(AI_STATUS_OFF) + STOP_PROCESSING(SSai_behaviors, src) + SSai_controllers.active_ai_controllers -= src + CancelActions() + +/datum/ai_controller/proc/PauseAi(time) + paused_until = world.time + time + +///Call this to add a behavior to the stack. +/datum/ai_controller/proc/queue_behavior(behavior_type, ...) + var/datum/ai_behavior/behavior = GET_AI_BEHAVIOR(behavior_type) + if(!behavior) + CRASH("Behavior [behavior_type] not found.") + var/list/arguments = args.Copy() + arguments[1] = src + if(!behavior.setup(arglist(arguments))) + return + LAZYADD(current_behaviors, behavior) + arguments.Cut(1, 2) + if(length(arguments)) + behavior_args[behavior_type] = arguments + else + behavior_args -= behavior_type + +/datum/ai_controller/proc/ProcessBehavior(delta_time, datum/ai_behavior/behavior) + var/list/arguments = list(delta_time, src) + var/list/stored_arguments = behavior_args[behavior.type] + if(stored_arguments) + arguments += stored_arguments + behavior.perform(arglist(arguments)) + +/datum/ai_controller/proc/CancelActions() + if(!LAZYLEN(current_behaviors)) + return + for(var/i in current_behaviors) + var/datum/ai_behavior/current_behavior = i + var/list/arguments = list(src, FALSE) + var/list/stored_arguments = behavior_args[current_behavior.type] + if(stored_arguments) + arguments += stored_arguments + current_behavior.finish_action(arglist(arguments)) + +/datum/ai_controller/proc/on_sentience_gained() + SIGNAL_HANDLER + UnregisterSignal(pawn, COMSIG_MOB_LOGIN) + if(!continue_processing_when_client) + set_ai_status(AI_STATUS_OFF) //Can't do anything while player is connected + RegisterSignal(pawn, COMSIG_MOB_LOGOUT, .proc/on_sentience_lost) + +/datum/ai_controller/proc/on_sentience_lost() + SIGNAL_HANDLER + UnregisterSignal(pawn, COMSIG_MOB_LOGOUT) + set_ai_status(AI_STATUS_ON) //Can't do anything while player is connected + RegisterSignal(pawn, COMSIG_MOB_LOGIN, .proc/on_sentience_gained) + +/// Use this proc to define how your controller defines what access the pawn has for the sake of pathfinding, likely pointing to whatever ID slot is relevant +/datum/ai_controller/proc/get_access() + return diff --git a/code/datums/ai/_ai_planning_subtree.dm b/code/datums/ai/_ai_planning_subtree.dm new file mode 100644 index 0000000000000..ec69cd3e3e64f --- /dev/null +++ b/code/datums/ai/_ai_planning_subtree.dm @@ -0,0 +1,7 @@ +///A subtree is attached to a controller and is occasionally called by /ai_controller/SelectBehaviors(), this mainly exists to act as a way to subtype and modify SelectBehaviors() without needing to subtype the ai controller itself +/datum/ai_planning_subtree + + +///Determines what behaviors should the controller try processing; if this returns SUBTREE_RETURN_FINISH_PLANNING then the controller won't go through the other subtrees should multiple exist in controller.planning_subtrees +/datum/ai_planning_subtree/proc/SelectBehaviors(datum/ai_controller/controller, delta_time) + return diff --git a/code/datums/ai/_item_behaviors.dm b/code/datums/ai/_item_behaviors.dm new file mode 100644 index 0000000000000..9dc032ba58aaf --- /dev/null +++ b/code/datums/ai/_item_behaviors.dm @@ -0,0 +1,59 @@ +///This behavior is for obj/items, it is used to free themselves out of the hands of whoever is holding them +/datum/ai_behavior/item_escape_grasp + +/datum/ai_behavior/item_escape_grasp/perform(delta_time, datum/ai_controller/controller) + . = ..() + var/obj/item/item_pawn = controller.pawn + var/mob/item_holder = item_pawn.loc + if(!istype(item_holder)) + finish_action(controller, FALSE) //We're no longer beind held. abort abort!! + item_pawn.visible_message("[item_pawn] slips out of the hands of [item_holder]!") + item_holder.dropItemToGround(item_pawn, TRUE) + finish_action(controller, TRUE) + + +///This behavior is for obj/items, it is used to move closer to a target and throw themselves towards them. +/datum/ai_behavior/item_move_close_and_attack + required_distance = 3 + behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT + action_cooldown = 20 + ///Sound to use + var/attack_sound + ///Max attemps to make + var/max_attempts = 3 + + +/datum/ai_behavior/item_move_close_and_attack/setup(datum/ai_controller/controller, target_key, throw_count_key) + . = ..() + controller.current_movement_target = controller.blackboard[target_key] + + +/datum/ai_behavior/item_move_close_and_attack/perform(delta_time, datum/ai_controller/controller, target_key, throw_count_key) + . = ..() + var/obj/item/item_pawn = controller.pawn + var/atom/throw_target = controller.blackboard[target_key] + + item_pawn.visible_message("[item_pawn] hurls towards [throw_target]!") + item_pawn.throw_at(throw_target, rand(4,5), 9) + playsound(item_pawn.loc, attack_sound, 100, TRUE) + controller.blackboard[throw_count_key]++ + if(controller.blackboard[throw_count_key] >= max_attempts) + finish_action(controller, TRUE, target_key, throw_count_key) + +/datum/ai_behavior/item_move_close_and_attack/finish_action(datum/ai_controller/controller, succeeded, target_key, throw_count_key) + . = ..() + reset_blackboard(controller, succeeded, target_key, throw_count_key) + +/datum/ai_behavior/item_move_close_and_attack/proc/reset_blackboard(datum/ai_controller/controller, succeeded, target_key, throw_count_key) + controller.blackboard -= target_key + controller.blackboard[throw_count_key] = 0 + +/datum/ai_behavior/item_move_close_and_attack/haunted + attack_sound = 'sound/items/haunted/ghostitemattack.ogg' + max_attempts = 4 + +/datum/ai_behavior/item_move_close_and_attack/haunted/finish_action(datum/ai_controller/controller, succeeded, target_key, throw_count_key) + var/atom/throw_target = controller.blackboard[target_key] + var/list/hauntee_list = controller.blackboard[BB_TO_HAUNT_LIST] + hauntee_list[throw_target]-- + return ..() diff --git a/code/datums/ai/dog/dog_behaviors.dm b/code/datums/ai/dog/dog_behaviors.dm new file mode 100644 index 0000000000000..34c8531778e22 --- /dev/null +++ b/code/datums/ai/dog/dog_behaviors.dm @@ -0,0 +1,208 @@ +/datum/ai_behavior/battle_screech/dog + screeches = list("barks","howls") + +/// Fetching makes the pawn chase after whatever it's targeting and pick it up when it's in range, with the dog_equip behavior +/datum/ai_behavior/fetch + behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT + +/datum/ai_behavior/fetch/perform(delta_time, datum/ai_controller/controller) + . = ..() + var/mob/living/living_pawn = controller.pawn + var/obj/item/fetch_thing = controller.blackboard[BB_FETCH_TARGET] + + //either we can't pick it up, or we'd rather eat it, so stop trying. + if(fetch_thing.anchored || !isturf(fetch_thing.loc) || istype(fetch_thing, /obj/item/reagent_containers/food) || !living_pawn.CanReach(fetch_thing)) + finish_action(controller, FALSE) + return + + finish_action(controller, TRUE) + +/datum/ai_behavior/fetch/finish_action(datum/ai_controller/controller, success) + . = ..() + + if(!success) //Don't try again on this item if we failed + var/obj/item/target = controller.blackboard[BB_FETCH_TARGET] + if(target) + controller.blackboard[BB_FETCH_IGNORE_LIST][WEAKREF(target)] = TRUE + controller.blackboard[BB_FETCH_TARGET] = null + controller.blackboard[BB_FETCH_DELIVER_TO] = null + + +/// This is simply a behaviour to pick up a fetch target +/datum/ai_behavior/simple_equip/perform(delta_time, datum/ai_controller/controller) + . = ..() + var/obj/item/fetch_target = controller.blackboard[BB_FETCH_TARGET] + if(!isturf(fetch_target?.loc) || !isitem(fetch_target)) // someone picked it up, something happened to it, or it wasn't an item anyway + finish_action(controller, FALSE) + return + + if(in_range(controller.pawn, fetch_target)) + pickup_item(controller, fetch_target) + finish_action(controller, TRUE) + else + finish_action(controller, FALSE) + +/datum/ai_behavior/simple_equip/finish_action(datum/ai_controller/controller, success) + . = ..() + controller.blackboard[BB_FETCH_TARGET] = null + +/datum/ai_behavior/simple_equip/proc/pickup_item(datum/ai_controller/controller, obj/item/target) + var/atom/pawn = controller.pawn + drop_item(controller) + pawn.visible_message("[pawn] picks up [target] in [pawn.p_their()] mouth.") + target.forceMove(pawn) + controller.blackboard[BB_SIMPLE_CARRY_ITEM] = target + return TRUE + +/datum/ai_behavior/simple_equip/proc/drop_item(datum/ai_controller/controller) + var/obj/item/carried_item = controller.blackboard[BB_SIMPLE_CARRY_ITEM] + if(!carried_item) + return + + var/atom/pawn = controller.pawn + pawn.visible_message("[pawn] drops [carried_item].") + carried_item.forceMove(get_turf(pawn)) + controller.blackboard[BB_SIMPLE_CARRY_ITEM] = null + return TRUE + + + +/// This behavior involves dropping off a carried item to a specified person (or place) +/datum/ai_behavior/deliver_item + behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT + +/datum/ai_behavior/deliver_item/perform(delta_time, datum/ai_controller/controller) + . = ..() + var/mob/living/return_target = controller.blackboard[BB_FETCH_DELIVER_TO] + if(!return_target) + finish_action(controller, FALSE) + if(in_range(controller.pawn, return_target)) + deliver_item(controller) + finish_action(controller, TRUE) + +/datum/ai_behavior/deliver_item/finish_action(datum/ai_controller/controller, success) + . = ..() + controller.blackboard[BB_FETCH_DELIVER_TO] = null + +/// Actually drop the fetched item to the target +/datum/ai_behavior/deliver_item/proc/deliver_item(datum/ai_controller/controller) + var/obj/item/carried_item = controller.blackboard[BB_SIMPLE_CARRY_ITEM] + var/atom/movable/return_target = controller.blackboard[BB_FETCH_DELIVER_TO] + if(!carried_item || !return_target) + finish_action(controller, FALSE) + return + + if(ismob(return_target)) + controller.pawn.visible_message("[controller.pawn] delivers [carried_item] at [return_target]'s feet.") + else // not sure how to best phrase this + controller.pawn.visible_message("[controller.pawn] delivers [carried_item] to [return_target].") + + carried_item.forceMove(get_turf(return_target)) + controller.blackboard -= BB_SIMPLE_CARRY_ITEM + return TRUE + +/// This behavior involves either eating a snack we can reach, or begging someone holding a snack +/datum/ai_behavior/eat_snack + behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT + +/datum/ai_behavior/eat_snack/perform(delta_time, datum/ai_controller/controller) + . = ..() + var/obj/item/snack = controller.current_movement_target + if(!istype(snack) || !istype(snack, /obj/item/reagent_containers/food) || !(isturf(snack.loc) || ishuman(snack.loc))) + finish_action(controller, FALSE) + + var/mob/living/living_pawn = controller.pawn + if(!in_range(living_pawn, snack)) + return + + if(isturf(snack.loc)) + snack.attack_animal(living_pawn) // snack attack! + else if(iscarbon(snack.loc) && DT_PROB(10, delta_time)) + living_pawn.manual_emote("stares at [snack.loc]'s [snack.name] with a sad puppy-face.") + + if(QDELETED(snack)) // we ate it! + finish_action(controller, TRUE) + + +/// This behavior involves either eating a snack we can reach, or begging someone holding a snack +/datum/ai_behavior/play_dead + behavior_flags = NONE + +/datum/ai_behavior/play_dead/perform(delta_time, datum/ai_controller/controller) + . = ..() + var/mob/living/simple_animal/simple_pawn = controller.pawn + if(!istype(simple_pawn)) + return + + if(!controller.blackboard[BB_DOG_PLAYING_DEAD]) + controller.blackboard[BB_DOG_PLAYING_DEAD] = TRUE + simple_pawn.emote("deathgasp", intentional=FALSE) + simple_pawn.icon_state = simple_pawn.icon_dead + if(simple_pawn.flip_on_death) + simple_pawn.transform = simple_pawn.transform.Turn(180) + simple_pawn.density = FALSE + + if(DT_PROB(10, delta_time)) + finish_action(controller, TRUE) + +/datum/ai_behavior/play_dead/finish_action(datum/ai_controller/controller, succeeded) + . = ..() + var/mob/living/simple_animal/simple_pawn = controller.pawn + if(!istype(simple_pawn) || simple_pawn.stat) // imagine actually dying while playing dead. hell, imagine being the kid waiting for your pup to get back up :( + return + controller.blackboard[BB_DOG_PLAYING_DEAD] = FALSE + simple_pawn.visible_message("[simple_pawn] springs to [simple_pawn.p_their()] feet, panting excitedly!") + simple_pawn.icon_state = simple_pawn.icon_living + if(simple_pawn.flip_on_death) + simple_pawn.transform = simple_pawn.transform.Turn(180) + simple_pawn.density = initial(simple_pawn.density) + +/// This behavior involves either eating a snack we can reach, or begging someone holding a snack +/datum/ai_behavior/harass + behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM + required_distance = 3 + +/datum/ai_behavior/harass/perform(delta_time, datum/ai_controller/controller) + . = ..() + var/mob/living/living_pawn = controller.pawn + if(!istype(living_pawn) || !(isturf(living_pawn.loc) || HAS_TRAIT(living_pawn, TRAIT_AI_BAGATTACK))) + return + + var/datum/weakref/harass_ref = controller.blackboard[BB_DOG_HARASS_TARGET] + var/atom/movable/harass_target = harass_ref.resolve() + if(!harass_target || !can_see(living_pawn, harass_target, length=AI_DOG_VISION_RANGE)) + finish_action(controller, FALSE) + return + + if(controller.blackboard[BB_DOG_FRIENDS][harass_ref]) + living_pawn.visible_message("[living_pawn] looks sideways at [harass_target] for a moment, then shakes [living_pawn.p_their()] head and ceases aggression.") + finish_action(controller, FALSE) + return + + var/mob/living/living_target = harass_target + if(istype(living_target) && (living_target.stat || HAS_TRAIT(living_target, TRAIT_FAKEDEATH))) + finish_action(controller, TRUE) + return + + // subtypes of this behavior can change behavior for how eager/averse the pawn is to attack the target as opposed to falling back/making noise/getting help + if(in_range(living_pawn, living_target)) + attack(controller, living_target) + else if(DT_PROB(50, delta_time)) + living_pawn.manual_emote("[pick("barks", "growls", "stares")] menacingly at [harass_target]!") + +/datum/ai_behavior/harass/finish_action(datum/ai_controller/controller, succeeded) + . = ..() + controller.blackboard[BB_DOG_HARASS_TARGET] = null + +/// A proc representing when the mob is pushed to actually attack the target. Again, subtypes can be used to represent different attacks from different animals, or it can be some other generic behavior +/datum/ai_behavior/harass/proc/attack(datum/ai_controller/controller, mob/living/living_target) + var/mob/living/living_pawn = controller.pawn + if(!istype(living_pawn)) + return + // make sure the pawn gets some temporary strength boost to actually attack the target instead of pathetically nuzzling them. + var/old_melee_damage = living_pawn.melee_damage + living_pawn.melee_damage = max(7, old_melee_damage) + + living_pawn.UnarmedAttack(living_target, FALSE) + + living_pawn.melee_damage = old_melee_damage diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm new file mode 100644 index 0000000000000..0cc308682f31f --- /dev/null +++ b/code/datums/ai/dog/dog_controller.dm @@ -0,0 +1,294 @@ +/datum/ai_controller/dog + blackboard = list(\ + BB_SIMPLE_CARRY_ITEM = null,\ + BB_FETCH_TARGET = null,\ + BB_FETCH_DELIVER_TO = null,\ + BB_DOG_FRIENDS = list(),\ + BB_FETCH_IGNORE_LIST = list(),\ + BB_DOG_ORDER_MODE = DOG_COMMAND_NONE,\ + BB_DOG_PLAYING_DEAD = FALSE,\ + BB_DOG_HARASS_TARGET = null) + ai_movement = /datum/ai_movement/jps + planning_subtrees = list(/datum/ai_planning_subtree/dog) + + COOLDOWN_DECLARE(heel_cooldown) + COOLDOWN_DECLARE(command_cooldown) + + +/datum/ai_controller/dog/process(delta_time) + if(ismob(pawn)) + var/mob/living/living_pawn = pawn + movement_delay = living_pawn.cached_multiplicative_slowdown + return ..() + +/datum/ai_controller/dog/TryPossessPawn(atom/new_pawn) + if(!isliving(new_pawn)) + return AI_CONTROLLER_INCOMPATIBLE + + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) + RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, .proc/on_examined) + RegisterSignal(new_pawn, COMSIG_CLICK_ALT, .proc/check_altclicked) + RegisterSignal(new_pawn, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), .proc/on_death) + RegisterSignal(SSdcs, COMSIG_GLOB_CARBON_THROW_THING, .proc/listened_throw) + return ..() //Run parent at end + +/datum/ai_controller/dog/UnpossessPawn(destroy) + var/obj/item/carried_item = blackboard[BB_SIMPLE_CARRY_ITEM] + if(carried_item) + pawn.visible_message("
Please stand by for an important message from our new intern.
" diff --git a/code/datums/announcers/medbot_announcer.dm b/code/datums/announcers/medbot_announcer.dm new file mode 100644 index 0000000000000..9d58bc37461e8 --- /dev/null +++ b/code/datums/announcers/medbot_announcer.dm @@ -0,0 +1,21 @@ +/datum/centcom_announcer/medbot + welcome_sounds = list('sound/ai/medbot/welcome.ogg', + 'sound/ai/medbot/newAI.ogg') + alert_sounds = list('sound/ai/medbot/attention.ogg') + command_report_sounds = list('sound/ai/medbot/commandreport.ogg') + event_sounds = list(ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg', + ANNOUNCER_ALIENS = 'sound/ai/medbot/aliens.ogg', + ANNOUNCER_ANIMES = 'sound/ai/medbot/animes.ogg', + ANNOUNCER_GRANOMALIES = 'sound/ai/medbot/granomalies.ogg', + ANNOUNCER_INTERCEPT = 'sound/ai/medbot/intercept.ogg', + ANNOUNCER_IONSTORM = 'sound/ai/medbot/ionstorm.ogg', + ANNOUNCER_METEORS = 'sound/ai/medbot/meteors.ogg', + ANNOUNCER_OUTBREAK5 = 'sound/ai/medbot/outbreak5.ogg', + ANNOUNCER_OUTBREAK7 = 'sound/ai/medbot/outbreak7.ogg', + ANNOUNCER_POWEROFF = 'sound/ai/medbot/poweroff.ogg', + ANNOUNCER_POWERON = 'sound/ai/medbot/poweron.ogg', + ANNOUNCER_RADIATION = 'sound/ai/medbot/radiation.ogg', + ANNOUNCER_SHUTTLECALLED = 'sound/ai/medbot/shuttlecalled.ogg', + ANNOUNCER_SHUTTLEDOCK = 'sound/ai/medbot/shuttledock.ogg', + ANNOUNCER_SHUTTLERECALLED = 'sound/ai/medbot/shuttlerecalled.ogg', + ANNOUNCER_SPANOMALIES = 'sound/ai/medbot/spanomalies.ogg') diff --git a/code/datums/armor.dm b/code/datums/armor.dm index cbf4b76c60fb7..4168f42e17654 100644 --- a/code/datums/armor.dm +++ b/code/datums/armor.dm @@ -1,9 +1,9 @@ -#define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]" +#define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]-[stamina]" -/proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0) +/proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, stamina = 0) . = locate(ARMORID) if (!.) - . = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic) + . = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic, stamina) /datum/armor datum_flags = DF_USE_TAG @@ -17,8 +17,9 @@ var/fire var/acid var/magic + var/stamina -/datum/armor/New(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0) +/datum/armor/New(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, stamina = 0) src.melee = melee src.bullet = bullet src.laser = laser @@ -29,13 +30,14 @@ src.fire = fire src.acid = acid src.magic = magic + src.stamina = stamina tag = ARMORID -/datum/armor/proc/modifyRating(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0) - return getArmor(src.melee+melee, src.bullet+bullet, src.laser+laser, src.energy+energy, src.bomb+bomb, src.bio+bio, src.rad+rad, src.fire+fire, src.acid+acid, src.magic+magic) +/datum/armor/proc/modifyRating(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, stamina = 0) + return getArmor(src.melee+melee, src.bullet+bullet, src.laser+laser, src.energy+energy, src.bomb+bomb, src.bio+bio, src.rad+rad, src.fire+fire, src.acid+acid, src.magic+magic, src.stamina+stamina) /datum/armor/proc/modifyAllRatings(modifier = 0) - return getArmor(melee+modifier, bullet+modifier, laser+modifier, energy+modifier, bomb+modifier, bio+modifier, rad+modifier, fire+modifier, acid+modifier, magic+modifier) + return getArmor(melee+modifier, bullet+modifier, laser+modifier, energy+modifier, bomb+modifier, bio+modifier, rad+modifier, fire+modifier, acid+modifier, magic+modifier, stamina+modifier) /datum/armor/proc/setRating(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic) return getArmor((isnull(melee) ? src.melee : melee),\ @@ -47,19 +49,20 @@ (isnull(rad) ? src.rad : rad),\ (isnull(fire) ? src.fire : fire),\ (isnull(acid) ? src.acid : acid),\ - (isnull(magic) ? src.magic : magic)) + (isnull(magic) ? src.magic : magic),\ + (isnull(stamina) ? src.stamina : stamina)) /datum/armor/proc/getRating(rating) return vars[rating] /datum/armor/proc/getList() - return list("melee" = melee, "bullet" = bullet, "laser" = laser, "energy" = energy, "bomb" = bomb, "bio" = bio, "rad" = rad, "fire" = fire, "acid" = acid, "magic" = magic) + return list("melee" = melee, "bullet" = bullet, "laser" = laser, "energy" = energy, "bomb" = bomb, "bio" = bio, "rad" = rad, "fire" = fire, "acid" = acid, "magic" = magic, "stamina" = stamina) /datum/armor/proc/attachArmor(datum/armor/AA) - return getArmor(melee+AA.melee, bullet+AA.bullet, laser+AA.laser, energy+AA.energy, bomb+AA.bomb, bio+AA.bio, rad+AA.rad, fire+AA.fire, acid+AA.acid, magic+AA.magic) + return getArmor(melee+AA.melee, bullet+AA.bullet, laser+AA.laser, energy+AA.energy, bomb+AA.bomb, bio+AA.bio, rad+AA.rad, fire+AA.fire, acid+AA.acid, magic+AA.magic, stamina+AA.stamina) /datum/armor/proc/detachArmor(datum/armor/AA) - return getArmor(melee-AA.melee, bullet-AA.bullet, laser-AA.laser, energy-AA.energy, bomb-AA.bomb, bio-AA.bio, rad-AA.rad, fire-AA.fire, acid-AA.acid, magic-AA.magic) + return getArmor(melee-AA.melee, bullet-AA.bullet, laser-AA.laser, energy-AA.energy, bomb-AA.bomb, bio-AA.bio, rad-AA.rad, fire-AA.fire, acid-AA.acid, magic-AA.magic, stamina-AA.stamina) /datum/armor/vv_edit_var(var_name, var_value) if (var_name == NAMEOF(src, tag)) diff --git a/code/datums/atmosphere/_atmosphere.dm b/code/datums/atmosphere/_atmosphere.dm index 2a35250905c6d..df76b3f2a4111 100644 --- a/code/datums/atmosphere/_atmosphere.dm +++ b/code/datums/atmosphere/_atmosphere.dm @@ -54,6 +54,6 @@ // Now finally lets make that string var/list/gas_string_builder = list() for(var/i in gasmix.get_gases()) - gas_string_builder += "[GLOB.meta_gas_info[i][META_GAS_ID]]=[gasmix.get_moles(i)]" + gas_string_builder += "[GLOB.gas_data.ids[i]]=[gasmix.get_moles(i)]" gas_string_builder += "TEMP=[gasmix.return_temperature()]" gas_string = gas_string_builder.Join(";") diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm deleted file mode 100644 index 55dc49e171e6a..0000000000000 --- a/code/datums/atmosphere/planetary.dm +++ /dev/null @@ -1,25 +0,0 @@ -// Atmos types used for planetary airs -/datum/atmosphere/lavaland - id = LAVALAND_DEFAULT_ATMOS - - base_gases = list( - /datum/gas/oxygen=5, - /datum/gas/nitrogen=10, - ) - normal_gases = list( - /datum/gas/oxygen=10, - /datum/gas/nitrogen=10, - /datum/gas/carbon_dioxide=10, - ) - restricted_gases = list( - /datum/gas/bz=10, - /datum/gas/plasma=0.1, - /datum/gas/water_vapor=0.1, - ) - restricted_chance = 50 - - minimum_pressure = WARNING_LOW_PRESSURE + 10 - maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1 - - minimum_temp = BODYTEMP_COLD_DAMAGE_LIMIT + 1 - maximum_temp = 350 diff --git a/code/datums/beam.dm b/code/datums/beam.dm index da90c7c298119..79beb122b647f 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -42,7 +42,7 @@ return recalculating = TRUE timing_id = null - if(origin && target && get_dist(origin,target)
New vote started. It will end in [input_cooldown/10] seconds." + for(var/M in orbiters) + to_chat(M, message) + else + var/message = "No votes were cast this cycle." + for(var/M in orbiters) + to_chat(M, message) + +/datum/component/deadchat_control/proc/count_democracy_votes() + if(!length(ckey_to_cooldown)) + return + var/list/votes = list() + for(var/command in inputs) + votes["[command]"] = 0 + for(var/vote in ckey_to_cooldown) + votes[ckey_to_cooldown[vote]]++ + ckey_to_cooldown.Remove(vote) + + // Solve which had most votes. + var/prev_value = 0 + var/result + for(var/vote in votes) + if(votes[vote] > prev_value) + prev_value = votes[vote] + result = vote + + if(result in inputs) + return result + +/datum/component/deadchat_control/vv_edit_var(var_name, var_value) + . = ..() + if(!.) + return + if(var_name != NAMEOF(src, deadchat_mode)) + return + ckey_to_cooldown = list() + if(var_value == DEMOCRACY_MODE) + timerid = addtimer(CALLBACK(src, .proc/democracy_loop), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) + else + deltimer(timerid) + +/datum/component/deadchat_control/proc/orbit_begin(atom/source, atom/orbiter) + RegisterSignal(orbiter, COMSIG_MOB_DEADSAY, .proc/deadchat_react) + orbiters |= orbiter + +/datum/component/deadchat_control/proc/orbit_stop(atom/source, atom/orbiter) + if(orbiter in orbiters) + UnregisterSignal(orbiter, COMSIG_MOB_DEADSAY) + orbiters -= orbiter \ No newline at end of file diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm deleted file mode 100644 index 8fb3405af0d67..0000000000000 --- a/code/datums/components/decal.dm +++ /dev/null @@ -1,75 +0,0 @@ -/datum/component/decal - dupe_mode = COMPONENT_DUPE_ALLOWED - can_transfer = TRUE - var/cleanable - var/description - var/mutable_appearance/pic - - var/first_dir // This only stores the dir arg from init - -/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_NEVER, _color, _layer=TURF_LAYER, _description, _alpha=255) - if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha)) - return COMPONENT_INCOMPATIBLE - first_dir = _dir - description = _description - cleanable = _cleanable - - apply() - -/datum/component/decal/RegisterWithParent() - if(first_dir) - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react) - if(cleanable != CLEAN_NEVER) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react) - if(description) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - -/datum/component/decal/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_EXAMINE)) - -/datum/component/decal/Destroy() - remove() - return ..() - -/datum/component/decal/PreTransfer() - remove() - -/datum/component/decal/PostTransfer() - remove() - apply() - -/datum/component/decal/proc/generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha) - if(!_icon || !_icon_state) - return FALSE - // It has to be made from an image or dir breaks because of a byond bug - var/temp_image = image(_icon, null, _icon_state, _layer, _dir) - pic = new(temp_image) - pic.color = _color - pic.alpha = _alpha - return TRUE - -/datum/component/decal/proc/apply(atom/thing) - var/atom/master = thing || parent - master.add_overlay(pic, TRUE) - if(isitem(master)) - addtimer(CALLBACK(master, /obj/item/.proc/update_slot_icon), 0, TIMER_UNIQUE) - -/datum/component/decal/proc/remove(atom/thing) - var/atom/master = thing || parent - master.cut_overlay(pic, TRUE) - if(isitem(master)) - addtimer(CALLBACK(master, /obj/item/.proc/update_slot_icon), 0, TIMER_UNIQUE) - -/datum/component/decal/proc/rotate_react(datum/source, old_dir, new_dir) - if(old_dir == new_dir) - return - remove() - pic.dir = turn(pic.dir, dir2angle(old_dir) - dir2angle(new_dir)) - apply() - -/datum/component/decal/proc/clean_react(datum/source, strength) - if(strength >= cleanable) - qdel(src) - -/datum/component/decal/proc/examine(datum/source, mob/user, list/examine_list) - examine_list += description diff --git a/code/datums/components/decals/blood.dm b/code/datums/components/decals/blood.dm deleted file mode 100644 index 3114ddb24e9e4..0000000000000 --- a/code/datums/components/decals/blood.dm +++ /dev/null @@ -1,39 +0,0 @@ -/datum/component/decal/blood - dupe_mode = COMPONENT_DUPE_UNIQUE - -/datum/component/decal/blood/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_STRENGTH_BLOOD, _color, _layer=ABOVE_OBJ_LAYER) - if(!isitem(parent)) - return COMPONENT_INCOMPATIBLE - . = ..() - RegisterSignal(parent, COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name) - -/datum/component/decal/blood/generate_appearance(_icon, _icon_state, _dir, _layer, _color) - var/obj/item/I = parent - if(!_icon) - _icon = 'icons/effects/blood.dmi' - if(!_icon_state) - _icon_state = "itemblood" - var/icon = initial(I.icon) - var/icon_state = initial(I.icon_state) - if(!icon || !icon_state) - // It's something which takes on the look of other items, probably - icon = I.icon - icon_state = I.icon_state - var/static/list/blood_splatter_appearances = list() - //try to find a pre-processed blood-splatter. otherwise, make a new one - var/index = "[REF(icon)]-[icon_state]" - pic = blood_splatter_appearances[index] - - if(!pic) - var/icon/blood_splatter_icon = icon(initial(I.icon), initial(I.icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object - blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent) - blood_splatter_icon.Blend(icon(_icon, _icon_state), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant - pic = mutable_appearance(blood_splatter_icon, initial(I.icon_state)) - blood_splatter_appearances[index] = pic - return TRUE - -/datum/component/decal/blood/proc/get_examine_name(datum/source, mob/user, list/override) - var/atom/A = parent - override[EXAMINE_POSITION_ARTICLE] = A.gender == PLURAL? "some" : "a" - override[EXAMINE_POSITION_BEFORE] = " blood-stained " - return COMPONENT_EXNAME_CHANGED diff --git a/code/datums/components/edit_complainer.dm b/code/datums/components/edit_complainer.dm index bf52296e2cb74..632a7c6d7492e 100644 --- a/code/datums/components/edit_complainer.dm +++ b/code/datums/components/edit_complainer.dm @@ -19,5 +19,7 @@ RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, .proc/var_edit_react) /datum/component/edit_complainer/proc/var_edit_react(datum/source, list/arguments) + SIGNAL_HANDLER + var/atom/movable/master = parent master.say(pick(say_lines)) diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm new file mode 100644 index 0000000000000..389815e36fe84 --- /dev/null +++ b/code/datums/components/embedded.dm @@ -0,0 +1,337 @@ +/* + This component is responsible for handling individual instances of embedded objects. The embeddable element is what allows an item to be embeddable and stores its embedding stats, + and when it impacts and meets the requirements to stick into something, it instantiates an embedded component. Once the item falls out, the component is destroyed, while the + element survives to embed another day. + + - Carbon embedding has all the classical embedding behavior, and tracks more events and signals. The main behaviors and hooks to look for are: + -- Every process tick, there is a chance to randomly proc pain, controlled by pain_chance. There may also be a chance for the object to fall out randomly, per fall_chance + -- Every time the mob moves, there is a chance to proc jostling pain, controlled by jostle_chance (and only 50% as likely if the mob is walking or crawling) + -- Various signals hooking into carbon topic() and the embed removal surgery in order to handle removals. + + + In addition, there are 2 cases of embedding: embedding, and sticking + + - Embedding involves harmful and dangerous embeds, whether they cause brute damage, stamina damage, or a mix. This is the default behavior for embeddings, for when something is "pointy" + + - Sticking occurs when an item should not cause any harm while embedding (imagine throwing a sticky ball of tape at someone, rather than a shuriken). An item is considered "sticky" + when it has 0 random pain chance and 0 jostling chance. It's a bit arbitrary, but fairly straightforward. + + Stickables differ from embeds in the following ways: + -- Text descriptors use phrasing like "X is stuck to Y" rather than "X is embedded in Y" + -- There is no slicing sound on impact + -- All damage checks and bloodloss are skipped + +*/ + + +/datum/component/embedded + dupe_mode = COMPONENT_DUPE_ALLOWED + var/obj/item/bodypart/limb + var/obj/item/weapon + + // all of this stuff is explained in _DEFINES/combat.dm + var/embed_chance // not like we really need it once we're already stuck in but hey + var/fall_chance + var/pain_chance + var/pain_mult + var/max_damage_mult + var/remove_pain_mult + var/rip_time + var/ignore_throwspeed_threshold + var/jostle_chance + var/jostle_pain_mult + var/pain_stam_pct + var/armour_block + + var/harmful + +/datum/component/embedded/Initialize(obj/item/I, + datum/thrownthing/throwingdatum, + obj/item/bodypart/part, + embed_chance = EMBED_CHANCE, + fall_chance = EMBEDDED_ITEM_FALLOUT, + pain_chance = EMBEDDED_PAIN_CHANCE, + pain_mult = EMBEDDED_PAIN_MULTIPLIER, + max_damage_mult = EMBEDDED_MAX_DAMAGE_MULTIPLIER, + remove_pain_mult = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER, + rip_time = EMBEDDED_UNSAFE_REMOVAL_TIME, + ignore_throwspeed_threshold = FALSE, + jostle_chance = EMBEDDED_JOSTLE_CHANCE, + jostle_pain_mult = EMBEDDED_JOSTLE_PAIN_MULTIPLIER, + pain_stam_pct = EMBEDDED_PAIN_STAM_PCT, + armour_block = EMBEDDED_ARMOUR_BLOCK) + + if(!iscarbon(parent) || !isitem(I)) + return COMPONENT_INCOMPATIBLE + + if(part) + limb = part + src.embed_chance = embed_chance + src.fall_chance = fall_chance + src.pain_chance = pain_chance + src.pain_mult = pain_mult + src.max_damage_mult = max_damage_mult + src.remove_pain_mult = remove_pain_mult + src.rip_time = rip_time + src.ignore_throwspeed_threshold = ignore_throwspeed_threshold + src.jostle_chance = jostle_chance + src.jostle_pain_mult = jostle_pain_mult + src.pain_stam_pct = pain_stam_pct + src.armour_block = armour_block + src.weapon = I + + if(!weapon.isEmbedHarmless()) + harmful = TRUE + + weapon.embedded(parent, part) + START_PROCESSING(SSdcs, src) + var/mob/living/carbon/victim = parent + + limb.embedded_objects |= weapon // on the inside... on the inside... + weapon.forceMove(victim) + RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/weaponDeleted) + victim.visible_message("[weapon] [harmful ? "embeds" : "sticks"] itself [harmful ? "in" : "to"] [victim]'s [limb.name]!", "[weapon] [harmful ? "embeds" : "sticks"] itself [harmful ? "in" : "to"] your [limb.name]!") + + if(harmful) + victim.throw_alert("embeddedobject", /atom/movable/screen/alert/embeddedobject) + playsound(victim,'sound/weapons/bladeslice.ogg', 40) + weapon.add_mob_blood(victim)//it embedded itself in you, of course it's bloody! + SEND_SIGNAL(victim, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded) + +/datum/component/embedded/Destroy() + var/mob/living/carbon/victim = parent + if(victim && !victim.has_embedded_objects()) + victim.clear_alert("embeddedobject") + SEND_SIGNAL(victim, COMSIG_CLEAR_MOOD_EVENT, "embedded") + if(weapon) + UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + weapon = null + limb = null + return ..() + +/datum/component/embedded/RegisterWithParent() + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/jostleCheck) + RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, .proc/ripOut) + RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, .proc/safeRemove) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/checkRemoval) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/tryPullOutOther) + +/datum/component/embedded/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND)) + +/datum/component/embedded/process(delta_time) + var/mob/living/carbon/victim = parent + + if(!victim || !limb) // in case the victim and/or their limbs exploded (say, due to a sticky bomb) + weapon.forceMove(get_turf(weapon)) + qdel(src) + return + + if(victim.stat == DEAD) + return + + var/damage = weapon.w_class * pain_mult + var/max_damage = weapon.w_class * max_damage_mult + weapon.throwforce + var/chance = DT_PROB_RATE(pain_chance / 100, delta_time) * 100 + if(pain_stam_pct && victim.stam_paralyzed) //if it's a less-lethal embed, give them a break if they're already stamcritted + chance *= 0.2 + damage *= 0.5 + else if(victim.lying) + chance *= 0.2 + + if(harmful && prob(chance)) + var/damage_left = max_damage - limb.get_damage() + var/damage_wanted = (1-pain_stam_pct) * damage + var/damage_to_deal = CLAMP(damage_wanted, 0, damage_left) + var/damage_as_stam = damage_wanted - damage_to_deal + if(!damage_to_deal) + to_chat(victim, "[weapon] embedded in your [limb.name] stings a little!") + else + limb.receive_damage(brute=damage_to_deal, stamina=(pain_stam_pct * damage) + damage_as_stam) + to_chat(victim, "[weapon] embedded in your [limb.name] hurts!") + + var/fallchance_current = DT_PROB_RATE(fall_chance / 100, delta_time) * 100 + if(prob(fallchance_current)) + fallOut() + +//////////////////////////////////////// +////////////BEHAVIOR PROCS////////////// +//////////////////////////////////////// + +/// Called every time a carbon with a harmful embed moves, rolling a chance for the item to cause pain. The chance is halved if the carbon is crawling or walking. +/datum/component/embedded/proc/jostleCheck() + SIGNAL_HANDLER + + var/mob/living/carbon/victim = parent + var/chance = jostle_chance + if(victim.m_intent == MOVE_INTENT_WALK || victim.lying) + chance *= 0.5 + + if(harmful && prob(chance)) + var/damage = weapon.w_class * jostle_pain_mult + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) + to_chat(victim, "[weapon] embedded in your [limb.name] jostles and stings!") + + +/// Called when then item randomly falls out of a carbon. This handles the damage and descriptors, then calls safe_remove() +/datum/component/embedded/proc/fallOut() + var/mob/living/carbon/victim = parent + + if(harmful) + var/damage = weapon.w_class * remove_pain_mult + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) + + victim.visible_message("[weapon] falls [harmful ? "out" : "off"] of [victim.name]'s [limb.name]!", "[weapon] falls [harmful ? "out" : "off"] of your [limb.name]!") + safeRemove() + +/// Called when a carbon with an object embedded/stuck to them inspects themselves and clicks the appropriate link to begin ripping the item out. This handles the ripping attempt, descriptors, and dealing damage, then calls safe_remove() +/datum/component/embedded/proc/ripOut(datum/source, obj/item/I, obj/item/bodypart/limb) + SIGNAL_HANDLER + + if(I != weapon || src.limb != limb) + return + + var/mob/living/carbon/victim = parent + var/time_taken = rip_time * weapon.w_class + INVOKE_ASYNC(src, .proc/complete_rip_out, victim, I, limb, time_taken) + +/// everything async that ripOut used to do +/datum/component/embedded/proc/complete_rip_out(mob/living/carbon/victim, obj/item/I, obj/item/bodypart/limb, time_taken) + victim.visible_message("[victim] attempts to remove [weapon] from [victim.p_their()] [limb.name].","You attempt to remove [weapon] from your [limb.name]... (It will take [DisplayTimeText(time_taken)].)") + + if(!do_after(victim, time_taken, target = victim)) + return + if(!weapon || !limb || weapon.loc != victim || !(weapon in limb.embedded_objects)) + qdel(src) + return + + if(harmful) + var/damage = weapon.w_class * remove_pain_mult + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) //It hurts to rip it out, get surgery you dingus. + victim.emote("scream") + + victim.visible_message("[victim] successfully rips [weapon] [harmful ? "out" : "off"] of [victim.p_their()] [limb.name]!", "You successfully remove [weapon] from your [limb.name].") + safeRemove(victim) + +/// This proc handles the final step and actual removal of an embedded/stuck item from a carbon, whether or not it was actually removed safely. +/// Pass TRUE for to_hands if we want it to go to the victim's hands when they pull it out +/datum/component/embedded/proc/safeRemove(to_hands) + SIGNAL_HANDLER + + var/mob/living/carbon/victim = parent + limb.embedded_objects -= weapon + UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) // have to do it here otherwise we trigger weaponDeleted() + + if(!weapon.unembedded()) // if it hasn't deleted itself due to drop del + UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + if(to_hands) + INVOKE_ASYNC(to_hands, /mob.proc/put_in_hands, weapon) + else + INVOKE_ASYNC(weapon, /atom/movable.proc/forceMove, get_turf(victim)) + + qdel(src) + +/datum/component/embedded/proc/tryPullOutOther(mob/living/carbon/victim, mob/user) + SIGNAL_HANDLER + + if(!user.IsAdvancedToolUser()) + to_chat(user, "You don't have the dexterity to do this!") + return + + if(istype(victim)) // check to see if the limb is actually exposed + var/mob/living/carbon/human/victim_human = victim + if(!victim_human.can_inject(user, TRUE, limb.body_zone, penetrate_thick = FALSE)) + return TRUE + + if(weapon.w_class <= WEIGHT_CLASS_SMALL) + to_chat(user, "[weapon] embedding in \the [limb.name] of [parent] is too small to pull out with your bare hands!") + return + + INVOKE_ASYNC(src, .proc/pluckOut, user, 1, 2, "pulling out") + return COMPONENT_NO_ATTACK_HAND + +/datum/component/embedded/proc/checkRemoval(mob/living/carbon/victim, obj/item/I, mob/user) + SIGNAL_HANDLER + + if(!istype(victim) || user.zone_selected != limb.body_zone || user.a_intent != INTENT_HELP) + return + + var/damage_multiplier = 1 + var/remove_verb = "removing" + + switch(I.tool_behaviour) + if(TOOL_HEMOSTAT) + damage_multiplier = 0 + remove_verb = "carefully removing" + if(TOOL_WIRECUTTER) + if(weapon.w_class >= WEIGHT_CLASS_NORMAL) + to_chat(user, "[weapon] is too large to extract with wirecutters!") + return + damage_multiplier = 0.5 + if(TOOL_SCREWDRIVER) + if(weapon.w_class >= WEIGHT_CLASS_SMALL) + to_chat(user, "[weapon] is too large to dislodge with a screwdriver!") + return + damage_multiplier = 0.8 + remove_verb = "dislodging" + else + return + + if(ishuman(victim)) // check to see if the limb is actually exposed + var/mob/living/carbon/human/victim_human = victim + if(!victim_human.can_inject(user, TRUE, limb.body_zone, penetrate_thick = FALSE)) + return TRUE + + INVOKE_ASYNC(src, .proc/pluckOut, user, damage_multiplier, max(damage_multiplier, 0.2), remove_verb) + return COMPONENT_NO_AFTERATTACK + +/// The actual action for pulling out an embedded object with any tools that work +/datum/component/embedded/proc/pluckOut(mob/user, damage_multiplier, time_multiplier, remove_verb) + var/mob/living/carbon/victim = parent + + var/self_pluck = (user == victim) + + if(self_pluck) + user.visible_message("[user] begins [remove_verb] [weapon] from [user.p_their()] [limb.name]", "You start [remove_verb] [weapon] from your [limb.name]...",\ + vision_distance=COMBAT_MESSAGE_RANGE, ignored_mobs=victim) + else + user.visible_message("[user] begins [remove_verb] [weapon] from [victim]'s [limb.name]","You start [remove_verb] [weapon] from [victim]'s [limb.name]...", \ + vision_distance=COMBAT_MESSAGE_RANGE, ignored_mobs=victim) + to_chat(victim, "[user] begins [remove_verb] [weapon] from your [limb.name]...") + + //Pluck time + var/pluck_time = 4 SECONDS * weapon.w_class * time_multiplier + if(!do_after(user, pluck_time, target = victim)) + if(self_pluck) + to_chat(user, "You fail to remove [weapon] from your [limb.name].") + else + to_chat(user, "You fail to remove [weapon] from [victim]'s [limb.name].") + to_chat(victim, "[user] fails to remove [weapon] from your [limb.name].") + return + + //Removed succesfully + if(self_pluck) + to_chat(user, "You successfully remove [weapon] from your [limb.name].") + else + to_chat(user, "You successfully remove [weapon] from [victim]'s [limb.name].") + to_chat(victim, "[user] remove [weapon] from your [limb.name].") + + //Apply damage + if(harmful && damage_multiplier) + var/damage = weapon.w_class * remove_pain_mult * damage_multiplier + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) + victim.emote("scream") + + //Remove it + safeRemove(user) + +/// Something deleted or moved our weapon while it was embedded, how rude! +/datum/component/embedded/proc/weaponDeleted() + SIGNAL_HANDLER + + var/mob/living/carbon/victim = parent + limb.embedded_objects -= weapon + + if(victim) + to_chat(victim, "\The [weapon] that was embedded in your [limb.name] disappears!") + qdel(src) diff --git a/code/datums/components/empprotection.dm b/code/datums/components/empprotection.dm index c85cdf31c7254..513370f3d5fa5 100644 --- a/code/datums/components/empprotection.dm +++ b/code/datums/components/empprotection.dm @@ -8,4 +8,6 @@ RegisterSignal(parent, list(COMSIG_ATOM_EMP_ACT), .proc/getEmpFlags) /datum/component/empprotection/proc/getEmpFlags(datum/source, severity) + SIGNAL_HANDLER + return flags diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index 094dce211d430..6b8e2278016d2 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -5,7 +5,7 @@ var/light_impact_range = 2 var/flash_range = 3 var/equipped_slot //For items, lets us determine where things should be hit. - + /datum/component/explodable/Initialize(devastation_range_override, heavy_impact_range_override, light_impact_range_override, flash_range_override) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE @@ -20,8 +20,8 @@ RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/explodable_attack) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - - + + if(devastation_range_override) devastation_range = devastation_range_override @@ -33,32 +33,46 @@ flash_range = flash_range_override /datum/component/explodable/proc/explodable_insert_item(datum/source, obj/item/I, mob/M, silent = FALSE, force = FALSE) + SIGNAL_HANDLER + check_if_detonate(I) /datum/component/explodable/proc/explodable_impact(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum) + SIGNAL_HANDLER + check_if_detonate(hit_atom) /datum/component/explodable/proc/explodable_bump(datum/source, atom/A) + SIGNAL_HANDLER + check_if_detonate(A) ///Called when you use this object to attack sopmething /datum/component/explodable/proc/explodable_attack(datum/source, atom/movable/target, mob/living/user) + SIGNAL_HANDLER + check_if_detonate(target) -///Called when you attack a specific body part of the thing this is equipped on. Useful for exploding pants. +///Called when you attack a specific body part of the thing this is equipped on. Useful for exploding pants. /datum/component/explodable/proc/explodable_attack_zone(datum/source, damage, damagetype, def_zone) + SIGNAL_HANDLER + if(!def_zone) return if(damagetype != BURN) //Don't bother if it's not fire. return if(!is_hitting_zone(def_zone)) //You didn't hit us! ha! - return + return detonate() /datum/component/explodable/proc/on_equip(datum/source, mob/equipper, slot) + SIGNAL_HANDLER + RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMGE, .proc/explodable_attack_zone) /datum/component/explodable/proc/on_drop(datum/source, mob/user) + SIGNAL_HANDLER + UnregisterSignal(user, COMSIG_MOB_APPLY_DAMGE) /// Checks if we're hitting the zone this component is covering @@ -87,7 +101,7 @@ if(I.body_parts_covered & bodypart.body_part) return TRUE return FALSE - + /datum/component/explodable/proc/check_if_detonate(target) if(!isitem(target)) @@ -100,6 +114,8 @@ /// Expldoe and remove the object /datum/component/explodable/proc/detonate() + SIGNAL_HANDLER + var/atom/A = parent explosion(A, devastation_range, heavy_impact_range, light_impact_range, flash_range) //epic explosion time qdel(A) diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm index 9d1eeec219610..edfad6e20b5b7 100644 --- a/code/datums/components/footstep.dm +++ b/code/datums/components/footstep.dm @@ -11,6 +11,8 @@ RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/play_footstep) /datum/component/footstep/proc/play_footstep() + SIGNAL_HANDLER + var/turf/open/T = get_turf(parent) if(!istype(T)) return @@ -93,11 +95,13 @@ TRUE, GLOB.footstep[T.footstep][3] + e) - if((!H.shoes && !feetCover)) //are we NOT wearing shoes - if(H.dna.species.special_step_sounds) - playsound(T, pick(H.dna.species.special_step_sounds), 50, TRUE) - else - playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]), - GLOB.barefootstep[T.barefootstep][2] * v, - TRUE, - GLOB.barefootstep[T.barefootstep][3] + e) + //Sound of wearing shoes always plays, special movement sound + // IE (server motors wont play bare footed.) + if(H.dna.species.special_step_sounds) + playsound(T, pick(H.dna.species.special_step_sounds), 50, TRUE) + + else if((!H.shoes && !feetCover)) //are we NOT wearing shoes + playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]), + GLOB.barefootstep[T.barefootstep][2] * v, + TRUE, + GLOB.barefootstep[T.barefootstep][3] + e) diff --git a/code/datums/components/forced_gravity.dm b/code/datums/components/forced_gravity.dm index 7f609c494572e..ba4bf6b27232d 100644 --- a/code/datums/components/forced_gravity.dm +++ b/code/datums/components/forced_gravity.dm @@ -12,9 +12,13 @@ gravity = forced_value /datum/component/forced_gravity/proc/gravity_check(datum/source, turf/location, list/gravs) + SIGNAL_HANDLER + if(!ignore_space && isspaceturf(location)) return gravs += gravity /datum/component/forced_gravity/proc/turf_gravity_check(datum/source, atom/checker, list/gravs) - return gravity_check(null, parent, gravs) \ No newline at end of file + SIGNAL_HANDLER + + return gravity_check(null, parent, gravs) diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm index 737c401dda034..956e4da8a05d7 100644 --- a/code/datums/components/forensics.dm +++ b/code/datums/components/forensics.dm @@ -43,8 +43,6 @@ /datum/component/forensics/proc/wipe_blood_DNA() blood_DNA = null - if(isitem(parent)) - qdel(parent.GetComponent(/datum/component/decal/blood)) return TRUE /datum/component/forensics/proc/wipe_fibers() @@ -52,6 +50,8 @@ return TRUE /datum/component/forensics/proc/clean_act(datum/source, strength) + SIGNAL_HANDLER + if(strength >= CLEAN_STRENGTH_FINGERPRINTS) wipe_fingerprints() if(strength >= CLEAN_STRENGTH_BLOOD) @@ -72,7 +72,7 @@ if(!iscameramob(M)) return if(isaicamera(M)) - var/mob/camera/aiEye/ai_camera = M + var/mob/camera/ai_eye/ai_camera = M if(!ai_camera.ai) return M = ai_camera.ai @@ -144,7 +144,7 @@ if(!iscameramob(M)) return if(isaicamera(M)) - var/mob/camera/aiEye/ai_camera = M + var/mob/camera/ai_eye/ai_camera = M if(!ai_camera.ai) return M = ai_camera.ai @@ -181,4 +181,6 @@ return if(!length(blood_DNA)) return - parent.LoadComponent(/datum/component/decal/blood) + if(isitem(parent)) + var/obj/item/I = parent + I.AddElement(/datum/element/decal/blood, initial(I.icon) || I.icon, initial(I.icon_state) || I.icon_state) diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm index b6e7722d1aeb6..683a964b8c010 100644 --- a/code/datums/components/gps.dm +++ b/code/datums/components/gps.dm @@ -36,15 +36,21 @@ GLOBAL_LIST_EMPTY(GPS_list) ///Called on COMSIG_ITEM_ATTACK_SELF /datum/component/gps/item/proc/interact(datum/source, mob/user) + SIGNAL_HANDLER + if(user) - ui_interact(user) + INVOKE_ASYNC(src, .proc/ui_interact, user) ///Called on COMSIG_PARENT_EXAMINE /datum/component/gps/item/proc/on_examine(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + examine_list += "Alt-click to switch it [tracking ? "off":"on"]." ///Called on COMSIG_ATOM_EMP_ACT /datum/component/gps/item/proc/on_emp_act(datum/source, severity) + SIGNAL_HANDLER + emped = TRUE var/atom/A = parent A.cut_overlay("working") @@ -61,7 +67,10 @@ GLOBAL_LIST_EMPTY(GPS_list) ///Calls toggletracking /datum/component/gps/item/proc/on_AltClick(datum/source, mob/user) + SIGNAL_HANDLER + toggletracking(user) + ui_update() ///Toggles the tracking for the gps /datum/component/gps/item/proc/toggletracking(mob/user) @@ -106,22 +115,21 @@ GLOBAL_LIST_EMPTY(GPS_list) var/turf/curr = get_turf(parent) data["currentArea"] = "[get_area_name(curr, TRUE)]" - data["currentCoords"] = "[curr.x], [curr.y], [curr.z]" + data["currentCoords"] = "[curr.x], [curr.y], [curr.get_virtual_z_level()]" var/list/signals = list() - data["signals"] = list() for(var/gps in GLOB.GPS_list) var/datum/component/gps/G = gps if(G.emped || !G.tracking || G == src) continue var/turf/pos = get_turf(G.parent) - if(!pos || !global_mode && pos.z != curr.z) + if(!pos || !global_mode && pos.get_virtual_z_level() != curr.get_virtual_z_level()) continue var/list/signal = list() signal["entrytag"] = G.gpstag //Name or 'tag' of the GPS - signal["coords"] = "[pos.x], [pos.y], [pos.z]" - if(pos.z == curr.z) //Distance/Direction calculations for same z-level only + signal["coords"] = "[pos.x], [pos.y], [pos.get_virtual_z_level()]" + if(pos.get_virtual_z_level() == curr.get_virtual_z_level()) //Distance/Direction calculations for same z-level only signal["dist"] = max(get_dist(curr, pos), 0) //Distance between the src and remote GPS turfs signal["degrees"] = round(Get_Angle(curr, pos)) //0-360 degree directional bearing, for more precision. signals += list(signal) //Add this signal to the list of signals diff --git a/code/datums/components/heirloom.dm b/code/datums/components/heirloom.dm index 72b28b125dd6a..69f8fb817b98a 100644 --- a/code/datums/components/heirloom.dm +++ b/code/datums/components/heirloom.dm @@ -12,6 +12,8 @@ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) /datum/component/heirloom/proc/examine(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + if(user.mind == owner) examine_list += "It is your precious [family_name] family heirloom. Keep it safe!" else if(isobserver(user)) diff --git a/code/datums/components/honkspam.dm b/code/datums/components/honkspam.dm index 73b5e3335aad1..9f17f372b04f1 100644 --- a/code/datums/components/honkspam.dm +++ b/code/datums/components/honkspam.dm @@ -15,6 +15,8 @@ spam_flag = FALSE /datum/component/honkspam/proc/interact(mob/user) + SIGNAL_HANDLER + if(!spam_flag) spam_flag = TRUE var/obj/item/parent_item = parent diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm index 57bb8e0ae60a4..930bf51c3e942 100644 --- a/code/datums/components/infective.dm +++ b/code/datums/components/infective.dm @@ -33,19 +33,27 @@ RegisterSignal(parent, COMSIG_GIBS_STREAK, .proc/try_infect_streak) /datum/component/infective/proc/try_infect_eat(datum/source, mob/living/eater, mob/living/feeder) + SIGNAL_HANDLER + for(var/V in diseases) eater.ForceContractDisease(V) try_infect(feeder, BODY_ZONE_L_ARM) /datum/component/infective/proc/clean(datum/source, clean_strength) + SIGNAL_HANDLER + if(clean_strength >= min_clean_strength) qdel(src) /datum/component/infective/proc/try_infect_buckle(datum/source, mob/M, force) + SIGNAL_HANDLER + if(isliving(M)) try_infect(M) /datum/component/infective/proc/try_infect_collide(datum/source, atom/A) + SIGNAL_HANDLER + var/atom/movable/P = parent if(P.throwing) //this will be handled by try_infect_impact_zone() @@ -54,18 +62,26 @@ try_infect(A) /datum/component/infective/proc/try_infect_impact_zone(datum/source, mob/living/target, hit_zone) + SIGNAL_HANDLER + try_infect(target, hit_zone) /datum/component/infective/proc/try_infect_attack_zone(datum/source, mob/living/carbon/target, mob/living/user, hit_zone) + SIGNAL_HANDLER + try_infect(user, BODY_ZONE_L_ARM) try_infect(target, hit_zone) /datum/component/infective/proc/try_infect_attack(datum/source, mob/living/target, mob/living/user) + SIGNAL_HANDLER + if(!iscarbon(target)) //this case will be handled by try_infect_attack_zone try_infect(target) try_infect(user, BODY_ZONE_L_ARM) /datum/component/infective/proc/try_infect_equipped(datum/source, mob/living/L, slot) + SIGNAL_HANDLER + var/old_permeability if(isitem(parent)) //if you are putting an infective item on, it obviously will not protect you, so set its permeability high enough that it will never block ContactContractDisease() @@ -80,10 +96,14 @@ I.permeability_coefficient = old_permeability /datum/component/infective/proc/try_infect_crossed(datum/source, atom/movable/M) + SIGNAL_HANDLER + if(isliving(M)) try_infect(M, BODY_ZONE_PRECISE_L_FOOT) /datum/component/infective/proc/try_infect_streak(datum/source, list/directions, list/output_diseases) + SIGNAL_HANDLER + output_diseases |= diseases /datum/component/infective/proc/try_infect(mob/living/L, target_zone) @@ -91,7 +111,9 @@ L.ContactContractDisease(V, target_zone) /datum/component/infective/proc/extrapolation(datum/source, mob/user, var/obj/item/extrapolator/E, scan = TRUE) + SIGNAL_HANDLER + if(scan) E.scan(source, diseases, user) else - E.extrapolate(source, diseases, user) + INVOKE_ASYNC(E, /obj/item/extrapolator.proc/extrapolate, source, diseases, user) diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm index ae96fcb4d0b0a..4a417d8b5acaa 100644 --- a/code/datums/components/jousting.dm +++ b/code/datums/components/jousting.dm @@ -23,16 +23,22 @@ RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack) /datum/component/jousting/proc/on_equip(datum/source, mob/user, slot) + SIGNAL_HANDLER + RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/mob_move, TRUE) current_holder = user /datum/component/jousting/proc/on_drop(datum/source, mob/user) + SIGNAL_HANDLER + UnregisterSignal(user, COMSIG_MOVABLE_MOVED) current_holder = null current_direction = NONE current_tile_charge = 0 /datum/component/jousting/proc/on_attack(datum/source, mob/living/target, mob/user) + SIGNAL_HANDLER + if(user != current_holder) return var/current = current_tile_charge @@ -41,7 +47,7 @@ if((requires_mount && ((requires_mob_riding && !ismob(user.buckled)) || (!user.buckled))) || !current_direction || (current_tile_charge < min_tile_charge)) return var/turf/target_turf = get_step(user, current_direction) - if(target in range(1, target_turf)) + if(get_dist(target, target_turf) <= 1) var/knockdown_chance = (target_buckled? mounted_knockdown_chance_per_tile : unmounted_knockdown_chance_per_tile) * current var/knockdown_time = (target_buckled? mounted_knockdown_time : unmounted_knockdown_time) var/damage = (target_buckled? mounted_damage_boost_per_tile : unmounted_damage_boost_per_tile) * current @@ -59,6 +65,8 @@ user.visible_message("[msg]!") /datum/component/jousting/proc/mob_move(datum/source, newloc, dir) + SIGNAL_HANDLER + if(!current_holder || (requires_mount && ((requires_mob_riding && !ismob(current_holder.buckled)) || (!current_holder.buckled)))) return if(dir != current_direction) diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm index a36169e6dfd37..770f72cfea5b0 100644 --- a/code/datums/components/knockoff.dm +++ b/code/datums/components/knockoff.dm @@ -11,7 +11,7 @@ RegisterSignal(parent, COMSIG_ITEM_DROPPED,.proc/OnDropped) src.knockoff_chance = knockoff_chance - + if(zone_override) target_zones = zone_override @@ -19,6 +19,8 @@ src.slots_knockoffable = slots_knockoffable /datum/component/knockoff/proc/Knockoff(mob/living/attacker,zone) + SIGNAL_HANDLER + var/obj/item/I = parent var/mob/living/carbon/human/wearer = I.loc if(!istype(wearer)) @@ -33,6 +35,8 @@ wearer.visible_message("[attacker] knocks off [wearer]'s [I.name]!","[attacker] knocks off your [I.name]!") /datum/component/knockoff/proc/OnEquipped(datum/source, mob/living/carbon/human/H,slot) + SIGNAL_HANDLER + if(!istype(H)) return if(slots_knockoffable && !(slot in slots_knockoffable)) @@ -41,4 +45,6 @@ RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE) /datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M) - UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT) \ No newline at end of file + SIGNAL_HANDLER + + UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT) diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm index fef0dd0ef0c9f..2b788b1030d4a 100644 --- a/code/datums/components/lockon_aiming.dm +++ b/code/datums/components/lockon_aiming.dm @@ -18,6 +18,7 @@ var/list/last_location var/datum/callback/on_lock var/datum/callback/can_target_callback + var/aiming_params /datum/component/lockon_aiming/Initialize(range, list/typecache, amount, list/immune, datum/callback/when_locked, icon, icon_state, datum/callback/target_callback) if(!ismob(parent)) @@ -46,14 +47,10 @@ if(icon_state) lock_icon_state = icon_state generate_lock_visuals() - var/mob/M = parent - LAZYOR(M.mousemove_intercept_objects, src) START_PROCESSING(SSfastprocess, src) /datum/component/lockon_aiming/Destroy() - var/mob/M = parent clear_visuals() - LAZYREMOVE(M.mousemove_intercept_objects, src) STOP_PROCESSING(SSfastprocess, src) return ..() @@ -119,27 +116,6 @@ return LAZYREMOVE(immune_weakrefs, A.weak_reference) -/datum/component/lockon_aiming/onMouseMove(object,location,control,params) - var/mob/M = parent - if(!istype(M) || !M.client) - return - var/datum/position/P = mouse_absolute_datum_map_position_from_client(M.client) - if(!P) - return - var/turf/T = P.return_turf() - LAZYINITLIST(last_location) - if(length(last_location) == 3 && last_location[1] == T.x && last_location[2] == T.y && last_location[3] == T.z) - return //Same turf, don't bother. - if(last_location) - last_location.Cut() - else - last_location = list() - last_location.len = 3 - last_location[1] = T.x - last_location[2] = T.y - last_location[3] = T.z - autolock() - /datum/component/lockon_aiming/process() if(update_disabled) return @@ -163,7 +139,7 @@ var/mob/M = parent if(!M.client) return FALSE - var/datum/position/current = mouse_absolute_datum_map_position_from_client(M.client) + var/datum/position/current = mouse_absolute_datum_map_position_from_client(M.client, aiming_params) var/turf/target = current.return_turf() var/list/atom/targets = get_nearest(target, target_typecache, lock_amount, lock_cursor_range) if(targets == LOCKON_IGNORE_RESULT) diff --git a/code/datums/components/magnetic_catch.dm b/code/datums/components/magnetic_catch.dm index 4defe936e5ea4..ac8a5ee6fc521 100644 --- a/code/datums/components/magnetic_catch.dm +++ b/code/datums/components/magnetic_catch.dm @@ -16,19 +16,31 @@ RegisterSignal(i, COMSIG_MOVABLE_PRE_THROW, .proc/throw_react) /datum/component/magnetic_catch/proc/examine(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + examine_list += "It has been installed with inertia dampening to prevent coffee spills." /datum/component/magnetic_catch/proc/crossed_react(datum/source, atom/movable/thing) + SIGNAL_HANDLER + RegisterSignal(thing, COMSIG_MOVABLE_PRE_THROW, .proc/throw_react, TRUE) /datum/component/magnetic_catch/proc/uncrossed_react(datum/source, atom/movable/thing) + SIGNAL_HANDLER + UnregisterSignal(thing, COMSIG_MOVABLE_PRE_THROW) /datum/component/magnetic_catch/proc/entered_react(datum/source, atom/movable/thing, atom/oldloc) + SIGNAL_HANDLER + RegisterSignal(thing, COMSIG_MOVABLE_PRE_THROW, .proc/throw_react, TRUE) /datum/component/magnetic_catch/proc/exited_react(datum/source, atom/movable/thing, atom/newloc) + SIGNAL_HANDLER + UnregisterSignal(thing, COMSIG_MOVABLE_PRE_THROW) /datum/component/magnetic_catch/proc/throw_react(datum/source, list/arguments) + SIGNAL_HANDLER + return COMPONENT_CANCEL_THROW diff --git a/code/datums/components/manual_blinking.dm b/code/datums/components/manual_blinking.dm index d54291cee2cb8..0c5979af02b3c 100644 --- a/code/datums/components/manual_blinking.dm +++ b/code/datums/components/manual_blinking.dm @@ -7,7 +7,7 @@ var/last_blink var/check_every = 20 SECONDS //we scp now var/grace_period = 6 SECONDS - var/damage_rate = 1 // organ damage taken per tick + var/damage_rate = 0.5 // organ damage taken per second var/list/valid_emotes = list(/datum/emote/living/carbon/blink, /datum/emote/living/carbon/blink_r) var/datum/action/blink/button = new @@ -56,12 +56,16 @@ UnregisterSignal(parent, COMSIG_MOB_DEATH) /datum/component/manual_blinking/proc/restart() + SIGNAL_HANDLER + START_PROCESSING(SSdcs, src) /datum/component/manual_blinking/proc/pause() + SIGNAL_HANDLER + STOP_PROCESSING(SSdcs, src) -/datum/component/manual_blinking/process() +/datum/component/manual_blinking/process(delta_time) var/mob/living/carbon/C = parent if(world.time > (last_blink + check_every + grace_period)) @@ -69,13 +73,15 @@ to_chat(C, "Your eyes begin to wither, you need to blink!") warn_dying = TRUE - E.applyOrganDamage(damage_rate) + E.applyOrganDamage(damage_rate * delta_time) else if(world.time > (last_blink + check_every)) if(!warn_grace) to_chat(C, "You feel a need to blink!") warn_grace = TRUE /datum/component/manual_blinking/proc/check_added_organ(mob/who_cares, obj/item/organ/O) + SIGNAL_HANDLER + var/obj/item/organ/eyes/new_eyes = O if(istype(new_eyes,/obj/item/organ/eyes)) @@ -83,6 +89,8 @@ START_PROCESSING(SSdcs, src) /datum/component/manual_blinking/proc/check_removed_organ(mob/who_cares, obj/item/organ/O) + SIGNAL_HANDLER + var/obj/item/organ/eyes/bye_beyes = O // oh come on, that's pretty good if(istype(bye_beyes, /obj/item/organ/eyes)) @@ -90,6 +98,8 @@ STOP_PROCESSING(SSdcs, src) /datum/component/manual_blinking/proc/check_emote(mob/living/carbon/user, datum/emote/emote) + SIGNAL_HANDLER + if(emote.type in valid_emotes) warn_grace = FALSE warn_dying = FALSE diff --git a/code/datums/components/manual_breathing.dm b/code/datums/components/manual_breathing.dm index 0be40118c6144..9a3871ce11c68 100644 --- a/code/datums/components/manual_breathing.dm +++ b/code/datums/components/manual_breathing.dm @@ -7,7 +7,7 @@ var/last_breath var/check_every = 12 SECONDS var/grace_period = 6 SECONDS - var/damage_rate = 1 // organ damage taken per tick + var/damage_rate = 0.5 // organ damage taken per second var/datum/emote/next_breath_type = /datum/emote/inhale var/datum/action/breathe/button = new @@ -66,12 +66,16 @@ UnregisterSignal(parent, COMSIG_MOB_DEATH) /datum/component/manual_breathing/proc/restart() + SIGNAL_HANDLER + START_PROCESSING(SSdcs, src) /datum/component/manual_breathing/proc/pause() + SIGNAL_HANDLER + STOP_PROCESSING(SSdcs, src) -/datum/component/manual_breathing/process() +/datum/component/manual_breathing/process(delta_time) var/mob/living/carbon/C = parent var/next_text = initial(next_breath_type.key) @@ -80,7 +84,7 @@ to_chat(C, "You begin to suffocate, you need to [next_text]!") warn_dying = TRUE - L.applyOrganDamage(damage_rate) + L.applyOrganDamage(damage_rate * delta_time) C.losebreath += 0.8 else if(world.time > (last_breath + check_every)) if(!warn_grace) @@ -88,6 +92,8 @@ warn_grace = TRUE /datum/component/manual_breathing/proc/check_added_organ(mob/who_cares, obj/item/organ/O) + SIGNAL_HANDLER + var/obj/item/organ/eyes/new_lungs = O if(istype(new_lungs,/obj/item/organ/lungs)) @@ -95,6 +101,8 @@ START_PROCESSING(SSdcs, src) /datum/component/manual_breathing/proc/check_removed_organ(mob/who_cares, obj/item/organ/O) + SIGNAL_HANDLER + var/obj/item/organ/lungs/old_lungs = O if(istype(old_lungs, /obj/item/organ/lungs)) @@ -102,6 +110,8 @@ STOP_PROCESSING(SSdcs, src) /datum/component/manual_breathing/proc/check_emote(mob/living/carbon/user, datum/emote/emote) + SIGNAL_HANDLER + if(emote.type == next_breath_type) if(next_breath_type == /datum/emote/inhale) next_breath_type = /datum/emote/exhale diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 4db6612a84a98..361c3e1b014e9 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -46,6 +46,8 @@ materials[M] = 0 /datum/component/material_container/proc/OnExamine(datum/source, mob/user) + SIGNAL_HANDLER + if(show_on_examine) for(var/I in materials) var/datum/material/M = I @@ -55,6 +57,8 @@ /// Proc that allows players to fill the parent with mats /datum/component/material_container/proc/OnAttackBy(datum/source, obj/item/I, mob/living/user) + SIGNAL_HANDLER + var/list/tc = allowed_typecache if(disable_attackby) return @@ -104,6 +108,7 @@ I.forceMove(user.drop_location()) else to_chat(user, "You insert a material total of [inserted] into [parent].") + SEND_SIGNAL(I, COMSIG_OBJ_DECONSTRUCT) //Help prevent using material ingestors to void storage items. qdel(I) if(after_insert) after_insert.Invoke(I.type, last_inserted_id, inserted) @@ -112,7 +117,7 @@ /// Proc specifically for inserting items, returns the amount of materials entered. /datum/component/material_container/proc/insert_item(obj/item/I, var/multiplier = 1, stack_amt) - if(!I) + if(QDELETED(I)) return FALSE if(istype(I, /obj/item/stack)) return insert_stack(I, stack_amt, multiplier) @@ -137,7 +142,7 @@ return primary_mat /// Proc for putting a stack inside of the container -/datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt, multiplier = 1) +/datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt, multiplier = 1) if(isnull(amt)) amt = S.amount @@ -160,7 +165,7 @@ return amt /// For inserting an amount of material -/datum/component/material_container/proc/insert_amount_mat(amt, var/datum/material/mat) +/datum/component/material_container/proc/insert_amount_mat(amt, var/datum/material/mat) if(!istype(mat)) mat = getmaterialref(mat) if(amt > 0 && has_space(amt)) @@ -175,7 +180,7 @@ return FALSE /// Uses an amount of a specific material, effectively removing it. -/datum/component/material_container/proc/use_amount_mat(amt, var/datum/material/mat) +/datum/component/material_container/proc/use_amount_mat(amt, var/datum/material/mat) if(!istype(mat)) mat = getmaterialref(mat) var/amount = materials[mat] @@ -187,7 +192,7 @@ return FALSE /// Proc for transfering materials to another container. -/datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, var/datum/material/mat) +/datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, var/datum/material/mat) if(!istype(mat)) mat = getmaterialref(mat) if((amt==0)||(!T)||(!mat)) @@ -216,7 +221,7 @@ /datum/component/material_container/proc/use_materials(list/mats, multiplier=1) if(!mats || !length(mats)) return FALSE - + var/list/mats_to_remove = list() //Assoc list MAT | AMOUNT for(var/x in mats) //Loop through all required materials @@ -230,7 +235,7 @@ return FALSE //Can't afford it mats_to_remove[req_mat] += amount_required //Add it to the assoc list of things to remove continue - + var/total_amount_save = total_amount for(var/i in mats_to_remove) @@ -239,7 +244,7 @@ return total_amount_save - total_amount /// For spawning mineral sheets at a specific location. Used by machines to output sheets. -/datum/component/material_container/proc/retrieve_sheets(sheet_amt, var/datum/material/M, target = null) +/datum/component/material_container/proc/retrieve_sheets(sheet_amt, var/datum/material/M, target = null) if(!M.sheet_type) return 0 //Add greyscale sheet handling here later if(sheet_amt <= 0) @@ -263,7 +268,7 @@ /// Proc to get all the materials and dump them as sheets -/datum/component/material_container/proc/retrieve_all(target = null) +/datum/component/material_container/proc/retrieve_all(target = null) var/result = 0 for(var/MAT in materials) var/amount = materials[MAT] @@ -286,18 +291,18 @@ req_mat = getmaterialref(req_mat) //Get the ref else // Its a category. (For example MAT_CATEGORY_RIGID) - if(!has_enough_of_category(req_mat, mats[req_mat], multiplier)) //Do we have enough of this category? + if(!has_enough_of_category(req_mat, mats[x], multiplier)) //Do we have enough of this category? return FALSE else continue - if(!has_enough_of_material(req_mat, mats[req_mat], multiplier))//Not a category, so just check the normal way + if(!has_enough_of_material(req_mat, mats[x], multiplier))//Not a category, so just check the normal way return FALSE return TRUE /// Returns all the categories in a recipe. -/datum/component/material_container/proc/get_categories(list/mats) +/datum/component/material_container/proc/get_categories(list/mats) var/list/categories = list() for(var/x in mats) //Loop through all required materials if(!istext(x)) //This means its not a category @@ -307,12 +312,12 @@ /// Returns TRUE if you have enough of the specified material. -/datum/component/material_container/proc/has_enough_of_material(var/datum/material/req_mat, amount, multiplier=1) +/datum/component/material_container/proc/has_enough_of_material(var/datum/material/req_mat, amount, multiplier=1) if(!materials[req_mat]) //Do we have the resource? return FALSE //Can't afford it var/amount_required = amount * multiplier if(materials[req_mat] >= amount_required) // do we have enough of the resource? - return TRUE + return TRUE return FALSE //Can't afford it /// Returns TRUE if you have enough of a specified material category (Which could be multiple materials) @@ -324,7 +329,7 @@ return FALSE /// Turns a material amount into the amount of sheets it should output -/datum/component/material_container/proc/amount2sheet(amt) +/datum/component/material_container/proc/amount2sheet(amt) if(amt >= MINERAL_MATERIAL_AMOUNT) return round(amt / MINERAL_MATERIAL_AMOUNT) return FALSE @@ -346,7 +351,24 @@ return material_amount /// Returns the amount of a specific material in this container. -/datum/component/material_container/proc/get_material_amount(var/datum/material/mat) +/datum/component/material_container/proc/get_material_amount(var/datum/material/mat) if(!istype(mat)) mat = getmaterialref(mat) - return(materials[mat]) + return materials[mat] + +/// List format is list(material_name = list(amount = ..., ref = ..., etc.)) +/datum/component/material_container/ui_data(mob/user) + var/list/data = list() + + for(var/datum/material/material as anything in materials) + var/amount = materials[material] + + data += list(list( + "name" = material.name, + "ref" = REF(material), + "amount" = amount, + "sheets" = round(amount / MINERAL_MATERIAL_AMOUNT), + "removable" = amount >= MINERAL_MATERIAL_AMOUNT, + )) + + return data diff --git a/code/datums/components/mirage_border.dm b/code/datums/components/mirage_border.dm index b84da962d8b8a..5f5470816da77 100644 --- a/code/datums/components/mirage_border.dm +++ b/code/datums/components/mirage_border.dm @@ -44,3 +44,7 @@ name = "Mirage holder" anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT + +/obj/effect/abstract/mirage_holder/Destroy(force) + vis_contents.Cut() + . = ..() diff --git a/code/datums/components/mirv.dm b/code/datums/components/mirv.dm new file mode 100644 index 0000000000000..e64b4ba638ef0 --- /dev/null +++ b/code/datums/components/mirv.dm @@ -0,0 +1,43 @@ +/datum/component/mirv + var/projectile_type + var/radius // shoots a projectile for every turf on this radius from the hit target + var/override_projectile_range + +/datum/component/mirv/Initialize(projectile_type, radius=1, override_projectile_range) + if(!isgun(parent) && !ismachinery(parent) && !isstructure(parent) && !isgrenade(parent)) + return COMPONENT_INCOMPATIBLE + + src.projectile_type = projectile_type + src.radius = radius + src.override_projectile_range = override_projectile_range + + if(isgrenade(parent)) + parent.AddComponent(/datum/component/pellet_cloud, projectile_type=projectile_type) + +/datum/component/mirv/RegisterWithParent() + if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc + RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + +/datum/component/mirv/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_PROJECTILE_ON_HIT)) + +/datum/component/mirv/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle) + SIGNAL_HANDLER + + INVOKE_ASYNC(src, .proc/do_shrapnel, firer, target) + +/datum/component/mirv/proc/do_shrapnel(mob/firer, atom/target) + if(radius < 1) + return + var/turf/target_turf = get_turf(target) + for(var/turf/shootat_turf in RANGE_TURFS(radius, target) - RANGE_TURFS(radius-1, target)) + + var/obj/item/projectile/P = new projectile_type(target_turf) + //Shooting Code: + P.range = radius+1 + if(override_projectile_range) + P.range = override_projectile_range + P.preparePixelProjectile(shootat_turf, target) + P.firer = firer // don't hit ourself that would be really annoying + P.permutated += target // don't hit the target we hit already with the flak + P.fire() diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index cf2e05ad83bd0..b82781feeb218 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -10,8 +10,8 @@ var/mood_modifier = 1 //Modifier to allow certain mobs to be less affected by moodlets var/list/datum/mood_event/mood_events = list() var/insanity_effect = 0 //is the owner being punished for low mood? If so, how much? - var/obj/screen/mood/screen_obj - var/obj/screen/sanity/screen_obj_sanity + var/atom/movable/screen/mood/screen_obj + var/atom/movable/screen/sanity/screen_obj_sanity /datum/component/mood/Initialize() if(!isliving(parent)) @@ -24,6 +24,7 @@ RegisterSignal(parent, COMSIG_ENTER_AREA, .proc/check_area_mood) RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud) + RegisterSignal(parent, COMSIG_HUMAN_VOID_MASK_ACT, .proc/direct_sanity_drain) var/mob/living/owner = parent if(owner.hud_used) modify_hud() @@ -169,29 +170,28 @@ screen_obj.color = "#2eeb9a" break -/datum/component/mood/process() //Called on SSmood process +///Called on SSmood process +/datum/component/mood/process(delta_time) var/mob/living/owner = parent - switch(mood_level) if(1) - setSanity(sanity-0.3) + setSanity(sanity-0.3*delta_time) if(2) - setSanity(sanity-0.15) + setSanity(sanity-0.15*delta_time) if(3) - setSanity(sanity-0.1) + setSanity(sanity-0.1*delta_time) if(4) - setSanity(sanity-0.05, minimum=SANITY_UNSTABLE) + setSanity(sanity-0.05*delta_time, minimum=SANITY_UNSTABLE) if(5) setSanity(sanity+0.1, maximum=SANITY_NEUTRAL) if(6) - setSanity(sanity+0.2, maximum=SANITY_GREAT) + setSanity(sanity+0.2*delta_time, maximum=SANITY_GREAT) if(7) - setSanity(sanity+0.3, maximum=INFINITY) + setSanity(sanity+0.3*delta_time, maximum=SANITY_GREAT) if(8) - setSanity(sanity+0.4, maximum=SANITY_MAXIMUM) + setSanity(sanity+0.4*delta_time, maximum=SANITY_MAXIMUM) if(9) - setSanity(sanity+0.6, maximum=SANITY_MAXIMUM) - + setSanity(sanity+0.6*delta_time, maximum=SANITY_MAXIMUM) HandleNutrition(owner) HandleHygiene(owner) @@ -216,26 +216,32 @@ if(SANITY_INSANE to SANITY_CRAZY) setInsanityEffect(MAJOR_INSANITY_PEN) master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=0.6, movetypes=(~FLYING)) + master.add_actionspeed_modifier(/datum/actionspeed_modifier/low_sanity) sanity_level = 6 if(SANITY_CRAZY to SANITY_UNSTABLE) setInsanityEffect(MINOR_INSANITY_PEN) master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=0.3, movetypes=(~FLYING)) + master.add_actionspeed_modifier(/datum/actionspeed_modifier/low_sanity) sanity_level = 5 if(SANITY_UNSTABLE to SANITY_DISTURBED) setInsanityEffect(0) master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=0.15, movetypes=(~FLYING)) + master.add_actionspeed_modifier(/datum/actionspeed_modifier/low_sanity) sanity_level = 4 if(SANITY_DISTURBED to SANITY_NEUTRAL) setInsanityEffect(0) master.remove_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE) + master.remove_actionspeed_modifier(ACTIONSPEED_ID_SANITY) sanity_level = 3 if(SANITY_NEUTRAL+1 to SANITY_GREAT+1) //shitty hack but +1 to prevent it from responding to super small differences setInsanityEffect(0) master.remove_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE) + master.add_actionspeed_modifier(/datum/actionspeed_modifier/high_sanity) sanity_level = 2 if(SANITY_GREAT+1 to INFINITY) setInsanityEffect(0) master.remove_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE) + master.add_actionspeed_modifier(/datum/actionspeed_modifier/high_sanity) sanity_level = 1 update_mood_icon() @@ -247,6 +253,8 @@ insanity_effect = newval /datum/component/mood/proc/add_event(datum/source, category, type, param) //Category will override any events in the same category, should be unique unless the event is based on the same thing like hunger. + SIGNAL_HANDLER + var/datum/mood_event/the_event if(!istext(category)) category = REF(category) @@ -268,6 +276,8 @@ addtimer(CALLBACK(src, .proc/clear_event, null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE) /datum/component/mood/proc/clear_event(datum/source, category) + SIGNAL_HANDLER + if(!istext(category)) category = REF(category) var/datum/mood_event/event = mood_events[category] @@ -278,6 +288,11 @@ qdel(event) update_mood() +/datum/component/mood/proc/get_event(category) + if(!istext(category)) + category = REF(category) + return mood_events[category] + /datum/component/mood/proc/remove_temp_moods(var/admin) //Removes all temp moods for(var/i in mood_events) var/datum/mood_event/moodlet = mood_events[i] @@ -289,6 +304,8 @@ /datum/component/mood/proc/modify_hud(datum/source) + SIGNAL_HANDLER + var/mob/living/owner = parent var/datum/hud/hud = owner.hud_used screen_obj = new @@ -299,6 +316,8 @@ RegisterSignal(screen_obj, COMSIG_CLICK, .proc/hud_click) /datum/component/mood/proc/unmodify_hud(datum/source) + SIGNAL_HANDLER + if(!screen_obj) return var/mob/living/owner = parent @@ -310,15 +329,16 @@ QDEL_NULL(screen_obj_sanity) /datum/component/mood/proc/hud_click(datum/source, location, control, params, mob/user) + SIGNAL_HANDLER + print_mood(user) /datum/component/mood/proc/HandleNutrition(mob/living/L) - if(ishuman(L)) - var/mob/living/carbon/human/H = L - if(isethereal(H)) - HandleCharge(H) - if(HAS_TRAIT(H, TRAIT_NOHUNGER)) - return FALSE //no mood events for nutrition + if(HAS_TRAIT(L, TRAIT_NOHUNGER)) + return FALSE //no mood events for nutrition + if(HAS_TRAIT(L, TRAIT_POWERHUNGRY)) + HandleCharge(L) + return switch(L.nutrition) if(NUTRITION_LEVEL_FULL to INFINITY) if (!HAS_TRAIT(L, TRAIT_VORACIOUS)) @@ -336,43 +356,45 @@ if(0 to NUTRITION_LEVEL_STARVING) add_event(null, "nutrition", /datum/mood_event/starving) -/datum/component/mood/proc/HandleCharge(mob/living/carbon/human/H) - var/datum/species/ethereal/E = H.dna?.species - switch(E.get_charge(H)) - if(ETHEREAL_CHARGE_NONE to ETHEREAL_CHARGE_LOWPOWER) - add_event(null, "charge", /datum/mood_event/decharged) - if(ETHEREAL_CHARGE_LOWPOWER to ETHEREAL_CHARGE_NORMAL) - add_event(null, "charge", /datum/mood_event/lowpower) - if(ETHEREAL_CHARGE_NORMAL to ETHEREAL_CHARGE_ALMOSTFULL) - clear_event(null, "charge") - if(ETHEREAL_CHARGE_ALMOSTFULL to ETHEREAL_CHARGE_FULL) - add_event(null, "charge", /datum/mood_event/charged) +/datum/component/mood/proc/HandleCharge(mob/living/L) + switch(L.nutrition) + if(NUTRITION_LEVEL_WELL_FED to INFINITY) + add_event(null, "nutrition", /datum/mood_event/charged) + if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED) + clear_event(null, "nutrition") + if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_FED) + add_event(null, "nutrition", /datum/mood_event/lowpower) + if(0 to NUTRITION_LEVEL_STARVING) + add_event(null, "nutrition", /datum/mood_event/decharged) /datum/component/mood/proc/HandleHygiene(mob/living/carbon/human/H) - if(H.hygiene <= HYGIENE_LEVEL_DIRTY) - HygieneMiasma(H) - -/datum/component/mood/proc/HygieneMiasma(mob/living/carbon/human/H) - // Properly stored humans shouldn't create miasma - if(istype(H.loc, /obj/structure/closet/crate/coffin)|| istype(H.loc, /obj/structure/closet/body_bag) || istype(H.loc, /obj/structure/bodycontainer)) - return - - var/turf/T = get_turf(H) - - if(!istype(T) || T.return_air().return_pressure() > (WARNING_HIGH_PRESSURE - 10)) - return - - var/datum/gas_mixture/stank = new - stank.set_moles(/datum/gas/miasma, MIASMA_HYGIENE_MOLES) - stank.set_temperature(BODYTEMP_NORMAL) - T.assume_air(stank) - T.air_update_turf() + if(H.has_quirk(/datum/quirk/neet)) + return //Neets don't care. + switch (H.hygiene) + if(HYGIENE_LEVEL_DISGUSTING to HYGIENE_LEVEL_DISGUSTING)//Believe it or not but this is actually the cleaner option. + add_event(null, "hygiene", /datum/mood_event/disgusting) + if(HYGIENE_LEVEL_DISGUSTING to HYGIENE_LEVEL_DIRTY) + add_event(null, "hygiene", /datum/mood_event/dirty) + if(HYGIENE_LEVEL_DIRTY to HYGIENE_LEVEL_NORMAL) + clear_event(null, "hygiene") + if(HYGIENE_LEVEL_NORMAL to HYGIENE_LEVEL_CLEAN) + add_event(null, "hygiene", /datum/mood_event/neat) /datum/component/mood/proc/check_area_mood(datum/source, var/area/A) + SIGNAL_HANDLER + if(A.mood_bonus) + if(get_event("area")) //walking between areas that give mood bonus should first clear the bonus from the previous one + clear_event(null, "area") add_event(null, "area", /datum/mood_event/area, list(A.mood_bonus, A.mood_message)) else clear_event(null, "area") #undef MINOR_INSANITY_PEN #undef MAJOR_INSANITY_PEN + +///Causes direct drain of someone's sanity, call it with a numerical value corresponding how badly you want to hurt their sanity +/datum/component/mood/proc/direct_sanity_drain(datum/source, amount) + SIGNAL_HANDLER + + setSanity(sanity + amount) diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm index 8bf4ab5f6309f..bc99510afa726 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -107,9 +107,9 @@ else adjust_nanites(null, amount) //just add to the nanite volume -/datum/component/nanites/process() +/datum/component/nanites/process(delta_time) if(!IS_IN_STASIS(host_mob)) - adjust_nanites(null, regen_rate) + adjust_nanites(null, regen_rate * delta_time) add_research() for(var/X in programs) var/datum/nanite_program/NP = X @@ -121,10 +121,14 @@ /datum/component/nanites/proc/delete_nanites() + SIGNAL_HANDLER + qdel(src) //Syncs the nanite component to another, making it so programs are the same with the same programming (except activation status) /datum/component/nanites/proc/sync(datum/signal_source, datum/component/nanites/source, full_overwrite = TRUE, copy_activation = FALSE) + SIGNAL_HANDLER + var/list/programs_to_remove = programs.Copy() var/list/programs_to_add = source.programs.Copy() for(var/X in programs) @@ -157,6 +161,8 @@ NP.software_error() /datum/component/nanites/proc/add_program(datum/source, datum/nanite_program/new_program, datum/nanite_program/source_program) + SIGNAL_HANDLER + for(var/X in programs) var/datum/nanite_program/NP = X if(NP.unique && NP.type == new_program.type) @@ -176,6 +182,8 @@ return (nanite_volume > 0) /datum/component/nanites/proc/adjust_nanites(datum/source, amount) + SIGNAL_HANDLER + nanite_volume = clamp(nanite_volume + amount, 0, max_nanites) if(nanite_volume <= 0) //oops we ran out qdel(src) @@ -192,6 +200,8 @@ holder.icon_state = "nanites[nanite_percent]" /datum/component/nanites/proc/on_emp(datum/source, severity) + SIGNAL_HANDLER + nanite_volume *= (rand(60, 90) * 0.01) //Lose 10-40% of nanites adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume if(prob(40/severity)) @@ -201,8 +211,10 @@ NP.on_emp(severity) -/datum/component/nanites/proc/on_shock(datum/source, shock_damage, siemens_coeff = 1, flags = NONE) - if(flags & SHOCK_ILLUSION || shock_damage < 1) +/datum/component/nanites/proc/on_shock(datum/source, shock_damage, shock_source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE) + SIGNAL_HANDLER + + if(illusion || shock_damage < 1) return if(!HAS_TRAIT_NOT_FROM(host_mob, TRAIT_SHOCKIMMUNE, "nanites"))//Another shock protection must protect nanites too, but nanites protect only host @@ -213,35 +225,49 @@ NP.on_shock(shock_damage) /datum/component/nanites/proc/on_minor_shock(datum/source) + SIGNAL_HANDLER + adjust_nanites(null, -(rand(5, 15))) //Lose 5-15 flat nanite volume for(var/X in programs) var/datum/nanite_program/NP = X NP.on_minor_shock() /datum/component/nanites/proc/check_stealth(datum/source) + SIGNAL_HANDLER + return stealth /datum/component/nanites/proc/on_death(datum/source, gibbed) + SIGNAL_HANDLER + for(var/X in programs) var/datum/nanite_program/NP = X NP.on_death(gibbed) /datum/component/nanites/proc/receive_signal(datum/source, code, source = "an unidentified source") + SIGNAL_HANDLER + for(var/X in programs) var/datum/nanite_program/NP = X NP.receive_signal(code, source) /datum/component/nanites/proc/receive_comm_signal(datum/source, comm_code, comm_message, comm_source = "an unidentified source") + SIGNAL_HANDLER + for(var/X in programs) if(istype(X, /datum/nanite_program/comm)) var/datum/nanite_program/comm/NP = X NP.receive_comm_signal(comm_code, comm_message, comm_source) /datum/component/nanites/proc/check_viable_biotype() + SIGNAL_HANDLER + if(!(MOB_ORGANIC in host_mob.mob_biotypes) && !(MOB_UNDEAD in host_mob.mob_biotypes) && !HAS_TRAIT(host_mob, TRAIT_NANITECOMPATIBLE)) qdel(src) //bodytype no longer sustains nanites /datum/component/nanites/proc/check_access(datum/source, obj/O) + SIGNAL_HANDLER + for(var/datum/nanite_program/access/access_program in programs) if(access_program.activated) return O.check_access_list(access_program.access) @@ -250,15 +276,23 @@ return FALSE /datum/component/nanites/proc/set_volume(datum/source, amount) + SIGNAL_HANDLER + nanite_volume = clamp(amount, 0, max_nanites) /datum/component/nanites/proc/set_max_volume(datum/source, amount) + SIGNAL_HANDLER + max_nanites = max(1, max_nanites) /datum/component/nanites/proc/set_cloud(datum/source, amount) + SIGNAL_HANDLER + cloud_id = clamp(amount, 0, 100) /datum/component/nanites/proc/set_cloud_sync(datum/source, method) + SIGNAL_HANDLER + switch(method) if(NANITE_CLOUD_TOGGLE) cloud_active = !cloud_active @@ -268,12 +302,18 @@ cloud_active = TRUE /datum/component/nanites/proc/set_safety(datum/source, amount) + SIGNAL_HANDLER + safety_threshold = clamp(amount, 0, max_nanites) /datum/component/nanites/proc/set_regen(datum/source, amount) + SIGNAL_HANDLER + regen_rate = amount /datum/component/nanites/proc/confirm_nanites() + SIGNAL_HANDLER + return TRUE //yup i exist /datum/component/nanites/proc/get_data(list/nanite_data) @@ -285,6 +325,8 @@ nanite_data["stealth"] = stealth /datum/component/nanites/proc/get_programs(datum/source, list/nanite_programs) + SIGNAL_HANDLER + nanite_programs |= programs /datum/component/nanites/proc/add_research() @@ -301,6 +343,8 @@ SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_NANITES = research_value)) /datum/component/nanites/proc/nanite_scan(datum/source, mob/user, full_scan) + SIGNAL_HANDLER + if(!full_scan) if(!stealth) to_chat(user, "Nanites Detected") @@ -324,6 +368,8 @@ return TRUE /datum/component/nanites/proc/nanite_ui_data(datum/source, list/data, scan_level) + SIGNAL_HANDLER + data["has_nanites"] = TRUE data["nanite_volume"] = nanite_volume data["regen_rate"] = regen_rate diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index 1160aa44cbd25..e9c2a5c41d3a1 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -2,6 +2,7 @@ can_transfer = TRUE dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS var/list/orbiters + var/datum/movement_detector/tracker //radius: range to orbit at, radius of the circle formed by orbiting (in pixels) //clockwise: whether you orbit clockwise or anti clockwise @@ -22,17 +23,15 @@ /datum/component/orbiter/RegisterWithParent() var/atom/target = parent + target.orbiters = src - while(ismovableatom(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react) - target = target.loc + if(ismovableatom(target)) + tracker = new(target, CALLBACK(src, .proc/move_react)) /datum/component/orbiter/UnregisterFromParent() var/atom/target = parent target.orbiters = null - while(ismovableatom(target)) - UnregisterSignal(target, COMSIG_MOVABLE_MOVED) - target = target.loc + QDEL_NULL(tracker) /datum/component/orbiter/Destroy() var/atom/master = parent @@ -42,9 +41,9 @@ orbiters = null return ..() -/datum/component/orbiter/InheritComponent(datum/component/orbiter/newcomp, original, list/arguments) - if(arguments) - begin_orbit(arglist(arguments)) +/datum/component/orbiter/InheritComponent(datum/component/orbiter/newcomp, original, atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation) + if(!newcomp) + begin_orbit(arglist(args.Copy(3))) return // The following only happens on component transfers orbiters += newcomp.orbiters @@ -63,7 +62,7 @@ orbiters[orbiter] = TRUE orbiter.orbiting = src RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, .proc/orbiter_move_react) - + SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter) var/matrix/initial_transform = matrix(orbiter.transform) orbiters[orbiter] = initial_transform @@ -89,6 +88,7 @@ if(!orbiters[orbiter]) return UnregisterSignal(orbiter, COMSIG_MOVABLE_MOVED) + SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_STOP, orbiter) orbiter.SpinAnimation(0, 0) if(istype(orbiters[orbiter],/matrix)) //This is ugly. orbiter.transform = orbiters[orbiter] @@ -99,10 +99,9 @@ qdel(src) // This proc can receive signals by either the thing being directly orbited or anything holding it -/datum/component/orbiter/proc/move_react(atom/orbited, atom/oldloc, direction) +/datum/component/orbiter/proc/move_react(atom/movable/master, atom/mover, atom/oldloc, direction) set waitfor = FALSE // Transfer calls this directly and it doesnt care if the ghosts arent done moving - var/atom/movable/master = parent if(master.loc == oldloc) return @@ -110,19 +109,6 @@ if(!newturf) qdel(src) - // Handling the signals of stuff holding us (or not anymore) - // These are prety rarely activated, how often are you following something in a bag? - if(oldloc && !isturf(oldloc)) // We used to be registered to it, probably - var/atom/target = oldloc - while(ismovableatom(target)) - UnregisterSignal(target, COMSIG_MOVABLE_MOVED) - target = target.loc - if(orbited?.loc && orbited.loc != newturf) // We want to know when anything holding us moves too - var/atom/target = orbited.loc - while(ismovableatom(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react, TRUE) - target = target.loc - var/atom/curloc = master.loc for(var/i in orbiters) var/atom/movable/thing = i @@ -135,6 +121,8 @@ /datum/component/orbiter/proc/orbiter_move_react(atom/movable/orbiter, atom/oldloc, direction) + SIGNAL_HANDLER + if(orbiter.loc == get_turf(parent)) return end_orbit(orbiter) diff --git a/code/datums/components/paintable.dm b/code/datums/components/paintable.dm index 756c42aa9dabc..8b946dd915ba6 100644 --- a/code/datums/components/paintable.dm +++ b/code/datums/components/paintable.dm @@ -13,6 +13,8 @@ A.remove_atom_colour(FIXED_COLOUR_PRIORITY, current_paint) /datum/component/spraycan_paintable/proc/Repaint(datum/source, obj/item/toy/crayon/spraycan/spraycan, mob/living/user) + SIGNAL_HANDLER + if(!istype(spraycan) || user.a_intent == INTENT_HARM) return . = COMPONENT_NO_AFTERATTACK diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm new file mode 100644 index 0000000000000..1c0c41e2c2f69 --- /dev/null +++ b/code/datums/components/pellet_cloud.dm @@ -0,0 +1,298 @@ +/* + * This component is used when you want to create a bunch of shrapnel or projectiles (say, shrapnel from a fragmentation grenade, or buckshot from a shotgun) from a central point, + * without necessarily printing a separate message for every single impact. This component should be instantiated right when you need it (like the moment of firing), then activated + * by signal. + * + * Pellet cloud currently works on two classes of sources: directed (ammo casings), and circular (grenades, landmines). + * -Directed: This means you're shooting multiple pellets, like buckshot. If an ammo casing is defined as having multiple pellets, it will automatically create a pellet cloud + * and call COMSIG_PELLET_CLOUD_INIT (see [/obj/item/ammo_casing/proc/fire_casing]). Thus, the only projectiles fired will be the ones fired here. + * The magnitude var controls how many pellets are created. + * -Circular: This results in a big spray of shrapnel flying all around the detonation point when the grenade fires COMSIG_GRENADE_PRIME or landmine triggers COMSIG_MINE_TRIGGERED. + * The magnitude var controls how big the detonation radius is (the bigger the magnitude, the more shrapnel is created). Grenades can be covered with bodies to reduce shrapnel output. + * + * Once all of the fired projectiles either hit a target or disappear due to ranging out/whatever else, we resolve the list of all the things we hit and print aggregate messages so we get + * one "You're hit by 6 buckshot pellets" vs 6x "You're hit by the buckshot blah blah" messages. + * + * Note that this is how all guns handle shooting ammo casings with multiple pellets, in case such a thing comes up. +*/ + +/datum/component/pellet_cloud + /// What's the projectile path of the shrapnel we're shooting? + var/projectile_type + + /// How many shrapnel projectiles are we responsible for tracking? May be reduced for grenades if someone dives on top of it. Defined by ammo casing for casings, derived from magnitude otherwise + var/num_pellets + /// For grenades/landmines, how big is the radius of turfs we're targeting? Note this does not effect the projectiles range, only how many we generate + var/radius = 4 + + /// The list of pellets we're responsible for tracking, once these are all accounted for, we finalize. + var/list/pellets = list() + /// An associated list with the atom hit as the key and how many pellets they've eaten for the value, for printing aggregate messages + var/list/targets_hit = list() + /// For grenades, any /mob/living's the grenade is moved onto, see [/datum/component/pellet_cloud/proc/handle_martyrs()] + var/list/bodies + + /// For grenades, tracking how many pellets are removed due to martyrs and how many pellets are added due to the last person to touch it being on top of it + var/pellet_delta = 0 + /// how many pellets ranged out without hitting anything + var/terminated + /// how many pellets impacted something + var/hits + /// If the parent tried deleting and we're not done yet, we send it to nullspace then delete it after + var/queued_delete = FALSE + + /// for if we're an ammo casing being fired + var/mob/living/shooter + +/datum/component/pellet_cloud/Initialize(projectile_type=/obj/item/shrapnel, magnitude=5) + if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent)) + return COMPONENT_INCOMPATIBLE + + if(magnitude < 1) + stack_trace("Invalid magnitude [magnitude] < 1 on pellet_cloud, parent: [parent]") + magnitude = 1 + + src.projectile_type = projectile_type + + if(isammocasing(parent)) + num_pellets = magnitude + else if(isgrenade(parent) || islandmine(parent)) + radius = magnitude + +/datum/component/pellet_cloud/Destroy(force, silent) + pellets = null + targets_hit = null + bodies = null + return ..() + +/datum/component/pellet_cloud/RegisterWithParent() + RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/nullspace_parent) + if(isammocasing(parent)) + RegisterSignal(parent, COMSIG_PELLET_CLOUD_INIT, .proc/create_casing_pellets) + else if(isgrenade(parent)) + RegisterSignal(parent, COMSIG_GRENADE_ARMED, .proc/grenade_armed) + RegisterSignal(parent, COMSIG_GRENADE_PRIME, .proc/create_blast_pellets) + else if(islandmine(parent)) + RegisterSignal(parent, COMSIG_MINE_TRIGGERED, .proc/create_blast_pellets) + +/datum/component/pellet_cloud/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNCROSSED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED)) + +/** + * create_casing_pellets() is for directed pellet clouds for ammo casings that have multiple pellets (buckshot and scatter lasers for instance) + * + * Honestly this is mostly just a rehash of [/obj/item/ammo_casing/proc/fire_casing()] for pellet counts > 1, except this lets us tamper with the pellets and hook onto them for tracking purposes. + * The arguments really don't matter, this proc is triggered by COMSIG_PELLET_CLOUD_INIT which is only for this really, it's just a big mess of the state vars we need for doing the stuff over here. + */ +/datum/component/pellet_cloud/proc/create_casing_pellets(obj/item/ammo_casing/shell, atom/target, mob/living/user, fired_from, randomspread, spread, zone_override, params, distro) + SIGNAL_HANDLER + + shooter = user + var/turf/targloc = get_turf(target) + if(!zone_override) + zone_override = shooter.zone_selected + + for(var/i in 1 to num_pellets) + shell.ready_proj(target, user, SUPPRESSED_VERY, zone_override, fired_from) + if(distro) + if(randomspread) + spread = round((rand() - 0.5) * distro) + else //Smart spread + spread = round((i / num_pellets - 0.5) * distro) + + RegisterSignal(shell.BB, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit) + RegisterSignal(shell.BB, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range) + pellets += shell.BB + var/turf/current_loc = get_turf(user) + if(!istype(targloc) || !istype(current_loc)) + return + INVOKE_ASYNC(shell, /obj/item/ammo_casing.proc/throw_proj, target, targloc, shooter, params, spread) + if(i != num_pellets) + shell.newshot() + +/** + * create_blast_pellets() is for when we have a central point we want to shred the surroundings of with a ring of shrapnel, namely frag grenades and landmines. + * + * Note that grenades have extra handling for someone throwing themselves/being thrown on top of it, while landmines do not (obviously, it's a landmine!). See [/datum/component/pellet_cloud/proc/handle_martyrs()] + */ +/datum/component/pellet_cloud/proc/create_blast_pellets(obj/O, mob/living/lanced_by) + SIGNAL_HANDLER + + var/atom/A = parent + + if(isgrenade(parent)) // handle_martyrs can reduce the radius and thus the number of pellets we produce if someone dives on top of a frag grenade + INVOKE_ASYNC(src, .proc/handle_martyrs, lanced_by) // note that we can modify radius in this proc + + if(radius < 1) + return + + var/list/all_the_turfs_were_gonna_lacerate = RANGE_TURFS(radius, A) - RANGE_TURFS(radius-1, A) + num_pellets = all_the_turfs_were_gonna_lacerate.len + pellet_delta + + for(var/T in all_the_turfs_were_gonna_lacerate) + var/turf/shootat_turf = T + INVOKE_ASYNC(src, .proc/pew, shootat_turf) + +/** + * handle_martyrs() is used for grenades that shoot shrapnel to check if anyone threw themselves/were thrown on top of the grenade, thus absorbing a good chunk of the shrapnel + * + * Between the time the grenade is armed and the actual detonation, we set var/list/bodies to the list of mobs currently on the new tile, as if the grenade landed on top of them, tracking if any of them move off the tile and removing them from the "under" list + * Once the grenade detonates, handle_martyrs() is called and gets all the new mobs on the tile, and add the ones not in var/list/bodies to var/list/martyrs + * We then iterate through the martyrs and reduce the shrapnel magnitude for each mob on top of it, shredding each of them with some of the shrapnel they helped absorb. This can snuff out all of the shrapnel if there's enough bodies + * + */ +/datum/component/pellet_cloud/proc/handle_martyrs(mob/living/lanced_by) + var/magnitude_absorbed + var/list/martyrs = list() + + var/self_harm_radius_mult = 3 + + if(lanced_by && prob(60)) + to_chat(lanced_by, "Your plan to whack someone with a grenade on a stick backfires on you, literally!") + self_harm_radius_mult = 1 // we'll still give the guy who got hit some extra shredding, but not 3*radius + pellet_delta += radius + for(var/i in 1 to radius) + pew(lanced_by) // thought you could be tricky and lance someone with no ill effects!! + + for(var/mob/living/body in get_turf(parent)) + if(body == shooter) + pellet_delta += radius * self_harm_radius_mult + for(var/i in 1 to radius * self_harm_radius_mult) + pew(body) // free shrapnel if it goes off in your hand, and it doesn't even count towards the absorbed. fun! + else if(!(body in bodies)) + martyrs += body // promoted from a corpse to a hero + + for(var/M in martyrs) + var/mob/living/martyr = M + if(radius > 4) + martyr.visible_message("[martyr] heroically covers \the [parent] with [martyr.p_their()] body, absorbing a load of the shrapnel!", "You heroically cover \the [parent] with your body, absorbing a load of the shrapnel!") + magnitude_absorbed += round(radius * 0.5) + else if(radius >= 2) + martyr.visible_message("[martyr] heroically covers \the [parent] with [martyr.p_their()] body, absorbing some of the shrapnel!", "You heroically cover \the [parent] with your body, absorbing some of the shrapnel!") + magnitude_absorbed += 2 + else + martyr.visible_message("[martyr] heroically covers \the [parent] with [martyr.p_their()] body, snuffing out the shrapnel!", "You heroically cover \the [parent] with your body, snuffing out the shrapnel!") + magnitude_absorbed = radius + + var/pellets_absorbed = (radius ** 2) - ((radius - magnitude_absorbed - 1) ** 2) + radius -= magnitude_absorbed + pellet_delta -= round(pellets_absorbed * 0.5) + + if(martyr.stat != DEAD && martyr.client) + RegisterSignal(martyr, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) + + for(var/i in 1 to round(pellets_absorbed * 0.5)) + pew(martyr) + + if(radius < 1) + break + +///One of our pellets hit something, record what it was and check if we're done (terminated == num_pellets) +/datum/component/pellet_cloud/proc/pellet_hit(obj/item/projectile/P, atom/movable/firer, atom/target, Angle) + SIGNAL_HANDLER + + pellets -= P + terminated++ + hits++ + targets_hit[target]++ + if(targets_hit[target] == 1) + RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) + UnregisterSignal(P, list(COMSIG_PARENT_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT)) + if(terminated == num_pellets) + finalize() + +///One of our pellets disappeared due to hitting their max range (or just somehow got qdel'd), remove it from our list and check if we're done (terminated == num_pellets) +/datum/component/pellet_cloud/proc/pellet_range(obj/item/projectile/P) + SIGNAL_HANDLER + + pellets -= P + terminated++ + UnregisterSignal(P, list(COMSIG_PARENT_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT)) + if(terminated == num_pellets) + finalize() + +/// Minor convenience function for creating each shrapnel piece with circle explosions, mostly stolen from the MIRV component +/datum/component/pellet_cloud/proc/pew(atom/target, spread=0) + var/obj/item/projectile/P = new projectile_type(get_turf(parent)) + + //Shooting Code: + P.spread = spread + P.original = target + P.fired_from = parent + P.firer = parent // don't hit ourself that would be really annoying + P.permutated += parent // don't hit the target we hit already with the flak + P.suppressed = SUPPRESSED_VERY // set the projectiles to make no message so we can do our own aggregate message + P.preparePixelProjectile(target, parent) + RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit) + RegisterSignal(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range) + pellets += P + P.fire() + +///All of our pellets are accounted for, time to go target by target and tell them how many things they got hit by. +/datum/component/pellet_cloud/proc/finalize() + var/obj/item/projectile/P = projectile_type + var/proj_name = initial(P.name) + + for(var/atom/target in targets_hit) + var/num_hits = targets_hit[target] + UnregisterSignal(target, COMSIG_PARENT_QDELETING) + if(num_hits > 1) + target.visible_message("[target] is hit by [num_hits] [proj_name]s!", null, null, COMBAT_MESSAGE_RANGE, target) + to_chat(target, "You're hit by [num_hits] [proj_name]s!") + else + target.visible_message("[target] is hit by a [proj_name]!", null, null, COMBAT_MESSAGE_RANGE, target) + to_chat(target, "You're hit by a [proj_name]!") + UnregisterSignal(parent, COMSIG_PARENT_PREQDELETED) + if(queued_delete) + qdel(parent) + qdel(src) + +/// Look alive, we're armed! Now we start watching to see if anyone's covering us +/datum/component/pellet_cloud/proc/grenade_armed(obj/item/nade) + SIGNAL_HANDLER + + if(ismob(nade.loc)) + shooter = nade.loc + LAZYINITLIST(bodies) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/grenade_dropped) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/grenade_moved) + RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, .proc/grenade_uncrossed) + +/// Someone dropped the grenade, so set them to the shooter in case they're on top of it when it goes off +/datum/component/pellet_cloud/proc/grenade_dropped(obj/item/nade, mob/living/slick_willy) + SIGNAL_HANDLER + + shooter = slick_willy + grenade_moved() + +/// Our grenade has moved, reset var/list/bodies so we're "on top" of any mobs currently on the tile +/datum/component/pellet_cloud/proc/grenade_moved() + SIGNAL_HANDLER + + LAZYCLEARLIST(bodies) + for(var/mob/living/L in get_turf(parent)) + RegisterSignal(L, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) + bodies += L + +/// Someone who was originally "under" the grenade has moved off the tile and is now eligible for being a martyr and "covering" it +/datum/component/pellet_cloud/proc/grenade_uncrossed(datum/source, atom/movable/AM) + SIGNAL_HANDLER + + bodies -= AM + +/// Our grenade or landmine or caseless shell or whatever tried deleting itself, so we intervene and nullspace it until we're done here +/datum/component/pellet_cloud/proc/nullspace_parent() + SIGNAL_HANDLER + + var/atom/movable/AM = parent + AM.moveToNullspace() + queued_delete = TRUE + return TRUE + +/// Someone who was originally "under" the grenade has moved off the tile and is now eligible for being a martyr and "covering" it +/datum/component/pellet_cloud/proc/on_target_qdel(atom/target) + SIGNAL_HANDLER + + UnregisterSignal(target, COMSIG_PARENT_QDELETING) + targets_hit -= target + LAZYREMOVE(bodies, target) diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index 17105b0c5de9d..f89f50d2118f3 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -35,9 +35,8 @@ create_overlays() /datum/component/plumbing/process() - if(!demand_connects || !reagents) - STOP_PROCESSING(SSfluids, src) - return + if(!demand_connects || !reagents) // This actually shouldn't happen, but better safe than sorry + return PROCESS_KILL if(reagents.total_volume < reagents.maximum_volume) for(var/D in GLOB.cardinals) if(D & demand_connects) @@ -99,9 +98,9 @@ for(var/D in GLOB.cardinals) var/color var/direction - if(D & demand_connects) + if(D & initial(demand_connects)) color = "red" //red because red is mean and it takes - else if(D & supply_connects) + else if(D & initial(supply_connects)) color = "blue" //blue is nice and gives else continue @@ -124,6 +123,8 @@ ducterlays += I ///we stop acting like a plumbing thing and disconnect if we are, so we can safely be moved and stuff /datum/component/plumbing/proc/disable() + SIGNAL_HANDLER + if(!active) return STOP_PROCESSING(SSfluids, src) @@ -144,7 +145,7 @@ update_dir() active = TRUE var/atom/movable/AM = parent - for(var/obj/machinery/duct/D in AM.loc) //Destroy any ducts under us. Ducts also self destruct if placed under a plumbing machine. machines disable when they get moved + for(var/obj/machinery/duct/D in AM.loc) //Destroy any ducts under us. Ducts also self-destruct if placed under a plumbing machine. machines disable when they get moved if(D.anchored) //that should cover everything D.disconnect_duct() @@ -164,6 +165,8 @@ /// Toggle our machinery on or off. This is called by a hook from default_unfasten_wrench with anchored as only param, so we dont have to copypaste this on every object that can move /datum/component/plumbing/proc/toggle_active(obj/O, new_state) + SIGNAL_HANDLER + if(new_state) enable() else @@ -179,6 +182,7 @@ var/new_supply_connects var/new_dir = AM.dir var/angle = 180 - dir2angle(new_dir) + if(new_dir == SOUTH) demand_connects = initial(demand_connects) supply_connects = initial(supply_connects) diff --git a/code/datums/components/rad_insulation.dm b/code/datums/components/rad_insulation.dm index 73d8c29440cf6..ef5510f144688 100644 --- a/code/datums/components/rad_insulation.dm +++ b/code/datums/components/rad_insulation.dm @@ -15,11 +15,17 @@ amount = _amount /datum/component/rad_insulation/proc/rad_probe_react(datum/source) + SIGNAL_HANDLER + return COMPONENT_BLOCK_RADIATION /datum/component/rad_insulation/proc/rad_contaminating(datum/source, strength) + SIGNAL_HANDLER + return COMPONENT_BLOCK_CONTAMINATION -/datum/component/rad_insulation/proc/rad_pass(datum/source, datum/radiation_wave/wave, width) - wave.intensity = wave.intensity*(1-((1-amount)/width)) // The further out the rad wave goes the less it's affected by insulation (larger width) +/datum/component/rad_insulation/proc/rad_pass(datum/source, datum/radiation_wave/wave, index) + SIGNAL_HANDLER + + wave.intensity[index] *= amount return COMPONENT_RAD_WAVE_HANDLED diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm index e892afeea3541..b12f00adb01dd 100644 --- a/code/datums/components/radioactive.dm +++ b/code/datums/components/radioactive.dm @@ -23,7 +23,7 @@ RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/rad_attack) else return COMPONENT_INCOMPATIBLE - if(strength > RAD_MINIMUM_CONTAMINATION) + if(strength * (RAD_CONTAMINATION_STR_COEFFICIENT * RAD_CONTAMINATION_BUDGET_SIZE) > RAD_COMPONENT_MINIMUM) SSradiation.warn(src) //Let's make er glow //This relies on parent not being a turf or something. IF YOU CHANGE THAT, CHANGE THIS @@ -38,17 +38,17 @@ master.remove_filter("rad_glow") return ..() -/datum/component/radioactive/process() - if(!prob(50)) +/datum/component/radioactive/process(delta_time) + if(!DT_PROB(50, delta_time)) return - radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT*2, FALSE, can_contaminate) + if(strength >= RAD_WAVE_MINIMUM) + radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT*RAD_DISTANCE_COEFFICIENT_COMPONENT_MULTIPLIER, FALSE, can_contaminate) if(!hl3_release_date) return strength -= strength / hl3_release_date - if(strength < RAD_WAVE_MINIMUM) + if(strength < RAD_COMPONENT_MINIMUM) qdel(src) - return PROCESS_KILL /datum/component/radioactive/proc/glow_loop(atom/movable/master) var/filter = master.get_filter("rad_glow") @@ -56,18 +56,20 @@ animate(filter, alpha = 110, time = 15, loop = -1) animate(alpha = 40, time = 25) -/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, list/arguments) +/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, _strength, _source, _half_life, _can_contaminate) if(!i_am_original) return if(!hl3_release_date) // Permanently radioactive things don't get to grow stronger return if(C) var/datum/component/radioactive/other = C - strength = max(strength, other.strength) + strength += other.strength else - strength = max(strength, arguments[1]) + strength = max(strength, _strength) /datum/component/radioactive/proc/rad_examine(datum/source, mob/user, atom/thing) + SIGNAL_HANDLER + var/atom/master = parent var/list/out = list() if(get_dist(master, user) <= 1) @@ -84,6 +86,8 @@ to_chat(user, out.Join()) /datum/component/radioactive/proc/rad_attack(datum/source, atom/movable/target, mob/living/user) + SIGNAL_HANDLER + radiation_pulse(parent, strength/20) target.rad_act(strength/2) if(!hl3_release_date) diff --git a/code/datums/components/religious_tool.dm b/code/datums/components/religious_tool.dm new file mode 100644 index 0000000000000..0f11e5d3d20e9 --- /dev/null +++ b/code/datums/components/religious_tool.dm @@ -0,0 +1,153 @@ +/** + * + * Allows the parent to act similarly to the Altar of Gods with modularity. Invoke and Sect Selection is done via attacking with a bible. This means you cannot sacrifice Bibles (you shouldn't want to do this anyways although now that I mentioned it you probably will want to). + * + */ +/datum/component/religious_tool + dupe_mode = COMPONENT_DUPE_UNIQUE + /// Enables access to the global sect directly + var/datum/religion_sect/easy_access_sect + /// What extent do we want this religious tool to act? In case you don't want full access to the list. Generated on New + var/operation_flags + /// The rite currently being invoked + var/datum/religion_rites/performing_rite + ///Sets the type for catalyst + var/catalyst_type = /obj/item/storage/book/bible + ///Enables overide of COMPONENT_NO_AFTERATTACK, not recommended as it means you can potentially cause damage to the item using the catalyst. + var/force_catalyst_afterattack = FALSE + var/datum/callback/after_sect_select_cb + +/datum/component/religious_tool/Initialize(_flags = ALL, _force_catalyst_afterattack = FALSE, _after_sect_select_cb, override_catalyst_type) + . = ..() + operation_flags = _flags + force_catalyst_afterattack = _force_catalyst_afterattack + after_sect_select_cb = _after_sect_select_cb + SetGlobalToLocal() //attempt to connect on start in case one already exists! + if(override_catalyst_type) + catalyst_type = override_catalyst_type + +/datum/component/religious_tool/RegisterWithParent() + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/AttemptActions) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + +/datum/component/religious_tool/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) + +/** + * Sets the easy access variable to the global if it exists. + */ +/datum/component/religious_tool/proc/SetGlobalToLocal() + if(easy_access_sect) + return TRUE + if(!GLOB.religious_sect) + return FALSE + easy_access_sect = GLOB.religious_sect + after_sect_select_cb?.Invoke() + return TRUE + + + +/** + * Since all of these involve attackby, we require mega proc. Handles Invocation, Sacrificing, And Selection of Sects. + */ +/datum/component/religious_tool/proc/AttemptActions(datum/source, obj/item/the_item, mob/living/user) + /**********Sect Selection**********/ + if(!SetGlobalToLocal()) + if(!(operation_flags & RELIGION_TOOL_SECTSELECT)) + return + . = COMPONENT_NO_AFTERATTACK //At this point you're intentionally trying to select a sect. + if(user.mind.holy_role != HOLY_ROLE_HIGHPRIEST) + to_chat(user, "You are not the high priest, and therefore cannot select a religious sect.") + return + var/list/available_options = generate_available_sects(user) + if(!available_options) + return + + var/sect_select = input(user,"Select a sect (You CANNOT revert this decision!)","Select a Sect",null) in available_options + if(!sect_select || !user.canUseTopic(parent, BE_CLOSE, FALSE, NO_TK)) + to_chat(user,"You cannot select a sect at this time.") + return + var/type_selected = available_options[sect_select] + GLOB.religious_sect = new type_selected() + for(var/mob/living/am_i_holy_living in GLOB.player_list) + if(!am_i_holy_living.mind?.holy_role) + continue + GLOB.religious_sect.on_conversion(am_i_holy_living) + easy_access_sect = GLOB.religious_sect + after_sect_select_cb?.Invoke() + return + /**********Rite Invocation**********/ + else if(istype(the_item, catalyst_type)) + if(!(operation_flags & RELIGION_TOOL_INVOKE)) + return + . = force_catalyst_afterattack ? null : COMPONENT_NO_AFTERATTACK + if(!easy_access_sect.rites_list) + to_chat(user, "Your sect doesn't have any rites to perform!") + return + if(performing_rite) + to_chat(user, "There is a rite currently being performed here already!") + return + var/rite_select = input(user,"Select a rite to perform!","Select a rite",null) in easy_access_sect.rites_list + if(!rite_select || !user.canUseTopic(parent, BE_CLOSE, FALSE, NO_TK)) + to_chat(user,"You cannot perform the rite at this time.") + return + var/selection2type = easy_access_sect.rites_list[rite_select] + performing_rite = new selection2type(parent) + if(!performing_rite.perform_rite(user, parent)) + QDEL_NULL(performing_rite) + else + performing_rite.invoke_effect(user, parent) + easy_access_sect.adjust_favor(-performing_rite.favor_cost) + QDEL_NULL(performing_rite) + return + + /**********Sacrificing**********/ + else if(operation_flags & RELIGION_TOOL_SACRIFICE) + if(!easy_access_sect?.can_sacrifice(the_item,user)) + if(user.a_intent != INTENT_HARM && !(the_item.item_flags & ABSTRACT)) + var/turf/location = get_turf(parent) + if(location) + user.transferItemToLoc(the_item, location) + return COMPONENT_NO_AFTERATTACK + return + easy_access_sect.on_sacrifice(the_item,user) + return COMPONENT_NO_AFTERATTACK + + +/** + * Generates a list of available sects to the user. Intended to support custom-availability sects. Because these are not instanced, we cannot put the availability on said sect beyond variables. + */ +/datum/component/religious_tool/proc/generate_available_sects(mob/user) + . = list() + for(var/i in subtypesof(/datum/religion_sect)) + var/datum/religion_sect/not_a_real_instance_rs = i + if(initial(not_a_real_instance_rs.starter)) + . += list(initial(not_a_real_instance_rs.name) = i) + +/** + * Appends to examine so the user knows it can be used for religious purposes. + */ +/datum/component/religious_tool/proc/on_examine(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + + var/can_i_see = FALSE + if(isobserver(user)) + can_i_see = TRUE + else if(isliving(user)) + var/mob/living/L = user + if(L.mind?.holy_role) + can_i_see = TRUE + + if(!can_i_see) + return + if(!easy_access_sect) + if(operation_flags & RELIGION_TOOL_SECTSELECT) + examine_list += "This looks like it can be used to select a sect." + return + + examine_list += "The sect currently has [round(easy_access_sect.favor)] favor with [GLOB.deity]. [(operation_flags & RELIGION_TOOL_SACRIFICE) ? "Desired items can be used on this to increase favor." : ""]" + if(!easy_access_sect.rites_list) + return //if we dont have rites it doesnt do us much good if the object can be used to invoke them! + if(operation_flags & RELIGION_TOOL_INVOKE) + examine_list += "List of available Rites:" + examine_list += easy_access_sect.rites_list diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm index 4d6b01b9f1798..84f7f74a15754 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/remote_materials.dm @@ -24,6 +24,7 @@ handles linking back and forth. src.allow_standalone = allow_standalone RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy) + RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, .proc/check_z_disconnect) var/turf/T = get_turf(parent) if (force_connect || (mapload && is_station_level(T.z))) @@ -53,18 +54,30 @@ handles linking back and forth. /datum/component/remote_materials/proc/_MakeLocal() silo = null - mat_container = parent.AddComponent(/datum/component/material_container, - list(/datum/material/iron, /datum/material/glass, /datum/material/copper, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace, /datum/material/plastic), - local_size, - FALSE, - /obj/item/stack) + + var/static/list/allowed_mats = list( + /datum/material/iron, + /datum/material/glass, + /datum/material/copper, + /datum/material/silver, + /datum/material/gold, + /datum/material/diamond, + /datum/material/plasma, + /datum/material/uranium, + /datum/material/bananium, + /datum/material/titanium, + /datum/material/bluespace, + /datum/material/plastic, + ) + + mat_container = parent.AddComponent(/datum/component/material_container, allowed_mats, local_size, allowed_types=/obj/item/stack) /datum/component/remote_materials/proc/set_local_size(size) local_size = size if (!silo && mat_container) mat_container.max_amount = size -// called if disconnected by ore silo UI or destruction +// called if disconnected by ore silo UI, or destruction /datum/component/remote_materials/proc/disconnect_from(obj/machinery/ore_silo/old_silo) if (!old_silo || silo != old_silo) return @@ -72,13 +85,42 @@ handles linking back and forth. mat_container = null if (allow_standalone) _MakeLocal() + return TRUE + +/datum/component/remote_materials/proc/is_valid_link(atom/targeta, atom/targetb = silo) + return ((is_station_level(targeta.z) && is_station_level(targetb.z)) || (targeta.get_virtual_z_level() == targetb.get_virtual_z_level())) + + +/datum/component/remote_materials/proc/check_z_disconnect() + SIGNAL_HANDLER + if(!silo) //No silo? + return + var/atom/P = parent + if(!is_valid_link(P)) + graceful_disconnect() + +// like disconnect_from, but does proper cleanup instead of simple deletion. +/datum/component/remote_materials/proc/graceful_disconnect() + var/obj/machinery/ore_silo/old_silo = silo + if(!disconnect_from(old_silo)) + return + old_silo.connected -= src + old_silo.updateUsrDialog() + var/atom/P = parent + P.visible_message("[parent]'s material manager blinks orange: Disconnected.") /datum/component/remote_materials/proc/OnAttackBy(datum/source, obj/item/I, mob/user) + SIGNAL_HANDLER + if(I.tool_behaviour == TOOL_MULTITOOL) if(!I.multitool_check_buffer(user, I)) return COMPONENT_NO_AFTERATTACK var/obj/item/multitool/M = I if (!QDELETED(M.buffer) && istype(M.buffer, /obj/machinery/ore_silo)) + var/atom/P = parent + if (!is_valid_link(P, M.buffer)) + to_chat(usr, "[parent]'s material manager blinks red: Out of Range.") + return COMPONENT_NO_AFTERATTACK if (silo == M.buffer) to_chat(user, "[parent] is already connected to [silo].") return COMPONENT_NO_AFTERATTACK @@ -111,3 +153,21 @@ handles linking back and forth. return "[mat_container.total_amount] / [mat_container.max_amount == INFINITY ? "Unlimited" : mat_container.max_amount] ([silo ? "remote" : "local"])" else return "0 / 0" + +/// Ejects the given material ref and logs it, or says out loud the problem. +/datum/component/remote_materials/proc/eject_sheets(datum/material/material_ref, eject_amount) + var/atom/movable/movable_parent = parent + if (!istype(movable_parent)) + return 0 + + if (!mat_container) + movable_parent.say("No access to material storage, please contact the quartermaster.") + return 0 + if (on_hold()) + movable_parent.say("Mineral access is on hold, please contact the quartermaster.") + return 0 + var/count = mat_container.retrieve_sheets(eject_amount, material_ref, movable_parent.drop_location()) + var/list/matlist = list() + matlist[material_ref] = eject_amount + silo_log(parent, "ejected", -count, "sheets", matlist) + return count diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm index ad344daf447cc..bc743efc87cd3 100644 --- a/code/datums/components/riding.dm +++ b/code/datums/components/riding.dm @@ -29,6 +29,9 @@ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/vehicle_moved) /datum/component/riding/proc/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE) + SIGNAL_HANDLER + + unequip_buckle_inhands(parent) var/atom/movable/AM = parent restore_position(M) unequip_buckle_inhands(M) @@ -36,6 +39,8 @@ qdel(src) /datum/component/riding/proc/vehicle_mob_buckle(datum/source, mob/living/M, force = FALSE) + SIGNAL_HANDLER + handle_vehicle_offsets() /datum/component/riding/proc/handle_vehicle_layer() @@ -52,6 +57,8 @@ directional_vehicle_layers["[dir]"] = layer /datum/component/riding/proc/vehicle_moved(datum/source) + SIGNAL_HANDLER + var/atom/movable/AM = parent for(var/i in AM.buckled_mobs) ride_check(i) @@ -213,6 +220,8 @@ H.add_movespeed_modifier(MOVESPEED_ID_HUMAN_CARRYING, multiplicative_slowdown = HUMAN_CARRY_SLOWDOWN) /datum/component/riding/human/proc/on_host_unarmed_melee(atom/target) + SIGNAL_HANDLER + var/mob/living/carbon/human/H = parent if(H.a_intent == INTENT_DISARM && (target in H.buckled_mobs)) force_dismount(target) @@ -307,7 +316,7 @@ M.visible_message("[M] is thrown clear of [AM]!", \ "You're thrown clear of [AM]!") M.throw_at(target, 14, 5, AM) - M.Paralyze(60) + M.Knockdown(60) /datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, riding_target_override = null) var/atom/movable/AM = parent diff --git a/code/datums/components/rot.dm b/code/datums/components/rot.dm index f78c640516598..cb195ea0f83df 100644 --- a/code/datums/components/rot.dm +++ b/code/datums/components/rot.dm @@ -10,7 +10,11 @@ START_PROCESSING(SSprocessing, src) -/datum/component/rot/process() +/datum/component/rot/Destroy() + STOP_PROCESSING(SSprocessing, src) + return ..() + +/datum/component/rot/process(delta_time) var/atom/A = parent var/turf/open/T = get_turf(A) @@ -18,7 +22,7 @@ return var/datum/gas_mixture/stank = new - stank.set_moles(/datum/gas/miasma, amount) + stank.set_moles(GAS_MIASMA, amount * delta_time) stank.set_temperature(BODYTEMP_NORMAL) // otherwise we have gas below 2.7K which will break our lag generator T.assume_air(stank) T.air_update_turf() @@ -33,6 +37,9 @@ /datum/component/rot/corpse/process() var/mob/living/carbon/C = parent + if(C == null) //can't delete what doesnt exist + return + if(C.stat != DEAD) qdel(src) return diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm index 42b8d2af297f3..b3f8208e58319 100644 --- a/code/datums/components/rotation.dm +++ b/code/datums/components/rotation.dm @@ -51,28 +51,28 @@ if(rotation_flags & ROTATION_WRENCH) RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/WrenchRot) -/datum/component/simple_rotation/proc/add_verbs() +/datum/component/simple_rotation/proc/add_rotation_verbs() if(rotation_flags & ROTATION_VERBS) var/atom/movable/AM = parent if(rotation_flags & ROTATION_FLIP) - AM.verbs += /atom/movable/proc/simple_rotate_flip + AM.add_verb(/atom/movable/proc/simple_rotate_flip) if(src.rotation_flags & ROTATION_CLOCKWISE) - AM.verbs += /atom/movable/proc/simple_rotate_clockwise + AM.add_verb(/atom/movable/proc/simple_rotate_clockwise) if(src.rotation_flags & ROTATION_COUNTERCLOCKWISE) - AM.verbs += /atom/movable/proc/simple_rotate_counterclockwise + AM.add_verb(/atom/movable/proc/simple_rotate_counterclockwise) -/datum/component/simple_rotation/proc/remove_verbs() +/datum/component/simple_rotation/proc/remove_rotation_verbs() if(parent) var/atom/movable/AM = parent - AM.verbs -= /atom/movable/proc/simple_rotate_flip - AM.verbs -= /atom/movable/proc/simple_rotate_clockwise - AM.verbs -= /atom/movable/proc/simple_rotate_counterclockwise + AM.remove_verb(/atom/movable/proc/simple_rotate_flip) + AM.remove_verb(/atom/movable/proc/simple_rotate_clockwise) + AM.remove_verb(/atom/movable/proc/simple_rotate_counterclockwise) /datum/component/simple_rotation/proc/remove_signals() UnregisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_PARENT_EXAMINE, COMSIG_PARENT_ATTACKBY)) /datum/component/simple_rotation/RegisterWithParent() - add_verbs() + add_rotation_verbs() add_signals() . = ..() @@ -83,7 +83,7 @@ return COMPONENT_NOTRANSFER /datum/component/simple_rotation/UnregisterFromParent() - remove_verbs() + remove_rotation_verbs() remove_signals() . = ..() @@ -95,19 +95,25 @@ . = ..() /datum/component/simple_rotation/RemoveComponent() - remove_verbs() + remove_rotation_verbs() . = ..() /datum/component/simple_rotation/proc/ExamineMessage(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + if(rotation_flags & ROTATION_ALTCLICK) examine_list += "Alt-click to rotate it clockwise." /datum/component/simple_rotation/proc/HandRot(datum/source, mob/user, rotation = default_rotation_direction) + SIGNAL_HANDLER + if(!can_be_rotated.Invoke(user, rotation) || !can_user_rotate.Invoke(user, rotation)) return BaseRot(user, rotation) /datum/component/simple_rotation/proc/WrenchRot(datum/source, obj/item/I, mob/living/user) + SIGNAL_HANDLER + if(!can_be_rotated.Invoke(user,default_rotation_direction) || !can_user_rotate.Invoke(user,default_rotation_direction)) return if(I.tool_behaviour == TOOL_WRENCH) diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm new file mode 100644 index 0000000000000..9fd124d79e58c --- /dev/null +++ b/code/datums/components/shell.dm @@ -0,0 +1,244 @@ +/// Makes an atom a shell that is able to take in an attached circuit. +/datum/component/shell + dupe_mode = COMPONENT_DUPE_UNIQUE + + /// The circuitboard attached to this shell + var/obj/item/integrated_circuit/attached_circuit + + /// Flags containing what this shell can do + var/shell_flags = NONE + + /// The capacity of the shell. + var/capacity = INFINITY + + /// A list of components that cannot be removed + var/list/obj/item/circuit_component/unremovable_circuit_components + + var/locked = FALSE + +/datum/component/shell/Initialize(unremovable_circuit_components, capacity, shell_flags) + . = ..() + if(!ismovable(parent)) + return COMPONENT_INCOMPATIBLE + + src.shell_flags = shell_flags || src.shell_flags + src.capacity = capacity || src.capacity + src.unremovable_circuit_components = unremovable_circuit_components + + for(var/obj/item/circuit_component/circuit_component as anything in unremovable_circuit_components) + circuit_component.removable = FALSE + +/datum/component/shell/RegisterWithParent() + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attack_by) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, .proc/on_attack_ghost) + if(!(shell_flags & SHELL_FLAG_CIRCUIT_FIXED)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), .proc/on_screwdriver_act) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), .proc/on_multitool_act) + RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_object_deconstruct) + if(shell_flags & SHELL_FLAG_REQUIRE_ANCHOR) + RegisterSignal(parent, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, .proc/on_unfasten) + RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, .proc/on_atom_usb_cable_try_attach) + +/datum/component/shell/UnregisterFromParent() + UnregisterSignal(parent, list( + COMSIG_PARENT_ATTACKBY, + COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), + COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), + COMSIG_OBJ_DECONSTRUCT, + COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, + COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_ATTACK_GHOST, + COMSIG_ATOM_USB_CABLE_TRY_ATTACH, + )) + + QDEL_NULL(attached_circuit) + +/datum/component/shell/Destroy(force, silent) + QDEL_LIST(unremovable_circuit_components) + return ..() + +/datum/component/shell/proc/on_object_deconstruct() + SIGNAL_HANDLER + remove_circuit() + +/datum/component/shell/proc/on_attack_ghost(datum/source, mob/dead/observer/ghost) + SIGNAL_HANDLER + if(attached_circuit) + INVOKE_ASYNC(attached_circuit, /datum.proc/ui_interact, ghost) + +/datum/component/shell/proc/on_examine(datum/source, mob/user, list/examine_text) + SIGNAL_HANDLER + if(!attached_circuit) + examine_text += "There is no integrated circuit attached." + return + + examine_text += "There is an integrated circuit attached. Use a multitool to access the wiring. Use a screwdriver to remove it from [source]." + examine_text += "The cover panel to the integrated circuit is [locked? "locked" : "unlocked"]." + var/obj/item/stock_parts/cell/cell = attached_circuit.cell + examine_text += "The charge meter reads [cell ? round(cell.percent(), 1) : 0]%." + + if (shell_flags & SHELL_FLAG_USB_PORT) + examine_text += "There is a USB port on the front." + + +/** + * Called when the shell is wrenched. + * + * Only applies if the shell has SHELL_FLAG_REQUIRE_ANCHOR. + * Disables the integrated circuit if unanchored, otherwise enable the circuit. + */ +/datum/component/shell/proc/on_unfasten(atom/source, anchored) + SIGNAL_HANDLER + attached_circuit?.on = anchored +/** + * Called when an item hits the parent. This is the method to add the circuitboard to the component. + */ +/datum/component/shell/proc/on_attack_by(atom/source, obj/item/item, mob/living/attacker) + SIGNAL_HANDLER + + if(istype(item, /obj/item/stock_parts/cell)) + source.balloon_alert(attacker, "Can't pull cell in directly!") + return + + if(attached_circuit?.owner_id && item == attached_circuit.owner_id.resolve()) + locked = !locked + source.balloon_alert(attacker, "[locked? "Locked" : "Unlocked"] [source]") + return COMPONENT_NO_AFTERATTACK + + if(attached_circuit && istype(item, /obj/item/circuit_component)) + attached_circuit.add_component(item, attacker) + return + + if(!istype(item, /obj/item/integrated_circuit)) + return + var/obj/item/integrated_circuit/logic_board = item + . = COMPONENT_NO_AFTERATTACK + + if(logic_board.shell) // I'll be surprised if this ever happens + return + + if(attached_circuit) + source.balloon_alert(attacker, "There is already a circuitboard inside!") + return + + if(length(logic_board.attached_components) > capacity) + source.balloon_alert(attacker, "This is too large to fit into [parent]!") + return + + logic_board.inserter_mind = WEAKREF(attacker.mind) + attach_circuit(logic_board, attacker) + +/datum/component/shell/proc/on_multitool_act(atom/source, mob/user, obj/item/tool) + SIGNAL_HANDLER + if(!attached_circuit) + return + + if(locked) + if(shell_flags & SHELL_FLAG_ALLOW_FAILURE_ACTION) + return + source.balloon_alert(user, "It's locked!") + return COMPONENT_BLOCK_TOOL_ATTACK + + attached_circuit.interact(user) + return COMPONENT_BLOCK_TOOL_ATTACK + +/** + * Called when a screwdriver is used on the parent. Removes the circuitboard from the component. + */ +/datum/component/shell/proc/on_screwdriver_act(atom/source, mob/user, obj/item/tool) + SIGNAL_HANDLER + if(!attached_circuit) + return + + if(locked) + if(shell_flags & SHELL_FLAG_ALLOW_FAILURE_ACTION) + return + source.balloon_alert(user, "It's locked!") + return COMPONENT_BLOCK_TOOL_ATTACK + + tool.play_tool_sound(parent) + source.balloon_alert(user, "You unscrew [attached_circuit] from [parent].") + remove_circuit() + return COMPONENT_BLOCK_TOOL_ATTACK + +/** + * Checks for when the circuitboard moves. If it moves, removes it from the component. + */ +/datum/component/shell/proc/on_circuit_moved(obj/item/integrated_circuit/circuit, atom/new_loc) + SIGNAL_HANDLER + if(new_loc != parent) + remove_circuit() + +/** + * Checks for when the circuitboard deletes so that it can be unassigned. + */ +/datum/component/shell/proc/on_circuit_delete(datum/source) + SIGNAL_HANDLER + remove_circuit() + +/datum/component/shell/proc/on_circuit_add_component_manually(atom/source, obj/item/circuit_component/added_comp, mob/living/user) + SIGNAL_HANDLER + + if(locked) + source.balloon_alert(user, "It's locked!") + return COMPONENT_CANCEL_ADD_COMPONENT + + if(length(attached_circuit.attached_components) - length(unremovable_circuit_components) >= capacity) + source.balloon_alert(user, "It's at maximum capacity!") + return COMPONENT_CANCEL_ADD_COMPONENT + +/** + * Attaches a circuit to the parent. Doesn't do any checks to see for any existing circuits so that should be done beforehand. + */ +/datum/component/shell/proc/attach_circuit(obj/item/integrated_circuit/circuitboard, mob/living/user) + if(!user.transferItemToLoc(circuitboard, parent)) + return + locked = FALSE + attached_circuit = circuitboard + RegisterSignal(circuitboard, COMSIG_MOVABLE_MOVED, .proc/on_circuit_moved) + RegisterSignal(circuitboard, COMSIG_PARENT_QDELETING, .proc/on_circuit_delete) + for(var/obj/item/circuit_component/to_add as anything in unremovable_circuit_components) + to_add.forceMove(attached_circuit) + attached_circuit.add_component(to_add) + RegisterSignal(circuitboard, COMSIG_CIRCUIT_ADD_COMPONENT_MANUALLY, .proc/on_circuit_add_component_manually) + attached_circuit.set_shell(parent) + user.balloon_alert(user, "Attached [circuitboard] to [parent]") + + if(shell_flags & SHELL_FLAG_REQUIRE_ANCHOR) + var/atom/movable/parent_atom = parent + on_unfasten(parent_atom, parent_atom.anchored) + +/** + * Removes the circuit from the component. Doesn't do any checks to see for an existing circuit so that should be done beforehand. + */ +/datum/component/shell/proc/remove_circuit() + attached_circuit.on = TRUE + attached_circuit.remove_current_shell() + UnregisterSignal(attached_circuit, list( + COMSIG_MOVABLE_MOVED, + COMSIG_PARENT_QDELETING, + COMSIG_CIRCUIT_ADD_COMPONENT_MANUALLY, + )) + if(attached_circuit.loc == parent) + var/atom/parent_atom = parent + attached_circuit.forceMove(parent_atom.drop_location()) + + for(var/obj/item/circuit_component/to_remove as anything in unremovable_circuit_components) + attached_circuit.remove_component(to_remove) + to_remove.moveToNullspace() + attached_circuit = null + +/datum/component/shell/proc/on_atom_usb_cable_try_attach(atom/source, obj/item/usb_cable/usb_cable, mob/user) + SIGNAL_HANDLER + + if (!(shell_flags & SHELL_FLAG_USB_PORT)) + source.balloon_alert(user, "This shell has no usb ports") + return COMSIG_CANCEL_USB_CABLE_ATTACK + + if (isnull(attached_circuit)) + source.balloon_alert(user, "No circuit inside") + return COMSIG_CANCEL_USB_CABLE_ATTACK + + usb_cable.attached_circuit = attached_circuit + return COMSIG_USB_CABLE_CONNECTED_TO_CIRCUIT diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index 172f252d5af21..294fc53621690 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -14,6 +14,8 @@ RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip) /datum/component/slippery/proc/Slip(datum/source, atom/movable/AM) + SIGNAL_HANDLER + var/mob/victim = AM if(istype(victim) && !victim.is_flying() && victim.slip(knockdown_time, parent, lube_flags, paralyze_time, force_drop_items) && callback) callback.Invoke(victim) diff --git a/code/datums/components/snail_crawl.dm b/code/datums/components/snail_crawl.dm index 555bbdeed74d5..59a0af93cf4aa 100644 --- a/code/datums/components/snail_crawl.dm +++ b/code/datums/components/snail_crawl.dm @@ -6,6 +6,8 @@ snail = parent /datum/component/snailcrawl/proc/lubricate() + SIGNAL_HANDLER + if(snail.resting && !snail.buckled) //s l i d e var/turf/open/OT = get_turf(snail) if(isopenturf(OT)) @@ -16,4 +18,4 @@ /datum/component/snailcrawl/_RemoveFromParent() snail.remove_movespeed_modifier(MOVESPEED_ID_SNAIL_CRAWL) - return ..() \ No newline at end of file + return ..() diff --git a/code/datums/components/soundplayer.dm b/code/datums/components/soundplayer.dm new file mode 100644 index 0000000000000..1671c69dd4260 --- /dev/null +++ b/code/datums/components/soundplayer.dm @@ -0,0 +1,41 @@ +/*This is the sound_player component. It can be attached to any datum and register any signal to play the sound(s) you want, when you want. Used for the honk virus as an example + Usage : + target.AddComponent(/datum/component/sound_player, args) + Arguments : + custom_volume : Used to define a custom volume. Default : 30 + custom_sounds : Used to define a list of custom sounds that will be picked at random when play_sound() is triggered. Default : list('sound/items/bikehorn.ogg') + amount : Used to define an amount of time the component will work before deleting itself. Default : -1 + signal_or_sig_list : Used to register the signal(s) you want to play the sound when they are sent. Default : None +*/ +/datum/component/sound_player + var/volume = 30 + var/list/sounds = list('sound/items/bikehorn.ogg') + var/amount_left = -1 + +/datum/component/sound_player/Initialize(custom_volume, custom_sounds, amount, signal_or_sig_list) + if(!isnull(custom_volume)) + volume = custom_volume + + if(!isnull(custom_sounds)) + sounds = custom_sounds + + if(!isnull(amount)) + amount_left = amount + + RegisterSignal(parent, signal_or_sig_list, .proc/play_sound) //Registers all the signals in signal_or_sig_list. + + + +/*play_sound() os the proc that actually plays the sound. + If amount_left is equal to -1, the component is infinite and will never delete itself. +*/ +/datum/component/sound_player/proc/play_sound() + playsound(parent, pickweight(sounds), volume, TRUE) + switch(amount_left) + if(-1) + return + if(1) //Last use. + qdel(src) + return + else + amount_left-- diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index 221e3a41d9fd3..8600a59de0cdf 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -6,7 +6,7 @@ var/max_mobs = 5 var/spawn_text = "emerges from" var/list/faction = list("mining") - + /datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs) @@ -26,9 +26,11 @@ /datum/component/spawner/process() try_spawn_mob() - + /datum/component/spawner/proc/stop_spawning(force) + SIGNAL_HANDLER + STOP_PROCESSING(SSprocessing, src) for(var/mob/living/simple_animal/L in spawned_mobs) if(L.nest == src) @@ -36,7 +38,7 @@ spawned_mobs = null /datum/component/spawner/proc/try_spawn_mob() - var/atom/P = parent + var/atom/P = parent if(spawned_mobs.len >= max_mobs) return 0 if(spawn_delay > world.time) @@ -44,7 +46,7 @@ spawn_delay = world.time + spawn_time var/chosen_mob_type = pick(mob_types) var/mob/living/simple_animal/L = new chosen_mob_type(P.loc) - L.flags_1 |= (P.flags_1 & ADMIN_SPAWNED_1) + L.flags_1 |= (P.flags_1 & ADMIN_SPAWNED_1) spawned_mobs += L L.nest = src L.faction = src.faction diff --git a/code/datums/components/spikes.dm b/code/datums/components/spikes.dm index 042b5b5019088..ca067ddac53d9 100644 --- a/code/datums/components/spikes.dm +++ b/code/datums/components/spikes.dm @@ -7,8 +7,8 @@ var/cooldown = 0 /datum/component/spikes/Initialize(damage = 0, spikearmor = 0, diseaseid = null) - spikedamage = damage - armor = spikearmor + spikedamage = damage + armor = spikearmor id = diseaseid RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/prick_collide) RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/prick_crossed) @@ -20,7 +20,7 @@ RegisterSignal(parent, COMSIG_COMPONENT_REMOVING, .proc/removearmor) RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, .proc/prick_touch) RegisterSignal(parent, COMSIG_MOB_HAND_ATTACKED, .proc/prick_touched) - + /datum/component/spikes/proc/prick(mob/living/carbon/C, damage_mod = 1) var/netdamage = spikedamage * damage_mod @@ -33,17 +33,25 @@ cooldown = (world.time + 8) //spike cooldown is equal to default unarmed attack speed /datum/component/spikes/proc/prick_touch(datum/source, mob/living/carbon/human/M, mob/living/carbon/human/H) + SIGNAL_HANDLER + prick(H, 0.5) /datum/component/spikes/proc/prick_touched(datum/source, mob/living/carbon/human/H, mob/living/carbon/human/M) + SIGNAL_HANDLER + prick(M, 1.5) /datum/component/spikes/proc/prick_collide(datum/source, atom/A) + SIGNAL_HANDLER + if(iscarbon(A)) var/mob/living/carbon/C = A prick(C) /datum/component/spikes/proc/prick_crossed(datum/source, atom/movable/M) + SIGNAL_HANDLER + var/atom/movable/P = parent if(iscarbon(M)) var/mob/living/carbon/C = M @@ -60,6 +68,8 @@ prick(C) /datum/component/spikes/proc/setarmor(datum/source, datum/species/S) //this is a proc used to make sure a change in species won't fuck up the armor bonus. + SIGNAL_HANDLER + if(ishuman(parent)) var/mob/living/carbon/human/H = parent finalarmor = armor @@ -68,13 +78,16 @@ H.dna.species.armor += finalarmor /datum/component/spikes/proc/checkdiseasecure(datum/source, var/diseaseid) + SIGNAL_HANDLER + if(diseaseid == id) qdel(src) //we were cured! time to go. /datum/component/spikes/proc/removearmor(datum/source, var/datum/component/C) + SIGNAL_HANDLER + if(C != src) return if(ishuman(parent) && armor) var/mob/living/carbon/human/H = parent H.dna.species.armor -= finalarmor - \ No newline at end of file diff --git a/code/datums/components/spill.dm b/code/datums/components/spill.dm index 1a9a526ec342d..343cdab3f081b 100644 --- a/code/datums/components/spill.dm +++ b/code/datums/components/spill.dm @@ -31,24 +31,30 @@ RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/drop_react) var/obj/item/master = parent preexisting_item_flags = master.item_flags - master.item_flags |= ITEM_SLOT_POCKET + master.item_flags |= ITEM_SLOT_POCKETS /datum/component/spill/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) var/obj/item/master = parent - if(!(preexisting_item_flags & ITEM_SLOT_POCKET)) - master.item_flags &= ~ITEM_SLOT_POCKET + if(!(preexisting_item_flags & ITEM_SLOT_POCKETS)) + master.item_flags &= ~ITEM_SLOT_POCKETS /datum/component/spill/proc/equip_react(obj/item/source, mob/equipper, slot) - if(slot == SLOT_L_STORE || slot == SLOT_R_STORE) + SIGNAL_HANDLER + + if(slot == ITEM_SLOT_LPOCKET || slot == ITEM_SLOT_RPOCKET) RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/knockdown_react, TRUE) else UnregisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN) /datum/component/spill/proc/drop_react(obj/item/source, mob/dropper) + SIGNAL_HANDLER + UnregisterSignal(dropper, COMSIG_LIVING_STATUS_KNOCKDOWN) /datum/component/spill/proc/knockdown_react(mob/living/fool) + SIGNAL_HANDLER + var/obj/item/master = parent fool.dropItemToGround(master) if(droptext) diff --git a/code/datums/components/spinny.dm b/code/datums/components/spinny.dm new file mode 100644 index 0000000000000..cdf5262ab31b8 --- /dev/null +++ b/code/datums/components/spinny.dm @@ -0,0 +1,33 @@ +/** + * spinny.dm + * + * It's a component that spins things a whole bunch, like [proc/dance_rotate] but without the sleeps +*/ +/datum/component/spinny + dupe_mode = COMPONENT_DUPE_UNIQUE + /// How many turns are left? + var/steps_left + /// Turns clockwise by default, or counterclockwise if the reverse argument is TRUE + var/turn_degrees = 90 + +/datum/component/spinny/Initialize(steps = 12, reverse = FALSE) + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE + + steps_left = steps + turn_degrees = (reverse ? -90 : 90) + START_PROCESSING(SSfastprocess, src) + +/datum/component/spinny/Destroy(force, silent) + STOP_PROCESSING(SSfastprocess, src) + return ..() + +/datum/component/spinny/process(delta_time) + steps_left-- + var/atom/spinny_boy = parent + if(!istype(spinny_boy) || steps_left <= 0) + qdel(src) + return + + // 25% chance to make 2 turns instead of 1 since the old dance_rotate wasn't strictly clockwise/counterclockwise + spinny_boy.setDir(turn(spinny_boy.dir, turn_degrees * (prob(25) ? 2 : 1))) diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm index 94620429aa026..dd5a305aa898d 100644 --- a/code/datums/components/spooky.dm +++ b/code/datums/components/spooky.dm @@ -5,6 +5,8 @@ RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/spectral_attack) /datum/component/spooky/proc/spectral_attack(datum/source, mob/living/carbon/C, mob/user) + SIGNAL_HANDLER + if(ishuman(user)) //this weapon wasn't meant for mortals. var/mob/living/carbon/human/U = user if(!istype(U.dna.species, /datum/species/skeleton)) @@ -13,7 +15,7 @@ U.stuttering = 20 if(U.getStaminaLoss() > 95) to_chat(U, "Your ears weren't meant for this spectral sound.") - spectral_change(U) + INVOKE_ASYNC(src, .proc/spectral_change, U) return if(ishuman(C)) @@ -28,7 +30,7 @@ if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly))) C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live to_chat(C, "DOOT") - spectral_change(H) + INVOKE_ASYNC(src, .proc/spectral_change, H) else //the sound will spook monkeys. C.Jitter(15) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index fed8ab28408af..e50a931e45ab9 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -41,6 +41,8 @@ use_delay = use_delay_override /datum/component/squeak/proc/play_squeak() + SIGNAL_HANDLER + if(prob(squeak_chance)) if(!override_squeak_sounds) playsound(parent, pickweight(default_squeak_sounds), volume, 1, -1) @@ -48,6 +50,8 @@ playsound(parent, pickweight(override_squeak_sounds), volume, 1, -1) /datum/component/squeak/proc/step_squeak() + SIGNAL_HANDLER + if(steps > step_delay) play_squeak() steps = 0 @@ -55,6 +59,8 @@ steps++ /datum/component/squeak/proc/play_squeak_crossed(datum/source, atom/movable/AM) + SIGNAL_HANDLER + if(isitem(AM)) var/obj/item/I = AM if(I.item_flags & ABSTRACT) @@ -66,26 +72,36 @@ if(istype(AM, /obj/effect/dummy/phased_mob)) //don't squeek if they're in a phased/jaunting container. return var/atom/current_parent = parent - if(isturf(current_parent.loc)) + if(isturf(current_parent?.loc)) play_squeak() /datum/component/squeak/proc/use_squeak() + SIGNAL_HANDLER + if(last_use + use_delay < world.time) last_use = world.time play_squeak() /datum/component/squeak/proc/on_equip(datum/source, mob/equipper, slot) + SIGNAL_HANDLER + RegisterSignal(equipper, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react, TRUE) /datum/component/squeak/proc/on_drop(datum/source, mob/user) + SIGNAL_HANDLER + UnregisterSignal(user, COMSIG_MOVABLE_DISPOSING) // Disposal pipes related shit /datum/component/squeak/proc/disposing_react(datum/source, obj/structure/disposalholder/holder, obj/machinery/disposal/source) + SIGNAL_HANDLER + //We don't need to worry about unregistering this signal as it will happen for us automaticaly when the holder is qdeleted RegisterSignal(holder, COMSIG_ATOM_DIR_CHANGE, .proc/holder_dir_change) /datum/component/squeak/proc/holder_dir_change(datum/source, old_dir, new_dir) + SIGNAL_HANDLER + //If the dir changes it means we're going through a bend in the pipes, let's pretend we bumped the wall if(old_dir != new_dir) play_squeak() diff --git a/code/datums/components/stationloving.dm b/code/datums/components/stationloving.dm index 51d67e10e2088..c4c0359feb44f 100644 --- a/code/datums/components/stationloving.dm +++ b/code/datums/components/stationloving.dm @@ -16,15 +16,17 @@ src.allow_death = allow_death check_in_bounds() // Just in case something is being created outside of station/centcom -/datum/component/stationloving/InheritComponent(datum/component/stationloving/newc, original, list/arguments) - if (original) - if (istype(newc)) +/datum/component/stationloving/InheritComponent(datum/component/stationloving/newc, original, _inform_admins, allow_death) + if(original) + if(newc) inform_admins = newc.inform_admins allow_death = newc.allow_death - else if (LAZYLEN(arguments)) - inform_admins = arguments[1] + else + inform_admins = _inform_admins /datum/component/stationloving/proc/relocate() + SIGNAL_HANDLER + var/targetturf = find_safe_turf() if(!targetturf) if(GLOB.blobstart.len > 0) @@ -39,6 +41,8 @@ return targetturf /datum/component/stationloving/proc/check_in_bounds() + SIGNAL_HANDLER + if(in_bounds()) return else @@ -49,31 +53,36 @@ message_admins("[parent] has been moved out of bounds in [ADMIN_VERBOSEJMP(currentturf)]. Moving it to [ADMIN_VERBOSEJMP(targetturf)].") /datum/component/stationloving/proc/check_soul_imbue() + SIGNAL_HANDLER + return disallow_soul_imbue /datum/component/stationloving/proc/check_mark_retrieval() + SIGNAL_HANDLER + return COMPONENT_BLOCK_MARK_RETRIEVAL /datum/component/stationloving/proc/in_bounds() var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4)) var/static/list/disallowed_centcom_areas = typecacheof(list(/area/abductor_ship, /area/awaymission/errorroom)) var/turf/T = get_turf(parent) - if (!T) + if(!T) return FALSE var/area/A = T.loc - if (is_station_level(T.z)) + if(is_station_level(T.z)) return TRUE - if (is_centcom_level(T.z)) + if(is_centcom_level(T.z)) if (is_type_in_typecache(A, disallowed_centcom_areas)) return FALSE return TRUE - if (is_reserved_level(T.z)) + if(is_reserved_level(T.z)) if (is_type_in_typecache(A, allowed_shuttles)) return TRUE return FALSE /datum/component/stationloving/proc/check_deletion(datum/source, force) // TRUE = interrupt deletion, FALSE = proceed with deletion + SIGNAL_HANDLER var/turf/T = get_turf(parent) diff --git a/code/datums/components/storage/concrete/_concrete.dm b/code/datums/components/storage/concrete/_concrete.dm index 3fe69103a59ce..41111451edc97 100644 --- a/code/datums/components/storage/concrete/_concrete.dm +++ b/code/datums/components/storage/concrete/_concrete.dm @@ -92,12 +92,16 @@ return FALSE /datum/component/storage/concrete/proc/on_contents_del(datum/source, atom/A) + SIGNAL_HANDLER + var/atom/real_location = parent if(A in real_location) usr = null remove_from_storage(A, null) /datum/component/storage/concrete/proc/on_deconstruct(datum/source, disassembled) + SIGNAL_HANDLER + if(drop_all_on_deconstruct) do_quick_empty() @@ -156,7 +160,7 @@ var/datum/component/storage/concrete/master = master() var/atom/parent = src.parent var/moved = FALSE - if(!istype(I)) + if(!istype(I) || I.anchored) return FALSE if(M) if(!M.temporarilyRemoveItemFromInventory(I)) diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm index 4920811551bb0..80c9e469408e5 100644 --- a/code/datums/components/storage/concrete/bag_of_holding.dm +++ b/code/datums/components/storage/concrete/bag_of_holding.dm @@ -5,23 +5,28 @@ var/list/obj/item/storage/backpack/holding/matching = typecache_filter_list(W.GetAllContents(), typecacheof(/obj/item/storage/backpack/holding)) matching -= A if(istype(W, /obj/item/storage/backpack/holding) || matching.len) - var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [A.name]?", "Abort", "Proceed") - if(safety != "Proceed" || QDELETED(A) || QDELETED(W) || QDELETED(user) || !user.canUseTopic(A, BE_CLOSE, iscarbon(user)) || !(W in user.contents)) // need to be holding the bag you're "inserting" - return - var/turf/loccheck = get_turf(A) - if(is_reebe(loccheck.z)) - user.visible_message("An unseen force knocks [user] to the ground!", "\"I think not!\"") - user.Paralyze(60) - return - to_chat(user, "The Bluespace interfaces of the two devices catastrophically malfunction!") - qdel(W) - playsound(loccheck,'sound/effects/supermatter.ogg', 200, 1) - - message_admins("[ADMIN_LOOKUPFLW(user)] detonated a bag of holding at [ADMIN_VERBOSEJMP(loccheck)].") - log_game("[key_name(user)] detonated a bag of holding at [loc_name(loccheck)].") - - user.gib(TRUE, TRUE, TRUE) - new/obj/singularity/boh_tear(loccheck) - qdel(A) + INVOKE_ASYNC(src, .proc/recursive_insertion, W, user) return . = ..() + +/datum/component/storage/concrete/bluespace/bag_of_holding/proc/recursive_insertion(obj/item/W, mob/living/user) + var/atom/A = parent + var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [A.name]?", "Abort", "Proceed") + if(safety != "Proceed" || QDELETED(A) || QDELETED(W) || QDELETED(user) || !user.canUseTopic(A, BE_CLOSE, iscarbon(user)) || !(W in user.contents)) // need to be holding the bag you're "inserting" + return + var/turf/loccheck = get_turf(A) + if(is_reebe(loccheck.z)) + user.visible_message("An unseen force knocks [user] to the ground!", "\"I think not!\"") + user.Paralyze(60) + return + to_chat(user, "The Bluespace interfaces of the two devices catastrophically malfunction!") + qdel(W) + playsound(loccheck,'sound/effects/supermatter.ogg', 200, 1) + + message_admins("[ADMIN_LOOKUPFLW(user)] detonated a bag of holding at [ADMIN_VERBOSEJMP(loccheck)].") + log_game("[key_name(user)] detonated a bag of holding at [loc_name(loccheck)].") + + user.gib(TRUE, TRUE, TRUE) + new/obj/singularity/boh_tear(loccheck) + qdel(A) + diff --git a/code/datums/components/storage/concrete/bluespace.dm b/code/datums/components/storage/concrete/bluespace.dm index 05a185322293b..71a95717ac551 100644 --- a/code/datums/components/storage/concrete/bluespace.dm +++ b/code/datums/components/storage/concrete/bluespace.dm @@ -9,7 +9,18 @@ var/atom/dumping_location = dest.get_dumping_location() var/turf/bagT = get_turf(parent) var/turf/destT = get_turf(dumping_location) - if(destT && bagT && bagT.z == destT.z && get_dist(M, dumping_location) < dumping_range) + var/valid = TRUE + if(!destT || !bagT || get_dist(M, dumping_location) >= dumping_range || bagT.get_virtual_z_level() != destT.get_virtual_z_level()) + valid = FALSE + //Check density LOS. + if(valid) + for(var/turf/T as() in getline(bagT, destT)) + if(T.density) + valid = FALSE + break + + //Check still valid + if(valid) if(dumping_location.storage_contents_dump_act(src, M)) if(alt_sound && prob(1)) playsound(src, alt_sound, 40, 1) @@ -20,4 +31,3 @@ to_chat(M, "The [A.name] buzzes.") playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return FALSE - diff --git a/code/datums/components/storage/concrete/fish_case.dm b/code/datums/components/storage/concrete/fish_case.dm new file mode 100644 index 0000000000000..438974186e5fe --- /dev/null +++ b/code/datums/components/storage/concrete/fish_case.dm @@ -0,0 +1,8 @@ +/datum/component/storage/concrete/fish_case + max_items = 1 + can_hold_trait = TRAIT_FISH_CASE_COMPATIBILE + +/datum/component/storage/concrete/fish_case/can_be_inserted(obj/item/I, stop_messages, mob/M) + /// Activate deferred components if any. + SEND_SIGNAL(I, COMSIG_AQUARIUM_BEFORE_INSERT_CHECK) + . = ..() diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index bba34c95d644a..384827b5939ab 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -98,11 +98,13 @@ /obj/item/gun/ballistic/revolver/detective, /obj/item/ammo_box/c38)) -/datum/component/storage/concrete/pockets/small/helmet - max_items = 1 +/datum/component/storage/concrete/pockets/helmet quickdraw = TRUE + max_combined_w_class = 6 -/datum/component/storage/concrete/pockets/small/helmet/Initialize() +/datum/component/storage/concrete/pockets/helmet/Initialize() . = ..() - can_hold = typecacheof(list(/obj/item/reagent_containers/glass/bottle, - /obj/item/ammo_box/a762)) + can_hold = typecacheof(list(/obj/item/reagent_containers/food/drinks/bottle/vodka, + /obj/item/reagent_containers/food/drinks/bottle/molotov, + /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/ammo_box/a762)) diff --git a/code/datums/components/storage/concrete/rped.dm b/code/datums/components/storage/concrete/rped.dm index 455eb985f0904..b05d7601aa681 100644 --- a/code/datums/components/storage/concrete/rped.dm +++ b/code/datums/components/storage/concrete/rped.dm @@ -12,7 +12,7 @@ . = ..() if(!I.get_part_rating()) if (!stop_messages) - to_chat(M, "[parent] only accepts machine parts!") + M.balloon_alert(M, "Only machine parts fit") return FALSE /datum/component/storage/concrete/bluespace/rped @@ -29,5 +29,5 @@ . = ..() if(!I.get_part_rating()) if (!stop_messages) - to_chat(M, "[parent] only accepts machine parts!") + M.balloon_alert(M, "Only machine parts fit") return FALSE diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index cf5128cda72fd..ce2654004f584 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -12,6 +12,9 @@ var/list/can_hold //if this is set, only things in this typecache will fit. var/list/cant_hold //if this is set, anything in this typecache will not be able to fit. + var/list/exception_hold //if set, these items will be the exception to the max size of object that can fit. + /// If set can only contain stuff with this single trait present. + var/list/can_hold_trait var/list/mob/is_using //lazy list of mobs looking at the contents of this storage. @@ -36,8 +39,8 @@ var/display_numerical_stacking = FALSE //stack things of the same type and show as a single object with a number. - var/obj/screen/storage/boxes //storage display object - var/obj/screen/close/closer //close button object + var/atom/movable/screen/storage/boxes //storage display object + var/atom/movable/screen/close/closer //close button object var/allow_big_nesting = FALSE //allow storage objects of the same or greater size. @@ -144,6 +147,8 @@ return master? master.real_location() : null /datum/component/storage/proc/canreach_react(datum/source, list/next) + SIGNAL_HANDLER + var/datum/component/storage/concrete/master = master() if(!master) return @@ -154,24 +159,32 @@ next += slave.parent /datum/component/storage/proc/on_move() + SIGNAL_HANDLER + var/atom/A = parent for(var/mob/living/L in can_see_contents()) if(!L.CanReach(A)) hide_from(L) /datum/component/storage/proc/attack_self(datum/source, mob/M) + SIGNAL_HANDLER + if(locked) - to_chat(M, "[parent] seems to be locked!") + var/atom/host = parent + host.balloon_alert(M, "It's locked") return FALSE if((M.get_active_held_item() == parent) && allow_quick_empty) - quick_empty(M) + INVOKE_ASYNC(src, .proc/quick_empty, M) /datum/component/storage/proc/preattack_intercept(datum/source, obj/O, mob/M, params) + SIGNAL_HANDLER + if(!isitem(O) || !click_gather || SEND_SIGNAL(O, COMSIG_CONTAINS_STORAGE)) return FALSE . = COMPONENT_NO_ATTACK if(locked) - to_chat(M, "[parent] seems to be locked!") + var/atom/host = parent + host.balloon_alert(M, "It's locked") return FALSE var/obj/item/I = O if(collection_mode == COLLECT_ONE) @@ -180,19 +193,25 @@ return if(!isturf(I.loc)) return - var/list/things = I.loc.contents.Copy() + INVOKE_ASYNC(src, .proc/async_preattack_intercept, I, M) + +///async functionality from preattack_intercept +/datum/component/storage/proc/async_preattack_intercept(obj/item/attack_item, mob/pre_attack_mob) + var/list/things = attack_item.loc.contents.Copy() if(collection_mode == COLLECT_SAME) - things = typecache_filter_list(things, typecacheof(I.type)) + for(var/A in things) + if(!istype(A, attack_item)) + things -= A var/len = length(things) if(!len) - to_chat(M, "You failed to pick up anything with [parent].") + to_chat(pre_attack_mob, "You failed to pick up anything with [parent]!") return - var/datum/progressbar/progress = new(M, len, I.loc) + var/datum/progressbar/progress = new(pre_attack_mob, len, attack_item.loc) var/list/rejections = list() - while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress))) + while(do_after(pre_attack_mob, 1 SECONDS, parent, NONE, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, attack_item.loc, rejections, progress))) stoplag(1) qdel(progress) - to_chat(M, "You put everything you could [insert_preposition] [parent].") + to_chat(pre_attack_mob, "You put everything you could [insert_preposition] [parent].") /datum/component/storage/proc/handle_mass_item_insertion(list/things, datum/component/storage/src_object, mob/user, datum/progressbar/progress) var/atom/source_real_location = src_object.real_location() @@ -240,10 +259,12 @@ if(!M.canUseStorage() || !A.Adjacent(M) || M.incapacitated()) return if(locked) - to_chat(M, "[parent] seems to be locked!") + var/atom/host = parent + host.balloon_alert(M, "It's locked") return FALSE A.add_fingerprint(M) - to_chat(M, "You start dumping out [parent].") + var/atom/host = parent + host.balloon_alert(M, "You start dumping out the contents") var/turf/T = get_turf(A) var/list/things = contents() var/datum/progressbar/progress = new(M, length(things), T) @@ -280,6 +301,8 @@ return TRUE /datum/component/storage/proc/set_locked(datum/source, new_state) + SIGNAL_HANDLER + locked = new_state if(locked) close_all() @@ -321,7 +344,7 @@ var/datum/numbered_display/ND = numerical_display_contents[type] ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE ND.sample_object.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]" - ND.sample_object.maptext = "[(ND.number > 1)? "[ND.number]" : ""]" + ND.sample_object.maptext = MAPTEXT("[(ND.number > 1)? "[ND.number]" : ""]") ND.sample_object.layer = ABOVE_HUD_LAYER ND.sample_object.plane = ABOVE_HUD_PLANE cx++ @@ -362,32 +385,43 @@ M.client.screen |= boxes M.client.screen |= closer M.client.screen |= real_location.contents - M.active_storage = src + M.set_active_storage(src) LAZYOR(is_using, M) + RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/mob_deleted) return TRUE +/datum/component/storage/proc/mob_deleted(datum/source) + SIGNAL_HANDLER + hide_from(source) + /datum/component/storage/proc/hide_from(mob/M) + if(M.active_storage == src) + M.set_active_storage(null) + LAZYREMOVE(is_using, M) + + UnregisterSignal(M, COMSIG_PARENT_QDELETING) if(!M.client) return TRUE var/atom/real_location = real_location() M.client.screen -= boxes M.client.screen -= closer M.client.screen -= real_location.contents - if(M.active_storage == src) - M.active_storage = null - LAZYREMOVE(is_using, M) return TRUE /datum/component/storage/proc/close(mob/M) hide_from(M) /datum/component/storage/proc/close_all() + SIGNAL_HANDLER + . = FALSE for(var/mob/M in can_see_contents()) close(M) . = TRUE //returns TRUE if any mobs actually got a close(M) call /datum/component/storage/proc/emp_act(datum/source, severity) + SIGNAL_HANDLER + if(emp_shielded) return var/datum/component/storage/concrete/master = master() @@ -422,6 +456,8 @@ return master._removal_reset(thing) /datum/component/storage/proc/_remove_and_refresh(datum/source, atom/movable/thing) + SIGNAL_HANDLER + _removal_reset(thing) refresh_mob_views() @@ -435,6 +471,8 @@ return master.remove_from_storage(AM, new_location) /datum/component/storage/proc/refresh_mob_views() + SIGNAL_HANDLER + var/list/seeing = can_see_contents() for(var/i in seeing) show_to(i) @@ -447,6 +485,7 @@ cansee |= M else LAZYREMOVE(is_using, M) + UnregisterSignal(M, COMSIG_PARENT_QDELETING) return cansee //Tries to dump content @@ -455,7 +494,8 @@ var/atom/dump_destination = dest_object.get_dumping_location() if(A.Adjacent(M) && dump_destination && M.Adjacent(dump_destination)) if(locked) - to_chat(M, "[parent] seems to be locked!") + var/atom/host = parent + host.balloon_alert(M, "It's locked") return FALSE if(dump_destination.storage_contents_dump_act(src, M)) playsound(A, "rustle", 50, 1, -5) @@ -464,6 +504,8 @@ //This proc is called when you want to place an item into the storage item. /datum/component/storage/proc/attackby(datum/source, obj/item/I, mob/M, params) + SIGNAL_HANDLER + if(istype(I, /obj/item/hand_labeler)) var/obj/item/hand_labeler/labeler = I if(labeler.mode) @@ -493,12 +535,16 @@ //Abuses the fact that lists are just references, or something like that. /datum/component/storage/proc/signal_return_inv(datum/source, list/interface, recursive = TRUE) + SIGNAL_HANDLER + if(!islist(interface)) return FALSE interface |= return_inv(recursive) return TRUE /datum/component/storage/proc/mousedrop_onto(datum/source, atom/over_object, mob/M) + SIGNAL_HANDLER + set waitfor = FALSE . = COMPONENT_NO_MOUSEDROP var/atom/A = parent @@ -517,14 +563,14 @@ // this must come before the screen objects only block, dunno why it wasn't before if(over_object == M) user_show_to_mob(M) - if(!istype(over_object, /obj/screen)) - dump_content_at(over_object, M) + if(!istype(over_object, /atom/movable/screen)) + INVOKE_ASYNC(src, .proc/dump_content_at, over_object, M) return if(A.loc != M) return playsound(A, "rustle", 50, 1, -5) - if(istype(over_object, /obj/screen/inventory/hand)) - var/obj/screen/inventory/hand/H = over_object + if(istype(over_object, /atom/movable/screen/inventory/hand)) + var/atom/movable/screen/inventory/hand/H = over_object M.putItemFromInventoryInHandIfPossible(A, H.held_index) return A.add_fingerprint(M) @@ -535,12 +581,15 @@ return FALSE A.add_fingerprint(M) if(locked && !force) - to_chat(M, "[parent] seems to be locked!") + var/atom/host = parent + host.balloon_alert(M, "It's locked") return FALSE if(force || M.CanReach(parent, view_only = TRUE)) show_to(M) /datum/component/storage/proc/mousedrop_receive(datum/source, atom/movable/O, mob/M) + SIGNAL_HANDLER + if(isitem(O)) var/obj/item/I = O if(iscarbon(M) || isdrone(M)) @@ -552,7 +601,7 @@ //This proc return 1 if the item can be picked up and 0 if it can't. //Set the stop_messages to stop it from printing messages /datum/component/storage/proc/can_be_inserted(obj/item/I, stop_messages = FALSE, mob/M) - if(!istype(I) || (I.item_flags & ABSTRACT)) + if(!istype(I) || I.anchored || (I.item_flags & ABSTRACT)) return FALSE //Not an item if(I == parent) return FALSE //no paradoxes for you @@ -565,42 +614,42 @@ if(locked) if(M && !stop_messages) host.add_fingerprint(M) - to_chat(M, "[host] seems to be locked!") + host.balloon_alert(M, "It's locked") return FALSE if(real_location.contents.len >= max_items) if(!stop_messages) - to_chat(M, "[host] is full, make some space!") + host.balloon_alert(M, "[host] is full") return FALSE //Storage item is full if(length(can_hold)) if(!is_type_in_typecache(I, can_hold)) if(!stop_messages) - to_chat(M, "[host] cannot hold [I]!") + host.balloon_alert(M, "It doesn't fit") return FALSE - if(is_type_in_typecache(I, cant_hold)) //Check for specific items which this container can't hold. + if(is_type_in_typecache(I, cant_hold) || HAS_TRAIT(I, TRAIT_NO_STORAGE_INSERT) || (can_hold_trait && !HAS_TRAIT(I, can_hold_trait))) //Items which this container can't hold. if(!stop_messages) - to_chat(M, "[host] cannot hold [I]!") + host.balloon_alert(M, "It doesn't fit") return FALSE if(I.w_class > max_w_class) if(!stop_messages) - to_chat(M, "[I] is too big for [host]!") + host.balloon_alert(M, "[I] is too big") return FALSE var/sum_w_class = I.w_class for(var/obj/item/_I in real_location) sum_w_class += _I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it. if(sum_w_class > max_combined_w_class) if(!stop_messages) - to_chat(M, "[I] won't fit in [host], make some space!") + host.balloon_alert(M, "[host] is full") return FALSE if(isitem(host)) var/obj/item/IP = host var/datum/component/storage/STR_I = I.GetComponent(/datum/component/storage) if((I.w_class >= IP.w_class) && STR_I && !allow_big_nesting) if(!stop_messages) - to_chat(M, "[IP] cannot hold [I] as it's a storage item of the same size!") + host.balloon_alert(M, "It's too big") return FALSE //To prevent the stacking of same sized storage items. if(HAS_TRAIT(I, TRAIT_NODROP)) //SHOULD be handled in unEquip, but better safe than sorry. if(!stop_messages) - to_chat(M, "\the [I] is stuck to your hand, you can't put it in \the [host]!") + host.balloon_alert(M, "[I] is stuck to your hand") return FALSE var/datum/component/storage/concrete/master = master() if(!istype(master)) @@ -629,13 +678,13 @@ return if(rustle_sound) playsound(parent, "rustle", 50, 1, -5) - for(var/mob/viewing in viewers(user, null)) + for(var/mob/viewing as() in viewers(user)) if(M == viewing) to_chat(usr, "You put [I] [insert_preposition]to [parent].") else if(in_range(M, viewing)) //If someone is standing close enough, they can tell what it is... - viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", 1) + viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", MSG_VISUAL) else if(I && I.w_class >= 3) //Otherwise they can only see large or normal items from a distance... - viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", 1) + viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", MSG_VISUAL) /datum/component/storage/proc/update_icon() if(isobj(parent)) @@ -643,31 +692,45 @@ O.update_icon() /datum/component/storage/proc/signal_insertion_attempt(datum/source, obj/item/I, mob/M, silent = FALSE, force = FALSE) + SIGNAL_HANDLER + if((!force && !can_be_inserted(I, TRUE, M)) || (I == parent)) return FALSE return handle_item_insertion(I, silent, M) /datum/component/storage/proc/signal_can_insert(datum/source, obj/item/I, mob/M, silent = FALSE) + SIGNAL_HANDLER + return can_be_inserted(I, silent, M) /datum/component/storage/proc/show_to_ghost(datum/source, mob/dead/observer/M) + SIGNAL_HANDLER + return user_show_to_mob(M, TRUE) /datum/component/storage/proc/signal_show_attempt(datum/source, mob/showto, force = FALSE) + SIGNAL_HANDLER + return user_show_to_mob(showto, force) /datum/component/storage/proc/on_check() + SIGNAL_HANDLER + return TRUE /datum/component/storage/proc/check_locked() + SIGNAL_HANDLER + return locked -/datum/component/storage/proc/signal_take_type(datum/source, type, atom/destination, amount = INFINITY, check_adjacent = FALSE, force = FALSE, mob/user, list/inserted) +/datum/component/storage/proc/signal_take_type(datum/source, typecache, atom/destination, amount = INFINITY, check_adjacent = FALSE, force = FALSE, mob/user, list/inserted) + SIGNAL_HANDLER + if(!force) if(check_adjacent) if(!user || !user.CanReach(destination) || !user.CanReach(parent)) return FALSE - var/list/taking = typecache_filter_list(contents(), typecacheof(type)) + var/list/taking = typecache_filter_list(contents(), typecache) if(taking.len > amount) taking.len = amount if(inserted) //duplicated code for performance, don't bother checking retval/checking for list every item. @@ -684,15 +747,20 @@ return max(0, max_items - real_location.contents.len) /datum/component/storage/proc/signal_fill_type(datum/source, type, amount = 20, force = FALSE) + SIGNAL_HANDLER + var/atom/real_location = real_location() if(!force) amount = min(remaining_space_items(), amount) for(var/i in 1 to amount) handle_item_insertion(new type(real_location), TRUE) - CHECK_TICK + if(QDELETED(src)) + return TRUE return TRUE /datum/component/storage/proc/on_attack_hand(datum/source, mob/user) + SIGNAL_HANDLER + var/atom/A = parent if(!attack_hand_interact) return @@ -709,45 +777,57 @@ var/mob/living/carbon/human/H = user if(H.l_store == A && !H.get_active_held_item()) //Prevents opening if it's in a pocket. . = COMPONENT_NO_ATTACK_HAND - H.put_in_hands(A) + INVOKE_ASYNC(H, /mob.proc/put_in_hands, A) H.l_store = null return if(H.r_store == A && !H.get_active_held_item()) . = COMPONENT_NO_ATTACK_HAND - H.put_in_hands(A) + INVOKE_ASYNC(H, /mob.proc/put_in_hands, A) H.r_store = null return if(A.loc == user) . = COMPONENT_NO_ATTACK_HAND if(locked) - to_chat(user, "[parent] seems to be locked!") + var/atom/host = parent + host.balloon_alert(user, "It's locked") else show_to(user) /datum/component/storage/proc/signal_on_pickup(datum/source, mob/user) + SIGNAL_HANDLER + var/atom/A = parent update_actions() - for(var/mob/M in range(1, A)) + for(var/mob/M as() in hearers(1, A)) if(M.active_storage == src) close(M) /datum/component/storage/proc/signal_take_obj(datum/source, atom/movable/AM, new_loc, force = FALSE) + SIGNAL_HANDLER + if(!(AM in real_location())) return FALSE return remove_from_storage(AM, new_loc) /datum/component/storage/proc/signal_quick_empty(datum/source, atom/loctarget) + SIGNAL_HANDLER + return do_quick_empty(loctarget) /datum/component/storage/proc/signal_hide_attempt(datum/source, mob/target) + SIGNAL_HANDLER + return hide_from(target) /datum/component/storage/proc/on_alt_click(datum/source, mob/user) + SIGNAL_HANDLER + if(!isliving(user) || !user.CanReach(parent)) return if(locked) - to_chat(user, "[parent] seems to be locked!") + var/atom/host = parent + host.balloon_alert(user, "It's locked") return var/atom/A = parent @@ -757,19 +837,29 @@ playsound(A, "rustle", 50, 1, -5) return - if(!user.incapacitated()) - var/obj/item/I = locate() in real_location() - if(!I) - return - A.add_fingerprint(user) - remove_from_storage(I, get_turf(user)) - if(!user.put_in_hands(I)) - to_chat(user, "You fumble for [I] and it falls on the floor.") - return - user.visible_message("[user] draws [I] from [parent]!", "You draw [I] from [parent].") + if(user.incapacitated()) return + var/obj/item/to_remove = locate() in real_location() + if(!to_remove) + return + INVOKE_ASYNC(src, .proc/attempt_put_in_hands, to_remove, user) + +///attempt to put an item from contents into the users hands +/datum/component/storage/proc/attempt_put_in_hands(obj/item/to_remove, mob/user) + var/atom/parent_as_atom = parent + + parent_as_atom.add_fingerprint(user) + remove_from_storage(to_remove, get_turf(user)) + if(!user.put_in_hands(to_remove)) + to_chat(user, "You fumble for [to_remove] and it falls on the floor.") + return + user.visible_message("[user] draws [to_remove] from [parent]!", "You draw [to_remove] from [parent].") + return + /datum/component/storage/proc/action_trigger(datum/signal_source, datum/action/source) + SIGNAL_HANDLER + gather_mode_switch(source.owner) return COMPONENT_ACTION_BLOCK_TRIGGER @@ -777,8 +867,8 @@ collection_mode = (collection_mode+1)%3 switch(collection_mode) if(COLLECT_SAME) - to_chat(user, "[parent] now picks up all items of a single type at once.") + user.balloon_alert(user, "[parent] now picks up all items of single type") if(COLLECT_EVERYTHING) - to_chat(user, "[parent] now picks up all items in a tile at once.") + user.balloon_alert(user, "[parent] now picks up all items") if(COLLECT_ONE) - to_chat(user, "[parent] now picks up one item at a time.") + user.balloon_alert(user, "[parent] now picks up single item") diff --git a/code/datums/components/swarming.dm b/code/datums/components/swarming.dm index 3818126c0eb77..1e25172f956ca 100644 --- a/code/datums/components/swarming.dm +++ b/code/datums/components/swarming.dm @@ -12,6 +12,8 @@ RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, .proc/leave_swarm) /datum/component/swarming/proc/join_swarm(datum/source, atom/movable/AM) + SIGNAL_HANDLER + var/datum/component/swarming/other_swarm = AM.GetComponent(/datum/component/swarming) if(!other_swarm) return @@ -21,6 +23,8 @@ other_swarm.swarm_members |= src /datum/component/swarming/proc/leave_swarm(datum/source, atom/movable/AM) + SIGNAL_HANDLER + var/datum/component/swarming/other_swarm = AM.GetComponent(/datum/component/swarming) if(!other_swarm || !(other_swarm in swarm_members)) return diff --git a/code/datums/components/team_monitor.dm b/code/datums/components/team_monitor.dm new file mode 100644 index 0000000000000..d4213a83eb948 --- /dev/null +++ b/code/datums/components/team_monitor.dm @@ -0,0 +1,564 @@ +#define ALT_APPEARENCE_ID "team_monitor" + +//================== +// Helpers +//================== + +//A list that tracks everything that should be tracked by team monitors +//Assoc list: +// Key = Frequency +// Value = Components +GLOBAL_LIST_EMPTY(tracker_huds) +GLOBAL_LIST_EMPTY(tracker_beacons) + +//Gets the first free team element, useful for creating new teams +//Special key is for what kind of team frequency it should be +//Everything that has a team monitor can be configured to change what frequency it tracks on +//The special key can be used to make keys like synd5 or synd83 to prevent centcom tracking syndies. +/proc/get_free_team_frequency(special_key = "") + var/sanity = 5 + //5 attempts to find a free team element, should never get that far + while(sanity > 0) + sanity -- + var/random_id = rand(1, 999) + var/key = "[random_id]" + if(!GLOB.tracker_beacons.Find("[special_key][key]")) + return key + //Return something anyways + var/random_id = rand(1, 999) + var/key = "[random_id]" + return key + +//Adds a new tracking hud +/proc/add_tracker_hud(frequency_added, datum/component/component_added) + if(!frequency_added) + return + if(islist(GLOB.tracker_huds[frequency_added])) + GLOB.tracker_huds[frequency_added] |= component_added + else + GLOB.tracker_huds[frequency_added] = list(component_added) + +//Adds a new tracking beacon +/proc/add_tracker_beacon(frequency_added, datum/component/component_added) + if(!frequency_added) + return + if(islist(GLOB.tracker_beacons[frequency_added])) + GLOB.tracker_beacons[frequency_added] |= component_added + else + GLOB.tracker_beacons[frequency_added] = list(component_added) + +/proc/get_all_beacons_on_frequency(frequency, base_frequency) + if(!frequency) + return list() + var/list/found_beacons = list() + if(islist(GLOB.tracker_beacons[frequency])) + found_beacons.Add(GLOB.tracker_beacons[frequency]) + if(islist(GLOB.tracker_beacons["[base_frequency]-GLOB"])) + found_beacons.Add(GLOB.tracker_beacons["[base_frequency]-GLOB"]) + return found_beacons + +/proc/get_all_watchers_on_frequency(frequency, team_key = "", global_freq = FALSE) + if(global_freq) + . = list() + for(var/tracker_freq in GLOB.tracker_huds) + for(var/datum/component/team_monitor/TM as() in GLOB.tracker_huds[tracker_freq]) + if(TM.team_freq_key == team_key) + . += TM + else + return GLOB.tracker_huds[frequency] + +//================== +// Component +// - HUD COMPONENT +// - HANDLES POINTING TOWARDS TRACKED BEACONS +//================== + +//The component that handles tracking atoms +/datum/component/team_monitor + //The frequency of the team signals we are trackings + var/team_freq_key = "debug" //Key <-- cannot be changed + var/team_frequency = "" //Final compiled: Consists of key then numbers between 1 and 999 + //The atoms we are actually tracking + // Key = Beacon component + // Value = image + var/list/tracking = list() + //Who are we updating for + var/mob/updating = null + //Distance from center + //Probably in pixels or something idk + var/distance = 20 + //Should we display the hud in the firstplace + var/hud_visible = TRUE + //The attached beacon: Ignore this one + var/datum/component/tracking_beacon/attached_beacon + +/datum/component/team_monitor/Initialize(frequency_key, frequency, _attached_beacon) + var/obj/item/clothing/item = parent + if(!istype(item)) + return COMPONENT_INCOMPATIBLE + + team_freq_key = frequency_key + if(frequency) + team_frequency = "[frequency_key][frequency]" + else + team_frequency = null + + attached_beacon = _attached_beacon + + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/parent_equipped) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/parent_dequpped) + + get_matching_beacons() + add_tracker_hud(team_frequency, src) + +/datum/component/team_monitor/Destroy(force, silent) + //Unregister signals + if(parent) + UnregisterSignal(parent, COMSIG_ITEM_EQUIPPED) + UnregisterSignal(parent, COMSIG_ITEM_DROPPED) + + if(team_frequency) + GLOB.tracker_huds[team_frequency] -= src + + //Stop processing + STOP_PROCESSING(SSprocessing, src) + + //Remove the HUD from the equipped mob + if(updating) + hide_hud(updating) + + //Dispose + if(attached_beacon) + if(attached_beacon.attached_monitor == src) + attached_beacon.attached_monitor = null + attached_beacon = null + + . = ..() + +//Gets the active trackers for when the team_monitor component +//is initialized while other trackers are already active. +/datum/component/team_monitor/proc/get_matching_beacons() + for(var/datum/component/tracking_beacon/beacon as() in get_all_beacons_on_frequency(team_frequency, team_freq_key)) + if(beacon != attached_beacon && (beacon.updating || beacon.always_update)) + add_to_tracking_network(beacon) + +//=========== +// Handles the parent being moved and updates the direction of the arrows. +//=========== + +/datum/component/team_monitor/process() + update_all_directions() + +//When the parent is removed, we need to update our arrows +//Also if we are visible update the arrows of anything tracking us +/datum/component/team_monitor/proc/parent_moved() + SIGNAL_HANDLER + + //Update our alt appearences + update_all_directions() + +//Updates the direction of the arrows for all atoms we are tracking +/datum/component/team_monitor/proc/update_all_directions() + if(!updating) + return + for(var/datum/component/tracking_beacon/beacon as() in tracking) + update_atom_dir(beacon) + +//Update the arrow towards another atom +/datum/component/team_monitor/proc/update_atom_dir(datum/component/tracking_beacon/beacon) + if(!updating || !updating.hud_used || !beacon) + return + var/atom/movable/screen/arrow/screen = tracking[beacon] + var/turf/target_turf = get_turf(beacon.parent) + var/turf/parent_turf = get_turf(parent) + if(target_turf.get_virtual_z_level() != parent_turf.get_virtual_z_level() || target_turf == parent_turf) + if(screen) + //Remove the screen + updating.hud_used.team_finder_arrows -= screen + qdel(screen) + tracking[beacon] = null + //Update their hud + updating.hud_used.show_hud(updating.hud_used.hud_version, updating) + return + if(!screen) + //Create the screen + screen = new + screen.alpha = 240 + screen.color = beacon.colour + screen.hud = updating.hud_used + updating.hud_used.team_finder_arrows += screen + tracking[beacon] = screen + //Update their hud + updating.hud_used.show_hud(updating.hud_used.hud_version, updating) + var/matrix/rotationMatrix = matrix() + rotationMatrix.Scale(1.5) + rotationMatrix.Translate(0, -distance) + rotationMatrix.Turn(Get_Angle(target_turf, parent_turf)) + animate(screen, transform = rotationMatrix, time = 2) + +//=========== +// Handles being equipped / dequipped +//=========== + +//The parent equipped an item with a team_monitor, check if its in the right slot and apply the hud +//Also needs to enable other trackers pointers towards us +/datum/component/team_monitor/proc/parent_equipped(datum/source, mob/equipper, slot) + SIGNAL_HANDLER + + var/obj/item/clothing/item = parent + if(!istype(item)) + return + if(item.slot_flags & slot) //Was equipped to a valid slot for this item? + show_hud(equipper) + else + hide_hud(equipper) + +//Disable our hud +//Disable the pointers to us +/datum/component/team_monitor/proc/parent_dequpped(datum/source, mob/user) + SIGNAL_HANDLER + + hide_hud(user) + +//=========== +// Handles hiding / showing the hud when equipped +//=========== + +/datum/component/team_monitor/proc/show_hud(mob/target) + updating = target + //Our hud is disabled + if(!hud_visible) + return + //Start processing to update in weird situations + START_PROCESSING(SSprocessing, src) + //Register parent signal + RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/parent_moved) + //Mob doesnt have a hud, dont add hud arrows + if(!target.hud_used) + return + for(var/datum/component/tracking_beacon/key in tracking) + var/atom/movable/screen/arrow/arrow = new + arrow.alpha = 240 + arrow.color = key.colour + arrow.hud = target.hud_used + target.hud_used.team_finder_arrows += arrow + tracking[key] = arrow + //Update their hud + target.hud_used.show_hud(target.hud_used.hud_version, target) + update_all_directions() + +/datum/component/team_monitor/proc/hide_hud(mob/target) + updating = null + //Stop processing + STOP_PROCESSING(SSprocessing, src) + //UnRegister parent signal + UnregisterSignal(target, COMSIG_MOVABLE_MOVED) + //Remove our arrows + for(var/key in tracking) + var/atom/movable/screen/arrow = tracking[key] + if(!arrow) + continue + if(target.hud_used) + target.hud_used.team_finder_arrows -= arrow + qdel(arrow) + tracking[key] = null + //Update their hud + if(target.hud_used) + target.hud_used.show_hud(target.hud_used.hud_version, target) + +//=========== +// Handles user interaction +// - Disabling hud transmission +// - Disabling hud view +// - Changing transmission frequency +//=========== + +/datum/component/team_monitor/proc/toggle_hud(new_hud_status, mob/user) + hud_visible = new_hud_status + if(hud_visible && !updating) + show_hud(user) + else if(!hud_visible) + hide_hud(user) + +/datum/component/team_monitor/proc/change_frequency(mob/user) + //Get new frequency + var/new_freq = input(user, "Enter a new frequency (1 - 999):", "Frequency Change", 1) as num|null + if(!new_freq) + to_chat(user, "Invalid frequency. Encrypted tracking HUD disabled.") + return + if(new_freq < 1 || new_freq > 999) + to_chat(user, "Frequency is out of range. Must be between 1 and 999.") + return + set_frequency(new_freq) + to_chat(user, "Tracking HUD now scanning on frequency [team_frequency].") + //Set frequency of the linked beacon + if(attached_beacon) + attached_beacon.set_frequency(new_freq) + +/datum/component/team_monitor/proc/set_frequency(new_frequency) + var/hud_on = hud_visible + var/mob/user = updating + //Remove tracking from old frequency + if(team_frequency) + if(updating) + toggle_hud(FALSE, updating) + //Remove from the global frequency + GLOB.tracker_huds[team_frequency] -= src + //Clear tracking + tracking.Cut() + team_frequency = "[team_freq_key][new_frequency]" + //Add tracking to new frequency + if(!team_frequency) + return + //Adds our tracking component to the global list of trackers + add_tracker_hud(team_frequency, src) + //Gets the other trackers on our frequency + get_matching_beacons() + //Show hud if needed + if(user) + toggle_hud(hud_on, user) + +//Adds a new atom to the tracking monitor, will create a hud element that tracks them +//TODO: Add the screen if already equipped +//Should be the only way atoms are added to the tracking list +/datum/component/team_monitor/proc/add_to_tracking_network(datum/component/tracking_beacon/beacon) + if(beacon != attached_beacon) + if(updating?.hud_used) + var/atom/movable/screen/arrow/arrow = new + arrow.alpha = 240 + arrow.color = beacon.colour + arrow.hud = updating.hud_used + updating.hud_used.team_finder_arrows += arrow + tracking[beacon] = arrow + //Update arrow direction + update_atom_dir(beacon) + //Update their hud + updating.hud_used.show_hud(updating.hud_used.hud_version, updating) + else + tracking[beacon] = null + +//================== +// Component +// - TRACKER COMPONENT +// - HANDLES UPDATING TRACKERS WHEN MOVED +//================== + +/datum/component/tracking_beacon + //The frequency of the team signals we are trackings + var/team_freq_key = "debug" //Key <-- cannot be changed + var/team_frequency = "" //Final compiled: Consists of key then numbers between 1 and 999 + //Are we visible to other trackers? + var/visible = TRUE + //Our colour + var/colour = "#FFFFFF" + //Who are we updating for + var/mob/updating = null + //Do we have an attached monitor? + var/datum/component/team_monitor/attached_monitor + //Should we update when not equipped? + var/always_update = FALSE + //Global signal? + var/global_signal = FALSE + +/datum/component/tracking_beacon/Initialize(_frequency_key, _frequency, _attached_monitor, _visible = TRUE, _colour = "#ffffff", _global = FALSE, _always_update = FALSE) + . = ..() + + //Set vars + colour = _colour + attached_monitor = _attached_monitor + always_update = _always_update + global_signal = _global + + //Set the frequency we are transmitting on + team_freq_key = _frequency_key + if(_global) + team_frequency = "[_frequency_key]-GLOB" + else if(_frequency) + team_frequency = "[_frequency_key][_frequency]" + else + team_frequency = null + + //Add ourselves to the tracking network + add_tracker_beacon(team_frequency, src) + + //Register tracking signal + if(always_update) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/update_position) + else + //Reigster equipping signals + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/parent_equipped) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/parent_dequpped) + + //Set our visibility on the tracking network + toggle_visibility(_visible) + +/datum/component/tracking_beacon/Destroy(force, silent) + //Unregister signals + if(parent) + //Register tracking signal + if(always_update) + UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) + else + UnregisterSignal(parent, COMSIG_ITEM_EQUIPPED) + UnregisterSignal(parent, COMSIG_ITEM_DROPPED) + + //Unregister movement signal + if(updating) + UnregisterSignal(updating, COMSIG_MOVABLE_MOVED) + + //Goodbye, it was a good life + remove_from_huds() + + //Remove from the global network + if(team_frequency) + GLOB.tracker_beacons[team_frequency] -= src + + if(attached_monitor?.attached_beacon == src) + attached_monitor.attached_beacon = null + attached_monitor = null + + . = ..() + +//=========== +// Equip/Dequip transmission handling +//=========== + +//The parent equipped an item with a team_monitor, check if its in the right slot and apply the hud +//Also needs to enable other trackers pointers towards us +/datum/component/tracking_beacon/proc/parent_equipped(datum/source, mob/equipper, slot) + SIGNAL_HANDLER + + var/obj/item/clothing/item = parent + if(!istype(item)) + return + if(item.slot_flags & slot) //Was equipped to a valid slot for this item? + updating = equipper + toggle_visibility(TRUE) + RegisterSignal(updating, COMSIG_MOVABLE_MOVED, .proc/update_position) + else + toggle_visibility(FALSE) + if(updating) + UnregisterSignal(updating, COMSIG_MOVABLE_MOVED) + updating = null + +//Disable our hud +//Disable the pointers to us +/datum/component/tracking_beacon/proc/parent_dequpped(datum/source, mob/user) + SIGNAL_HANDLER + + toggle_visibility(FALSE) + if(updating) + UnregisterSignal(updating, COMSIG_MOVABLE_MOVED) + updating = null + +//=========== +// Visibility Handling +//=========== + +//Toggle visibility +//If visibility is disabled we will hide ourselves from others +/datum/component/tracking_beacon/proc/toggle_visibility(new_vis) + visible = new_vis + //If we are updating toggle our visibility + if((updating || always_update) && visible) + add_to_huds() + else + remove_from_huds() + +//=========== +// Position Updating +//=========== + +/datum/component/tracking_beacon/proc/update_position() + SIGNAL_HANDLER + + //Update everyone tracking us + if(!visible) + return + if(!team_frequency) + return + for(var/datum/component/team_monitor/TM as() in get_all_watchers_on_frequency(team_frequency, team_freq_key, global_signal)) + if(TM != attached_monitor) + TM.update_atom_dir(src) + +//=========== +// Showing on huds +//=========== + +//Remove ourselves from other tracking components +/datum/component/tracking_beacon/proc/remove_from_huds() + if(!team_frequency) + return + for(var/datum/component/team_monitor/team_monitor as() in get_all_watchers_on_frequency(team_frequency, team_freq_key, global_signal)) + //Remove ourselves from the tracking list + var/atom/movable/screen/arrow = team_monitor.tracking[src] + team_monitor.tracking.Remove(src) + //Delete the arrow pointing to use + if(!arrow) + continue + if(team_monitor.updating?.hud_used) + team_monitor.updating.hud_used.team_finder_arrows -= arrow + //Update their hud + team_monitor.updating.hud_used.show_hud(team_monitor.updating.hud_used.hud_version, team_monitor.updating) + qdel(arrow) + +//Add ourselves to other tracking components +/datum/component/tracking_beacon/proc/add_to_huds() + //If we are invisibile, dont bother + if(!visible) + return + //Find other trackers and add ourselves to their tracking network + if(!team_frequency) + return + for(var/datum/component/team_monitor/team_monitor as() in get_all_watchers_on_frequency(team_frequency, team_freq_key, global_signal)) + if(team_monitor != attached_monitor) + team_monitor.add_to_tracking_network(src) + +//=========== +// Handles user interaction +// - Disabling hud transmission +// - Disabling hud view +// - Changing transmission frequency +//=========== + +/datum/component/tracking_beacon/proc/change_frequency(mob/user) + //Get new frequency + var/new_freq = input(user, "Enter a new frequency (1 - 999):", "Frequency Change", 1) as num|null + if(!new_freq) + to_chat(user, "Invalid frequency. Encrypted tracking beacon disabled.") + return + if(new_freq < 1 || new_freq > 999) + to_chat(user, "Frequency is out of range. Must be between 1 and 999.") + return + set_frequency(new_freq) + to_chat(user, "Tracking HUD now transmitting on frequency [team_frequency].") + //Set frequency of the linked tracker + if(attached_monitor) + attached_monitor.set_frequency(new_freq) + +/datum/component/tracking_beacon/proc/set_frequency(new_frequency) + //Remove tracking from old frequency + if(team_frequency) + //Disable the beacon on other trackers + toggle_visibility(FALSE) + //Remove from the global frequency + GLOB.tracker_beacons[team_frequency] -= src + team_frequency = "[team_freq_key][new_frequency]" + //Add tracking to new frequency + if(!team_frequency) + return + //Adds our tracking component to the global list of trackers + add_tracker_beacon(team_frequency, src) + //Set our visibility on the tracking network + toggle_visibility(visible) + +//======= +// Generic Arrow, No special effects +//======= + +/atom/movable/screen/arrow + icon = 'icons/mob/hud.dmi' + icon_state = "hud_arrow" + screen_loc = ui_team_finder + +#undef ALT_APPEARENCE_ID diff --git a/code/datums/components/tether.dm b/code/datums/components/tether.dm index faa6182208afc..a458db2f25717 100644 --- a/code/datums/components/tether.dm +++ b/code/datums/components/tether.dm @@ -17,6 +17,8 @@ RegisterSignal(parent, list(COMSIG_MOVABLE_PRE_MOVE), .proc/checkTether) /datum/component/tether/proc/checkTether(mob/mover, newloc) + SIGNAL_HANDLER + if (get_dist(mover,newloc) > max_dist) to_chat(mover, "The [tether_name] runs out of slack and prevents you from moving!") return COMPONENT_MOVABLE_BLOCK_PRE_MOVE diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm index f3d95bfd4cb65..e0f7bcea1509f 100644 --- a/code/datums/components/thermite.dm +++ b/code/datums/components/thermite.dm @@ -52,13 +52,13 @@ master.cut_overlay(overlay) return ..() -/datum/component/thermite/InheritComponent(datum/component/thermite/newC, i_am_original, list/arguments) +/datum/component/thermite/InheritComponent(datum/component/thermite/newC, i_am_original, _amount) if(!i_am_original) return if(newC) amount += newC.amount else - amount += arguments[1] + amount += _amount /datum/component/thermite/proc/thermite_melt(mob/user) var/turf/master = parent @@ -80,13 +80,19 @@ qdel(src) /datum/component/thermite/proc/clean_react(datum/source, strength) + SIGNAL_HANDLER + //Thermite is just some loose powder, you could probably clean it with your hands. << todo? qdel(src) /datum/component/thermite/proc/flame_react(datum/source, exposed_temperature, exposed_volume) + SIGNAL_HANDLER + if(exposed_temperature > 1922) // This is roughly the real life requirement to ignite thermite thermite_melt() /datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params) + SIGNAL_HANDLER + if(thing.is_hot()) thermite_melt(user) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm new file mode 100644 index 0000000000000..717c8d5b2abcc --- /dev/null +++ b/code/datums/components/twohanded.dm @@ -0,0 +1,392 @@ +/** + * Two Handed Component + * + * When applied to an item it will make it two handed + * + */ +/datum/component/two_handed + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS // Only one of the component can exist on an item + var/wielded = FALSE /// Are we holding the two handed item properly + var/force_multiplier = 0 /// The multiplier applied to force when wielded, does not work with force_wielded, and force_unwielded + var/force_wielded = 0 /// The force of the item when wielded + var/force_unwielded = 0 /// The force of the item when unwielded + var/block_power_wielded = 0 /// The block power of the item when wielded + var/block_power_unwielded = 0 /// The block power of the item when unwielded + var/wieldsound = FALSE /// Play sound when wielded + var/unwieldsound = FALSE /// Play sound when unwielded + var/attacksound = FALSE /// Play sound on attack when wielded + var/require_twohands = FALSE /// Does it have to be held in both hands + var/icon_wielded = FALSE /// The icon that will be used when wielded + var/obj/item/offhand/offhand_item = null /// Reference to the offhand created for the item + var/sharpened_increase = 0 /// The amount of increase recived from sharpening the item + var/unwield_on_swap /// Allow swapping, unwield on swap + var/auto_wield /// If true wielding will be performed when picked up + var/ignore_attack_self /// If true will not unwield when attacking self. + +/** + * Two Handed component + * + * vars: + * * require_twohands (optional) Does the item need both hands to be carried + * * wieldsound (optional) The sound to play when wielded + * * unwieldsound (optional) The sound to play when unwielded + * * attacksound (optional) The sound to play when wielded and attacking + * * force_multiplier (optional) The force multiplier when wielded, do not use with force_wielded, and force_unwielded + * * force_wielded (optional) The force setting when the item is wielded, do not use with force_multiplier + * * force_unwielded (optional) The force setting when the item is unwielded, do not use with force_multiplier + * * icon_wielded (optional) The icon to be used when wielded + * * unwield_on_swap (optional) Allow swapping, unwield on swap + * * auto_wield (optional) If true wielding will be performed when picked up + */ +/datum/component/two_handed/Initialize(require_twohands=FALSE, wieldsound=FALSE, unwieldsound=FALSE, attacksound=FALSE, \ + force_multiplier=0, force_wielded=0, force_unwielded=0, block_power_wielded=0, \ + block_power_unwielded=0, icon_wielded=FALSE, \ + unwield_on_swap = FALSE, auto_wield = FALSE, ignore_attack_self = FALSE) + if(!isitem(parent)) + return COMPONENT_INCOMPATIBLE + + src.require_twohands = require_twohands + src.wieldsound = wieldsound + src.unwieldsound = unwieldsound + src.attacksound = attacksound + src.force_multiplier = force_multiplier + src.force_wielded = force_wielded + src.force_unwielded = force_unwielded + src.block_power_wielded = block_power_wielded + src.block_power_unwielded = block_power_unwielded + src.icon_wielded = icon_wielded + src.unwield_on_swap = unwield_on_swap + src.auto_wield = auto_wield + src.ignore_attack_self = ignore_attack_self + + if(require_twohands) + ADD_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS, ABSTRACT_ITEM_TRAIT) + +// Inherit the new values passed to the component +#define ISWIELDED(O) (SEND_SIGNAL(O, COMSIG_ITEM_CHECK_WIELDED) & COMPONENT_IS_WIELDED) + +/datum/component/two_handed/InheritComponent(datum/component/two_handed/new_comp, original, require_twohands, wieldsound, unwieldsound, \ + force_multiplier, force_wielded, force_unwielded, block_power_wielded, block_power_unwielded, icon_wielded, \ + unwield_on_swap, auto_wield, ignore_attack_self) + if(!original) + return + if(require_twohands) + src.require_twohands = require_twohands + if(wieldsound) + src.wieldsound = wieldsound + if(unwieldsound) + src.unwieldsound = unwieldsound + if(attacksound) + src.attacksound = attacksound + if(force_multiplier) + src.force_multiplier = force_multiplier + if(force_wielded) + src.force_wielded = force_wielded + if(force_unwielded) + src.force_unwielded = force_unwielded + if(block_power_wielded) + src.block_power_wielded = block_power_wielded + if(block_power_unwielded) + src.block_power_unwielded = block_power_unwielded + if(icon_wielded) + src.icon_wielded = icon_wielded + if(unwield_on_swap) + src.unwield_on_swap = unwield_on_swap + if(auto_wield) + src.auto_wield = auto_wield + if(ignore_attack_self) + src.ignore_attack_self = ignore_attack_self + +// register signals withthe parent item +/datum/component/two_handed/RegisterWithParent() + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, .proc/on_update_icon) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, .proc/on_sharpen) + RegisterSignal(parent, COMSIG_ITEM_CHECK_WIELDED, .proc/get_wielded) + +// Remove all siginals registered to the parent item +/datum/component/two_handed/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, + COMSIG_ITEM_DROPPED, + COMSIG_ITEM_ATTACK_SELF, + COMSIG_ITEM_ATTACK, + COMSIG_ATOM_UPDATE_ICON, + COMSIG_MOVABLE_MOVED, + COMSIG_ITEM_SHARPEN_ACT, + COMSIG_ITEM_CHECK_WIELDED,)) + +/// Triggered on equip of the item containing the component +/datum/component/two_handed/proc/on_equip(datum/source, mob/user, slot) + SIGNAL_HANDLER + + if(auto_wield) + if(slot == ITEM_SLOT_HANDS) + RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands) + else + UnregisterSignal(user, COMSIG_MOB_SWAP_HANDS) + if((auto_wield || require_twohands) && slot == ITEM_SLOT_HANDS) // force equip the item + wield(user) + if(!user.is_holding(parent) && wielded && !require_twohands) + unwield(user) + +/// Triggered on drop of item containing the component +/datum/component/two_handed/proc/on_drop(datum/source, mob/user) + SIGNAL_HANDLER + + if(auto_wield) + UnregisterSignal(user, COMSIG_MOB_SWAP_HANDS) + if(require_twohands) + unwield(user, show_message=TRUE) + if(wielded) + unwield(user) + if(source == offhand_item && !QDELETED(src)) + qdel(src) + +/// Triggered on attack self of the item containing the component +/datum/component/two_handed/proc/on_attack_self(datum/source, mob/user) + SIGNAL_HANDLER + + if(ignore_attack_self) + return + + if(wielded) + unwield(user) + else + wield(user) + +/** + * Wield the two handed item in both hands + * + * vars: + * * user The mob/living/carbon that is wielding the item + */ +/datum/component/two_handed/proc/wield(mob/living/carbon/user, swap_hands = FALSE) + if(wielded) + return + if(ismonkey(user)) + to_chat(user, "It's too heavy for you to wield fully.") + return + if(swap_hands ? user.get_active_held_item() : user.get_inactive_held_item()) + if(require_twohands) + to_chat(user, "[parent] is too cumbersome to carry in one hand!") + user.dropItemToGround(parent, force=TRUE) + else + to_chat(user, "You need your other hand to be empty!") + return + if(user.get_num_arms() < 2) + if(require_twohands) + user.dropItemToGround(parent, force=TRUE) + to_chat(user, "You don't have enough intact hands.") + return + + // wield update status + if(SEND_SIGNAL(parent, COMSIG_TWOHANDED_WIELD, user) & COMPONENT_TWOHANDED_BLOCK_WIELD) + return // blocked wield from item + wielded = TRUE + if(!auto_wield) + RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands) + + // update item stats and name + var/obj/item/parent_item = parent + if(force_multiplier) + parent_item.force *= force_multiplier + else if(force_wielded) + parent_item.force = force_wielded + if(block_power_wielded) + parent_item.block_power = block_power_wielded + if(sharpened_increase) + parent_item.force += sharpened_increase + parent_item.name = "[parent_item.name] (Wielded)" + parent_item.update_icon() + + if(iscyborg(user)) + to_chat(user, "You dedicate your module to [parent].") + else + to_chat(user, "You grab [parent] with both hands.") + + // Play sound if one is set + if(wieldsound) + playsound(parent_item.loc, wieldsound, 50, TRUE) + + // Let's reserve the other hand + offhand_item = new(user) + offhand_item.name = "[parent_item.name] - offhand" + offhand_item.desc = "Your second grip on [parent_item]." + offhand_item.wielded = TRUE + RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, .proc/on_drop) + if(swap_hands) + user.put_in_active_hand(offhand_item) + else + user.put_in_inactive_hand(offhand_item) + +/** + * Unwield the two handed item + * + * vars: + * * user The mob/living/carbon that is unwielding the item + * * show_message (option) show a message to chat on unwield + */ +/datum/component/two_handed/proc/unwield(mob/living/carbon/user, show_message=TRUE) + if(!wielded || !user) + return + + // wield update status + wielded = FALSE + if(!auto_wield) + UnregisterSignal(user, COMSIG_MOB_SWAP_HANDS) + SEND_SIGNAL(parent, COMSIG_TWOHANDED_UNWIELD, user) + + // update item stats + var/obj/item/parent_item = parent + if(sharpened_increase) + parent_item.force -= sharpened_increase + if(force_multiplier) + parent_item.force /= force_multiplier + else if(!isnull(force_unwielded)) + parent_item.force = force_unwielded + if(!isnull(block_power_unwielded)) + parent_item.block_power = block_power_unwielded + + // update the items name to remove the wielded status + var/sf = findtext(parent_item.name, " (Wielded)", -10) // 10 == length(" (Wielded)") + if(sf) + parent_item.name = copytext(parent_item.name, 1, sf) + else + parent_item.name = "[initial(parent_item.name)]" + + // Update icons + parent_item.update_icon() + if(user.get_item_by_slot(ITEM_SLOT_BACK) == parent) + user.update_inv_back() + else + user.update_inv_hands() + + // if the item requires two handed drop the item on unwield + if(require_twohands) + user.dropItemToGround(parent, force=TRUE) + + // Show message if requested + if(show_message) + if(iscyborg(user)) + to_chat(user, "You free up your module.") + else if(require_twohands) + to_chat(user, "You drop [parent].") + else + to_chat(user, "You are now carrying [parent] with one hand.") + + // Play sound if set + if(unwieldsound) + playsound(parent_item.loc, unwieldsound, 50, TRUE) + + // Remove the object in the offhand + if(offhand_item) + UnregisterSignal(offhand_item, COMSIG_ITEM_DROPPED) + qdel(offhand_item) + // Clear any old refrence to an item that should be gone now + offhand_item = null + +/** + * on_attack triggers on attack with the parent item + */ +/datum/component/two_handed/proc/on_attack(obj/item/source, mob/living/target, mob/living/user) + SIGNAL_HANDLER + + if(wielded && attacksound) + var/obj/item/parent_item = parent + playsound(parent_item.loc, attacksound, 50, TRUE) + +/** + * on_update_icon triggers on call to update parent items icon + * + * Updates the icon using icon_wielded if set + */ +/datum/component/two_handed/proc/on_update_icon(datum/source) + SIGNAL_HANDLER + + if(icon_wielded && wielded) + var/obj/item/parent_item = parent + if(parent_item) + parent_item.icon_state = icon_wielded + return COMSIG_ATOM_NO_UPDATE_ICON_STATE + +/** + * on_moved Triggers on item moved + */ +/datum/component/two_handed/proc/on_moved(datum/source, mob/user, dir) + SIGNAL_HANDLER + + unwield(user) + +/** + * on_swap_hands Triggers on swapping hands, blocks swap if the other hand is busy + */ +/datum/component/two_handed/proc/on_swap_hands(mob/user, obj/item/held_item) + SIGNAL_HANDLER + + if(!held_item) + //We are swapping to our two handed object. + if(auto_wield) + wield(user, TRUE) + return + if(held_item == parent) + if(unwield_on_swap) + unwield(user, FALSE) + else + return COMPONENT_BLOCK_SWAP + +/** + * on_sharpen Triggers on usage of a sharpening stone on the item + */ +/datum/component/two_handed/proc/on_sharpen(obj/item/item, amount, max_amount) + SIGNAL_HANDLER + + if(!item) + return COMPONENT_BLOCK_SHARPEN_BLOCKED + if(sharpened_increase) + return COMPONENT_BLOCK_SHARPEN_ALREADY + var/wielded_val = 0 + if(force_multiplier) + var/obj/item/parent_item = parent + if(wielded) + wielded_val = parent_item.force + else + wielded_val = parent_item.force * force_multiplier + else + wielded_val = force_wielded + if(wielded_val > max_amount) + return COMPONENT_BLOCK_SHARPEN_MAXED + sharpened_increase = min(amount, (max_amount - wielded_val)) + return COMPONENT_BLOCK_SHARPEN_APPLIED + +/datum/component/two_handed/proc/get_wielded(obj/item/source) + SIGNAL_HANDLER + + if(wielded) + return COMPONENT_IS_WIELDED + else + return 0 + +/** + * The offhand dummy item for two handed items + * + */ +/obj/item/offhand + name = "offhand" + icon_state = "offhand" + w_class = WEIGHT_CLASS_HUGE + item_flags = ABSTRACT + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + var/wielded = FALSE // Off Hand tracking of wielded status + +/obj/item/offhand/Destroy() + wielded = FALSE + return ..() + +/obj/item/offhand/equipped(mob/user, slot) + . = ..() + if(wielded && !user.is_holding(src) && !QDELETED(src)) + qdel(src) diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index 2688898e27044..dab99e3d0f1fd 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -94,6 +94,8 @@ uplink_items = get_uplink_items(gamemode, TRUE, allow_restricted) /datum/component/uplink/proc/OnAttackBy(datum/source, obj/item/I, mob/user) + SIGNAL_HANDLER + if(!active) return //no hitting everyone/everything just to try to slot tcs in! if(istype(I, /obj/item/stack/telecrystal)) @@ -103,7 +105,16 @@ var/datum/uplink_item/UI = uplink_items[category][item] var/path = UI.refund_path || UI.item var/cost = UI.refund_amount || UI.cost - if(I.type == path && UI.refundable && I.check_uplink_validity()) + //Check that the uplink items path is right + //Check that the uplink item is refundable + //Check that the uplink is valid + //Check that the uplink has purchased this item (Sales can be refunded as the path relates to the old one) + var/hash = purchase_log.hash_purchase(UI, UI.cost) + var/datum/uplink_purchase_entry/UPE = purchase_log.purchase_log[hash] + if(I.type == path && UI.refundable && I.check_uplink_validity() && UPE?.amount_purchased > 0 && UPE.allow_refund) + UPE.amount_purchased -- + if(!UPE.amount_purchased) + purchase_log.purchase_log.Remove(hash) telecrystals += cost purchase_log.total_spent -= cost to_chat(user, "[I] refunded.") @@ -111,13 +122,15 @@ return /datum/component/uplink/proc/interact(datum/source, mob/user) + SIGNAL_HANDLER + if(locked) return if(!non_traitor_allowed && !user.mind.special_role) return active = TRUE if(user) - ui_interact(user) + INVOKE_ASYNC(src, .proc/ui_interact, user) // an unlocked uplink blocks also opening the PDA or headset menu return COMPONENT_NO_INTERACT @@ -227,25 +240,35 @@ // Implant signal responses /datum/component/uplink/proc/implant_activation() + SIGNAL_HANDLER + var/obj/item/implant/implant = parent locked = FALSE interact(null, implant.imp_in) /datum/component/uplink/proc/implanting(datum/source, list/arguments) + SIGNAL_HANDLER + var/mob/user = arguments[2] owner = "[user.key]" /datum/component/uplink/proc/old_implant(datum/source, list/arguments, obj/item/implant/new_implant) + SIGNAL_HANDLER + // It kinda has to be weird like this until implants are components return SEND_SIGNAL(new_implant, COMSIG_IMPLANT_EXISTING_UPLINK, src) /datum/component/uplink/proc/new_implant(datum/source, datum/component/uplink/uplink) + SIGNAL_HANDLER + uplink.telecrystals += telecrystals return COMPONENT_DELETE_NEW_IMPLANT // PDA signal responses /datum/component/uplink/proc/new_ringtone(datum/source, mob/living/user, new_ring_text) + SIGNAL_HANDLER + var/obj/item/pda/master = parent if(trim(lowertext(new_ring_text)) != trim(lowertext(unlock_code))) if(failsafe_code && trim(lowertext(new_ring_text)) == trim(lowertext(failsafe_code))) @@ -262,6 +285,8 @@ // Radio signal responses /datum/component/uplink/proc/new_frequency(datum/source, list/arguments) + SIGNAL_HANDLER + var/obj/item/radio/master = parent var/frequency = arguments[1] if(frequency != unlock_code) @@ -275,6 +300,8 @@ // Pen signal responses /datum/component/uplink/proc/pen_rotation(datum/source, degrees, mob/living/carbon/user) + SIGNAL_HANDLER + var/obj/item/pen/master = parent previous_attempts += degrees if(length(previous_attempts) > PEN_ROTATIONS) diff --git a/code/datums/components/waddling.dm b/code/datums/components/waddling.dm index 47ca60c8a19c6..f9a6b69eceffd 100644 --- a/code/datums/components/waddling.dm +++ b/code/datums/components/waddling.dm @@ -11,12 +11,16 @@ RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Waddle) /datum/component/waddling/proc/LivingWaddle() + SIGNAL_HANDLER + var/mob/living/L = parent if(L.incapacitated() || !(L.mobility_flags & MOBILITY_STAND)) return Waddle() /datum/component/waddling/proc/Waddle() + SIGNAL_HANDLER + animate(parent, pixel_z = 4, time = 0) animate(pixel_z = 0, transform = turn(matrix(), pick(-12, 0, 12)), time=2) animate(pixel_z = 0, transform = matrix(), time = 0) diff --git a/code/datums/components/wearertargeting.dm b/code/datums/components/wearertargeting.dm index 4760757701fe7..cbfec78d11f2c 100644 --- a/code/datums/components/wearertargeting.dm +++ b/code/datums/components/wearertargeting.dm @@ -13,10 +13,14 @@ RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) /datum/component/wearertargeting/proc/on_equip(datum/source, mob/equipper, slot) + SIGNAL_HANDLER + if((slot in valid_slots) && istype(equipper, mobtype)) RegisterSignal(equipper, signals, proctype, TRUE) else UnregisterSignal(equipper, signals) /datum/component/wearertargeting/proc/on_drop(datum/source, mob/user) + SIGNAL_HANDLER + UnregisterSignal(user, signals) diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm index be7d8f1290f37..366598940148d 100644 --- a/code/datums/components/wet_floor.dm +++ b/code/datums/components/wet_floor.dm @@ -12,9 +12,9 @@ var/permanent = FALSE var/last_process = 0 -/datum/component/wet_floor/InheritComponent(datum/newcomp, orig, argslist) +/datum/component/wet_floor/InheritComponent(datum/newcomp, orig, strength, duration_minimum, duration_add, duration_maximum, _permanent) if(!newcomp) //We are getting passed the arguments of a would-be new component, but not a new component - add_wet(arglist(argslist)) + add_wet(arglist(args.Copy(3))) else //We are being passed in a full blown component var/datum/component/wet_floor/WF = newcomp //Lets make an assumption if(WF.gc()) //See if it's even valid, still. Also does LAZYLEN and stuff for us. @@ -87,6 +87,9 @@ if(TURF_WET_PERMAFROST) intensity = 120 lube_flags = SLIDE_ICE | GALOSHES_DONT_HELP + if(TURF_WET_SUPERLUBE) + intensity = 120 + lube_flags = SLIDE | GALOSHES_DONT_HELP | SLIP_WHEN_CRAWLING else qdel(parent.GetComponent(/datum/component/slippery)) return @@ -94,6 +97,8 @@ parent.LoadComponent(/datum/component/slippery, intensity, lube_flags, CALLBACK(src, .proc/AfterSlip)) /datum/component/wet_floor/proc/dry(datum/source, strength = TURF_WET_WATER, immediate = FALSE, duration_decrease = INFINITY) + SIGNAL_HANDLER + for(var/i in time_left_list) if(text2num(i) <= strength) time_left_list[i] = max(0, time_left_list[i] - duration_decrease) @@ -134,6 +139,8 @@ highest_strength = max(highest_strength, text2num(i)) /datum/component/wet_floor/proc/is_wet() + SIGNAL_HANDLER + . = 0 for(var/i in time_left_list) . |= text2num(i) @@ -156,7 +163,7 @@ //NB it's possible we get deleted after this, due to inherit /datum/component/wet_floor/proc/add_wet(type, duration_minimum = 0, duration_add = 0, duration_maximum = MAXIMUM_WET_TIME, _permanent = FALSE) - var/static/list/allowed_types = list(TURF_WET_WATER, TURF_WET_LUBE, TURF_WET_ICE, TURF_WET_PERMAFROST) + var/static/list/allowed_types = list(TURF_WET_WATER, TURF_WET_LUBE, TURF_WET_ICE, TURF_WET_PERMAFROST, TURF_WET_SUPERLUBE) if(duration_minimum <= 0 || !type) return FALSE if(type in allowed_types) diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm index b0a4f41765821..8c8639d1383b1 100644 --- a/code/datums/dash_weapon.dm +++ b/code/datums/dash_weapon.dm @@ -6,7 +6,6 @@ var/current_charges = 1 var/max_charges = 1 var/charge_rate = 250 - var/mob/living/carbon/human/holder var/obj/item/dashing_item var/dash_sound = 'sound/magic/blink.ogg' var/recharge_sound = 'sound/magic/charge.ogg' @@ -17,7 +16,10 @@ /datum/action/innate/dash/Grant(mob/user, obj/dasher) . = ..() dashing_item = dasher - holder = user + +/datum/action/innate/dash/Destroy() + dashing_item = null + return ..() /datum/action/innate/dash/IsAvailable() if(current_charges > 0) @@ -26,25 +28,27 @@ return FALSE /datum/action/innate/dash/Activate() - dashing_item.attack_self(holder) //Used to toggle dash behavior in the dashing item + dashing_item.attack_self(owner) //Used to toggle dash behavior in the dashing item /datum/action/innate/dash/proc/Teleport(mob/user, atom/target) if(!IsAvailable()) return var/turf/T = get_turf(target) - if(target in view(user.client.view, user)) + if(user in viewers(user.client.view, T)) var/obj/spot1 = new phaseout(get_turf(user), user.dir) - user.forceMove(T) - playsound(T, dash_sound, 25, 1) - var/obj/spot2 = new phasein(get_turf(user), user.dir) - spot1.Beam(spot2,beam_effect,time=20) - current_charges-- - holder.update_action_buttons_icon() - addtimer(CALLBACK(src, .proc/charge), charge_rate) + if(do_teleport(user, T, channel = TELEPORT_CHANNEL_FREE, no_effects = TRUE)) + playsound(T, dash_sound, 25, 1) + var/obj/spot2 = new phasein(get_turf(user), user.dir) + spot1.Beam(spot2,beam_effect,time=20) + current_charges-- + owner.update_action_buttons_icon() + addtimer(CALLBACK(src, .proc/charge), charge_rate) + else + to_chat(user, "You cannot dash here!") /datum/action/innate/dash/proc/charge() current_charges = CLAMP(current_charges + 1, 0, max_charges) - holder.update_action_buttons_icon() + owner.update_action_buttons_icon() if(recharge_sound) playsound(dashing_item, recharge_sound, 50, 1) - to_chat(holder, "[src] now has [current_charges]/[max_charges] charges.") + to_chat(owner, "[src] now has [current_charges]/[max_charges] charges.") diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 7445e6ffbf0cc..66a6b8b5f586a 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -1,4 +1,3 @@ - /datum/datacore var/medical[] = list() var/medicalPrintCount = 0 @@ -75,38 +74,56 @@ D.adjust_money(amount) return -/datum/datacore/proc/addMinorCrime(id = "", datum/data/crime/crime) +/** + * Adds crime to security record. + * + * Is used to add single crime to someone's security record. + * Arguments: + * * id - record id. + * * datum/data/crime/crime - premade array containing every variable, usually created by createCrimeEntry. + */ +/datum/datacore/proc/addCrime(id = "", datum/data/crime/crime) for(var/datum/data/record/R in security) if(R.fields["id"] == id) - var/list/crimes = R.fields["mi_crim"] + var/list/crimes = R.fields["crim"] crimes |= crime return -/datum/datacore/proc/removeMinorCrime(id, cDataId) +/** + * Deletes crime from security record. + * + * Is used to delete single crime to someone's security record. + * Arguments: + * * id - record id. + * * cDataId - id of already existing crime. + */ +/datum/datacore/proc/removeCrime(id, cDataId) for(var/datum/data/record/R in security) if(R.fields["id"] == id) - var/list/crimes = R.fields["mi_crim"] + var/list/crimes = R.fields["crim"] for(var/datum/data/crime/crime in crimes) if(crime.dataId == text2num(cDataId)) crimes -= crime return -/datum/datacore/proc/removeMajorCrime(id, cDataId) +/** + * Adds details to a crime. + * + * Is used to add or replace details to already existing crime. + * Arguments: + * * id - record id. + * * cDataId - id of already existing crime. + * * details - data you want to add. + */ +/datum/datacore/proc/addCrimeDetails(id, cDataId, details) for(var/datum/data/record/R in security) if(R.fields["id"] == id) - var/list/crimes = R.fields["ma_crim"] + var/list/crimes = R.fields["crim"] for(var/datum/data/crime/crime in crimes) if(crime.dataId == text2num(cDataId)) - crimes -= crime + crime.crimeDetails = details return -/datum/datacore/proc/addMajorCrime(id = "", datum/data/crime/crime) - for(var/datum/data/record/R in security) - if(R.fields["id"] == id) - var/list/crimes = R.fields["ma_crim"] - crimes |= crime - return - /datum/datacore/proc/manifest() for(var/i in GLOB.new_player_list) var/mob/dead/new_player/N = i @@ -130,7 +147,7 @@ "Medical" = GLOB.medical_positions, "Science" = GLOB.science_positions, "Supply" = GLOB.supply_positions, - "Civilian" = GLOB.civilian_positions, + "Civilian" = GLOB.civilian_positions | GLOB.gimmick_positions, "Silicon" = GLOB.nonhuman_positions ) for(var/datum/data/record/t in GLOB.data_core.general) @@ -147,7 +164,8 @@ "rank" = rank )) has_department = TRUE - break + if(department != "Command") //List heads in both command and their own department. + break if(!has_department) if(!manifest_out["Misc"]) manifest_out["Misc"] = list() @@ -155,7 +173,12 @@ "name" = name, "rank" = rank )) - return manifest_out + //Sort the list by 'departments' primarily so command is on top. + var/list/sorted_out = list() + for(var/department in (departments += "Misc")) + if(!isnull(manifest_out[department])) + sorted_out[department] = manifest_out[department] + return sorted_out /datum/datacore/proc/get_manifest_html(monochrome = FALSE) var/list/manifest = get_manifest() @@ -253,8 +276,7 @@ S.fields["name"] = H.real_name S.fields["criminal"] = "None" S.fields["citation"] = list() - S.fields["mi_crim"] = list() - S.fields["ma_crim"] = list() + S.fields["crim"] = list() S.fields["notes"] = "No notes." security += S diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 2ce49061abc2e..20cc783694c57 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -35,6 +35,15 @@ /// A weak reference to another datum var/datum/weakref/weak_reference + /* + * Lazy associative list of currently active cooldowns. + * + * cooldowns [ COOLDOWN_INDEX ] = add_timer() + * add_timer() returns the truthy value of -1 when not stoppable, and else a truthy numeric index + */ + var/list/cooldowns + + #ifdef TESTING var/running_find_references var/last_find_references = 0 @@ -44,6 +53,14 @@ var/list/cached_vars #endif +/** + * Topic signals + */ + +/datum/Topic(href, href_list[]) + ..() + SEND_SIGNAL(src, COMSIG_TOPIC, usr, href_list) + /** * Default implementation of clean-up code. * @@ -197,3 +214,33 @@ qdel(D) else return returned +/** + * Callback called by a timer to end an associative-list-indexed cooldown. + * + * Arguments: + * * source - datum storing the cooldown + * * index - string index storing the cooldown on the cooldowns associative list + * + * This sends a signal reporting the cooldown end. + */ +/proc/end_cooldown(datum/source, index) + if(QDELETED(source)) + return + SEND_SIGNAL(source, COMSIG_CD_STOP(index)) + TIMER_COOLDOWN_END(source, index) + + +/** + * Proc used by stoppable timers to end a cooldown before the time has ran out. + * + * Arguments: + * * source - datum storing the cooldown + * * index - string index storing the cooldown on the cooldowns associative list + * + * This sends a signal reporting the cooldown end, passing the time left as an argument. + */ +/proc/reset_cooldown(datum/source, index) + if(QDELETED(source)) + return + SEND_SIGNAL(source, COMSIG_CD_RESET(index), S_TIMER_COOLDOWN_TIMELEFT(source, index)) + TIMER_COOLDOWN_END(source, index) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 3bcd831b6c974..a91549ab4ce24 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -29,7 +29,11 @@ VV_DROPDOWN_OPTION(VV_HK_MARK, "Mark Object") VV_DROPDOWN_OPTION(VV_HK_DELETE, "Delete") VV_DROPDOWN_OPTION(VV_HK_EXPOSE, "Show VV To Player") + VV_DROPDOWN_OPTION(VV_HK_ADDCOMPONENT, "Add Component/Element") VV_DROPDOWN_OPTION(VV_HK_MODIFY_TRAITS, "Modify Traits") + #ifdef REFERENCE_TRACKING + VV_DROPDOWN_OPTION(VV_HK_VIEW_REFERENCES, "View References") + #endif //This proc is only called if everything topic-wise is verified. The only verifications that should happen here is things like permission checks! //href_list is a reference, modifying it in these procs WILL change the rest of the proc in topic.dm of admin/view_variables! @@ -37,10 +41,8 @@ /datum/proc/vv_do_topic(list/href_list) if(!usr || !usr.client || !usr.client.holder || !check_rights(NONE)) return FALSE //This is VV, not to be called by anything else. - /* This was ported from /TG/, modify traits isn't a thing here. Keeping in case it becomes a thing. if(href_list[VV_HK_MODIFY_TRAITS]) usr.client.holder.modify_traits(src) - */ return TRUE /datum/proc/vv_get_header() diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 00a8850dfb322..e164228994c00 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -79,8 +79,8 @@ if(isobj(H.wear_suit)) Cl = H.wear_suit passed = prob((Cl.permeability_coefficient*100) - 1) - if(passed && isobj(SLOT_W_UNIFORM)) - Cl = SLOT_W_UNIFORM + if(passed && isobj(ITEM_SLOT_ICLOTHING)) + Cl = ITEM_SLOT_ICLOTHING passed = prob((Cl.permeability_coefficient*100) - 1) if(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM) if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS) @@ -149,4 +149,4 @@ return !is_mouth_covered() /mob/living/carbon/CanSpreadAirborneDisease() - return !((head && (head.flags_cover & HEADCOVERSMOUTH) && (head.armor.getRating("bio") >= 25)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && (wear_mask.armor.getRating("bio") >= 25))) + return !((head && (head.flags_cover & HEADCOVERSMOUTH) && (head.get_armor_rating("bio", src) >= 25)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && (wear_mask.get_armor_rating("bio", src) >= 25))) diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index d8724491e6467..b85c3eaed100b 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -1,7 +1,7 @@ /datum/disease //Flags var/visibility_flags = 0 - var/disease_flags = CURABLE|CAN_CARRY|CAN_RESIST + var/disease_flags = CURABLE | CAN_CARRY | CAN_RESIST var/spread_flags = DISEASE_SPREAD_AIRBORNE | DISEASE_SPREAD_CONTACT_FLUIDS | DISEASE_SPREAD_CONTACT_SKIN //Fluff @@ -26,7 +26,7 @@ var/carrier = FALSE //If our host is only a carrier var/bypasses_immunity = FALSE //Does it skip species virus immunity check? Some things may diseases and not viruses var/permeability_mod = 1 - var/severity = DISEASE_SEVERITY_NONTHREAT + var/danger = DISEASE_NONTHREAT var/list/required_organs = list() var/needs_all_cures = TRUE var/list/strain_data = list() //dna_spread special bullshit @@ -65,6 +65,10 @@ /datum/disease/proc/stage_act() var/cure = has_cure() + var/mob/living/L = affected_mob + if(L.IsInStasis()) + return + if(carrier && !cure) return @@ -113,7 +117,7 @@ var/turf/T = affected_mob.loc if(istype(T)) - for(var/mob/living/carbon/C in oview(spread_range, affected_mob)) + for(var/mob/living/carbon/C in ohearers(spread_range, affected_mob)) var/turf/V = get_turf(C) if(disease_air_spread_walk(T, V)) C.AirborneContractDisease(src, force_spread) @@ -146,7 +150,7 @@ //note that stage is not copied over - the copy starts over at stage 1 var/static/list/copy_vars = list("name", "visibility_flags", "disease_flags", "spread_flags", "form", "desc", "agent", "spread_text", "cure_text", "max_stages", "stage_prob", "viable_mobtypes", "cures", "infectivity", "cure_chance", - "bypasses_immunity", "permeability_mod", "severity", "required_organs", "needs_all_cures", "strain_data", + "bypasses_immunity", "permeability_mod", "danger", "required_organs", "needs_all_cures", "strain_data", "infectable_biotypes", "process_dead") var/datum/disease/D = copy_type ? new copy_type() : new type() @@ -171,26 +175,26 @@ affected_mob = null //Use this to compare severities -/proc/get_disease_severity_value(severity) - switch(severity) - if(DISEASE_SEVERITY_BENEFICIAL) +/proc/get_disease_danger_value(danger) + switch(danger) + if(DISEASE_BENEFICIAL) return 1 - if(DISEASE_SEVERITY_POSITIVE) + if(DISEASE_POSITIVE) return 2 - if(DISEASE_SEVERITY_NONTHREAT) + if(DISEASE_NONTHREAT) return 3 - if(DISEASE_SEVERITY_MINOR) + if(DISEASE_MINOR) return 4 - if(DISEASE_SEVERITY_MEDIUM) + if(DISEASE_MEDIUM) return 5 - if(DISEASE_SEVERITY_HARMFUL) + if(DISEASE_HARMFUL) return 6 - if(DISEASE_SEVERITY_DANGEROUS) + if(DISEASE_DANGEROUS) return 7 - if(DISEASE_SEVERITY_BIOHAZARD) + if(DISEASE_BIOHAZARD) return 8 - if(DISEASE_SEVERITY_PANDEMIC) + if(DISEASE_PANDEMIC) return 9 /datum/disease/proc/speechModification(message) - return message \ No newline at end of file + return message diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 6e2ff6468dfeb..313e2dc333b62 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -25,8 +25,12 @@ spread_text = "Unknown" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/monkey/tumor) - // NEW VARS - var/list/properties = list() + var/resistance + var/stealth + var/stage_rate + var/transmission + var/severity + var/speed var/list/symptoms = list() // The symptoms of the disease. var/id = "" var/processing = FALSE @@ -35,8 +39,8 @@ var/sentient = FALSE //used to classify if a disease is sentient var/faltered = FALSE //used if a disease has been made non-contagious // The order goes from easy to cure to hard to cure. - var/static/list/advance_cures = list( - /datum/reagent/water, /datum/reagent/consumable/ethanol, /datum/reagent/consumable/sodiumchloride, + var/static/list/advance_cures = list( + /datum/reagent/water, /datum/reagent/consumable/ethanol, /datum/reagent/consumable/sodiumchloride, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/leporazine, /datum/reagent/concentrated_barbers_aid, /datum/reagent/toxin/lipolicide, /datum/reagent/medicine/haloperidol, /datum/reagent/drug/krokodil @@ -51,13 +55,15 @@ Refresh() /datum/disease/advance/Destroy() - SEND_SIGNAL(affected_mob, COMSIG_DISEASE_END, GetDiseaseID()) + if(affected_mob) + SEND_SIGNAL(affected_mob, COMSIG_DISEASE_END, GetDiseaseID()) + UnregisterSignal(affected_mob, COMSIG_MOB_DEATH) if(processing) for(var/datum/symptom/S in symptoms) S.End(src) return ..() -/datum/disease/advance/try_infect(var/mob/living/infectee, make_copy = TRUE) +/datum/disease/advance/try_infect(mob/living/infectee, make_copy = TRUE) //see if we are more transmittable than enough diseases to replace them //diseases replaced in this way do not confer immunity var/list/advance_diseases = list() @@ -75,13 +81,23 @@ sortTim(advance_diseases, /proc/cmp_advdisease_resistance_asc) for(var/i in 1 to replace_num) var/datum/disease/advance/competition = advance_diseases[i] - if(totalTransmittable() > competition.totalResistance()) + if(transmission > competition.resistance) competition.cure(FALSE) else return FALSE //we are not strong enough to bully our way in infect(infectee, make_copy) return TRUE +/datum/disease/advance/after_add() + if(affected_mob) + RegisterSignal(affected_mob, COMSIG_MOB_DEATH, .proc/on_mob_death) + +/datum/disease/advance/proc/on_mob_death() + SIGNAL_HANDLER + + for(var/datum/symptom/S as() in symptoms) + S.OnDeath(src) + // Randomly pick a symptom to activate. /datum/disease/advance/stage_act() ..() @@ -106,13 +122,12 @@ // Compares type then ID. /datum/disease/advance/IsSame(datum/disease/advance/D) - - if(!(istype(D, /datum/disease/advance))) - return 0 + if(!istype(D, /datum/disease/advance)) + return FALSE if(GetDiseaseID() != D.GetDiseaseID()) - return 0 - return 1 + return FALSE + return TRUE // Returns the advance disease with a different reference memory. /datum/disease/advance/Copy() @@ -120,7 +135,12 @@ QDEL_LIST(A.symptoms) for(var/datum/symptom/S in symptoms) A.symptoms += S.Copy() - A.properties = properties.Copy() + A.resistance = resistance + A.stealth = stealth + A.stage_rate = stage_rate + A.transmission = transmission + A.severity = severity + A.speed = speed A.id = id A.mutable = mutable A.faltered = faltered @@ -132,7 +152,7 @@ var/list/name_symptoms = list() for(var/datum/symptom/S in symptoms) name_symptoms += S.name - return "[name] sym:[english_list(name_symptoms)] r:[totalResistance()] s:[totalStealth()] ss:[totalStageSpeed()] t:[totalTransmittable()]" + return "[name] sym:[english_list(name_symptoms)] r:[resistance] s:[stealth] ss:[stage_rate] t:[transmission]" /* @@ -194,45 +214,40 @@ //Generate disease properties based on the effects. Returns an associated list. /datum/disease/advance/proc/GenerateProperties() - properties = list("resistance" = 0, "stealth" = 0, "stage_rate" = 0, "transmittable" = 0, "severity" = 0) - for(var/datum/symptom/S in symptoms) //I can't change the order of the symptom list by severity, so i have to loop through symptoms three times, one for each tier of severity, to keep it consistent - properties["resistance"] += S.resistance - properties["stealth"] += S.stealth - properties["stage_rate"] += S.stage_speed - properties["transmittable"] += S.transmittable - S.severityset(src) - if(!S.neutered && S.severity >= 5) //big severity goes first. This means it can be reduced by beneficials, but won't increase from minor symptoms - properties["severity"] += S.severity - for(var/datum/symptom/S in symptoms) + resistance = 0 + stealth = 0 + stage_rate = 0 + transmission = 0 + severity = 0 + //Why do we need 2 loops here? + //First loop just sets stats and second is purely just to set (and get) symptom severity + for(var/datum/symptom/S as() in symptoms) + resistance += S.resistance + stealth += S.stealth + stage_rate += S.stage_speed + transmission += S.transmission + + for(var/datum/symptom/S as() in symptoms) S.severityset(src) - if(!S.neutered) - switch(S.severity)//these go in the middle. They won't augment large severity diseases, but they can push low ones up to channel 2 - if(1 to 2) - properties["severity"] = max(properties["severity"], min(3, (S.severity + properties["severity"]))) - if(3 to 4) - properties["severity"] = max(properties["severity"], min(4, (S.severity + properties["severity"]))) - for(var/datum/symptom/S in symptoms) //benign and beneficial symptoms go last - S.severityset(src) - if(!S.neutered && S.severity <= 0) - properties["severity"] += S.severity + if(S.neutered) + continue + severity += S.severity // Assign the properties that are in the list. /datum/disease/advance/proc/AssignProperties() - if(properties && properties.len) - if(properties["stealth"] >= 2) - visibility_flags |= HIDDEN_SCANNER - else - visibility_flags &= ~HIDDEN_SCANNER + if(stealth >= 2) + visibility_flags |= HIDDEN_SCANNER + else + visibility_flags &= ~HIDDEN_SCANNER - SetSpread(CLAMP(2 ** (properties["transmittable"] - symptoms.len), DISEASE_SPREAD_BLOOD, DISEASE_SPREAD_AIRBORNE)) + SetSpread(CLAMP(2 ** (transmission - symptoms.len), DISEASE_SPREAD_BLOOD, DISEASE_SPREAD_AIRBORNE)) + + permeability_mod = max(CEILING(0.4 * transmission, 1), 1) + cure_chance = 15 - CLAMP(resistance, -5, 5) // can be between 10 and 20 + stage_prob = max(stage_rate, 2) + SetDanger(severity) + GenerateCure() - permeability_mod = max(CEILING(0.4 * properties["transmittable"], 1), 1) - cure_chance = 15 - CLAMP(properties["resistance"], -5, 5) // can be between 10 and 20 - stage_prob = max(properties["stage_rate"], 2) - SetSeverity(properties["severity"]) - GenerateCure(properties) - else - CRASH("Our properties were empty or null!") // Assign the spread type and give it the correct description. @@ -261,31 +276,31 @@ spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_FLUIDS | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_AIRBORNE spread_text = "Airborne" -/datum/disease/advance/proc/SetSeverity(level_sev) +/datum/disease/advance/proc/SetDanger(level_sev) switch(level_sev) if(-INFINITY to -2) - severity = DISEASE_SEVERITY_BENEFICIAL + danger = DISEASE_BENEFICIAL if(-1) - severity = DISEASE_SEVERITY_POSITIVE + danger = DISEASE_POSITIVE if(0) - severity = DISEASE_SEVERITY_NONTHREAT + danger = DISEASE_NONTHREAT if(1) - severity = DISEASE_SEVERITY_MINOR + danger = DISEASE_MINOR if(2) - severity = DISEASE_SEVERITY_MEDIUM + danger = DISEASE_MEDIUM if(3) - severity = DISEASE_SEVERITY_HARMFUL + danger = DISEASE_HARMFUL if(4) - severity = DISEASE_SEVERITY_DANGEROUS + danger = DISEASE_DANGEROUS if(5) - severity = DISEASE_SEVERITY_BIOHAZARD + danger = DISEASE_BIOHAZARD if(6 to INFINITY) - severity = DISEASE_SEVERITY_PANDEMIC + danger = DISEASE_PANDEMIC else - severity = "Unknown" + danger = "Unknown" /datum/disease/advance/proc/CheckChannel() //i hate that i have to use this to make this work - switch(properties["severity"]) + switch(severity) if(-INFINITY to -2) return 1 if(-1) @@ -309,13 +324,12 @@ // Will generate a random cure, the less resistance the symptoms have, the harder the cure. /datum/disease/advance/proc/GenerateCure() - if(properties && properties.len) - var/res = CLAMP(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) - cures = list(advance_cures[res]) + var/res = CLAMP(resistance - (symptoms.len / 2), 1, advance_cures.len) + cures = list(advance_cures[res]) - // Get the cure name from the cure_id - var/datum/reagent/D = GLOB.chemical_reagents_list[cures[1]] - cure_text = D.name + // Get the cure name from the cure_id + var/datum/reagent/D = GLOB.chemical_reagents_list[cures[1]] + cure_text = D.name // Randomly generate a symptom, has a chance to lose or gain a symptom. /datum/disease/advance/proc/Evolve(min_level, max_level, ignore_mutable = FALSE) @@ -405,7 +419,7 @@ */ // Mix a list of advance diseases and return the mixed result. -/proc/Advance_Mix(var/list/D_list) +/proc/Advance_Mix(list/D_list) var/list/diseases = list() for(var/datum/disease/advance/A in D_list) @@ -496,17 +510,97 @@ log_virus("[key_name(user)] has triggered a custom virus outbreak of [D.admin_details()]!") -/datum/disease/advance/proc/totalStageSpeed() - return properties["stage_rate"] - -/datum/disease/advance/proc/totalStealth() - return properties["stealth"] -/datum/disease/advance/proc/totalResistance() - return properties["resistance"] -/datum/disease/advance/proc/totalTransmittable() - return properties["transmittable"] - -/datum/disease/advance/proc/totalSeverity() - return properties["severity"] +/datum/disease/advance/proc/random_disease_name(var/atom/diseasesource)//generates a name for a disease depending on its symptoms and where it comes from + var/list/prefixes = list("Spacer's ", "Space ", "Infectious ","Viral ", "The ", "[pick(GLOB.first_names)]'s ", "[pick(GLOB.last_names)]'s ", "Acute ")//prefixes that arent tacked to the body need spaces after the word + var/list/bodies = list(pick("[pick(GLOB.first_names)]", "[pick(GLOB.last_names)]"), "Space", "Disease", "Noun", "Cold", "Germ", "Virus") + var/list/suffixes = list("ism", "itis", "osis", "itosis", " #[rand(1,10000)]", "-[rand(1,100)]", "s", "y", " ovirus", " Bug", " Infection", " Disease", " Complex", " Syndrome", " Sickness") //suffixes that arent tacked directly on need spaces before the word + if(stealth >=2) + prefixes += "Crypto " + switch(max(resistance - (symptoms.len / 2), 1)) + if(1) + suffixes += "-alpha" + if(2) + suffixes += "-beta" + if(3) + suffixes += "-gamma" + if(4) + suffixes += "-delta" + if(5) + suffixes += "-epsilon" + if(6) + suffixes += pick("-zeta", "-eta", "-theta", "-iota") + if(7) + suffixes += pick("-kappa", "-lambda") + if(8) + suffixes += pick("-mu", "-nu", "-xi", "-omicron") + if(9) + suffixes += pick("-pi", "-rho", "-sigma", "-tau") + if(10) + suffixes += pick("-upsilon", "-phi", "-chi", "-psi") + if(11 to INFINITY) + suffixes += "-omega" + prefixes += "Robust " + switch(transmission - symptoms.len) + if(-INFINITY to 2) + prefixes += "Bloodborne " + if(3) + prefixes += list("Mucous ", "Kissing ") + if(4) + prefixes += "Contact " + suffixes += " Flu" + if(5 to INFINITY) + prefixes += "Airborne " + suffixes += " Plague" + switch(severity) + if(-INFINITY to 0) + prefixes += "Altruistic " + if(1 to 2) + prefixes += "Benign " + if(3 to 4) + prefixes += "Malignant " + if(5) + prefixes += "Terminal " + bodies += "Death" + if(6 to INFINITY) + prefixes += "Deadly " + bodies += "Death" + if(diseasesource) + if(ishuman(diseasesource)) + var/mob/living/carbon/human/H = diseasesource + prefixes += pick("[H.first_name()]'s", "[H.name]'s", "[H.job]'s", "[H.dna.species]'s") + bodies += pick("[H.first_name()]", "[H.job]", "[H.dna.species]") + if(islizard(H) || iscatperson(H))//add rat-origin prefixes to races that eat rats + prefixes += list("Vermin ", "Zoo", "Maintenance ") + bodies += list("Rat", "Maint") + else switch(diseasesource.type) + if(/mob/living/simple_animal/pet/hamster/vector) + prefixes += list("Vector's ", "Hamster ") + bodies += list("Freebie") + if(/obj/effect/decal/cleanable) + prefixes += list("Bloody ", "Maintenance ") + bodies += list("Maint") + if(/mob/living/simple_animal/mouse) + prefixes += list("Vermin ", "Zoo", "Maintenance ") + bodies += list("Rat", "Maint") + if(/obj/item/reagent_containers/syringe) + prefixes += list("Junkie ", "Maintenance ") + bodies += list("Needle", "Maint") + if(/obj/item/fugu_gland) + prefixes += "Wumbo" + if(/obj/item/organ/lungs) + prefixes += "Miasmic " + bodies += list("Stench", "Lung") + for(var/datum/symptom/Symptom as() in symptoms) + if(!Symptom.neutered) + prefixes += Symptom.prefixes + bodies += Symptom.bodies + suffixes += Symptom.suffixes + switch(rand(1, 3)) + if(1) + return "[pick(prefixes)][pick(bodies)]" + if(2) + return "[pick(prefixes)][pick(bodies)][pick(suffixes)]" + if(3) + return "[pick(bodies)][pick(suffixes)]" \ No newline at end of file diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm index 6e97ac9e73035..0b03a3861b44e 100644 --- a/code/datums/diseases/advance/presets.dm +++ b/code/datums/diseases/advance/presets.dm @@ -23,7 +23,7 @@ var/randomname = TRUE var/datum/symptom/setsymptom = null -/datum/disease/advance/random/New(max_symptoms, max_level = 9, var/datum/symptom/specialsymptom = setsymptom) +/datum/disease/advance/random/New(max_symptoms, max_level = 9, min_level = 1, var/datum/symptom/specialsymptom = setsymptom, var/atom/infected) if(!max_symptoms) max_symptoms = (2 + rand(1, (VIRUS_SYMPTOM_LIMIT-2))) if(specialsymptom) @@ -33,7 +33,7 @@ var/datum/symptom/S = symptom if(S == specialsymptom) continue - if(initial(S.level) > max_level) + if(initial(S.level) > max_level || initial(S.level) < min_level) continue if(initial(S.level) <= 0) //unobtainable symptoms continue @@ -49,7 +49,10 @@ Finalize() Refresh() if(randomname) - name = "Sample #[rand(1,10000)]" + var/randname = random_disease_name(infected) + AssignName(randname) + name = randname + /datum/disease/advance/random/macrophage name = "Unknown Disease" @@ -64,4 +67,4 @@ /datum/disease/advance/random/blob // had to do it this way due to an odd glitch name = "Blob Spores" setsymptom = /datum/symptom/blobspores - randomname = FALSE \ No newline at end of file + randomname = FALSE diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm index 76ce20bbcffa6..359b8284875f4 100644 --- a/code/datums/diseases/advance/symptoms/beard.dm +++ b/code/datums/diseases/advance/symptoms/beard.dm @@ -21,11 +21,13 @@ BONUS stealth = 1 resistance = 3 stage_speed = 3 - transmittable = 1 + transmission = 1 level = 4 severity = 0 symptom_delay_min = 18 symptom_delay_max = 36 + prefixes = list("Facial ") + bodies = list("Beard") var/list/beard_order = list("Beard (Jensen)", "Beard (Full)", "Beard (Dwarf)", "Beard (Very Long)") diff --git a/code/datums/diseases/advance/symptoms/beesymptom.dm b/code/datums/diseases/advance/symptoms/beesymptom.dm index 028dcc56afc11..0714a5ef8bade 100644 --- a/code/datums/diseases/advance/symptoms/beesymptom.dm +++ b/code/datums/diseases/advance/symptoms/beesymptom.dm @@ -4,29 +4,31 @@ stealth = -2 resistance = 2 stage_speed = 1 - transmittable = 1 + transmission = 1 level = 0 severity = 2 symptom_delay_min = 5 symptom_delay_max = 20 var/honey = FALSE var/toxic_bees= FALSE + prefixes = list("Hive ") + bodies = list("Bees", "Hive") threshold_desc = "Resistance 12: The bees become symbiotic with the host, synthesizing honey and no longer stinging the stomach lining, and no longer attacking the host. Bees will also contain honey, unless transmission exceeds 10.
\ Transmission 10: Bees now contain a completely random toxin." /datum/symptom/beesease/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 12) - severity -= 4 - if(A.properties["transmittable"] >= 10) + if(A.transmission >= 10) severity += 2 + if(A.resistance >= 12) + severity -= 4 /datum/symptom/beesease/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 12) + if(A.resistance >= 12) honey = TRUE - if(A.properties["transmittable"] >= 10) + if(A.transmission >= 10) toxic_bees = TRUE /datum/symptom/beesease/Activate(datum/disease/advance/A) @@ -74,6 +76,8 @@ else if(honey) var/mob/living/simple_animal/hostile/poison/bees/newbee = new /mob/living/simple_animal/hostile/poison/bees(M.loc) //Heh, newbee newbee.assign_reagent(GLOB.chemical_reagents_list[/datum/reagent/consumable/honey]) + var/mob/living/simple_animal/hostile/poison/bees/newbee2 = new /mob/living/simple_animal/hostile/poison/bees(M.loc) + newbee2.assign_reagent(GLOB.chemical_reagents_list[/datum/reagent/medicine/insulin]) else new /mob/living/simple_animal/hostile/poison/bees(M.loc) diff --git a/code/datums/diseases/advance/symptoms/blobspores.dm b/code/datums/diseases/advance/symptoms/blobspores.dm index 4da930412411e..fa15f8a94ebf3 100644 --- a/code/datums/diseases/advance/symptoms/blobspores.dm +++ b/code/datums/diseases/advance/symptoms/blobspores.dm @@ -4,9 +4,11 @@ stealth = 1 resistance = 6 stage_speed = -2 - transmittable = 1 + transmission = 1 level = 9 severity = 3 + prefixes = list("Xeno", "Sporing ") + bodies = list("Blob") var/ready_to_pop var/factory_blob var/strong_blob @@ -17,19 +19,19 @@ /datum/symptom/blobspores/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 14) + if(A.resistance >= 14) severity += 1 /datum/symptom/blobspores/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 11) + if(A.resistance >= 11) factory_blob = TRUE - if(A.properties["resistance"] >= 8) + if(A.resistance >= 8) strong_blob = TRUE - if(A.properties["resistance"] >= 14) - node_blob = TRUE + if(A.resistance >= 14) + node_blob = TRUE /datum/symptom/blobspores/Activate(datum/disease/advance/A) if(!..()) @@ -60,10 +62,14 @@ /datum/symptom/blobspores/OnDeath(datum/disease/advance/A) + if(neutered) //Stops this symptom from making people scared even if this is useless + return FALSE var/mob/living/M = A.affected_mob M.visible_message("[M] starts swelling grotesquely!") - sleep(10 SECONDS) - if(!A && !M) + addtimer(CALLBACK(src, .proc/blob_the_mob, A, M), 10 SECONDS) + +/datum/symptom/blobspores/proc/blob_the_mob(datum/disease/advance/A, mob/living/M) + if(!A || !M) return var/list/blob_options = list(/obj/structure/blob/normal) if(factory_blob) @@ -79,9 +85,9 @@ for(var/datum/disease/D in B.disease)//don't let them farm diseases with this and monkeys B.disease -= D B.disease += A//instead, they contain the disease that was in this - if(prob(A.properties["resistance"])) + if(prob(A.resistance)) var/atom/blobbernaut = new /mob/living/simple_animal/hostile/blob/blobbernaut/(M.loc) blobbernaut.add_atom_colour(pick(BLOB_STRAIN_COLOR_LIST), FIXED_COLOUR_PRIORITY) var/atom/blob_tile = new pick_blob(M.loc) - blob_tile.add_atom_colour(pick(BLOB_STRAIN_COLOR_LIST), FIXED_COLOUR_PRIORITY) //A random colour for the blob, as this blob isnt going to get a overmind colour + blob_tile.add_atom_colour(pick(BLOB_STRAIN_COLOR_LIST), FIXED_COLOUR_PRIORITY) //A random colour for the blob, as this blob isn't going to get a overmind colour M.visible_message("A huge mass of blob and blob spores burst out of [M]!") diff --git a/code/datums/diseases/advance/symptoms/braindamage.dm b/code/datums/diseases/advance/symptoms/braindamage.dm index 82f15da1b2a9a..d21852382b78e 100644 --- a/code/datums/diseases/advance/symptoms/braindamage.dm +++ b/code/datums/diseases/advance/symptoms/braindamage.dm @@ -4,11 +4,14 @@ stealth = 1 resistance = -2 stage_speed = -3 - transmittable = -1 + transmission = -1 level = 8 severity = 3 symptom_delay_min = 15 symptom_delay_max = 60 + prefixes = list("Idiot's ") + bodies = list("Idiot") + suffixes = list(" Memory Loss") var/lethal = FALSE var/moretrauma = FALSE threshold_desc = "transmission 12: The disease's damage reaches lethal levels.
\ @@ -16,15 +19,15 @@ /datum/symptom/braindamage/severityset(datum/disease/advance/A) . = ..() - if(A.properties["transmittable"] >= 12) + if(A.transmission >= 12) severity += 1 /datum/symptom/braindamage/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmittable"] >= 12) + if(A.transmission >= 12) lethal = TRUE - if(A.properties["stage_rate"] >= 9) + if(A.stage_rate >= 9) moretrauma = TRUE /datum/symptom/braindamage/Activate(datum/disease/advance/A) @@ -53,5 +56,5 @@ /datum/symptom/braindamage/proc/givetrauma(datum/disease/advance/A, chance) if(prob(chance)) if(ishuman(A.affected_mob)) - var/mob/living/carbon/human/M = A.affected_mob + var/mob/living/carbon/human/M = A.affected_mob M?.gain_trauma(BRAIN_TRAUMA_MILD) diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index 61495b98f8d00..2fa821eb3e352 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -23,28 +23,29 @@ Bonus stealth = -2 resistance = -0 stage_speed = -1 - transmittable = -2 + transmission = -2 level = 9 severity = 5 base_message_chance = 15 symptom_delay_min = 14 symptom_delay_max = 30 + bodies = list("Lung") + suffixes = list(" Tuberculosis") var/paralysis = FALSE threshold_desc = "Stage Speed 8: Additionally synthesizes pancuronium and sodium thiopental inside the host.
\ Transmission 8: Doubles the damage caused by the symptom." /datum/symptom/asphyxiation/severityset(datum/disease/advance/A) . = ..() - if(A.properties["transmittable"] >= 8) + if(A.transmission >= 8) severity += 1 - return..() /datum/symptom/asphyxiation/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 8) + if(A.stage_rate >= 8) paralysis = TRUE - if(A.properties["transmittable"] >= 8) + if(A.transmission >= 8) power = 2 /datum/symptom/asphyxiation/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/clockwork.dm b/code/datums/diseases/advance/symptoms/clockwork.dm index 10e1f2a8dc28a..367c6b25f3b0a 100644 --- a/code/datums/diseases/advance/symptoms/clockwork.dm +++ b/code/datums/diseases/advance/symptoms/clockwork.dm @@ -4,38 +4,43 @@ stealth = 0 resistance = 1 stage_speed = 4 //while the reference material has low speed, this virus will take a good while to completely convert someone - transmittable = -1 + transmission = -1 level = 9 severity = 0 symptom_delay_min = 10 - symptom_delay_max = 60 + symptom_delay_max = 30 + prefixes = list("Ratvarian ", "Keter ", "Clockwork ", "Robo") + bodies = list("Robot") + suffixes = list("-217") var/replaceorgans = FALSE var/replacebody = FALSE var/robustbits = FALSE threshold_desc = "Stage Speed 4:The virus will replace the host's organic organs with mundane, biometallic versions. +1 severity.
\ - Stage Speed 10:The virus will eventually convert the host's entire body to biometallic materials, and maintain its cellular integrity. +1 severity.
\ - Stage Speed 13:Biometallic mass created by the virus will be superior to typical organic mass. -3 severity." + Resistance 4:The virus will eventually convert the host's entire body to biometallic materials, and maintain its cellular integrity. +1 severity.
\ + Stage Speed 12:Biometallic mass created by the virus will be superior to typical organic mass. -3 severity." /datum/symptom/robotic_adaptation/OnAdd(datum/disease/advance/A) A.infectable_biotypes |= MOB_ROBOTIC /datum/symptom/robotic_adaptation/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stage_rate"] >= 5) //at base level, robotic organs are purely a liability + if(A.stage_rate >= 4) //at base level, robotic organs are purely a liability severity += 1 - if(A.properties["stage_rate"] >= 10)//at base level, robotic bodyparts have very few bonuses, mostly being a liability in the case of EMPS + if(A.stage_rate >= 12)//but at this threshold, it all becomes worthwhile, though getting augged is a better choice + severity -= 3//net benefits: 2 damage reduction, flight if you have wings, filter out low amounts of gas, durable ears, flash protection, a liver half as good as an upgraded cyberliver, and flight if you are a winged species + if(A.resistance >= 4)//at base level, robotic bodyparts have very few bonuses, mostly being a liability in the case of EMPS severity += 1 //at this stage, even one EMP will hurt, a lot. - if(A.properties["stage_rate"] >= 13)//but at this threshold, it all becomes worthwhile, though getting augged is a better choice - severity -= 3//net benefits: 2 damage reduction, flight if you have wings, filter out low amounts of gas, durable ears, flash protection, a liver half as good as an upgraded cyberliver, and flight if you are a winged species + /datum/symptom/robotic_adaptation/Start(datum/disease/advance/A) . = ..() - if(A.properties["stage_rate"] >= 4) + if(A.stage_rate >= 4) replaceorgans = TRUE - if(A.properties["stage_rate"] >= 10) - replacebody = TRUE - if(A.properties["stage_rate"] >= 14) - robustbits = TRUE //note that having this symptom means most healing symptoms won't work on you + if(A.stage_rate >= 4) + replacebody = TRUE + if(A.stage_rate >= 12) + robustbits = TRUE //note that having this symptom means most healing symptoms won't work on you + /datum/symptom/robotic_adaptation/Activate(datum/disease/advance/A) if(!..()) @@ -46,100 +51,111 @@ if(replaceorgans) to_chat(H, "[pick("You feel a grinding pain in your abdomen.", "You exhale a jet of steam.")]") if(5) - if(replaceorgans) + if(replaceorgans || replacebody) if(Replace(H)) return - else if(replacebody) - H.adjustCloneLoss(-30) //we're fully mechanical, repair integrity. This symptom has a soft synergy with overclocked pituitary, so we want that to be useable. OFI is obviously out - ADD_TRAIT(H, TRAIT_NANITECOMPATIBLE, DISEASE_TRAIT) + if(replacebody) + H.adjustCloneLoss(-20) //repair mechanical integrity + ADD_TRAIT(H, TRAIT_NANITECOMPATIBLE, DISEASE_TRAIT) return /datum/symptom/robotic_adaptation/proc/Replace(mob/living/carbon/human/H) - for(var/obj/item/organ/O in H.internal_organs) - if(O.status == ORGAN_ROBOTIC) //they are either part robotic or we already converted them! - continue - switch(O.slot) //i hate doing it this way, but the cleaner way runtimes and does not work - if(ORGAN_SLOT_BRAIN) - var/datum/mind/ownermind = H.mind - var/obj/item/organ/brain/clockwork/organ = new() - organ.Insert(H, TRUE, FALSE) - to_chat(H, "Your head throbs with pain for a moment, and then goes numb.") - H.emote("scream") - ownermind.transfer_to(H) - H.grab_ghost() - return TRUE - if(ORGAN_SLOT_STOMACH) - var/obj/item/organ/stomach/clockwork/organ = new() - organ.Insert(H, TRUE, FALSE) - if(prob(40)) - to_chat(H, "You feel a stabbing pain in your abdomen!") - H.emote("scream") - return TRUE - if(ORGAN_SLOT_EARS) - var/obj/item/organ/ears/robot/clockwork/organ = new() - if(robustbits) - organ.damage_multiplier = 0.5 - organ.Insert(H, TRUE, FALSE) - to_chat(H, "Your ears pop.") - return TRUE - if(ORGAN_SLOT_EYES) - var/obj/item/organ/eyes/robotic/clockwork/organ = new() - if(robustbits) - organ.flash_protect = 1 - organ.Insert(H, TRUE, FALSE) - if(prob(40)) - to_chat(H, "You feel a stabbing pain in your eyeballs!") + if(replaceorgans) + for(var/obj/item/organ/O in H.internal_organs) + if(O.status == ORGAN_ROBOTIC) //they are either part robotic or we already converted them! + continue + switch(O.slot) //i hate doing it this way, but the cleaner way runtimes and does not work + if(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/clockwork/organ = new() + var/datum/mind/ownermind = H.mind + if(robustbits) + organ.robust = TRUE //STOPS THAT GODDAMN CLANGING BECAUSE IT'S WELL OILED OR SOMETHING + organ.Insert(H, TRUE, FALSE) + ownermind.transfer_to(H) + to_chat(H, "Your head throbs with pain for a moment, and then goes numb.") H.emote("scream") - return TRUE - if(ORGAN_SLOT_LUNGS) - var/obj/item/organ/lungs/clockwork/organ = new() - if(robustbits) - organ.safe_toxins_max = 15 - organ.safe_co2_max = 15 - organ.SA_para_min = 15 - organ.SA_sleep_min = 15 - organ.BZ_trip_balls_min = 15 - organ.gas_stimulation_min = 15 - organ.Insert(H, TRUE, FALSE) - if(prob(40)) + H.grab_ghost() + return TRUE + if(ORGAN_SLOT_STOMACH) + if(HAS_TRAIT(H, TRAIT_POWERHUNGRY)) + var/obj/item/organ/stomach/battery/clockwork/organ = new() + if(robustbits) + organ.max_charge = 15000 + organ.Insert(H, TRUE, FALSE) + else + var/obj/item/organ/stomach/clockwork/organ = new() + organ.Insert(H, TRUE, FALSE) + if(prob(40)) + to_chat(H, "You feel a stabbing pain in your abdomen!") + H.emote("scream") + return TRUE + if(ORGAN_SLOT_EARS) + var/obj/item/organ/ears/robot/clockwork/organ = new() + if(robustbits) + organ.damage_multiplier = 0.5 + organ.Insert(H, TRUE, FALSE) + to_chat(H, "Your ears pop.") + return TRUE + if(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/robotic/clockwork/organ = new() + if(robustbits) + organ.flash_protect = 1 + organ.Insert(H, TRUE, FALSE) + if(prob(40)) + to_chat(H, "You feel a stabbing pain in your eyeballs!") + H.emote("scream") + return TRUE + if(ORGAN_SLOT_LUNGS) + var/obj/item/organ/lungs/clockwork/organ = new() + if(robustbits) + organ.gas_max = list( + GAS_PLASMA = 15, + GAS_CO2 = 15, + ) + organ.SA_para_min = 15 + organ.SA_sleep_min = 15 + organ.BZ_trip_balls_min = 15 + organ.gas_stimulation_min = 15 + organ.Insert(H, TRUE, FALSE) + if(prob(40)) + to_chat(H, "You feel a stabbing pain in your chest!") + H.emote("scream") + return TRUE + if(ORGAN_SLOT_HEART) + var/obj/item/organ/heart/clockwork/organ = new() + organ.Insert(H, TRUE, FALSE) to_chat(H, "You feel a stabbing pain in your chest!") H.emote("scream") - return TRUE - if(ORGAN_SLOT_HEART) - var/obj/item/organ/heart/clockwork/organ = new() - organ.Insert(H, TRUE, FALSE) - to_chat(H, "You feel a stabbing pain in your chest!") - H.emote("scream") - return TRUE - if(ORGAN_SLOT_LIVER) - var/obj/item/organ/liver/clockwork/organ = new() - if(robustbits) - organ.toxTolerance = 7 - organ.Insert(H, TRUE, FALSE) - if(prob(40)) - to_chat(H, "You feel a stabbing pain in your abdomen!") - H.emote("scream") - return TRUE - if(ORGAN_SLOT_TONGUE) - if(robustbits) - var/obj/item/organ/tongue/robot/clockwork/better/organ = new() + return TRUE + if(ORGAN_SLOT_LIVER) + var/obj/item/organ/liver/clockwork/organ = new() + if(robustbits) + organ.toxTolerance = 7 + organ.Insert(H, TRUE, FALSE) + if(prob(40)) + to_chat(H, "You feel a stabbing pain in your abdomen!") + H.emote("scream") + return TRUE + if(ORGAN_SLOT_TONGUE) + if(robustbits) + var/obj/item/organ/tongue/robot/clockwork/better/organ = new() + organ.Insert(H, TRUE, FALSE) + return TRUE + else + var/obj/item/organ/tongue/robot/clockwork/organ = new() + organ.Insert(H, TRUE, FALSE) + return TRUE + if(ORGAN_SLOT_TAIL) + var/obj/item/organ/tail/clockwork/organ = new() organ.Insert(H, TRUE, FALSE) return TRUE - else - var/obj/item/organ/tongue/robot/clockwork/organ = new() + if(ORGAN_SLOT_WINGS) + var/obj/item/organ/wings/cybernetic/clockwork/organ = new() + if(robustbits) + organ.flight_level = WINGS_FLYING organ.Insert(H, TRUE, FALSE) + to_chat(H, "Your wings feel stiff.") return TRUE - if(ORGAN_SLOT_TAIL) - var/obj/item/organ/tail/clockwork/organ = new() - organ.Insert(H, TRUE, FALSE) - return TRUE - if(ORGAN_SLOT_WINGS) - var/obj/item/organ/wings/cybernetic/clockwork/organ = new() - if(robustbits) - organ.flight_level = WINGS_FLYING - organ.Insert(H, TRUE, FALSE) - to_chat(H, "Your wings feel stiff.") - return TRUE if(replacebody) for(var/obj/item/bodypart/O in H.bodyparts) if(O.status == BODYPART_ROBOTIC) @@ -147,10 +163,10 @@ O.burn_reduction = max(2, O.burn_reduction) O.brute_reduction = max(3, O.brute_reduction) continue - switch(O.body_zone) + switch(O.body_zone) if(BODY_ZONE_HEAD) var/obj/item/bodypart/head/robot/clockwork/B = new() - if(robustbits) + if(robustbits) B.brute_reduction = 3 //this is just below the amount that lets augs ignore space damage. B.burn_reduction = 2 B.replace_limb(H, TRUE) @@ -233,18 +249,26 @@ /obj/item/organ/stomach/clockwork name = "nutriment refinery" - icon_state = "stomach-clock" desc = "A biomechanical furnace, which turns calories into mechanical energy." - icon_state = "liver-clock" + icon_state = "stomach-clock" status = ORGAN_ROBOTIC organ_flags = ORGAN_SYNTHETIC -/obj/item/organ/stomach/cell/emp_act(severity) - owner.nutrition -= 100 * severity +/obj/item/organ/stomach/clockwork/emp_act(severity) + owner.adjust_nutrition(-200/severity) + +/obj/item/organ/stomach/battery/clockwork + name = "biometallic flywheel" + desc = "A biomechanical battery which stores mechanical energy." + icon_state = "stomach-clock" + status = ORGAN_ROBOTIC + organ_flags = ORGAN_SYNTHETIC + max_charge = 7500 + charge = 7500 /obj/item/organ/tongue/robot/clockwork name = "dynamic micro-phonograph" - desc = "an old-timey looking device connected to an odd, shifting cylinder." + desc = "An old-timey looking device connected to an odd, shifting cylinder." icon_state = "tongueclock" /obj/item/organ/tongue/robot/clockwork/better @@ -257,10 +281,10 @@ /obj/item/organ/brain/clockwork name = "enigmatic gearbox" desc ="An engineer would call this inconcievable wonder of gears and metal a 'black box'" - icon_state = "posibrain-occupied" + icon_state = "brain-clock" status = ORGAN_ROBOTIC organ_flags = ORGAN_SYNTHETIC - icon_state = "brain-clock" + var/robust //Set to true if the robustbits causes brain replacement. Because holy fuck is the CLANG CLANG CLANG CLANG annoying /obj/item/organ/brain/clockwork/emp_act(severity) switch(severity) @@ -271,13 +295,13 @@ /obj/item/organ/brain/clockwork/on_life() . = ..() - if(prob(25)) + if(prob(5) && !robust) SEND_SOUND(owner, pickweight(list('sound/effects/clock_tick.ogg' = 6, 'sound/effects/smoke.ogg' = 2, 'sound/spookoween/chain_rattling.ogg' = 1, 'sound/ambience/ambiruin3.ogg' = 1))) /obj/item/organ/liver/clockwork name = "biometallic alembic" - icon_state = "liver-c" desc = "A series of small pumps and boilers, designed to facilitate proper metabolism." + icon_state = "liver-clock" organ_flags = ORGAN_SYNTHETIC status = ORGAN_ROBOTIC alcohol_tolerance = 0 @@ -364,4 +388,4 @@ desc = "An odd metal body full of gears and pipes. It still seems alive." icon = 'icons/mob/augmentation/augments_clockwork.dmi' brute_reduction = 0 - burn_reduction = 0 \ No newline at end of file + burn_reduction = 0 diff --git a/code/datums/diseases/advance/symptoms/cockroach.dm b/code/datums/diseases/advance/symptoms/cockroach.dm index c922c69e7312d..018ed1993919d 100644 --- a/code/datums/diseases/advance/symptoms/cockroach.dm +++ b/code/datums/diseases/advance/symptoms/cockroach.dm @@ -5,11 +5,13 @@ stealth = 0 resistance = 3 stage_speed = 3 - transmittable = 1 + transmission = 1 level = 0 severity = 0 //rip funy symptom_delay_min = 10 symptom_delay_max = 30 + prefixes = list("Blatto") + bodies = list("Roach") var/death_roaches = FALSE threshold_desc = "Stage Speed 8:Increases roach speed
\ Transmission 8:When the host dies, more roaches spawn
" @@ -17,10 +19,10 @@ /datum/symptom/cockroach/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 8) + if(A.stage_rate >= 8) symptom_delay_min = 5 symptom_delay_max = 15 - if(A.properties["transmittable"] >= 8) + if(A.transmission >= 8) death_roaches = TRUE /datum/symptom/cockroach/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index f5ccef12acd23..dc6777d896b10 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -22,12 +22,14 @@ Bonus stealth = 1 resistance = -1 stage_speed = -3 - transmittable = 0 + transmission = 0 level = 4 severity = 2 base_message_chance = 25 symptom_delay_min = 10 symptom_delay_max = 30 + prefixes = list("Dizzy ") + bodies = list("Ditz") var/brain_damage = FALSE threshold_desc = "Resistance 6: Causes brain damage over time.
\ Transmission 6: Increases confusion duration.
\ @@ -35,17 +37,17 @@ Bonus /datum/symptom/confusion/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 6) + if(A.resistance >= 6) severity += 1 /datum/symptom/confusion/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 6) + if(A.resistance >= 6) brain_damage = TRUE - if(A.properties["transmittable"] >= 6) + if(A.transmission >= 6) power = 1.5 - if(A.properties["stealth"] >= 4) + if(A.stealth >= 4) suppress_warning = TRUE /datum/symptom/confusion/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index c286c7c64809e..cae4806c56f0b 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -22,12 +22,13 @@ BONUS stealth = -1 resistance = 3 stage_speed = 1 - transmittable = 2 + transmission = 2 level = 1 severity = 0 base_message_chance = 15 symptom_delay_min = 2 symptom_delay_max = 15 + bodies = list("Cough") var/infective = FALSE threshold_desc = "Resistance 3: Host will drop small items when coughing.
\ Resistance 10: Occasionally causes coughing fits that stun the host.
\ @@ -37,23 +38,23 @@ BONUS /datum/symptom/cough/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 3) - severity += 1 - if(A.properties["resistance"] >= 10) + if(A.resistance >= 3) severity += 1 + if(A.resistance >= 10) + severity += 1 /datum/symptom/cough/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 4) + if(A.stealth >= 4) suppress_warning = TRUE if(A.spread_flags & DISEASE_SPREAD_AIRBORNE) //infect bystanders infective = TRUE - if(A.properties["resistance"] >= 3) //strong enough to drop items + if(A.resistance >= 3) //strong enough to drop items power = 1.5 - if(A.properties["resistance"] >= 10) //strong enough to stun (rarely) - power = 2 - if(A.properties["stage_rate"] >= 6) //cough more often + if(A.resistance >= 10) //strong enough to stun (rarely) + power = 2 + if(A.stage_rate >= 6) //cough more often symptom_delay_max = 10 /datum/symptom/cough/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index c675287788317..ce45116175068 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -22,26 +22,28 @@ Bonus stealth = -1 resistance = -2 stage_speed = -1 - transmittable = -3 + transmission = -3 level = 4 severity = 2 base_message_chance = 100 symptom_delay_min = 25 symptom_delay_max = 80 + prefixes = list("Aural ") + bodies = list("Ear") threshold_desc = "Resistance 9: Causes permanent deafness, instead of intermittent.
\ Stealth 4: The symptom remains hidden until active." /datum/symptom/deafness/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 9) + if(A.resistance >= 9) severity += 1 /datum/symptom/deafness/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 4) + if(A.stealth >= 4) suppress_warning = TRUE - if(A.properties["resistance"] >= 9) //permanent deafness + if(A.resistance >= 9) //permanent deafness power = 2 /datum/symptom/deafness/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index 0ab44686b22b0..4242cc66a4c88 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -6,7 +6,7 @@ Fever No change to hidden. Increases resistance. Increases stage speed. - Little transmittable. + Little transmission. Low level. Bonus @@ -21,31 +21,35 @@ Bonus stealth = -1 resistance = 3 stage_speed = 3 - transmittable = 2 + transmission = 2 level = 2 severity = 0 base_message_chance = 20 symptom_delay_min = 10 symptom_delay_max = 30 + bodies = list("Fever") + suffixes = list(" Fever") var/unsafe = FALSE //over the heat threshold threshold_desc = "Resistance 5: Increases fever intensity, fever can overheat and harm the host.
\ Resistance 10: Further increases fever intensity." /datum/symptom/fever/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 5) - severity += 1 - if(A.properties["resistance"] >= 10) + if(A.resistance >= 5) severity += 1 + prefixes = list("Desert") + if(A.resistance >= 10) + severity += 1 + prefixes = list("Volcanic") /datum/symptom/fever/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 5) //dangerous fever + if(A.resistance >= 5) //dangerous fever power = 1.5 unsafe = TRUE - if(A.properties["resistance"] >= 10) - power = 2.5 + if(A.resistance >= 10) + power = 2.5 /datum/symptom/fever/Activate(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index fe141596d1fdb..692b78a1f4e16 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -22,12 +22,15 @@ Bonus stealth = 1 resistance = -2 stage_speed = -3 - transmittable = -3 + transmission = -3 level = 6 severity = 4 base_message_chance = 20 symptom_delay_min = 20 symptom_delay_max = 75 + prefixes = list("Burning ") + bodies = list("Combustion") + suffixes = list(" Combustion") var/infective = FALSE threshold_desc = "Stage Speed 4: Increases the intensity of the flames.
\ Stage Speed 8: Further increases flame intensity.
\ @@ -37,13 +40,13 @@ Bonus /datum/symptom/fire/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 4) + if(A.stage_rate >= 4) power = 1.5 - if(A.properties["stage_rate"] >= 8) - power = 2 - if(A.properties["stealth"] >= 4) + if(A.stage_rate >= 8) + power = 2 + if(A.stealth >= 4) suppress_warning = TRUE - if(A.properties["transmittable"] >= 8) //burning skin spreads the virus through smoke + if(A.transmission >= 8) //burning skin spreads the virus through smoke infective = TRUE /datum/symptom/fire/Activate(datum/disease/advance/A) @@ -103,17 +106,20 @@ Bonus /datum/symptom/alkali - name = "Alkali perspiration" + name = "Alkali Perspiration" desc = "The virus attaches to sudoriparous glands, synthesizing a chemical that bursts into flames when reacting with water, leading to self-immolation." stealth = 2 resistance = -2 stage_speed = -2 - transmittable = -2 + transmission = -2 level = 9 severity = 5 base_message_chance = 100 symptom_delay_min = 30 symptom_delay_max = 90 + prefixes = list("Explosive ") + bodies = list("Hellfire") + suffixes = list(" of the Damned") var/chems = FALSE var/explosion_power = 1 threshold_desc = "Resistance 9: Doubles the intensity of the effect, but reduces its frequency.
\ @@ -122,21 +128,19 @@ Bonus /datum/symptom/alkali/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 9) - severity = 6 - if(A.properties["stage_rate"] >= 10) + if(A.resistance >= 9 || A.stage_rate >= 8) severity = 6 /datum/symptom/alkali/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 9) //intense but sporadic effect + if(A.resistance >= 9) //intense but sporadic effect power = 2 symptom_delay_min = 50 symptom_delay_max = 140 - if(A.properties["stage_rate"] >= 8) //serious boom when wet + if(A.stage_rate >= 8) //serious boom when wet explosion_power = 2 - if(A.properties["transmittable"] >= 8) //extra chemicals + if(A.transmission >= 8) //extra chemicals chems = TRUE /datum/symptom/alkali/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 4082bbe75d7ef..a6355765eb18b 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -22,12 +22,14 @@ Bonus stealth = -3 resistance = -4 stage_speed = 0 - transmittable = -4 + transmission = -4 level = 6 severity = 4 base_message_chance = 50 symptom_delay_min = 15 symptom_delay_max = 60 + prefixes = list("Bloody ", "Hemo") + bodies = list("Hemophilia") var/bleed = FALSE var/pain = FALSE threshold_desc = "Resistance 7: Host will bleed profusely during necrosis.
\ @@ -36,9 +38,9 @@ Bonus /datum/symptom/flesh_eating/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 7) //extra bleeding + if(A.resistance >= 7) //extra bleeding bleed = TRUE - if(A.properties["transmittable"] >= 8) //extra stamina damage + if(A.transmission >= 8) //extra stamina damage pain = TRUE /datum/symptom/flesh_eating/Activate(datum/disease/advance/A) @@ -88,25 +90,32 @@ Bonus stealth = -2 resistance = -2 stage_speed = 1 - transmittable = -2 + transmission = -2 level = 9 severity = 5 base_message_chance = 50 symptom_delay_min = 3 symptom_delay_max = 6 + prefixes = list("Necrotic ", "Necro") + suffixes = list(" Rot") var/chems = FALSE var/zombie = FALSE threshold_desc = "Stage Speed 7: Synthesizes Heparin and Lipolicide inside the host, causing increased bleeding and hunger.
\ Stealth 5: The symptom remains hidden until active." +/datum/symptom/flesh_death/severityset(datum/disease/advance/A) + . = ..() + if((A.stealth >= 2) && (A.stage_rate >= 12)) + bodies = list("Zombie") + /datum/symptom/flesh_death/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 5) + if(A.stealth >= 5) suppress_warning = TRUE - if(A.properties["stage_rate"] >= 7) //bleeding and hunger + if(A.stage_rate >= 7) //bleeding and hunger chems = TRUE - if((A.properties["stealth"] >= 2) && (A.properties["stage_rate"] >= 12)) + if((A.stealth >= 2) && (A.stage_rate >= 12)) zombie = TRUE /datum/symptom/flesh_death/Activate(datum/disease/advance/A) @@ -125,7 +134,7 @@ Bonus return if(prob(base_message_chance / 2)) //reduce spam to_chat(M, "[pick("You feel your muscles weakening.", "Some of your skin detaches itself.", "You feel sandy.")]") - + /datum/symptom/flesh_death/proc/Flesh_death(mob/living/M, datum/disease/advance/A) var/get_damage = rand(6,10) if(MOB_UNDEAD in M.mob_biotypes) diff --git a/code/datums/diseases/advance/symptoms/fleshgrowth.dm b/code/datums/diseases/advance/symptoms/fleshgrowth.dm deleted file mode 100644 index 71e7a27232886..0000000000000 --- a/code/datums/diseases/advance/symptoms/fleshgrowth.dm +++ /dev/null @@ -1,232 +0,0 @@ -/datum/symptom/flesh - name = "Exolocomotive Xenomitosis" - desc = "The virus will grow on any surfaces it can, such as the host's skin, or even the ground, should the host remain stationary" - stealth = -2 - resistance = 3 - stage_speed = 3 - transmittable = 1 - level = 9 - severity = 2 - symptom_delay_min = 1 - symptom_delay_max = 1 - var/cachedcolor = null - var/turf/open/currentloc = null - var/cycles = 0 - var/lastcycle = 0 - var/requiredcycles = 0 - var/maxradius = 1 - threshold_desc = "Stage Speed:Influences the time the host must stand still to begin spreading infectious mass.
\ - Stage Speed 6:Infectious mass will patch wounds in the host's flesh, healing their brute damage. Standing on infectious mass heals the host far quicker, and laying down even faster. -3 severity.
\ - Transmission:Influences the maximum spread radius of infectious mass.
\ - Transmission 10:Infectious mass will contain all viruses currently afflicting the host. +1 severity." - -/datum/symptom/flesh/severityset(datum/disease/advance/A) - . = ..() - if(A.properties["stage_rate"] >= 6) - severity -= 3 - if(A.properties["transmittable"] >= 10) - severity += 1 - -/datum/symptom/flesh/Start(datum/disease/advance/A) - . = ..() - requiredcycles = (max(2, round((18 - A.properties["stage_rate"]) / 2))) //14 speed is the highest possible rate of growth - maxradius = (round(A.properties["transmittable"] / 3)) - var/mob/living/M = A.affected_mob - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.dna.species.use_skintones) - cachedcolor = H.skin_tone - else if(MUTCOLORS in H.dna.species.species_traits) - cachedcolor = H.dna.features["mcolor"] - -/datum/symptom/flesh/Activate(datum/disease/advance/A) - if(!..()) - return - var/mob/living/M = A.affected_mob - var/list/diseases = list(A) - var/healfactor = 0 - if(iscarbon(M)) - var/mob/living/carbon/C = M - switch(A.stage) - if(5) - if(currentloc == C.loc) - cycles += 1 - else if(isturf(C.loc) && !isspaceturf(C.loc)) - currentloc = C.loc - cycles = 0 - lastcycle = 0 - var/obj/structure/alien/flesh/W = locate(/obj/structure/alien/flesh) in currentloc - if(W) - healfactor += 1 - if(istype(W, /obj/structure/alien/flesh/node)) - healfactor += 1 - var/obj/structure/alien/flesh/node/node = W - if(round(cycles / requiredcycles) >= lastcycle && node.node_range < maxradius) - node.node_range += 1 - lastcycle += 1 - if(!(C.mobility_flags & MOBILITY_STAND)) - healfactor *= 2 - else if(round(cycles / requiredcycles) >= 1) - if(A.properties["transmittable"] >= 10) - for(var/datum/disease/D in M.diseases) - if((D.spread_flags & DISEASE_SPREAD_SPECIAL) || (D.spread_flags & DISEASE_SPREAD_NON_CONTAGIOUS) || (D.spread_flags & DISEASE_SPREAD_FALTERED)) - continue - if(D == A) - continue - diseases += D - if(maxradius >= 1) - var/obj/structure/alien/flesh/node/N = new(currentloc, diseases) - N.node_range = 0 - else - new /obj/structure/alien/flesh(currentloc, diseases) - C.visible_message("The film on [C]'s skin grows onto the floor!", "The film creeping along your skin secretes onto the floor!") - lastcycle += 1 - if(A.properties["stage_rate"] >= 8) - healfactor += 0.5 - C.heal_overall_damage(healfactor, required_status = BODYPART_ORGANIC)//max passive healing is 4.5, whilst laying down on a node. - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(istype(H.dna.species, /datum/species/zombie/infectious)) - var/datum/species/zombie/infectious/Z = H.dna.species - if(Z.limbs_id == "pinkzombie") - return - else - Z.limbs_id = "pinkzombie" - H.regenerate_icons() - if(H.skin_tone == "pink") - return - else if(H.dna.features["mcolor"] == "D37") - return - if(H.dna.species.use_skintones) - H.skin_tone = "pink" - H.visible_message("A film of pinkish material grows over [H]'s skin!", "Your skin is completely covered by a film of pinkish, fleshy mass!") - H.regenerate_icons() - else if(MUTCOLORS in H.dna.species.species_traits) - H.dna.features["mcolor"] = "D37" //pinkish red - H.visible_message("A film of pinkish material grows over [H]'s skin!", "Your skin is completely covered by a film of pinkish, fleshy mass!") - H.regenerate_icons() - -/datum/symptom/flesh/End(datum/disease/advance/A) - . = ..() - var/mob/living/M = A.affected_mob - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.dna.species.use_skintones) - H.skin_tone = cachedcolor - else if(MUTCOLORS in H.dna.species.species_traits) - H.dna.features["mcolor"] = cachedcolor - H.regenerate_icons() - - -/obj/structure/alien/flesh //this isn't a subtype of alien weeds so it wont heal aliens - gender = PLURAL - name = "infested floor" - desc = "A thick film of flesh covers the floor." - anchored = TRUE - density = FALSE - layer = TURF_LAYER - plane = FLOOR_PLANE - icon_state = "weeds" - max_integrity = 15 - canSmoothWith = list(/obj/structure/alien/flesh, /turf/closed/wall) - smooth = SMOOTH_MORE - var/last_expand = 0 //last world.time this weed expanded - var/growth_cooldown_low = 150 - var/growth_cooldown_high = 200 - var/static/list/blacklisted_turfs - var/list/nodediseases = list() - -/obj/structure/alien/flesh/Initialize(mapload, list/datum/disease/diseases) - pixel_x = -4 - pixel_y = -4 //so the sprites line up right in the map editor - . = ..() - - if(!blacklisted_turfs) //note: if some sort of sanitary floors are added, put them in here - blacklisted_turfs = typecacheof(list( - /turf/open/space, - /turf/open/chasm, - /turf/open/lava)) - - - last_expand = world.time + rand(growth_cooldown_low, growth_cooldown_high) - if(icon == initial(icon)) - switch(rand(1,3)) - if(1) - icon = 'icons/obj/smooth_structures/alien/flesh1.dmi' - if(2) - icon = 'icons/obj/smooth_structures/alien/flesh2.dmi' - if(3) - icon = 'icons/obj/smooth_structures/alien/flesh3.dmi' - if(LAZYLEN(diseases)) - for(var/datum/disease/D in diseases) - nodediseases += D - if(LAZYLEN(nodediseases)) - AddComponent(/datum/component/infective, nodediseases) - -/obj/structure/alien/flesh/examine(mob/user) - . = ..() - if(isliving(user)) - var/mob/living/U = user - for(var/datum/disease/advance/A in U.diseases) - for(var/datum/symptom/S in A.symptoms) - if(istype(S, /datum/symptom/flesh)) - . += "It looks warm and inviting. It would be so wonderful to just lay down in it..." - return - -/obj/structure/alien/flesh/proc/expand() - var/turf/U = get_turf(src) - if(is_type_in_typecache(U, blacklisted_turfs)) - qdel(src) - return FALSE - - for(var/turf/T in U.GetAtmosAdjacentTurfs()) - if(locate(/obj/structure/alien/flesh) in T) - continue - - if(is_type_in_typecache(T, blacklisted_turfs)) - continue - - var/obj/structure/alien/weeds/W = locate(/obj/structure/alien/weeds) in T //we infect and subsume alien weeds and replace them with our own shit - if(W) - if(istype(W, /obj/structure/alien/weeds/node)) - new /obj/structure/alien/flesh/node(T, nodediseases) - continue - else - qdel(W) - new /obj/structure/alien/flesh(T, nodediseases) - return TRUE - -/obj/structure/alien/flesh/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - take_damage(5, BURN, 0, 0) - -//Weed nodes -/obj/structure/alien/flesh/node - name = "putrid infection" - desc = "A sickly red glow emanates from the pustules on this fleshy film." - icon_state = "weednode" - light_color = LIGHT_COLOR_BLOOD_MAGIC //a good, sickly atmosphere - light_power = 0.5 - var/lon_range = 4 - var/node_range = 3 - - -/obj/structure/alien/flesh/node/Initialize() - icon = 'icons/obj/smooth_structures/alien/fleshpolyp.dmi' - . = ..() - set_light(lon_range) - var/obj/structure/alien/W = locate(/obj/structure/alien) in loc //we infect and take over alien resin - if(W && W != src) - qdel(W) - START_PROCESSING(SSobj, src) - -/obj/structure/alien/flesh/node/Destroy() - STOP_PROCESSING(SSobj, src) - return ..() - -/obj/structure/alien/flesh/node/process() - if(node_range) - for(var/obj/structure/alien/flesh/W in range(node_range, src)) - if(W.last_expand <= world.time) - if(W.expand()) - W.last_expand = world.time + rand(growth_cooldown_low, growth_cooldown_high) \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index 0f5d9153780d4..05619706eedfa 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -21,7 +21,7 @@ Bonus stealth = -2 resistance = -3 stage_speed = 0 - transmittable = -3 + transmission = -3 level = 6 severity = 3 var/list/possible_mutations @@ -29,17 +29,16 @@ Bonus base_message_chance = 50 symptom_delay_min = 60 symptom_delay_max = 120 + prefixes = list("Genetic ", "Chromosomal ", "Mutagenic ", "Muta-") + bodies = list("Mutant") var/no_reset = FALSE threshold_desc = "Resistance 8: Causes two harmful mutations at once.
\ Stage Speed 10: Increases mutation frequency.
\ - Stage Speed 14: Mutations will be beneficial.
\ Stealth 5: The mutations persist even if the virus is cured." /datum/symptom/genetic_mutation/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stage_rate"] >= 14) - severity = 0 - else if(A.properties["resistance"] >= 8) + if(A.resistance >= 8) severity += 1 /datum/symptom/genetic_mutation/Activate(datum/disease/advance/A) @@ -59,17 +58,14 @@ Bonus /datum/symptom/genetic_mutation/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 5) //don't restore dna after curing + if(A.stealth >= 5) //don't restore dna after curing no_reset = TRUE - if(A.properties["stage_rate"] >= 10) //mutate more often + if(A.stage_rate >= 10) //mutate more often symptom_delay_min = 20 symptom_delay_max = 60 - if(A.properties["resistance"] >= 8) //mutate twice + if(A.resistance >= 8) //mutate twice power = 2 - if(A.properties["stage_rate"] >= 14) - possible_mutations = (GLOB.good_mutations | GLOB.not_good_mutations) - GLOB.all_mutations[RACEMUT] - else - possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.all_mutations[RACEMUT] + possible_mutations = (GLOB.bad_mutations | GLOB.not_good_mutations) - GLOB.all_mutations[RACEMUT] var/mob/living/carbon/M = A.affected_mob if(M) if(!M.has_dna()) diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index 6782d5195e04a..afce17942a3d5 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -6,7 +6,7 @@ Hallucigen Very noticable. Lowers resistance considerably. Decreases stage speed. - Reduced transmittable. + Reduced transmission. Critical Level. Bonus @@ -21,28 +21,30 @@ Bonus stealth = 1 resistance = -3 stage_speed = -1 - transmittable = -1 + transmission = -1 level = 5 severity = 1 base_message_chance = 25 symptom_delay_min = 10 symptom_delay_max = 70 + prefixes = list("Narcotic ", "Narco", "Psycho-") + suffixes = list(" Psychosis") var/fake_healthy = FALSE threshold_desc = "Stage Speed 7: Increases the amount of hallucinations.
\ Stealth 2: The virus mimics positive symptoms.." /datum/symptom/hallucigen/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stage_rate"] >= 7) + if(A.stage_rate >= 7) severity += 1 /datum/symptom/hallucigen/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 2) //fake good symptom messages + if(A.stealth >= 2) //fake good symptom messages fake_healthy = TRUE base_message_chance = 50 - if(A.properties["stage_rate"] >= 7) //stronger hallucinations + if(A.stage_rate >= 7) //stronger hallucinations power = 2 /datum/symptom/hallucigen/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index ccfbdd1daed9d..b65efdce59e60 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -23,31 +23,32 @@ BONUS stealth = -1 resistance = 4 stage_speed = 2 - transmittable = 0 + transmission = 0 level = 1 severity = 0 base_message_chance = 100 symptom_delay_min = 15 symptom_delay_max = 30 + bodies = list("Skull", "Migraine") threshold_desc = "Stage Speed 6: Headaches will cause severe pain, that weakens the host.
\ Stage Speed 9: Headaches become less frequent but far more intense, preventing any action from the host.
\ Stealth 4: Reduces headache frequency until later stages." /datum/symptom/headache/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stage_rate"] >= 6) - severity += 1 - if(A.properties["stage_rate"] >= 9) + if(A.stage_rate >= 6) severity += 1 + if(A.stage_rate >= 9) + severity += 1 /datum/symptom/headache/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 4) + if(A.stealth >= 4) base_message_chance = 50 - if(A.properties["stage_rate"] >= 6) //severe pain - power = 2 - if(A.properties["stage_rate"] >= 9) //cluster headaches + if(A.stage_rate >= 6) //severe pain + power = 2 + if(A.stage_rate >= 9) //cluster headaches symptom_delay_min = 30 symptom_delay_max = 60 power = 3 @@ -64,4 +65,4 @@ BONUS M.adjustStaminaLoss(25) if(power >= 3 && A.stage >= 5) to_chat(M, "[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]") - M.Stun(35) \ No newline at end of file + M.Stun(35) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 35ca2badf22d7..786601ace4052 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -4,7 +4,7 @@ stealth = 0 resistance = 0 stage_speed = 0 - transmittable = 0 + transmission = 0 level = -1 //not obtainable base_message_chance = 20 //here used for the overlays symptom_delay_min = 1 @@ -16,7 +16,7 @@ /datum/symptom/heal/Start(datum/disease/advance/A) if(!..()) return FALSE - if(A.properties["stage_rate"] >= 6) //stronger healing + if(A.stage_rate >= 6) //stronger healing power = 2 return TRUE //For super calls of subclasses @@ -49,9 +49,10 @@ stealth = 0 resistance = -2 stage_speed = 2 - transmittable = -2 + transmission = -2 level = 7 power = 2 + prefixes = list("Toxo") var/food_conversion = FALSE desc = "The virus rapidly breaks down any foreign chemicals in the bloodstream." threshold_desc = "Resistance 7: Increases chem removal speed.
\ @@ -60,9 +61,9 @@ /datum/symptom/heal/chem/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 6) + if(A.stage_rate >= 6) food_conversion = TRUE - if(A.properties["resistance"] >= 7) + if(A.resistance >= 7) power = 4 /datum/symptom/heal/chem/Heal(mob/living/M, datum/disease/advance/A, actual_power) @@ -80,26 +81,27 @@ stealth = 0 resistance = 2 stage_speed = -3 - transmittable = -3 + transmission = -3 level = 8 severity = -2 passive_message = "The pain from your wounds makes you feel oddly sleepy." + prefixes = list("Sleeping ", "Regenerative ") + suffixes = list(" Coma") var/deathgasp = FALSE var/stabilize = FALSE var/active_coma = FALSE //to prevent multiple coma procs threshold_desc = "Stealth 2: Host appears to die when falling into a coma, triggering symptoms that activate on death.
\ - Resistance 4: The virus also stabilizes the host while they are in critical condition.
\ Stage Speed 7: Increases healing speed." /datum/symptom/heal/coma/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 7) + if(A.stage_rate >= 7) power = 1.5 - if(A.properties["resistance"] >= 4) + if(A.resistance >= 4) stabilize = TRUE - if(A.properties["stealth"] >= 2) + if(A.stealth >= 2) deathgasp = TRUE /datum/symptom/heal/coma/on_stage_change(new_stage, datum/disease/advance/A) //mostly copy+pasted from the code for self-respiration's TRAIT_NOBREATH stuff @@ -133,8 +135,9 @@ /datum/symptom/heal/coma/proc/coma(mob/living/M) if(deathgasp) - M.emote("deathgasp") - M.fakedeath("regenerative_coma") + M.fakedeath(TRAIT_REGEN_COMA) + else + M.Unconscious(300, TRUE, TRUE) M.update_stat() M.update_mobility() addtimer(CALLBACK(src, .proc/uncoma, M), 300) @@ -143,7 +146,10 @@ if(!active_coma) return active_coma = FALSE - M.cure_fakedeath("regenerative_coma") + if(deathgasp) + M.cure_fakedeath(TRAIT_REGEN_COMA) + else + M.SetUnconscious(0) M.update_stat() M.update_mobility() @@ -175,10 +181,11 @@ stealth = -1 resistance = -2 stage_speed = -2 - transmittable = 0 + transmission = 0 severity = -1 level = 6 passive_message = "Your skin tingles." + prefixes = list("Healing ", "Minor ") var/threshhold = 15 var/scarcounter = 0 @@ -188,9 +195,9 @@ /datum/symptom/heal/surface/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 8) //stronger healing + if(A.stage_rate >= 8) //stronger healing power = 2 - if(A.properties["resistance"] >= 10) + if(A.resistance >= 10) threshhold = 30 /datum/symptom/heal/surface/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) @@ -207,7 +214,7 @@ scarcounter++ if(M.getToxLoss() && M.getToxLoss() <= threshhold) - M.adjustToxLoss(-power) + M.adjustToxLoss(-power, FALSE, TRUE) if(healed) if(prob(10)) @@ -226,8 +233,10 @@ stealth = -1 resistance = -2 stage_speed = 2 - transmittable = 1 + transmission = 1 level = 4 + prefixes = list("Metabolic ", "Junkie's ", "Chemical ") + bodies = list("Hunger") var/triple_metabolism = FALSE var/reduced_hunger = FALSE desc = "The virus causes the host's metabolism to accelerate rapidly, making them process chemicals twice as fast,\ @@ -238,9 +247,9 @@ /datum/symptom/heal/metabolism/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 10) + if(A.stage_rate >= 10) triple_metabolism = TRUE - if(A.properties["stealth"] >= 3) + if(A.stealth >= 3) reduced_hunger = TRUE /datum/symptom/heal/metabolism/Heal(mob/living/carbon/C, datum/disease/advance/A, actual_power) @@ -269,11 +278,13 @@ im not even gonna bother with these for the following symptoms. typed em out, co stealth = 0 resistance = -1 stage_speed = -1 - transmittable = -2 + transmission = -2 level = 6 severity = 2 symptom_delay_min = 15 symptom_delay_max = 40 + prefixes = list("Magnetic ", "Electro") + bodies = list("Magnet") var/bigemp = FALSE var/cellheal = FALSE threshold_desc = "Stealth 2: The disease resets cell DNA, quickly curing cell damage and mutations.
\ @@ -281,17 +292,17 @@ im not even gonna bother with these for the following symptoms. typed em out, co /datum/symptom/EMP/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stealth"] >= 2) //if you combine this with pituitary disruption, you have the two most downside-heavy symptoms available + if(A.stealth >= 2) //if you combine this with pituitary disruption, you have the two most downside-heavy symptoms available severity -= 1 - if(A.properties["transmittable"] >= 8) + if(A.transmission >= 8) severity += 1 /datum/symptom/EMP/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 2) + if(A.stealth >= 2) cellheal = TRUE - if(A.properties["transmittable"] >= 8) + if(A.transmission >= 8) bigemp = TRUE /datum/symptom/EMP/Activate(datum/disease/advance/A) @@ -313,15 +324,17 @@ im not even gonna bother with these for the following symptoms. typed em out, co /datum/symptom/sweat name = "Hyperperspiration" - desc = "Causes the host to sweat profusely, leaving small water puddles and extnguishing small fires" + desc = "Causes the host to sweat profusely, leaving small water puddles and extinguishing small fires" stealth = 1 resistance = -1 stage_speed = 0 - transmittable = 1 + transmission = 1 level = 6 severity = 1 symptom_delay_min = 10 symptom_delay_max = 30 + prefixes = list("Sweaty ", "Moist ", "Mister ") + bodies = list("Perspiration") var/bigsweat = FALSE var/toxheal = FALSE var/ammonia = FALSE @@ -331,17 +344,17 @@ im not even gonna bother with these for the following symptoms. typed em out, co /datum/symptom/sweat/severityset(datum/disease/advance/A) . = ..() - if(A.properties["transmittable"] >= 6) + if(A.transmission >= 6) severity -= 1 /datum/symptom/sweat/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmittable"] >= 6) + if(A.transmission >= 6) toxheal = TRUE - if(A.properties["transmittable"] >= 4) + if(A.transmission >= 4) bigsweat = TRUE - if(A.properties["stage_rate"] >= 6) + if(A.stage_rate >= 6) ammonia = TRUE /datum/symptom/sweat/Activate(datum/disease/advance/A) @@ -378,7 +391,7 @@ im not even gonna bother with these for the following symptoms. typed em out, co create_reagents(1000) reagents.add_reagent(/datum/reagent/water, 10) -obj/effect/sweatsplash/proc/splash() +/obj/effect/sweatsplash/proc/splash() chem_splash(loc, 2, list(reagents)) qdel(src) @@ -388,11 +401,13 @@ obj/effect/sweatsplash/proc/splash() stealth = 1 resistance = 2 stage_speed = -2 - transmittable = -3 + transmission = -3 level = 8 severity = 0 symptom_delay_min = 1 symptom_delay_max = 1 + prefixes = list("Quantum ", "Thermal ") + bodies = list("Teleport") var/telethreshold = 15 var/burnheal = FALSE var/turf/open/location_return = null @@ -402,17 +417,17 @@ obj/effect/sweatsplash/proc/splash() /datum/symptom/teleport/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 6) + if(A.resistance >= 6) severity -= 1 - if(A.properties["transmittable"] >= 8) + if(A.transmission >= 8) severity -= 1 /datum/symptom/teleport/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 6) + if(A.resistance >= 6) burnheal = TRUE - if(A.properties["transmittable"] >= 8) + if(A.transmission >= 8) telethreshold = -10 power = 2 @@ -423,14 +438,14 @@ obj/effect/sweatsplash/proc/splash() switch(A.stage) if(4, 5) if(burnheal) - M.heal_overall_damage(0, 1) //no required_status checks here, this does all bodyparts equally + M.heal_overall_damage(0, 1.5) //no required_status checks here, this does all bodyparts equally if(prob(5) && (M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT || M.bodytemperature > BODYTEMP_COLD_DAMAGE_LIMIT)) location_return = get_turf(M) //sets up return point if(prob(50)) to_chat(M, "The lukewarm temperature makes you feel strange!") if(cooldowntimer == 0 && ((M.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT + telethreshold && !HAS_TRAIT(M, TRAIT_RESISTHEAT)) || (M.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT - telethreshold && !HAS_TRAIT(M, TRAIT_RESISTCOLD)) || (burnheal && M.getFireLoss() > 60 + telethreshold))) do_sparks(5,FALSE,M) - to_chat(M, "The change in temperature shocks you back to a previous spacial state!") + to_chat(M, "The change in temperature shocks you back to a previous spatial state!") do_teleport(M, location_return, 0, asoundin = 'sound/effects/phasein.ogg') //Teleports home do_sparks(5,FALSE,M) cooldowntimer = 10 @@ -449,11 +464,13 @@ obj/effect/sweatsplash/proc/splash() stealth = -3 resistance = -2 stage_speed = 1 - transmittable = -2 + transmission = -2 level = 7 severity = 1 symptom_delay_min = 1 symptom_delay_max = 1 + prefixes = list("Blood ", "Meat ", "Flesh ") + bodies = list("Giant") var/current_size = 1 var/tetsuo = FALSE var/bruteheal = FALSE @@ -464,22 +481,22 @@ obj/effect/sweatsplash/proc/splash() /datum/symptom/growth/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stage_rate"] >= 6) + if(A.stage_rate >= 6) severity -= 1 - if(A.properties["stage_rate"] >= 12) - severity += 3 + if(A.stage_rate >= 12) + severity += 3 /datum/symptom/growth/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 6) + if(A.stage_rate >= 6) bruteheal = TRUE - if(A.properties["stage_rate"] >= 12) - tetsuo = TRUE - power = 3 //should make this symptom actually worth it + if(A.stage_rate >= 12) + tetsuo = TRUE + power = 3 //should make this symptom actually worth it var/mob/living/carbon/M = A.affected_mob ownermind = M.mind - sizemult = CLAMP((0.5 + A.properties["stage_rate"] / 10), 1.1, 2.5) + sizemult = CLAMP((0.5 + A.stage_rate / 10), 1.1, 2.5) M.resize = sizemult M.update_transform() @@ -491,16 +508,22 @@ obj/effect/sweatsplash/proc/splash() if(4, 5) if(prob(5) && bruteheal) to_chat(M, "You retch, and a splatter of gore escapes your gullet!") - M.Knockdown(10) + M.Immobilize(5) new /obj/effect/decal/cleanable/blood/(M.loc) playsound(get_turf(M), 'sound/effects/splat.ogg', 50, 1) if(prob(60)) + if(tetsuo && prob(15)) + if(A.affected_mob.job == "Clown") + new /obj/effect/spawner/lootdrop/teratoma/major/clown(M.loc) + if(MOB_ROBOTIC in A.infectable_biotypes) + new /obj/effect/decal/cleanable/robot_debris(M.loc) + new /obj/effect/spawner/lootdrop/teratoma/robot(M.loc) new /obj/effect/spawner/lootdrop/teratoma/minor(M.loc) if(tetsuo) var/list/organcantidates = list() var/list/missing = M.get_missing_limbs() if(prob(35)) - new /obj/effect/gibspawner/human/bodypartless(M.loc) //yes. this is very messy. very, very messy. + new /obj/effect/decal/cleanable/blood/gibs(M.loc) //yes. this is very messy. very, very messy. new /obj/effect/spawner/lootdrop/teratoma/major(M.loc) for(var/obj/item/organ/O in M.loc) if(O.organ_flags & ORGAN_FAILING || O.organ_flags & ORGAN_VITAL) //dont use shitty organs or brains @@ -510,6 +533,10 @@ obj/effect/sweatsplash/proc/splash() organcantidates += O continue organcantidates += O + if(ishuman(M)) + var/mob/living/carbon/human/H = M //To view species + if(!is_species(H, /datum/species/plasmaman)) + O -= /obj/item/organ/lungs/plasmaman //So this disease doesn't eventually kill everyone with lungs if(organcantidates.len) for(var/I in 1 to min(rand(1, 3), organcantidates.len)) var/obj/item/organ/chosen = pick_n_take(organcantidates) @@ -540,8 +567,6 @@ obj/effect/sweatsplash/proc/splash() ownermind.transfer_to(M) M.grab_ghost() break - if(tetsuo && prob(10) && A.affected_mob.job == "Clown") - new /obj/effect/spawner/lootdrop/teratoma/major/clown(M.loc) if(bruteheal) M.heal_overall_damage(2 * power, required_status = BODYPART_ORGANIC) if(prob(11 * power)) @@ -559,6 +584,7 @@ obj/effect/sweatsplash/proc/splash() animate(pixel_z = 0, transform = turn(matrix(), pick(-12, 0, 12)), time=2) //waddle desizing is an issue, because you can game it to use this symptom and become small animate(pixel_z = 0, transform = matrix(), time = 0) //so, instead, we use waddle desizing to desize you from this symptom, instead of a transformation, because it wont shrink you naturally +//they are used for the maintenance spawn, for ling teratoma see changeling\teratoma.dm /obj/effect/mob_spawn/teratomamonkey //spawning these is one of the downsides of overclocking the symptom name = "fleshy mass" desc = "A writhing mass of flesh." @@ -567,15 +593,16 @@ obj/effect/sweatsplash/proc/splash() density = FALSE anchored = FALSE + antagonist_type = /datum/antagonist/teratoma/hugbox mob_type = /mob/living/carbon/monkey/tumor mob_name = "a living tumor" death = FALSE roundstart = FALSE - short_desc = "You are a living tumor. By all accounts, you should not exist." - flavour_text = {" - You are a living teratoma, and your existence is misery. You feel the need to spread woe about the station- but not to kill. - "} use_cooldown = TRUE + show_flavour = FALSE //it's handled by antag datum + short_desc = "You are a living tumor. By all accounts you should not exist." + flavour_text = "Spread misery and chaos upon the station." + important_info = "Avoid killing unprovoked, kill only in self defense!" /obj/effect/mob_spawn/teratomamonkey/Initialize() . = ..() diff --git a/code/datums/diseases/advance/symptoms/heartattack.dm b/code/datums/diseases/advance/symptoms/heartattack.dm index a9645c142cf3b..f798bb473f0eb 100644 --- a/code/datums/diseases/advance/symptoms/heartattack.dm +++ b/code/datums/diseases/advance/symptoms/heartattack.dm @@ -21,26 +21,28 @@ Bonus stealth = 2 resistance = 1 stage_speed = -6 - transmittable = -2 + transmission = -2 level = 9 severity = 5 symptom_delay_min = 1 symptom_delay_max = 1 - var/heartattack = FALSE + prefixes = list("Cardiac ", "Cardio") + bodies = list("Heart") + var/heartattack = FALSE threshold_desc = "Transmission 10: When the victim has a heart attack, their heart will pop right out of their chest, and attack!.
\ Stealth 2: The disease is somewhat less noticable to the host." /datum/symptom/heartattack/severityset(datum/disease/advance/A) . = ..() - if(A.properties["transmittable"] >= 10) + if(A.transmission >= 10) severity += 1 /datum/symptom/heartattack/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmittable"] >= 10) + if(A.transmission >= 10) heartattack = TRUE - if(A.properties["stealth"] >= 2) + if(A.stealth >= 2) suppress_warning = TRUE /datum/symptom/heartattack/Activate(datum/disease/advance/A) @@ -48,7 +50,7 @@ Bonus return var/mob/living/carbon/M = A.affected_mob if(suppress_warning && M.can_heartattack()) - if(prob(2)) + if(prob(2)) to_chat(M, "[pick("Your chest aches.", "You need to sit down.", "You feel out of breath.")]") else if(prob(2) && M.can_heartattack()) to_chat(M, "[pick("Your chest hurts!.", "You feel like your heart skipped a beat!")]") @@ -67,5 +69,5 @@ Bonus qdel(heart) to_chat(M, "Your heart bursts out of your chest! It looks furious!") new /mob/living/simple_animal/hostile/heart(M.loc) - - + + diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index 6dfd1750d8787..dc29e45fcfd8c 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -23,11 +23,13 @@ BONUS stealth = 0 resistance = 3 stage_speed = 3 - transmittable = 1 + transmission = 1 level = 1 severity = 0 symptom_delay_min = 5 symptom_delay_max = 25 + prefixes = list("Irritant ") + bodies = list("Itch") var/scratch = FALSE threshold_desc = "Transmission 6: Increases frequency of itching.
\ Stage Speed 7: The host will scrath itself when itching, causing superficial damage." @@ -35,10 +37,10 @@ BONUS /datum/symptom/itching/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmittable"] >= 6) //itch more often + if(A.transmission >= 6) //itch more often symptom_delay_min = 1 symptom_delay_max = 4 - if(A.properties["stage_rate"] >= 7) //scratch + if(A.stage_rate >= 7) //scratch scratch = TRUE /datum/symptom/itching/Activate(datum/disease/advance/A) @@ -51,4 +53,4 @@ BONUS var/can_scratch = scratch && !M.incapacitated() && get_location_accessible(M, picked_bodypart) M.visible_message("[can_scratch ? "[M] scratches [M.p_their()] [bodypart.name]." : ""]", "Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]") if(can_scratch) - bodypart.receive_damage(0.5) \ No newline at end of file + bodypart.receive_damage(0.5) diff --git a/code/datums/diseases/advance/symptoms/lubefeet.dm b/code/datums/diseases/advance/symptoms/lubefeet.dm index 24e6e38154c56..c253600cb10e8 100644 --- a/code/datums/diseases/advance/symptoms/lubefeet.dm +++ b/code/datums/diseases/advance/symptoms/lubefeet.dm @@ -4,11 +4,13 @@ stealth = 0 resistance = 2 stage_speed = 5 - transmittable = -2 + transmission = -2 level = 9 severity = 2 symptom_delay_min = 1 symptom_delay_max = 3 + prefixes = list("Slippery ", "Lubricated ") + bodies = list("Foot", "Feet") var/morelube = FALSE var/clownshoes = TRUE threshold_desc = "Transmission 10: The host sweats even more profusely, lubing almost every tile they walk over
\ @@ -16,15 +18,15 @@ /datum/symptom/lubefeet/severityset(datum/disease/advance/A) . = ..() - if(A.properties["transmittable"] >= 10) + if(A.transmission >= 10) severity += 1 /datum/symptom/lubefeet/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmittable"] >= 10) + if(A.transmission >= 10) morelube = TRUE - if(A.properties["resistance"] >= 14) + if(A.resistance >= 14) clownshoes = TRUE /datum/symptom/lubefeet/Activate(datum/disease/advance/A) @@ -75,5 +77,5 @@ qdel(M.shoes) var/obj/item/clothing/C = new /obj/item/clothing/shoes/clown_shoes(M) ADD_TRAIT(C, TRAIT_NODROP, DISEASE_TRAIT) - M.equip_to_slot_or_del(C, SLOT_SHOES) + M.equip_to_slot_or_del(C, ITEM_SLOT_FEET) return diff --git a/code/datums/diseases/advance/symptoms/macrophage.dm b/code/datums/diseases/advance/symptoms/macrophage.dm index 1c39badae17f1..3125056ad8989 100644 --- a/code/datums/diseases/advance/symptoms/macrophage.dm +++ b/code/datums/diseases/advance/symptoms/macrophage.dm @@ -4,11 +4,13 @@ stealth = -4 resistance = 1 stage_speed = -2 - transmittable = 2 + transmission = 2 level = 9 severity = 2 symptom_delay_min = 30 symptom_delay_max = 60 + prefixes = list("Ambulant ", "Macro") + bodies = list("Phage") var/gigagerms = FALSE var/netspeed = 0 var/phagecounter = 10 @@ -21,14 +23,14 @@ /datum/symptom/macrophage/severityset(datum/disease/advance/A) . = ..() - if(A.properties["transmittable"] >= 10) + if(A.transmission >= 10) severity += 2 /datum/symptom/macrophage/Start(datum/disease/advance/A) if(!..()) return - netspeed = max(1, (A.properties["stage_rate"])) - if(A.properties["transmittable"] >= 10) + netspeed = max(1, A.stage_rate) + if(A.transmission >= 10) gigagerms = TRUE /datum/symptom/macrophage/Activate(datum/disease/advance/A) @@ -42,7 +44,7 @@ M.visible_message("Lumps form on [M]'s skin!", \ "You cringe in pain as lumps form and move around on your skin!") if(5) - phagecounter -= max(2, A.properties["stage_rate"]) + phagecounter -= max(2, A.stage_rate) if(gigagerms && phagecounter <= 0) //only ever spawn one big germ Burst(A, M, TRUE) phagecounter += 10 @@ -54,25 +56,24 @@ var/mob/living/simple_animal/hostile/macrophage/phage if(gigagerms) phage = new /mob/living/simple_animal/hostile/macrophage/aggro(M.loc) - phage.melee_damage = max(5, A.properties["resistance"]) + phage.melee_damage = max(5, A.resistance) M.apply_damage(rand(10, 20)) playsound(M, 'sound/effects/splat.ogg', 50, 1) M.emote("scream") else phage = new(M.loc) M.apply_damage(rand(1, 7)) - phage.health += A.properties["resistance"] - phage.maxHealth += A.properties["resistance"] + phage.health += A.resistance + phage.maxHealth += A.resistance phage.infections += A phage.basedisease = A - if(A.properties["transmittable"] >= 12) + if(A.transmission >= 12) for(var/datum/disease/D in M.diseases) if((D.spread_flags & DISEASE_SPREAD_SPECIAL) || (D.spread_flags & DISEASE_SPREAD_NON_CONTAGIOUS) || (D.spread_flags & DISEASE_SPREAD_FALTERED)) continue if(D == A) continue phage.infections += D - phage.InitializeSkin() M.visible_message("A strange creature bursts out of [M]!", \ "A slimy creature bursts forth from your flesh!") addtimer(CALLBACK(phage, /mob/living/simple_animal/hostile/macrophage.proc/shrivel), 3000) diff --git a/code/datums/diseases/advance/symptoms/nanites.dm b/code/datums/diseases/advance/symptoms/nanites.dm index 87c4f4f73cf97..39328231454cb 100644 --- a/code/datums/diseases/advance/symptoms/nanites.dm +++ b/code/datums/diseases/advance/symptoms/nanites.dm @@ -4,11 +4,13 @@ stealth = 0 resistance = 2 stage_speed = 2 - transmittable = -1 + transmission = -1 level = 7 severity = 0 symptom_delay_min = 1 symptom_delay_max = 1 + prefixes = list("Nano-") + suffixes = list(" Silicophilia") var/reverse_boost = FALSE threshold_desc = "Transmission 5: Increases the virus' growth rate while nanites are present.
\ Stage Speed 7: Increases the replication boost." @@ -16,9 +18,9 @@ /datum/symptom/nano_boost/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmittable"] >= 5) //reverse boost + if(A.transmission >= 5) //reverse boost reverse_boost = TRUE - if(A.properties["stage_rate"] >= 7) //more nanites + if(A.stage_rate >= 7) //more nanites power = 2 /datum/symptom/nano_boost/Activate(datum/disease/advance/A) @@ -36,18 +38,20 @@ NP.software_error(rand(3, 4)) //activate, deactivate, or trigger the nanites if(A.stage >= 4) M.heal_overall_damage((0.5 * power), (0.5 * power), required_status = BODYPART_ROBOTIC) - + /datum/symptom/nano_destroy name = "Silicolysis" desc = "The virus reacts to nanites in the host's bloodstream by attacking and consuming them. May also cause nanites to go haywire. Damages the host's mechanical limbs" stealth = 0 resistance = 4 stage_speed = -1 - transmittable = 1 + transmission = 1 level = 7 severity = 0 symptom_delay_min = 1 symptom_delay_max = 1 + prefixes = list("Nano-") + suffixes = list(" Silicophobia") var/reverse_boost = FALSE threshold_desc = "Stage Speed 5: Increases the virus' growth rate while nanites are present.
\ Resistance 7: Severely increases the rate at which the nanites are destroyed." @@ -55,9 +59,9 @@ /datum/symptom/nano_destroy/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 5) //reverse boost + if(A.stage_rate >= 5) //reverse boost reverse_boost = TRUE - if(A.properties["resistance"] >= 7) //more nanites + if(A.resistance >= 7) //more nanites power = 3 /datum/symptom/nano_destroy/Activate(datum/disease/advance/A) @@ -76,4 +80,4 @@ else if(prob(2)) NP.software_error() if(A.stage >= 4) - M.take_overall_damage((1 * power), required_status = BODYPART_ROBOTIC) \ No newline at end of file + M.take_overall_damage((1 * power), required_status = BODYPART_ROBOTIC) diff --git a/code/datums/diseases/advance/symptoms/narcolepsy.dm b/code/datums/diseases/advance/symptoms/narcolepsy.dm index 42d939736a8d5..ae56ee278b21a 100644 --- a/code/datums/diseases/advance/symptoms/narcolepsy.dm +++ b/code/datums/diseases/advance/symptoms/narcolepsy.dm @@ -18,11 +18,13 @@ Bonus stealth = 1 resistance = -2 stage_speed = -3 - transmittable = -2 + transmission = -2 level = 6 symptom_delay_min = 10 symptom_delay_max = 30 severity = 2 + prefixes = list("Lazy ", "Yawning ") + bodies = list("Sleep") var/sleep_level = 0 var/sleepy_ticks = 0 var/stamina = FALSE @@ -31,15 +33,15 @@ Bonus /datum/symptom/narcolepsy/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 10) //act more often + if(A.resistance >= 10) //act more often severity += 1 /datum/symptom/narcolepsy/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmittable"] >= 7) //stamina damage + if(A.transmission >= 7) //stamina damage stamina = TRUE - if(A.properties["resistance"] >= 10) //act more often + if(A.resistance >= 10) //act more often symptom_delay_min = 5 symptom_delay_max = 20 diff --git a/code/datums/diseases/advance/symptoms/necropolis.dm b/code/datums/diseases/advance/symptoms/necropolis.dm index 92143539f7cd0..d8828f47d13f2 100644 --- a/code/datums/diseases/advance/symptoms/necropolis.dm +++ b/code/datums/diseases/advance/symptoms/necropolis.dm @@ -4,7 +4,7 @@ stealth = 0 resistance = 3 stage_speed = -10 - transmittable = -3 + transmission = -3 level = 9 base_message_chance = 5 severity = -1 @@ -13,6 +13,8 @@ var/tendrils = FALSE var/chest = FALSE var/fireproof = FALSE + prefixes = list("Lava ", "Lavaland ", "Eldritch ") + bodies = list("Goliath", "Tentacle", "Carapace") threshold_desc = "Stealth 8: Upon death, the host's soul will solidify into an unholy artifact, rendering them utterly unrevivable in the process.
\ Resistance 15: The area near the host roils with paralyzing tendrils.
\ Resistance 20: Host becomes immune to heat, ash, and lava" @@ -22,20 +24,21 @@ /datum/symptom/necroseed/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stealth"] >= 8) + if(A.stealth >= 8) severity += 2 - if(A.properties["resistance"] >= 20) + if(A.resistance >= 20) severity -= 1 /datum/symptom/necroseed/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 15) + if(A.resistance >= 15) tendrils = TRUE - if(A.properties["stealth"] >= 8) + if(A.resistance >= 20) + fireproof = TRUE + if(A.stealth >= 8) chest = TRUE - if(A.properties["resistance"] >= 20) - fireproof = TRUE + /datum/symptom/necroseed/Activate(datum/disease/advance/A) if(!..()) @@ -77,7 +80,7 @@ LAZYCLEARLIST(cached_tentacle_turfs) last_location = loc tentacle_recheck_cooldown = world.time + initial(tentacle_recheck_cooldown) - for(var/turf/open/T in orange(2, loc)) + for(var/turf/open/T in (RANGE_TURFS(1, loc)-loc)) LAZYADD(cached_tentacle_turfs, T) for(var/t in cached_tentacle_turfs) if(isopenturf(t)) @@ -107,18 +110,13 @@ if(!..()) return var/mob/living/M = A.affected_mob - if(chest && A.stage == 5 && M.mind) + if(chest && A.stage >= 5 && M.mind) to_chat(M, "Your soul is ripped from your body!") M.visible_message("An unearthly roar shakes the ground as [M] explodes into a shower of gore, leaving behind an ominous, fleshy chest.") playsound(M.loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1) M.hellbound = TRUE - M.gib() - if(ishuman(M)) //We don't NEED them to be human. However, I want to avoid people making teratoma-farms for necrochests - var/mob/living/carbon/human/H = M - var/S = H.dna.species - if(istype(S, /datum/species/golem) || istype(S, /datum/species/jelly)) //nope. sorry, xenobio. - return - else + addtimer(CALLBACK(M, /mob/proc/gib), 0.5 SECONDS) //we can't gib mob while it's already dying + if(!ishuman(M) || HAS_TRAIT(M, TRAIT_NONECRODISEASE)) //We don't NEED them to be human. However, I want to avoid people making teratoma-farms for necrochests return new /obj/structure/closet/crate/necropolis/tendril(M.loc) diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index fa19acfd0e6bf..009b55ab8a1e0 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -22,14 +22,15 @@ Bonus stealth = 1 resistance = -3 stage_speed = -3 - transmittable = -4 + transmission = -4 severity = -1 level = 6 base_message_chance = 5 symptom_delay_min = 1 symptom_delay_max = 1 + prefixes = list("Breathless ", "Anaerobic ") var/regenerate_blood = FALSE - var/gas_type = /datum/gas/miasma + var/gas_type = GAS_MIASMA var/base_moles = 3 var/emote = "fart" threshold_desc = "Resistance 8: Additionally regenerates lost blood.
" @@ -37,7 +38,7 @@ Bonus /datum/symptom/oxygen/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 8) //blood regeneration + if(A.resistance >= 8) //blood regeneration regenerate_blood = TRUE /datum/symptom/oxygen/Activate(datum/disease/advance/A) @@ -50,7 +51,7 @@ Bonus M.adjustOxyLoss(-7, 0) M.losebreath = max(0, M.losebreath - 4) if(regenerate_blood && M.blood_volume < BLOOD_VOLUME_NORMAL) - M.blood_volume += 1 + M.blood_volume += 8 //it takes 4 seconds to lose one point of bleed_rate. this is exactly sufficient to counter autophageocytosis' Heparin production. Theoretically. if(prob(1) && prob(50)) var/turf/open/T = get_turf(M) if(!istype(T)) @@ -61,7 +62,7 @@ Bonus M.emote(emote) else if(prob(base_message_chance)) - to_chat(M, "[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.", "Something smells rotten", "You feel peckish")]") + to_chat(M, "[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.", "Something smells rotten.", "You feel peckish.")]") return /datum/symptom/oxygen/on_stage_change(new_stage, datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/pierrot.dm b/code/datums/diseases/advance/symptoms/pierrot.dm index fc59f983f0884..431774bfce6c7 100644 --- a/code/datums/diseases/advance/symptoms/pierrot.dm +++ b/code/datums/diseases/advance/symptoms/pierrot.dm @@ -4,7 +4,7 @@ stealth = -1 resistance = 3 stage_speed = 1 - transmittable = 2 + transmission = 2 level = 0 severity = 0 symptom_delay_min = 2 @@ -18,20 +18,22 @@ /datum/symptom/pierrot/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 10) + bodies = list("Clown", "Red-Nose", "[pick(GLOB.clown_names)]") //added here because it doesnt wanna pick in base vars + prefixes = list("Fool's ", "[pick(GLOB.clown_names)]'s ") + if(A.resistance >= 10) severity +=1 - if(A.properties["resistance"] >= 15) - severity += 2 + if(A.resistance >= 15) + severity += 2 /datum/symptom/pierrot/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmission"] >= 10) + if(A.transmission >= 10) honkspread = TRUE - if(A.properties["resistance"] >= 10) + if(A.resistance >= 10) clownmask = TRUE - if(A.properties["resistance"] >= 15) - clumsy = TRUE + if(A.resistance >= 15) + clumsy = TRUE /datum/symptom/pierrot/Activate(datum/disease/advance/A) if(!..()) @@ -72,15 +74,15 @@ var/mob/living/carbon/human/M = A.affected_mob if(istype(M.wear_mask, /obj/item/clothing/mask/gas/clown_hat)) REMOVE_TRAIT(M.wear_mask, TRAIT_NODROP, DISEASE_TRAIT) - + /datum/symptom/pierrot/proc/give_clown_mask(datum/disease/advance/A) if(ishuman(A.affected_mob)) - var/mob/living/carbon/human/M = A.affected_mob + var/mob/living/carbon/human/M = A.affected_mob if(!istype(M.wear_mask, /obj/item/clothing/mask/gas/clown_hat)) if(!M.dropItemToGround(M.wear_mask)) qdel(M.wear_mask) var/obj/item/clothing/C = new /obj/item/clothing/mask/gas/clown_hat(M) ADD_TRAIT(C, TRAIT_NODROP, DISEASE_TRAIT) - M.equip_to_slot_or_del(C, SLOT_WEAR_MASK) + M.equip_to_slot_or_del(C, ITEM_SLOT_MASK) return diff --git a/code/datums/diseases/advance/symptoms/radiation.dm b/code/datums/diseases/advance/symptoms/radiation.dm index c72b460b01816..76c0a11bb7ce9 100644 --- a/code/datums/diseases/advance/symptoms/radiation.dm +++ b/code/datums/diseases/advance/symptoms/radiation.dm @@ -4,24 +4,26 @@ stealth = -1 resistance = 2 stage_speed = -1 - transmittable = 2 + transmission = 2 level = 8 severity = 3 symptom_delay_min = 10 symptom_delay_max = 40 + prefixes = list("Gamma ") + bodies = list("Radiation") var/fastrads = FALSE var/radothers = FALSE threshold_desc = "Speed 8: Host takes radiation damage faster." /datum/symptom/radiation/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stage_rate"] >= 8) + if(A.stage_rate >= 8) severity += 1 /datum/symptom/radiation/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 8) + if(A.stage_rate >= 8) fastrads = TRUE /datum/symptom/radiation/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 7c58044f48b22..d7547d79bd1b7 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -4,11 +4,12 @@ stealth = -1 resistance = -2 stage_speed = 1 - transmittable = -3 + transmission = -3 level = 5 severity = -1 symptom_delay_min = 5 symptom_delay_max = 10 + bodies = list("Neuron") var/purge_alcohol = FALSE var/trauma_heal_mild = FALSE var/trauma_heal_severe = FALSE @@ -19,11 +20,11 @@ /datum/symptom/mind_restoration/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 6) //heal brain damage + if(A.resistance >= 6) //heal brain damage trauma_heal_mild = TRUE - if(A.properties["resistance"] >= 9) //heal severe traumas - trauma_heal_severe = TRUE - if(A.properties["transmittable"] >= 8) //purge alcohol + if(A.resistance >= 9) //heal severe traumas + trauma_heal_severe = TRUE + if(A.transmission >= 8) //purge alcohol purge_alcohol = TRUE /datum/symptom/mind_restoration/Activate(var/datum/disease/advance/A) @@ -69,7 +70,7 @@ stealth = 0 resistance = 1 stage_speed = -2 - transmittable = 2 + transmission = 2 level = 4 severity = -1 base_message_chance = 7 @@ -106,4 +107,4 @@ eyes.applyOrganDamage(-1) else if(prob(base_message_chance)) - to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]") \ No newline at end of file + to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]") diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index 2f0ec1422a429..9a58c4b830c10 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -20,12 +20,13 @@ BONUS stealth = 0 resistance = 3 stage_speed = 2 - transmittable = 2 + transmission = 2 level = 4 severity = 0 base_message_chance = 50 symptom_delay_min = 45 symptom_delay_max = 90 + bodies = list("Bald", "Scalp") /datum/symptom/shedding/Activate(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index e546d46403690..895f1d2e73070 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -21,30 +21,32 @@ Bonus stealth = 0 resistance = 2 stage_speed = 2 - transmittable = 2 + transmission = 2 level = 2 severity = 0 symptom_delay_min = 10 symptom_delay_max = 30 + bodies = list("Shiver") + suffixes = list(" Shivers") var/unsafe = FALSE //over the cold threshold threshold_desc = "Stage Speed 5: Increases cooling speed; the host can fall below safe temperature levels.
\ Stage Speed 10: Further increases cooling speed." /datum/symptom/shivering/severityset(datum/disease/advance/A) . = ..() - if(A.properties["stage_rate"] >= 5) //dangerous cold - severity += 1 - if(A.properties["stage_rate"] >= 10) + if(A.stage_rate >= 5) //dangerous cold severity += 1 + if(A.stage_rate >= 10) + severity += 1 /datum/symptom/shivering/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stage_rate"] >= 5) //dangerous cold + if(A.stage_rate >= 5) //dangerous cold power = 1.5 unsafe = TRUE - if(A.properties["stage_rate"] >= 10) - power = 2.5 + if(A.stage_rate >= 10) + power = 2.5 /datum/symptom/shivering/Activate(datum/disease/advance/A) if(!..()) @@ -63,4 +65,4 @@ Bonus if(unsafe) limit = 0 M.adjust_bodytemperature(-get_cold * A.stage, limit) - return 1 \ No newline at end of file + return 1 diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index 2a9cd4c3792f9..ff3e7310e7e46 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -21,11 +21,13 @@ BONUS stealth = 2 resistance = 0 stage_speed = 3 - transmittable = 1 + transmission = 1 level = 5 severity = 0 symptom_delay_min = 25 symptom_delay_max = 75 + prefixes = list("White ", "Light ") + bodies = list("Albinism") var/cachedcolor = null /datum/symptom/vitiligo/Start(datum/disease/advance/A) @@ -91,11 +93,13 @@ BONUS stealth = 1 resistance = 2 stage_speed = 1 - transmittable = 2 + transmission = 2 level = 5 severity = 0 symptom_delay_min = 7 symptom_delay_max = 14 + prefixes = list("Black ", "Dark ") + bodies = list("Melanism") var/cachedcolor = null /datum/symptom/revitiligo/Start(datum/disease/advance/A) @@ -161,12 +165,14 @@ BONUS stealth = 0 resistance = 1 stage_speed = 4 - transmittable = 1 + transmission = 1 level = 0 severity = 0 base_message_chance = 50 symptom_delay_min = 45 symptom_delay_max = 90 + prefixes = list("Rainbow ", "Chromatic ") + bodies = list("Pigment") /datum/symptom/polyvitiligo/Activate(datum/disease/advance/A) if(!..()) @@ -181,3 +187,149 @@ BONUS else if (prob(50)) // spam M.visible_message("[M] looks rather vibrant.", "The colors, man, the colors.") + +/************************************ +Dermagraphic Ovulogenesis + + Extremely Noticeable + Increases resistance slightly. + Not Fast, Not Slow + Transmittable. + High Level + +BONUS + Provides Brute Healing when Egg Sacs/Eggs are eaten, simultaneously infecting anyone who eats them + +***********************************/ +/datum/symptom/skineggs //Thought Exolocomotive Xenomitosis was a weird symptom? Well, this is about 10x weirder. + name = "Dermagraphic Ovulogenesis" + desc = "The virus causes the host to grow egg-like nodules on their skin, which periodically fall off and contain the disease and some healing chemicals." + stealth = -3 //You are basically growing these weird Egg shits on your skin, this is not stealthy in the slightest + resistance = 1 + stage_speed = 0 + transmission = 2 //The symptom is in it of itself meant to spread + level = 9 + severity = -1 + base_message_chance = 50 + symptom_delay_min = 60 + symptom_delay_max = 105 + prefixes = list("Ovi ") + bodies = list("Oviposition", "Nodule") + suffixes = list(" Mitosis") + var/big_heal + var/all_disease + var/eggsplosion + var/sneaky + threshold_desc = "Transmission 12: Eggs and Egg Sacs contain all diseases on the host, instead of just the disease containing the symptom.
\ + Transmission 16: Egg Sacs will 'explode' into eggs after a period of time, covering a larger area with infectious matter.
\ + Resistance 10: Eggs and Egg Sacs contain more healing chems.
\ + Stealth 6: Eggs and Egg Sacs become nearly transparent, making them more difficult to see.
\ + Stage Speed 10: Egg Sacs fall off the host more frequently." + +/datum/symptom/skineggs/severityset(datum/disease/advance/A) + . = ..() + if(A.resistance >= 10) + severity -= 1 + if(A.transmission >= 12) + severity += 1 + if(A.transmission >= 16) + severity += 1 + if(A.stealth >= 6) + severity += 1 + +/datum/symptom/skineggs/Start(datum/disease/advance/A) + if(!..()) + return + if(A.resistance >= 10) + big_heal = TRUE + if(A.transmission >= 12) + all_disease = TRUE + if(A.transmission >= 16) + eggsplosion = TRUE //Haha get it? + if(A.stealth >= 6) + sneaky = TRUE + if(A.stage_rate >= 10) + symptom_delay_min -= 10 + symptom_delay_max -= 20 + + +/datum/symptom/skineggs/Activate(datum/disease/advance/A) + if(!..()) + return + var/mob/living/M = A.affected_mob + var/list/diseases = list(A) + switch(A.stage) + if(5) + if(all_disease) + for(var/datum/disease/D in M.diseases) + if((D.spread_flags & DISEASE_SPREAD_SPECIAL) || (D.spread_flags & DISEASE_SPREAD_NON_CONTAGIOUS) || (D.spread_flags & DISEASE_SPREAD_FALTERED)) + continue + if(D == A) + continue + diseases += D + new /obj/item/reagent_containers/food/snacks/eggsac(M.loc, diseases, eggsplosion, sneaky, big_heal) + +#define EGGSPLODE_DELAY 100 SECONDS +/obj/item/reagent_containers/food/snacks/eggsac + name = "Fleshy Egg Sac" + desc = "A small Egg Sac which appears to be made out of someone's flesh!" + customfoodfilling = FALSE //Not Used For Filling + icon = 'icons/obj/food/food.dmi' + icon_state = "eggsac" + bitesize = 4 + var/list/diseases = list() + var/sneaky_egg + var/big_heal + +//Constructor +/obj/item/reagent_containers/food/snacks/eggsac/New(loc, var/list/disease, var/eggsplodes, var/sneaky, var/large_heal) + ..() + for(var/datum/disease/D in disease) + diseases += D + if(large_heal) + reagents.add_reagent_list(list(/datum/reagent/medicine/bicaridine = 20, /datum/reagent/medicine/tricordrazine = 10)) + reagents.add_reagent(/datum/reagent/blood, 10, diseases) + big_heal = TRUE + else + reagents.add_reagent_list(list(/datum/reagent/medicine/bicaridine = 10, /datum/reagent/medicine/tricordrazine = 10)) + reagents.add_reagent(/datum/reagent/blood, 15, diseases) + if(sneaky) + icon_state = "eggsac-sneaky" + sneaky_egg = sneaky + if(eggsplodes) + addtimer(CALLBACK(src, .proc/eggsplode), EGGSPLODE_DELAY) + if(LAZYLEN(diseases)) + AddComponent(/datum/component/infective, diseases) + +#undef EGGSPLODE_DELAY + +/obj/item/reagent_containers/food/snacks/eggsac/proc/eggsplode() + for(var/i = 1, i <= rand(4,8), i++) + var/list/directions = GLOB.alldirs + var/obj/item/I = new /obj/item/reagent_containers/food/snacks/fleshegg(src.loc, diseases, sneaky_egg, big_heal) + var/turf/thrown_at = get_ranged_target_turf(I, pick(directions), rand(2, 4)) + I.throw_at(thrown_at, rand(2,4), 4) + +/obj/item/reagent_containers/food/snacks/fleshegg + name = "Fleshy Egg" + desc = "An Egg which appears to be made out of someone's flesh!" + customfoodfilling = FALSE //Not Used For Filling + icon = 'icons/obj/food/food.dmi' + icon_state = "fleshegg" + bitesize = 1 + var/list/diseases = list() + +/obj/item/reagent_containers/food/snacks/fleshegg/New(loc, var/list/disease, var/sneaky, var/large_heal) + ..() + for(var/datum/disease/D in disease) + diseases += D + if(large_heal) + reagents.add_reagent_list(list(/datum/reagent/medicine/bicaridine = 20, /datum/reagent/medicine/tricordrazine = 10)) + reagents.add_reagent(/datum/reagent/blood, 10, diseases) + else + reagents.add_reagent_list(list(/datum/reagent/medicine/bicaridine = 10, /datum/reagent/medicine/tricordrazine = 10)) + reagents.add_reagent(/datum/reagent/blood, 15, diseases) + if(sneaky) + icon_state = "fleshegg-sneaky" + if(LAZYLEN(diseases)) + AddComponent(/datum/component/infective, diseases) diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm index 4773b85386441..cbb12c3176f29 100644 --- a/code/datums/diseases/advance/symptoms/sneeze.dm +++ b/code/datums/diseases/advance/symptoms/sneeze.dm @@ -21,17 +21,19 @@ Bonus stealth = -2 resistance = 3 stage_speed = 0 - transmittable = 4 + transmission = 4 level = 1 severity = 0 symptom_delay_min = 5 symptom_delay_max = 35 + prefixes = list("Nasal ") + bodies = list("Cold") threshold_desc = "Stealth 4: The symptom remains hidden until active." /datum/symptom/sneeze/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 4) + if(A.stealth >= 4) suppress_warning = TRUE /datum/symptom/sneeze/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/species.dm b/code/datums/diseases/advance/symptoms/species.dm index 13257f4018f7a..e1ce14f809d17 100644 --- a/code/datums/diseases/advance/symptoms/species.dm +++ b/code/datums/diseases/advance/symptoms/species.dm @@ -4,9 +4,10 @@ stealth = 2 resistance = 2 stage_speed = 2 - transmittable = 0 + transmission = 0 level = 5 severity = 0 + prefixes = list("Zombie ") /datum/symptom/undead_adaptation/OnAdd(datum/disease/advance/A) A.process_dead = TRUE @@ -22,12 +23,14 @@ stealth = -1 resistance = 4 stage_speed = -2 - transmittable = 3 + transmission = 3 level = 5 severity = 0 + prefixes = list("Crystalline ") + /datum/symptom/inorganic_adaptation/OnAdd(datum/disease/advance/A) A.infectable_biotypes |= MOB_INORGANIC /datum/symptom/inorganic_adaptation/OnRemove(datum/disease/advance/A) - A.infectable_biotypes -= MOB_INORGANIC \ No newline at end of file + A.infectable_biotypes -= MOB_INORGANIC diff --git a/code/datums/diseases/advance/symptoms/spiked.dm b/code/datums/diseases/advance/symptoms/spiked.dm index 25cadd2ac86c5..f30a91169d121 100644 --- a/code/datums/diseases/advance/symptoms/spiked.dm +++ b/code/datums/diseases/advance/symptoms/spiked.dm @@ -19,12 +19,14 @@ Thresholds stealth = -3 resistance = 3 stage_speed = -3 - transmittable = 0 + transmission = 0 level = 0 symptom_delay_min = 1 symptom_delay_max = 1 severity = 1 base_message_chance = 5 + prefixes = list("Thorny ", "Horned ") + bodies = list("Horn", "Spiked") var/Power = 1 var/armor = 0 var/done = FALSE @@ -33,15 +35,15 @@ Thresholds /datum/symptom/spiked/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 6) + if(A.resistance >= 6) severity -= 1 /datum/symptom/spiked/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["resistance"] >= 6) //armor. capped at 20, but scaling with resistance, so if you want to max out spiked skin armor, you'll have to make several sacrifices - armor = min(20, A.properties["resistance"]) - if(A.properties["transmittable"] >= 6) //higher damage + if(A.resistance >= 6) //armor. capped at 20, but scaling with resistance, so if you want to max out spiked skin armor, you'll have to make several sacrifices + armor = min(20, A.resistance) + if(A.transmission >= 6) //higher damage Power = 1.4 //the typical +100% is waaaay too strong here when the symptom is stacked. +40% is sufficient /datum/symptom/spiked/Activate(var/datum/disease/advance/A) @@ -69,7 +71,7 @@ Thresholds C.apply_damage(1*power, BRUTE, blocked = def_check) C.visible_message("[C.name] is pricked on [H.name]'s spikes.") playsound(get_turf(C), 'sound/weapons/slice.ogg', 50, 1) - for(var/mob/living/carbon/C in oview(1, H)) + for(var/mob/living/carbon/C in ohearers(1, H)) if(C.pulling && C.pulling == H) var/def_check = C.getarmor(type = "melee") C.apply_damage(3*power, BRUTE, blocked = def_check) diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index 330efc860bc4c..f83b61769f93d 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -8,7 +8,7 @@ var/stealth = 0 var/resistance = 0 var/stage_speed = 0 - var/transmittable = 0 + var/transmission = 0 // The type level of the symptom. Higher is harder to generate. var/level = -1 // The severity level of the symptom. Higher is more dangerous. @@ -29,6 +29,9 @@ var/neutered = FALSE var/list/thresholds var/naturally_occuring = TRUE //if this symptom can appear from /datum/disease/advance/GenerateSymptoms() + var/list/prefixes = list() + var/list/bodies = list() + var/list/suffixes = list() /datum/symptom/New() var/list/S = SSdisease.list_symptoms diff --git a/code/datums/diseases/advance/symptoms/viral.dm b/code/datums/diseases/advance/symptoms/viral.dm index 9fd9d5a03e497..a6d4a33d4980f 100644 --- a/code/datums/diseases/advance/symptoms/viral.dm +++ b/code/datums/diseases/advance/symptoms/viral.dm @@ -19,8 +19,9 @@ BONUS stealth = 3 resistance = 5 stage_speed = -3 - transmittable = 0 + transmission = 0 level = 3 + prefixes = list("Chronic ") /* ////////////////////////////////////// @@ -44,8 +45,9 @@ BONUS stealth = -2 resistance = -3 stage_speed = 5 - transmittable = 3 + transmission = 3 level = 3 + prefixes = list("Unstable ") /* ////////////////////////////////////// @@ -65,7 +67,7 @@ Bonus ////////////////////////////////////// */ -/datum/symptom/viralreverse +/datum/symptom/viralreverse name = "Viral aggressive metabolism" desc = "The virus sacrifices its long term survivability to nearly instantly fully spread inside a host. \ @@ -73,14 +75,15 @@ Bonus stealth = 1 resistance = -4 stage_speed = 3 - transmittable = -3 + transmission = -3 level = 3 symptom_delay_min = 1 symptom_delay_max = 1 + prefixes = list("Spontaneous ") var/time_to_cure threshold_desc = "Resistance/Stage Speed: Highest between these determines the amount of time before self-curing.
\ - Stealth 4 Doubles the time before the virus self-cures" - + Stealth 4 Doubles the time before the virus self-cures" + /datum/symptom/viralreverse/Activate(datum/disease/advance/A) if(!..()) @@ -95,12 +98,12 @@ Bonus A.stage -= 1 if(A.stage < 2) to_chat(M, "You suddenly feel healthy.") - A.cure() + A.cure(FALSE) //Doesn't Add Resistance. Virology can now make potions for stuff, be it healing the senses or making people explode /datum/symptom/viralreverse/Start(datum/disease/advance/A) if(!..()) return A.stage = 5 - if(A.properties["stealth"] >= 4) //more time before it's cured + if(A.stealth >= 4) //more time before it's cured power = 2 - time_to_cure = max(A.properties["resistance"], A.properties["stage_rate"]) * 10 * power + time_to_cure = max(A.resistance, A.stage_rate) * 10 * power diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index ffc639b860312..0777fcdd8e2eb 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -22,27 +22,30 @@ Bonus stealth = -1 resistance = -3 stage_speed = -4 - transmittable = -2 + transmission = -2 level = 5 severity = 3 base_message_chance = 50 symptom_delay_min = 25 symptom_delay_max = 80 + prefixes = list("Eye ") + bodies = list("Blind") + suffixes = list(" Blindness") var/remove_eyes = FALSE threshold_desc = "Resistance 12: Weakens extraocular muscles, eventually leading to complete detachment of the eyes.
\ Stealth 4: The symptom remains hidden until active." /datum/symptom/visionloss/severityset(datum/disease/advance/A) . = ..() - if(A.properties["resistance"] >= 12) //goodbye eyes + if(A.resistance >= 12) //goodbye eyes severity += 1 /datum/symptom/visionloss/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 4) + if(A.stealth >= 4) suppress_warning = TRUE - if(A.properties["resistance"] >= 12) //goodbye eyes + if(A.resistance >= 12) //goodbye eyes remove_eyes = TRUE /datum/symptom/visionloss/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index faf9de3678952..3d08e65e205b7 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -6,7 +6,7 @@ Voice Change Noticeable. Lowers resistance. Decreases stage speed. - Increased transmittable. + Increased transmission. Fatal Level. Bonus @@ -22,12 +22,13 @@ Bonus stealth = -1 resistance = -2 stage_speed = -2 - transmittable = 2 + transmission = 2 level = 6 severity = 2 base_message_chance = 100 symptom_delay_min = 60 symptom_delay_max = 120 + prefixes = list("Vocal ") var/scramble_language = FALSE var/datum/language/current_language threshold_desc = "Transmission 14: The host's language center of the brain is damaged, leading to complete inability to speak or understand any language.
\ @@ -36,19 +37,20 @@ Bonus /datum/symptom/voice_change/severityset(datum/disease/advance/A) . = ..() - if(A.properties["transmittable"] >= 14) //random language + if(A.transmission >= 14) //random language + bodies += list("Polyglot") severity += 1 /datum/symptom/voice_change/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 3) + if(A.stealth >= 3) suppress_warning = TRUE - if(A.properties["stage_rate"] >= 7) //faster change of voice + if(A.stage_rate >= 7) //faster change of voice base_message_chance = 25 symptom_delay_min = 25 symptom_delay_max = 85 - if(A.properties["transmittable"] >= 14) //random language + if(A.transmission >= 14) //random language scramble_language = TRUE /datum/symptom/voice_change/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm index 504b697e7d85d..0ed1b31d01db8 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -26,12 +26,15 @@ Bonus stealth = -2 resistance = 1 stage_speed = 0 - transmittable = 2 + transmission = 2 level = 3 severity = 1 base_message_chance = 100 symptom_delay_min = 25 symptom_delay_max = 80 + prefixes = list("Digestive ") + bodies = list("Vomit") + suffixes = list(" Emission") var/vomit_blood = FALSE var/proj_vomit = 0 threshold_desc = "Resistance 7: Host will vomit blood, causing internal damage.
\ @@ -41,11 +44,11 @@ Bonus /datum/symptom/vomit/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 4) + if(A.stealth >= 4) suppress_warning = TRUE - if(A.properties["resistance"] >= 7) //blood vomit + if(A.resistance >= 7) //blood vomit vomit_blood = TRUE - if(A.properties["transmittable"] >= 7) //projectile vomit + if(A.transmission >= 7) //projectile vomit proj_vomit = 5 /datum/symptom/vomit/Activate(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index da1a1f6a40665..52b89c0c261be 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -6,7 +6,7 @@ Weight Loss Very Very Noticable. Decreases resistance. Decreases stage speed. - Reduced Transmittable. + Reduced transmission. High level. Bonus @@ -23,18 +23,20 @@ Bonus stealth = -2 resistance = 2 stage_speed = -2 - transmittable = -1 + transmission = -1 level = 3 severity = 2 base_message_chance = 100 symptom_delay_min = 15 symptom_delay_max = 45 + prefixes = list("Starving ") + bodies = list("Diet") threshold_desc = "Stealth 2: The symptom is less noticeable." /datum/symptom/weight_loss/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["stealth"] >= 2) //warn less often + if(A.stealth >= 2) //warn less often base_message_chance = 25 /datum/symptom/weight_loss/Activate(datum/disease/advance/A) @@ -48,4 +50,4 @@ Bonus else to_chat(M, "[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]") M.overeatduration = max(M.overeatduration - 100, 0) - M.adjust_nutrition(-100) \ No newline at end of file + M.adjust_nutrition(-100) diff --git a/code/datums/diseases/advance/symptoms/wizarditis.dm b/code/datums/diseases/advance/symptoms/wizarditis.dm index 6dc5f1a1e1662..55e2e52852a55 100644 --- a/code/datums/diseases/advance/symptoms/wizarditis.dm +++ b/code/datums/diseases/advance/symptoms/wizarditis.dm @@ -4,29 +4,31 @@ stealth = 1 resistance = -2 stage_speed = -3 - transmittable = -1 + transmission = -1 level = 0 severity = 0 symptom_delay_min = 15 symptom_delay_max = 45 + prefixes = list("Wizard's ", "Magic ", "Accursed ") + bodies = list("Wizard") var/teleport = FALSE var/robes = FALSE - threshold_desc = "Transmission 14: The host teleports occasionally.
\ - Speed 7: The host grows a set of wizard robes." + threshold_desc = "Transmission 8: The host teleports occasionally.
\ + Stage Speed 7: The host grows a set of wizard robes." /datum/symptom/wizarditis/severityset(datum/disease/advance/A) . = ..() - if(A.properties["transmittable"] >= 12) + if(A.transmission >= 8) severity += 1 - if(A.properties["speed"] >= 7) + if(A.stage_rate >= 7) severity += 1 /datum/symptom/wizarditis/Start(datum/disease/advance/A) if(!..()) return - if(A.properties["transmission"] >= 14) + if(A.transmission >= 8) teleport = TRUE - if(A.properties["speed"] >= 7) + if(A.stage_rate >= 7) robes = TRUE /datum/symptom/wizarditis/Activate(datum/disease/advance/A) @@ -47,7 +49,7 @@ if(prob(30) && prob(50)) to_chat(M, "You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar")].") - if(4) + if(4,5) if(prob(50)) M.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!")) @@ -71,7 +73,7 @@ qdel(H.head) C = new /obj/item/clothing/head/wizard(H) ADD_TRAIT(C, TRAIT_NODROP, DISEASE_TRAIT) - H.equip_to_slot_or_del(C, SLOT_HEAD) + H.equip_to_slot_or_del(C, ITEM_SLOT_HEAD) return if(prob(chance)) if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe)) @@ -79,7 +81,7 @@ qdel(H.wear_suit) C = new /obj/item/clothing/suit/wizrobe(H) ADD_TRAIT(C, TRAIT_NODROP, DISEASE_TRAIT) - H.equip_to_slot_or_del(C, SLOT_WEAR_SUIT) + H.equip_to_slot_or_del(C, ITEM_SLOT_OCLOTHING) return if(prob(chance)) if(!istype(H.shoes, /obj/item/clothing/shoes/sandal/magic)) @@ -87,7 +89,7 @@ qdel(H.shoes) C = new /obj/item/clothing/shoes/sandal/magic(H) ADD_TRAIT(C, TRAIT_NODROP, DISEASE_TRAIT) - H.equip_to_slot_or_del(C, SLOT_SHOES) + H.equip_to_slot_or_del(C, ITEM_SLOT_FEET) return else var/mob/living/carbon/H = A.affected_mob @@ -98,11 +100,11 @@ /datum/symptom/wizarditis/proc/teleport(datum/disease/advance/A) - var/turf/L = get_safe_random_station_turf() + var/turf/L = get_safe_random_station_turfs() A.affected_mob.say("SCYAR NILA!") do_teleport(A.affected_mob, L, forceMove = TRUE, channel = TELEPORT_CHANNEL_MAGIC) - playsound(get_turf(A.affected_mob), 'sound/weapons/zapbang.ogg', 50,1) - + playsound(get_turf(A.affected_mob), 'sound/weapons/zapbang.ogg', 50,1) + /datum/symptom/wizarditis/End(datum/disease/advance/A) if(ishuman(A.affected_mob)) var/mob/living/carbon/human/H = A.affected_mob @@ -113,5 +115,5 @@ if(istype(H.shoes, /obj/item/clothing/shoes/sandal/magic)) REMOVE_TRAIT(H.shoes, TRAIT_NODROP, DISEASE_TRAIT) - + diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index d2712a0146fdf..e43b0ab1d5129 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -23,11 +23,13 @@ BONUS stealth = 3 resistance = 4 stage_speed = 4 - transmittable = -4 + transmission = -4 level = 5 base_message_chance = 100 symptom_delay_min = 25 symptom_delay_max = 50 + prefixes = list("Eternal ") + bodies = list("Immortal", "Elixir") /datum/symptom/youth/Activate(datum/disease/advance/A) if(!..()) @@ -55,4 +57,4 @@ BONUS if(5) if(H.age > 21) H.age = 21 - to_chat(H, "You feel like you can take on the world!") \ No newline at end of file + to_chat(H, "You feel like you can take on the world!") diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 20ecceb224c2c..d039923f63231 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -9,7 +9,7 @@ agent = "Excess Lepidopticides" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) desc = "If left untreated subject will regurgitate butterflies." - severity = DISEASE_SEVERITY_MINOR + danger = DISEASE_MINOR /datum/disease/anxiety/stage_act() ..() @@ -38,4 +38,4 @@ "You cough up butterflies!") new /mob/living/simple_animal/butterfly(affected_mob.loc) new /mob/living/simple_animal/butterfly(affected_mob.loc) - return \ No newline at end of file + return diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 7a6ea142b3619..35a6040f02eec 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -7,7 +7,7 @@ viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 1 desc = "If left untreated the subject will become very weak, and may vomit often." - severity = DISEASE_SEVERITY_MEDIUM + danger = DISEASE_MEDIUM disease_flags = CAN_CARRY|CAN_RESIST spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS visibility_flags = HIDDEN_PANDEMIC diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index 074bda0560f8f..b26618640fefe 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -9,7 +9,7 @@ agent = "Apidae Infection" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) desc = "If left untreated subject will regurgitate bees." - severity = DISEASE_SEVERITY_MEDIUM + danger = DISEASE_MEDIUM infectable_biotypes = list(MOB_ORGANIC, MOB_UNDEAD) //bees nesting in corpses /datum/disease/beesease/stage_act() @@ -36,4 +36,4 @@ affected_mob.visible_message("[affected_mob] coughs up a swarm of bees!", \ "You cough up a swarm of bees!") new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc) - return \ No newline at end of file + return diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index 0bcd1e30eadb8..edfc1486469e7 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -10,7 +10,7 @@ cure_chance = 15//higher chance to cure, since two reagents are required desc = "This disease destroys the braincells, causing brain fever, brain necrosis and general intoxication." required_organs = list(/obj/item/organ/brain) - severity = DISEASE_SEVERITY_HARMFUL + danger = DISEASE_HARMFUL /datum/disease/brainrot/stage_act() //Removed toxloss because damaging diseases are pretty horrible. Last round it killed the entire station because the cure didn't work -- Urist -ACTUALLY Removed rather than commented out, I don't see it returning - RR ..() diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index dd91a0d822168..0961557f5e3b4 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -7,7 +7,7 @@ viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) permeability_mod = 0.5 desc = "If left untreated, the subject will contract the flu." - severity = DISEASE_SEVERITY_NONTHREAT + danger = DISEASE_NONTHREAT /datum/disease/cold/stage_act() ..() @@ -50,4 +50,4 @@ if(!affected_mob.disease_resistances.Find(/datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu() affected_mob.ForceContractDisease(Flu, FALSE, TRUE) - cure() \ No newline at end of file + cure() diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index 47f391ecf78d1..35027ed10ae61 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -8,7 +8,7 @@ agent = "ICE9-rhinovirus" viable_mobtypes = list(/mob/living/carbon/human) desc = "If left untreated the subject will slow, as if partly frozen." - severity = DISEASE_SEVERITY_HARMFUL + danger = DISEASE_HARMFUL /datum/disease/cold9/stage_act() ..() @@ -36,4 +36,4 @@ if(prob(1)) to_chat(affected_mob, "Your throat feels sore.") if(prob(10)) - to_chat(affected_mob, "You feel stiff.") \ No newline at end of file + to_chat(affected_mob, "You feel stiff.") diff --git a/code/datums/diseases/decloning.dm b/code/datums/diseases/decloning.dm index b332876c01060..90ff0cda7fff5 100644 --- a/code/datums/diseases/decloning.dm +++ b/code/datums/diseases/decloning.dm @@ -7,7 +7,7 @@ agent = "Severe Genetic Damage" viable_mobtypes = list(/mob/living/carbon/human) desc = @"If left untreated the subject will [REDACTED]!" - severity = "Dangerous!" + danger = DISEASE_DANGEROUS cures = list(/datum/reagent/medicine/rezadone) disease_flags = CAN_CARRY|CAN_RESIST spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS @@ -55,5 +55,5 @@ affected_mob.adjustCloneLoss(5) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170) if(affected_mob.cloneloss >= 100) - affected_mob.visible_message("[affected_mob] skin turns to dust!", "Your skin turns to dust!") - affected_mob.dust() \ No newline at end of file + affected_mob.visible_message("[affected_mob] skin turns to dust!", "Your skin turns to dust!") + affected_mob.dust() diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 3a67230d36ec2..42a6595707994 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -11,7 +11,7 @@ var/datum/dna/original_dna = null var/transformed = 0 desc = "This disease transplants the genetic code of the initial vector into new hosts." - severity = DISEASE_SEVERITY_MEDIUM + danger = DISEASE_MEDIUM /datum/disease/dnaspread/stage_act() diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index 37628a5502f18..cb7776969c7c7 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -8,7 +8,7 @@ agent = "Gravitokinetic Bipotential SADS-" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) desc = "If left untreated death will occur." - severity = DISEASE_SEVERITY_BIOHAZARD + danger = DISEASE_BIOHAZARD /datum/disease/fake_gbs/stage_act() ..() diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm index 62bb3de8df412..3cb6e91e7f6dd 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -9,7 +9,7 @@ viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) permeability_mod = 0.75 desc = "If left untreated the subject will feel quite unwell." - severity = DISEASE_SEVERITY_MINOR + danger = DISEASE_MINOR /datum/disease/flu/stage_act() ..() diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm index 3297877fe910d..398f9e88678ef 100644 --- a/code/datums/diseases/fluspanish.dm +++ b/code/datums/diseases/fluspanish.dm @@ -9,7 +9,7 @@ viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 0.75 desc = "If left untreated the subject will burn to death for being a heretic." - severity = DISEASE_SEVERITY_DANGEROUS + danger = DISEASE_DANGEROUS /datum/disease/fluspanish/stage_act() ..() diff --git a/code/datums/diseases/gastrolisis.dm b/code/datums/diseases/gastrolisis.dm index 5f03fe1b706b3..24c220dd13c07 100644 --- a/code/datums/diseases/gastrolisis.dm +++ b/code/datums/diseases/gastrolisis.dm @@ -38,12 +38,12 @@ "You scream in pain as your eyes are pushed out by your new snail eyes!") affected_mob.emote("scream") return - var/obj/item/shell = affected_mob.get_item_by_slot(SLOT_BACK) + var/obj/item/shell = affected_mob.get_item_by_slot(ITEM_SLOT_BACK) if(!istype(shell, /obj/item/storage/backpack/snail)) shell = null if(!shell && prob(5)) - if(affected_mob.dropItemToGround(affected_mob.get_item_by_slot(SLOT_BACK))) - affected_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(affected_mob), SLOT_BACK) + if(affected_mob.dropItemToGround(affected_mob.get_item_by_slot(ITEM_SLOT_BACK))) + affected_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(affected_mob), ITEM_SLOT_BACK) affected_mob.visible_message("[affected_mob] grows a grotesque shell on their back!", \ "You scream in pain as a shell pushes itself out from under your skin!") affected_mob.emote("scream") @@ -78,7 +78,7 @@ if(eyes) var/obj/item/organ/eyes/new_eyes = new H.dna.species.mutanteyes () new_eyes.Insert(H) - var/obj/item/storage/backpack/bag = H.get_item_by_slot(SLOT_BACK) + var/obj/item/storage/backpack/bag = H.get_item_by_slot(ITEM_SLOT_BACK) if(istype(bag, /obj/item/storage/backpack/snail)) bag.emptyStorage() H.doUnEquip(bag, TRUE, no_move = TRUE) diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index 8ac199685570f..2be16dd8c49cf 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -10,7 +10,7 @@ viable_mobtypes = list(/mob/living/carbon/human) disease_flags = CAN_CARRY|CAN_RESIST|CURABLE permeability_mod = 1 - severity = DISEASE_SEVERITY_BIOHAZARD + danger = DISEASE_BIOHAZARD /datum/disease/gbs/stage_act() ..() diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index c823d0984b64b..9084707b0e0d1 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -8,7 +8,7 @@ viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 1 desc = "If left untreated the subject will die!" - severity = "Dangerous!" + danger = DISEASE_DANGEROUS disease_flags = CAN_CARRY|CAN_RESIST spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS visibility_flags = HIDDEN_PANDEMIC @@ -37,7 +37,7 @@ to_chat(H, "You feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short on breath", "uneasy")].") if(3 to 4) if(!sound) - H.playsound_local(H, 'sound/health/slowbeat.ogg',40,0, channel = CHANNEL_HEARTBEAT) + H.playsound_local(H, 'sound/health/slowbeat.ogg',40,0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) sound = TRUE if(prob(3)) to_chat(H, "You feel a sharp pain in your chest!") diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index 29e6657e1313f..740010762a482 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -9,7 +9,7 @@ disease_flags = CAN_CARRY|CAN_RESIST|CURABLE permeability_mod = 0.75 desc = "This disease disrupts the magnetic field of your body, making it act as if a powerful magnet. Injections of iron help stabilize the field." - severity = DISEASE_SEVERITY_MEDIUM + danger = DISEASE_MEDIUM infectable_biotypes = list(MOB_ORGANIC, MOB_ROBOTIC) process_dead = TRUE @@ -65,4 +65,4 @@ var/iter = rand(1,3) for(i=0,i
" : "" for(var/line in testmerge) var/datum/tgs_revision_information/test_merge/tm = line - var/cm = tm.pull_request_commit + var/cm = tm.head_commit var/details = ": '" + html_encode(tm.title) + "' by " + html_encode(tm.author) + " at commit " + html_encode(copytext_char(cm, 1, 11)) if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder)) continue @@ -77,7 +79,9 @@ msg += "No commit information" if(world.TgsAvailable()) var/datum/tgs_version/version = world.TgsVersion() - msg += "Server tools version: [version.raw_parameter]" + msg += "TGS version: [version.raw_parameter]" + var/datum/tgs_version/api_version = world.TgsApiVersion() + msg += "DMAPI version: [api_version.raw_parameter]" // Game mode odds msg += "
Current Informational Settings:" diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 29c51577a594f..ac3d91f6ca59d 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -8,7 +8,7 @@ // forceMove: if false, teleport will use Move() proc (dense objects will prevent teleportation) // no_effects: disable the default effectin/effectout of sparks // forced: whether or not to ignore no_teleport -/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, forceMove = TRUE, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, forced = FALSE) +/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, forceMove = TRUE, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, forced = FALSE, teleport_mode = TELEPORT_MODE_DEFAULT) // teleporting most effects just deletes them var/static/list/delete_atoms = typecacheof(list( /obj/effect, @@ -16,6 +16,8 @@ /obj/effect/dummy/chameleon, /obj/effect/wisp, /obj/effect/mob_spawn, + /obj/effect/warp_cube, + /obj/effect/extraction_holder, )) if(delete_atoms[teleatom.type]) qdel(teleatom) @@ -56,7 +58,11 @@ var/area/A = get_area(curturf) var/area/B = get_area(destturf) - if(!forced && (HAS_TRAIT(teleatom, TRAIT_NO_TELEPORT) || A.noteleport || B.noteleport)) + if(!forced && (HAS_TRAIT(teleatom, TRAIT_NO_TELEPORT))) + return FALSE + + //Either area has teleport restriction and teleport mode isn't allowed in that area + if(!forced && ((A.teleport_restriction && A.teleport_restriction != teleport_mode) || (B.teleport_restriction && B.teleport_restriction != teleport_mode))) return FALSE if(SEND_SIGNAL(destturf, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, curturf, destturf)) @@ -87,7 +93,7 @@ effect.start() // Safe location finder -/proc/find_safe_turf(zlevel, list/zlevels, extended_safety_checks = FALSE) +/proc/find_safe_turf(zlevel, list/zlevels, extended_safety_checks = FALSE, dense_atoms = TRUE) if(!zlevels) if (zlevel) zlevels = list(zlevel) @@ -118,11 +124,11 @@ // Can most things breathe? if(trace_gases) continue - if(A.get_moles(/datum/gas/oxygen) < 16) + if(A.get_moles(GAS_O2) < 16) continue - if(A.get_moles(/datum/gas/plasma)) + if(A.get_moles(GAS_PLASMA)) continue - if(A.get_moles(/datum/gas/carbon_dioxide) >= 10) + if(A.get_moles(GAS_CO2) >= 10) continue // Aim for goldilocks temperatures and pressure @@ -138,19 +144,35 @@ if(!L.is_safe()) continue + // Check that we're not warping onto a table or window + if(!dense_atoms) + var/density_found = FALSE + for(var/atom/movable/found_movable in F) + if(found_movable.density) + density_found = TRUE + break + if(density_found) + continue + // DING! You have passed the gauntlet, and are "probably" safe. return F /proc/get_teleport_turfs(turf/center, precision = 0) if(!precision) return list(center) + //Return only open turfs unless none are available + var/list/safe_turfs = list() var/list/posturfs = list() - for(var/turf/T in range(precision,center)) + for(var/turf/T as() in RANGE_TURFS(precision, center)) if(T.is_transition_turf()) continue // Avoid picking these. var/area/A = T.loc - if(!A.noteleport) + if(!A.teleport_restriction) posturfs.Add(T) + if(isopenturf(T)) + safe_turfs += T + if(length(safe_turfs)) + return safe_turfs return posturfs /proc/get_teleport_turf(turf/center, precision = 0) diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index dafd2b11a3fa8..e28192bed544c 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -9,7 +9,7 @@ #define HOLORECORD_MAX_LENGTH 200 -/mob/camera/aiEye/remote/holo/setLoc() +/mob/camera/ai_eye/remote/holo/setLoc() . = ..() var/obj/machinery/holopad/H = origin H?.move_hologram(eye_user, loc) @@ -27,7 +27,7 @@ var/obj/machinery/holopad/connected_holopad //the one that answered the call (may be null) var/list/dialed_holopads //all things called, will be cleared out to just connected_holopad once answered - var/mob/camera/aiEye/remote/holo/eye //user's eye, once connected + var/mob/camera/ai_eye/remote/holo/eye //user's eye, once connected var/obj/effect/overlay/holo_pad_hologram/hologram //user's hologram, once connected var/datum/action/innate/end_holocall/hangup //hangup action @@ -72,6 +72,7 @@ if(!QDELETED(hologram)) hologram.HC = null QDEL_NULL(hologram) + hologram = null for(var/I in dialed_holopads) var/obj/machinery/holopad/H = I diff --git a/code/datums/hud.dm b/code/datums/hud.dm index eeeee8b1ab4dc..4bf5c2e60a347 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -56,11 +56,14 @@ GLOBAL_LIST_INIT(huds, list( GLOB.all_huds -= src return ..() -/datum/atom_hud/proc/remove_hud_from(mob/M) +/datum/atom_hud/proc/remove_hud_from(mob/M, absolute = FALSE) if(!M || !hudusers[M]) return - if (!--hudusers[M]) + if (absolute || !--hudusers[M]) + UnregisterSignal(M, COMSIG_PARENT_QDELETING) hudusers -= M + if(next_time_allowed[M]) + next_time_allowed -= M if(queued_to_see[M]) queued_to_see -= M else @@ -76,7 +79,7 @@ GLOBAL_LIST_INIT(huds, list( return TRUE /datum/atom_hud/proc/remove_from_single_hud(mob/M, atom/A) //unsafe, no sanity apart from client - if(!M || !M.client || !A) + if(!M || !M.client || !A?.hud_list.len) return for(var/i in hud_icons) M.client.images -= A.hud_list[i] @@ -86,6 +89,7 @@ GLOBAL_LIST_INIT(huds, list( return if(!hudusers[M]) hudusers[M] = 1 + RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/unregister_mob) if(next_time_allowed[M] > world.time) if(!queued_to_see[M]) addtimer(CALLBACK(src, .proc/show_hud_images_after_cooldown, M), next_time_allowed[M] - world.time) @@ -97,6 +101,12 @@ GLOBAL_LIST_INIT(huds, list( else hudusers[M]++ +/datum/atom_hud/proc/unregister_mob(datum/source, force) + SIGNAL_HANDLER + + remove_hud_from(source, TRUE) + remove_from_hud(source) + /datum/atom_hud/proc/show_hud_images_after_cooldown(M) if(queued_to_see[M]) queued_to_see -= M diff --git a/code/datums/keybinding/carbon.dm b/code/datums/keybinding/carbon.dm index 015a879cf0bea..05f62d9825219 100644 --- a/code/datums/keybinding/carbon.dm +++ b/code/datums/keybinding/carbon.dm @@ -71,3 +71,17 @@ var/mob/living/carbon/C = user.mob C.a_intent_change(INTENT_HARM) return TRUE + +/datum/keybinding/carbon/give + key = "G" + name = "Give_Item" + full_name = "Give item" + description = "Give the item you're currently holding" + category = CATEGORY_CARBON + +/datum/keybinding/carbon/give/down(client/user) + if(!iscarbon(user.mob)) + return + var/mob/living/carbon/C = user.mob + C.give() + return TRUE diff --git a/code/datums/keybinding/client.dm b/code/datums/keybinding/client.dm index d95bac96b99e1..555bd423ab00e 100644 --- a/code/datums/keybinding/client.dm +++ b/code/datums/keybinding/client.dm @@ -34,3 +34,16 @@ /datum/keybinding/client/toggleminimalhud/down(client/user) user.mob.button_pressed_F12() return TRUE + + +/datum/keybinding/client/zoomin + key = "\]" + name = "zoomin" + full_name = "Zoom In" + description = "Temporary switch icon scaling mode to 4x until unpressed" + +/datum/keybinding/client/zoomin/down(client/user) + winset(user, "mapwindow.map", "zoom=[PIXEL_SCALING_4X]") + +/datum/keybinding/client/zoomin/up(client/user) + winset(user, "mapwindow.map", "zoom=[user.prefs.pixel_size]") diff --git a/code/datums/keybinding/human.dm b/code/datums/keybinding/human.dm index 300f91a2d7cbe..7b588fe7a016d 100644 --- a/code/datums/keybinding/human.dm +++ b/code/datums/keybinding/human.dm @@ -10,7 +10,8 @@ description = "" /datum/keybinding/human/quick_equip/down(client/user) - if (!ishuman(user.mob)) return + if(!ishuman(user.mob) || user.mob.incapacitated()) + return var/mob/living/carbon/human/H = user.mob H.quick_equip() return TRUE @@ -23,15 +24,16 @@ description = "" /datum/keybinding/human/quick_equip_belt/down(client/user) - if (!ishuman(user.mob)) return + if(!ishuman(user.mob) || user.mob.incapacitated()) + return var/mob/living/carbon/human/H = user.mob var/obj/item/thing = H.get_active_held_item() - var/obj/item/equipped_belt = H.get_item_by_slot(SLOT_BELT) + var/obj/item/equipped_belt = H.get_item_by_slot(ITEM_SLOT_BELT) if(!equipped_belt) // We also let you equip a belt like this if(!thing) to_chat(user, "You have no belt to take something out of.") return TRUE - if(H.equip_to_slot_if_possible(thing, SLOT_BELT)) + if(H.equip_to_slot_if_possible(thing, ITEM_SLOT_BELT)) H.update_inv_hands() return TRUE if(!SEND_SIGNAL(equipped_belt, COMSIG_CONTAINS_STORAGE)) // not a storage item @@ -61,15 +63,16 @@ description = "" /datum/keybinding/human/quick_equip_backpack/down(client/user) - if (!ishuman(user.mob)) return + if(!ishuman(user.mob) || user.mob.incapacitated()) + return var/mob/living/carbon/human/H = user.mob var/obj/item/thing = H.get_active_held_item() - var/obj/item/equipped_back = H.get_item_by_slot(SLOT_BACK) + var/obj/item/equipped_back = H.get_item_by_slot(ITEM_SLOT_BACK) if(!equipped_back) // We also let you equip a backpack like this if(!thing) to_chat(user, "You have no backpack to take something out of.") return - if(H.equip_to_slot_if_possible(thing, SLOT_BACK)) + if(H.equip_to_slot_if_possible(thing, ITEM_SLOT_BACK)) H.update_inv_hands() return if(!SEND_SIGNAL(equipped_back, COMSIG_CONTAINS_STORAGE)) // not a storage item @@ -90,3 +93,30 @@ return stored.attack_hand(H) // take out thing from backpack return + +/datum/keybinding/human/quick_equip_suit_storage + key = "Shift-Q" + name = "quick_equip_suit_storage" + full_name = "Put Item In Suit Storage" + description = "" + +/datum/keybinding/human/quick_equip_suit_storage/down(client/user) + if(!ishuman(user.mob) || user.mob.incapacitated()) + return + var/mob/living/carbon/human/H = user.mob + var/obj/item/thing = H.get_active_held_item() + var/obj/item/stored = H.get_item_by_slot(ITEM_SLOT_SUITSTORE) + if(!stored) + if(!thing) + to_chat(user, "There's nothing in your suit storage to take out.") + return TRUE + if(H.equip_to_slot_if_possible(thing, ITEM_SLOT_SUITSTORE)) + H.update_inv_hands() + return TRUE + if(thing && stored) + to_chat(user, "There's already something in your suit storage!") + return TRUE + if(!stored || stored.on_found(H)) + return TRUE + stored.attack_hand(H) + return TRUE \ No newline at end of file diff --git a/code/datums/keybinding/living.dm b/code/datums/keybinding/living.dm index 156b2d8892b7b..5fc5bbed94a6c 100644 --- a/code/datums/keybinding/living.dm +++ b/code/datums/keybinding/living.dm @@ -14,3 +14,16 @@ var/mob/living/L = user.mob L.resist() return TRUE + +/datum/keybinding/living/rest + key = "V" + name = "rest" + full_name = "Rest" + description = "Lay down, or get up." + +/datum/keybinding/living/rest/down(client/user) + if(!isliving(user.mob)) + return + var/mob/living/L = user.mob + L.lay_down() + return TRUE \ No newline at end of file diff --git a/code/datums/keybinding/mob.dm b/code/datums/keybinding/mob.dm index 75e259caab1cc..3deb6a2776088 100644 --- a/code/datums/keybinding/mob.dm +++ b/code/datums/keybinding/mob.dm @@ -149,6 +149,20 @@ M.toggle_move_intent() return TRUE +/datum/keybinding/mob/toggle_move_intent_alternative + key = "Unbound" + name = "toggle_move_intent_alt" + full_name = "press to cycle move intent" + description = "Pressing this cycle to the opposite move intent, does not cycle back" + +/datum/keybinding/mob/toggle_move_intent_alternative/down(client/user) + . = ..() + if(.) + return + var/mob/M = user.mob + M.toggle_move_intent() + return TRUE + /datum/keybinding/mob/target_head_cycle key = "Numpad8" name = "target_head_cycle" @@ -225,3 +239,21 @@ if(!user.mob) return user.body_l_leg() return TRUE + +/datum/keybinding/mob/prevent_movement + key = "Ctrl" + name = "block_movement" + full_name = "Block movement" + description = "While pressed, prevents movement when pressing directional keys; instead just changes your facing direction" + +/datum/keybinding/mob/prevent_movement/down(client/user) + . = ..() + if(.) + return + user.movement_locked = TRUE + +/datum/keybinding/mob/prevent_movement/up(client/user) + . = ..() + if(.) + return + user.movement_locked = FALSE diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 5a236beb6f73c..e146487fb4591 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -58,7 +58,7 @@ if(!timerid) return on_stop() - deltimer(timerid) + deltimer(timerid, SSsound_loops) timerid = null /datum/looping_sound/proc/sound_loop(starttime) @@ -68,13 +68,13 @@ if(!chance || prob(chance)) play(get_sound(starttime)) if(!timerid) - timerid = addtimer(CALLBACK(src, .proc/sound_loop, world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP) + timerid = addtimer(CALLBACK(src, .proc/sound_loop, world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP, SSsound_loops) /datum/looping_sound/proc/play(soundfile) var/list/atoms_cache = output_atoms var/sound/S = sound(soundfile) if(direct) - S.channel = open_sound_channel() + S.channel = SSsounds.random_available_channel() S.volume = volume for(var/i in 1 to atoms_cache.len) var/atom/thing = atoms_cache[i] @@ -93,7 +93,7 @@ if(start_sound) play(start_sound) start_wait = start_length - addtimer(CALLBACK(src, .proc/sound_loop), start_wait, TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, .proc/sound_loop), start_wait, TIMER_CLIENT_TIME, SSsound_loops) /datum/looping_sound/proc/on_stop() if(end_sound) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 3bc2a3548a3af..733373fd2c38a 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -19,12 +19,13 @@ var/map_file = "BoxStation.dmm" var/traits = null - var/space_ruin_levels = 7 + var/space_ruin_levels = 4 //Keep this low, as new ones are created dynamically when needed. var/space_empty_levels = 1 var/minetype = "lavaland" var/allow_custom_shuttles = TRUE + var/allow_night_lighting = TRUE var/shuttles = list( "cargo" = "cargo_box", "ferry" = "ferry_fancy", @@ -128,6 +129,8 @@ allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE + allow_night_lighting = json["allow_night_lighting"] != FALSE + defaulted = FALSE return TRUE #undef CHECK_EXISTS diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm new file mode 100644 index 0000000000000..d016eeae3eb7e --- /dev/null +++ b/code/datums/mapgen/CaveGenerator.dm @@ -0,0 +1,161 @@ +/datum/map_generator/cave_generator + var/name = "Cave Generator" + ///Weighted list of the types that spawns if the turf is open + var/open_turf_types = list(/turf/open/floor/plating/asteroid = 1) + ///Weighted list of the types that spawns if the turf is closed + var/closed_turf_types = list(/turf/closed/mineral/random/volcanic = 1) + ///List of turf types (subtypes included) to skip when generating terrain + var/blacklisted_turf_types + + + ///Weighted list of extra features that can spawn in the area, such as geysers. + var/list/feature_spawn_list = list(/obj/structure/geyser/random = 1) + ///Weighted list of mobs that can spawn in the area. + var/list/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, \ + /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \ + /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \ + SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10) + ///Weighted list of flora that can spawn in the area. + var/list/flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2) + // Weighted list of Megafauna that can spawn in the caves + var/list/megafauna_spawn_list + + + ///Base chance of spawning a mob + var/mob_spawn_chance = 6 + ///Base chance of spawning flora + var/flora_spawn_chance = 2 + ///Base chance of spawning features + var/feature_spawn_chance = 0.1 + ///Unique ID for this spawner + var/string_gen + + ///Chance of cells starting closed + var/initial_closed_chance = 45 + ///Amount of smoothing iterations + var/smoothing_iterations = 20 + ///How much neighbours does a dead cell need to become alive + var/birth_limit = 4 + ///How little neighbours does a alive cell need to die + var/death_limit = 3 + +/datum/map_generator/cave_generator/New() + . = ..() + if(!megafauna_spawn_list) + megafauna_spawn_list = GLOB.megafauna_spawn_list + +/datum/map_generator/cave_generator/generate_terrain(list/turfs) + . = ..() + var/start_time = REALTIMEOFDAY + string_gen = rustg_cnoise_generate("[initial_closed_chance]", "[smoothing_iterations]", "[birth_limit]", "[death_limit]", "[world.maxx]", "[world.maxy]") //Generate the raw CA data + var/blacklist = typecacheof(blacklisted_turf_types) + + for(var/i in turfs) //Go through all the turfs and generate them + var/turf/gen_turf = i + + if(blacklist && blacklist[gen_turf.type]) + continue + + var/forced + var/closed + + if(istype(gen_turf, /turf/open/genturf)) + var/turf/open/genturf/genturf = gen_turf + if(genturf.force_generation) + forced = TRUE + switch(genturf.genturf_hint) + if(GENTURF_HINT_OPEN) + closed = FALSE + if(GENTURF_HINT_CLOSED) + closed = TRUE + + var/area/A = gen_turf.loc + if(!forced && !(A.area_flags & CAVES_ALLOWED)) + continue + + if(isnull(closed)) + closed = text2num(string_gen[world.maxx * (gen_turf.y - 1) + gen_turf.x]) + + var/stored_flags + if(gen_turf.flags_1 & NO_RUINS_1) + stored_flags |= NO_RUINS_1 + + var/turf/new_turf = pickweight(closed ? closed_turf_types : open_turf_types) + + new_turf = gen_turf.ChangeTurf(new_turf, initial(new_turf.baseturfs), CHANGETURF_DEFER_CHANGE) + + new_turf.flags_1 |= stored_flags + + if(!closed)//Open turfs have some special behavior related to spawning flora and mobs. + + var/turf/open/new_open_turf = new_turf + + ///Spawning isn't done in procs to save on overhead on the 60k turfs we're going through. + + //FLORA SPAWNING HERE + var/atom/spawned_flora + if(flora_spawn_list && prob(flora_spawn_chance)) + var/can_spawn = TRUE + + if(!(A.area_flags & FLORA_ALLOWED)) + can_spawn = FALSE + if(can_spawn) + spawned_flora = pickweight(flora_spawn_list) + spawned_flora = new spawned_flora(new_open_turf) + + //FEATURE SPAWNING HERE + var/atom/spawned_feature + if(feature_spawn_list && prob(feature_spawn_chance)) + var/can_spawn = TRUE + + if(!(A.area_flags & FLORA_ALLOWED)) //checks the same flag because lol dunno + can_spawn = FALSE + + var/atom/picked_feature = pickweight(feature_spawn_list) + + for(var/obj/structure/F in range(7, new_open_turf)) + if(istype(F, picked_feature)) + can_spawn = FALSE + + if(can_spawn) + spawned_feature = new picked_feature(new_open_turf) + + //MOB SPAWNING HERE + + if(mob_spawn_list && !spawned_flora && !spawned_feature && prob(mob_spawn_chance)) + var/can_spawn = TRUE + + if(!(A.area_flags & MOB_SPAWN_ALLOWED)) + can_spawn = FALSE + + var/atom/picked_mob = pickweight(mob_spawn_list) + + if(picked_mob == SPAWN_MEGAFAUNA) // + if((A.area_flags & MEGAFAUNA_SPAWN_ALLOWED) && megafauna_spawn_list?.len) //this is danger. it's boss time. + picked_mob = pickweight(megafauna_spawn_list) + else //this is not danger, don't spawn a boss, spawn something else + picked_mob = pickweight(mob_spawn_list - SPAWN_MEGAFAUNA) //What if we used 100% of the brain...and did something (slightly) less shit than a while loop? + + for(var/thing in urange(12, new_open_turf)) //prevents mob clumps + if(!ishostile(thing) && !istype(thing, /obj/structure/spawner)) + continue + if((ispath(picked_mob, /mob/living/simple_animal/hostile/megafauna) || ismegafauna(thing)) && get_dist(new_open_turf, thing) <= 7) + can_spawn = FALSE //if there's a megafauna within standard view don't spawn anything at all + break + if(ispath(picked_mob, /mob/living/simple_animal/hostile/asteroid) || istype(thing, /mob/living/simple_animal/hostile/asteroid)) + can_spawn = FALSE //if the random is a standard mob, avoid spawning if there's another one within 12 tiles + break + if((ispath(picked_mob, /obj/structure/spawner/lavaland) || istype(thing, /obj/structure/spawner/lavaland)) && get_dist(new_open_turf, thing) <= 2) + can_spawn = FALSE //prevents tendrils spawning in each other's collapse range + break + + if(can_spawn) + if(ispath(picked_mob, /mob/living/simple_animal/hostile/megafauna/bubblegum)) //there can be only one bubblegum, so don't waste spawns on it + megafauna_spawn_list.Remove(picked_mob) + + new picked_mob(new_open_turf) + CHECK_TICK + + var/message = "[name] finished in [(REALTIMEOFDAY - start_time)/10]s!" + to_chat(world, "[message]") + log_world(message) diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm new file mode 100644 index 0000000000000..9daf0e8318f39 --- /dev/null +++ b/code/datums/mapgen/Cavegens/LavalandGenerator.dm @@ -0,0 +1,17 @@ +/datum/map_generator/cave_generator/lavaland + open_turf_types = list(/turf/open/floor/plating/asteroid/basalt/lava_land_surface = 1) + closed_turf_types = list(/turf/closed/mineral/random/volcanic = 1) + blacklisted_turf_types = list(/turf/open/lava) // Don't override lava rivers + + + feature_spawn_list = list(/obj/structure/geyser/random = 1) + mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, \ + /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \ + /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \ + SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10) + flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ash/strange = 1) + + initial_closed_chance = 45 + smoothing_iterations = 50 + birth_limit = 4 + death_limit = 3 diff --git a/code/datums/mapgen/JungleGenerator.dm b/code/datums/mapgen/JungleGenerator.dm new file mode 100644 index 0000000000000..1e329ac3df634 --- /dev/null +++ b/code/datums/mapgen/JungleGenerator.dm @@ -0,0 +1,95 @@ +//the random offset applied to square coordinates, causes intermingling at biome borders +#define BIOME_RANDOM_SQUARE_DRIFT 2 + +/datum/map_generator/jungle_generator + ///2D list of all biomes based on heat and humidity combos. + var/list/possible_biomes = list( + BIOME_LOW_HEAT = list( + BIOME_LOW_HUMIDITY = /datum/biome/plains, + BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/mudlands, + BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/mudlands, + BIOME_HIGH_HUMIDITY = /datum/biome/water + ), + BIOME_LOWMEDIUM_HEAT = list( + BIOME_LOW_HUMIDITY = /datum/biome/plains, + BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/jungle, + BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/jungle, + BIOME_HIGH_HUMIDITY = /datum/biome/mudlands + ), + BIOME_HIGHMEDIUM_HEAT = list( + BIOME_LOW_HUMIDITY = /datum/biome/plains, + BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/plains, + BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/jungle/deep, + BIOME_HIGH_HUMIDITY = /datum/biome/jungle + ), + BIOME_HIGH_HEAT = list( + BIOME_LOW_HUMIDITY = /datum/biome/wasteland, + BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/plains, + BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/jungle, + BIOME_HIGH_HUMIDITY = /datum/biome/jungle/deep + ) + ) + ///Used to select "zoom" level into the perlin noise, higher numbers result in slower transitions + var/perlin_zoom = 65 + +///Seeds the rust-g perlin noise with a random number. +/datum/map_generator/jungle_generator/generate_terrain(var/list/turfs) + . = ..() + var/height_seed = rand(0, 50000) + var/humidity_seed = rand(0, 50000) + var/heat_seed = rand(0, 50000) + + for(var/t in turfs) //Go through all the turfs and generate them + var/turf/gen_turf = t + var/drift_x = (gen_turf.x + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom + var/drift_y = (gen_turf.y + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom + + var/height = text2num(rustg_noise_get_at_coordinates("[height_seed]", "[drift_x]", "[drift_y]")) + + + var/datum/biome/selected_biome + if(height <= 0.85) //If height is less than 0.85, we generate biomes based on the heat and humidity of the area. + var/humidity = text2num(rustg_noise_get_at_coordinates("[humidity_seed]", "[drift_x]", "[drift_y]")) + var/heat = text2num(rustg_noise_get_at_coordinates("[heat_seed]", "[drift_x]", "[drift_y]")) + var/heat_level //Type of heat zone we're in LOW-MEDIUM-HIGH + var/humidity_level //Type of humidity zone we're in LOW-MEDIUM-HIGH + + switch(heat) + if(0 to 0.25) + heat_level = BIOME_LOW_HEAT + if(0.25 to 0.5) + heat_level = BIOME_LOWMEDIUM_HEAT + if(0.5 to 0.75) + heat_level = BIOME_HIGHMEDIUM_HEAT + if(0.75 to 1) + heat_level = BIOME_HIGH_HEAT + switch(humidity) + if(0 to 0.25) + humidity_level = BIOME_LOW_HUMIDITY + if(0.25 to 0.5) + humidity_level = BIOME_LOWMEDIUM_HUMIDITY + if(0.5 to 0.75) + humidity_level = BIOME_HIGHMEDIUM_HUMIDITY + if(0.75 to 1) + humidity_level = BIOME_HIGH_HUMIDITY + selected_biome = possible_biomes[heat_level][humidity_level] + else //Over 0.85; It's a mountain + selected_biome = /datum/biome/mountain + selected_biome = SSmapping.biomes[selected_biome] //Get the instance of this biome from SSmapping + selected_biome.generate_turf(gen_turf) + CHECK_TICK + +/turf/open/genturf + name = "ungenerated turf" + desc = "If you see this, and you're not a ghost, yell at coders" + icon = 'icons/turf/debug.dmi' + icon_state = "genturf" + ///Can be: null, GENTURF_HINT_OPEN or GENTURF_HINT_CLOSED + var/genturf_hint + ///Should the generation be ran even if the area forbids it? + var/force_generation + +/area/mine/planetgeneration + name = "planet generation area" + dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + map_generator = /datum/map_generator/jungle_generator diff --git a/code/datums/mapgen/_MapGenerator.dm b/code/datums/mapgen/_MapGenerator.dm new file mode 100644 index 0000000000000..aa4406bf789e0 --- /dev/null +++ b/code/datums/mapgen/_MapGenerator.dm @@ -0,0 +1,6 @@ +///This type is responsible for any map generation behavior that is done in areas, override this to allow for area-specific map generation. This generation is ran by areas in initialize. +/datum/map_generator + +///This proc will be ran by areas on Initialize, and provides the areas turfs as argument to allow for generation. +/datum/map_generator/proc/generate_terrain(var/list/turfs) + return diff --git a/code/datums/mapgen/biomes/_biome.dm b/code/datums/mapgen/biomes/_biome.dm new file mode 100644 index 0000000000000..bf0f02cfbaadf --- /dev/null +++ b/code/datums/mapgen/biomes/_biome.dm @@ -0,0 +1,50 @@ +///This datum handles the transitioning from a turf to a specific biome, and handles spawning decorative structures and mobs. +/datum/biome + ///Type of turf this biome creates + var/turf_type + ///Chance of having a structure from the flora types list spawn + var/flora_density = 0 + ///Chance of having a mob from the fauna types list spawn + var/fauna_density = 0 + ///list of type paths of objects that can be spawned when the turf spawns flora + var/list/flora_types = list(/obj/structure/flora/grass/jungle) + ///list of type paths of mobs that can be spawned when the turf spawns fauna + var/list/fauna_types = list() + +///This proc handles the creation of a turf of a specific biome type +/datum/biome/proc/generate_turf(var/turf/gen_turf) + gen_turf.ChangeTurf(turf_type, null, CHANGETURF_DEFER_CHANGE) + if(length(fauna_types) && prob(fauna_density)) + var/mob/fauna = pick(fauna_types) + new fauna(gen_turf) + + if(length(flora_types) && prob(flora_density)) + var/obj/structure/flora = pick(flora_types) + new flora(gen_turf) + +/datum/biome/mudlands + turf_type = /turf/open/floor/plating/dirt/jungle/dark + flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/rock/jungle, /obj/structure/flora/rock/pile/largejungle) + flora_density = 3 + +/datum/biome/plains + turf_type = /turf/open/floor/plating/grass/jungle + flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/tree/jungle, /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/b, /obj/structure/flora/junglebush/c, /obj/structure/flora/junglebush/large, /obj/structure/flora/rock/pile/largejungle) + flora_density = 15 + +/datum/biome/jungle + turf_type = /turf/open/floor/plating/grass/jungle + flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/tree/jungle, /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/b, /obj/structure/flora/junglebush/c, /obj/structure/flora/junglebush/large, /obj/structure/flora/rock/pile/largejungle) + flora_density = 40 + +/datum/biome/jungle/deep + flora_density = 65 + +/datum/biome/wasteland + turf_type = /turf/open/floor/plating/dirt/jungle/wasteland + +/datum/biome/water + turf_type = /turf/open/water/jungle + +/datum/biome/mountain + turf_type = /turf/closed/mineral/random/jungle diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm index 206792c3ec573..475936d11cb0d 100644 --- a/code/datums/martial/_martial.dm +++ b/code/datums/martial/_martial.dm @@ -89,7 +89,7 @@ else if(make_temporary) base = H.mind.default_martial_art if(help_verb) - H.verbs += help_verb + H.add_verb(help_verb) H.mind.martial_art = src return TRUE @@ -112,5 +112,5 @@ /datum/martial_art/proc/on_remove(mob/living/carbon/human/H) if(help_verb) - H.verbs -= help_verb + H.remove_verb(help_verb) return diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 0e0d201e02e95..13be970cfdfd4 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -54,7 +54,7 @@ /obj/item/clothing/gloves/boxing/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_GLOVES) + if(slot == ITEM_SLOT_GLOVES) var/mob/living/carbon/human/H = user style.teach(H,1) return @@ -63,6 +63,6 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_GLOVES) == src) + if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src) style.remove(H) return diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 94434cffc57ae..0d756b4fe316a 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -183,7 +183,7 @@ /obj/item/clothing/gloves/krav_maga/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_GLOVES) + if(slot == ITEM_SLOT_GLOVES) var/mob/living/carbon/human/H = user style.teach(H,1) @@ -191,7 +191,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_GLOVES) == src) + if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src) style.remove(H) /obj/item/clothing/gloves/krav_maga/sec//more obviously named, given to sec @@ -218,4 +218,4 @@ heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50) \ No newline at end of file + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50, "stamina" = 0) diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index 45276a50405c4..359fd4d49318b 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -36,10 +36,7 @@ A.say("TORNADO SWEEP!", forced="plasma fist") TornadoAnimate(A) var/obj/effect/proc_holder/spell/aoe_turf/repulse/R = new(null) - var/list/turfs = list() - for(var/turf/T in range(1,A)) - turfs.Add(T) - R.cast(turfs) + R.cast(RANGE_TURFS(1,A)) log_combat(A, D, "tornado sweeped(Plasma Fist)") return diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm index 7aa202271865a..df229c9ec9fd5 100644 --- a/code/datums/martial/psychotic_brawl.dm +++ b/code/datums/martial/psychotic_brawl.dm @@ -3,9 +3,13 @@ id = MARTIALART_PSYCHOBRAWL /datum/martial_art/psychotic_brawling/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + if(HAS_TRAIT(A, TRAIT_PACIFISM)) + return FALSE return psycho_attack(A,D) /datum/martial_art/psychotic_brawling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + if(HAS_TRAIT(A, TRAIT_PACIFISM)) + return FALSE return psycho_attack(A,D) /datum/martial_art/psychotic_brawling/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 2e2d08dc18695..85e17a7cd9702 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -162,16 +162,12 @@ to_chat(usr, "Head Kick: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand.") to_chat(usr, "Elbow Drop: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition.") -/obj/item/twohanded/bostaff +/obj/item/staff/bostaff name = "bo staff" desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate." force = 10 w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK - force_unwielded = 10 - force_wielded = 24 - block_power_wielded = 50 - block_power_unwielded = 25 throwforce = 20 throw_speed = 2 attack_verb = list("smashed", "slammed", "whacked", "thwacked") @@ -183,10 +179,15 @@ block_upgrade_walk = 1 block_power = 25 -/obj/item/twohanded/bostaff/update_icon_state() - icon_state = "bostaff[wielded]" +/obj/item/staff/bostaff/ComponentInitialize() + . = ..() + AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=24, block_power_unwielded=25, block_power_wielded=50, icon_wielded="bostaff1") -/obj/item/twohanded/bostaff/attack(mob/target, mob/living/user) +/obj/item/staff/bostaff/update_icon_state() + icon_state = "bostaff0" + ..() + +/obj/item/staff/bostaff/attack(mob/target, mob/living/user) add_fingerprint(user) if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) to_chat(user, "You club yourself over the head with [src].") @@ -206,7 +207,7 @@ to_chat(user, "It would be dishonorable to attack a foe while they cannot retaliate.") return if(user.a_intent == INTENT_DISARM) - if(!wielded) + if(!ISWIELDED(src)) return ..() if(!ishuman(target)) return ..() @@ -235,7 +236,7 @@ else return ..() -/obj/item/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - if(wielded) +/obj/item/staff/bostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(!ISWIELDED(src)) return ..() return 0 diff --git a/code/datums/martial/tribal_claw.dm b/code/datums/martial/tribal_claw.dm new file mode 100644 index 0000000000000..7e90d65d4bc85 --- /dev/null +++ b/code/datums/martial/tribal_claw.dm @@ -0,0 +1,110 @@ +#define TAIL_SWEEP_COMBO "DDGH" +#define FACE_SCRATCH_COMBO "HD" +#define JUGULAR_CUT_COMBO "HHG" +#define TAIL_GRAB_COMBO "DHGG" + +/datum/martial_art/tribal_claw + name = "Tribal Claw" + id = MARTIALART_TRIBALCLAW + allow_temp_override = FALSE + help_verb = /mob/living/carbon/human/proc/tribal_claw_help + +/datum/martial_art/tribal_claw/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) + if(findtext(streak,TAIL_SWEEP_COMBO)) + streak = "" + tailSweep(A,D) + return TRUE + if(findtext(streak,FACE_SCRATCH_COMBO)) + streak = "" + faceScratch(A,D) + return TRUE + if(findtext(streak,JUGULAR_CUT_COMBO)) + streak = "" + jugularCut(A,D) + return TRUE + if(findtext(streak,TAIL_GRAB_COMBO)) + streak = "" + tailGrab(A,D) + return TRUE + return FALSE + +//Tail Sweep, triggers an effect similar to Space Dragon's tail sweep but only affects stuff 1 tile next to you, basically 3x3. +/datum/martial_art/tribal_claw/proc/tailSweep(mob/living/carbon/human/A, mob/living/carbon/human/D) + if(A == current_target) + return + log_combat(A, D, "tail sweeped(Tribal Claw)") + D.visible_message("[A] sweeps [D]'s legs with their tail!", \ + "[A] sweeps your legs with their tail!") + var/obj/effect/proc_holder/spell/aoe_turf/repulse/spacedragon/R = new + R.cast(RANGE_TURFS(1,A)) + +//Face Scratch, deals 10 brute to head(reduced by armor), blurs the target's vision and gives them the confused effect for a short time. +/datum/martial_art/tribal_claw/proc/faceScratch(mob/living/carbon/human/A, mob/living/carbon/human/D) + var/def_check = D.getarmor(BODY_ZONE_HEAD, "melee") + log_combat(A, D, "face scratched (Tribal Claw)") + D.visible_message("[A] scratches [D]'s face with their claws!", \ + "[A] scratches your face with their claws!") + D.apply_damage(10, BRUTE, BODY_ZONE_HEAD, def_check) + D.confused += 5 + D.blur_eyes(5) + A.do_attack_animation(D, ATTACK_EFFECT_CLAW) + playsound(get_turf(D), 'sound/weapons/slash.ogg', 50, 1, -1) + +/* +Jugular Cut, can only be done if the target is in crit, being held in a tier 3 grab by the user or if they are sleeping. +Deals 15 brute to head(reduced by armor) and causes a rapid bleeding effect similar to throat slicing someone with a sharp item. +*/ +/datum/martial_art/tribal_claw/proc/jugularCut(mob/living/carbon/human/A, mob/living/carbon/human/D) + var/def_check = D.getarmor(BODY_ZONE_HEAD, "melee") + if((D.health <= D.crit_threshold || (A.pulling == D && A.grab_state >= GRAB_NECK) || D.IsSleeping())) + log_combat(A, D, "jugular cut (Tribal Claw)") + D.visible_message("[A] cuts [D]'s jugular vein with their claws!", \ + "[A] cuts your jugular vein!") + D.apply_damage(15, BRUTE, BODY_ZONE_HEAD, def_check) + D.bleed_rate = CLAMP(D.bleed_rate + 20, 0, 30) + D.apply_status_effect(/datum/status_effect/neck_slice) + A.do_attack_animation(D, ATTACK_EFFECT_CLAW) + playsound(get_turf(D), 'sound/weapons/slash.ogg', 50, 1, -1) + else + return basic_hit(A,D) + +//Tail Grab, instantly puts your target in a T3 grab and makes them unable to talk for a short time. +/datum/martial_art/tribal_claw/proc/tailGrab(mob/living/carbon/human/A, mob/living/carbon/human/D) + log_combat(A, D, "tail grabbed (Tribal Claw)") + D.visible_message("[A] grabs [D] with their tail!", \ + "[A] grabs you with their tail!") + D.grabbedby(A, 1) + D.Knockdown(5) //Without knockdown target still stands up while T3 grabbed. + A.setGrabState(GRAB_NECK) + if(D.silent <= 10) + D.silent = CLAMP(D.silent + 10, 0, 10) + +/datum/martial_art/tribal_claw/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + add_to_streak("H",D) + if(check_streak(A,D)) + return TRUE + return FALSE + +/datum/martial_art/tribal_claw/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + add_to_streak("D",D) + if(check_streak(A,D)) + return TRUE + return FALSE + +/datum/martial_art/tribal_claw/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + add_to_streak("G",D) + if(check_streak(A,D)) + return TRUE + return FALSE + +/mob/living/carbon/human/proc/tribal_claw_help() + set name = "Recall Teachings" + set desc = "Remember the martial techniques of the Tribal Claw" + set category = "Tribal Claw" + + to_chat(usr, "You retreat inward and recall the teachings of the Tribal Claw...") + + to_chat(usr, "Tail Sweep: Disarm Disarm Grab Harm. Pushes everyone around you away and knocks them down.") + to_chat(usr, "Face Scratch: Harm Disarm. Damages your target's head and confuses them for a short time.") + to_chat(usr, "Jugular Cut: Harm Harm Grab. Causes your target to rapidly lose blood, works only if you grab your target by their neck, if they are sleeping, or in critical condition.") + to_chat(usr, "Tail Grab: Disarm Harm Grab Grab. Grabs your target by their neck and makes them unable to talk for a short time.") diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index 53b35784806d1..12d73e4ceaded 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -364,9 +364,7 @@ var/falling = 0 for (var/obj/O in oview(1, A)) - if (O.density == 1) - if (O == A) - continue + if(O.density) if (O == D) continue if (O.opacity) @@ -458,7 +456,7 @@ /obj/item/storage/belt/champion/wrestling/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_BELT) + if(slot == ITEM_SLOT_BELT) var/mob/living/carbon/human/H = user style.teach(H,1) return @@ -467,6 +465,6 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_BELT) == src) + if(H.get_item_by_slot(ITEM_SLOT_BELT) == src) style.remove(H) return diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm index ec3ec0d05c234..fd169200a8371 100644 --- a/code/datums/materials/_material.dm +++ b/code/datums/materials/_material.dm @@ -1,6 +1,6 @@ /*! Material datum -Simple datum which is instanced once per type and is used for every object of said material. It has a variety of variables that define behavior. Subtyping from this makes it easier to create your own materials. +Simple datum which is instanced once per type and is used for every object of said material. It has a variety of variables that define behavior. Subtyping from this makes it easier to create your own materials. */ @@ -52,7 +52,7 @@ Simple datum which is instanced once per type and is used for every object of sa if(color) source.remove_atom_colour(FIXED_COLOUR_PRIORITY, color) source.alpha = initial(source.alpha) - + if(istype(source, /obj)) //objs on_removed_obj(source, material_flags) diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index c0c5fba56a647..19a6d9945fc16 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -83,12 +83,12 @@ /datum/material/plasma/on_applied(atom/source, amount, material_flags) . = ..() if(ismovableatom(source)) - source.AddElement(/datum/element/firestacker, 1) + source.AddElement(/datum/element/firestacker, amount=1) source.AddComponent(/datum/component/explodable, 0, 0, amount / 1000, amount / 500) /datum/material/plasma/on_removed(atom/source, material_flags) . = ..() - source.RemoveElement(/datum/element/firestacker, 1) + source.RemoveElement(/datum/element/firestacker, amount=1) qdel(source.GetComponent(/datum/component/explodable)) ///Can cause bluespace effects on use. (Teleportation) (Not yet implemented) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 9b062b13e174a..0d427225e474d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -55,7 +55,7 @@ var/damnation_type = 0 var/datum/mind/soulOwner //who owns the soul. Under normal circumstances, this will point to src var/hasSoul = TRUE // If false, renders the character unable to sell their soul. - var/isholy = FALSE //is this person a chaplain or admin role allowed to use bibles + var/holy_role = NONE //is this person a chaplain or admin role allowed to use bibles, Any rank besides 'NONE' allows for this. var/isAntagTarget = FALSE var/no_cloning_at_all = FALSE @@ -71,6 +71,9 @@ var/list/learned_recipes //List of learned recipe TYPES. var/list/crew_objectives = list() + /// A lazy list of statuses to add next to this mind in the traitor panel + var/list/special_statuses + /datum/mind/New(var/key) src.key = key soulOwner = src @@ -84,8 +87,23 @@ if(antag_datum.delete_on_mind_deletion) qdel(i) antag_datums = null + QDEL_NULL(language_holder) + set_current(null) return ..() +/datum/mind/proc/set_current(mob/new_current) + if(new_current && QDELING(new_current)) + CRASH("Tried to set a mind's current var to a qdeleted mob, what the fuck") + if(current) + UnregisterSignal(src, COMSIG_PARENT_QDELETING) + current = new_current + if(current) + RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/clear_current) + +/datum/mind/proc/clear_current(datum/source) + SIGNAL_HANDLER + set_current(null) + /datum/mind/proc/get_language_holder() if(!language_holder) language_holder = new (src) @@ -99,18 +117,18 @@ if(key) if(new_character.key != key) //if we're transferring into a body with a key associated which is not ours - new_character.ghostize(1) //we'll need to ghostize so that key isn't mobless. + new_character.ghostize(TRUE,SENTIENCE_ERASE) //we'll need to ghostize so that key isn't mobless. else key = new_character.key if(new_character.mind) //disassociate any mind currently in our new body's mind variable - new_character.mind.current = null + new_character.mind.set_current(null) var/datum/atom_hud/antag/hud_to_transfer = antag_hud//we need this because leave_hud() will clear this list var/mob/living/old_current = current if(current) current.transfer_observers_to(new_character) //transfer anyone observing the old character to the new one - current = new_character //associate ourself with our new body + set_current(new_character) //associate ourself with our new body new_character.mind = src //and associate our new body with ourself for(var/a in antag_datums) //Makes sure all antag datums effects are applied in the new body var/datum/antagonist/A = a @@ -128,11 +146,13 @@ SEND_SIGNAL(src, COMSIG_MIND_TRANSFER_TO, old_current, new_character) /datum/mind/proc/set_death_time() + SIGNAL_HANDLER + last_death = world.time /datum/mind/proc/store_memory(new_text) var/newlength = length(memory) + length(new_text) - if (newlength > MAX_MESSAGE_LEN * 100) + if(newlength > MAX_MESSAGE_LEN * 100) memory = copytext(memory, -newlength-MAX_MESSAGE_LEN * 100) memory += "[new_text]
" @@ -165,6 +185,7 @@ if(antag_team) antag_team.add_member(src) A.on_gain() + log_game("[key_name(src)] has gained antag datum [A.name]([A.type])") return A /datum/mind/proc/remove_antag_datum(datum_type) @@ -328,7 +349,7 @@ SSticker.mode.add_cultist(src) else if(is_servant_of_ratvar(creator)) - add_servant_of_ratvar(src) + add_servant_of_ratvar(current) else if(is_revolutionary(creator)) var/datum/antagonist/rev/converter = creator.mind.has_antag_datum(/datum/antagonist/rev,TRUE) @@ -347,9 +368,10 @@ current.faction |= creator.faction creator.faction |= current.faction - if(creator.mind.special_role) + var/mob/living/carbon/C = creator + if(creator.mind?.special_role || (istype(C) && C.last_mind?.special_role)) message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.") - to_chat(current, "Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless your creator's body is destroyed.") + to_chat(current, "Despite your creator's current allegiances, your true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless your creator's body is destroyed.") /datum/mind/proc/show_memory(mob/recipient, window=1) if(!recipient) @@ -683,6 +705,11 @@ if(G) G.reenter_corpse() +/// Sets our can_hijack to the fastest speed our antag datums allow. +/datum/mind/proc/get_hijack_speed() + . = 0 + for(var/datum/antagonist/A in antag_datums) + . = max(., A.hijack_speed()) /datum/mind/proc/has_objective(objective_type) for(var/datum/antagonist/A in antag_datums) @@ -715,7 +742,7 @@ SSticker.minds += mind if(!mind.name) mind.name = real_name - mind.current = src + mind.set_current(src) /mob/living/carbon/mind_initialize() ..() diff --git a/code/datums/mocking/client.dm b/code/datums/mocking/client.dm new file mode 100644 index 0000000000000..913c47e2a31bb --- /dev/null +++ b/code/datums/mocking/client.dm @@ -0,0 +1,4 @@ +/// This should match the interface of /client wherever necessary. +/datum/client_interface + /// Player preferences datum for the client + var/datum/preferences/prefs diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index c0481c15d9b09..75157efe6989d 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -217,3 +217,17 @@ /datum/mood_event/nanite_sadness/add_effects(message) description = "+++++++[message]+++++++\n" + +/datum/mood_event/sec_insulated_gloves + description = "I look like an Assistant...\n" + mood_change = -1 + +/datum/mood_event/burnt_wings + description = "MY PRECIOUS WINGS!!\n" + mood_change = -10 + timeout = 10 MINUTES + +/datum/mood_event/aquarium_negative + description = "All the fish are dead...\n" + mood_change = -3 + timeout = 1.5 MINUTES \ No newline at end of file diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 16806a459e10f..6abfbdf679ea4 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -19,6 +19,11 @@ /datum/mood_event/besthug/add_effects(mob/friend) description = "[friend.name] is great to be around, [friend.p_they()] makes me feel so happy!\n" +/datum/mood_event/headpat + description = "Headpats are lovely!\n" + mood_change = 1 + timeout = 2 MINUTES + /datum/mood_event/arcade description = "I beat the arcade game!\n" mood_change = 3 @@ -91,7 +96,7 @@ /datum/mood_event/cult description = "I have seen the truth, praise the almighty one!\n" - mood_change = 10 //maybe being a cultist isnt that bad after all + mood_change = 10 //maybe being a cultist isn't that bad after all hidden = TRUE /datum/mood_event/determined @@ -101,7 +106,7 @@ /datum/mood_event/heretics description = "THE HIGHER I RISE , THE MORE I SEE.\n" - mood_change = 10 //maybe being a cultist isnt that bad after all + mood_change = 10 //maybe being a cultist isn't that bad after all hidden = TRUE /datum/mood_event/family_heirloom @@ -128,7 +133,7 @@ timeout = 3 MINUTES /datum/mood_event/religiously_comforted - description = "You are comforted by the presence of a holy person.\n" + description = "I feel comforted by the presence of a holy person.\n" mood_change = 3 /datum/mood_event/clownshoes @@ -171,6 +176,15 @@ /datum/mood_event/nanite_happiness/add_effects(message) description = "+++++++[message]+++++++\n" +/datum/mood_event/poppy_pin + description = "I feel proud to show my remembrance of the many who have died to ensure that I have freedom.\n" + mood_change = 1 + +/datum/mood_event/funny_prank + description = "That was a funny prank, clown!\n" + mood_change = 2 + timeout = 2 MINUTES + /datum/mood_event/area description = "" //Fill this out in the area mood_change = 0 @@ -178,3 +192,16 @@ /datum/mood_event/area/add_effects(list/param) mood_change = param[1] description = param[2] + +/datum/mood_event/sec_black_gloves + description = "Black gloves look good on me.\n" + mood_change = 1 + +/datum/mood_event/assistant_insulated_gloves + description = "Finally got my hands on a good pair of gloves!\n" + mood_change = 1 + +/datum/mood_event/aquarium_positive + description = "Watching fish in aquarium is calming.\n" + mood_change = 3 + timeout = 1.5 MINUTES diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm index 68566c8336be7..dbba37b24a06c 100644 --- a/code/datums/mood_events/needs_events.dm +++ b/code/datums/mood_events/needs_events.dm @@ -1,6 +1,6 @@ //nutrition /datum/mood_event/fat - description = "I'm so fat...\n" //muh fatshaming + description = "I'm so fat.\n" //muh fatshaming mood_change = -6 /datum/mood_event/wellfed @@ -38,15 +38,15 @@ mood_change = -4 /datum/mood_event/verygross - description = "I think I'm going to puke...\n" + description = "I think I'm going to puke.\n" mood_change = -6 /datum/mood_event/disgusted - description = "Oh god that's disgusting...\n" + description = "Oh god, that's disgusting.\n" mood_change = -8 /datum/mood_event/disgust/bad_smell - description = "You smell something horribly decayed inside this room.\n" + description = "I can smell something horribly decayed inside this room.\n" mood_change = -6 /datum/mood_event/disgust/nauseating_stench @@ -60,6 +60,10 @@ /datum/mood_event/dirty description = "I smell horrid.\n" + mood_change = -3 + +/datum/mood_event/disgusting + description = "I smell DISGUSTING!\n" mood_change = -5 /datum/mood_event/happy_neet diff --git a/code/datums/movement_detector.dm b/code/datums/movement_detector.dm new file mode 100644 index 0000000000000..2bb1ce0de7bf5 --- /dev/null +++ b/code/datums/movement_detector.dm @@ -0,0 +1,55 @@ +/// A datum to handle the busywork of registering signals to handle in depth tracking of a movable +/datum/movement_detector + var/atom/movable/tracked + var/datum/callback/listener + +/datum/movement_detector/New(atom/movable/target, datum/callback/listener) + if(target) + track(target, listener) + +/datum/movement_detector/Destroy() + untrack() + tracked = null + listener = null + return ..() + +/// Sets up tracking of the given movable atom +/datum/movement_detector/proc/track(atom/movable/target, datum/callback/listener) + untrack() + tracked = target + src.listener = listener + + while(ismovableatom(target)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react) + target = target.loc + +/// Stops tracking +/datum/movement_detector/proc/untrack() + if(!tracked) + return + var/atom/movable/target = tracked + while(ismovableatom(target)) + UnregisterSignal(target, COMSIG_MOVABLE_MOVED) + target = target.loc + +/** + * Reacts to any movement that would cause a change in coordinates of the tracked movable atom + * This works by detecting movement of either the tracked object, or anything it is inside, recursively + */ +/datum/movement_detector/proc/move_react(atom/movable/mover, atom/oldloc, direction) + SIGNAL_HANDLER + + var/turf/newturf = get_turf(tracked) + + if(oldloc && !isturf(oldloc)) + var/atom/target = oldloc + while(ismovableatom(target)) + UnregisterSignal(target, COMSIG_MOVABLE_MOVED) + target = target.loc + if(tracked.loc != newturf) + var/atom/target = mover.loc + while(ismovableatom(target)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react, TRUE) + target = target.loc + + listener.Invoke(tracked, mover, oldloc, direction) diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm index 791401f8fe516..aa826f1ad682f 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -23,7 +23,7 @@ var/instability = 0 //instability the holder gets when the mutation is not native var/blocks = 4 //Amount of those big blocks with gene sequences var/difficulty = 8 //Amount of missing sequences. Sometimes it removes an entire pair for 2 points - var/timed = FALSE //Boolean to easily check if we're going to self destruct + var/timed = FALSE //Boolean to easily check if we're going to self-destruct var/alias //'Mutation #49', decided every round to get some form of distinction between undiscovered mutations var/scrambled = FALSE //Wheter we can read it if it's active. To avoid cheesing with mutagen var/class //Decides player accesibility, sorta @@ -32,6 +32,7 @@ //MUT_NORMAL - A mutation that can be activated and deactived by completing a sequence //MUT_EXTRA - A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before it's name in the mutation section of the dna console //MUT_OTHER Cannot be interacted with by players through normal means. I.E. wizards mutate + var/list/valid_chrom_list = list() //List of strings of valid chromosomes this mutation can accept. var/can_chromosome = CHROMOSOME_NONE //can we take chromosomes? 0: CHROMOSOME_NEVER never, 1:CHROMOSOME_NONE yeah, 2: CHROMOSOME_USED no, already have one @@ -157,6 +158,7 @@ energy_coeff = HM.energy_coeff mutadone_proof = HM.mutadone_proof can_chromosome = HM.can_chromosome + valid_chrom_list = HM.valid_chrom_list /datum/mutation/human/proc/remove_chromosome() stabilizer_coeff = initial(stabilizer_coeff) @@ -182,3 +184,23 @@ power.panel = "Genetic" owner.AddSpell(power) return TRUE + +// Runs through all the coefficients and uses this to determine which chromosomes the +// mutation can take. Stores these as text strings in a list. +/datum/mutation/human/proc/update_valid_chromosome_list() + valid_chrom_list.Cut() + + if(can_chromosome == CHROMOSOME_NEVER) + valid_chrom_list += "none" + return + + valid_chrom_list += "Reinforcement" + + if(stabilizer_coeff != -1) + valid_chrom_list += "Stabilizer" + if(synchronizer_coeff != -1) + valid_chrom_list += "Synchronizer" + if(power_coeff != -1) + valid_chrom_list += "Power" + if(energy_coeff != -1) + valid_chrom_list += "Energetic" diff --git a/code/datums/mutations/_combined.dm b/code/datums/mutations/_combined.dm index 1e6aa90dbe518..a0776532b4aa6 100644 --- a/code/datums/mutations/_combined.dm +++ b/code/datums/mutations/_combined.dm @@ -17,10 +17,6 @@ required = "/datum/mutation/human/strong; /datum/mutation/human/radioactive" result = HULK -/datum/generecipe/x_ray - required = "/datum/mutation/human/thermal; /datum/mutation/human/radioactive" - result = /datum/mutation/human/thermal/x_ray - /datum/generecipe/mindread required = "/datum/mutation/human/antenna; /datum/mutation/human/paranoia" result = MINDREAD diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index 9bd282100b63e..9486416ca6cfd 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -25,9 +25,9 @@ /datum/mutation/human/olfaction/on_life() var/hygiene_now = owner.hygiene - if(hygiene_now < 100 && prob(5)) + if(hygiene_now < 100 && prob(3)) owner.adjust_disgust(GET_MUTATION_SYNCHRONIZER(src) * (rand(3,5))) - if(hygiene_now < HYGIENE_LEVEL_DIRTY && prob(50)) + if(hygiene_now < HYGIENE_LEVEL_DIRTY && prob(15)) to_chat(owner,"You get a whiff of your stench and feel sick!") owner.adjust_disgust(GET_MUTATION_SYNCHRONIZER(src) * rand(5,10)) @@ -89,10 +89,10 @@ if(tracking_target == user) to_chat(user,"You smell out the trail to yourself. Yep, it's you.") return - if(usr.z < tracking_target.z) + if(usr.get_virtual_z_level() < tracking_target.get_virtual_z_level()) to_chat(user,"The trail leads... way up above you? Huh. They must be really, really far away.") return - else if(usr.z > tracking_target.z) + else if(usr.get_virtual_z_level() > tracking_target.get_virtual_z_level()) to_chat(user,"The trail leads... way down below you? Huh. They must be really, really far away.") return var/direction_text = "[dir2text(get_dir(usr, tracking_target))]" diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm index f49c847f42ddc..c47ef8bb6b22d 100644 --- a/code/datums/mutations/antenna.dm +++ b/code/datums/mutations/antenna.dm @@ -6,7 +6,7 @@ text_lose_indication = "Your antenna shrinks back down." instability = 5 difficulty = 8 - var/obj/item/implant/radio/antenna/linked_radio + var/datum/weakref/radio_weakref /obj/item/implant/radio/antenna name = "internal antenna organ" @@ -21,14 +21,16 @@ /datum/mutation/human/antenna/on_acquiring(mob/living/carbon/human/owner) if(..()) return - linked_radio = new(owner) + var/obj/item/implant/radio/antenna/linked_radio = new(owner) linked_radio.implant(owner, null, TRUE, TRUE) + radio_weakref = WEAKREF(linked_radio) /datum/mutation/human/antenna/on_losing(mob/living/carbon/human/owner) if(..()) return + var/obj/item/implant/radio/antenna/linked_radio = radio_weakref.resolve() if(linked_radio) - linked_radio.Destroy() + QDEL_NULL(linked_radio) /datum/mutation/human/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut) ..() @@ -59,7 +61,7 @@ /obj/effect/proc_holder/spell/targeted/mindread/cast(list/targets, mob/living/carbon/human/user = usr) for(var/mob/living/M in targets) - if(istype(usr.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat) || istype(M.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) + if(istype(usr.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat) || istype(M.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat)) to_chat(usr, "As you reach out with your mind, you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.") return if(M.stat == DEAD) diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index d8907013b13e9..4db8b55c6cfc1 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -71,7 +71,7 @@ desc = "Subject is easily terrified, and may suffer from hallucinations." quality = NEGATIVE text_gain_indication = "You feel screams echo through your mind..." - text_lose_indication = "The screaming in your mind fades." + text_lose_indication = "The screaming in your mind fades." /datum/mutation/human/paranoia/on_life() if(prob(5) && owner.stat == CONSCIOUS) @@ -175,11 +175,11 @@ /datum/mutation/human/race/on_acquiring(mob/living/carbon/human/owner) if(..()) return - . = owner.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) + . = owner.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE | TR_KEEPAI) /datum/mutation/human/race/on_losing(mob/living/carbon/monkey/owner) if(owner && istype(owner) && owner.stat != DEAD && (owner.dna.mutations.Remove(src))) - . = owner.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) + . = owner.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE | TR_KEEPAI) /datum/mutation/human/glow name = "Glowy" @@ -251,7 +251,7 @@ desc = "The user's skin will randomly combust, but is generally alot more resilient to burning." quality = NEGATIVE text_gain_indication = "You feel hot." - text_lose_indication = "You feel a lot cooler." + text_lose_indication = "You feel a lot cooler." difficulty = 14 synchronizer_coeff = 1 power_coeff = 1 @@ -276,7 +276,7 @@ desc = "The victim of the mutation has a very weak link to spatial reality, and may be displaced. Often causes extreme nausea." quality = NEGATIVE text_gain_indication = "The space around you twists sickeningly." - text_lose_indication = "The space around you settles back to normal." + text_lose_indication = "The space around you settles back to normal." difficulty = 18//high so it's hard to unlock and abuse instability = 10 synchronizer_coeff = 1 @@ -306,7 +306,7 @@ desc = "Subject has acidic chemicals building up underneath their skin. This is often lethal." quality = NEGATIVE text_gain_indication = "A horrible burning sensation envelops you as your flesh turns to acid!" - text_lose_indication = "A feeling of relief covers you as your flesh goes back to normal." + text_lose_indication = "A feeling of relief covers you as your flesh goes back to normal." difficulty = 18//high so it's hard to unlock and use on others var/msgcooldown = 0 @@ -346,7 +346,7 @@ desc = "Subject suffers from muscle spasms." quality = NEGATIVE text_gain_indication = "You flinch." - text_lose_indication = "Your flinching subsides." + text_lose_indication = "Your flinching subsides." difficulty = 16 /datum/mutation/human/spastic/on_acquiring() @@ -364,7 +364,7 @@ desc = "A mutation that replaces the right foot with another left foot. It makes standing up after getting knocked down very difficult." quality = NEGATIVE text_gain_indication = "Your right foot feels... left." - text_lose_indication = "Your right foot feels alright." + text_lose_indication = "Your right foot feels alright." difficulty = 16 var/stun_cooldown = 0 diff --git a/code/datums/mutations/cluwne.dm b/code/datums/mutations/cluwne.dm index ce625818fddd5..75b105918f325 100644 --- a/code/datums/mutations/cluwne.dm +++ b/code/datums/mutations/cluwne.dm @@ -19,18 +19,18 @@ if(!istype(H.wear_mask, /obj/item/clothing/mask/cluwne)) if(!H.doUnEquip(H.wear_mask)) qdel(H.wear_mask) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cluwne(H), SLOT_WEAR_MASK) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/cluwne(H), ITEM_SLOT_MASK) if(!istype(H.w_uniform, /obj/item/clothing/under/cluwne)) if(!H.doUnEquip(H.w_uniform)) qdel(H.w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/under/cluwne(H), SLOT_W_UNIFORM) + H.equip_to_slot_or_del(new /obj/item/clothing/under/cluwne(H), ITEM_SLOT_ICLOTHING) if(!istype(H.shoes, /obj/item/clothing/shoes/cluwne)) if(!H.doUnEquip(H.shoes)) qdel(H.shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/cluwne(H), SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/cluwne(H), ITEM_SLOT_FEET) - owner.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/white(owner), SLOT_GLOVES) // this is purely for cosmetic purposes incase they aren't wearing anything in that slot - owner.equip_to_slot_or_del(new /obj/item/storage/backpack/clown(owner), SLOT_BACK) // ditto + owner.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/white(owner), ITEM_SLOT_GLOVES) // this is purely for cosmetic purposes incase they aren't wearing anything in that slot + owner.equip_to_slot_or_del(new /obj/item/storage/backpack/clown(owner), ITEM_SLOT_BACK) // ditto /datum/mutation/human/cluwne/on_life(mob/living/carbon/human/owner) if((prob(15) && owner.IsUnconscious())) diff --git a/code/datums/mutations/cold.dm b/code/datums/mutations/cold.dm index cd10c2b38f759..146f7b21661a6 100644 --- a/code/datums/mutations/cold.dm +++ b/code/datums/mutations/cold.dm @@ -16,6 +16,24 @@ delete_old = FALSE action_icon_state = "snow" +/datum/mutation/human/wax_saliva + name = "Waxy Saliva" + desc = "Allows the user to secrete wax." + quality = POSITIVE + text_gain_indication = "Your mouth feels waxy." + instability = 10 + difficulty = 10 + synchronizer_coeff = 1 + locked = TRUE + power = /obj/effect/proc_holder/spell/targeted/conjure_item/wax + +/obj/effect/proc_holder/spell/targeted/conjure_item/wax + name = "Secrete Wax" + desc = "Concentrate to spit out some wax, useful for bee-themed construction." + item_type = /obj/item/stack/sheet/mineral/wax + charge_max = 50 + delete_old = FALSE + action_icon_state = "honey" /datum/mutation/human/cryokinesis name = "Cryokinesis" diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index d5ad0f9849a8a..2857ddd65c7a0 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -46,6 +46,8 @@ SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk") /datum/mutation/human/hulk/proc/handle_speech(original_message, wrapped_message) + SIGNAL_HANDLER + var/message = wrapped_message[1] if(message) message = "[replacetext(message, ".", "!")]!!" diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 9a30cd623cd5a..bb4a910b52061 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -30,6 +30,8 @@ UnregisterSignal(owner, COMSIG_MOB_SAY) /datum/mutation/human/wacky/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER + speech_args[SPEECH_SPANS] |= SPAN_SANS /datum/mutation/human/mute @@ -73,7 +75,6 @@ message = " [message] " //Time for a friendly game of SS13 message = replacetext(message," stupid "," smart ") - message = replacetext(message," retard "," genius ") message = replacetext(message," unrobust "," robust ") message = replacetext(message," dumb "," smart ") message = replacetext(message," awful "," great ") @@ -153,6 +154,8 @@ UnregisterSignal(owner, COMSIG_MOB_SAY) /datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER + var/message = speech_args[SPEECH_MESSAGE] if(message) message = replacetext(message,"w","v") @@ -182,31 +185,36 @@ UnregisterSignal(owner, COMSIG_MOB_SAY) /datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER + var/message = speech_args[SPEECH_MESSAGE] - if(message) - message = " [message] " - message = replacetext(message," looking at "," gawpin' at ") - message = replacetext(message," great "," bangin' ") - message = replacetext(message," man "," mate ") - message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin ")) - message = replacetext(message," what "," wot ") - message = replacetext(message," drink "," wet ") - message = replacetext(message," get "," giz ") - message = replacetext(message," what "," wot ") - message = replacetext(message," no thanks "," wuddent fukken do one ") - message = replacetext(message," i don't know "," wot mate ") - message = replacetext(message," no "," naw ") - message = replacetext(message," robust "," chin ") - message = replacetext(message," hi "," how what how ") - message = replacetext(message," hello "," sup bruv ") - message = replacetext(message," kill "," bang ") - message = replacetext(message," murder "," bang ") - message = replacetext(message," windows "," windies ") - message = replacetext(message," window "," windy ") - message = replacetext(message," break "," do ") - message = replacetext(message," your "," yer ") - message = replacetext(message," security "," coppers ") - speech_args[SPEECH_MESSAGE] = trim(message) + if(message[1] != "*") + message = " [message]" + var/list/whole_words = strings("british_talk.json", "words") + var/list/british_sounds = strings("british_talk.json", "sounds") + var/list/british_appends = strings("british_talk.json", "appends") + + for(var/key in whole_words) + var/value = whole_words[key] + if(islist(value)) + value = pick(value) + + message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]") + message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]") + message = replacetextEx(message, " [key]", " [value]") + + for(var/key in british_sounds) + var/value = british_sounds[key] + if(islist(value)) + value = pick(value) + + message = replacetextEx(message, "[uppertext(key)]", "[uppertext(value)]") + message = replacetextEx(message, "[capitalize(key)]", "[capitalize(value)]") + message = replacetextEx(message, "[key]", "[value]") + + if(prob(8)) + message += pick(british_appends) + speech_args[SPEECH_MESSAGE] = trim(message) /datum/mutation/human/elvis @@ -239,10 +247,12 @@ UnregisterSignal(owner, COMSIG_MOB_SAY) /datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER + var/message = speech_args[SPEECH_MESSAGE] if(message) message = " [message] " - message = replacetext(message," i'm not "," I aint ") + message = replacetext(message," i'm not "," I ain't ") message = replacetext(message," girl ",pick(" honey "," baby "," baby doll ")) message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo ")) message = replacetext(message," out of "," outta ") diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 0ccf850e37faa..3d94ada343546 100755 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -153,31 +153,31 @@ //Start with uniform,suit,backpack for additional slots if(uniform) - H.equip_to_slot_or_del(new uniform(H),SLOT_W_UNIFORM) + H.equip_to_slot_or_del(new uniform(H),ITEM_SLOT_ICLOTHING, TRUE) if(suit) - H.equip_to_slot_or_del(new suit(H),SLOT_WEAR_SUIT) + H.equip_to_slot_or_del(new suit(H),ITEM_SLOT_OCLOTHING, TRUE) if(back) - H.equip_to_slot_or_del(new back(H),SLOT_BACK) + H.equip_to_slot_or_del(new back(H),ITEM_SLOT_BACK, TRUE) if(belt) - H.equip_to_slot_or_del(new belt(H),SLOT_BELT) + H.equip_to_slot_or_del(new belt(H),ITEM_SLOT_BELT, TRUE) if(gloves) - H.equip_to_slot_or_del(new gloves(H),SLOT_GLOVES) + H.equip_to_slot_or_del(new gloves(H),ITEM_SLOT_GLOVES, TRUE) if(shoes) - H.equip_to_slot_or_del(new shoes(H),SLOT_SHOES) + H.equip_to_slot_or_del(new shoes(H),ITEM_SLOT_FEET, TRUE) if(head) - H.equip_to_slot_or_del(new head(H),SLOT_HEAD) + H.equip_to_slot_or_del(new head(H),ITEM_SLOT_HEAD, TRUE) if(mask) - H.equip_to_slot_or_del(new mask(H),SLOT_WEAR_MASK) + H.equip_to_slot_or_del(new mask(H),ITEM_SLOT_MASK, TRUE) if(neck) - H.equip_to_slot_or_del(new neck(H),SLOT_NECK) + H.equip_to_slot_or_del(new neck(H),ITEM_SLOT_NECK, TRUE) if(ears) - H.equip_to_slot_or_del(new ears(H),SLOT_EARS) + H.equip_to_slot_or_del(new ears(H),ITEM_SLOT_EARS, TRUE) if(glasses) - H.equip_to_slot_or_del(new glasses(H),SLOT_GLASSES) + H.equip_to_slot_or_del(new glasses(H),ITEM_SLOT_EYES, TRUE) if(id) - H.equip_to_slot_or_del(new id(H),SLOT_WEAR_ID) + H.equip_to_slot_or_del(new id(H),ITEM_SLOT_ID, TRUE) if(suit_store) - H.equip_to_slot_or_del(new suit_store(H),SLOT_S_STORE) + H.equip_to_slot_or_del(new suit_store(H),ITEM_SLOT_SUITSTORE, TRUE) if(accessory) var/obj/item/clothing/under/U = H.w_uniform @@ -193,9 +193,9 @@ if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. if(l_pocket) - H.equip_to_slot_or_del(new l_pocket(H),SLOT_L_STORE) + H.equip_to_slot_or_del(new l_pocket(H),ITEM_SLOT_LPOCKET, TRUE) if(r_pocket) - H.equip_to_slot_or_del(new r_pocket(H),SLOT_R_STORE) + H.equip_to_slot_or_del(new r_pocket(H),ITEM_SLOT_RPOCKET, TRUE) if(box) if(!backpack_contents) @@ -209,7 +209,7 @@ if(!isnum_safe(number))//Default to 1 number = 1 for(var/i in 1 to number) - H.equip_to_slot_or_del(new path(H),SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new path(H),ITEM_SLOT_BACKPACK, TRUE) if(!H.head && toggle_helmet && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit)) var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_suit diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm index e793cd1a0b9c7..a1f90ffa9f8f2 100644 --- a/code/datums/radiation_wave.dm +++ b/code/datums/radiation_wave.dm @@ -1,25 +1,53 @@ +#define PRC_FLAG_HL (1<<0) // Send half of current strength to the upper "left" +#define PRC_FLAG_L (1<<1) // Send the whole current strength to the upper "left": direct succession +#define PRC_FLAG_HR (1<<2) // Send half of current strength to the upper "right" +#define PRC_FLAG_R (1<<3) // Send the whole current strength to the upper "right": direct succession + +/** + * Crash Course: Understanding PRC_BEHAVIOR + * We move forward, and in square-by-square manner, so we need a list 8 entries larger than the current one, and future squares are determined from the current square. + * We move clockwise: "left" means intensity_new[i + j], "right" means intensity_new[i + j + 1]. `j` here is offset. + * Most squares are on branch: It moves "left"(L) or "right"(R). + * But, sometimes, a branch can't decide which way to go; then it splits(D) and merges(HL, HR). + * Then there are squares not on branch; those don't go anywhere else(N). + * But branchless squares still need to act radiation; does branchless square's does one time transient succession from both of immediate predecessors + * ... in contrast to "on-branch" squares where there are only one meaningful predecessor. + * Since we are calculating future squares, we need to see if there are any branchless squares needing our attention: (*STAR) + * And, of course, branchless squares might have to draw from another preceding branchless squares. (NWL, NWR) + */ + +#define PRC_BEHAVIOR_N (1<<4) // Not on branch, and both upper squares are on branch + // So we don't calculate prc_behavior every time (setting to 0 would do that) +#define PRC_BEHAVIOR_NWL PRC_FLAG_HL // Not on branch, but will send half of its strength to the "left" since it also is not on branch +#define PRC_BEHAVIOR_NWR PRC_FLAG_HR // Not on branch, but will send half of its strength to the "left" since it also is not on branch +#define PRC_BEHAVIOR_L PRC_FLAG_L // On branch, going "left" +#define PRC_BEHAVIOR_LSTAR (PRC_FLAG_L|PRC_FLAG_HR) // On branch, going "left", but there's branchless square on the "right" +#define PRC_BEHAVIOR_R PRC_FLAG_R // On branch, going "right" +#define PRC_BEHAVIOR_RSTAR (PRC_FLAG_R|PRC_FLAG_HL) // On branch, going "left", but there's branchless square on the "left" +#define PRC_BEHAVIOR_D (PRC_FLAG_L|PRC_FLAG_R) // On branch, double successor. +#define PRC_BEHAVIOR_HL PRC_FLAG_HL // From one of the double successor; single successor on the "left" +#define PRC_BEHAVIOR_HLSTAR (PRC_FLAG_HL|PRC_FLAG_HR) // From one of the double successor; single successor on the "left", but there's branchless square on the "right" +#define PRC_BEHAVIOR_HR PRC_FLAG_HR // From one of the double successor; single successor on the "right" +#define PRC_BEHAVIOR_HRSTAR (PRC_FLAG_HR|PRC_FLAG_HL) // From one of the double successor; single successor on the "right", but there's branchless square on the "left" + /datum/radiation_wave var/source var/turf/master_turf //The center of the wave - var/steps=0 //How far we've moved - var/intensity //How strong it was originaly + var/steps = 0 //How far we've moved + var/intensity[8] //How strong it is, except the distance falloff var/range_modifier //Higher than 1 makes it drop off faster, 0.5 makes it drop off half etc - var/move_dir //The direction of movement - var/list/__dirs //The directions to the side of the wave, stored for easy looping var/can_contaminate + var/static/list/prc_behavior_cache -/datum/radiation_wave/New(atom/_source, dir, _intensity=0, _range_modifier=RAD_DISTANCE_COEFFICIENT, _can_contaminate=TRUE) +/datum/radiation_wave/New(atom/_source, _intensity=0, _range_modifier=RAD_DISTANCE_COEFFICIENT, _can_contaminate=TRUE) source = "[_source] \[[REF(_source)]\]" master_turf = get_turf(_source) - move_dir = dir - __dirs = list() - __dirs+=turn(dir, 90) - __dirs+=turn(dir, -90) - - intensity = _intensity + // Yes, it causes (8 / range_modifier ** 2) times the strength you gave to the radiation_pulse(). + for(var/i in 1 to 8) + intensity[i] = _intensity range_modifier = _range_modifier can_contaminate = _can_contaminate @@ -27,69 +55,178 @@ /datum/radiation_wave/Destroy() . = QDEL_HINT_IWILLGC + intensity = null STOP_PROCESSING(SSradiation, src) ..() -/datum/radiation_wave/process() - master_turf = get_step(master_turf, move_dir) +/datum/radiation_wave/process(delta_time) + // If master_turf is no more, then we can't know where to irradiate. This is a very bad situation. if(!master_turf) qdel(src) return - steps++ - var/list/atoms = get_rad_atoms() + // If none of the turfs could be irradiated, then the wave should no longer exist + var/futile = TRUE + // Cache of unlucky atoms + var/list/atoms = list() + // The actual distance + var/distance = steps + 1 + // Represents decreasing radiation power over distance + var/falloff = 1 / (distance * range_modifier) ** 2 + // Caching + var/turf/cmaster_turf = master_turf + // Original intensity it is using + var/list/cintensity = intensity + // New intensity that'll be written; always larger than the previous one + var/list/intensity_new[(distance + 1) * 8] + // "Class" it belongs to + var/branchclass = 2 ** round(log(2, distance)) + // The secondary i, or the offset for i + var/j - var/strength - if(steps>1) - strength = INVERSE_SQUARE(intensity, max(range_modifier*steps, 1), 1) - else - strength = intensity + for(var/i in 1 to distance * 8) + //Culls invalid intensities + if(cintensity[i] * falloff < RAD_WAVE_MINIMUM) + continue + var/xpos + var/ypos + switch(i / distance) + if(0 to 2) + //Yes it starts one step off of what you'd expect. Blame BYOND. + xpos = cmaster_turf.x + distance + ypos = cmaster_turf.y + distance - i + if(2 to 4) + xpos = cmaster_turf.x + distance * 3 - i + ypos = cmaster_turf.y - distance + if(4 to 6) + xpos = cmaster_turf.x - distance + ypos = cmaster_turf.y - distance * 5 + i + if(6 to 8) + xpos = cmaster_turf.x - distance * 7 + i + ypos = cmaster_turf.y + distance + //Culls invalid coords + if(xpos < 1 || xpos > world.maxx || ypos < 1 || ypos > world.maxy) + continue - if(strength < RAD_WAVE_MINIMUM) - qdel(src) - return + //The radiation is considered alive + futile = FALSE + var/turf/place = locate(xpos, ypos, cmaster_turf.z) + atoms = get_rad_contents(place) - radiate(atoms, FLOOR(strength, 1)) + //Actual radiation spending + cintensity[i] *= radiate(atoms, cintensity[i] * falloff) - check_obstructions(atoms) // reduce our overall strength if there are radiation insulators + //Obstruction handling + check_obstructions(atoms, i) -/datum/radiation_wave/proc/get_rad_atoms() - var/list/atoms = list() - var/distance = steps - var/cmove_dir = move_dir - var/cmaster_turf = master_turf + /* + * This is what I call pseudo-raycasting (PRC). Real raycasting would be ridiculously expensive, + * So this is the solution I came up with. Don't try to understand it by seeing the code. + * You have been warned. If you find yourself really having to touch this cursed code, + * consider axing this away before contacting me via git-fu email digging. + * + * Therefore, I urge you not to hastily assume this code a culprit of your problem. + * This code is responsible just for *keeping the rads going forward* more reasonably + * in regard to obstruction and contamination cost. But, of course, if you are rewriting + * (notwithstanding how questionable rewriting something major of a mature codebase like + * every normal SS13 codebase is) the entire radiation code, then this code should be + * considered for deletion. + * + * On a side note, this implementation isn't very ideal. So please remove this instead of + * trying to improve it when its time has come. (i.e. another total overhaul) + * + * ~Xenomedes, Christmas 2020 + */ - if(cmove_dir == NORTH || cmove_dir == SOUTH) - distance-- //otherwise corners overlap + // Handling eight fundamental (read: perfectly straight) branches + if((j = i / distance) == (j = round(j))) + distance + 1 == branchclass * 2 \ + ? (i == distance * 8 \ + ? (intensity_new[j - 1] += (intensity_new[1] += ((intensity_new[(j += i)] = cintensity[i]) / 2)) && cintensity[i] / 2) \ + : (intensity_new[j - 1] += intensity_new[j + 1] = ((intensity_new[(j += i)] = cintensity[i]) / 2))) \ + : (intensity_new[i + j] = cintensity[i]) + continue - atoms += get_rad_contents(cmaster_turf) + var/list/cachecache - var/turf/place - for(var/dir in __dirs) //There should be just 2 dirs in here, left and right of the direction of movement - place = cmaster_turf - for(var/i in 1 to distance) - place = get_step(place, dir) - atoms += get_rad_contents(place) + if(!prc_behavior_cache) + prc_behavior_cache = list() + if(length(prc_behavior_cache) < distance) + prc_behavior_cache.len++ + // We don't reserve spaces for fundamental branches + var/L[distance - 1] + // distance == 1 is where every ray is fundamental branch + cachecache = prc_behavior_cache[distance - 1] = L + else + cachecache = prc_behavior_cache[distance - 1] - return atoms + // i % distance == 0 cases were already handled above + var/prc_behavior = cachecache[i % distance] -/datum/radiation_wave/proc/check_obstructions(list/atoms) - var/width = steps - var/cmove_dir = move_dir - if(cmove_dir == NORTH || cmove_dir == SOUTH) - width-- - width = 1+(2*width) + if(!prc_behavior) + // Necessary local variables + var/idx // index + var/lp // loop position + var/vl // velocity of loop + var/bt // branch threshold + // The actual behavior calculation + cachecache[i % distance] = prc_behavior = distance & 1 \ + ? ((lp = ((idx = i % distance) * (vl = distance - branchclass + 1)) % (distance + 1)) < (bt = branchclass - (idx - round(idx * vl / (distance + 1)))) \ + ? (lp \ + ? (lp + vl >= bt ? PRC_BEHAVIOR_LSTAR : PRC_BEHAVIOR_L) \ + : (vl >= bt ? PRC_BEHAVIOR_HLSTAR : PRC_BEHAVIOR_HL)) \ + : (lp > branchclass \ + ? (lp - vl <= bt ? PRC_BEHAVIOR_NWL : (lp - bt > branchclass ? PRC_BEHAVIOR_NWR : PRC_BEHAVIOR_N)) \ + : (lp == branchclass \ + ? (lp - vl <= bt ? PRC_BEHAVIOR_HRSTAR : PRC_BEHAVIOR_HR) \ + : (lp - vl <= bt ? PRC_BEHAVIOR_RSTAR : PRC_BEHAVIOR_R)))) \ + : ((lp = ((idx = i % distance) * (vl = distance - branchclass + 1)) % (distance + 1)) == (bt = branchclass - (idx - round(idx * vl / (distance + 1)))) \ + ? PRC_BEHAVIOR_D \ + : (lp > branchclass \ + ? (lp - vl <= bt ? PRC_BEHAVIOR_NWL : (lp - bt > branchclass ? PRC_BEHAVIOR_NWR : PRC_BEHAVIOR_N)) \ + : (lp < bt \ + ? (lp + vl >= bt ? PRC_BEHAVIOR_LSTAR : PRC_BEHAVIOR_L) \ + : (lp - vl <= bt ? PRC_BEHAVIOR_RSTAR : PRC_BEHAVIOR_R)))) + + prc_behavior & PRC_FLAG_HL \ + ? (intensity_new[i + j] += cintensity[i] / 2) \ + : (prc_behavior & PRC_FLAG_L \ + ? (intensity_new[i + j] = cintensity[i]) \ + : null) + + prc_behavior & PRC_FLAG_HR \ + ? (intensity_new[i + j + 1] += cintensity[i] / 2) \ + : (prc_behavior & PRC_FLAG_R \ + ? (intensity_new[i + j + 1] = cintensity[i]) \ + : null) + + if(futile) + qdel(src) + return + + // Now is time to move forward + intensity = intensity_new + steps += delta_time + +/datum/radiation_wave/proc/check_obstructions(list/atoms, index) for(var/k in 1 to atoms.len) var/atom/thing = atoms[k] if(!thing) continue - if (SEND_SIGNAL(thing, COMSIG_ATOM_RAD_WAVE_PASSING, src, width) & COMPONENT_RAD_WAVE_HANDLED) + if (SEND_SIGNAL(thing, COMSIG_ATOM_RAD_WAVE_PASSING, src, index) & COMPONENT_RAD_WAVE_HANDLED) continue if (thing.rad_insulation != RAD_NO_INSULATION) - intensity *= (1-((1-thing.rad_insulation)/width)) + intensity[index] *= thing.rad_insulation +// Returns post-radiation strength power scale of a ray +// If this proc returns a number lower than 1, it means that the some radiation was spent on contaminating something. /datum/radiation_wave/proc/radiate(list/atoms, strength) - var/contamination_chance = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_CHANCE_COEFFICIENT * min(1, 1/(steps*range_modifier)) + // returning 1 means no radiation was spent on contamination + . = 1 + var/list/moblist = list() + var/list/atomlist = list() + var/contam_strength = strength * (RAD_CONTAMINATION_STR_COEFFICIENT * RAD_CONTAMINATION_BUDGET_SIZE) // The budget for each list + var/is_contaminating = contam_strength > RAD_COMPONENT_MINIMUM && can_contaminate for(var/k in 1 to atoms.len) var/atom/thing = atoms[k] if(!thing) @@ -107,12 +244,45 @@ /obj/item/implant, /obj/singularity )) - if(!can_contaminate || blacklisted[thing.type]) + // Insulating objects won't get contaminated + if(!is_contaminating || blacklisted[thing.type] || SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION) continue - if(prob(contamination_chance)) // Only stronk rads get to have little baby rads - if(SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION) - continue - var/rad_strength = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT + if(ismob(thing)) + moblist += thing + else + atomlist += thing + + // We don't randomly choose one from the list since that can result in zero meaningful contamination + + if(atomlist.len) + . -= RAD_CONTAMINATION_BUDGET_SIZE + var/affordance = min(round(contam_strength / RAD_COMPONENT_MINIMUM), atomlist.len) + var/contam_strength_divided = contam_strength / affordance + for(var/k in 1 to affordance) + var/atom/poor_thing = atomlist[k] + poor_thing.AddComponent(/datum/component/radioactive, contam_strength_divided, source) + + if(moblist.len) + . -= RAD_CONTAMINATION_BUDGET_SIZE + var/affordance = min(round(contam_strength / RAD_COMPONENT_MINIMUM), moblist.len) + var/contam_strength_divided = contam_strength / affordance + for(var/k in 1 to affordance) + var/mob/poor_mob = moblist[k] + poor_mob.AddComponent(/datum/component/radioactive, contam_strength_divided, source) - if (rad_strength >= RAD_WAVE_MINIMUM) // Don't even bother to add the component if its waves aren't going to do anything - thing.AddComponent(/datum/component/radioactive, rad_strength, source) +#undef PRC_FLAG_HL +#undef PRC_FLAG_L +#undef PRC_FLAG_HR +#undef PRC_FLAG_R +#undef PRC_BEHAVIOR_N +#undef PRC_BEHAVIOR_NWL +#undef PRC_BEHAVIOR_NWR +#undef PRC_BEHAVIOR_L +#undef PRC_BEHAVIOR_LSTAR +#undef PRC_BEHAVIOR_R +#undef PRC_BEHAVIOR_RSTAR +#undef PRC_BEHAVIOR_D +#undef PRC_BEHAVIOR_HL +#undef PRC_BEHAVIOR_HLSTAR +#undef PRC_BEHAVIOR_HR +#undef PRC_BEHAVIOR_HRSTAR diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 60a63f827a6a3..1ad3e72c29339 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -11,6 +11,7 @@ name = "Biological Storage Facility" description = "In case society crumbles, we will be able to restore our zoos to working order with the breeding stock kept in these 100% secure and unbreachable storage facilities. \ At no point has anything escaped. That's our story, and we're sticking to it." + cost = 4 /datum/map_template/ruin/space/asteroid1 id = "asteroid1" @@ -18,18 +19,19 @@ name = "Asteroid 1" description = "I-spy with my little eye, something beginning with R." - /datum/map_template/ruin/space/asteroid2 id = "asteroid2" suffix = "asteroid2.dmm" name = "Asteroid 2" description = "Oh my god, a giant rock!" + cost = 1 /datum/map_template/ruin/space/asteroid3 id = "asteroid3" suffix = "asteroid3.dmm" name = "Asteroid 3" description = "This asteroid floating in space has no official designation, because the scientist that discovered it deemed it 'super dull'." + cost = 1 /datum/map_template/ruin/space/asteroid4 id = "asteroid4" @@ -37,12 +39,96 @@ name = "Asteroid 4" description = "Nanotrasen Escape Pods have a 100%* success rate, and a 99%* customer satisfaction rate. \ *Please note that these statistics, are taken from pods that have successfully docked with a recovery vessel." + cost = 1 /datum/map_template/ruin/space/asteroid5 id = "asteroid5" suffix = "asteroid5.dmm" name = "Asteroid 5" description = "Oh my god, another giant rock!" + cost = 2 + +/datum/map_template/ruin/space/asteroid6 + id = "asteroid6" + suffix = "asteroid6.dmm" + name = "Asteroid 6" + description = "A odd crescent body." + +/datum/map_template/ruin/space/asteroid7 + id = "asteroid7" + suffix = "asteroid7.dmm" + name = "Asteroid 7" + description = "Space rocks!" + +/datum/map_template/ruin/space/asteroid8 + id = "asteroid8" + suffix = "asteroid8.dmm" + name = "Asteroid 8" + description = "Space rocks." + +/datum/map_template/ruin/space/asteroid9 + id = "asteroid9" + suffix = "asteroid9.dmm" + name = "Asteroid 9" + description = "This looks like it was a shuttle at some point... Now it's all rocks!" + +/datum/map_template/ruin/space/asteroid10 + id = "asteroid10" + suffix = "asteroid10.dmm" + name = "Asteroid 10" + description = "Welcome to dog heaven!" + +/datum/map_template/ruin/space/sos1 + id = "sos1" + suffix = "sos1.dmm" + name = "Pod 1" + description = "Help! I ran off course and I will never reach my destination!" + +/datum/map_template/ruin/space/sos2 + id = "sos2" + suffix = "sos2.dmm" + name = "Pod 2" + description = "Full frontal collision!" + +/datum/map_template/ruin/space/sos3 + id = "sos3" + suffix = "sos3.dmm" + name = "Pod 3" + description = "An ancient pod made out of odd materials..." + +/datum/map_template/ruin/space/sos4 + id = "sos4" + suffix = "sos4.dmm" + name = "Pod 4" + description = "Yuck!" + +/datum/map_template/ruin/space/sos5 + id = "sos5" + suffix = "sos5.dmm" + name = "Pod 5" + description = "Help never arrived!" + cost = 1 + +/datum/map_template/ruin/space/sos6 + id = "sos6" + suffix = "sos6.dmm" + name = "Pod 6" + description = "Cyka bylat! Vodka!!!" + cost = 1 + +/datum/map_template/ruin/space/sos7 + id = "sos7" + suffix = "sos7.dmm" + name = "Pod 7" + description = "Help! I was human once!" + cost = 1 + +/datum/map_template/ruin/space/sos8 + id = "sos8" + suffix = "sos8.dmm" + name = "Pod 8" + description = "CRASH!!!" + cost = 1 /datum/map_template/ruin/space/deep_storage id = "deep-storage" @@ -50,6 +136,7 @@ name = "Survivalist Bunker" description = "Assume the best, prepare for the worst. Generally, you should do so by digging a three man heavily fortified bunker into a giant unused asteroid. \ Then make it self sufficient, mask any evidence of construction, hook it covertly into the telecommunications network and hope for the best." + cost = 8 /datum/map_template/ruin/space/bigderelict1 id = "bigderelict1" @@ -57,6 +144,7 @@ name = "Derelict Tradepost" description = "A once-bustling tradestation that handled imports and exports from nearby stations now lays eerily dormant. \ The last received message was a distress call from one of the on-board officers, but we had no success in making contact again." + cost = 8 /datum/map_template/ruin/space/derelict1 id = "derelict1" @@ -64,6 +152,7 @@ name = "Derelict 1" description = "Nothing to see here citizen, move along, certainly no xeno outbreaks on this piece of station debris. That purple stuff? It's uh... station nectar. \ It's a top secret research installation." + cost = 2 /datum/map_template/ruin/space/derelict2 id = "derelict2" @@ -72,12 +161,14 @@ description = "Oh this is the night\n\ It's a beautiful night\n\ And we call it bella notte" + cost = 2 /datum/map_template/ruin/space/derelict3 id = "derelict3" suffix = "derelict3.dmm" name = "Derelict 3" description = "These hulks were once part of a larger structure, where the three great \[REDACTED\] were forged." + cost = 2 /datum/map_template/ruin/space/derelict4 id = "derelict4" @@ -85,12 +176,14 @@ name = "Derelict 4" description = "CentCom ferries have never crashed, will never crash, there is no current investigation into a crashed ferry, and we will not let Internal Affairs trample over high security \ information in the name of this baseless witchhunt." + cost = 2 /datum/map_template/ruin/space/derelict5 id = "derelict5" suffix = "derelict5.dmm" name = "Derelict 5" description = "The plan is, we put a whole bunch of crates full of treasure in this disused warehouse, launch it into space, and then ignore it. Forever." + cost = 2 /datum/map_template/ruin/space/derelict6 id = "derelict6" @@ -98,24 +191,28 @@ name = "Derelict 6" description = "The hush-hush of Nanotrasen when it comes to stations seemingly vanishing off the radar is an interesting topic, theories of nuclear destruction float about while Nanotrasen \ flat-out denies said stations ever existing." + cost = 2 /datum/map_template/ruin/space/empty_shell id = "empty-shell" suffix = "emptyshell.dmm" name = "Empty Shell" description = "Cozy, rural property available for a young professional couple. Only twelve parsecs from the nearest hyperspace lane!" + cost = 1 /datum/map_template/ruin/space/gas_the_lizards id = "gas-the-lizards" suffix = "gasthelizards.dmm" name = "Disposal Facility 17" description = "Gas efficiency at 95.6%, fluid elimination at 96.2%. Will require renewed supplies of 'carpet' before the end of the quarter." + cost = 2 /datum/map_template/ruin/space/intact_empty_ship id = "intact-empty-ship" suffix = "intactemptyship.dmm" name = "Authorship" description = "Just somewhere quiet, where I can focus on my work with no interruptions." + cost = 2 /datum/map_template/ruin/space/caravanambush id = "space/caravanambush" @@ -123,6 +220,7 @@ name = "Syndicate Ambush" description = "A caravan route used by passing cargo freights has been ambushed by a salvage team manned by the syndicate. \ The caravan managed to send off a distress message before being surrounded, their video feed cutting off as the sound of gunfire and a parrot was heard." + cost = 8 /datum/map_template/ruin/space/originalcontent id = "paperwizard" @@ -130,12 +228,14 @@ name = "A Giant Ball of Paper in Space" description = "Sightings of a giant wad of paper hurling through the depths of space have been recently reported by multiple outposts near this sector. \ A giant wad of paper, really? Damn prank callers." + cost = 4 /datum/map_template/ruin/space/mech_transport id = "mech-transport" suffix = "mechtransport.dmm" name = "CF Corsair" description = "Well, when is it getting here? I have bills to pay; very well-armed clients who want their shipments as soon as possible! I don't care, just find it!" + cost = 2 /datum/map_template/ruin/space/onehalf id = "onehalf" @@ -143,30 +243,35 @@ name = "DK Excavator 453" description = "Based on the trace elements we've detected on the gutted asteroids, we suspect that a mining ship using a restricted engine is somewhere in the area. \ We'd like to request a patrol vessel to investigate." + cost = 4 /datum/map_template/ruin/space/spacehotel id = "spacehotel" suffix = "spacehotel.dmm" name = "The Twin-Nexus Hotel" description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably." + cost = 8 /datum/map_template/ruin/space/turreted_outpost id = "turreted-outpost" suffix = "turretedoutpost.dmm" name = "Unnamed Turreted Outpost" description = "We'd ask them to stop blaring that ruskiepop music, but none of us are brave enough to go near those death turrets they have." + cost = 2 /datum/map_template/ruin/space/oldshuttle id = "spaceman-origins" suffix = "shuttlerelic.dmm" name = "Strange Ship" description = "A ship seemingly lost, drifting along the stars. This thing looks like it belongs in ancient times." + cost = 2 /datum/map_template/ruin/space/way_home id = "way-home" suffix = "way_home.dmm" name = "Salvation" description = "In the darkest times, we will find our way home." + cost = 1 /datum/map_template/ruin/space/djstation id = "djstation" @@ -174,12 +279,14 @@ name = "DJ Station" description = "Until very recently this pirate radio station was used to harangue local space stations over a variety of perceived \"ethics violations\". \ It seems like someone finally got sick of it, but the equipment still works." + cost = 2 /datum/map_template/ruin/space/thederelict id = "thederelict" suffix = "thederelict.dmm" name = "Kosmicheskaya Stantsiya 13" description = "The true fate of Kosmicheskaya Stantsiya 13 is an open question to this day. Most corporations deny its existence, for fear of questioning on what became of its crew." + cost = 8 /datum/map_template/ruin/space/abandonedteleporter id = "abandonedteleporter" @@ -187,6 +294,7 @@ name = "Abandoned Teleporter" description = "In space construction the teleporter is often the first system brought online. \ This lonely half built teleporter is a sign of a proposed structure that for one reason or another just never got built." + cost = 2 /datum/map_template/ruin/space/crashedclownship id = "crashedclownship" @@ -194,6 +302,7 @@ name = "Crashed Clown Ship" description = "For centuries the promise of a new clown homeworld has been the siren call for countless clown vessels. \ Alas the clown's lust for shinanagans means that successful voyages are almost unheard of, with most vessels falling to hilarious consequences almost immediately." + cost = 2 /datum/map_template/ruin/space/crashedship id = "crashedship" @@ -201,6 +310,7 @@ name = "Crashed Ship" description = "Among civilian vessels the most common cause of tragedy is lack of food. \ This ship was outfited with a multitude of food generating features, then summarily ran into an asteroid shortly after takeoff." + cost = 8 /datum/map_template/ruin/space/listeningstation id = "listeningstation" @@ -208,6 +318,7 @@ name = "Syndicate Listening Station" description = "Listening stations form the backbone of the syndicate's information gathering operations. \ Assignment to these stations is dreaded by most agents, as it entails long and lonely shifts listening to nearby stations chatter incessently about the most meaningless things." + cost = 5 /datum/map_template/ruin/space/oldAIsat id = "oldAIsat" @@ -216,12 +327,14 @@ description = "When the inspector told the employees that they were all fired, and that their jobs \"could be done by trained lizards anyway\", they reacted badly. \ This event and others is the reason why Central always sends an ERT squad with their competent inspectors. Incompetent inspectors are told they can \"do it alone\" because they're \"that pro\". \ Incompetent inspectors believe this." + cost = 4 /datum/map_template/ruin/space/oldteleporter id = "oldteleporter" suffix = "oldteleporter.dmm" name = "Detached Teleporter" description = "The structure of this surprisingly intact teleporter suggests that it was once part of a larger structure, but what remains of said structure, if anything, can only be guessed at." + cost = 1 /datum/map_template/ruin/space/vaporwave id = "vaporwave" @@ -229,6 +342,7 @@ name = "Aesthetic Outpost" description = "Pause and remember-- You are unique.You are special. Every mistake, trial, and hardship has helped to sculpt your real beauty. \ Stop hating yourself and start appreciating and loving yourself!" + cost = 2 /datum/map_template/ruin/space/bus id = "bus" @@ -236,6 +350,7 @@ name = "Waylaid Buses" description = "There seems to be a pair of buses that pulled over for repairs. What were they doing..? Their shipment sure seems to be filled with a strange mix. \ Anyway, it looks like some people tried to fix it up for a long time but didn't really get anywhere..." + cost = 2 /datum/map_template/ruin/space/oldstation id = "oldstation" @@ -243,6 +358,7 @@ name = "Ancient Space Station" description = "The crew of a space station awaken one hundred years after a crisis. Awaking to a derelict space station on the verge of collapse, and a hostile force of invading \ hivebots. Can the surviving crew overcome the odds and survive and rebuild, or will the cold embrace of the stars become their new home?" + cost = 8 /datum/map_template/ruin/space/miracle id = "miracle" @@ -255,6 +371,7 @@ suffix = "gondolaasteroid.dmm" name = "Gondoland" description = "Just an ordinary rock- wait, what's that thing?" + cost = 2 /datum/map_template/ruin/space/whiteshipruin_box id = "whiteshipruin_box" @@ -262,12 +379,14 @@ name = "NT Medical Ship" description = "An ancient ship, said to be among the first discovered derelicts near Space Station 13 that was still in working order. \ Aged and deprecated by time, this relic of a vessel is now broken beyond repair." + cost = 2 /datum/map_template/ruin/space/whiteshipdock id = "whiteshipdock" suffix = "whiteshipdock.dmm" name = "Whiteship Dock" description = "An abandoned but functional vessel parked in deep space, ripe for the taking." + cost = 2 /datum/map_template/ruin/space/cat_experiments id = "meow" @@ -275,40 +394,82 @@ name = "Feline-Human Combination Den" description = "With heated debates over the legality of the catperson and their status in the workforce, there's always a place for the blackmarket to slip in for some cash. Whether the results \ are morally sound or not is another issue entirely." + cost = 4 /datum/map_template/ruin/space/cloning_facility id = "cloning_facility" suffix = "cloning_facility.dmm" name = "Ancient Cloning Lab" description = "An experimental cloning lab snapped off from an ancient ship. The cloner model inside lacks many modern functionalities and security measures." + cost = 2 /datum/map_template/ruin/space/hilbertresearchfacility id = "hilbert_facility" suffix = "hilbertshoteltestingsite.dmm" name = "Hilbert Research Facility" description = "A research facility of great bluespace discoveries. Long since abandoned, willingly or not..." + cost = 2 /datum/map_template/ruin/space/clownplanet id = "clownplanet" suffix = "clownplanet.dmm" name = "Clown Planet" description = "Thought lost in 2552, this minor planet has recently been rediscovered." + cost = 2 /datum/map_template/ruin/space/macspace id = "fast_food" suffix = "Fast_Food.dmm" name = "Mac Space Restaurant" description = "A fast food reataurant in space." + cost = 5 /datum/map_template/ruin/space/scav_mining id = "mining_asteroid" suffix = "scav_mining.dmm" name = "Mining asteroid" description = "An abandoned mining operation on an asteroid that now has new ocupants that is not happy to se you" + cost = 2 /datum/map_template/ruin/space/power_puzzle id = "power_puzzle" suffix = "power_puzzle.dmm" name = "Power Puzzle" description = "an abandoned secure storage location. there is no power left in the batteries and the former ocupants locked it pretty tight before leaving.\ - You will have to power areas to raise the bolts on the doors. look out for secrets." \ No newline at end of file + You will have to power areas to raise the bolts on the doors. look out for secrets." + cost = 4 + +/datum/map_template/ruin/space/spacearcade + id = "spacearcade" + suffix = "spacearcade.dmm" + name = "Space Arcade" + description = "Come here to have fun! We even have the best arcade game in the Universe, Disco Disco Rave!" + cost = 2 + +/datum/map_template/ruin/space/spacedock + id = "spacearcade" + suffix = "spacedock13.dmm" + name = "Shuttle Construction" + description = "A shuttle building station that seems to have been forgotten, or floated off into space." + cost = 2 + +/datum/map_template/ruin/space/spacehive + id = "spacehive" + suffix = "spacehive.dmm" + name = "Space Hive" + description = "A hydroponics experiment gone horribly, horribly wrong!" + cost = 1 + +/datum/map_template/ruin/space/swarmerstation + id = "swarmerstation13" + suffix = "swarmerstation13.dmm" + name = "Swarmer Station" + description = "Shat is left of a syndicate radio station, after swarmers infiltrated it." + cost = 2 + +/datum/map_template/ruin/space/refference + id = "refference" + suffix = "refference.dmm" + name = "Lost Cyborg" + description = "500 years too soon!" + cost = 2 diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm index 11e2cbdc10292..fd46c5bcdeafc 100644 --- a/code/datums/saymode.dm +++ b/code/datums/saymode.dm @@ -33,8 +33,11 @@ if(LINGHIVE_LINK) to_chat(M, msg) if(LINGHIVE_OUTSIDER) - if(prob(40)) - to_chat(M, "We can faintly sense an outsider trying to communicate through the hivemind...") + var/mob/living/L = M + if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE) && prob(70)) + to_chat(M, msg) + else + to_chat(M, "We hear a faint chittering from within our mind...") if(LINGHIVE_LING) if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE)) to_chat(user, "The poison in the air hinders our ability to interact with the hivemind.") @@ -57,8 +60,11 @@ if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE)) to_chat(M, msg) if(LINGHIVE_OUTSIDER) - if(prob(40)) - to_chat(M, "We can faintly sense another of our kind trying to communicate through the hivemind...") + var/mob/living/L = M + if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE) && prob(70)) + to_chat(M, msg) + else + to_chat(M, "We hear a faint chittering from within our mind...") if(LINGHIVE_OUTSIDER) to_chat(user, "Our senses have not evolved enough to be able to communicate this way...") return FALSE @@ -88,7 +94,7 @@ return FALSE -/datum/saymode/binary //everything that uses .b (silicons, drones, blobbernauts/spores, swarmers) +/datum/saymode/binary //everything that uses .b (silicons, drones, swarmers) key = MODE_KEY_BINARY mode = MODE_BINARY @@ -97,10 +103,6 @@ var/mob/living/simple_animal/hostile/swarmer/S = user S.swarmer_chat(message) return FALSE - if(isblobmonster(user)) - var/mob/living/simple_animal/hostile/blob/B = user - B.blob_chat(message) - return FALSE if(isdrone(user)) var/mob/living/simple_animal/drone/D = user D.drone_chat(message) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index e6a9fcd3c0a6e..8d96dbb44965a 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -11,6 +11,7 @@ var/credit_cost = INFINITY var/can_be_bought = TRUE + var/illegal_shuttle = FALSE //makes you able to buy the shuttle at a hacked/emagged comms console even if can_be_bought is FALSE var/list/movement_force // If set, overrides default movement_force on shuttle @@ -21,9 +22,14 @@ /datum/map_template/shuttle/proc/prerequisites_met() return TRUE -/datum/map_template/shuttle/New() +/datum/map_template/shuttle/New(path = null, rename = null, cache = FALSE, admin_load = null) + if(admin_load)//This data must be populated for the system to not shit itself apparently + suffix = admin_load + port_id = "custom" + can_be_bought = FALSE shuttle_id = "[port_id]_[suffix]" - mappath = "[prefix][shuttle_id].dmm" + if(!admin_load) + mappath = "[prefix][shuttle_id].dmm" . = ..() /datum/map_template/shuttle/preload_size(path, cache) @@ -244,12 +250,25 @@ description = "The crew must pass through an otherworldy arena to board this shuttle. Expect massive casualties. The source of the Bloody Signal must be tracked down and eliminated to unlock this shuttle." admin_notes = "RIP AND TEAR." credit_cost = 10000 + /// Whether the arena z-level has been created + var/arena_loaded = FALSE /datum/map_template/shuttle/emergency/arena/prerequisites_met() if(SHUTTLE_UNLOCK_BUBBLEGUM in SSshuttle.shuttle_purchase_requirements_met) return TRUE return FALSE +/datum/map_template/shuttle/emergency/arena/post_load(obj/docking_port/mobile/M) + . = ..() + if(!arena_loaded) + arena_loaded = TRUE + var/datum/map_template/arena/arena_template = new() + arena_template.load_new_z() + +/datum/map_template/arena + name = "The Arena" + mappath = "_maps/templates/the_arena.dmm" + /datum/map_template/shuttle/emergency/birdboat suffix = "birdboat" name = "Birdboat Station Emergency Shuttle" @@ -268,13 +287,6 @@ credit_cost = 2000 description = "The gold standard in emergency exfiltration, this tried and true design is equipped with everything the crew needs for a safe flight home." -/datum/map_template/shuttle/emergency/donut - suffix = "donut" - name = "Donutstation Emergency Shuttle" - description = "The perfect spearhead for any crude joke involving the station's shape, this shuttle supports a separate containment cell for prisoners and a compact medical wing." - admin_notes = "Has airlocks on both sides of the shuttle and will probably intersect near the front on some stations that build past departures." - credit_cost = 2500 - /datum/map_template/shuttle/emergency/clown suffix = "clown" name = "Snappop(tm)!" @@ -307,6 +319,12 @@ credit_cost = 5000 description = "A fully functional shuttle including a complete infirmary, storage facilties and regular amenities." +/datum/map_template/shuttle/emergency/corg + suffix = "corg" + name = "Corg Station Emergency Shuttle" + credit_cost = 4000 + description = "A smaller shuttle with area for cargo, medical and security personnel." + /datum/map_template/shuttle/emergency/mini suffix = "mini" name = "Ministation emergency shuttle" @@ -451,14 +469,14 @@ suffix = "kilo" name = "supply shuttle (Kilo)" +/datum/map_template/shuttle/cargo/corg + suffix = "corg" + name = "supply shuttle (Corg)" + /datum/map_template/shuttle/cargo/birdboat suffix = "birdboat" name = "supply shuttle (Birdboat)" -/datum/map_template/shuttle/cargo/donut - suffix = "donut" - name = "supply shuttle (Donut)" - /datum/map_template/shuttle/emergency/delta suffix = "delta" name = "Delta Station Emergency Shuttle" @@ -504,9 +522,9 @@ suffix = "box" name = "labour shuttle (Box)" -/datum/map_template/shuttle/arrival/donut - suffix = "donut" - name = "arrival shuttle (Donut)" +/datum/map_template/shuttle/arrival/corg + suffix = "corg" + name = "arrival shuttle (Corg)" /datum/map_template/shuttle/infiltrator/basic suffix = "basic" @@ -538,6 +556,20 @@ name = "science outpost shuttle" can_be_bought = FALSE +/datum/map_template/shuttle/exploration + port_id = "exploration" + suffix = "shuttle" + name = "exploration shuttle" + can_be_bought = FALSE + +/datum/map_template/shuttle/exploration/corg + suffix = "corg" + name = "corg exploration shuttle" + +/datum/map_template/shuttle/exploration/delta + suffix = "delta" + name = "delta exploration shuttle" + /datum/map_template/shuttle/labour/delta suffix = "delta" name = "labour shuttle (Delta)" @@ -546,6 +578,10 @@ suffix = "kilo" name = "labour shuttle (Kilo)" +/datum/map_template/shuttle/labour/corg + suffix = "corg" + name = "labour shuttle (Corg)" + /datum/map_template/shuttle/arrival/delta suffix = "delta" name = "arrival shuttle (Delta)" @@ -629,3 +665,11 @@ suffix = "primary" name = "primary turbolift (multi-z debug)" can_be_bought = FALSE + +/datum/map_template/shuttle/tram + port_id = "tram" + can_be_bought = FALSE + +/datum/map_template/shuttle/tram/corg + suffix = "corg" + name = "corgstation transport shuttle" diff --git a/code/datums/soullink.dm b/code/datums/soullink.dm index de73a8e74c6d7..618944739a759 100644 --- a/code/datums/soullink.dm +++ b/code/datums/soullink.dm @@ -5,6 +5,8 @@ var/list/sharedSoullinks //soullinks we are a/the sharer of /mob/living/Destroy() + if(playable) + remove_from_spawner_menu() for(var/s in ownedSoullinks) var/datum/soullink/S = s S.ownerDies(FALSE) diff --git a/code/datums/soundtrack.dm b/code/datums/soundtrack.dm new file mode 100644 index 0000000000000..97f4505f7186f --- /dev/null +++ b/code/datums/soundtrack.dm @@ -0,0 +1,29 @@ +GLOBAL_LIST_EMPTY(soundtrack_this_round) // A running list of soundtrack songs that have played this round, for credits entries + +/datum/soundtrack_song + var/title + var/artist + var/url + var/album + var/file + +/datum/soundtrack_song/bee + album = "BeeStation OST" + +/datum/soundtrack_song/bee/future_perception + title = "Future Perception" + artist = "Merct" + url = "https://www.youtube.com/watch?v=N9559mSGjKg" + file = 'sound/soundtrack/future_perception.ogg' + +/datum/soundtrack_song/bee/countdown + title = "Countdown" + artist = "qwertyquerty" + url = "https://www.youtube.com/watch?v=G2gVAPKlgqA" + file = 'sound/soundtrack/countdown.ogg' + +/datum/soundtrack_song/bee/mind_crawler + title = "Mind Crawler" + artist = "Merct" + url = "https://www.youtube.com/watch?v=EiLBxoBNsNo" + file = 'sound/soundtrack/mind_crawler.ogg' diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm index 95a7d8e63391d..ec6a4484d20e0 100644 --- a/code/datums/spawners_menu.dm +++ b/code/datums/spawners_menu.dm @@ -1,11 +1,3 @@ -/datum/spawners_menu - var/mob/dead/observer/owner - -/datum/spawners_menu/New(mob/dead/observer/new_owner) - if(!istype(new_owner)) - qdel(src) - owner = new_owner - /datum/spawners_menu/ui_state(mob/user) return GLOB.observer_state @@ -34,13 +26,21 @@ this["flavor_text"] = MS.flavour_text this["important_info"] = MS.important_info else - var/obj/O = spawner_obj - this["desc"] = O.desc + var/atom/movable/O = spawner_obj + if(isslime(O)) + this["short_desc"] = O.get_spawner_desc() + this["flavor_text"] = O.get_spawner_flavour_text() + else + this["desc"] = O.desc + this["amount_left"] = LAZYLEN(GLOB.mob_spawners[spawner]) data["spawners"] += list(this) return data +/datum/spawners_menu/ui_state(mob/user) + return GLOB.observer_state + /datum/spawners_menu/ui_act(action, params) if(..()) return @@ -49,17 +49,17 @@ if(!group_name || !(group_name in GLOB.mob_spawners)) return var/list/spawnerlist = GLOB.mob_spawners[group_name] - if(!spawnerlist.len) + if(!LAZYLEN(spawnerlist)) return - var/obj/effect/mob_spawn/MS = pick(spawnerlist) + var/atom/movable/MS = pick(spawnerlist) if(!istype(MS) || !(MS in GLOB.poi_list)) return switch(action) if("jump") if(MS) - owner.forceMove(get_turf(MS)) + usr.forceMove(get_turf(MS)) . = TRUE if("spawn") if(MS) - MS.attack_ghost(owner) + MS.attack_ghost(usr) . = TRUE diff --git a/code/datums/station_traits/_station_trait.dm b/code/datums/station_traits/_station_trait.dm new file mode 100644 index 0000000000000..93fc351f69189 --- /dev/null +++ b/code/datums/station_traits/_station_trait.dm @@ -0,0 +1,40 @@ +///Base class of station traits. These are used to influence rounds in one way or the other by influencing the levers of the station. +/datum/station_trait + ///Name of the trait + var/name = "unnamed station trait" + ///The type of this trait. Used to classify how this trait influences the station + var/trait_type = STATION_TRAIT_NEUTRAL + ///Whether or not this trait uses process() + var/trait_processes = FALSE + ///Chance relative to other traits of its type to be picked + var/weight = 10 + ///Does this trait show in the centcom report? + var/show_in_report = FALSE + ///What message to show in the centcom report? + var/report_message + ///What code-trait does this station trait give? gives none if null + var/trait_to_give + ///What traits are incompatible with this one? + var/blacklist + ///Extra flags for station traits such as it being abstract + var/trait_flags + ///Should we announce anything roundstart? If so, those are our options + var/list/possible_announcements + + +/datum/station_trait/New() + . = ..() + SSticker.OnRoundstart(CALLBACK(src, .proc/on_round_start)) + if(trait_processes) + START_PROCESSING(SSstation, src) + if(trait_to_give) + ADD_TRAIT(SSstation, trait_to_give, STATION_TRAIT) + +///Proc ran when round starts. Use this for roundstart effects. +/datum/station_trait/proc/on_round_start() + if(length(possible_announcements)) + priority_announce(pick(possible_announcements), null, null, has_important_message = TRUE) + +///type of info the centcom report has on this trait, if any. +/datum/station_trait/proc/get_report() + return "[name] - [report_message]" diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm new file mode 100644 index 0000000000000..c18ae1085cf2a --- /dev/null +++ b/code/datums/station_traits/negative_traits.dm @@ -0,0 +1,171 @@ +/datum/station_trait/carp_infestation + name = "Carp infestation" + trait_type = STATION_TRAIT_NEGATIVE + weight = 5 + show_in_report = TRUE + report_message = "Dangerous fauna is present in the area of this station." + trait_to_give = STATION_TRAIT_CARP_INFESTATION + +/datum/station_trait/distant_supply_lines + name = "Distant supply lines" + trait_type = STATION_TRAIT_NEGATIVE + weight = 3 + show_in_report = TRUE + report_message = "Due to the distance to our normal supply lines, cargo orders are more expensive." + blacklist = list(/datum/station_trait/strong_supply_lines) + trait_to_give = STATION_TRAIT_DISTANT_SUPPLY_LINES + +/datum/station_trait/late_arrivals + name = "Late Arrivals" + trait_type = STATION_TRAIT_NEGATIVE + weight = 2 + show_in_report = TRUE + report_message = "Sorry for that, we didn't expect to fly into that vomiting goose while bringing you to your new station." + trait_to_give = STATION_TRAIT_LATE_ARRIVALS + blacklist = list(/datum/station_trait/random_spawns, /datum/station_trait/hangover) + possible_announcements = list("You are getting late, again. Get your stuff together or you are all fired.", + "Our calculations were off by a bit. Shuttle will be there in a few seconds.") + +/datum/station_trait/random_spawns + name = "Drive-by landing" + trait_type = STATION_TRAIT_NEGATIVE + weight = 2 + show_in_report = TRUE + report_message = "Sorry for that, we missed your station by a few miles, so we just launched you towards your station in pods. Hope you don't mind!" + trait_to_give = STATION_TRAIT_RANDOM_ARRIVALS + blacklist = list(/datum/station_trait/late_arrivals, /datum/station_trait/hangover) + possible_announcements = list("We overshot your station by a few miles. Prepare to be pod launched onto it.", + "We've missed your station, sorry for that. You will be launched onto it shortly.") + +/datum/station_trait/hangover + name = "Hangover" + trait_type = STATION_TRAIT_NEGATIVE + weight = 2 + show_in_report = TRUE + report_message = "Ohh.... Man.... That mandatory office party from last shift... God that was awesome... I woke up in some random toilet 3 sectors away..." + trait_to_give = STATION_TRAIT_HANGOVER + blacklist = list(/datum/station_trait/late_arrivals, /datum/station_trait/random_spawns) + possible_announcements = list("That was one hell of a night. Now, get back to work.", + "Party's over. Get back to work.") + +/datum/station_trait/hangover/New() + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSmapping, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/create_spawners) + +/datum/station_trait/hangover/proc/create_spawners() + var/list/turf/turfs = get_safe_random_station_turfs(typesof(/area/hallway), rand(200, 300)) + for(var/turf/T as() in turfs) + new /obj/effect/spawner/hangover_spawn(T) + + +/datum/station_trait/hangover/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/living_mob, mob/spawned_mob, joined_late) + SIGNAL_HANDLER + + if(joined_late) + return + if(!iscarbon(living_mob)) + return + + var/mob/living/carbon/spawned_carbon = living_mob + spawned_carbon.set_resting(TRUE, silent = TRUE) + if(prob(50)) + spawned_carbon.adjust_drugginess(rand(15, 20)) + else + spawned_carbon.drunkenness += rand(15, 25) + spawned_carbon.adjust_disgust(rand(5, 55)) //How hungover are you? + + if(prob(35) && !spawned_carbon.head) + var/obj/item/hat = pick(list(/obj/item/clothing/head/sombrero, /obj/item/clothing/head/fedora, /obj/item/clothing/mask/balaclava, /obj/item/clothing/head/ushanka, /obj/item/clothing/head/cardborg, /obj/item/clothing/head/pirate, /obj/item/clothing/head/cone)) + hat = new hat(spawned_mob) + spawned_mob.equip_to_slot(hat, ITEM_SLOT_HEAD) + +/obj/effect/spawner/hangover_spawn + name = "hangover spawner" + +/obj/effect/spawner/hangover_spawn/Initialize() + . = ..() + if(prob(60)) + new /obj/effect/decal/cleanable/vomit(get_turf(src)) + if(prob(70)) + var/bottle_count = pick(10;1, 5;2, 2;3) + for(var/index in 1 to bottle_count) + new /obj/item/reagent_containers/food/drinks/beer/almost_empty(get_turf(src)) + +/datum/station_trait/blackout + name = "Blackout" + trait_type = STATION_TRAIT_NEGATIVE + weight = 5 + show_in_report = TRUE + report_message = "Station lights seem to be damaged, be safe when starting your shift today." + +/datum/station_trait/blackout/on_round_start() + . = ..() + for(var/a in GLOB.apcs_list) + var/obj/machinery/power/apc/current_apc = a + if(prob(60)) + current_apc.overload_lighting() + +/datum/station_trait/empty_maint + name = "Cleaned out maintenance" + trait_type = STATION_TRAIT_NEGATIVE + weight = 5 + show_in_report = TRUE + report_message = "Our workers cleaned out most of the junk in the maintenace areas." + blacklist = list(/datum/station_trait/filled_maint) + trait_to_give = STATION_TRAIT_EMPTY_MAINT + + +/datum/station_trait/overflow_job_bureacracy + name = "Overflow bureacracy mistake" + trait_type = STATION_TRAIT_NEGATIVE + weight = 5 + show_in_report = TRUE + var/list/jobs_to_use = list("Clown", "Bartender", "Cook", "Botanist", "Cargo Technician", "Mime", "Janitor") + var/chosen_job + +/datum/station_trait/overflow_job_bureacracy/New() + . = ..() + chosen_job = pick(jobs_to_use) + RegisterSignal(SSjob, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/set_overflow_job_override) + +/datum/station_trait/overflow_job_bureacracy/get_report() + return "[name] - It seems for some reason we put out the wrong job-listing for the overflow role this shift...I hope you like [chosen_job]s." + +/datum/station_trait/overflow_job_bureacracy/proc/set_overflow_job_override(datum/source, new_overflow_role) + SIGNAL_HANDLER + + SSjob.set_overflow_role(chosen_job) + +/datum/station_trait/slow_shuttle + name = "Slow Shuttle" + trait_type = STATION_TRAIT_NEGATIVE + weight = 5 + show_in_report = TRUE + report_message = "Due to distance to our supply station, the cargo shuttle will have a slower flight time to your cargo department." + blacklist = list(/datum/station_trait/quick_shuttle) + +/datum/station_trait/slow_shuttle/on_round_start() + . = ..() + SSshuttle.supply.callTime *= 1.5 + +/datum/station_trait/bot_languages + name = "Bot Language Matrix Malfunction" + trait_type = STATION_TRAIT_NEGATIVE + weight = 3 + show_in_report = TRUE + report_message = "Your station's friendly bots have had their language matrix fried due to an event, resulting in some strange and unfamiliar speech patterns." + +/datum/station_trait/bot_languages/New() + . = ..() + /// What "caused" our robots to go haywire (fluff) + var/event_source = pick(list("an ion storm", "a syndicate hacking attempt", "a malfunction", "issues with your onboard AI", "an intern's mistakes", "budget cuts")) + report_message = "Your station's friendly bots have had their language matrix fried due to [event_source], resulting in some strange and unfamiliar speech patterns." + +/datum/station_trait/bot_languages/on_round_start() + . = ..() + //All bots that exist round start have their set language randomized. + for(var/mob/living/simple_animal/bot/found_bot in GLOB.alive_mob_list) + /// The bot's language holder - so we can randomize and change their language + var/datum/language_holder/bot_languages = found_bot.get_language_holder() + bot_languages.selected_language = bot_languages.get_random_spoken_language() diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm new file mode 100644 index 0000000000000..c7cc020910c71 --- /dev/null +++ b/code/datums/station_traits/neutral_traits.dm @@ -0,0 +1,80 @@ +/datum/station_trait/bananium_shipment + name = "Bananium Shipment" + trait_type = STATION_TRAIT_NEUTRAL + weight = 5 + report_message = "Rumors has it that the clown planet has been sending support packages to clowns in this system" + trait_to_give = STATION_TRAIT_BANANIUM_SHIPMENTS + +/datum/station_trait/ian_adventure + name = "Ian's Adventure" + trait_type = STATION_TRAIT_NEUTRAL + weight = 5 + show_in_report = FALSE + report_message = "Ian has gone exploring somewhere in the station." + +/datum/station_trait/ian_adventure/on_round_start() + for(var/mob/living/simple_animal/pet/dog/corgi/dog in GLOB.mob_list) + if(!(istype(dog, /mob/living/simple_animal/pet/dog/corgi/Ian) || istype(dog, /mob/living/simple_animal/pet/dog/corgi/puppy/Ian))) + continue + + // The extended safety checks at time of writing are about chasms and lava + // if there are any chasms and lava on stations in the future, woah + var/turf/current_turf = get_turf(dog) + var/turf/adventure_turf = find_safe_turf(extended_safety_checks = TRUE, dense_atoms = FALSE) + + // Poof! + do_smoke(location=current_turf) + dog.forceMove(adventure_turf) + do_smoke(location=adventure_turf) + + +/datum/station_trait/glitched_pdas + name = "PDA glitch" + trait_type = STATION_TRAIT_NEUTRAL + weight = 8 + show_in_report = TRUE + report_message = "Something seems to be wrong with the PDAs issued to you all this shift. Nothing too bad though." + trait_to_give = STATION_TRAIT_PDA_GLITCHED + +/datum/station_trait/announcement_intern + name = "Announcement Intern" + trait_type = STATION_TRAIT_NEUTRAL + weight = 3 + show_in_report = TRUE + report_message = "Please be nice to him." + blacklist = list(/datum/station_trait/announcement_medbot, + /datum/station_trait/announcement_baystation + ) + +/datum/station_trait/announcement_intern/New() + . = ..() + SSstation.announcer = /datum/centcom_announcer/intern + +/datum/station_trait/announcement_medbot + name = "Announcement \"System\"" + trait_type = STATION_TRAIT_NEUTRAL + weight = 5 + show_in_report = TRUE + report_message = "Our announcement system is under scheduled maintanance at the moment. Thankfully, we have a backup." + blacklist = list( + /datum/station_trait/announcement_intern, + /datum/station_trait/announcement_baystation + ) + +/datum/station_trait/announcement_medbot/New() + . = ..() + SSstation.announcer = /datum/centcom_announcer/medbot + +/datum/station_trait/announcement_baystation + name = "Announcer: Archival Tape" + trait_type = STATION_TRAIT_NEUTRAL + weight = 5 + show_in_report = TRUE + report_message = "We lost the primary datatape that holds the announcement system's voice responses. We did however find an older backup." + blacklist = list(/datum/station_trait/announcement_intern, + /datum/station_trait/announcement_medbot + ) + +/datum/station_trait/announcement_baystation/New() + . = ..() + SSstation.announcer = /datum/centcom_announcer/baystation diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm new file mode 100644 index 0000000000000..967701c333250 --- /dev/null +++ b/code/datums/station_traits/positive_traits.dm @@ -0,0 +1,123 @@ +#define PARTY_COOLDOWN_LENGTH_MIN 6 MINUTES +#define PARTY_COOLDOWN_LENGTH_MAX 12 MINUTES + + +/datum/station_trait/lucky_winner + name = "Lucky winner" + trait_type = STATION_TRAIT_POSITIVE + weight = 1 + show_in_report = TRUE + report_message = "Your station has won the grand prize of the annual station charity event. Free snacks will be delivered to the bar every now and then." + trait_processes = TRUE + COOLDOWN_DECLARE(party_cooldown) + +/datum/station_trait/lucky_winner/on_round_start() + . = ..() + COOLDOWN_START(src, party_cooldown, rand(PARTY_COOLDOWN_LENGTH_MIN, PARTY_COOLDOWN_LENGTH_MAX)) + +/datum/station_trait/lucky_winner/process(delta_time) + if(!COOLDOWN_FINISHED(src, party_cooldown)) + return + + COOLDOWN_START(src, party_cooldown, rand(PARTY_COOLDOWN_LENGTH_MIN, PARTY_COOLDOWN_LENGTH_MAX)) + + var/area/area_to_spawn_in = pick(GLOB.bar_areas) + var/turf/T = get_safe_random_station_turfs(area_to_spawn_in) + + var/obj/structure/closet/supplypod/centcompod/toLaunch = new() + var/obj/item/pizzabox/pizza_to_spawn = pick(list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, /obj/item/pizzabox/vegetable)) //no pineapple pizza you monster + new pizza_to_spawn(toLaunch) + for(var/i in 1 to 6) + new /obj/item/reagent_containers/food/drinks/beer(toLaunch) + new /obj/effect/pod_landingzone(T, toLaunch) + +/datum/station_trait/galactic_grant + name = "Galactic grant" + trait_type = STATION_TRAIT_POSITIVE + weight = 5 + show_in_report = TRUE + report_message = "Your station has been selected for a special grant. Some extra funds has been made available to your cargo department." + +/datum/station_trait/galactic_grant/on_round_start() + var/datum/bank_account/cargo_bank = SSeconomy.get_dep_account(ACCOUNT_CAR) + cargo_bank.adjust_money(rand(2000, 5000)) + +/datum/station_trait/premium_internals_box + name = "Premium internals boxes" + trait_type = STATION_TRAIT_POSITIVE + weight = 10 + show_in_report = TRUE + report_message = "The internals boxes for your crew have been filled with bonus equipment." + trait_to_give = STATION_TRAIT_PREMIUM_INTERNALS + +/datum/station_trait/bountiful_bounties + name = "Bountiful bounties" + trait_type = STATION_TRAIT_POSITIVE + weight = 5 + show_in_report = TRUE + report_message = "It seems collectors in this system are extra keen to on bounties, and will pay more to see their completion." + +/datum/station_trait/bountiful_bounties/on_round_start() + SSeconomy.bounty_modifier *= 1.2 + +/datum/station_trait/strong_supply_lines + name = "Strong supply lines" + trait_type = STATION_TRAIT_POSITIVE + weight = 5 + show_in_report = TRUE + report_message = "Prices are low in this system, BUY BUY BUY!" + blacklist = list(/datum/station_trait/distant_supply_lines) + trait_to_give = STATION_TRAIT_STRONG_SUPPLY_LINES + +/datum/station_trait/scarves + name = "Scarves" + trait_type = STATION_TRAIT_POSITIVE + weight = 5 + show_in_report = TRUE + var/list/scarves + +/datum/station_trait/scarves/New() + . = ..() + report_message = pick( + "Nanotrasen is experimenting with seeing if neck warmth improves employee morale.", + "After Space Fashion Week, scarves are the hot new accessory.", + "Everyone was simultaneously a little bit cold when they packed to go to the station.", + "The station is definitely not under attack by neck grappling aliens masquerading as wool. Definitely not.", + "You all get free scarves. Don't ask why.", + "A shipment of scarves was delivered to the station.", + ) + scarves = typesof(/obj/item/clothing/neck/scarf) + list( + /obj/item/clothing/neck/stripedredscarf, + /obj/item/clothing/neck/stripedgreenscarf, + /obj/item/clothing/neck/stripedbluescarf, + ) + + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + +/datum/station_trait/scarves/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/living_mob, mob/M, joined_late) + SIGNAL_HANDLER + + var/scarf_type = pick(scarves) + + living_mob.equip_to_slot_or_del(new scarf_type(living_mob), ITEM_SLOT_NECK) + +/datum/station_trait/filled_maint + name = "Filled up maintenance" + trait_type = STATION_TRAIT_POSITIVE + weight = 5 + show_in_report = TRUE + report_message = "Our workers accidentally forgot more of their personal belongings in the maintenance areas." + blacklist = list(/datum/station_trait/empty_maint) + trait_to_give = STATION_TRAIT_FILLED_MAINT + +/datum/station_trait/quick_shuttle + name = "Quick Shuttle" + trait_type = STATION_TRAIT_POSITIVE + weight = 5 + show_in_report = TRUE + report_message = "Due to proximity to our supply station, the cargo shuttle will have a quicker flight time to your cargo department." + blacklist = list(/datum/station_trait/slow_shuttle) + +/datum/station_trait/quick_shuttle/on_round_start() + . = ..() + SSshuttle.supply.callTime *= 0.5 diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index a264dd850a9d2..2e09609233766 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -3,9 +3,9 @@ /datum/status_effect/shadow_mend id = "shadow_mend" duration = 30 - alert_type = /obj/screen/alert/status_effect/shadow_mend + alert_type = /atom/movable/screen/alert/status_effect/shadow_mend -/obj/screen/alert/status_effect/shadow_mend +/atom/movable/screen/alert/status_effect/shadow_mend name = "Shadow Mend" desc = "Shadowy energies wrap around your wounds, sealing them at a price. After healing, you will slowly lose health every three seconds for thirty seconds." icon_state = "shadow_mend" @@ -29,9 +29,9 @@ id = "void_price" duration = 300 tick_interval = 30 - alert_type = /obj/screen/alert/status_effect/void_price + alert_type = /atom/movable/screen/alert/status_effect/void_price -/obj/screen/alert/status_effect/void_price +/atom/movable/screen/alert/status_effect/void_price name = "Void Price" desc = "Black tendrils cinch tightly against you, digging wicked barbs into your flesh." icon_state = "shadow_mend" @@ -43,7 +43,7 @@ /datum/status_effect/cyborg_power_regen id = "power_regen" duration = 100 - alert_type = /obj/screen/alert/status_effect/power_regen + alert_type = /atom/movable/screen/alert/status_effect/power_regen var/power_to_give = 0 //how much power is gained each tick /datum/status_effect/cyborg_power_regen/on_creation(mob/living/new_owner, new_power_per_tick) @@ -51,7 +51,7 @@ if(. && isnum_safe(new_power_per_tick)) power_to_give = new_power_per_tick -/obj/screen/alert/status_effect/power_regen +/atom/movable/screen/alert/status_effect/power_regen name = "Power Regeneration" desc = "You are quickly regenerating power!" icon_state = "power_regen" @@ -68,16 +68,16 @@ id = "his_grace" duration = -1 tick_interval = 4 - alert_type = /obj/screen/alert/status_effect/his_grace + alert_type = /atom/movable/screen/alert/status_effect/his_grace var/bloodlust = 0 -/obj/screen/alert/status_effect/his_grace +/atom/movable/screen/alert/status_effect/his_grace name = "His Grace" desc = "His Grace hungers, and you must feed Him." icon_state = "his_grace" alerttooltipstyle = "hisgrace" -/obj/screen/alert/status_effect/his_grace/MouseEntered(location,control,params) +/atom/movable/screen/alert/status_effect/his_grace/MouseEntered(location,control,params) desc = initial(desc) var/datum/status_effect/his_grace/HG = attached_effect desc += "
Current Bloodthirst: [HG.bloodlust]\ @@ -118,7 +118,7 @@ /datum/status_effect/wish_granters_gift //Fully revives after ten seconds. id = "wish_granters_gift" duration = 50 - alert_type = /obj/screen/alert/status_effect/wish_granters_gift + alert_type = /atom/movable/screen/alert/status_effect/wish_granters_gift /datum/status_effect/wish_granters_gift/on_apply() to_chat(owner, "Death is not your end! The Wish Granter's energy suffuses you, and you begin to rise...") @@ -129,7 +129,7 @@ owner.visible_message("[owner] appears to wake from the dead, having healed all wounds!", "You have regenerated.") owner.update_mobility() -/obj/screen/alert/status_effect/wish_granters_gift +/atom/movable/screen/alert/status_effect/wish_granters_gift name = "Wish Granter's Immortality" desc = "You are being resurrected!" icon_state = "wish_granter" @@ -167,7 +167,7 @@ id = "blooddrunk" duration = 10 tick_interval = 0 - alert_type = /obj/screen/alert/status_effect/blooddrunk + alert_type = /atom/movable/screen/alert/status_effect/blooddrunk var/last_health = 0 var/last_bruteloss = 0 var/last_fireloss = 0 @@ -176,7 +176,7 @@ var/last_cloneloss = 0 var/last_staminaloss = 0 -/obj/screen/alert/status_effect/blooddrunk +/atom/movable/screen/alert/status_effect/blooddrunk name = "Blood-Drunk" desc = "You are drunk on blood! Your pulse thunders in your ears! Nothing can harm you!" //not true, and the item description mentions its actual effect icon_state = "blooddrunk" @@ -209,7 +209,7 @@ last_staminaloss = owner.getStaminaLoss() owner.log_message("gained blood-drunk stun immunity", LOG_ATTACK) owner.add_stun_absorption("blooddrunk", INFINITY, 4) - owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1) + owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1, use_reverb = FALSE) /datum/status_effect/blooddrunk/tick() //multiply the effect of healing by 10 if(owner.health > last_health) @@ -312,18 +312,18 @@ playsound(owner, 'sound/weapons/fwoosh.ogg', 75, 0) var/obj/item/slashy slashy = owner.get_active_held_item() - for(var/mob/living/M in orange(1,owner)) + for(var/mob/living/M in ohearers(1,owner)) slashy.attack(M, owner) /datum/status_effect/sword_spin/on_remove() owner.visible_message("[owner]'s inhuman strength dissipates and the sword's runes grow cold!") - //Used by changelings to rapidly heal //Being on fire will suppress this healing /datum/status_effect/fleshmend id = "fleshmend" - alert_type = /obj/screen/alert/status_effect/fleshmend + alert_type = /atom/movable/screen/alert/status_effect/fleshmend + duration = 100 /datum/status_effect/fleshmend/tick() if(owner.on_fire) @@ -331,12 +331,13 @@ return else linked_alert.icon_state = "fleshmend" - owner.adjustBruteLoss(-1.5, FALSE) - owner.adjustFireLoss(-0.25, FALSE) - owner.adjustToxLoss(-0.5, FALSE) - owner.adjustCloneLoss(-0.5) + owner.adjustBruteLoss(-2.5, FALSE) + owner.adjustFireLoss(-2.5, FALSE) + owner.adjustOxyLoss(-2.5) + owner.adjustCloneLoss(-2.5) + owner.adjustToxLoss(-2.5, FALSE, TRUE) -/obj/screen/alert/status_effect/fleshmend +/atom/movable/screen/alert/status_effect/fleshmend name = "Fleshmend" desc = "Our wounds are rapidly healing. This effect is prevented if we are on fire." icon_state = "fleshmend" @@ -426,13 +427,13 @@ itemUser.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1.5) itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health //Heal all those around you, unbiased - for(var/mob/living/L in view(7, owner)) + for(var/mob/living/L in hearers(7, owner)) if(L.health < L.maxHealth) new /obj/effect/temp_visual/heal(get_turf(L), "#375637") if(iscarbon(L)) L.adjustBruteLoss(-3.5) L.adjustFireLoss(-3.5) - L.adjustToxLoss(-3.5, forced = TRUE) //Because Slime People are people too + L.adjustToxLoss(-3.5, FALSE, TRUE) //Because Slime People are people too L.adjustOxyLoss(-3.5) L.adjustStaminaLoss(-3.5) L.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3.5) @@ -444,7 +445,7 @@ var/mob/living/simple_animal/SM = L SM.adjustHealth(-3.5, forced = TRUE) -/obj/screen/alert/status_effect/regenerative_core +/atom/movable/screen/alert/status_effect/regenerative_core name = "Blessing of the Necropolis" desc = "The power of the necropolis flows through you. You could get used to this..." icon_state = "regenerative_core" @@ -454,7 +455,7 @@ id = "Regenerative Core" duration = 300 status_type = STATUS_EFFECT_REPLACE - alert_type = /obj/screen/alert/status_effect/regenerative_core + alert_type = /atom/movable/screen/alert/status_effect/regenerative_core var/power = 1 var/alreadyinfected = FALSE diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 25d260605a7ac..de71c4b4eb84a 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -48,7 +48,7 @@ //SLEEPING /datum/status_effect/incapacitating/sleeping id = "sleeping" - alert_type = /obj/screen/alert/status_effect/asleep + alert_type = /atom/movable/screen/alert/status_effect/asleep needs_update_stat = TRUE var/mob/living/carbon/carbon_owner var/mob/living/carbon/human/human_owner @@ -88,7 +88,7 @@ if(prob(10) && owner.health > owner.crit_threshold) owner.emote("snore") -/obj/screen/alert/status_effect/asleep +/atom/movable/screen/alert/status_effect/asleep name = "Asleep" desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are." icon_state = "asleep" @@ -98,7 +98,7 @@ id = "stasis" duration = -1 tick_interval = 10 - alert_type = /obj/screen/alert/status_effect/stasis + alert_type = /atom/movable/screen/alert/status_effect/stasis var/last_dead_time /datum/status_effect/incapacitating/stasis/proc/update_time_of_death() @@ -114,6 +114,7 @@ /datum/status_effect/incapacitating/stasis/on_creation(mob/living/new_owner, set_duration, updating_canmove) . = ..() update_time_of_death() + owner.reagents?.end_metabolization(owner, FALSE) /datum/status_effect/incapacitating/stasis/tick() update_time_of_death() @@ -126,7 +127,7 @@ update_time_of_death() return ..() -/obj/screen/alert/status_effect/stasis +/atom/movable/screen/alert/status_effect/stasis name = "Stasis" desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring." icon_state = "stasis" @@ -137,7 +138,7 @@ /datum/status_effect/strandling //get it, strand as in durathread strand + strangling = strandling hahahahahahahahahahhahahaha i want to die id = "strandling" status_type = STATUS_EFFECT_UNIQUE - alert_type = /obj/screen/alert/status_effect/strandling + alert_type = /atom/movable/screen/alert/status_effect/strandling /datum/status_effect/strandling/on_apply() ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron") @@ -147,13 +148,13 @@ REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron") return ..() -/obj/screen/alert/status_effect/strandling +/atom/movable/screen/alert/status_effect/strandling name = "Choking strand" desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand." icon_state = "his_grace" alerttooltipstyle = "hisgrace" -/obj/screen/alert/status_effect/strandling/Click(location, control, params) +/atom/movable/screen/alert/status_effect/strandling/Click(location, control, params) . = ..() if(usr != owner) return @@ -168,9 +169,9 @@ id = "syringe" status_type = STATUS_EFFECT_MULTIPLE alert_type = null - var/obj/item/reagent_containers/syringe/syringe = null + var/obj/item/reagent_containers/syringe/syringe var/injectmult = 1 - + /datum/status_effect/syringe/on_creation(mob/living/new_owner, obj/item/reagent_containers/syringe/origin, mult) syringe = origin injectmult = mult @@ -181,7 +182,7 @@ var/amount = syringe.initial_inject syringe.reagents.reaction(owner, INJECT) syringe.reagents.trans_to(owner, max(3.1, amount * injectmult)) - owner.throw_alert("syringealert", /obj/screen/alert/syringe) + owner.throw_alert("syringealert", /atom/movable/screen/alert/syringe) /datum/status_effect/syringe/tick() . = ..() @@ -190,16 +191,18 @@ syringe.reagents.trans_to(owner, amount * injectmult) -/obj/screen/alert/syringe +/atom/movable/screen/alert/syringe name = "Embedded Syringe" desc = "A syringe has embedded itself into your body, injecting its reagents! click this icon to carefully remove the syringe." icon_state = "drugged" alerttooltipstyle = "hisgrace" -/obj/screen/alert/syringe/Click(location, control, params) +/atom/movable/screen/alert/syringe/Click(location, control, params) . = ..() if(usr != owner) return + if(owner.incapacitated()) + return var/list/syringes = list() if(iscarbon(owner)) var/mob/living/carbon/C = owner @@ -210,7 +213,7 @@ var/datum/status_effect/syringe/syringestatus = pick_n_take(syringes) if(istype(syringestatus, /datum/status_effect/syringe)) var/obj/item/reagent_containers/syringe/syringe = syringestatus.syringe - to_chat(owner, "You begin carefully pulling the syringe out...") + to_chat(owner, "You begin carefully pulling the syringe out.") if(do_after(C, 20, null, owner)) to_chat(C, "You succesfuly remove the syringe.") syringe.forceMove(C.loc) @@ -223,7 +226,7 @@ syringe.reagents.trans_to(C, amount) syringe.forceMove(C.loc) qdel(syringestatus) - if(!C.has_status_effect(STATUS_EFFECT_SYRINGE)) + if(!C.has_status_effect(STATUS_EFFECT_SYRINGE)) C.clear_alert("syringealert") @@ -264,9 +267,9 @@ id = "his_wrath" duration = -1 tick_interval = 4 - alert_type = /obj/screen/alert/status_effect/his_wrath + alert_type = /atom/movable/screen/alert/status_effect/his_wrath -/obj/screen/alert/status_effect/his_wrath +/atom/movable/screen/alert/status_effect/his_wrath name = "His Wrath" desc = "You fled from His Grace instead of feeding Him, and now you suffer." icon_state = "his_grace" @@ -299,9 +302,9 @@ status_type = STATUS_EFFECT_REPLACE alert_type = null var/mutable_appearance/marked_underlay - var/obj/item/twohanded/kinetic_crusher/hammer_synced + var/obj/item/kinetic_crusher/hammer_synced -/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/twohanded/kinetic_crusher/new_hammer_synced) +/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/kinetic_crusher/new_hammer_synced) . = ..() if(.) hammer_synced = new_hammer_synced @@ -393,7 +396,7 @@ new /obj/effect/temp_visual/bleed/explode(T) for(var/d in GLOB.alldirs) new /obj/effect/temp_visual/dir_setting/bloodsplatter(T, d) - playsound(T, "desceration", 200, 1, -1) + playsound(T, "desecration", 200, 1, -1) owner.adjustBruteLoss(bleed_damage) else new /obj/effect/temp_visual/bleed(get_turf(owner)) @@ -448,7 +451,7 @@ /datum/status_effect/necropolis_curse/proc/apply_curse(set_curse) curse_flags |= set_curse if(curse_flags & CURSE_BLINDING) - owner.overlay_fullscreen("curse", /obj/screen/fullscreen/curse, 1) + owner.overlay_fullscreen("curse", /atom/movable/screen/fullscreen/curse, 1) /datum/status_effect/necropolis_curse/proc/remove_curse(remove_curse) if(remove_curse & CURSE_BLINDING) @@ -510,7 +513,7 @@ ADD_TRAIT(owner, TRAIT_PACIFISM, "gonbolaPacify") ADD_TRAIT(owner, TRAIT_MUTE, "gonbolaMute") ADD_TRAIT(owner, TRAIT_JOLLY, "gonbolaJolly") - to_chat(owner, "You suddenly feel at peace and feel no need to make any sudden or rash actions...") + to_chat(owner, "You suddenly feel at peace and feel no need to make any sudden or rash actions.") return ..() /datum/status_effect/gonbolaPacify/on_remove() @@ -525,11 +528,11 @@ tick_interval = 10 examine_text = "SUBJECTPRONOUN seems slow and unfocused." var/stun = TRUE - alert_type = /obj/screen/alert/status_effect/trance + alert_type = /atom/movable/screen/alert/status_effect/trance -/obj/screen/alert/status_effect/trance +/atom/movable/screen/alert/status_effect/trance name = "Trance" - desc = "Everything feels so distant, and you can feel your thoughts forming loops inside your head..." + desc = "Everything feels so distant, and you can feel your thoughts forming loops inside your head." icon_state = "high" /datum/status_effect/trance/tick() @@ -545,7 +548,7 @@ if(!owner.has_quirk(/datum/quirk/monochromatic)) owner.add_client_colour(/datum/client_colour/monochrome) owner.visible_message("[stun ? "[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point." : ""]", \ - "[pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]") + "[pick("You feel your thoughts slow down.", "You suddenly feel extremely dizzy.", "You feel like you're in the middle of a dream.","You feel incredibly relaxed.")]") return TRUE /datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE) @@ -561,14 +564,16 @@ owner.remove_client_colour(/datum/client_colour/monochrome) to_chat(owner, "You snap out of your trance!") -/datum/status_effect/trance/proc/hypnotize(datum/source, message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/datum/status_effect/trance/proc/hypnotize(datum/source, list/hearing_args, list/spans, list/message_mods = list()) + SIGNAL_HANDLER + if(!owner.can_hear()) return - if(speaker == owner) + if(hearing_args[HEARING_SPEAKER] == owner) return var/mob/living/carbon/C = owner C.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY) //clear previous hypnosis - addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, raw_message), 10) + addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10) addtimer(CALLBACK(C, /mob/living.proc/Stun, 60, TRUE, TRUE), 15) //Take some time to think about it qdel(src) @@ -601,9 +606,8 @@ range = 7 var/list/mob/living/targets = list() - for(var/mob/M in oview(owner, range)) - if(isliving(M)) - targets += M + for(var/mob/living/M in oview(range, owner)) + targets += M if(LAZYLEN(targets)) to_chat(owner, "Your arm spasms!") owner.log_message(" attacked someone due to a Muscle Spasm", LOG_ATTACK) //the following attack will log itself @@ -621,7 +625,7 @@ return var/obj/item/I = owner.get_active_held_item() var/list/turf/targets = list() - for(var/turf/T in oview(owner, 3)) + for(var/turf/T in oview(3, get_turf(owner))) targets += T if(LAZYLEN(targets) && I) to_chat(owner, "Your arm spasms!") @@ -632,7 +636,7 @@ id = "convulsing" duration = 150 status_type = STATUS_EFFECT_REFRESH - alert_type = /obj/screen/alert/status_effect/convulsing + alert_type = /atom/movable/screen/alert/status_effect/convulsing /datum/status_effect/convulsing/on_creation(mob/living/zappy_boy) . = ..() @@ -646,7 +650,7 @@ H.visible_message("[H]'s hand convulses, and they drop their [I.name]!","Your hand convulses violently, and you drop what you were holding!") H.jitteriness += 5 -/obj/screen/alert/status_effect/convulsing +/atom/movable/screen/alert/status_effect/convulsing name = "Shaky Hands" desc = "You've been zapped with something and your hands can't stop shaking! You can't seem to hold on to anything." icon_state = "convulsing" @@ -655,7 +659,7 @@ id = "dna_melt" duration = 600 status_type = STATUS_EFFECT_REPLACE - alert_type = /obj/screen/alert/status_effect/dna_melt + alert_type = /atom/movable/screen/alert/status_effect/dna_melt var/kill_either_way = FALSE //no amount of removing mutations is gonna save you now /datum/status_effect/dna_melt/on_creation(mob/living/new_owner, set_duration, updating_canmove) @@ -669,7 +673,7 @@ var/mob/living/carbon/human/H = owner H.something_horrible(kill_either_way) -/obj/screen/alert/status_effect/dna_melt +/atom/movable/screen/alert/status_effect/dna_melt name = "Genetic Breakdown" desc = "I don't feel so good. Your body can't handle the mutations! You have one minute to remove your mutations, or you will be met with a horrible fate." icon_state = "dna_melt" @@ -679,7 +683,7 @@ duration = 100 status_type = STATUS_EFFECT_REPLACE tick_interval = 1 - alert_type = /obj/screen/alert/status_effect/go_away + alert_type = /atom/movable/screen/alert/status_effect/go_away var/direction /datum/status_effect/go_away/on_creation(mob/living/new_owner, set_duration, updating_canmove) @@ -692,7 +696,7 @@ var/turf/T = get_step(owner, direction) owner.forceMove(T) -/obj/screen/alert/status_effect/go_away +/atom/movable/screen/alert/status_effect/go_away name = "TO THE STARS AND BEYOND!" desc = "I must go, my people need me!" icon_state = "high" @@ -703,7 +707,7 @@ duration = 25 status_type = STATUS_EFFECT_REFRESH tick_interval = 1 - alert_type = /obj/screen/alert/status_effect/interdiction + alert_type = /atom/movable/screen/alert/status_effect/interdiction var/running_toggled = FALSE /datum/status_effect/interdiction/tick() @@ -712,7 +716,7 @@ if(owner.confused < 10) owner.confused = 10 running_toggled = TRUE - to_chat(owner, "You know you shouldn't be running here...") + to_chat(owner, "You know you shouldn't be running here.") owner.add_movespeed_modifier(MOVESPEED_ID_INTERDICTION, multiplicative_slowdown=1.5) /datum/status_effect/interdiction/on_remove() @@ -720,9 +724,9 @@ if(running_toggled && owner.m_intent == MOVE_INTENT_WALK) owner.toggle_move_intent(owner) -/obj/screen/alert/status_effect/interdiction +/atom/movable/screen/alert/status_effect/interdiction name = "Interdicted" - desc = "I don't think I am meant to go this way..." + desc = "I don't think I am meant to go this way." icon_state = "inathneqs_endowment" /datum/status_effect/fake_virus @@ -834,8 +838,8 @@ var/mob/living/carbon/carbon_owner = owner carbon_owner.adjustStaminaLoss(10 * repetitions) carbon_owner.adjustFireLoss(5 * repetitions) - for(var/mob/living/carbon/victim in range(1,carbon_owner)) - if(IS_HERETIC(victim) || victim == carbon_owner) + for(var/mob/living/carbon/victim in ohearers(1,carbon_owner)) + if(IS_HERETIC(victim)) continue victim.apply_status_effect(type,repetitions-1) break @@ -859,36 +863,84 @@ id = "corrosion_curse" status_type = STATUS_EFFECT_REPLACE alert_type = null - tick_interval = 1 SECONDS + tick_interval = 4 SECONDS /datum/status_effect/corrosion_curse/on_creation(mob/living/new_owner, ...) . = ..() - to_chat(owner, "Your feel your body starting to break apart...") + to_chat(owner, "You hear a distant whisper that fills you with dread.") /datum/status_effect/corrosion_curse/tick() . = ..() if(!ishuman(owner)) return var/mob/living/carbon/human/H = owner + if (H.IsSleeping()) + return var/chance = rand(0,100) + var/message = "Coder did fucky wucky U w U" switch(chance) - if(0 to 19) + if(0 to 39) + H.adjustStaminaLoss(20) + message = "You feel tired." + if(40 to 59) + H.Dizzy(3 SECONDS) + message = "Your feel light headed." + if(60 to 74) + H.confused = max(H.confused, 2 SECONDS) + message = "Your feel confused." + if(75 to 79) + H.adjustOrganLoss(ORGAN_SLOT_STOMACH,15) H.vomit() - if(20 to 29) - H.Dizzy(10) - if(30 to 39) - H.adjustOrganLoss(ORGAN_SLOT_LIVER,5) - if(40 to 49) - H.adjustOrganLoss(ORGAN_SLOT_HEART,5) - if(50 to 59) - H.adjustOrganLoss(ORGAN_SLOT_STOMACH,5) - if(60 to 69) - H.adjustOrganLoss(ORGAN_SLOT_EYES,10) - if(70 to 79) - H.adjustOrganLoss(ORGAN_SLOT_EARS,10) - if(80 to 89) - H.adjustOrganLoss(ORGAN_SLOT_LUNGS,10) - if(90 to 99) - H.adjustOrganLoss(ORGAN_SLOT_TONGUE,10) - if(100) - H.adjustOrganLoss(ORGAN_SLOT_BRAIN,20) + message = "Black bile shoots out of your mouth." + if(80 to 84) + H.adjustOrganLoss(ORGAN_SLOT_LIVER,15) + H.SetKnockdown(10) + message = "Your feel a terrible pain in your abdomen." + if(85 to 89) + H.adjustOrganLoss(ORGAN_SLOT_EYES,15) + message = "Your eyes sting." + else + H.adjustOrganLoss(ORGAN_SLOT_EARS,15) + message = "Your inner ear hurts." + if (prob(33)) //so the victim isn't spammed with messages every 3 seconds + to_chat(H,message) + +/datum/status_effect/ghoul + id = "ghoul" + status_type = STATUS_EFFECT_UNIQUE + duration = -1 + examine_text = "SUBJECTPRONOUN has a blank, catatonic like stare." + alert_type = /atom/movable/screen/alert/status_effect/ghoul + +/atom/movable/screen/alert/status_effect/ghoul + name = "Flesh Servant" + desc = "You are a Ghoul! A eldritch monster reanimated to serve its master." + icon_state = "mind_control" + +/datum/status_effect/spanish + id = "spanish" + duration = 120 SECONDS + alert_type = null + +/datum/status_effect/spanish/on_apply(mob/living/new_owner, ...) + . = ..() + to_chat(owner, "Alert: Vocal cords are malfunctioning.") + owner.add_blocked_language(subtypesof(/datum/language/) - /datum/language/uncommon, LANGUAGE_EMP) + owner.grant_language(/datum/language/uncommon, FALSE, TRUE, LANGUAGE_EMP) + +/datum/status_effect/spanish/on_remove() + owner.remove_blocked_language(subtypesof(/datum/language/), LANGUAGE_EMP) + owner.remove_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_EMP) + to_chat(owner, "Alert: Vocal cords restored to normal function.") + return ..() + +/datum/status_effect/ipc/emp + id = "ipc_emp" + examine_text = "SUBJECTPRONOUN is buzzing and twitching!" + duration = 120 SECONDS + alert_type = /atom/movable/screen/alert/status_effect/emp + status_type = STATUS_EFFECT_REFRESH +/atom/movable/screen/alert/status_effect/emp + name = "Electro-Magnetic Pulse" + desc = "You've been hit with an EMP! You're malfunctioning!" + icon_state = "hypnosis" diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm index 608dbb2d7a116..c0b2988f0dde5 100644 --- a/code/datums/status_effects/gas.dm +++ b/code/datums/status_effects/gas.dm @@ -2,11 +2,11 @@ id = "frozen" duration = 100 status_type = STATUS_EFFECT_UNIQUE - alert_type = /obj/screen/alert/status_effect/freon + alert_type = /atom/movable/screen/alert/status_effect/freon var/icon/cube var/can_melt = TRUE -/obj/screen/alert/status_effect/freon +/atom/movable/screen/alert/status_effect/freon name = "Frozen Solid" desc = "You're frozen inside an ice cube, and cannot move! You can still do stuff, like shooting. Resist out of the cube!" icon_state = "frozen" @@ -26,6 +26,11 @@ qdel(src) /datum/status_effect/freon/proc/owner_resist() + SIGNAL_HANDLER + + INVOKE_ASYNC(src, .proc/do_resist) + +/datum/status_effect/freon/proc/do_resist() to_chat(owner, "You start breaking out of the ice cube!") if(do_mob(owner, owner, 40)) if(!QDELETED(src)) diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 1f032929c742e..ff1f54aceedb7 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -49,7 +49,7 @@ get_kill() . = ..() -/obj/screen/alert/status_effect/in_love +/atom/movable/screen/alert/status_effect/in_love name = "In Love" desc = "You feel so wonderfully in love!" icon_state = "in_love" @@ -58,7 +58,7 @@ id = "in_love" duration = -1 status_type = STATUS_EFFECT_UNIQUE - alert_type = /obj/screen/alert/status_effect/in_love + alert_type = /atom/movable/screen/alert/status_effect/in_love var/mob/living/date /datum/status_effect/in_love/on_creation(mob/living/new_owner, mob/living/love_interest) @@ -70,7 +70,9 @@ /datum/status_effect/in_love/tick() if(date) new /obj/effect/temp_visual/love_heart/invisible(get_turf(date.loc), owner) - + if(get_dist(get_turf(owner), get_turf(date)) < 7) + owner.heal_overall_damage(1, 1, BODYPART_ORGANIC) + date.heal_overall_damage(1, 1, BODYPART_ORGANIC) /datum/status_effect/throat_soothed id = "throat_soothed" @@ -117,7 +119,7 @@ spell.update_icon() rewarded.adjustBruteLoss(-25) rewarded.adjustFireLoss(-25) - rewarded.adjustToxLoss(-25) + rewarded.adjustToxLoss(-25, FALSE, TRUE) rewarded.adjustOxyLoss(-25) rewarded.adjustCloneLoss(-25) @@ -128,6 +130,20 @@ alert_type = null var/mob/living/listening_in +/datum/status_effect/bugged/on_apply(mob/living/new_owner, mob/living/tracker) + . = ..() + if (.) + RegisterSignal(new_owner, COMSIG_MOVABLE_HEAR, .proc/handle_hearing) + +/datum/status_effect/bugged/on_remove() + . = ..() + UnregisterSignal(owner, COMSIG_MOVABLE_HEAR) + +/datum/status_effect/bugged/proc/handle_hearing(datum/source, list/hearing_args) + SIGNAL_HANDLER + listening_in.show_message(hearing_args[HEARING_MESSAGE]) + + /datum/status_effect/bugged/on_creation(mob/living/new_owner, mob/living/tracker) . = ..() if(.) diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm index fe989d6b4e413..a67e29b68387a 100644 --- a/code/datums/status_effects/status_effect.dm +++ b/code/datums/status_effects/status_effect.dm @@ -10,8 +10,8 @@ var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves - var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description - var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists + var/alert_type = /atom/movable/screen/alert/status_effect //the alert thrown by the status effect, contains name and description + var/atom/movable/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists /datum/status_effect/New(list/arguments) on_creation(arglist(arguments)) @@ -19,16 +19,16 @@ /datum/status_effect/proc/on_creation(mob/living/new_owner, ...) if(new_owner) owner = new_owner - if(owner) - LAZYADD(owner.status_effects, src) - if(!owner || !on_apply()) + if(QDELETED(owner) || !on_apply()) qdel(src) return + if(owner) + LAZYADD(owner.status_effects, src) if(duration != -1) duration = world.time + duration tick_interval = world.time + tick_interval if(alert_type) - var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type) + var/atom/movable/screen/alert/status_effect/A = owner.throw_alert(id, alert_type) A.attached_effect = src //so the alert can reference us, if it needs to linked_alert = A //so we can reference the alert, if we need to if(duration > 0 || initial(tick_interval) > 0) //don't process if we don't care @@ -38,6 +38,7 @@ /datum/status_effect/Destroy() STOP_PROCESSING(SSfastprocess, src) if(owner) + linked_alert = null owner.clear_alert(id) LAZYREMOVE(owner.status_effects, src) on_remove() @@ -81,11 +82,15 @@ // ALERT HOOK // //////////////// -/obj/screen/alert/status_effect +/atom/movable/screen/alert/status_effect name = "Curse of Mundanity" desc = "You don't feel any different..." var/datum/status_effect/attached_effect +/atom/movable/screen/alert/status_effect/Destroy() + attached_effect = null //Don't keep a ref now + return ..() + ////////////////// // HELPER PROCS // ////////////////// diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm new file mode 100644 index 0000000000000..602323d22c027 --- /dev/null +++ b/code/datums/tgs_event_handler.dm @@ -0,0 +1,41 @@ +/datum/tgs_event_handler/impl + var/datum/timedevent/reattach_timer + +/datum/tgs_event_handler/impl/HandleEvent(event_code, ...) + switch(event_code) + if(TGS_EVENT_REBOOT_MODE_CHANGE) + var/list/reboot_mode_lookup = list ("[TGS_REBOOT_MODE_NORMAL]" = "be normal", "[TGS_REBOOT_MODE_SHUTDOWN]" = "shutdown the server", "[TGS_REBOOT_MODE_RESTART]" = "hard restart the server") + var/old_reboot_mode = args[2] + var/new_reboot_mode = args[3] + message_admins("TGS: Rebooting will no longer [reboot_mode_lookup["[old_reboot_mode]"]], it will [reboot_mode_lookup["[new_reboot_mode]"]] instead") + if(TGS_EVENT_PORT_SWAP) + message_admins("TGS: Changing port from [world.port] to [args[2]]") + if(TGS_EVENT_INSTANCE_RENAMED) + message_admins("TGS: Instance renamed to from [world.TgsInstanceName()] to [args[2]]") + if(TGS_EVENT_COMPILE_START) + message_admins("TGS: Deployment started, new game version incoming...") + if(TGS_EVENT_COMPILE_CANCELLED) + message_admins("TGS: Deployment cancelled!") + if(TGS_EVENT_COMPILE_FAILURE) + message_admins("TGS: Deployment failed!") + if(TGS_EVENT_DEPLOYMENT_COMPLETE) + message_admins("TGS: Deployment complete!") + to_chat(world, "Server updated, changes will be applied on the next round...") + if(TGS_EVENT_WATCHDOG_DETACH) + message_admins("TGS restarting...") + reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES, TIMER_STOPPABLE) + if(TGS_EVENT_WATCHDOG_REATTACH) + var/datum/tgs_version/old_version = world.TgsVersion() + var/datum/tgs_version/new_version = args[2] + if(!old_version.Equals(new_version)) + to_chat(world, "TGS updated to v[new_version.deprefixed_parameter]") + else + message_admins("TGS: Back online") + if(reattach_timer) + deltimer(reattach_timer) + reattach_timer = null + if(TGS_EVENT_WATCHDOG_SHUTDOWN) + to_chat_immediate(world, "Server is shutting down!") + +/datum/tgs_event_handler/impl/proc/LateOnReattach() + message_admins("Warning: TGS hasn't notified us of it coming back for a full minute! Is there a problem?") diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm index 8cccc66063a7e..d5c7753277640 100644 --- a/code/datums/traits/_quirk.dm +++ b/code/datums/traits/_quirk.dm @@ -59,14 +59,14 @@ /datum/quirk/proc/clone_data() //return additional data that should be remembered by cloning /datum/quirk/proc/on_clone(data) //create the quirk from clone data -/datum/quirk/process() +/datum/quirk/process(delta_time) if(QDELETED(quirk_holder)) quirk_holder = null qdel(src) return if(quirk_holder.stat == DEAD) return - on_process() + on_process(delta_time) /mob/living/proc/get_trait_string(medical) //helper string. gets a string of all the traits the mob has var/list/dat = list() @@ -124,7 +124,7 @@ Use this as a guideline var/mob/living/carbon/human/H = quirk_holder var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H)) H.put_in_hands(glasses) - H.equip_to_slot(glasses, SLOT_GLASSES) + H.equip_to_slot(glasses, ITEM_SLOT_EYES) H.regenerate_icons() //This whole proc is called automatically diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 4a0f0f7e5b252..fac6f5fe67677 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -67,8 +67,8 @@ mob_trait = TRAIT_JOLLY mood_quirk = TRUE -/datum/quirk/jolly/on_process() - if(prob(0.05)) +/datum/quirk/jolly/on_process(delta_time) + if(DT_PROB(0.05, delta_time)) SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "jolly", /datum/mood_event/jolly) /datum/quirk/light_step @@ -91,8 +91,8 @@ var/mob/living/carbon/human/H = quirk_holder var/obj/item/choice_beacon/music/B = new(get_turf(H)) var/list/slots = list ( - "backpack" = SLOT_IN_BACKPACK, - "hands" = SLOT_HANDS, + "backpack" = ITEM_SLOT_BACKPACK, + "hands" = ITEM_SLOT_HANDS, ) H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE) @@ -144,8 +144,14 @@ /datum/quirk/photographer/on_spawn() var/mob/living/carbon/human/H = quirk_holder var/obj/item/camera/camera = new(get_turf(H)) - H.put_in_hands(camera) - H.equip_to_slot(camera, SLOT_NECK) + var/list/camera_slots = list ( + "neck" = ITEM_SLOT_NECK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET, + "backpack" = ITEM_SLOT_BACKPACK, + "hands" = ITEM_SLOT_HANDS + ) + H.equip_in_one_of_slots(camera, camera_slots , qdel_on_fail = TRUE) H.regenerate_icons() /datum/quirk/selfaware @@ -170,13 +176,13 @@ /datum/quirk/spiritual/on_spawn() var/mob/living/carbon/human/H = quirk_holder - H.equip_to_slot_or_del(new /obj/item/storage/fancy/candle_box(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/matches(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/fancy/candle_box(H), ITEM_SLOT_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/matches(H), ITEM_SLOT_BACKPACK) /datum/quirk/spiritual/on_process() var/comforted = FALSE - for(var/mob/living/L in oview(5, quirk_holder)) - if(L.mind?.isholy && L.stat == CONSCIOUS) + for(var/mob/living/carbon/human/H in oview(5, quirk_holder)) + if(H.mind?.holy_role && H.stat == CONSCIOUS) comforted = TRUE break if(comforted) @@ -196,7 +202,7 @@ var/mob/living/carbon/human/H = quirk_holder var/obj/item/toy/crayon/spraycan/spraycan = new(get_turf(H)) H.put_in_hands(spraycan) - H.equip_to_slot(spraycan, SLOT_IN_BACKPACK) + H.equip_to_slot(spraycan, ITEM_SLOT_BACKPACK) H.regenerate_icons() /datum/quirk/voracious diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index c402c41a76901..f67437bed3661 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -23,13 +23,13 @@ lose_text = "You feel vigorous again." medical_record_text = "Patient requires regular treatment for blood loss due to low production of blood." -/datum/quirk/blooddeficiency/on_process() +/datum/quirk/blooddeficiency/on_process(delta_time) var/mob/living/carbon/human/H = quirk_holder if(NOBLOOD in H.dna.species.species_traits) //can't lose blood if your species doesn't have any return else if (H.blood_volume > (BLOOD_VOLUME_SAFE - 25)) // just barely survivable without treatment - H.blood_volume -= 0.275 + H.blood_volume -= 0.275 * delta_time /datum/quirk/blindness name = "Blind" @@ -45,21 +45,38 @@ /datum/quirk/blindness/on_spawn() var/mob/living/carbon/human/H = quirk_holder var/obj/item/clothing/glasses/blindfold/white/B = new(get_turf(H)) - if(!H.equip_to_slot_if_possible(B, SLOT_GLASSES, bypass_equip_delay_self = TRUE)) //if you can't put it on the user's eyes, put it in their hands, otherwise put it on their eyes + if(!H.equip_to_slot_if_possible(B, ITEM_SLOT_EYES, bypass_equip_delay_self = TRUE)) //if you can't put it on the user's eyes, put it in their hands, otherwise put it on their eyes H.put_in_hands(B) H.regenerate_icons() /datum/quirk/brainproblems name = "Brain Tumor" - desc = "You have a little friend in your brain that is slowly destroying it. Better bring some mannitol!" + desc = "You have a little friend in your brain that is slowly destroying it. Thankfully, you start with a bottle of mannitol pills." value = -3 gain_text = "You feel smooth." lose_text = "You feel wrinkled again." medical_record_text = "Patient has a tumor in their brain that is slowly driving them to brain death." + var/where = "at your feet" /datum/quirk/brainproblems/on_process() quirk_holder.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2) +/datum/quirk/brainproblems/on_spawn() + var/mob/living/carbon/human/H = quirk_holder + var/obj/item/storage/pill_bottle/mannitol/braintumor/P = new(get_turf(H)) + + var/slot = H.equip_in_one_of_slots(P, list(ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET, ITEM_SLOT_BACKPACK), FALSE) + if(slot) + var/list/slots = list( + ITEM_SLOT_LPOCKET = "in your left pocket", + ITEM_SLOT_RPOCKET = "in your right pocket", + ITEM_SLOT_BACKPACK = "in your backpack" + ) + where = slots[slot] + +/datum/quirk/brainproblems/post_add() + to_chat(quirk_holder, "There is a bottle of mannitol [where]. You're going to need it.") + /datum/quirk/deafness name = "Deaf" desc = "You are incurably deaf." @@ -79,8 +96,8 @@ medical_record_text = "Patient has a severe mood disorder causing them to experience sudden moments of sadness." mood_quirk = TRUE -/datum/quirk/depression/on_process() - if(prob(0.05)) +/datum/quirk/depression/on_process(delta_time) + if(DT_PROB(0.05, delta_time)) SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "depression", /datum/mood_event/depression) /datum/quirk/family_heirloom @@ -103,7 +120,7 @@ if("Clown") heirloom_type = /obj/item/bikehorn/golden if("Mime") - heirloom_type = /obj/item/reagent_containers/food/snacks/baguette + heirloom_type = /obj/item/reagent_containers/food/snacks/baguette/mime if("Janitor") heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket) if("Cook") @@ -117,7 +134,7 @@ if("Chaplain") heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater) if("Assistant") - heirloom_type = /obj/item/storage/toolbox/mechanical/old/heirloom + heirloom_type = pick(/obj/item/storage/toolbox/mechanical/old/heirloom, /obj/item/clothing/gloves/cut/heirloom) if("Barber") heirloom_type = /obj/item/handmirror if("Stage Magician") @@ -179,9 +196,9 @@ /obj/item/dice/d20) heirloom = new heirloom_type(get_turf(quirk_holder)) var/list/slots = list( - "in your left pocket" = SLOT_L_STORE, - "in your right pocket" = SLOT_R_STORE, - "in your backpack" = SLOT_IN_BACKPACK + "in your left pocket" = ITEM_SLOT_LPOCKET, + "in your right pocket" = ITEM_SLOT_RPOCKET, + "in your backpack" = ITEM_SLOT_BACKPACK ) where = H.equip_in_one_of_slots(heirloom, slots, FALSE) || "at your feet" @@ -230,13 +247,13 @@ /datum/quirk/foreigner/add() var/mob/living/carbon/human/H = quirk_holder - if(ishuman(H) && !isipc(H) && H.job != "Curator") + if(ishuman(H) && H.job != "Curator") H.add_blocked_language(/datum/language/common) H.grant_language(/datum/language/uncommon) /datum/quirk/foreigner/remove() var/mob/living/carbon/human/H = quirk_holder - if(ishuman(H) && !isipc(H) && H.job != "Curator") + if(ishuman(H) && H.job != "Curator") H.remove_blocked_language(/datum/language/common) H.remove_language(/datum/language/uncommon) @@ -290,7 +307,7 @@ var/mob/living/carbon/human/H = quirk_holder var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H)) H.put_in_hands(glasses) - H.equip_to_slot(glasses, SLOT_GLASSES) + H.equip_to_slot(glasses, ITEM_SLOT_EYES) H.regenerate_icons() //this is to remove the inhand icon, which persists even if it's not in their hands /datum/quirk/nyctophobia @@ -303,8 +320,7 @@ if(H.dna.species.id in list("shadow", "nightmare")) return //we're tied with the dark, so we don't get scared of it; don't cleanse outright to avoid cheese var/turf/T = get_turf(quirk_holder) - var/lums = T.get_lumcount() - if(lums <= 0.2) + if(T.get_lumcount() <= 0.2) if(quirk_holder.m_intent == MOVE_INTENT_RUN) to_chat(quirk_holder, "Easy, easy, take it slow... you're in the dark...") quirk_holder.toggle_move_intent() @@ -419,11 +435,11 @@ lose_text = "You feel in tune with the world again." medical_record_text = "Patient suffers from acute Reality Dissociation Syndrome and experiences vivid hallucinations." -/datum/quirk/insanity/on_process() +/datum/quirk/insanity/on_process(delta_time) if(quirk_holder.reagents.has_reagent(/datum/reagent/toxin/mindbreaker, needs_metabolizing = TRUE)) quirk_holder.hallucination = 0 return - if(prob(2)) //we'll all be mad soon enough + if(DT_PROB(2, delta_time)) //we'll all be mad soon enough madness() /datum/quirk/insanity/proc/madness() @@ -444,18 +460,18 @@ medical_record_text = "Patient is usually anxious in social encounters and prefers to avoid them." var/dumb_thing = TRUE -/datum/quirk/social_anxiety/on_process() +/datum/quirk/social_anxiety/on_process(delta_time) var/nearby_people = 0 for(var/mob/living/carbon/human/H in oview(3, quirk_holder)) if(H.client) nearby_people++ var/mob/living/carbon/human/H = quirk_holder - if(prob(2 + nearby_people)) + if(DT_PROB(2 + nearby_people, delta_time)) H.stuttering = max(3, H.stuttering) - else if(prob(min(3, nearby_people)) && !H.silent) + else if(DT_PROB(min(3, nearby_people), delta_time) && !H.silent) to_chat(H, "You retreat into yourself. You really don't feel up to talking.") H.silent = max(10, H.silent) - else if(prob(0.5) && dumb_thing) + else if(DT_PROB(0.5, delta_time) && dumb_thing) to_chat(H, "You think of a dumb thing you said a long time ago and scream internally.") dumb_thing = FALSE //only once per life if(prob(1)) @@ -469,7 +485,7 @@ gain_text = "You suddenly feel the craving for drugs." lose_text = "You feel like you should kick your drug habit." medical_record_text = "Patient has a history of hard drugs." - var/drug_list = list(/datum/reagent/drug/crank, /datum/reagent/drug/krokodil, /datum/reagent/medicine/morphine, /datum/reagent/drug/happiness, /datum/reagent/drug/methamphetamine) //List of possible IDs + var/drug_list = list(/datum/reagent/drug/crank, /datum/reagent/drug/krokodil, /datum/reagent/medicine/morphine, /datum/reagent/drug/happiness, /datum/reagent/drug/methamphetamine, /datum/reagent/drug/ketamine) //List of possible IDs var/datum/reagent/reagent_type //!If this is defined, reagent_id will be unused and the defined reagent type will be instead. var/datum/reagent/reagent_instance //! actual instanced version of the reagent var/where_drug //! Where the drug spawned @@ -500,9 +516,9 @@ if (accessory_type) accessory_instance = new accessory_type(current_turf) var/list/slots = list( - "in your left pocket" = SLOT_L_STORE, - "in your right pocket" = SLOT_R_STORE, - "in your backpack" = SLOT_IN_BACKPACK + "in your left pocket" = ITEM_SLOT_LPOCKET, + "in your right pocket" = ITEM_SLOT_RPOCKET, + "in your backpack" = ITEM_SLOT_BACKPACK ) where_drug = H.equip_in_one_of_slots(drug_instance, slots, FALSE) || "at your feet" if (accessory_instance) @@ -555,7 +571,7 @@ /datum/quirk/junkie/smoker/on_process() . = ..() var/mob/living/carbon/human/H = quirk_holder - var/obj/item/I = H.get_item_by_slot(SLOT_WEAR_MASK) + var/obj/item/I = H.get_item_by_slot(ITEM_SLOT_MASK) if (istype(I, /obj/item/clothing/mask/cigarette)) var/obj/item/storage/fancy/cigarettes/C = drug_container_type if(istype(I, initial(C.spawn_type))) @@ -563,6 +579,65 @@ return SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "wrong_cigs", /datum/mood_event/wrong_brand) +/datum/quirk/alcoholic + name = "Alcoholic" + desc = "You can't stand being sober." + value = -1 + gain_text = "You could really go for a drink right about now." + lose_text = "You feel like you should quit drinking." + medical_record_text = "Patient is an alcohol abuser." + var/where_drink //Where the bottle spawned + var/drink_types = list(/obj/item/reagent_containers/food/drinks/bottle/ale, + /obj/item/reagent_containers/food/drinks/bottle/beer, + /obj/item/reagent_containers/food/drinks/bottle/gin, + /obj/item/reagent_containers/food/drinks/bottle/whiskey, + /obj/item/reagent_containers/food/drinks/bottle/vodka, + /obj/item/reagent_containers/food/drinks/bottle/rum, + /obj/item/reagent_containers/food/drinks/bottle/applejack) + var/need = 0 // How much they crave alcohol at the moment + var/tick_number = 0 // Keeping track of how many ticks have passed between a check + var/obj/item/reagent_containers/food/drinks/bottle/drink_instance + +/datum/quirk/alcoholic/on_spawn() + drink_instance = pick(drink_types) + drink_instance = new drink_instance() + var/list/slots = list("in your backpack" = ITEM_SLOT_BACKPACK) + var/mob/living/carbon/human/H = quirk_holder + where_drink = H.equip_in_one_of_slots(drink_instance, slots, FALSE) || "at your feet" + +/datum/quirk/alcoholic/post_add() + to_chat(quirk_holder, "There is a small bottle of [drink_instance] [where_drink]. You only have a single bottle, might have to find some more...") + +/datum/quirk/alcoholic/on_process() + if(tick_number >= 6) // how many ticks should pass between a check + tick_number = 0 + var/mob/living/carbon/human/H = quirk_holder + if(H.drunkenness > 0) // If they're not drunk, need goes up. else they're satisfied + need = -15 + else + need++ + + switch(need) + if(1 to 10) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "alcoholic", /datum/mood_event/withdrawal_light, "alcohol") + if(prob(5)) + to_chat(H, "You could go for a drink right about now.") + if(10 to 20) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "alcoholic", /datum/mood_event/withdrawal_medium, "alcohol") + if(prob(5)) + to_chat(H, "You feel like you need alcohol. You just can't stand being sober.") + if(20 to 30) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "alcoholic", /datum/mood_event/withdrawal_severe, "alcohol") + if(prob(5)) + to_chat(H, "You have an intense craving for a drink.") + if(30 to INFINITY) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "alcoholic", /datum/mood_event/withdrawal_critical, "Alcohol") + if(prob(5)) + to_chat(H, "You're not feeling good at all! You really need some alcohol.") + else + SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "alcoholic") + tick_number++ + /datum/quirk/unstable name = "Unstable" desc = "Due to past troubles, you are unable to recover your sanity if you lose it. Be very careful managing your mood!" @@ -571,3 +646,20 @@ gain_text = "There's a lot on your mind right now." lose_text = "Your mind finally feels calm." medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." + +/datum/quirk/phobia + name = "Phobia" + desc = "Because of a traumatic event in your past you have developed a strong phobia." + value = -2 + gain_text = "You start feeling an irrational fear of something." + lose_text = "You are no longer irrationally afraid." + medical_record_text = "Patient suffers from a deeply-rooted phobia." + +/datum/quirk/phobia/add() + var/datum/brain_trauma/mild/phobia/T = new() + var/mob/living/carbon/human/H = quirk_holder + H.gain_trauma(T, TRAUMA_RESILIENCE_ABSOLUTE) + +/datum/quirk/phobia/remove() + var/mob/living/carbon/human/H = quirk_holder + H.cure_trauma_type(/datum/brain_trauma/mild/phobia, TRAUMA_RESILIENCE_ABSOLUTE) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index f16f2b3741793..beedf80064f51 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -29,7 +29,7 @@ var/datum/species/species = H.dna.species if(initial(species.liked_food) & MEAT) species.liked_food |= MEAT - if(!initial(species.disliked_food) & MEAT) + if(!(initial(species.disliked_food) & MEAT)) species.disliked_food &= ~MEAT /datum/quirk/pineapple_liker @@ -54,7 +54,7 @@ name = "Ananas Aversion" desc = "You find yourself greatly detesting fruits of the ananas genus. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare putting it on a pizza!?" value = 0 - gain_text = "You find yourself pondering what kind of idiot actually enjoys pineapples..." + gain_text = "You find yourself pondering what kind of idiot actually enjoys pineapples." lose_text = "Your feelings towards pineapples seem to return to a lukewarm state." /datum/quirk/pineapple_hater/add() @@ -89,24 +89,6 @@ species.liked_food = initial(species.liked_food) species.disliked_food = initial(species.disliked_food) -/datum/quirk/neat - name = "Neat" - desc = "You really don't like being unhygienic, and will get sad if you are." - mob_trait = TRAIT_NEAT - gain_text = "You feel like you have to stay clean." - lose_text = "You no longer feel the need to always be clean." - mood_quirk = TRUE - -/datum/quirk/neat/on_process() - var/mob/living/carbon/human/H = quirk_holder - switch (H.hygiene) - if(0 to HYGIENE_LEVEL_DIRTY) - SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "neat", /datum/mood_event/dirty) - if(HYGIENE_LEVEL_DIRTY to HYGIENE_LEVEL_NORMAL) - SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "neat") - if(HYGIENE_LEVEL_NORMAL to HYGIENE_LEVEL_CLEAN) - SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "neat", /datum/mood_event/neat) - /datum/quirk/monochromatic name = "Monochromacy" desc = "You suffer from full colorblindness, and perceive nearly the entire world in blacks and whites." @@ -118,7 +100,7 @@ /datum/quirk/monochromatic/post_add() if(quirk_holder.mind.assigned_role == "Detective") - to_chat(quirk_holder, "Mmm. Nothing's ever clear on this station. It's all shades of gray...") + to_chat(quirk_holder, "Mmm. Nothing's ever clear on this station. It's all shades of gray.") quirk_holder.playsound_local(quirk_holder, 'sound/ambience/ambidet1.ogg', 50, FALSE) /datum/quirk/monochromatic/remove() diff --git a/code/datums/verbs.dm b/code/datums/verbs.dm deleted file mode 100644 index 8f79ed5eec34b..0000000000000 --- a/code/datums/verbs.dm +++ /dev/null @@ -1,102 +0,0 @@ -/datum/verbs - var/name - var/list/children - var/datum/verbs/parent - var/list/verblist - var/abstract = FALSE - -//returns the master list for verbs of a type -/datum/verbs/proc/GetList() - CRASH("Abstract verblist for [type]") - -//do things for each entry in Generate_list -//return value sets Generate_list[verbpath] -/datum/verbs/proc/HandleVerb(list/entry, procpath/verbpath, ...) - return entry - -/datum/verbs/New() - var/mainlist = GetList() - var/ourentry = mainlist[type] - children = list() - verblist = list() - if (ourentry) - if (!islist(ourentry)) //some of our childern already loaded - qdel(src) - CRASH("Verb double load: [type]") - Add_children(ourentry) - - mainlist[type] = src - - Load_verbs(type, typesof("[type]/verb")) - - var/datum/verbs/parent = mainlist[parent_type] - if (!parent) - mainlist[parent_type] = list(src) - else if (islist(parent)) - parent += src - else - parent.Add_children(list(src)) - -/datum/verbs/proc/Set_parent(datum/verbs/_parent) - parent = _parent - if (abstract) - parent.Add_children(children) - var/list/verblistoftypes = list() - for(var/thing in verblist) - LAZYADD(verblistoftypes[verblist[thing]], thing) - - for(var/verbparenttype in verblistoftypes) - parent.Load_verbs(verbparenttype, verblistoftypes[verbparenttype]) - -/datum/verbs/proc/Add_children(list/kids) - if (abstract && parent) - parent.Add_children(kids) - return - - for(var/thing in kids) - var/datum/verbs/item = thing - item.Set_parent(src) - if (!item.abstract) - children += item - -/datum/verbs/proc/Load_verbs(verb_parent_type, list/verbs) - if (abstract && parent) - parent.Load_verbs(verb_parent_type, verbs) - return - - for (var/verbpath in verbs) - verblist[verbpath] = verb_parent_type - -/datum/verbs/proc/Generate_list(...) - . = list() - if (length(children)) - for (var/thing in children) - var/datum/verbs/child = thing - var/list/childlist = child.Generate_list(arglist(args)) - if (childlist) - var/childname = "[child]" - if (childname == "[child.type]") - var/list/tree = splittext(childname, "/") - childname = tree[tree.len] - .[child.type] = "parent=[rustg_url_encode(type)];name=[childname]" - . += childlist - - for (var/thing in verblist) - var/procpath/verbpath = thing - if (!verbpath) - stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]") - var/list/entry = list() - entry["parent"] = "[type]" - entry["name"] = verbpath.desc - if (verbpath.name[1] == "@") - entry["command"] = copytext(verbpath.name, length(verbpath.name[1]) + 1) - else - entry["command"] = replacetext(verbpath.name, " ", "-") - - .[verbpath] = HandleVerb(arglist(list(entry, verbpath) + args)) - -/world/proc/LoadVerbs(verb_type) - if(!ispath(verb_type, /datum/verbs) || verb_type == /datum/verbs) - CRASH("Invalid verb_type: [verb_type]") - for (var/typepath in subtypesof(verb_type)) - new typepath() diff --git a/code/datums/view.dm b/code/datums/view.dm index 7d425c9ad8505..ea695b50dee55 100644 --- a/code/datums/view.dm +++ b/code/datums/view.dm @@ -34,9 +34,11 @@ /datum/viewData/proc/isZooming() return (width || height) -/datum/viewData/proc/resetToDefault() +/datum/viewData/proc/resetToDefault(var/new_default) width = 0 height = 0 + if(new_default != null) + default = new_default apply() /datum/viewData/proc/add(toAdd) diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index d0fff8da9fe3d..6ab9cbadcee3c 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -47,7 +47,7 @@ /datum/weather/rad_storm/end() if(..()) return - priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") + priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert", SSstation.announcer.get_rand_alert_sound()) status_alarm(FALSE) /datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement. diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index 511847484ccf7..8c1f04e869a82 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -90,9 +90,11 @@ /datum/wires/proc/shuffle_wires() colors.Cut() randomize() + ui_update() /datum/wires/proc/repair() cut_wires.Cut() + ui_update() /datum/wires/proc/get_wire(color) return colors[color] @@ -135,29 +137,36 @@ else cut_wires += wire on_cut(wire, mend = FALSE) + ui_update() /datum/wires/proc/cut_color(color) cut(get_wire(color)) + ui_update() /datum/wires/proc/cut_random() cut(wires[rand(1, wires.len)]) + ui_update() /datum/wires/proc/cut_all() for(var/wire in wires) cut(wire) + ui_update() /datum/wires/proc/pulse(wire, user) if(is_cut(wire)) return on_pulse(wire, user) + ui_update() /datum/wires/proc/pulse_color(color, mob/living/user) pulse(get_wire(color), user) + ui_update() /datum/wires/proc/pulse_assembly(obj/item/assembly/S) for(var/color in assemblies) if(S == assemblies[color]) pulse_color(color) + ui_update() return TRUE /datum/wires/proc/attach_assembly(color, obj/item/assembly/S) @@ -165,6 +174,7 @@ assemblies[color] = S S.forceMove(holder) S.connected = src + ui_update() return S /datum/wires/proc/detach_assembly(color) @@ -173,6 +183,7 @@ assemblies -= color S.connected = null S.forceMove(holder.drop_location()) + ui_update() return S /datum/wires/proc/emp_pulse() @@ -185,6 +196,7 @@ remaining_pulses-- if(!remaining_pulses) break + ui_update() // Overridable Procs /datum/wires/proc/interactable(mob/user) @@ -217,6 +229,7 @@ return ..() return UI_CLOSE + /datum/wires/ui_state(mob/user) return GLOB.physical_state diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm index 7acfdf76bc203..d11cf41bd8ea5 100644 --- a/code/datums/wires/airalarm.dm +++ b/code/datums/wires/airalarm.dm @@ -54,7 +54,7 @@ A.apply_mode(usr) if(WIRE_ALARM) // Clear alarms. var/area/AA = get_area(A) - if(AA.atmosalert(0, holder)) + if(AA.atmosalert(FALSE, holder)) A.post_alert(0) A.update_icon() @@ -76,6 +76,6 @@ A.apply_mode(usr) if(WIRE_ALARM) // Post alarm. var/area/AA = get_area(A) - if(AA.atmosalert(2, holder)) + if(AA.atmosalert(TRUE, holder)) A.post_alert(2) A.update_icon() diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index f06bba6486714..eafdef8eff45f 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -69,12 +69,7 @@ A.aiControlDisabled = 1 else if(A.aiControlDisabled == -1) A.aiControlDisabled = 2 - sleep(10) - if(A) - if(A.aiControlDisabled == 1) - A.aiControlDisabled = 0 - else if(A.aiControlDisabled == 2) - A.aiControlDisabled = -1 + addtimer(CALLBACK(A, /obj/machinery/door/airlock.proc/reset_ai_wire), 1 SECONDS) if(WIRE_SHOCK) // Pulse to shock the door for 10 ticks. if(!A.secondsElectrified) A.set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME, usr) @@ -87,6 +82,16 @@ if(WIRE_LIGHT) A.lights = !A.lights A.update_icon() + ui_update() + A.ui_update() + +/obj/machinery/door/airlock/proc/reset_ai_wire() + if(aiControlDisabled == 1) + aiControlDisabled = 0 + else if(aiControlDisabled == 2) + aiControlDisabled = -1 + wires.ui_update() + ui_update() /datum/wires/airlock/on_cut(wire, mend) var/obj/machinery/door/airlock/A = holder @@ -138,3 +143,5 @@ if(WIRE_ZAP1, WIRE_ZAP2) // Ouch. if(isliving(usr)) A.shock(usr, 50) + ui_update() + A.ui_update() diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index dc126f612e120..b4c9d22c8c207 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -37,6 +37,7 @@ if(!A.aidisabled) A.aidisabled = TRUE addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 10) + ui_update() /datum/wires/apc/on_cut(index, mend) var/obj/machinery/power/apc/A = holder @@ -52,4 +53,5 @@ if(mend) A.aidisabled = FALSE else - A.aidisabled = TRUE \ No newline at end of file + A.aidisabled = TRUE + ui_update() diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm index 8b113adad1f25..1e5cd1017d11b 100644 --- a/code/datums/wires/autolathe.dm +++ b/code/datums/wires/autolathe.dm @@ -1,5 +1,5 @@ /datum/wires/autolathe - holder_type = /obj/machinery/autolathe + holder_type = /obj/machinery/modular_fabricator/autolathe proper_name = "Autolathe" /datum/wires/autolathe/New(atom/holder) @@ -11,34 +11,35 @@ ..() /datum/wires/autolathe/interactable(mob/user) - var/obj/machinery/autolathe/A = holder + var/obj/machinery/modular_fabricator/autolathe/A = holder if(A.panel_open) return TRUE /datum/wires/autolathe/get_status() - var/obj/machinery/autolathe/A = holder + var/obj/machinery/modular_fabricator/autolathe/A = holder var/list/status = list() status += "The red light is [A.disabled ? "on" : "off"]." status += "The blue light is [A.hacked ? "on" : "off"]." return status /datum/wires/autolathe/on_pulse(wire) - var/obj/machinery/autolathe/A = holder + var/obj/machinery/modular_fabricator/autolathe/A = holder switch(wire) if(WIRE_HACK) A.adjust_hacked(!A.hacked) - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, /obj/machinery/modular_fabricator/autolathe.proc/reset, wire), 60) if(WIRE_SHOCK) A.shocked = !A.shocked - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, /obj/machinery/modular_fabricator/autolathe.proc/reset, wire), 60) if(WIRE_DISABLE) A.disabled = !A.disabled - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, /obj/machinery/modular_fabricator/autolathe.proc/reset, wire), 60) if(WIRE_ACTIVATE) A.begin_process() + ui_update() /datum/wires/autolathe/on_cut(wire, mend) - var/obj/machinery/autolathe/A = holder + var/obj/machinery/modular_fabricator/autolathe/A = holder switch(wire) if(WIRE_HACK) A.adjust_hacked(!mend) @@ -48,3 +49,4 @@ A.disabled = !mend if(WIRE_ZAP) A.shock(usr, 50) + ui_update() diff --git a/code/datums/wires/emitter.dm b/code/datums/wires/emitter.dm index d0e1352c0efa4..a157230f07f63 100644 --- a/code/datums/wires/emitter.dm +++ b/code/datums/wires/emitter.dm @@ -14,4 +14,3 @@ if(WIRE_HACK) E.mode = !E.mode E.set_projectile() - ..() diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index 8616478010510..518d3e6c58712 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -43,7 +43,7 @@ message_admins("\An [assembly] has pulsed a grenade, which was installed by [fingerprint].") log_game("\An [assembly] has pulsed a grenade, which was installed by [fingerprint].") var/mob/M = get_mob_by_ckey(fingerprint) - var/turf/T = get_turf(M) + var/turf/T = get_turf(M) G.log_grenade(M, T) G.prime() @@ -99,6 +99,7 @@ switch(wire) if(WIRE_DISARM) // Pulse to toggle P.bomb_defused = !P.bomb_defused + ui_update() else // Boom explode() @@ -108,6 +109,7 @@ if(WIRE_DISARM) // Disarm and untrap the box. if(!mend) P.bomb_defused = TRUE + ui_update() else if(!mend && !P.bomb_defused) explode() @@ -116,10 +118,9 @@ var/obj/item/pizzabox/P = holder P.bomb.detonate() - /datum/wires/explosive/gibtonite - holder_type = /obj/item/twohanded/required/gibtonite + holder_type = /obj/item/gibtonite /datum/wires/explosive/gibtonite/explode() - var/obj/item/twohanded/required/gibtonite/P = holder + var/obj/item/gibtonite/P = holder P.GibtoniteReaction(null, 2) diff --git a/code/datums/wires/r_n_d.dm b/code/datums/wires/r_n_d.dm index ea61c1779ef4e..7aaad875faa59 100644 --- a/code/datums/wires/r_n_d.dm +++ b/code/datums/wires/r_n_d.dm @@ -30,6 +30,7 @@ R.hacked = !R.hacked if(WIRE_DISABLE) R.disabled = !R.disabled + ui_update() /datum/wires/rnd/on_cut(wire, mend) var/obj/machinery/rnd/R = holder switch(wire) @@ -37,3 +38,4 @@ R.hacked = !mend if(WIRE_DISABLE) R.disabled = !mend + ui_update() diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 46fb8200ea63b..5ad295d80a271 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -38,6 +38,7 @@ new_ai = select_active_ai(R) R.notify_ai(DISCONNECT) if(new_ai && (new_ai != R.connected_ai)) + log_combat(usr, R, "synced cyborg [R.connected_ai ? "from [ADMIN_LOOKUP(R.connected_ai)]": "false"] to [ADMIN_LOOKUP(new_ai)]") R.connected_ai = new_ai if(R.shell) R.undeploy() //If this borg is an AI shell, disconnect the controlling AI and assign ti to a new AI @@ -46,18 +47,24 @@ R.notify_ai(TRUE) if(WIRE_CAMERA) // Pulse to disable the camera. if(!QDELETED(R.builtInCamera) && !R.scrambledcodes) - R.builtInCamera.toggle_cam(usr, 0) + R.builtInCamera.toggle_cam(usr, FALSE) R.visible_message("[R]'s camera lens focuses loudly.", "Your camera lens focuses loudly.") + log_combat(usr, R, "toggled cyborg camera to [R.builtInCamera.status ? "on" : "off"] via pulse") if(WIRE_LAWSYNC) // Forces a law update if possible. if(R.lawupdate) R.visible_message("[R] gently chimes.", "LawSync protocol engaged.") + log_combat(usr, R, "forcibly synced cyborg laws via pulse") + // TODO, log the laws they gained here R.lawsync() R.show_laws() if(WIRE_LOCKDOWN) R.SetLockdown(!R.lockcharge) // Toggle + log_combat(usr, R, "[!R.lockcharge ? "locked down" : "released"] via pulse") + if(WIRE_RESET_MODULE) if(R.has_module()) R.visible_message("[R]'s module servos twitch.", "Your module display flickers.") + ui_update() /datum/wires/robot/on_cut(wire, mend) var/mob/living/silicon/robot/R = holder @@ -65,6 +72,7 @@ if(WIRE_AI) // Cut the AI wire to reset AI control. if(!mend) R.notify_ai(DISCONNECT) + log_combat(usr, R, "cut AI wire on cyborg[R.connected_ai ? " and disconnected from [ADMIN_LOOKUP(R.connected_ai)]": ""]") if(R.shell) R.undeploy() R.connected_ai = null @@ -72,15 +80,21 @@ if(mend) if(!R.emagged) R.lawupdate = TRUE + log_combat(usr, R, "enabled lawsync via wire") else if(!R.deployed) //AI shells must always have the same laws as the AI R.lawupdate = FALSE + log_combat(usr, R, "disabled lawsync via wire") if (WIRE_CAMERA) // Disable the camera. if(!QDELETED(R.builtInCamera) && !R.scrambledcodes) R.builtInCamera.status = mend - R.builtInCamera.toggle_cam(usr, 0) + R.builtInCamera.toggle_cam(usr, FALSE) R.visible_message("[R]'s camera lens focuses loudly.", "Your camera lens focuses loudly.") + log_combat(usr, R, "[mend ? "enabled" : "disabled"] cyborg camera via wire") if(WIRE_LOCKDOWN) // Simple lockdown. R.SetLockdown(!mend) + log_combat(usr, R, "[!R.lockcharge ? "locked down" : "released"] via wire") if(WIRE_RESET_MODULE) if(R.has_module() && !mend) R.ResetModule() + log_combat(usr, R, "reset the cyborg module via wire") + ui_update() diff --git a/code/datums/wires/suit_storage_unit.dm b/code/datums/wires/suit_storage_unit.dm index eb7781203b2b5..7b165622effec 100644 --- a/code/datums/wires/suit_storage_unit.dm +++ b/code/datums/wires/suit_storage_unit.dm @@ -32,6 +32,7 @@ if(WIRE_ZAP) if(usr) SSU.shock(usr) + ui_update() /datum/wires/suit_storage_unit/on_cut(wire, mend) var/obj/machinery/suit_storage_unit/SSU = holder @@ -43,3 +44,4 @@ if(WIRE_ZAP) if(usr) SSU.shock(usr) + ui_update() diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm index 078c940b041fd..c703b88105ef8 100644 --- a/code/datums/wires/vending.dm +++ b/code/datums/wires/vending.dm @@ -40,6 +40,7 @@ V.scan_id = !V.scan_id if(WIRE_SPEAKER) V.shut_up = !V.shut_up + ui_update() /datum/wires/vending/on_cut(wire, mend) var/obj/machinery/vending/V = holder @@ -57,3 +58,4 @@ V.scan_id = mend if(WIRE_SPEAKER) V.shut_up = mend + ui_update() diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 9580dbb63a6b8..5b86aac25c5aa 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -1,198 +1,295 @@ -// SETUP - -/proc/TopicHandlers() - . = list() - var/list/all_handlers = subtypesof(/datum/world_topic) - for(var/I in all_handlers) - var/datum/world_topic/WT = I - var/keyword = initial(WT.keyword) - if(!keyword) - warning("[WT] has no keyword! Ignoring...") - continue - var/existing_path = .[keyword] - if(existing_path) - warning("[existing_path] and [WT] have the same keyword! Ignoring [WT]...") - else if(keyword == "key") - warning("[WT] has keyword 'key'! Ignoring...") - else - .[keyword] = WT +// VERSION + +// Update topic version whenever changes are made +// The Version Number follows SemVer http://semver.org/ +#define TOPIC_VERSION_MAJOR 2 // Major Version Number --> Increment when implementing breaking changes +#define TOPIC_VERSION_MINOR 0 // Minor Version Number --> Increment when adding features +#define TOPIC_VERSION_PATCH 0 // Patchlevel --> Increment when fixing bugs // DATUM /datum/world_topic - var/keyword - var/log = TRUE - var/key_valid - var/require_comms_key = FALSE - -/datum/world_topic/proc/TryRun(list/input, addr) - key_valid = config && (CONFIG_GET(string/comms_key) == input["key"]) - if(require_comms_key && !key_valid) - return "Bad Key" - input -= "key" - . = Run(input, addr) - if(islist(.)) - . = list2params(.) - -/datum/world_topic/proc/Run(list/input, addr) - CRASH("Run() not implemented for [type]!") + var/key // query key + var/anonymous = FALSE // can be used with anonymous authentication + var/list/required_params = list() + var/statuscode = null + var/response = null + var/data = null + +/datum/world_topic/proc/CheckParams(list/params) + var/list/missing_params = list() + var/errorcount = 0 + + for(var/param in required_params) + if(!params[param]) + errorcount++ + missing_params += param + + if(errorcount) + statuscode = 400 + response = "Bad Request - Missing parameters" + data = missing_params + return errorcount + +/datum/world_topic/proc/Run(list/input) + // Always returns true; actual details in statuscode, response and data variables + return TRUE + +// API INFO TOPICS + +/datum/world_topic/api_get_version + key = "api_get_version" + anonymous = TRUE + +/datum/world_topic/api_get_version/Run(list/input) + . = ..() + var/list/version = list() + var/versionstring = null + + version["major"] = TOPIC_VERSION_MAJOR + version["minor"] = TOPIC_VERSION_MINOR + version["patch"] = TOPIC_VERSION_PATCH + + versionstring = "[version["major"]].[version["minor"]].[version["patch"]]" + + statuscode = 200 + response = versionstring + data = version + +/datum/world_topic/api_get_authed_functions + key = "api_get_authed_functions" + anonymous = TRUE + +/datum/world_topic/api_get_authed_functions/Run(list/input) + . = ..() + var/list/functions = GLOB.topic_tokens[input["auth"]] + if(functions) + statuscode = 200 + response = "Authorized functions retrieved" + data = functions + else + statuscode = 401 + response = "Unauthorized - No functions found" + data = null + +/datum/world_topic/api_do_handshake + key = "api_do_handshake" + anonymous = TRUE + +/datum/world_topic/api_do_handshake/Run(list/input) + . = ..() + var/list/functions = GLOB.topic_tokens[input["auth"]] + var/list/servers = CONFIG_GET(keyed_list/cross_server) + var/fmt_addr = "byond://[input["addr"]]" + var/token = servers[fmt_addr] + if(!token || !functions) // Handshake requires both servers to have each other's deets + statuscode = 401 + response = "Unauthorized - Handshake Failed" + data = null + else + statuscode = 200 + response = "Handshake Successful" + data = list("token" = token, "functions" = functions) + if(!GLOB.topic_servers[fmt_addr]) // part of the ad-hoc connection system + SStopic.handshake_server(fmt_addr, token) // TOPICS /datum/world_topic/ping - keyword = "ping" - log = FALSE + key = "ping" + anonymous = TRUE -/datum/world_topic/ping/Run(list/input, addr) - . = 0 - for (var/client/C in GLOB.clients) - ++. +/datum/world_topic/ping/Run(list/input) + . = ..() + statuscode = 200 + response = "Pong!" + data = length(GLOB.clients) /datum/world_topic/playing - keyword = "playing" - log = FALSE + key = "playing" + anonymous = TRUE -/datum/world_topic/playing/Run(list/input, addr) - return GLOB.player_list.len +/datum/world_topic/playing/Run(list/input) + . = ..() + statuscode = 200 + response = "Player count retrieved" + data = length(GLOB.player_list) /datum/world_topic/pr_announce - keyword = "announce" - require_comms_key = TRUE + key = "announce" + required_params = list("id", "announce") var/static/list/PRcounts = list() //PR id -> number of times announced this round -/datum/world_topic/pr_announce/Run(list/input, addr) - var/list/payload = json_decode(input["payload"]) - var/id = "[payload["pull_request"]["id"]]" - if(!PRcounts[id]) - PRcounts[id] = 1 +/datum/world_topic/pr_announce/Run(list/input) + . = ..() + if(!PRcounts[input["id"]]) + PRcounts[input["id"]] = 1 else - ++PRcounts[id] - if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND) + PRcounts[input["id"]]++ + if(PRcounts[input["id"]] > PR_ANNOUNCEMENTS_PER_ROUND) + statuscode = 429 + response = "Rate Limited - PR Spam blocked" return - var/final_composed = "PR: [input[keyword]]" + var/final_composed = "PR: [input["announce"]]" for(var/client/C in GLOB.clients) C.AnnouncePR(final_composed) + statuscode = 200 + response = "PR Announced" /datum/world_topic/ahelp_relay - keyword = "Ahelp" - require_comms_key = TRUE + key = "ahelp" + required_params = list("source", "message", "message_sender") -/datum/world_topic/ahelp_relay/Run(list/input, addr) - relay_msg_admins("HELP: [input["source"]] [input["message_sender"]]: [input["message"]]") +/datum/world_topic/ahelp_relay/Run(list/input) + . = ..() + relay_msg_admins("HELP: [input["source"]]: [input["message_sender"]]: [input["message"]]") + statuscode = 200 + response = "Ahelp relayed" /datum/world_topic/comms_console - keyword = "Comms_Console" - require_comms_key = TRUE + key = "comms_console" + required_params = list("message", "message_sender") + +/datum/world_topic/comms_console/Run(list/input) + . = ..() + if(CHAT_FILTER_CHECK(input["message"])) // prevents any.. diplomatic incidents + minor_announce("In the interest of station productivity and mental hygiene, a message from [input["message_sender"]] was intercepted by the CCC and determined to be unfit for crew-level access.", "CentCom Communications Commission") + message_admins("Incomming cross-comms message from [input["message_sender"]] blocked: [input["message"]]") + statuscode = 451 // "Unavailable for legal reasons" ahaha; i.e. censored + response = "Censored - Message blocked by chat filter" + return -/datum/world_topic/comms_console/Run(list/input, addr) minor_announce(input["message"], "Incoming message from [input["message_sender"]]") for(var/obj/machinery/computer/communications/CM in GLOB.machines) CM.overrideCooldown() + statuscode = 200 + response = "Message received" /datum/world_topic/news_report - keyword = "News_Report" - require_comms_key = TRUE + key = "news_report" + required_params = list("message", "message_sender") -/datum/world_topic/news_report/Run(list/input, addr) +/datum/world_topic/news_report/Run(list/input) + . = ..() minor_announce(input["message"], "Breaking Update From [input["message_sender"]]") - -/datum/world_topic/adminmsg - keyword = "adminmsg" - require_comms_key = TRUE - -/datum/world_topic/adminmsg/Run(list/input, addr) - return IrcPm(input[keyword], input["msg"], input["sender"]) + statuscode = 200 + response = "Message received" /datum/world_topic/namecheck - keyword = "namecheck" - require_comms_key = TRUE + key = "namecheck" + required_params = list("target") -/datum/world_topic/namecheck/Run(list/input, addr) - //Oh this is a hack, someone refactor the functionality out of the chat command PLS - var/datum/tgs_chat_command/namecheck/NC = new - var/datum/tgs_chat_user/user = new - user.friendly_name = input["sender"] - user.mention = user.friendly_name - return NC.Run(user, input["namecheck"]) +/datum/world_topic/namecheck/Run(list/input) + . = ..() + statuscode = 200 + response = "Names fetched" + data = keywords_lookup(input["target"], TRUE) /datum/world_topic/adminwho - keyword = "adminwho" - require_comms_key = TRUE - -/datum/world_topic/adminwho/Run(list/input, addr) - return ircadminwho() + key = "adminwho" + +/datum/world_topic/adminwho/Run(list/input) + . = ..() + var/list/admins = list() + for(var/client/admin in GLOB.admins) + admins[++admins.len] = list("ckey" = admin.ckey, + "key" = admin.key, + "rank" = admin.holder.rank.name, + "stealth" = admin.holder.fakekey ? TRUE : FALSE, + "afk" = admin.is_afk()) + statuscode = 200 + response = "Admin list fetched" + data = admins + +/datum/world_topic/playerlist + key = "playerlist" + anonymous = TRUE + +/datum/world_topic/playerlist/Run(list/input) + . = ..() + data = list() + for(var/client/C as() in GLOB.clients) + data += C.ckey + statuscode = 200 + response = "Player list fetched" /datum/world_topic/status - keyword = "status" - -/datum/world_topic/status/Run(list/input, addr) - . = list() - .["version"] = GLOB.game_version - .["mode"] = GLOB.master_mode - .["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE - .["enter"] = GLOB.enter_allowed - .["vote"] = CONFIG_GET(flag/allow_vote_mode) - .["ai"] = CONFIG_GET(flag/allow_ai) - .["host"] = world.host ? world.host : null - .["round_id"] = GLOB.round_id - .["players"] = GLOB.clients.len - .["revision"] = GLOB.revdata.commit - .["revision_date"] = GLOB.revdata.date - .["hub"] = GLOB.hub_visibility - - var/client_num = 0 - for(var/client/C in GLOB.clients) - .["client[client_num]"] = C.key - client_num++ + key = "status" + anonymous = TRUE + +/datum/world_topic/status/Run(list/input) + . = ..() + data = list() + data["version"] = GLOB.game_version + data["mode"] = GLOB.master_mode + data["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE + data["enter"] = GLOB.enter_allowed + data["vote"] = CONFIG_GET(flag/allow_vote_mode) + data["ai"] = CONFIG_GET(flag/allow_ai) + data["host"] = world.host ? world.host : null + data["round_id"] = text2num(GLOB.round_id) // I don't know who's fault it is that round id is loaded as a string but screw you + data["players"] = GLOB.clients.len + data["revision"] = GLOB.revdata.commit + data["revision_date"] = GLOB.revdata.date + data["hub"] = GLOB.hub_visibility var/list/adm = get_admin_counts() var/list/presentmins = adm["present"] var/list/afkmins = adm["afk"] - .["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho - .["gamestate"] = SSticker.current_state - - .["map_name"] = SSmapping.config?.map_name || "Loading..." + data["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho + data["gamestate"] = SSticker.current_state - if(key_valid) - .["active_players"] = get_active_player_count() - if(SSticker.HasRoundStarted()) - .["real_mode"] = SSticker.mode.name - // Key-authed callers may know the truth behind the "secret" + data["map_name"] = SSmapping.config?.map_name || "Loading..." - .["security_level"] = get_security_level() - .["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0 + data["security_level"] = get_security_level() + data["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0 // Amount of world's ticks in seconds, useful for calculating round duration //Time dilation stats. - .["time_dilation_current"] = SStime_track.time_dilation_current - .["time_dilation_avg"] = SStime_track.time_dilation_avg - .["time_dilation_avg_slow"] = SStime_track.time_dilation_avg_slow - .["time_dilation_avg_fast"] = SStime_track.time_dilation_avg_fast + data["time_dilation_current"] = SStime_track.time_dilation_current + data["time_dilation_avg"] = SStime_track.time_dilation_avg + data["time_dilation_avg_slow"] = SStime_track.time_dilation_avg_slow + data["time_dilation_avg_fast"] = SStime_track.time_dilation_avg_fast //pop cap stats - .["soft_popcap"] = CONFIG_GET(number/soft_popcap) || 0 - .["hard_popcap"] = CONFIG_GET(number/hard_popcap) || 0 - .["extreme_popcap"] = CONFIG_GET(number/extreme_popcap) || 0 - .["popcap"] = max(CONFIG_GET(number/soft_popcap), CONFIG_GET(number/hard_popcap), CONFIG_GET(number/extreme_popcap)) //generalized field for this concept for use across ss13 codebases + data["soft_popcap"] = CONFIG_GET(number/soft_popcap) || 0 + data["hard_popcap"] = CONFIG_GET(number/hard_popcap) || 0 + data["extreme_popcap"] = CONFIG_GET(number/extreme_popcap) || 0 + data["popcap"] = max(CONFIG_GET(number/soft_popcap), CONFIG_GET(number/hard_popcap), CONFIG_GET(number/extreme_popcap)) //generalized field for this concept for use across ss13 codebases if(SSshuttle?.emergency) - .["shuttle_mode"] = SSshuttle.emergency.mode + data["shuttle_mode"] = SSshuttle.emergency.mode // Shuttle status, see /__DEFINES/stat.dm - .["shuttle_timer"] = SSshuttle.emergency.timeLeft() + data["shuttle_timer"] = SSshuttle.emergency.timeLeft() // Shuttle timer, in seconds + statuscode = 200 + response = "Status retrieved" + +/datum/world_topic/status/authed + key = "status_authed" + anonymous = FALSE + +/datum/world_topic/status/authed/Run(list/input) + . = ..() + // Add on a little extra data for our "special" patrons + data["active_players"] = get_active_player_count() + if(SSticker.HasRoundStarted()) + data["real_mode"] = SSticker.mode.name /datum/world_topic/identify_uuid - keyword = "identify_uuid" - require_comms_key = TRUE - log = FALSE + key = "identify_uuid" + required_params = list("uuid") -/datum/world_topic/identify_uuid/Run(list/input, addr) +/datum/world_topic/identify_uuid/Run(list/input) var/uuid = input["uuid"] - . = list() + data = list() if(!SSdbcore.Connect()) - return null + statuscode = 500 + response = "Failed to reach database" + data = null + return var/datum/DBQuery/query_ckey_lookup = SSdbcore.NewQuery( "SELECT ckey FROM [format_table_name("player")] WHERE uuid = :uuid", @@ -200,12 +297,105 @@ ) if(!query_ckey_lookup.Execute()) qdel(query_ckey_lookup) - return null + statuscode = 500 + response = "Database query failed" + return - .["identified_ckey"] = null + statuscode = 200 + response = "UUID Checked against database" + data["identified_ckey"] = null if(query_ckey_lookup.NextRow()) - .["identified_ckey"] = query_ckey_lookup.item[1] + data["identified_ckey"] = query_ckey_lookup.item[1] qdel(query_ckey_lookup) - return . +/datum/world_topic/d_ooc_send + key = "discord_send" + required_params = list("message", "message_sender") + +/datum/world_topic/d_ooc_send/Run(list/input) + . = ..() + var/msg = input["message"] + var/unm = input["message_sender"] + msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN) + unm = copytext(sanitize(unm), 1, MAX_MESSAGE_LEN) + msg = emoji_parse(msg) + log_ooc("DISCORD: [unm]: [msg]") + for(var/client/C in GLOB.clients) + if(C.prefs.chat_toggles & CHAT_OOC) + if(!("discord-[unm]" in C.prefs.ignoring)) + to_chat(C, "OOC: [unm]: ") + statuscode = 200 + response = "Message forwarded to OOC" + +/datum/world_topic/get_metacoins + key = "get_metacoins" + required_params = list("ckey") + +/datum/world_topic/get_metacoins/Run(list/input) + . = ..() + + var/ckey = input["ckey"] + + if(!ckey || !SSdbcore.Connect()) + statuscode = 500 + response = "Database query failed" + data = null + return + + var/datum/DBQuery/query_get_metacoins = SSdbcore.NewQuery( + "SELECT metacoins FROM [format_table_name("player")] WHERE ckey = :ckey", + list("ckey" = ckey) + ) + var/mc_count = null + if(query_get_metacoins.warn_execute()) + if(query_get_metacoins.NextRow()) + mc_count = query_get_metacoins.item[1] + else + statuscode = 500 + response = "Database query failed" + data = null + return + + qdel(query_get_metacoins) + + statuscode = 200 + response = "Metacoin count retrieved" + data = mc_count ? text2num(mc_count) : 0 + +/datum/world_topic/adjust_metacoins + key = "adjust_metacoins" + required_params = list("ckey", "amount", "id") + +/datum/world_topic/adjust_metacoins/Run(list/input) + . = ..() + + var/ckey = input["ckey"] + var/amount = input["amount"] + var/adjuster_ckey = input["id"] + + if(!SSdbcore.Connect()) + statuscode = 500 + response = "Database query failed" + data = null + return + + var/datum/DBQuery/query_metacoins = SSdbcore.NewQuery( + "UPDATE [format_table_name("player")] SET metacoins = metacoins + :amount WHERE ckey = :ckey", + list("amount" = amount, "ckey" = ckey) + ) + if(!query_metacoins.warn_execute()) + statuscode = 500 + response = "Database query failed" + data = null + return + + log_game("[ckey]'s metacoins were adjusted ([amount > 0 ? "+[amount]" : "[amount]"]) via Topic() call by [adjuster_ckey ? "[adjuster_ckey]" : "Unknown"]") + + qdel(query_metacoins) + + statuscode = 200 + response = "Metacoin count updated" +#undef TOPIC_VERSION_MAJOR +#undef TOPIC_VERSION_MINOR +#undef TOPIC_VERSION_PATCH diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm index 04f52f148c343..89bf6c3a84931 100644 --- a/code/game/alternate_appearance.dm +++ b/code/game/alternate_appearance.dm @@ -178,7 +178,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances) return TRUE return FALSE -datum/atom_hud/alternate_appearance/basic/onePerson +/datum/atom_hud/alternate_appearance/basic/onePerson var/mob/seer /datum/atom_hud/alternate_appearance/basic/onePerson/mobShouldSee(mob/M) @@ -190,3 +190,15 @@ datum/atom_hud/alternate_appearance/basic/onePerson ..(key, I, FALSE) seer = M add_hud_to(seer) + +/datum/atom_hud/alternate_appearance/basic/heretics + add_ghost_version = FALSE //just in case, to prevent infinite loops + +/datum/atom_hud/alternate_appearance/basic/heretics/New() + ..() + for(var/mob in GLOB.player_list) + if(mobShouldSee(mob)) + add_hud_to(mob) + +/datum/atom_hud/alternate_appearance/basic/heretics/mobShouldSee(mob/M) + return IS_HERETIC(M) || IS_HERETIC_MONSTER(M) \ No newline at end of file diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 8bfaed5ed8950..975b651754d71 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -7,7 +7,8 @@ icon = 'ICON FILENAME' (defaults to 'icons/turf/areas.dmi') icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) requires_power = FALSE (defaults to true) - ambient_effects = list() (defaults to GENERIC from sound.dm. override it as "ambient_effects = list('sound/ambience/signal.ogg')" or using another define. + ambience_index = AMBIENCE_GENERIC (picks the ambience from an assoc list in ambience.dm) + ambientsounds = list() (defaults to ambience_index's assoc on Initialize(). override it as "ambientsounds = list('sound/ambience/signal.ogg')" or by changing ambience_index) NOTE: there are two lists of areas in the end of this file: centcom and station itself. Please maintain these lists valid. --rastaf0 @@ -28,11 +29,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station power_light = FALSE power_equip = FALSE power_environ = FALSE - valid_territory = FALSE + area_flags = UNIQUE_AREA outdoors = TRUE - ambient_music = SPACE - blob_allowed = FALSE //Eating up space doesn't count for victory as a blob. - ambient_buzz = null // Space is pretty quiet + ambience_index = null + ambient_music_index = AMBIENCE_SPACE + ambient_buzz = null + sound_environment = SOUND_AREA_SPACE /area/space/nearstation icon_state = "space_near" @@ -44,9 +46,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = FALSE dynamic_lighting = DYNAMIC_LIGHTING_DISABLED has_gravity = STANDARD_GRAVITY + ambience_index = null ambient_buzz = null - /area/testroom requires_power = FALSE name = "Test Room" @@ -59,16 +61,16 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "asteroid" requires_power = FALSE has_gravity = STANDARD_GRAVITY - blob_allowed = FALSE //Nope, no winning on the asteroid as a blob. Gotta eat the station. - valid_territory = FALSE - ambient_effects = MINING + ambience_index = AMBIENCE_MINING + sound_environment = SOUND_AREA_ASTEROID + area_flags = UNIQUE_AREA /area/asteroid/nearstation dynamic_lighting = DYNAMIC_LIGHTING_FORCED - ambient_effects = RUINS + ambience_index = AMBIENCE_RUINS always_unpowered = FALSE requires_power = TRUE - blob_allowed = TRUE + area_flags = UNIQUE_AREA | BLOBS_ALLOWED /area/asteroid/nearstation/bomb_site name = "Bomb Testing Asteroid" @@ -78,10 +80,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Maintenance /area/maintenance - ambient_effects = MAINTENANCE - valid_territory = FALSE + ambience_index = AMBIENCE_MAINT + sound_environment = SOUND_AREA_TUNNEL_ENCLOSED + area_flags = BLOBS_ALLOWED | UNIQUE_AREA mood_bonus = -1 - mood_message = "It's kind of cramped in here!\n" + mood_message = "It's kind of cramped in here!\n" lighting_colour_tube = "#ffe5cb" lighting_colour_bulb = "#ffdbb4" @@ -98,6 +101,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/department/crew_quarters/bar name = "Bar Maintenance" icon_state = "maint_bar" + sound_environment = SOUND_AREA_WOODFLOOR /area/maintenance/department/crew_quarters/dorms name = "Dormitory Maintenance" @@ -158,7 +162,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/department/science/xenobiology name = "Xenobiology Maintenance" icon_state = "xenomaint" - xenobiology_compatible = TRUE + area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | XENOBIOLOGY_COMPATIBLE //Maintenance - Generic @@ -235,8 +239,76 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Incinerator" icon_state = "disposal" +//Maintenance - Upper + +/area/maintenance/upper/aft + name = "Upper Aft Maintenance" + icon_state = "amaint" + +/area/maintenance/upper/aft/secondary + name = "Upper Aft Maintenance" + icon_state = "amaint_2" + +/area/maintenance/upper/central + name = "Upper Central Maintenance" + icon_state = "maintcentral" + +/area/maintenance/upper/central/secondary + name = "Upper Central Maintenance" + icon_state = "maintcentral" + +/area/maintenance/upper/fore + name = "Upper Fore Maintenance" + icon_state = "fmaint" + +/area/maintenance/upper/fore/secondary + name = "Upper Fore Maintenance" + icon_state = "fmaint_2" + +/area/maintenance/upper/starboard + name = "Upper Starboard Maintenance" + icon_state = "smaint" + +/area/maintenance/upper/starboard/central + name = "Upper Central Starboard Maintenance" + icon_state = "smaint" + +/area/maintenance/upper/starboard/secondary + name = "Upper Secondary Starboard Maintenance" + icon_state = "smaint_2" + +/area/maintenance/upper/starboard/aft + name = "Upper Starboard Quarter Maintenance" + icon_state = "asmaint" + +/area/maintenance/upper/starboard/aft/secondary + name = "Upper Secondary Starboard Quarter Maintenance" + icon_state = "asmaint_2" + +/area/maintenance/upper/starboard/fore + name = "Upper Starboard Bow Maintenance" + icon_state = "fsmaint" + +/area/maintenance/upper/port + name = "Upper Port Maintenance" + icon_state = "pmaint" + +/area/maintenance/upper/port/central + name = "Upper Central Port Maintenance" + icon_state = "maintcentral" + +/area/maintenance/upper/port/aft + name = "Upper Port Quarter Maintenance" + icon_state = "apmaint" + +/area/maintenance/upper/port/fore + name = "Upper Port Bow Maintenance" + icon_state = "fpmaint" + //Hallway +/area/hallway + sound_environment = SOUND_AREA_STANDARD_STATION /area/hallway lighting_colour_tube = "#ffce99" @@ -288,36 +360,91 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Service Hallway" icon_state = "hall_service" +/area/hallway/secondary/law + name = "Law Hallway" + icon_state = "security" + + +/area/hallway/upper/primary/aft + name = "Upper Aft Primary Hallway" + icon_state = "hallA" + +/area/hallway/upper/primary/fore + name = "Upper Fore Primary Hallway" + icon_state = "hallF" + +/area/hallway/upper/primary/starboard + name = "Upper Starboard Primary Hallway" + icon_state = "hallS" + +/area/hallway/upper/primary/port + name = "Upper Port Primary Hallway" + icon_state = "hallP" + +/area/hallway/upper/primary/central + name = "Upper Central Primary Hallway" + icon_state = "hallC" + +/area/hallway/upper/secondary/command + name = "Upper Command Hallway" + icon_state = "bridge_hallway" + +/area/hallway/upper/secondary/construction + name = "Upper Construction Area" + icon_state = "construction" + +/area/hallway/upper/secondary/exit + name = "Upper Escape Shuttle Hallway" + icon_state = "escape" + +/area/hallway/upper/secondary/exit/departure_lounge + name = "Upper Departure Lounge" + icon_state = "escape_lounge" + +/area/hallway/upper/secondary/entry + name = "Upper Arrival Shuttle Hallway" + icon_state = "entry" + +/area/hallway/upper/secondary/service + name = "Upper Service Hallway" + icon_state = "hall_service" + //Command /area/bridge name = "Bridge" icon_state = "bridge" - ambient_effects = list('sound/ambience/signal.ogg') + ambientsounds = list('sound/ambience/signal.ogg') lighting_colour_tube = "#ffce99" lighting_colour_bulb = "#ffdbb4" lighting_brightness_tube = 8 + sound_environment = SOUND_AREA_STANDARD_STATION /area/bridge/meeting_room name = "Heads of Staff Meeting Room" icon_state = "meeting" + sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/bridge/meeting_room/council name = "Council Chamber" icon_state = "meeting" + sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/bridge/showroom/corporate name = "Corporate Showroom" icon_state = "showroom" + sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/crew_quarters/heads/captain name = "Captain's Office" icon_state = "captain" + sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/heads/captain/private name = "Captain's Quarters" icon_state = "captain" + sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/heads/chief name = "Chief Engineer's Office" @@ -344,10 +471,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "tcomsatcham" lighting_colour_tube = "#e2feff" lighting_colour_bulb = "#d5fcff" + sound_environment = SOUND_AREA_STANDARD_STATION /area/server name = "Messaging Server Room" icon_state = "server" + sound_environment = SOUND_AREA_STANDARD_STATION //Crew @@ -355,17 +484,20 @@ NOTE: there are two lists of areas in the end of this file: centcom and station lighting_colour_tube = "#ffce99" lighting_colour_bulb = "#ffdbb4" lighting_brightness_tube = 8 + sound_environment = SOUND_AREA_STANDARD_STATION /area/crew_quarters/dorms name = "Dormitories" icon_state = "Sleep" - safe = TRUE + area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA mood_bonus = 3 mood_message = "There's no place like the dorms!\n" +/area/crew_quarters/dorms/upper + name = "Upper Dorms" + /area/crew_quarters/cryopods name = "Cryopod Room" - safe = TRUE icon_state = "cryopod" lighting_colour_tube = "#e3ffff" lighting_colour_bulb = "#d5ffff" @@ -375,6 +507,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toilet" lighting_colour_tube = "#e3ffff" lighting_colour_bulb = "#d5ffff" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/crew_quarters/toilet/auxiliary name = "Auxiliary Restrooms" @@ -395,6 +528,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/lounge name = "Lounge" icon_state = "yellow" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/crew_quarters/fitness name = "Fitness Room" @@ -408,6 +542,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Recreation Area" icon_state = "fitness" +/area/crew_quarters/fitness/recreation/upper + name = "Upper Recreation Area" + icon_state = "fitness" + +/area/crew_quarters/park + name = "Recrational Park" + icon_state = "fitness" + lighting_colour_bulb = "#80aae9" + lighting_colour_tube = "#80aae9" + lighting_brightness_bulb = 9 + /area/crew_quarters/cafeteria name = "Cafeteria" icon_state = "cafeteria" @@ -421,6 +566,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/kitchen/coldroom name = "Kitchen Cold Room" icon_state = "kitchen_cold" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/crew_quarters/bar name = "Bar" @@ -429,10 +575,20 @@ NOTE: there are two lists of areas in the end of this file: centcom and station mood_message = "I love being in the bar!\n" lighting_colour_tube = "#fff4d6" lighting_colour_bulb = "#ffebc1" + sound_environment = SOUND_AREA_WOODFLOOR + +/area/crew_quarters/bar/Initialize(mapload) + . = ..() + GLOB.bar_areas += src + +/area/service/bar/Initialize(mapload) + . = ..() + GLOB.bar_areas += src /area/crew_quarters/bar/atrium name = "Atrium" icon_state = "bar" + sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/electronic_marketing_den name = "Electronic Marketing Den" @@ -448,6 +604,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/theatre name = "Theatre" icon_state = "Theatre" + sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/theatre/abandoned name = "Abandoned Theatre" @@ -464,6 +621,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/library/lounge name = "Library Lounge" + sound_environment = SOUND_AREA_LARGE_SOFTFLOOR icon_state = "library" /area/library/abandoned @@ -473,10 +631,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/chapel icon_state = "chapel" - ambient_effects = HOLY + ambience_index = AMBIENCE_HOLY flags_1 = NONE clockwork_warp_allowed = FALSE clockwork_warp_fail = "The consecration here prevents you from warping in." + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/chapel/main name = "Chapel" @@ -491,6 +650,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/chapel/asteroid name = "Chapel Asteroid" icon_state = "explored" + sound_environment = SOUND_AREA_ASTEROID /area/chapel/asteroid/monastery name = "Monastery Asteroid" @@ -502,12 +662,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/lawoffice name = "Law Office" icon_state = "law" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR //Engineering /area/engine - ambient_effects = ENGINEERING + ambience_index = AMBIENCE_ENGI + sound_environment = SOUND_AREA_LARGE_ENCLOSED lighting_colour_tube = "#ffce93" lighting_colour_bulb = "#ffbc6f" @@ -527,6 +689,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine/atmospherics_engine name = "Atmospherics Engine" icon_state = "atmos_engine" + area_flags = BLOBS_ALLOWED | UNIQUE_AREA + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/engine/engine_room //donut station specific name = "Engine Room" @@ -539,12 +703,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine/supermatter name = "Supermatter Engine" icon_state = "engine_sm" + area_flags = BLOBS_ALLOWED | UNIQUE_AREA + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/break_room name = "Engineering Foyer" icon_state = "engine_foyer" mood_bonus = 2 mood_message = "Ahhh, time to take a break.\n" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/gravity_generator name = "Gravity Generator Room" @@ -555,6 +722,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine/storage name = "Engineering Storage" icon_state = "engi_storage" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/storage_shared name = "Shared Engineering Storage" @@ -570,14 +738,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/solar requires_power = FALSE dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT - valid_territory = FALSE - blob_allowed = FALSE + area_flags = UNIQUE_AREA flags_1 = NONE - ambient_effects = ENGINEERING + ambience_index = AMBIENCE_ENGI + sound_environment = SOUND_AREA_SPACE /area/solar/fore name = "Fore Solar Array" icon_state = "yellow" + sound_environment = SOUND_AREA_STANDARD_STATION /area/solar/aft name = "Aft Solar Array" @@ -616,6 +785,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "panelsFP" + //Solar Maint /area/maintenance/solars @@ -651,19 +821,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/teleporter name = "Teleporter Room" icon_state = "teleporter" - ambient_effects = ENGINEERING + ambience_index = AMBIENCE_ENGI /area/gateway name = "Gateway" icon_state = "gateway" - ambient_effects = ENGINEERING + ambience_index = AMBIENCE_ENGI + sound_environment = SOUND_AREA_STANDARD_STATION //MedBay /area/medical name = "Medical" icon_state = "medbay3" - ambient_effects = MEDICAL + ambience_index = AMBIENCE_MEDICAL + sound_environment = SOUND_AREA_STANDARD_STATION mood_bonus = 2 mood_message = "I feel safe in here!\n" lighting_colour_tube = "#e7f8ff" @@ -672,7 +844,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/abandoned name = "Abandoned Medbay" icon_state = "medbay3" - ambient_effects = list('sound/ambience/signal.ogg') + ambientsounds = list('sound/ambience/signal.ogg') + sound_environment = SOUND_AREA_SMALL_ENCLOSED + +/area/medical/medbay/balcony + name = "Medbay Balcony" + icon_state = "medbay" /area/medical/medbay/central name = "Medbay Central" @@ -699,6 +876,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/patients_rooms name = "Patients' Rooms" icon_state = "patients" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/medical/patients_rooms/room_a name = "Patient Room A" @@ -708,6 +886,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Patient Room B" icon_state = "patients" +/area/medical/patients_rooms/room_c + name = "Patient Room C" + icon_state = "patients" + /area/medical/virology name = "Virology" icon_state = "virology" @@ -716,14 +898,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/morgue name = "Morgue" icon_state = "morgue" - ambient_effects = SPOOKY + ambience_index = AMBIENCE_SPOOKY + sound_environment = SOUND_AREA_SMALL_ENCLOSED mood_bonus = -2 - mood_message = "It smells like death in here!\n" + mood_message = "It smells like death in here!\n" /area/medical/chemistry name = "Chemistry" icon_state = "chem" +/area/medical/chemistry/upper + name = "Upper Chemistry" + icon_state = "chem" + /area/medical/apothecary name = "Apothecary" icon_state = "apothecary" @@ -732,6 +919,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Surgery" icon_state = "surgery" +/area/medical/surgery/aux + name = "Auxillery Surgery" + icon_state = "surgery" + /area/medical/cryo name = "Cryogenics" icon_state = "cryo" @@ -758,7 +949,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security name = "Security" icon_state = "security" - ambient_effects = HIGHSEC + ambience_index = AMBIENCE_DANGER + sound_environment = SOUND_AREA_STANDARD_STATION lighting_colour_tube = "#ffeee2" lighting_colour_bulb = "#ffdfca" @@ -770,11 +962,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Brig" icon_state = "brig" mood_bonus = -3 - mood_message = "I hate cramped brig cells.\n" + mood_message = "I hate cramped brig cells.\n" /area/security/courtroom name = "Courtroom" icon_state = "courtroom" + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/security/prison name = "Prison Wing" @@ -787,19 +980,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/processing/cremation name = "Security Crematorium" icon_state = "sec_prison" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/security/warden name = "Brig Control" icon_state = "Warden" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/security/detectives_office name = "Detective's Office" icon_state = "detective" - ambient_effects = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg') + ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg','sound/ambience/ambidet3.ogg','sound/ambience/ambidet4.ogg') /area/security/detectives_office/private_investigators_office name = "Private Investigator's Office" icon_state = "detective" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/security/range name = "Firing Range" @@ -808,7 +1004,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/execution icon_state = "execution_room" mood_bonus = -5 - mood_message = "I feel a sense of impending doom.\n" + mood_message = "I feel a sense of impending doom.\n" /area/security/execution/transfer name = "Transfer Centre" @@ -869,14 +1065,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "quart" lighting_colour_tube = "#ffe3cc" lighting_colour_bulb = "#ffdbb8" + sound_environment = SOUND_AREA_STANDARD_STATION /area/quartermaster/sorting name = "Delivery Office" icon_state = "cargo_delivery" + sound_environment = SOUND_AREA_STANDARD_STATION /area/quartermaster/warehouse name = "Warehouse" icon_state = "cargo_warehouse" + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/quartermaster/office name = "Cargo Office" @@ -885,11 +1084,16 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster/storage name = "Cargo Bay" icon_state = "cargo_bay" + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/quartermaster/qm name = "Quartermaster's Office" icon_state = "quart" +/area/quartermaster/qm_bedroom + name = "Quartermaster's Bedroom" + icon_state = "quart" + /area/quartermaster/miningdock name = "Mining Dock" icon_state = "mining" @@ -898,16 +1102,30 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Mining Office" icon_state = "mining" +/area/quartermaster/meeting_room + name = "Supply Meeting Room" + icon_state = "mining" + +/area/quartermaster/exploration_prep + name = "Exploration Preperation Room" + icon_state = "mining" + +/area/quartermaster/exploration_dock + name = "Exploration Dock" + icon_state = "mining" + /area/janitor name = "Custodial Closet" icon_state = "janitor" flags_1 = NONE mood_bonus = -1 - mood_message = "It feels dirty in here!\n" + mood_message = "It feels dirty in here!\n" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/hydroponics name = "Hydroponics" icon_state = "hydro" + sound_environment = SOUND_AREA_STANDARD_STATION /area/hydroponics/garden name = "Garden" @@ -918,6 +1136,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/hydroponics/garden/abandoned name = "Abandoned Garden" icon_state = "abandoned_garden" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/hydroponics/garden/monastery name = "Monastery Garden" @@ -931,6 +1150,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxlab" lighting_colour_tube = "#f0fbff" lighting_colour_bulb = "#e4f7ff" + sound_environment = SOUND_AREA_STANDARD_STATION /area/science/lab name = "Research and Development" @@ -940,13 +1160,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Xenobiology Lab" icon_state = "toxlab" +/area/science/shuttle + name = "Shuttle Construction" + lighting_colour_tube = "#ffe3cc" + lighting_colour_bulb = "#ffdbb8" + /area/science/storage name = "Toxins Storage" icon_state = "toxstorage" /area/science/test_area - valid_territory = FALSE name = "Toxins Test Area" + area_flags = BLOBS_ALLOWED | UNIQUE_AREA icon_state = "toxtest" /area/science/mixing @@ -955,8 +1180,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/science/mixing/chamber name = "Toxins Mixing Chamber" + area_flags = BLOBS_ALLOWED | UNIQUE_AREA icon_state = "toxmix" - valid_territory = FALSE /area/science/misc_lab name = "Testing Lab" @@ -993,6 +1218,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/science/research/abandoned name = "Abandoned Research Lab" icon_state = "medresearch" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/science/nanite name = "Nanite Lab" @@ -1003,6 +1229,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxmisc" //Storage +/area/storage + sound_environment = SOUND_AREA_STANDARD_STATION /area/storage/tools name = "Auxiliary Tool Storage" @@ -1018,8 +1246,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/storage/tcom name = "Telecomms Storage" + area_flags = BLOBS_ALLOWED | UNIQUE_AREA icon_state = "green" - valid_territory = FALSE /area/storage/eva name = "EVA Storage" @@ -1043,11 +1271,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/construction name = "Construction Area" icon_state = "yellow" - ambient_effects = ENGINEERING + ambience_index = AMBIENCE_ENGI + sound_environment = SOUND_AREA_STANDARD_STATION /area/construction/mining/aux_base name = "Auxiliary Base Construction" icon_state = "aux_base_construction" + sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/construction/storage_wing name = "Storage Wing" @@ -1057,7 +1287,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/vacant_room name = "Vacant Room" icon_state = "yellow" - ambient_effects = MAINTENANCE + ambience_index = AMBIENCE_MAINT icon_state = "vacant_room" /area/vacant_room/office @@ -1070,33 +1300,38 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //AI +/area/ai_monitored + sound_environment = SOUND_AREA_STANDARD_STATION + /area/ai_monitored/security/armory name = "Armory" icon_state = "armory" - ambient_effects = HIGHSEC + ambience_index = AMBIENCE_DANGER /area/ai_monitored/storage/eva name = "EVA Storage" icon_state = "eva" - ambient_effects = HIGHSEC + ambience_index = AMBIENCE_DANGER /area/ai_monitored/storage/satellite name = "AI Satellite Maint" icon_state = "storage" - ambient_effects = HIGHSEC + ambience_index = AMBIENCE_DANGER //Turret_protected /area/ai_monitored/turret_protected - ambient_effects = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg') + ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg') /area/ai_monitored/turret_protected/ai_upload name = "AI Upload Chamber" icon_state = "ai_upload" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/ai_monitored/turret_protected/ai_upload_foyer name = "AI Upload Access" icon_state = "ai_foyer" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/ai_monitored/turret_protected/ai name = "AI Chamber" @@ -1105,6 +1340,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/turret_protected/aisat name = "AI Satellite" icon_state = "ai" + sound_environment = SOUND_ENVIRONMENT_ROOM /area/ai_monitored/turret_protected/aisat/atmos name = "AI Satellite Atmos" @@ -1129,6 +1365,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/turret_protected/aisat_interior name = "AI Satellite Antechamber" icon_state = "ai" + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/ai_monitored/turret_protected/AIsatextAS name = "AI Sat Ext" @@ -1144,13 +1381,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/tcommsat clockwork_warp_allowed = FALSE clockwork_warp_fail = "For safety reasons, warping here is disallowed; the radio and bluespace noise could cause catastrophic results." - ambient_effects = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\ + ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\ 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg') /area/tcommsat/computer name = "Telecomms Control Room" icon_state = "tcomsatcomp" + sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/tcommsat/server name = "Telecomms Server Room" icon_state = "tcomsatcham" + +/area/tcommsat/relay + name = "Telecommunications Relay" + icon_state = "tcomsatcham" diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index 87b44291f56e9..48e77e1623753 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -3,6 +3,7 @@ clockwork_warp_allowed = FALSE var/list/obj/machinery/camera/motioncameras = list() var/list/datum/weakref/motionTargets = list() + sound_environment = SOUND_ENVIRONMENT_ROOM /area/ai_monitored/Initialize(mapload) . = ..() @@ -28,4 +29,4 @@ for(var/X in motioncameras) var/obj/machinery/camera/cam = X cam.lostTargetRef(WEAKREF(O)) - return \ No newline at end of file + return diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 553387621304f..1e6025324fab4 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -14,60 +14,55 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT invisibility = INVISIBILITY_LIGHTING - var/map_name // Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints. + var/area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA - var/valid_territory = TRUE // If it's a valid territory for gangs to claim - var/blob_allowed = TRUE // Does it count for blobs score? By default, all areas count. var/clockwork_warp_allowed = TRUE // Can servants warp into this area from Reebe? var/clockwork_warp_fail = "The structure there is too dense for warping to pierce. (This is normal in high-security areas.)" var/fire = null - var/atmos = TRUE + ///Whether there is an atmos alarm in this area var/atmosalm = FALSE var/poweralm = TRUE var/lightswitch = TRUE var/vacuum = null - var/requires_power = TRUE - var/always_unpowered = FALSE // This gets overridden to 1 for space in area/Initialize(). - - var/outdoors = FALSE //For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room) + /// For space, the asteroid, lavaland, etc. Used with blueprints or with weather to determine if we are adding a new area (vs editing a station room) + var/outdoors = FALSE var/areasize = 0 //Size of the area in open turfs, only calculated for indoors areas. var/mood_bonus = 0 //Mood for being here var/mood_message = "This area is pretty nice!\n" //Mood message for being here, only shows up if mood_bonus != 0 + ///Will objects this area be needing power? + var/requires_power = TRUE + /// This gets overridden to 1 for space in area/Initialize(). + var/always_unpowered = FALSE + var/power_equip = TRUE var/power_light = TRUE var/power_environ = TRUE - var/has_gravity = 0 + var/has_gravity = FALSE ///Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter) - var/noteleport = FALSE - ///Hides area from player Teleport function. - var/hidden = FALSE - ///Is the area teleport-safe: no space / radiation / aggresive mobs / other dangers - var/safe = FALSE - /// If false, loading multiple maps with this area type will create multiple instances. - var/unique = TRUE - - var/no_air = null + var/teleport_restriction = TELEPORT_ALLOW_ALL var/parallax_movedir = 0 - var/list/ambient_music = null // OOC, doesn't require the user to actually be able to hear it - var/list/ambient_effects = GENERIC // IC, requires the user to actually be able to hear it, will play spontaneously + var/ambience_index = AMBIENCE_GENERIC + var/list/ambientsounds + var/ambient_buzz = 'sound/ambience/shipambience.ogg' // Ambient buzz of the station, plays repeatedly, also IC + var/ambient_music_index + var/list/ambientmusic + flags_1 = CAN_BE_DIRTY_1 var/list/firedoors var/list/cameras var/list/firealarms var/firedoors_last_closed_on = 0 - /// Can the Xenobio management console transverse this area by default? - var/xenobiology_compatible = FALSE /// typecache to limit the areas that atoms in this area can smooth with, used for shuttles IIRC var/list/canSmoothWithAreas @@ -76,10 +71,29 @@ var/lighting_colour_tube = "#FFF6ED" var/lighting_colour_bulb = "#FFE6CC" var/lighting_colour_night = "#FFDBB5" - var/lighting_brightness_tube = 10 + var/lighting_brightness_tube = 11 var/lighting_brightness_bulb = 6 var/lighting_brightness_night = 6 + ///Used to decide what the minimum time between ambience is + var/min_ambience_cooldown = 30 SECONDS + ///Used to decide what the maximum time between ambience is + var/max_ambience_cooldown = 90 SECONDS + ///Used to decide what kind of reverb the area makes sound have + var/sound_environment = SOUND_ENVIRONMENT_NONE + + //Lighting overlay + var/obj/effect/lighting_overlay + var/lighting_overlay_colour = "#FFFFFF" + var/lighting_overlay_opacity = 0 + + ///This datum, if set, allows terrain generation behavior to be ran on Initialize() + var/datum/map_generator/map_generator + + ///Lazylist that contains additional turfs that map generation should be ran on. This is used for ruins which need a noop turf under non-noop areas so they don't leave genturfs behind. + var/list/additional_genturfs + + /** * A list of teleport locations * @@ -100,7 +114,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) /proc/process_teleport_locs() for(var/V in GLOB.sortedAreas) var/area/AR = V - if(istype(AR, /area/shuttle) || AR.noteleport) + if(istype(AR, /area/shuttle) || AR.teleport_restriction) continue if(GLOB.teleportlocs[AR.name]) continue @@ -120,7 +134,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) /area/New() // This interacts with the map loader, so it needs to be set immediately // rather than waiting for atoms to initialize. - if (unique) + if (area_flags & UNIQUE_AREA) GLOB.areas_by_type[type] = src power_usage = new /list(AREA_USAGE_LEN) // Some atoms would like to use power in Initialize() return ..() @@ -135,10 +149,14 @@ GLOBAL_LIST_EMPTY(teleportlocs) */ /area/Initialize() icon_state = "" - layer = AREA_LAYER - map_name = name // Save the initial (the name set in the map) name of the area. canSmoothWithAreas = typecacheof(canSmoothWithAreas) + if(!ambientsounds && ambience_index) + ambientsounds = GLOB.ambience_assoc[ambience_index] + + if(!ambientmusic && ambient_music_index) + ambientmusic = GLOB.ambient_music_assoc[ambient_music_index] + if(requires_power) luminosity = 0 else @@ -160,7 +178,11 @@ GLOBAL_LIST_EMPTY(teleportlocs) if(!IS_DYNAMIC_LIGHTING(src)) add_overlay(/obj/effect/fullbright) - + else if(lighting_overlay_opacity && lighting_overlay_colour) + lighting_overlay = new /obj/effect/fullbright + lighting_overlay.color = lighting_overlay_colour + lighting_overlay.alpha = lighting_overlay_opacity + add_overlay(lighting_overlay) reg_in_areas_in_z() return INITIALIZE_HINT_LATELOAD @@ -171,6 +193,28 @@ GLOBAL_LIST_EMPTY(teleportlocs) /area/LateInitialize() power_change() // all machines set to current power level, also updates icon +/area/proc/RunGeneration() + if(map_generator) + map_generator = new map_generator() + var/list/turfs = list() + for(var/turf/T in contents) + turfs += T + if(additional_genturfs) + turfs += additional_genturfs + additional_genturfs = null + map_generator.generate_terrain(turfs) + +/area/proc/test_gen() + if(map_generator) + var/list/turfs = list() + for(var/turf/T in contents) + turfs += T + if(additional_genturfs) + turfs += additional_genturfs + additional_genturfs = null + map_generator.generate_terrain(turfs) + + /** * Register this area as belonging to a z level * @@ -209,7 +253,9 @@ GLOBAL_LIST_EMPTY(teleportlocs) /area/Destroy() if(GLOB.areas_by_type[type] == src) GLOB.areas_by_type[type] = null - STOP_PROCESSING(SSobj, src) + GLOB.sortedAreas -= src + if(fire) + STOP_PROCESSING(SSobj, src) return ..() /** @@ -253,9 +299,9 @@ GLOBAL_LIST_EMPTY(teleportlocs) * * Sends to all ai players, alert consoles, drones and alarm monitor programs in the world */ -/area/proc/atmosalert(danger_level, obj/source) - if(danger_level != atmosalm) - if (danger_level==2) +/area/proc/atmosalert(isdangerous, obj/source) + if(isdangerous != atmosalm) + if(isdangerous==TRUE) for (var/item in GLOB.silicon_mobs) var/mob/living/silicon/aiPlayer = item @@ -270,7 +316,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) var/datum/computer_file/program/alarm_monitor/p = item p.triggerAlarm("Atmosphere", src, cameras, source) - else if (src.atmosalm == 2) + else for (var/item in GLOB.silicon_mobs) var/mob/living/silicon/aiPlayer = item aiPlayer.cancelAlarm("Atmosphere", src, source) @@ -284,9 +330,9 @@ GLOBAL_LIST_EMPTY(teleportlocs) var/datum/computer_file/program/alarm_monitor/p = item p.cancelAlarm("Atmosphere", src, source) - src.atmosalm = danger_level - return 1 - return 0 + atmosalm = isdangerous + return TRUE + return FALSE /** * Try to close all the firedoors in the area @@ -323,6 +369,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (!fire) set_fire_alarm_effect() ModifyFiredoors(FALSE) + START_PROCESSING(SSobj, src) for(var/item in firealarms) var/obj/machinery/firealarm/F = item F.update_icon() @@ -340,8 +387,6 @@ GLOBAL_LIST_EMPTY(teleportlocs) var/datum/computer_file/program/alarm_monitor/p = item p.triggerAlarm("Fire", src, cameras, source) - START_PROCESSING(SSobj, src) - /** * Reset the firealarm alert for this area * @@ -354,6 +399,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (fire) unset_fire_alarm_effects() ModifyFiredoors(TRUE) + STOP_PROCESSING(SSobj, src) for(var/item in firealarms) var/obj/machinery/firealarm/F = item F.update_icon() @@ -371,7 +417,17 @@ GLOBAL_LIST_EMPTY(teleportlocs) var/datum/computer_file/program/alarm_monitor/p = item p.cancelAlarm("Fire", src, source) - STOP_PROCESSING(SSobj, src) +///Get rid of any dangling camera refs +/area/proc/clear_camera(obj/machinery/camera/cam) + LAZYREMOVE(cameras, cam) + for (var/mob/living/silicon/aiPlayer as anything in GLOB.silicon_mobs) + aiPlayer.freeCamera(src, cam) + for (var/obj/machinery/computer/station_alert/comp as anything in GLOB.alert_consoles) + comp.freeCamera(src, cam) + for (var/mob/living/simple_animal/drone/drone_on as anything in GLOB.drones_list) + drone_on.freeCamera(src, cam) + for(var/datum/computer_file/program/alarm_monitor/monitor as anything in GLOB.alarmdisplay) + monitor.freeCamera(src, cam) /** * If 100 ticks has elapsed, toggle all the firedoors closed again @@ -547,7 +603,6 @@ GLOBAL_LIST_EMPTY(teleportlocs) if(AREA_USAGE_DYNAMIC_START to AREA_USAGE_DYNAMIC_END) power_usage[chan] += amount - /** * Call back when an atom enters an area * @@ -570,7 +625,8 @@ GLOBAL_LIST_EMPTY(teleportlocs) SEND_SIGNAL(M, COMSIG_EXIT_AREA, src) //The atom that exits the area /** - * Returns true if this atom has gravity for the passed in turf + * Returns true if this atom has gravity for the passed in turf or other gravity-mimicking behaviors + * In other words, it returns whether the atom can be *on* the turf (i.e. not forced to float) * * Sends signals COMSIG_ATOM_HAS_GRAVITY and COMSIG_TURF_HAS_GRAVITY, both can force gravity with * the forced gravity var @@ -600,7 +656,8 @@ GLOBAL_LIST_EMPTY(teleportlocs) max_grav = max(max_grav, i) return max_grav - if(isspaceturf(T)) // Turf never has gravity + + if(!T.check_gravity()) // Turf never has gravity return 0 var/area/A = get_area(T) @@ -608,9 +665,9 @@ GLOBAL_LIST_EMPTY(teleportlocs) return A.has_gravity else // There's a gravity generator on our z level - if(GLOB.gravity_generators["[T.z]"]) + if(GLOB.gravity_generators["[T.get_virtual_z_level()]"]) var/max_grav = 0 - for(var/obj/machinery/gravity_generator/main/G in GLOB.gravity_generators["[T.z]"]) + for(var/obj/machinery/gravity_generator/main/G in GLOB.gravity_generators["[T.get_virtual_z_level()]"]) max_grav = max(G.setting,max_grav) return max_grav return SSmapping.level_trait(T.z, ZTRAIT_GRAVITY) @@ -625,8 +682,8 @@ GLOBAL_LIST_EMPTY(teleportlocs) power_light = FALSE power_environ = FALSE always_unpowered = FALSE - valid_territory = FALSE - blob_allowed = FALSE + area_flags &= ~VALID_TERRITORY + area_flags &= ~BLOBS_ALLOWED addSorted() /** * Set the area size of the area @@ -656,3 +713,10 @@ GLOBAL_LIST_EMPTY(teleportlocs) /// A hook so areas can modify the incoming args (of what??) /area/proc/PlaceOnTopReact(list/new_baseturfs, turf/fake_turf_type, flags) return flags + +/// Gets an areas virtual z value. For having multiple areas on the same z-level treated mechanically as different z-levels +/area/proc/get_virtual_z(turf/T) + return T.z + +/area/get_virtual_z_level() + return get_virtual_z(get_turf(src)) diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index e63038de4e88e..0924e61135a0e 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -8,7 +8,8 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" name = "Strange Location" icon_state = "away" has_gravity = STANDARD_GRAVITY - ambient_effects = AWAY_MISSION + ambience_index = AMBIENCE_AWAY + sound_environment = SOUND_ENVIRONMENT_ROOM /area/awaymission/beach name = "Beach" @@ -16,7 +17,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED requires_power = FALSE has_gravity = STANDARD_GRAVITY - ambient_effects = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambinice.ogg') + ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambinice.ogg') /area/awaymission/errorroom name = "Super Secret Room" diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index 6ddce6afea2c9..addd6c27b27ad 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -7,8 +7,8 @@ dynamic_lighting = DYNAMIC_LIGHTING_FORCED requires_power = FALSE has_gravity = STANDARD_GRAVITY - noteleport = TRUE - blob_allowed = FALSE //Should go without saying, no blobs should take over centcom as a win condition. + teleport_restriction = TELEPORT_ALLOW_NONE + area_flags = VALID_TERRITORY | UNIQUE_AREA flags_1 = NONE /area/centcom/control @@ -29,7 +29,7 @@ /area/centcom/holding name = "Holding Facility" -/area/centcom/supplypod/flyMeToTheMoon +/area/centcom/supplypod/supplypod_temp_holding name = "Supplypod Shipping lane" icon_state = "supplypod_flight" @@ -45,21 +45,35 @@ /area/centcom/supplypod/loading name = "Supplypod Loading Facility" icon_state = "supplypod_loading" + var/loading_id = "" + +/area/centcom/supplypod/loading/Initialize() + . = ..() + if(!loading_id) + CRASH("[type] created without a loading_id") + if(GLOB.supplypod_loading_bays[loading_id]) + CRASH("Duplicate loading bay area: [type] ([loading_id])") + GLOB.supplypod_loading_bays[loading_id] = src /area/centcom/supplypod/loading/one name = "Bay #1" + loading_id = "1" /area/centcom/supplypod/loading/two name = "Bay #2" + loading_id = "2" /area/centcom/supplypod/loading/three name = "Bay #3" + loading_id = "3" /area/centcom/supplypod/loading/four name = "Bay #4" + loading_id = "4" /area/centcom/supplypod/loading/ert name = "ERT Bay" + loading_id = "5" //THUNDERDOME /area/tdome @@ -106,7 +120,8 @@ dynamic_lighting = DYNAMIC_LIGHTING_FORCED requires_power = FALSE has_gravity = STANDARD_GRAVITY - noteleport = TRUE + teleport_restriction = TELEPORT_ALLOW_NONE + area_flags = VALID_TERRITORY | UNIQUE_AREA flags_1 = NONE //Abductors @@ -114,7 +129,8 @@ name = "Abductor Ship" icon_state = "yellow" requires_power = FALSE - noteleport = TRUE + teleport_restriction = TELEPORT_ALLOW_ABDUCTORS + area_flags = VALID_TERRITORY | UNIQUE_AREA has_gravity = STANDARD_GRAVITY flags_1 = NONE @@ -124,10 +140,10 @@ icon_state = "syndie-ship" requires_power = FALSE has_gravity = STANDARD_GRAVITY - noteleport = TRUE - blob_allowed = FALSE //Not... entirely sure this will ever come up... but if the bus makes blobs AND ops, it shouldn't aim for the ops to win. + teleport_restriction = TELEPORT_ALLOW_NONE + area_flags = VALID_TERRITORY | UNIQUE_AREA flags_1 = NONE - ambient_effects = HIGHSEC + ambience_index = AMBIENCE_DANGER /area/syndicate_mothership/control name = "Syndicate Control Room" @@ -180,12 +196,12 @@ icon_state = "yellow" requires_power = FALSE has_gravity = STANDARD_GRAVITY - noteleport = TRUE - hidden = TRUE - ambient_effects = REEBE + teleport_restriction = TELEPORT_ALLOW_CLOCKWORK + area_flags = VALID_TERRITORY | UNIQUE_AREA | HIDDEN_AREA + ambience_index = AMBIENCE_REEBE /area/reebe/city_of_cogs name = "Reebe - City of Cogs" icon_state = "purple" - hidden = FALSE + area_flags = VALID_TERRITORY | UNIQUE_AREA | HIDDEN_AREA var/playing_ambience = FALSE diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index 6cf436908f7df..e9a371ea32bf9 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -2,8 +2,9 @@ name = "Holodeck" icon_state = "Holodeck" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - flags_1 = 0 - hidden = TRUE + flags_1 = NONE + area_flags = VALID_TERRITORY | UNIQUE_AREA | HIDDEN_AREA + sound_environment = SOUND_ENVIRONMENT_PADDED_CELL var/obj/machinery/computer/holodeck/linked var/restricted = 0 // if true, program goes on emag list @@ -15,11 +16,11 @@ /area/holodeck/powered(var/chan) if(!requires_power) - return 1 + return TRUE if(always_unpowered) - return 0 + return FALSE if(!linked) - return 0 + return FALSE var/area/A = get_area(linked) ASSERT(!istype(A, /area/holodeck)) return A.powered(chan) @@ -47,76 +48,5 @@ /area/holodeck/rec_center name = "\improper Recreational Holodeck" -/area/holodeck/rec_center/offline - name = "Holodeck - Offline" - -/area/holodeck/rec_center/court - name = "Holodeck - Empty Court" - -/area/holodeck/rec_center/dodgeball - name = "Holodeck - Dodgeball Court" - -/area/holodeck/rec_center/basketball - name = "Holodeck - Basketball Court" - -/area/holodeck/rec_center/thunderdome - name = "Holodeck - Thunderdome Arena" - -/area/holodeck/rec_center/beach - name = "Holodeck - Beach" - -/area/holodeck/rec_center/lounge - name = "Holodeck - Lounge" - -/area/holodeck/rec_center/medical - name = "Holodeck - Emergency Medical" - -/area/holodeck/rec_center/pet_lounge - name = "Holodeck - Pet Park" - -/area/holodeck/rec_center/firingrange - name = "Holodeck - Firing Range" - -/area/holodeck/rec_center/school - name = "Holodeck - Anime School" - -/area/holodeck/rec_center/chapelcourt - name = "Holodeck - Chapel Courtroom" - -/area/holodeck/rec_center/spacechess - name = "Holodeck - Space Chess" - -/area/holodeck/rec_center/kobayashi - name = "Holodeck - Kobayashi Maru" - -/area/holodeck/rec_center/winterwonderland - name = "Holodeck - Winter Wonderland" - -/area/holodeck/rec_center/photobooth - name = "Holodeck - Photobooth" - -// Bad programs - -/area/holodeck/rec_center/burn - name = "Holodeck - Atmospheric Burn Test" - restricted = 1 - -/area/holodeck/rec_center/wildlife - name = "Holodeck - Wildlife Simulation" - restricted = 1 - -/area/holodeck/rec_center/bunker - name = "Holodeck - Holdout Bunker" - restricted = 1 - -/area/holodeck/rec_center/anthophila - name = "Holodeck - Anthophila" - restricted = 1 - -/area/holodeck/rec_center/refuel - name = "Holodeck - Refueling Station" - restricted = 1 - -/area/holodeck/rec_center/thunderdome1218 - name = "Holodeck - 1218 AD" - restricted = 1 +/area/holodeck/rec_center/offstation_one + name = "\improper Recreational Holodeck" diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index d05ee88e4c79c..5c5bdec326589 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -5,6 +5,7 @@ has_gravity = STANDARD_GRAVITY lighting_colour_tube = "#ffe8d2" lighting_colour_bulb = "#ffdcb7" + area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED /area/mine/explored name = "Mine" @@ -17,7 +18,11 @@ power_light = FALSE outdoors = TRUE flags_1 = NONE - ambient_effects = MINING + ambience_index = AMBIENCE_MINING + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS + sound_environment = SOUND_AREA_STANDARD_STATION + area_flags = VALID_TERRITORY | UNIQUE_AREA /area/mine/unexplored name = "Mine" @@ -30,7 +35,10 @@ power_light = FALSE outdoors = TRUE flags_1 = NONE - ambient_effects = MINING + ambience_index = AMBIENCE_MINING + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS + area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | CAVES_ALLOWED /area/mine/lobby name = "Mining Station" @@ -73,7 +81,7 @@ /area/mine/laborcamp/security name = "Labor Camp Security" icon_state = "security" - ambient_effects = HIGHSEC + ambience_index = AMBIENCE_DANGER //This is a placeholder for the lavaland sci area. Whoever is here after me, I have made you some additional areas to work with. //You are free to rename these and change their icons. My job is done here. @@ -112,6 +120,8 @@ icon_state = "mining" has_gravity = STANDARD_GRAVITY flags_1 = NONE + sound_environment = SOUND_AREA_LAVALAND + area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED /area/lavaland/surface name = "Lavaland" @@ -122,7 +132,9 @@ power_equip = FALSE power_light = FALSE requires_power = TRUE - ambient_effects = MINING + ambience_index = AMBIENCE_MINING + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS /area/lavaland/underground name = "Lavaland Caves" @@ -133,8 +145,9 @@ power_environ = FALSE power_equip = FALSE power_light = FALSE - ambient_effects = MINING - + ambience_index = AMBIENCE_MINING + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS /area/lavaland/surface/outdoors name = "Lavaland Wastes" @@ -142,9 +155,13 @@ /area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here icon_state = "unexplored" + area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED /area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here icon_state = "danger" + area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED + map_generator = /datum/map_generator/cave_generator/lavaland /area/lavaland/surface/outdoors/explored name = "Lavaland Labor Camp" + area_flags = VALID_TERRITORY | UNIQUE_AREA diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm index bc66413cb65c8..08481fb474bb8 100644 --- a/code/game/area/areas/ruins/_ruins.dm +++ b/code/game/area/areas/ruins/_ruins.dm @@ -4,10 +4,10 @@ name = "\improper Unexplored Location" icon_state = "away" has_gravity = STANDARD_GRAVITY - hidden = TRUE + area_flags = HIDDEN_AREA | BLOBS_ALLOWED dynamic_lighting = DYNAMIC_LIGHTING_FORCED - ambient_effects = RUINS - + ambience_index = AMBIENCE_RUINS + sound_environment = SOUND_ENVIRONMENT_STONEROOM /area/ruin/unpowered always_unpowered = FALSE diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 2b877b313f9a2..7f58f29524748 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -6,7 +6,7 @@ /area/ruin/powered/clownplanet name = "Clown Planet" icon_state = "dk_yellow" - ambient_effects = list('sound/ambience/clown.ogg') + ambientsounds = list('sound/ambience/clown.ogg') /area/ruin/powered/animal_hospital icon_state = "dk_yellow" @@ -37,7 +37,7 @@ /area/ruin/unpowered/syndicate_lava_base name = "Secret Base" icon_state = "dk_yellow" - ambient_effects = HIGHSEC + ambience_index = AMBIENCE_DANGER /area/ruin/unpowered/syndicate_lava_base/engineering name = "Syndicate Lavaland Engineering" diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 86f34925feb8e..65fbe55e5be4c 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -2,7 +2,7 @@ /area/ruin/space has_gravity = FALSE - blob_allowed = FALSE //Nope, no winning in space as a blob. Gotta eat the station. + area_flags = UNIQUE_AREA /area/ruin/space/has_grav has_gravity = STANDARD_GRAVITY @@ -10,21 +10,6 @@ /area/ruin/space/has_grav/powered requires_power = FALSE - -/area/ruin/fakespace - icon_state = "space" - requires_power = TRUE - always_unpowered = TRUE - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - has_gravity = FALSE - power_light = FALSE - power_equip = FALSE - power_environ = FALSE - valid_territory = FALSE - outdoors = TRUE - ambient_effects = SPACE - blob_allowed = FALSE - ///////////// /area/ruin/space/way_home @@ -63,7 +48,7 @@ /area/ruin/space/has_grav/powered/aesthetic name = "Aesthetic" - ambient_effects = list('sound/ambience/ambivapor1.ogg') + ambientsounds = list('sound/ambience/ambivapor1.ogg') //Ruin of Hotel @@ -126,6 +111,10 @@ name = "Hotel Staff Room" icon_state = "crew_quarters" +/area/ruin/space/has_grav/hotel/secondary_solars + name = "Hotel Secondary Solar Control" + icon_state = "engine_smes" + @@ -244,6 +233,7 @@ name = "Beta Station Atmospherics" icon_state = "red" has_gravity = FALSE + ambience_index = AMBIENCE_ENGI /area/ruin/space/has_grav/ancientstation/betanorth name = "Beta Station North Corridor" @@ -256,6 +246,7 @@ /area/ruin/space/has_grav/ancientstation/engi name = "Charlie Station Engineering" icon_state = "engine" + ambience_index = AMBIENCE_ENGI /area/ruin/space/has_grav/ancientstation/comm name = "Charlie Station Command" @@ -368,7 +359,6 @@ name = "Ruskie DJ Station" icon_state = "DJ" has_gravity = STANDARD_GRAVITY - blob_allowed = FALSE //Nope, no winning on the DJ station as a blob. Gotta eat the main station. /area/ruin/space/djstation/solars name = "DJ Station Solars" @@ -381,7 +371,7 @@ /area/ruin/space/abandoned_tele name = "Abandoned Teleporter" icon_state = "teleporter" - ambient_effects = list('sound/ambience/ambimalf.ogg', 'sound/ambience/signal.ogg') + ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/signal.ogg') //OLD AI SAT diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index c829e1e259c16..70d78285d1b5d 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -8,18 +8,23 @@ dynamic_lighting = DYNAMIC_LIGHTING_FORCED has_gravity = STANDARD_GRAVITY always_unpowered = FALSE - valid_territory = FALSE - icon_state = "shuttle" // Loading the same shuttle map at a different time will produce distinct area instances. - unique = FALSE + area_flags = NONE lighting_colour_tube = "#fff0dd" lighting_colour_bulb = "#ffe1c1" + sound_environment = SOUND_ENVIRONMENT_ROOM + //The mobile port attached to this area + var/obj/docking_port/mobile/mobile_port /area/shuttle/Initialize() if(!canSmoothWithAreas) canSmoothWithAreas = type . = ..() +/area/shuttle/Destroy() + mobile_port = null + . = ..() + /area/shuttle/PlaceOnTopReact(list/new_baseturfs, turf/fake_turf_type, flags) . = ..() if(length(new_baseturfs) > 1 || fake_turf_type) @@ -27,14 +32,21 @@ if(ispath(new_baseturfs[1], /turf/open/floor/plating)) new_baseturfs.Insert(1, /turf/baseturf_skipover/shuttle) +/area/shuttle/proc/link_to_shuttle(obj/docking_port/mobile/M) + mobile_port = M + +/area/shuttle/get_virtual_z(turf/T) + if(mobile_port && is_reserved_level(mobile_port.z)) + return mobile_port.virtual_z + return ..(T) + ////////////////////////////Multi-area shuttles//////////////////////////// ////////////////////////////Syndicate infiltrator//////////////////////////// /area/shuttle/syndicate name = "Syndicate Infiltrator" - blob_allowed = FALSE - ambient_effects = HIGHSEC + ambience_index = AMBIENCE_DANGER canSmoothWithAreas = /area/shuttle/syndicate /area/shuttle/syndicate/bridge @@ -58,7 +70,6 @@ /area/shuttle/pirate name = "Pirate Shuttle" - blob_allowed = FALSE requires_power = TRUE canSmoothWithAreas = /area/shuttle/pirate @@ -67,14 +78,12 @@ /area/shuttle/hunter name = "Hunter Shuttle" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - blob_allowed = FALSE canSmoothWithAreas = /area/shuttle/hunter ////////////////////////////White Ship//////////////////////////// /area/shuttle/abandoned name = "Abandoned Ship" - blob_allowed = FALSE requires_power = TRUE canSmoothWithAreas = /area/shuttle/abandoned @@ -115,41 +124,44 @@ /area/shuttle/arrival name = "Arrival Shuttle" - unique = TRUE // SSjob refers to this area for latejoiners + area_flags = UNIQUE_AREA// SSjob refers to this area for latejoiners /area/shuttle/pod_1 name = "Escape Pod One" + area_flags = BLOBS_ALLOWED /area/shuttle/pod_2 name = "Escape Pod Two" + area_flags = BLOBS_ALLOWED /area/shuttle/pod_3 name = "Escape Pod Three" + area_flags = BLOBS_ALLOWED /area/shuttle/pod_4 name = "Escape Pod Four" + area_flags = BLOBS_ALLOWED /area/shuttle/mining name = "Mining Shuttle" - blob_allowed = FALSE /area/shuttle/mining/large name = "Mining Shuttle" - blob_allowed = FALSE requires_power = TRUE /area/shuttle/science name = "Science Shuttle" - blob_allowed = FALSE + requires_power = TRUE + +/area/shuttle/exploration + name = "Exploration Shuttle" requires_power = TRUE /area/shuttle/labor name = "Labor Camp Shuttle" - blob_allowed = FALSE /area/shuttle/supply name = "Supply Shuttle" - blob_allowed = FALSE /area/shuttle/escape name = "Emergency Shuttle" @@ -159,11 +171,11 @@ /area/shuttle/escape/luxury name = "Luxurious Emergency Shuttle" - noteleport = TRUE + teleport_restriction = TELEPORT_ALLOW_NONE /area/shuttle/escape/arena name = "The Arena" - noteleport = TRUE + teleport_restriction = TELEPORT_ALLOW_NONE /area/shuttle/escape/meteor name = "\proper a meteor with engines strapped to it" @@ -171,34 +183,26 @@ /area/shuttle/transport name = "Transport Shuttle" - blob_allowed = FALSE /area/shuttle/assault_pod name = "Steel Rain" - blob_allowed = FALSE /area/shuttle/sbc_starfury name = "SBC Starfury" - blob_allowed = FALSE /area/shuttle/sbc_fighter1 name = "SBC Fighter 1" - blob_allowed = FALSE /area/shuttle/sbc_fighter2 name = "SBC Fighter 2" - blob_allowed = FALSE /area/shuttle/sbc_corvette name = "SBC corvette" - blob_allowed = FALSE /area/shuttle/syndicate_scout name = "Syndicate Scout" - blob_allowed = FALSE /area/shuttle/caravan - blob_allowed = FALSE requires_power = TRUE /area/shuttle/caravan/syndicate1 diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 48e034c071b05..68458f190ea26 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1,3 +1,4 @@ + /** * The base type for nearly all physical objects in SS13 @@ -7,6 +8,7 @@ /atom layer = TURF_LAYER plane = GAME_PLANE + appearance_flags = TILE_BOUND var/level = 2 ///If non-null, overrides a/an/some in all cases @@ -46,6 +48,9 @@ ///vis overlays managed by SSvis_overlays to automaticaly turn them like other overlays var/list/managed_vis_overlays + ///overlays managed by update_overlays() to prevent removing overlays that weren't added by the same proc + var/list/managed_overlays + ///Proximity monitor associated with this atom var/datum/proximity_monitor/proximity_monitor ///Cooldown tick timer for buckle messages @@ -73,6 +78,25 @@ ///Bitfield for how the atom handles materials. var/material_flags = NONE + var/flags_ricochet = NONE + ///When a projectile tries to ricochet off this atom, the projectile ricochet chance is multiplied by this + var/ricochet_chance_mod = 1 + ///When a projectile ricochets off this atom, it deals the normal damage * this modifier to this atom + var/ricochet_damage_mod = 0.33 + + /// Last name used to calculate a color for the chatmessage overlays + var/chat_color_name + /// Last color calculated for the the chatmessage overlays + var/chat_color + + ///Mobs that are currently do_after'ing this atom, to be cleared from on Destroy() + var/list/targeted_by + + ///AI controller that controls this atom. type on init, then turned into an instance during runtime + var/datum/ai_controller/ai_controller + + /// Lazylist of all messages currently on this atom + var/list/chat_messages /** * Called when an atom is created in byond (built in engine proc) @@ -95,7 +119,7 @@ var/do_initialize = SSatoms.initialized if(do_initialize != INITIALIZATION_INSSATOMS) args[1] = do_initialize == INITIALIZATION_INNEW_MAPLOAD - if(SSatoms.InitAtom(src, args)) + if(SSatoms.InitAtom(src, FALSE, args)) //we were deleted return @@ -138,6 +162,9 @@ stack_trace("Warning: [src]([type]) initialized multiple times!") flags_1 |= INITIALIZED_1 + if(loc) + SEND_SIGNAL(loc, COMSIG_ATOM_CREATED, src) /// Sends a signal that the new atom `src`, has been created at `loc` + //atom color stuff if(color) add_atom_colour(color, FIXED_COLOUR_PRIORITY) @@ -163,6 +190,7 @@ set_custom_materials(temp_list) ComponentInitialize() + InitializeAIController() return INITIALIZE_HINT_NORMAL @@ -202,19 +230,39 @@ AA.remove_from_hud(src) if(reagents) - qdel(reagents) + QDEL_NULL(reagents) orbiters = null // The component is attached to us normaly and will be deleted elsewhere LAZYCLEARLIST(overlays) LAZYCLEARLIST(priority_overlays) + LAZYCLEARLIST(managed_overlays) + + for(var/i in targeted_by) + var/mob/M = i + LAZYREMOVE(M.do_afters, src) + + targeted_by = null QDEL_NULL(light) + QDEL_NULL(ai_controller) return ..() /atom/proc/handle_ricochet(obj/item/projectile/P) - return + var/turf/p_turf = get_turf(P) + var/face_direction = get_dir(src, p_turf) + var/face_angle = dir2angle(face_direction) + var/incidence_s = GET_ANGLE_OF_INCIDENCE(face_angle, (P.Angle + 180)) + var/a_incidence_s = abs(incidence_s) + if(a_incidence_s > 90 && a_incidence_s < 270) + return FALSE + if((P.flag in list("bullet", "bomb")) && P.ricochet_incidence_leeway) + if((a_incidence_s < 90 && a_incidence_s < 90 - P.ricochet_incidence_leeway) || (a_incidence_s > 270 && a_incidence_s -270 > P.ricochet_incidence_leeway)) + return + var/new_angle_s = SIMPLIFY_DEGREES(face_angle + incidence_s) + P.setAngle(new_angle_s) + return TRUE ///Can the mover object pass this atom, while heading for the target turf /atom/proc/CanPass(atom/movable/mover, turf/target) @@ -314,6 +362,7 @@ L.transferItemToLoc(M, src) else M.forceMove(src) + parts_list.Cut() ///Hook for multiz??? /atom/proc/update_multiz(prune_on_fail = FALSE) @@ -321,13 +370,27 @@ ///Take air from the passed in gas mixture datum /atom/proc/assume_air(datum/gas_mixture/giver) - qdel(giver) + return null + +/atom/proc/assume_air_moles(datum/gas_mixture/giver, moles) + return null + +/atom/proc/assume_air_ratio(datum/gas_mixture/giver, ratio) return null ///Remove air from this atom /atom/proc/remove_air(amount) return null +/atom/proc/remove_air_ratio(ratio) + return null + +/atom/proc/transfer_air(datum/gas_mixture/taker, amount) + return null + +/atom/proc/transfer_air_ratio(datum/gas_mixture/taker, ratio) + return null + ///Return the current air environment in this atom /atom/proc/return_air() if(loc) @@ -473,14 +536,30 @@ /// Updates the icon of the atom /atom/proc/update_icon() + SIGNAL_HANDLER + // I expect we're going to need more return flags and options in this proc var/signalOut = SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_ICON) if(!(signalOut & COMSIG_ATOM_NO_UPDATE_ICON_STATE)) update_icon_state() + if(!(signalOut & COMSIG_ATOM_NO_UPDATE_OVERLAYS)) + var/list/new_overlays = update_overlays() + if(managed_overlays) + cut_overlay(managed_overlays) + managed_overlays = null + if(length(new_overlays)) + managed_overlays = new_overlays + add_overlay(new_overlays) /// Updates the icon state of the atom /atom/proc/update_icon_state() +/// Updates the overlays of the atom +/atom/proc/update_overlays() + SHOULD_CALL_PARENT(TRUE) + . = list() + SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_OVERLAYS, .) + /** * An atom we are buckled or is contained within us has tried to move * @@ -493,10 +572,6 @@ to_chat(user, "You can't move while buckled to [src]!") return -/// Return true if this atoms contents should not have ex_act called on ex_act -/atom/proc/prevent_content_explosion() - return FALSE - /// Handle what happens when your contents are exploded by a bomb /atom/proc/contents_explosion(severity, target) return //For handling the effects of explosions on contents that would not normally be effected @@ -535,6 +610,7 @@ * throw lots of items around - singularity being a notable example) */ /atom/proc/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) + SEND_SIGNAL(src, COMSIG_ATOM_HITBY, AM, skipcatch, hitpush, blocked, throwingdatum) if(density && !has_gravity(AM)) //thrown stuff bounces off dense stuff in no grav, unless the thrown stuff ends up inside what it hit(embedding, bola, etc...). addtimer(CALLBACK(src, .proc/hitby_react, AM), 2) @@ -663,6 +739,12 @@ /atom/proc/ratvar_act() SEND_SIGNAL(src, COMSIG_ATOM_RATVAR_ACT) +/** + * Called when lighteater is called on this. + */ +/atom/proc/lighteater_act(obj/item/light_eater/light_eater) + return + /** * Respond to the eminence clicking on our atom * @@ -886,6 +968,8 @@ VV_DROPDOWN_OPTION(VV_HK_ADD_REAGENT, "Add Reagent") VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EMP, "EMP Pulse") VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EXPLOSION, "Explosion") + VV_DROPDOWN_OPTION(VV_HK_EDIT_FILTERS, "Edit Filters") + VV_DROPDOWN_OPTION(VV_HK_ADD_AI, "Add AI controller") /atom/vv_do_topic(list/href_list) . = ..() @@ -948,6 +1032,17 @@ var/newname = input(usr, "What do you want to rename this to?", "Automatic Rename") as null|text if(newname) vv_auto_rename(newname) + if(href_list[VV_HK_ADD_AI]) + if(!check_rights(R_VAREDIT)) + return + var/result = input(usr, "Choose the AI controller to apply to this atom WARNING: Not all AI works on all atoms.", "AI controller") as null|anything in subtypesof(/datum/ai_controller) + if(!result) + return + ai_controller = new result(src) + + if(href_list[VV_HK_EDIT_FILTERS] && check_rights(R_VAREDIT)) + var/client/C = usr.client + C?.open_filter_editor(src) /atom/vv_get_header() . = ..() @@ -1006,6 +1101,10 @@ * Must return parent proc ..() in the end if overridden */ /atom/proc/tool_act(mob/living/user, obj/item/I, tool_type) + var/signal_result + signal_result = SEND_SIGNAL(src, COMSIG_ATOM_TOOL_ACT(tool_type), user, I) + if(signal_result & COMPONENT_BLOCK_TOOL_ATTACK) // The COMSIG_ATOM_TOOL_ACT signal is blocking the act + return TOOL_ACT_SIGNAL_BLOCKING switch(tool_type) if(TOOL_CROWBAR) return crowbar_act(user, I) @@ -1043,7 +1142,7 @@ ///Screwdriver act /atom/proc/screwdriver_act(mob/living/user, obj/item/I) - SEND_SIGNAL(src, COMSIG_ATOM_SCREWDRIVER_ACT, user, I) + return ///Wrench act /atom/proc/wrench_act(mob/living/user, obj/item/I) @@ -1160,14 +1259,14 @@ var/reverse_message = "has been [what_done] by [ssource][postfix]" target.log_message(reverse_message, LOG_ATTACK, color="orange", log_globally=FALSE) -/atom/movable/proc/add_filter(name,priority,list/params) +/atom/proc/add_filter(name,priority,list/params) LAZYINITLIST(filter_data) var/list/p = params.Copy() p["priority"] = priority filter_data[name] = p update_filters() -/atom/movable/proc/update_filters() +/atom/proc/update_filters() filters = null filter_data = sortTim(filter_data, /proc/cmp_filter_data_priority, TRUE) for(var/f in filter_data) @@ -1175,15 +1274,48 @@ var/list/arguments = data.Copy() arguments -= "priority" filters += filter(arglist(arguments)) + UNSETEMPTY(filter_data) + +/atom/proc/transition_filter(name, time, list/new_params, easing, loop) + var/filter = get_filter(name) + if(!filter) + return + + var/list/old_filter_data = filter_data[name] + + var/list/params = old_filter_data.Copy() + for(var/thing in new_params) + params[thing] = new_params[thing] -/atom/movable/proc/get_filter(name) + animate(filter, new_params, time = time, easing = easing, loop = loop) + for(var/param in params) + filter_data[name][param] = params[param] + +/atom/proc/change_filter_priority(name, new_priority) + if(!filter_data || !filter_data[name]) + return + + filter_data[name]["priority"] = new_priority + update_filters() + +/atom/proc/get_filter(name) if(filter_data && filter_data[name]) return filters[filter_data.Find(name)] -/atom/movable/proc/remove_filter(name) - if(filter_data && filter_data[name]) - filter_data -= name - update_filters() +/atom/proc/remove_filter(name_or_names) + if(!filter_data) + return + + var/list/names = islist(name_or_names) ? name_or_names : list(name_or_names) + + for(var/name in names) + if(filter_data[name]) + filter_data -= name + update_filters() + +/atom/proc/clear_filters() + filter_data = null + filters = null /atom/proc/intercept_zImpact(atom/movable/AM, levels = 1) . |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels) @@ -1213,3 +1345,28 @@ */ /atom/proc/rust_heretic_act() return + +/** + * Used to set something as 'open' if it's being used as a supplypod + * + * Override this if you want an atom to be usable as a supplypod. + */ +/atom/proc/setOpened() + return + +/** + * Used to set something as 'closed' if it's being used as a supplypod + * + * Override this if you want an atom to be usable as a supplypod. + */ +/atom/proc/setClosed() + return + +/** +* Instantiates the AI controller of this atom. Override this if you want to assign variables first. +* +* This will work fine without manually passing arguments. ++*/ +/atom/proc/InitializeAIController() + if(ai_controller) + ai_controller = new ai_controller(src) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index c9cf118809854..d8eec70b69730 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -41,6 +41,56 @@ var/zfalling = FALSE + /// Either FALSE, [EMISSIVE_BLOCK_GENERIC], or [EMISSIVE_BLOCK_UNIQUE] + var/blocks_emissive = FALSE + ///Internal holder for emissive blocker object, do not use directly use blocks_emissive + var/atom/movable/emissive_blocker/em_block + /** + * an associative lazylist of relevant nested contents by "channel", the list is of the form: list(channel = list(important nested contents of that type)) + * each channel has a specific purpose and is meant to replace potentially expensive nested contents iteration + * do NOT add channels to this for little reason as it can add considerable memory usage. + */ + var/list/important_recursive_contents + + +/atom/movable/Initialize(mapload) + . = ..() + switch(blocks_emissive) + if(EMISSIVE_BLOCK_GENERIC) + var/mutable_appearance/gen_emissive_blocker = mutable_appearance(icon, icon_state, EMISSIVE_BLOCKER_LAYER, EMISSIVE_BLOCKER_PLANE) + gen_emissive_blocker.dir = dir + gen_emissive_blocker.alpha = alpha + gen_emissive_blocker.appearance_flags |= appearance_flags + add_overlay(list(gen_emissive_blocker)) + if(EMISSIVE_BLOCK_UNIQUE) + render_target = ref(src) + em_block = new(src, render_target) + + QDEL_NULL(em_block) + + if(pulling) + stop_pulling() + + +/atom/movable/proc/update_emissive_block() + if(!blocks_emissive) + return + else if (blocks_emissive == EMISSIVE_BLOCK_GENERIC) + var/mutable_appearance/gen_emissive_blocker = mutable_appearance(icon, icon_state, EMISSIVE_BLOCKER_LAYER, EMISSIVE_BLOCKER_PLANE) + gen_emissive_blocker.dir = dir + gen_emissive_blocker.alpha = alpha + gen_emissive_blocker.appearance_flags |= appearance_flags + return gen_emissive_blocker + else if(blocks_emissive == EMISSIVE_BLOCK_UNIQUE) + if(!em_block && !QDELETED(src)) + render_target = ref(src) + em_block = new(src, render_target) + return em_block + +/atom/movable/update_overlays() + . = ..() + . += update_emissive_block() + /atom/movable/proc/can_zFall(turf/source, levels = 1, turf/target, direction) if(!direction) direction = DOWN @@ -334,8 +384,8 @@ stop_pulling() else var/pull_dir = get_dir(src, pulling) - //puller and pullee more than one tile away or in diagonal position - if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir))) + //puller and pullee more than one tile away or in diagonal position and whatever the pullee is pulling isn't already moving from a pull as it'll most likely result in an infinite loop a la ouroborus. + if(!pulling.pulling?.moving_from_pull && (get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir)))) pulling.moving_from_pull = src pulling.Move(T, get_dir(pulling, T)) //the pullee tries to reach our previous position pulling.moving_from_pull = null @@ -381,6 +431,10 @@ orbiting.end_orbit(src) orbiting = null + LAZYCLEARLIST(important_recursive_contents) + + vis_contents.Cut() + // Make sure you know what you're doing if you call this, this is intended to only be called by byond directly. // You probably want CanPass() /atom/movable/Cross(atom/movable/AM) @@ -408,7 +462,7 @@ SEND_SIGNAL(src, COMSIG_MOVABLE_BUMP, A) . = ..() if(!QDELETED(throwing)) - throwing.hit_atom(A) + throwing.finalize(hit = TRUE, target = A) . = TRUE if(QDELETED(A)) return @@ -416,6 +470,9 @@ /atom/movable/proc/forceMove(atom/destination) . = FALSE + if(destination == null) //destination destroyed due to explosion + return + if(destination) . = doMove(destination) else @@ -526,15 +583,19 @@ /atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked, datum/thrownthing/throwingdatum) if(!anchored && hitpush && (!throwingdatum || (throwingdatum.force >= (move_resist * MOVE_FORCE_PUSH_RATIO)))) step(src, AM.dir) - ..() + ..(AM, skipcatch, hitpush, blocked, throwingdatum) /atom/movable/proc/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG) if((force < (move_resist * MOVE_FORCE_THROW_RATIO)) || (move_resist == INFINITY)) return return throw_at(target, range, speed, thrower, spin, diagonals_first, callback, force) -/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG) //If this returns FALSE then callback will not be called. +/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, quickstart = TRUE) //If this returns FALSE then callback will not be called. . = FALSE + + if(QDELETED(src)) + CRASH("Qdeleted thing being thrown around.") + if (!target || speed <= 0) return @@ -570,20 +631,14 @@ . = TRUE // No failure conditions past this point. - var/datum/thrownthing/TT = new() - TT.thrownthing = src - TT.target = target - TT.target_turf = get_turf(target) - TT.init_dir = get_dir(src, target) - TT.maxrange = range - TT.speed = speed - TT.thrower = thrower - TT.diagonals_first = diagonals_first - TT.force = force - TT.callback = callback - if(!QDELETED(thrower)) - TT.target_zone = thrower.zone_selected - + var/target_zone + if(QDELETED(thrower) || !istype(thrower)) + thrower = null //Let's not pass an invalid reference. + else + target_zone = thrower.zone_selected + + var/datum/thrownthing/TT = new(src, target, get_dir(src, target), range, speed, thrower, diagonals_first, force, callback, target_zone) + var/dist_x = abs(target.x - src.x) var/dist_y = abs(target.y - src.y) var/dx = (target.x > src.x) ? EAST : WEST @@ -608,6 +663,7 @@ if(pulledby) pulledby.stop_pulling() + movement_type |= THROWN throwing = TT if(spin) @@ -617,7 +673,9 @@ SSthrowing.processing[src] = TT if (SSthrowing.state == SS_PAUSED && length(SSthrowing.currentrun)) SSthrowing.currentrun[src] = TT - TT.tick() + + if(quickstart) + TT.tick() /atom/movable/proc/handle_buckled_mob_movement(newloc,direct) for(var/m in buckled_mobs) @@ -678,10 +736,13 @@ break . = dense_object_backup -//called when a mob resists while inside a container that is itself inside something. -/atom/movable/proc/relay_container_resist(mob/living/user, obj/O) +//Called when something resists while this atom is its loc +/atom/movable/proc/container_resist(mob/living/user) return +//Called when a mob resists while inside a container that is itself inside something. +/atom/movable/proc/relay_container_resist(mob/living/user, obj/O) + return /atom/movable/proc/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect) if(!no_effect && (visual_effect_icon || used_item)) @@ -761,9 +822,8 @@ if(throwing) return if(on && !(movement_type & FLOATING)) - animate(src, pixel_y = pixel_y + 2, time = 10, loop = -1) - sleep(10) - animate(src, pixel_y = pixel_y - 2, time = 10, loop = -1) + animate(src, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) + animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) setMovetype(movement_type | FLOATING) else if (!on && (movement_type & FLOATING)) animate(src, pixel_y = initial(pixel_y), time = 10) @@ -904,3 +964,40 @@ animate(I, alpha = 175, pixel_x = to_x, pixel_y = to_y, time = 3, transform = M, easing = CUBIC_EASING) sleep(1) animate(I, alpha = 0, transform = matrix(), time = 1) + +/atom/movable/proc/get_spawner_desc() + return name + +/atom/movable/proc/get_spawner_flavour_text() + return desc + +/atom/movable/proc/on_hearing_sensitive_trait_loss() + SIGNAL_HANDLER + + UnregisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_HEARING_SENSITIVE)) + for(var/atom/movable/location as anything in get_nested_locs(src) + src) + LAZYREMOVEASSOC(location.important_recursive_contents, RECURSIVE_CONTENTS_HEARING_SENSITIVE, src) + +///allows this movable to hear and adds itself to the important_recursive_contents list of itself and every movable loc its in +/atom/movable/proc/become_hearing_sensitive(trait_source = TRAIT_GENERIC) + if(!HAS_TRAIT(src, TRAIT_HEARING_SENSITIVE)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_HEARING_SENSITIVE), .proc/on_hearing_sensitive_trait_loss) + for(var/atom/movable/location as anything in get_nested_locs(src) + src) + LAZYADDASSOCLIST(location.important_recursive_contents, RECURSIVE_CONTENTS_HEARING_SENSITIVE, src) + ADD_TRAIT(src, TRAIT_HEARING_SENSITIVE, trait_source) + +/atom/movable/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) + . = ..() + if(LAZYLEN(arrived.important_recursive_contents)) + var/list/nested_locs = get_nested_locs(src) + src + for(var/channel in arrived.important_recursive_contents) + for(var/atom/movable/location as anything in nested_locs) + LAZYORASSOCLIST(location.important_recursive_contents, channel, arrived.important_recursive_contents[channel]) + +/atom/movable/Exited(atom/movable/gone, direction) + . = ..() + if(LAZYLEN(gone.important_recursive_contents)) + var/list/nested_locs = get_nested_locs(src) + src + for(var/channel in gone.important_recursive_contents) + for(var/atom/movable/location as anything in nested_locs) + LAZYREMOVEASSOC(location.important_recursive_contents, channel, gone.important_recursive_contents[channel]) diff --git a/code/game/communications.dm b/code/game/communications.dm index 696b942434f75..50e2173470d11 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -101,6 +101,7 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE, RADIO_CHANNEL_SUPPLY = FREQ_SUPPLY, RADIO_CHANNEL_SERVICE = FREQ_SERVICE, + RADIO_CHANNEL_EXPLORATION = FREQ_EXPLORATION, RADIO_CHANNEL_AI_PRIVATE = FREQ_AI_PRIVATE, RADIO_CHANNEL_CTF_RED = FREQ_CTF_RED, RADIO_CHANNEL_CTF_BLUE = FREQ_CTF_BLUE @@ -116,6 +117,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( "[FREQ_CENTCOM]" = RADIO_CHANNEL_CENTCOM, "[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE, "[FREQ_SUPPLY]" = RADIO_CHANNEL_SUPPLY, + "[FREQ_EXPLORATION]" = RADIO_CHANNEL_EXPLORATION, "[FREQ_SERVICE]" = RADIO_CHANNEL_SERVICE, "[FREQ_AI_PRIVATE]" = RADIO_CHANNEL_AI_PRIVATE, "[FREQ_CTF_RED]" = RADIO_CHANNEL_CTF_RED, @@ -123,8 +125,9 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( )) /datum/radio_frequency - var/frequency as num - var/list/list/obj/devices = list() + var/frequency + /// List of filters -> list of devices + var/list/list/datum/weakref/devices = list() /datum/radio_frequency/New(freq) frequency = freq @@ -154,14 +157,18 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( //Send the data for(var/current_filter in filter_list) - for(var/obj/device in devices[current_filter]) + for(var/datum/weakref/device_ref as anything in devices[current_filter]) + var/obj/device = device_ref.resolve() + if(!device) + devices[current_filter] -= device_ref + continue if(device == source) continue if(range) var/turf/end_point = get_turf(device) if(!end_point) continue - if(start_point.z != end_point.z || (range > 0 && get_dist(start_point, end_point) > range)) + if(start_point.get_virtual_z_level() != end_point.get_virtual_z_level() || (range > 0 && get_dist(start_point, end_point) > range)) continue device.receive_signal(signal) @@ -172,7 +179,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( var/list/devices_line = devices[filter] if(!devices_line) devices[filter] = devices_line = list() - devices_line += device + devices_line += WEAKREF(device) /datum/radio_frequency/proc/remove_listener(obj/device) @@ -180,7 +187,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( var/list/devices_line = devices[devices_filter] if(!devices_line) devices -= devices_filter - devices_line -= device + devices_line -= WEAKREF(device) if(!devices_line.len) devices -= devices_filter diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index a12ca8ee95bb2..1a0e5b05fc668 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -72,8 +72,8 @@ /datum/atom_hud/ai_detector/add_hud_to(mob/M) ..() if(M && (hudusers.len == 1)) - for(var/V in GLOB.aiEyes) - var/mob/camera/aiEye/E = V + for(var/V in GLOB.ai_eyes) + var/mob/camera/ai_eye/E = V E.update_ai_detect_hud() /* MED/SEC/DIAG HUD HOOKS */ @@ -91,14 +91,14 @@ //called when a carbon changes virus /mob/living/carbon/proc/check_virus() var/threat - var/severity + var/danger for(var/thing in diseases) var/datum/disease/D = thing if(!(D.visibility_flags & HIDDEN_SCANNER)) - if(!threat || get_disease_severity_value(D.severity) > threat) //a buffing virus gets an icon - threat = get_disease_severity_value(D.severity) - severity = D.severity - return severity + if(!threat || get_disease_danger_value(D.danger) > threat) //a buffing virus gets an icon + threat = get_disease_danger_value(D.danger) + danger = D.danger + return danger //helper for getting the appropriate health status /proc/RoundHealth(mob/living/M) @@ -160,9 +160,12 @@ //called when a living mob changes health /mob/living/proc/med_hud_set_health() var/image/holder = hud_list[HEALTH_HUD] - holder.icon_state = "hud[RoundHealth(src)]" - var/icon/I = icon(icon, icon_state, dir) - holder.pixel_y = I.Height() - world.icon_size + if(holder) + holder.icon_state = "hud[RoundHealth(src)]" + var/icon/I = icon(icon, icon_state, dir) + holder.pixel_y = I.Height() - world.icon_size + else + stack_trace("[src] does not have a HEALTH_HUD but updates it!") //for carbon suit sensors /mob/living/carbon/med_hud_set_health() @@ -171,49 +174,55 @@ //called when a carbon changes stat, virus or XENO_HOST /mob/living/proc/med_hud_set_status() var/image/holder = hud_list[STATUS_HUD] - var/icon/I = icon(icon, icon_state, dir) - holder.pixel_y = I.Height() - world.icon_size - if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) - holder.icon_state = "huddead" + if(holder) + var/icon/I = icon(icon, icon_state, dir) + holder.pixel_y = I.Height() - world.icon_size + if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) + holder.icon_state = "huddead" + else + holder.icon_state = "hudhealthy" else - holder.icon_state = "hudhealthy" + stack_trace("[src] does not have a HEALTH_HUD but updates it!") /mob/living/carbon/med_hud_set_status() var/image/holder = hud_list[STATUS_HUD] - var/icon/I = icon(icon, icon_state, dir) - var/virus_threat = check_virus() - holder.pixel_y = I.Height() - world.icon_size - if(HAS_TRAIT(src, TRAIT_XENO_HOST)) - holder.icon_state = "hudxeno" - else if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) - if(tod) - var/tdelta = round(world.time - timeofdeath) - if(tdelta < (DEFIB_TIME_LIMIT * 10)) - holder.icon_state = "huddefib" - return - holder.icon_state = "huddead" + if(holder) + var/icon/I = icon(icon, icon_state, dir) + var/virus_threat = check_virus() + holder.pixel_y = I.Height() - world.icon_size + if(HAS_TRAIT(src, TRAIT_XENO_HOST)) + holder.icon_state = "hudxeno" + else if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) + if(tod) + var/tdelta = round(world.time - timeofdeath) + if(tdelta < (DEFIB_TIME_LIMIT * 10)) + holder.icon_state = "huddefib" + return + holder.icon_state = "huddead" + else + switch(virus_threat) + if(DISEASE_PANDEMIC) + holder.icon_state = "hudill6" + if(DISEASE_BIOHAZARD) + holder.icon_state = "hudill5" + if(DISEASE_DANGEROUS) + holder.icon_state = "hudill4" + if(DISEASE_HARMFUL) + holder.icon_state = "hudill3" + if(DISEASE_MEDIUM) + holder.icon_state = "hudill2" + if(DISEASE_MINOR) + holder.icon_state = "hudill1" + if(DISEASE_NONTHREAT) + holder.icon_state = "hudill0" + if(DISEASE_POSITIVE) + holder.icon_state = "hudbuff" + if(DISEASE_BENEFICIAL) + holder.icon_state = "hudbuff2" + if(null) + holder.icon_state = "hudhealthy" else - switch(virus_threat) - if(DISEASE_SEVERITY_PANDEMIC) - holder.icon_state = "hudill6" - if(DISEASE_SEVERITY_BIOHAZARD) - holder.icon_state = "hudill5" - if(DISEASE_SEVERITY_DANGEROUS) - holder.icon_state = "hudill4" - if(DISEASE_SEVERITY_HARMFUL) - holder.icon_state = "hudill3" - if(DISEASE_SEVERITY_MEDIUM) - holder.icon_state = "hudill2" - if(DISEASE_SEVERITY_MINOR) - holder.icon_state = "hudill1" - if(DISEASE_SEVERITY_NONTHREAT) - holder.icon_state = "hudill0" - if(DISEASE_SEVERITY_POSITIVE) - holder.icon_state = "hudbuff" - if(DISEASE_SEVERITY_BENEFICIAL) - holder.icon_state = "hudbuff2" - if(null) - holder.icon_state = "hudhealthy" + stack_trace("[src] does not have a HEALTH_HUD but updates it!") /*********************************************** @@ -247,7 +256,7 @@ var/icon/IC = icon(icon, icon_state, dir) holder.pixel_y = IC.Height() - world.icon_size holder.icon_state = "hud_imp_chem" - if(HAS_TRAIT(src, TRAIT_MINDSHIELD) && !istype(src.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) //tinfoil hats interfere with implant detection + if(HAS_TRAIT(src, TRAIT_MINDSHIELD) && !istype(src.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat)) //tinfoil hats interfere with implant detection holder = hud_list[IMPLOYAL_HUD] var/icon/IC = icon(icon, icon_state, dir) holder.pixel_y = IC.Height() - world.icon_size @@ -262,7 +271,7 @@ var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.security) if(R) switch(R.fields["criminal"]) - if("*Arrest*") + if("Arrest") holder.icon_state = "hudwanted" return if("Incarcerated") @@ -274,6 +283,12 @@ if("Discharged") holder.icon_state = "huddischarged" return + if("Search") + holder.icon_state = "hudsearch" + return + if("Monitor") + holder.icon_state = "hudmonitor" + return holder.icon_state = null /*********************************************** @@ -454,53 +469,3 @@ holder.icon_state = "electrified" else holder.icon_state = "" - -/*~~~~~~~~~~~~ - Circutry! -~~~~~~~~~~~~~*/ -/obj/item/electronic_assembly/proc/diag_hud_set_circuithealth(hide = FALSE) - var/image/holder = hud_list[DIAG_CIRCUIT_HUD] - var/icon/I = icon(icon, icon_state, dir) - holder.pixel_y = I.Height() - world.icon_size - if((!isturf(loc))||hide) //if not on the ground dont show overlay - holder.icon_state = null - else - holder.icon_state = "huddiag[RoundDiagBar(obj_integrity/max_integrity)]" - -/obj/item/electronic_assembly/proc/diag_hud_set_circuitcell(hide = FALSE) - var/image/holder = hud_list[DIAG_BATT_HUD] - var/icon/I = icon(icon, icon_state, dir) - holder.pixel_y = I.Height() - world.icon_size - if((!isturf(loc))||hide) //if not on the ground dont show overlay - holder.icon_state = null - else if(battery) - var/chargelvl = battery.charge/battery.maxcharge - holder.icon_state = "hudbatt[RoundDiagBar(chargelvl)]" - else - holder.icon_state = "hudnobatt" - -/obj/item/electronic_assembly/proc/diag_hud_set_circuitstat(hide = FALSE) //On, On and dangerous, or Off - var/image/holder = hud_list[DIAG_STAT_HUD] - var/icon/I = icon(icon, icon_state, dir) - holder.pixel_y = I.Height() - world.icon_size - if((!isturf(loc))||hide) //if not on the ground don't show overlay - holder.icon_state = null - else if(!battery) - holder.icon_state = "hudoffline" - else if(battery.charge == 0) - holder.icon_state = "hudoffline" - else if(combat_circuits) //has a circuit that can harm people - holder.icon_state = prefered_hud_icon + "-red" - else //Bot is on and not dangerous - holder.icon_state = prefered_hud_icon - -/obj/item/electronic_assembly/proc/diag_hud_set_circuittracking(hide = FALSE) - var/image/holder = hud_list[DIAG_TRACK_HUD] - var/icon/I = icon(icon, icon_state, dir) - holder.pixel_y = I.Height() - world.icon_size - if((!isturf(loc))||hide) //if not on the ground dont show overlay - holder.icon_state = null - else if(long_range_circuits) - holder.icon_state = "hudtracking" - else - holder.icon_state = null diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index f961da979328d..d7257af93e4f9 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -1,7 +1,9 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")) GLOBAL_LIST_INIT(slots, list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store")) -GLOBAL_LIST_INIT(slot2slot, list("head" = SLOT_HEAD, "wear_mask" = SLOT_WEAR_MASK, "neck" = SLOT_NECK, "back" = SLOT_BACK, "wear_suit" = SLOT_WEAR_SUIT, "w_uniform" = SLOT_W_UNIFORM, "shoes" = SLOT_SHOES, "belt" = SLOT_BELT, "gloves" = SLOT_GLOVES, "glasses" = SLOT_GLASSES, "ears" = SLOT_EARS, "wear_id" = SLOT_WEAR_ID, "s_store" = SLOT_S_STORE)) -GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "wear_mask" = /obj/item/clothing/mask/changeling, "back" = /obj/item/changeling, "wear_suit" = /obj/item/clothing/suit/changeling, "w_uniform" = /obj/item/clothing/under/changeling, "shoes" = /obj/item/clothing/shoes/changeling, "belt" = /obj/item/changeling, "gloves" = /obj/item/clothing/gloves/changeling, "glasses" = /obj/item/clothing/glasses/changeling, "ears" = /obj/item/changeling, "wear_id" = /obj/item/changeling, "s_store" = /obj/item/changeling)) + +GLOBAL_LIST_INIT(slot2slot, list("head" = ITEM_SLOT_HEAD, "wear_mask" = ITEM_SLOT_MASK, "neck" = ITEM_SLOT_NECK, "back" = ITEM_SLOT_BACK, "wear_suit" = ITEM_SLOT_OCLOTHING, "w_uniform" = ITEM_SLOT_ICLOTHING, "shoes" = ITEM_SLOT_FEET, "belt" = ITEM_SLOT_BELT, "gloves" = ITEM_SLOT_GLOVES, "glasses" = ITEM_SLOT_EYES, "ears" = ITEM_SLOT_EARS, "wear_id" = ITEM_SLOT_ID, "s_store" = ITEM_SLOT_SUITSTORE)) +GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "wear_mask" = /obj/item/clothing/mask/changeling, "back" = /obj/item/changeling, "wear_suit" = /obj/item/clothing/suit/changeling, "w_uniform" = /obj/item/clothing/under/changeling, "shoes" = /obj/item/clothing/shoes/changeling, "belt" = /obj/item/changeling, "gloves" = /obj/item/clothing/gloves/changeling, "glasses" = /obj/item/clothing/glasses/changeling, "ears" = /obj/item/changeling, "wear_id" = /obj/item/changeling/id, "s_store" = /obj/item/changeling)) + /datum/game_mode/changeling @@ -11,7 +13,7 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w antag_flag = ROLE_CHANGELING false_report_weight = 10 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Brig Physician") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_players = 15 required_enemies = 1 recommended_enemies = 4 @@ -113,6 +115,9 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w if((user.vars[slot] && !istype(user.vars[slot], GLOB.slot2type[slot])) || !(chosen_prof.exists_list[slot])) continue + if(istype(user.vars[slot], GLOB.slot2type[slot]) && slot == "wear_id") //always remove old flesh IDs, so they get properly updated + qdel(user.vars[slot]) + var/obj/item/C var/equip = 0 if(!user.vars[slot]) @@ -128,8 +133,15 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w C.flags_cover = chosen_prof.flags_cover_list[slot] C.item_color = chosen_prof.item_color_list[slot] C.item_state = chosen_prof.item_state_list[slot] + + if(istype(C, /obj/item/changeling/id) && chosen_prof.id_icon) + var/obj/item/changeling/id/flesh_id = C + flesh_id.hud_icon = chosen_prof.id_icon + if(equip) user.equip_to_slot_or_del(C, GLOB.slot2slot[slot]) + if(!QDELETED(C)) + ADD_TRAIT(C, TRAIT_NODROP, CHANGELING_TRAIT) user.regenerate_icons() diff --git a/code/game/gamemodes/clock_cult/clockcult.dm b/code/game/gamemodes/clock_cult/clockcult.dm index fd54fd0bdb1d4..64b5c64fdc6d5 100644 --- a/code/game/gamemodes/clock_cult/clockcult.dm +++ b/code/game/gamemodes/clock_cult/clockcult.dm @@ -41,21 +41,19 @@ GLOBAL_VAR(clockcult_eminence) Servants: Convert more servants and defend the Ark of the Clockwork Justicar!\n\ Crew: Prepare yourselfs and destroy the Ark of the Clockwork Justicar." + var/clock_cultists = CLOCKCULT_SERVANTS var/list/selected_servants = list() var/datum/team/clock_cult/main_cult +/datum/game_mode/clockcult/setup_maps() + //Since we are loading in pre_setup, disable map loading. + SSticker.gamemode_hotswap_disabled = TRUE + LoadReebe() + return TRUE + /datum/game_mode/clockcult/pre_setup() - //Load Reebe - var/list/errorList = list() - var/list/reebe = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "CityOfCogs.dmm", default_traits=ZTRAITS_REEBE, silent=TRUE) - if(errorList.len) - message_admins("Reebe failed to load") - log_game("Reebe failed to load") - return FALSE - for(var/datum/parsed_map/map in reebe) - map.initTemplateBounds() //Generate cultists for(var/i in 1 to clock_cultists) if(!antag_candidates.len) @@ -65,10 +63,7 @@ GLOBAL_VAR(clockcult_eminence) selected_servants += clockie clockie.assigned_role = ROLE_SERVANT_OF_RATVAR clockie.special_role = ROLE_SERVANT_OF_RATVAR - //Generate scriptures - for(var/categorypath in typesof(/datum/clockcult/scripture)) - var/datum/clockcult/scripture/S = new categorypath - GLOB.clockcult_all_scriptures[S.name] = S + generate_clockcult_scriptures() return TRUE /datum/game_mode/clockcult/post_setup(report) @@ -82,7 +77,7 @@ GLOBAL_VAR(clockcult_eminence) var/datum/antagonist/servant_of_ratvar/S = add_servant_of_ratvar(servant_mind.current, team=main_cult) S.equip_carbon(servant_mind.current) S.equip_servant() - S.prefix = CLOCKCULT_MASTER + S.prefix = CLOCKCULT_PREFIX_MASTER //Setup the conversion limits for auto opening the ark calculate_clockcult_values() return ..() @@ -157,7 +152,7 @@ GLOBAL_VAR(clockcult_eminence) return FALSE if(ishuman(M) && (M.mind.assigned_role in list("Captain", "Chaplain"))) return FALSE - if(istype(M.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) + if(istype(M.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat)) return FALSE if(is_servant_of_ratvar(M)) return FALSE @@ -171,6 +166,12 @@ GLOBAL_VAR(clockcult_eminence) return FALSE return TRUE +/proc/generate_clockcult_scriptures() + //Generate scriptures + for(var/categorypath in subtypesof(/datum/clockcult/scripture)) + var/datum/clockcult/scripture/S = new categorypath + GLOB.clockcult_all_scriptures[S.name] = S + /proc/flee_reebe() for(var/mob/living/M in GLOB.mob_list) if(!is_reebe(M.z)) @@ -205,38 +206,42 @@ GLOBAL_VAR(clockcult_eminence) msg = sender.treat_message(msg) var/datum/antagonist/servant_of_ratvar/SoR = is_servant_of_ratvar(sender) var/prefix = "Clockbrother" - if(SoR.prefix) - prefix = sender.gender == MALE\ - ? "Clockfather"\ - : sender.gender == FEMALE\ - ? "Clockmother"\ - : "Clockmaster" - hierophant_message = "" - else - var/role = sender.mind?.assigned_role - //Ew, this could be done better with a dictionary list, but this isn't much slower - if(role in GLOB.command_positions) - prefix = "High Priest" - else if(role in GLOB.engineering_positions) - prefix = "Cogturner" - else if(role in GLOB.medical_positions) - prefix = "Rejuvinator" - else if(role in GLOB.science_positions) - prefix = "Calculator" - else if(role in GLOB.supply_positions) - prefix = "Pathfinder" - else if(role in "Assistant") - prefix = "Helper" - else if(role in "Mime") - prefix = "Cogwatcher" - else if(role in "Clown") - prefix = "Clonker" - else if(role in GLOB.civilian_positions) - prefix = "Cogworker" - else if(role in GLOB.security_positions) - prefix = "Warrior" - else if(role in GLOB.nonhuman_positions) - prefix = "CPU" + switch(SoR.prefix) + if(CLOCKCULT_PREFIX_EMINENCE) + prefix = "Master" + if(CLOCKCULT_PREFIX_MASTER) + prefix = sender.gender == MALE\ + ? "Clockfather"\ + : sender.gender == FEMALE\ + ? "Clockmother"\ + : "Clockmaster" + hierophant_message = "" + if(CLOCKCULT_PREFIX_RECRUIT) + var/role = sender.mind?.assigned_role + //Ew, this could be done better with a dictionary list, but this isn't much slower + if(role in GLOB.command_positions) + prefix = "High Priest" + else if(role in GLOB.engineering_positions) + prefix = "Cogturner" + else if(role in GLOB.medical_positions) + prefix = "Rejuvinator" + else if(role in GLOB.science_positions) + prefix = "Calculator" + else if(role in GLOB.supply_positions) + prefix = "Pathfinder" + else if(role in "Assistant") + prefix = "Helper" + else if(role in "Mime") + prefix = "Cogwatcher" + else if(role in "Clown") + prefix = "Clonker" + else if((role in GLOB.civilian_positions) || (role in GLOB.gimmick_positions)) + prefix = "Cogworker" + else if(role in GLOB.security_positions) + prefix = "Warrior" + else if(role in GLOB.nonhuman_positions) + prefix = "CPU" + //Fallthrough is default of "Clockbrother" hierophant_message += "[prefix] [sender.name] transmits, \"[msg]\"" else hierophant_message += msg diff --git a/code/game/gamemodes/clown_ops/bananium_bomb.dm b/code/game/gamemodes/clown_ops/bananium_bomb.dm index f8a61487c982a..8c4af7108a738 100644 --- a/code/game/gamemodes/clown_ops/bananium_bomb.dm +++ b/code/game/gamemodes/clown_ops/bananium_bomb.dm @@ -36,24 +36,24 @@ Cinematic(get_cinematic_type(off_station), world) for(var/mob/living/carbon/human/H in GLOB.carbon_list) var/turf/T = get_turf(H) - if(!T || T.z != z) + if(!T || T.get_virtual_z_level() != get_virtual_z_level()) continue H.Stun(10) var/obj/item/clothing/C if(!H.w_uniform || H.dropItemToGround(H.w_uniform)) C = new /obj/item/clothing/under/rank/civilian/clown(H) ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT) - H.equip_to_slot_or_del(C, SLOT_W_UNIFORM) + H.equip_to_slot_or_del(C, ITEM_SLOT_ICLOTHING) if(!H.shoes || H.dropItemToGround(H.shoes)) C = new /obj/item/clothing/shoes/clown_shoes(H) ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT) - H.equip_to_slot_or_del(C, SLOT_SHOES) + H.equip_to_slot_or_del(C, ITEM_SLOT_FEET) if(!H.wear_mask || H.dropItemToGround(H.wear_mask)) C = new /obj/item/clothing/mask/gas/clown_hat(H) ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT) - H.equip_to_slot_or_del(C, SLOT_WEAR_MASK) + H.equip_to_slot_or_del(C, ITEM_SLOT_MASK) H.dna.add_mutation(CLOWNMUT) H.gain_trauma(/datum/brain_trauma/mild/phobia/clowns, TRAUMA_RESILIENCE_LOBOTOMY) //MWA HA HA diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index 61863c96b230c..f96e4d18217bb 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -17,41 +17,50 @@ desc = "advanced clown shoes that protect the wearer and render them nearly immune to slipping on their own peels. They also squeak at 100% capacity." clothing_flags = NOSLIP slowdown = SHOES_SLOWDOWN - armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50) + armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50, "stamina" = 25) strip_delay = 70 resistance_flags = NONE permeability_coefficient = 0.05 pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes +/// Recharging rate in PPS (peels per second) +#define BANANA_SHOES_RECHARGE_RATE 17 +#define BANANA_SHOES_MAX_CHARGE 3000 + //The super annoying version /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat name = "mk-honk combat shoes" desc = "The culmination of years of clown combat research, these shoes leave a trail of chaos in their wake. They will slowly recharge themselves over time, or can be manually charged with bananium." slowdown = SHOES_SLOWDOWN - armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50) + armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50, "stamina" = 25) strip_delay = 70 resistance_flags = NONE permeability_coefficient = 0.05 pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes always_noslip = TRUE - var/max_recharge = 3000 //30 peels worth - var/recharge_rate = 34 //about 1/3 of a peel per tick /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/Initialize() . = ..() var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) - bananium.insert_amount_mat(max_recharge, /datum/material/bananium) + bananium.insert_amount_mat(BANANA_SHOES_MAX_CHARGE, /datum/material/bananium) START_PROCESSING(SSobj, src) -/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process() +/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + +/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process(delta_time) var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) var/bananium_amount = bananium.get_material_amount(/datum/material/bananium) - if(bananium_amount < max_recharge) - bananium.insert_amount_mat(min(recharge_rate, max_recharge - bananium_amount), /datum/material/bananium) + if(bananium_amount < BANANA_SHOES_MAX_CHARGE) + bananium.insert_amount_mat(min(BANANA_SHOES_RECHARGE_RATE * delta_time, BANANA_SHOES_MAX_CHARGE - bananium_amount), /datum/material/bananium) /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/attack_self(mob/user) ui_action_click(user) +#undef BANANA_SHOES_RECHARGE_RATE +#undef BANANA_SHOES_MAX_CHARGE + //BANANIUM SWORD /obj/item/melee/transforming/energy/sword/bananium @@ -138,7 +147,7 @@ var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery) slipper.signal_enabled = active -/obj/item/shield/energy/bananium/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force) +/obj/item/shield/energy/bananium/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, quickstart = TRUE) if(active) if(iscarbon(thrower)) var/mob/living/carbon/C = thrower @@ -151,9 +160,9 @@ if(iscarbon(hit_atom) && !caught)//if they are a carbon and they didn't catch it var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery) slipper.Slip(src, hit_atom) - if(thrownby && !caught) - sleep(1) - throw_at(thrownby, throw_range+2, throw_speed, null, TRUE) + var/mob/thrown_by = thrownby?.resolve() + if(thrown_by && !caught) + addtimer(CALLBACK(src, /atom/movable.proc/throw_at, thrown_by, throw_range+2, throw_speed, null, TRUE), 1) else return ..() @@ -206,14 +215,14 @@ icon_state = "moustacheg" clumsy_check = GRENADE_NONCLUMSY_FUMBLE -/obj/item/grenade/chem_grenade/teargas/moustache/prime() +/obj/item/grenade/chem_grenade/teargas/moustache/prime(mob/living/lanced_by) var/myloc = get_turf(src) . = ..() - for(var/mob/living/carbon/M in view(6, myloc)) + for(var/mob/living/carbon/M in hearers(6, myloc)) if(!istype(M.wear_mask, /obj/item/clothing/mask/gas/clown_hat) && !istype(M.wear_mask, /obj/item/clothing/mask/gas/mime) ) if(!M.wear_mask || M.dropItemToGround(M.wear_mask)) var/obj/item/clothing/mask/fakemoustache/sticky/the_stash = new /obj/item/clothing/mask/fakemoustache/sticky() - M.equip_to_slot_or_del(the_stash, SLOT_WEAR_MASK, TRUE, TRUE, TRUE, TRUE) + M.equip_to_slot_or_del(the_stash, ITEM_SLOT_MASK, TRUE, TRUE, TRUE, TRUE) /obj/item/clothing/mask/fakemoustache/sticky var/unstick_time = 600 @@ -266,7 +275,7 @@ icon_state = "darkhonker" max_integrity = 300 deflect_chance = 15 - armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) + armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100, "stamina" = 0) max_temperature = 35000 operation_req_access = list(ACCESS_SYNDICATE) internals_req_access = list(ACCESS_SYNDICATE) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 95a44c636a7c7..d8ecce2bb0a7b 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -38,7 +38,7 @@ report_type = "cult" antag_flag = ROLE_CULTIST false_report_weight = 1 - restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician") + restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") protected_jobs = list() required_players = 29 required_enemies = 4 @@ -52,6 +52,7 @@ title_icon = "cult" + var/finished = 0 var/acolytes_needed = 10 //for the survive objective @@ -78,12 +79,16 @@ if(prob(remaining)) recommended_enemies++ + recommended_enemies = max(recommended_enemies, required_enemies) for(var/cultists_number = 1 to recommended_enemies) if(!antag_candidates.len) break var/datum/mind/cultist = antag_pick(antag_candidates, ROLE_CULTIST) antag_candidates -= cultist + if(!cultist) + cultists_number-- + continue cultists_to_cult += cultist cultist.special_role = ROLE_CULTIST cultist.restricted_roles = restricted_jobs diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm index ce5d9ee7d38d9..22e64f00a81a4 100644 --- a/code/game/gamemodes/devil/devil_game_mode.dm +++ b/code/game/gamemodes/devil/devil_game_mode.dm @@ -4,7 +4,7 @@ report_type = "devil" antag_flag = ROLE_DEVIL false_report_weight = 1 - protected_jobs = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI", "Cyborg", "Security Officer", "Warden", "Detective", "Brig Physician") + protected_jobs = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI", "Cyborg", "Security Officer", "Warden", "Detective") required_players = 0 required_enemies = 1 recommended_enemies = 4 @@ -12,6 +12,8 @@ enemy_minimum_age = 0 title_icon = "devil" + allowed_special = list(/datum/special_role/traitor) + var/traitors_possible = 4 //hard limit on devils if scaling is turned off var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual. var/objective_count = 2 diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 133b8bb0eb44f..a5a8bfc80e6f9 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -1,44 +1,19 @@ -#define CURRENT_LIVING_PLAYERS 1 -#define CURRENT_LIVING_ANTAGS 2 -#define CURRENT_DEAD_PLAYERS 3 -#define CURRENT_OBSERVERS 4 - -#define ONLY_RULESET 1 -#define HIGHLANDER_RULESET 2 -#define TRAITOR_RULESET 4 -#define MINOR_RULESET 8 - #define RULESET_STOP_PROCESSING 1 -// -- Injection delays -GLOBAL_VAR_INIT(dynamic_latejoin_delay_min, (5 MINUTES)) -GLOBAL_VAR_INIT(dynamic_latejoin_delay_max, (25 MINUTES)) +#define FAKE_REPORT_CHANCE 8 +#define REPORT_NEG_DIVERGENCE -15 +#define REPORT_POS_DIVERGENCE 15 -GLOBAL_VAR_INIT(dynamic_midround_delay_min, (15 MINUTES)) -GLOBAL_VAR_INIT(dynamic_midround_delay_max, (35 MINUTES)) - -// Are HIGHLANDER_RULESETs allowed to stack? +// Are HIGH_IMPACT_RULESETs allowed to stack? GLOBAL_VAR_INIT(dynamic_no_stacking, TRUE) -// A number between -5 and +5. -// A negative value will give a more peaceful round and -// a positive value will give a round with higher threat. -GLOBAL_VAR_INIT(dynamic_curve_centre, 0) -// A number between 0.5 and 4. -// Higher value will favour extreme rounds and -// lower value rounds closer to the average. -GLOBAL_VAR_INIT(dynamic_curve_width, 1.8) -// If enabled only picks a single starting rule and executes only autotraitor midround ruleset. -GLOBAL_VAR_INIT(dynamic_classic_secret, FALSE) -// How many roundstart players required for high population override to take effect. -GLOBAL_VAR_INIT(dynamic_high_pop_limit, 55) // If enabled does not accept or execute any rulesets. GLOBAL_VAR_INIT(dynamic_forced_extended, FALSE) -// How high threat is required for HIGHLANDER_RULESETs stacking. +// How high threat is required for HIGH_IMPACT_RULESETs stacking. // This is independent of dynamic_no_stacking. GLOBAL_VAR_INIT(dynamic_stacking_limit, 90) // List of forced roundstart rulesets. GLOBAL_LIST_EMPTY(dynamic_forced_roundstart_ruleset) -// Forced threat level, setting this to zero or higher forces the roundstart threat to the value. +// Forced threat level, setting this to zero or higher forces the roundstart threat to the value. GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) /datum/game_mode/dynamic @@ -49,15 +24,23 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) announce_span = "danger" announce_text = "Dynamic mode!" // This needs to be changed maybe - reroll_friendly = FALSE; - + reroll_friendly = FALSE + // Threat logging vars /// The "threat cap", threat shouldn't normally go above this and is used in ruleset calculations - var/threat_level = 0 - /// Set at the beginning of the round. Spent by the mode to "purchase" rules. - var/threat = 0 + var/threat_level = 0 + + /// Set at the beginning of the round. Spent by the mode to "purchase" rules. Everything else goes in the postround budget. + var/round_start_budget = 0 + + /// Set at the beginning of the round. Spent by midrounds and latejoins. + var/mid_round_budget = 0 + + /// The initial round start budget for logging purposes, set once at the beginning of the round. + var/initial_round_start_budget = 0 + /// Running information about the threat. Can store text or datum entries. - var/list/threat_log = list() + var/list/threat_log = list() /// List of roundstart rules used for selecting the rules. var/list/roundstart_rules = list() /// List of latejoin rules used for selecting the rules. @@ -73,14 +56,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) * 0-6, 7-13, 14-20, 21-27, 28-34, 35-41, 42-48, 49-55, 56-62, 63+ */ var/pop_per_requirement = 6 - /// The requirement used for checking if a second rule should be selected. - var/list/second_rule_req = list(100, 100, 80, 70, 60, 50, 30, 20, 10, 0) - /// The requirement used for checking if a third rule should be selected. - var/list/third_rule_req = list(100, 100, 100, 90, 80, 70, 60, 50, 40, 30) - /// Threat requirement for a second ruleset when high pop override is in effect. - var/high_pop_second_rule_req = 40 - /// Threat requirement for a third ruleset when high pop override is in effect. - var/high_pop_third_rule_req = 60 /// Number of players who were ready on roundstart. var/roundstart_pop_ready = 0 /// List of candidates used on roundstart rulesets. @@ -89,36 +64,110 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) var/list/current_rules = list() /// List of executed rulesets. var/list/executed_rules = list() - /// Associative list of current players, in order: living players, living antagonists, dead players and observers. - var/list/list/current_players = list(CURRENT_LIVING_PLAYERS, CURRENT_LIVING_ANTAGS, CURRENT_DEAD_PLAYERS, CURRENT_OBSERVERS) - /// When world.time is over this number the mode tries to inject a latejoin ruleset. - var/latejoin_injection_cooldown = 0 - /// When world.time is over this number the mode tries to inject a midround ruleset. - var/midround_injection_cooldown = 0 /// When TRUE GetInjectionChance returns 100. var/forced_injection = FALSE /// Forced ruleset to be executed for the next latejoin. var/datum/dynamic_ruleset/latejoin/forced_latejoin_rule = null - /// When current_players was updated last time. - var/pop_last_updated = 0 /// How many percent of the rounds are more peaceful. var/peaceful_percentage = 50 - /// If a highlander executed. - var/highlander_executed = FALSE + /// If a high impact ruleset was executed. Only one will run at a time in most circumstances. + var/high_impact_ruleset_executed = FALSE /// If a only ruleset has been executed. var/only_ruleset_executed = FALSE + /// Dynamic configuration, loaded on pre_setup + var/list/configuration = null + /// Antags rolled by rules so far, to keep track of and discourage scaling past a certain ratio of crew/antags especially on lowpop. + var/antags_rolled = 0 + + /// When world.time is over this number the mode tries to inject a latejoin ruleset. + var/latejoin_injection_cooldown = 0 + + /// The minimum time the recurring latejoin ruleset timer is allowed to be. + var/latejoin_delay_min = (5 MINUTES) + + /// The maximum time the recurring latejoin ruleset timer is allowed to be. + var/latejoin_delay_max = (25 MINUTES) + + /// When world.time is over this number the mode tries to inject a midround ruleset. + var/midround_injection_cooldown = 0 + + /// The minimum time the recurring midround ruleset timer is allowed to be. + var/midround_delay_min = (15 MINUTES) + + /// The maximum time the recurring midround ruleset timer is allowed to be. + var/midround_delay_max = (35 MINUTES) + + /// If above this threat, increase the chance of injection + var/higher_injection_chance_minimum_threat = 70 + + /// The chance of injection increase when above higher_injection_chance_minimum_threat + var/higher_injection_chance = 15 + + /// If below this threat, decrease the chance of injection + var/lower_injection_chance_minimum_threat = 10 + + /// The chance of injection decrease when above lower_injection_chance_minimum_threat + var/lower_injection_chance = 15 + + /// A number between -5 and +5. + /// A negative value will give a more peaceful round and + /// a positive value will give a round with higher threat. + var/threat_curve_centre = 0 + + /// A number between 0.5 and 4. + /// Higher value will favour extreme rounds and + /// lower value rounds closer to the average. + var/threat_curve_width = 1.8 + + /// A number between -5 and +5. + /// Equivalent to threat_curve_centre, but for the budget split. + /// A negative value will weigh towards midround rulesets, and a positive + /// value will weight towards roundstart ones. + var/roundstart_split_curve_centre = 1 + + /// A number between 0.5 and 4. + /// Equivalent to threat_curve_width, but for the budget split. + /// Higher value will favour more variance in splits and + /// lower value rounds closer to the average. + var/roundstart_split_curve_width = 1.8 + + /// The minimum amount of time for antag random events to be hijacked. + var/random_event_hijack_minimum = 10 MINUTES + + /// The maximum amount of time for antag random events to be hijacked. + var/random_event_hijack_maximum = 18 MINUTES + + /// A list of recorded "snapshots" of the round, stored in the dynamic.json log + var/list/datum/dynamic_snapshot/snapshots + + /// The time when the last midround injection was attempted, whether or not it was successful + var/last_midround_injection_attempt = 0 + + /// The amount to inject when a round event is hijacked + var/hijacked_random_event_injection_chance = 50 + + /// Whether or not a random event has been hijacked this midround cycle + var/random_event_hijacked = HIJACKED_NOTHING + + /// The timer ID for the cancellable midround rule injection + var/midround_injection_timer_id + + /// The last drafted midround rulesets (without the current one included). + /// Used for choosing different midround injections. + var/list/current_midround_rulesets /datum/game_mode/dynamic/admin_panel() var/list/dat = list("
Game Mode Panel
") - dat += "Dynamic Mode \[VV\]\[Refresh\]" + dat += "Dynamic Mode \[VV\] \[Refresh\]
" dat += "Threat Level: [threat_level]
" + dat += "Budgets (Roundstart/Midrounds): [initial_round_start_budget]/[threat_level - initial_round_start_budget]
" - dat += "Threat to Spend: [threat] \[Adjust\] \[View Log\]
" + dat += "Midround budget to spend: [mid_round_budget] \[Adjust\] \[View Log\]
" dat += "
" - dat += "Parameters: centre = [GLOB.dynamic_curve_centre] ; width = [GLOB.dynamic_curve_width].
" + dat += "Parameters: centre = [threat_curve_centre] ; width = [threat_curve_width].
" + dat += "Split parameters: centre = [roundstart_split_curve_centre] ; width = [roundstart_split_curve_width].
" dat += "On average, [peaceful_percentage]% of the rounds are more peaceful.
" dat += "Forced extended: [GLOB.dynamic_forced_extended ? "On" : "Off"]
" - dat += "Classic secret (only autotraitor): [GLOB.dynamic_classic_secret ? "On" : "Off"]
" dat += "No stacking (only one round-ender): [GLOB.dynamic_no_stacking ? "On" : "Off"]
" dat += "Stacking limit: [GLOB.dynamic_stacking_limit] \[Adjust\]" dat += "
" @@ -129,7 +178,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) dat += "[DR.ruletype] - [DR.name]
" else dat += "none.
" - dat += "
Injection Timers: ([get_injection_chance(TRUE)]% chance)
" + dat += "
Injection Timers: ([get_injection_chance(dry_run = TRUE)]% latejoin chance, [get_midround_injection_chance(dry_run = TRUE)]% midround chance)
" dat += "Latejoin: [(latejoin_injection_cooldown-world.time)>60*10 ? "[round((latejoin_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(latejoin_injection_cooldown-world.time)] seconds"] \[Now!\]
" dat += "Midround: [(midround_injection_cooldown-world.time)>60*10 ? "[round((midround_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(midround_injection_cooldown-world.time)] seconds"] \[Now!\]
" usr << browse(dat.Join(), "window=gamemode_panel;size=500x500") @@ -143,18 +192,21 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) return if (href_list["forced_extended"]) GLOB.dynamic_forced_extended = !GLOB.dynamic_forced_extended + message_admins("[key_name(usr)] toggled dynamic's Forced Extended setting to [GLOB.dynamic_forced_extended].") else if (href_list["no_stacking"]) GLOB.dynamic_no_stacking = !GLOB.dynamic_no_stacking - else if (href_list["classic_secret"]) - GLOB.dynamic_classic_secret = !GLOB.dynamic_classic_secret + message_admins("[key_name(usr)] toggled dynamic's No Stacking setting to [GLOB.dynamic_no_stacking].") else if (href_list["adjustthreat"]) var/threatadd = input("Specify how much threat to add (negative to subtract). This can inflate the threat level.", "Adjust Threat", 0) as null|num if(!threatadd) return if(threatadd > 0) create_threat(threatadd) + threat_log += "[worldtime2text()]: [key_name(usr)] increased threat by [threatadd] threat." else - spend_threat(-threatadd) + spend_midround_budget(-threatadd) + threat_log += "[worldtime2text()]: [key_name(usr)] decreased threat by [-threatadd] threat." + message_admins("[key_name(usr)] adjusted the dynamic threat level by [threatadd] threat.") else if (href_list["injectlate"]) latejoin_injection_cooldown = 0 forced_injection = TRUE @@ -167,26 +219,48 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) show_threatlog(usr) else if (href_list["stacking_limit"]) GLOB.dynamic_stacking_limit = input(usr,"Change the threat limit at which round-endings rulesets will start to stack.", "Change stacking limit", null) as num - + message_admins("[key_name(usr)] adjusted dynamic's Stacking Limit setting to [GLOB.dynamic_stacking_limit].") + else if(href_list["force_latejoin_rule"]) + var/added_rule = input(usr,"What ruleset do you want to force upon the next latejoiner? This will bypass threat level and population restrictions.", "Rigging Latejoin", null) as null|anything in sortList(latejoin_rules) + if (!added_rule) + return + forced_latejoin_rule = added_rule + dynamic_log("[key_name(usr)] set [added_rule] to proc on the next latejoin.") + else if(href_list["clear_forced_latejoin"]) + forced_latejoin_rule = null + dynamic_log("[key_name(usr)] cleared the forced latejoin ruleset.") + else if(href_list["force_midround_rule"]) + var/added_rule = input(usr,"What ruleset do you want to force right now? This will bypass threat level and population restrictions.", "Execute Ruleset", null) as null|anything in sortList(midround_rules) + if (!added_rule) + return + dynamic_log("[key_name(usr)] executed the [added_rule] ruleset.") + picking_specific_rule(added_rule, TRUE) + else if(href_list["cancelmidround"]) + admin_cancel_midround(usr, href_list["cancelmidround"]) + return + else if (href_list["differentmidround"]) + admin_different_midround(usr, href_list["differentmidround"]) + return + admin_panel() // Refreshes the window -// Checks if there are HIGHLANDER_RULESETs and calls the rule's round_result() proc +// Checks if there are HIGH_IMPACT_RULESETs and calls the rule's round_result() proc /datum/game_mode/dynamic/set_round_result() + // If it got to this part, just pick one high impact ruleset if it exists for(var/datum/dynamic_ruleset/rule in executed_rules) - if(rule.flags & HIGHLANDER_RULESET) - if(rule.check_finished()) // Only the rule that actually finished the round sets round result. - return rule.round_result() - // If it got to this part, just pick one highlander if it exists - for(var/datum/dynamic_ruleset/rule in executed_rules) - if(rule.flags & HIGHLANDER_RULESET) + if(rule.flags & HIGH_IMPACT_RULESET) return rule.round_result() return ..() /datum/game_mode/dynamic/send_intercept() . = "Central Command Status Summary
" - switch(round(threat_level)) + var/shown_threat + if(prob(FAKE_REPORT_CHANCE)) + shown_threat = rand(1, 100) + else + shown_threat = clamp(threat_level + rand(REPORT_NEG_DIVERGENCE, REPORT_POS_DIVERGENCE), 0, 100) + switch(round(shown_threat)) if(0 to 19) - update_playercounts() if(!current_players[CURRENT_LIVING_ANTAGS].len) . += "Peaceful Waypoint
" . += "Your station orbits deep within controlled, core-sector systems and serves as a waypoint for routine traffic through Nanotrasen's trade empire. Due to the combination of high security, interstellar traffic, and low strategic value, it makes any direct threat of violence unlikely. Your primary enemies will be incompetence and bored crewmen: try to organize team-building events to keep staffers interested and productive." @@ -210,14 +284,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) . += "Your station is somehow in the middle of hostile territory, in clear view of any enemy of the corporation. Your likelihood to survive is low, and station destruction is expected and almost inevitable. Secure any sensitive material and neutralize any enemy you will come across. It is important that you at least try to maintain the station.
" . += "Good luck." - if(station_goals.len) - . += "
Special Orders for [station_name()]:" - for(var/datum/station_goal/G in station_goals) - G.on_report() - . += G.get_report() + . += generate_station_goal_report() print_command_report(., "Central Command Status Summary", announce=FALSE) - priority_announce("A summary has been copied and printed to all communications consoles.", "Security level elevated.", 'sound/ai/intercept.ogg') + priority_announce("A summary has been copied and printed to all communications consoles.", "Security level elevated.", ANNOUNCER_INTERCEPT) if(GLOB.security_level < SEC_LEVEL_BLUE) set_security_level(SEC_LEVEL_BLUE) @@ -233,9 +303,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) return TRUE if(force_ending) return TRUE - for(var/datum/dynamic_ruleset/rule in executed_rules) - if(rule.flags & HIGHLANDER_RULESET) - return rule.check_finished() /datum/game_mode/dynamic/proc/show_threatlog(mob/admin) if(!SSticker.HasRoundStarted()) @@ -251,86 +318,111 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) if(istext(entry)) out += "[entry]
" - out += "Remaining threat/threat_level: [threat]/[threat_level]" + out += "Remaining threat/threat_level: [mid_round_budget]/[threat_level]" usr << browse(out.Join(), "window=threatlog;size=700x500") /// Generates the threat level using lorentz distribution and assigns peaceful_percentage. /datum/game_mode/dynamic/proc/generate_threat() - var/relative_threat = LORENTZ_DISTRIBUTION(GLOB.dynamic_curve_centre, GLOB.dynamic_curve_width) - threat_level = round(lorentz_to_threat(relative_threat), 0.1) + var/relative_threat = LORENTZ_DISTRIBUTION(threat_curve_centre, threat_curve_width) + threat_level = round(lorentz_to_amount(relative_threat), 0.1) - peaceful_percentage = round(LORENTZ_CUMULATIVE_DISTRIBUTION(relative_threat, GLOB.dynamic_curve_centre, GLOB.dynamic_curve_width), 0.01)*100 + peaceful_percentage = round(LORENTZ_CUMULATIVE_DISTRIBUTION(relative_threat, threat_curve_centre, threat_curve_width), 0.01)*100 - threat = threat_level +/// Generates the midround and roundstart budgets +/datum/game_mode/dynamic/proc/generate_budgets() + var/relative_round_start_budget_scale = LORENTZ_DISTRIBUTION(roundstart_split_curve_centre, roundstart_split_curve_width) + round_start_budget = round((lorentz_to_amount(relative_round_start_budget_scale) / 100) * threat_level, 0.1) + initial_round_start_budget = round_start_budget + mid_round_budget = threat_level - round_start_budget /datum/game_mode/dynamic/can_start() - message_admins("Dynamic mode parameters for the round:") - message_admins("Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].") - message_admins("Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].") + return TRUE + +/datum/game_mode/dynamic/proc/setup_parameters() log_game("DYNAMIC: Dynamic mode parameters for the round:") - log_game("DYNAMIC: Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].") - log_game("DYNAMIC: Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].") + log_game("DYNAMIC: Centre is [threat_curve_centre], Width is [threat_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].") + log_game("DYNAMIC: Stacking limit is [GLOB.dynamic_stacking_limit].") if(GLOB.dynamic_forced_threat_level >= 0) threat_level = round(GLOB.dynamic_forced_threat_level, 0.1) - threat = threat_level else generate_threat() + generate_budgets() + set_cooldowns() + dynamic_log("Dynamic Mode initialized with a Threat Level of... [threat_level]! ([round_start_budget] round start budget)") + return TRUE - var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_latejoin_delay_max + GLOB.dynamic_latejoin_delay_min) - latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_latejoin_delay_min, GLOB.dynamic_latejoin_delay_max)) + world.time +/datum/game_mode/dynamic/proc/set_cooldowns() + var/latejoin_injection_cooldown_middle = 0.5*(latejoin_delay_max + latejoin_delay_min) + latejoin_injection_cooldown = round(clamp(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), latejoin_delay_min, latejoin_delay_max)) + world.time - var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_midround_delay_max + GLOB.dynamic_midround_delay_min) - midround_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_midround_delay_min, GLOB.dynamic_midround_delay_max)) + world.time - message_admins("Dynamic Mode initialized with a Threat Level of... [threat_level]!") - log_game("DYNAMIC: Dynamic Mode initialized with a Threat Level of... [threat_level]!") - return TRUE + var/midround_injection_cooldown_middle = 0.5*(midround_delay_max + midround_delay_min) + midround_injection_cooldown = round(clamp(EXP_DISTRIBUTION(midround_injection_cooldown_middle), midround_delay_min, midround_delay_max)) + world.time /datum/game_mode/dynamic/pre_setup() + if(CONFIG_GET(flag/dynamic_config_enabled)) + var/json_file = file("config/dynamic.json") + if(fexists(json_file)) + configuration = json_decode(file2text(json_file)) + if(configuration["Dynamic"]) + for(var/variable in configuration["Dynamic"]) + if(!vars[variable]) + stack_trace("Invalid dynamic configuration variable [variable] in game mode variable changes.") + continue + vars[variable] = configuration["Dynamic"][variable] + + setup_parameters() + setup_hijacking() + + var/valid_roundstart_ruleset = 0 for (var/rule in subtypesof(/datum/dynamic_ruleset)) var/datum/dynamic_ruleset/ruleset = new rule() // Simple check if the ruleset should be added to the lists. if(ruleset.name == "") continue + configure_ruleset(ruleset) switch(ruleset.ruletype) if("Roundstart") roundstart_rules += ruleset + if(ruleset.weight) + valid_roundstart_ruleset++ if ("Latejoin") latejoin_rules += ruleset if ("Midround") - if (ruleset.weight) - midround_rules += ruleset - for(var/mob/dead/new_player/player in GLOB.player_list) + midround_rules += ruleset + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/player = i if(player.ready == PLAYER_READY_TO_PLAY && player.mind) roundstart_pop_ready++ candidates.Add(player) log_game("DYNAMIC: Listing [roundstart_rules.len] round start rulesets, and [candidates.len] players ready.") if (candidates.len <= 0) + log_game("DYNAMIC: [candidates.len] candidates.") return TRUE - if (roundstart_rules.len <= 0) - return TRUE - + if(GLOB.dynamic_forced_roundstart_ruleset.len > 0) rigged_roundstart() - else + else if(valid_roundstart_ruleset < 1) + log_game("DYNAMIC: [valid_roundstart_ruleset] enabled roundstart rulesets.") + return TRUE + else roundstart() + dynamic_log("[round_start_budget] round start budget was left, donating it to midrounds.") + threat_log += "[worldtime2text()]: [round_start_budget] round start budget was left, donating it to midrounds." + mid_round_budget += round_start_budget + var/starting_rulesets = "" for (var/datum/dynamic_ruleset/roundstart/DR in executed_rules) starting_rulesets += "[DR.name], " + log_game("DYNAMIC: Picked the following roundstart rules: [starting_rulesets]") candidates.Cut() return TRUE /datum/game_mode/dynamic/post_setup(report) - update_playercounts() - for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules) rule.candidates.Cut() // The rule should not use candidates at this point as they all are null. - if(rule.delay > 0) - addtimer(CALLBACK(rule, /datum/dynamic_ruleset/roundstart.proc/execute), rule.delay) - else - if(!rule.execute()) - stack_trace("The starting rule \"[rule.name]\" failed to execute.") + addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay) ..() /// A simple roundstart proc used when dynamic_forced_roundstart_ruleset has rules in it. @@ -338,14 +430,21 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) message_admins("[GLOB.dynamic_forced_roundstart_ruleset.len] rulesets being forced. Will now attempt to draft players for them.") log_game("DYNAMIC: [GLOB.dynamic_forced_roundstart_ruleset.len] rulesets being forced. Will now attempt to draft players for them.") for (var/datum/dynamic_ruleset/roundstart/rule in GLOB.dynamic_forced_roundstart_ruleset) + configure_ruleset(rule) message_admins("Drafting players for forced ruleset [rule.name].") log_game("DYNAMIC: Drafting players for forced ruleset [rule.name].") rule.mode = src + rule.acceptable(roundstart_pop_ready, threat_level) // Assigns some vars in the modes, running it here for consistency rule.candidates = candidates.Copy() rule.trim_candidates() - rule.pop_per_requirement = rule.pop_per_requirement > 0 ? rule.pop_per_requirement : (src.pop_per_requirement > 0 ? src.pop_per_requirement : 6) //i hate myself for this - if (rule.ready(TRUE)) - picking_roundstart_rule(list(rule), forced = TRUE) + if (rule.ready(roundstart_pop_ready, TRUE)) + var/cost = rule.cost + var/scaled_times = 0 + if (rule.scaling_cost) + scaled_times = round(max(round_start_budget - cost, 0) / rule.scaling_cost) + cost += rule.scaling_cost * scaled_times + + spend_roundstart_budget(picking_roundstart_rule(rule, scaled_times, forced = TRUE)) /datum/game_mode/dynamic/proc/roundstart() if (GLOB.dynamic_forced_extended) @@ -353,150 +452,85 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) return TRUE var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/roundstart/rule in roundstart_rules) - if (rule.acceptable(roundstart_pop_ready, threat_level) && threat >= rule.cost) // If we got the population and threat required + if (!rule.weight) + continue + if (rule.acceptable(roundstart_pop_ready, threat_level) && round_start_budget >= rule.cost) // If we got the population and threat required rule.candidates = candidates.Copy() rule.trim_candidates() - if (rule.ready() && rule.candidates.len > 0) + if (rule.ready(roundstart_pop_ready) && rule.candidates.len > 0) drafted_rules[rule] = rule.weight - var/indice_pop = min(10,round(roundstart_pop_ready/pop_per_requirement)+1) - var/extra_rulesets_amount = 0 - if (GLOB.dynamic_classic_secret) - extra_rulesets_amount = 0 - else - if (roundstart_pop_ready > GLOB.dynamic_high_pop_limit) - message_admins("High Population Override is in effect! Threat Level will have more impact on which roles will appear, and player population less.") - log_game("DYNAMIC: High Population Override is in effect! Threat Level will have more impact on which roles will appear, and player population less.") - if (threat_level > high_pop_second_rule_req) - extra_rulesets_amount++ - if (threat_level > high_pop_third_rule_req) - extra_rulesets_amount++ - else - if (threat_level >= second_rule_req[indice_pop]) - extra_rulesets_amount++ - if (threat_level >= third_rule_req[indice_pop]) - extra_rulesets_amount++ - - if (drafted_rules.len > 0 && picking_roundstart_rule(drafted_rules)) - if (extra_rulesets_amount > 0) // We've got enough population and threat for a second rulestart rule - for (var/datum/dynamic_ruleset/roundstart/rule in drafted_rules) - if (rule.cost > threat) - drafted_rules -= rule - if (drafted_rules.len > 0 && picking_roundstart_rule(drafted_rules)) - if (extra_rulesets_amount > 1) // We've got enough population and threat for a third rulestart rule - for (var/datum/dynamic_ruleset/roundstart/rule in drafted_rules) - if (rule.cost > threat) - drafted_rules -= rule - picking_roundstart_rule(drafted_rules) - else - return FALSE - return TRUE + var/list/rulesets_picked = list() -/// Picks a random roundstart rule from the list given as an argument and executes it. -/datum/game_mode/dynamic/proc/picking_roundstart_rule(list/drafted_rules = list(), forced = FALSE) - var/datum/dynamic_ruleset/roundstart/starting_rule = pickweight(drafted_rules) - if(!starting_rule) - return FALSE + // Kept in case a ruleset can't be initialized for whatever reason, we want to be able to only spend what we can use. + var/round_start_budget_left = round_start_budget - if(!forced) - if(only_ruleset_executed) - return FALSE - // Check if a blocking ruleset has been executed. - else if(check_blocking(starting_rule.blocking_rules, executed_rules)) - drafted_rules -= starting_rule - if(drafted_rules.len <= 0) - return FALSE - starting_rule = pickweight(drafted_rules) - // Check if the ruleset is highlander and if a highlander ruleset has been executed - else if(starting_rule.flags & HIGHLANDER_RULESET) - if(threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) - if(highlander_executed) - drafted_rules -= starting_rule - if(drafted_rules.len <= 0) - return FALSE - starting_rule = pickweight(drafted_rules) - // With low pop and high threat there might be rulesets that get executed with no valid candidates. - else if(starting_rule.ready()) - drafted_rules -= starting_rule - if(drafted_rules.len <= 0) - return FALSE - starting_rule = pickweight(drafted_rules) - - message_admins("Picking a ruleset [starting_rule.name]") - log_game("DYNAMIC: Picking a ruleset [starting_rule.name]") - - roundstart_rules -= starting_rule - drafted_rules -= starting_rule - - starting_rule.trim_candidates() - if (starting_rule.pre_execute()) - spend_threat(starting_rule.cost) - threat_log += "[worldtime2text()]: Roundstart [starting_rule.name] spent [starting_rule.cost]" - if(starting_rule.flags & HIGHLANDER_RULESET) - highlander_executed = TRUE - else if(starting_rule.flags & ONLY_RULESET) - only_ruleset_executed = TRUE - executed_rules += starting_rule - if (starting_rule.persistent) - current_rules += starting_rule - for (var/datum/dynamic_ruleset/roundstart/rule in drafted_rules) - if (!rule.ready()) - drafted_rules -= rule // And removing rules that are no longer elligible - return TRUE - else - stack_trace("The starting rule \"[starting_rule.name]\" failed to pre_execute.") - return FALSE + while (round_start_budget_left > 0) + var/datum/dynamic_ruleset/roundstart/ruleset = pickweightAllowZero(drafted_rules) + if (isnull(ruleset)) + log_game("DYNAMIC: No more rules can be applied, stopping with [round_start_budget] left.") + break -/// Picks a random midround OR latejoin rule from the list given as an argument and executes it. -/// Also this could be named better. -/datum/game_mode/dynamic/proc/picking_midround_latejoin_rule(list/drafted_rules = list(), forced = FALSE) - var/datum/dynamic_ruleset/rule = pickweight(drafted_rules) - if(!rule) - return FALSE - - if(!forced) - if(only_ruleset_executed) - return FALSE - // Check if a blocking ruleset has been executed. - else if(check_blocking(rule.blocking_rules, executed_rules)) - drafted_rules -= rule - if(drafted_rules.len <= 0) - return FALSE - rule = pickweight(drafted_rules) - // Check if the ruleset is highlander and if a highlander ruleset has been executed - else if(rule.flags & HIGHLANDER_RULESET) - if(threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) - if(highlander_executed) - drafted_rules -= rule - if(drafted_rules.len <= 0) - return FALSE - rule = pickweight(drafted_rules) - - if(!rule.repeatable) - if(rule.ruletype == "Latejoin") - latejoin_rules = remove_from_list(latejoin_rules, rule.type) - else if(rule.type == "Midround") - midround_rules = remove_from_list(midround_rules, rule.type) - - if (rule.execute()) - log_game("DYNAMIC: Injected a [rule.ruletype == "latejoin" ? "latejoin" : "midround"] ruleset [rule.name].") - spend_threat(rule.cost) - threat_log += "[worldtime2text()]: [rule.ruletype] [rule.name] spent [rule.cost]" - if(rule.flags & HIGHLANDER_RULESET) - highlander_executed = TRUE - else if(rule.flags & ONLY_RULESET) + var/cost = (ruleset in rulesets_picked) ? ruleset.scaling_cost : ruleset.cost + if (cost == 0) + stack_trace("[ruleset] cost 0, this is going to result in an infinite loop.") + drafted_rules[ruleset] = null + continue + + if (cost > round_start_budget_left) + drafted_rules[ruleset] = null + continue + + if (check_blocking(ruleset.blocking_rules, rulesets_picked)) + drafted_rules[ruleset] = null + continue + + round_start_budget_left -= cost + + rulesets_picked[ruleset] += 1 + + if (ruleset.flags & HIGH_IMPACT_RULESET) + for (var/_other_ruleset in drafted_rules) + var/datum/dynamic_ruleset/other_ruleset = _other_ruleset + if (other_ruleset.flags & HIGH_IMPACT_RULESET) + drafted_rules[other_ruleset] = null + + if (ruleset.flags & LONE_RULESET) + drafted_rules[ruleset] = null + + for (var/ruleset in rulesets_picked) + spend_roundstart_budget(picking_roundstart_rule(ruleset, rulesets_picked[ruleset] - 1)) + +/// Initializes the round start ruleset provided to it. Returns how much threat to spend. +/datum/game_mode/dynamic/proc/picking_roundstart_rule(datum/dynamic_ruleset/roundstart/ruleset, scaled_times = 0, forced = FALSE) + log_game("DYNAMIC: Picked a ruleset: [ruleset.name], scaled [scaled_times] times") + + ruleset.trim_candidates() + var/added_threat = ruleset.scale_up(roundstart_pop_ready, scaled_times) + + if(ruleset.pre_execute(roundstart_pop_ready)) + threat_log += "[worldtime2text()]: Roundstart [ruleset.name] spent [ruleset.cost + added_threat]. [ruleset.scaling_cost ? "Scaled up [ruleset.scaled_times]/[scaled_times] times." : ""]" + if(ruleset.flags & ONLY_RULESET) only_ruleset_executed = TRUE - if(rule.ruletype == "Latejoin") - var/mob/M = pick(rule.candidates) - message_admins("[key_name(M)] joined the station, and was selected by the [rule.name] ruleset.") - log_game("DYNAMIC: [key_name(M)] joined the station, and was selected by the [rule.name] ruleset.") - executed_rules += rule - rule.candidates.Cut() - if (rule.persistent) + if(ruleset.flags & HIGH_IMPACT_RULESET) + high_impact_ruleset_executed = TRUE + executed_rules += ruleset + return ruleset.cost + added_threat + else + stack_trace("The starting rule \"[ruleset.name]\" failed to pre_execute.") + return 0 + +/// Mainly here to facilitate delayed rulesets. All roundstart rulesets are executed with a timered callback to this proc. +/datum/game_mode/dynamic/proc/execute_roundstart_rule(sent_rule) + var/datum/dynamic_ruleset/rule = sent_rule + if(rule.execute()) + if(rule.persistent) current_rules += rule + new_snapshot(rule) return TRUE - else - stack_trace("The [rule.ruletype] rule \"[rule.name]\" failed to execute.") + rule.clean_up() // Refund threat, delete teams and so on. + executed_rules -= rule + stack_trace("The starting rule \"[rule.name]\" failed to execute.") return FALSE /// An experimental proc to allow admins to call rules on the fly or have rules call other rules. @@ -504,35 +538,37 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) var/datum/dynamic_ruleset/midround/new_rule if(ispath(ruletype)) new_rule = new ruletype() // You should only use it to call midround rules though. + configure_ruleset(new_rule) else if(istype(ruletype, /datum/dynamic_ruleset)) new_rule = ruletype else return FALSE - + if(!new_rule) return FALSE - + if(!forced) if(only_ruleset_executed) return FALSE // Check if a blocking ruleset has been executed. else if(check_blocking(new_rule.blocking_rules, executed_rules)) return FALSE - // Check if the ruleset is highlander and if a highlander ruleset has been executed - else if(new_rule.flags & HIGHLANDER_RULESET) - if(threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) - if(highlander_executed) + // Check if the ruleset is high impact and if a high impact ruleset has been executed + else if(new_rule.flags & HIGH_IMPACT_RULESET) + if(threat_level < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) + if(high_impact_ruleset_executed) return FALSE - - update_playercounts() - if ((forced || (new_rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && new_rule.cost <= threat))) + + var/population = current_players[CURRENT_LIVING_PLAYERS].len + if((new_rule.acceptable(population, threat_level) && new_rule.cost <= mid_round_budget) || forced) new_rule.trim_candidates() if (new_rule.ready(forced)) - spend_threat(new_rule.cost) + spend_midround_budget(new_rule.cost) threat_log += "[worldtime2text()]: Forced rule [new_rule.name] spent [new_rule.cost]" + new_rule.pre_execute(population) if (new_rule.execute()) // This should never fail since ready() returned 1 - if(new_rule.flags & HIGHLANDER_RULESET) - highlander_executed = TRUE + if(new_rule.flags & HIGH_IMPACT_RULESET) + high_impact_ruleset_executed = TRUE else if(new_rule.flags & ONLY_RULESET) only_ruleset_executed = TRUE log_game("DYNAMIC: Making a call to a specific ruleset...[new_rule.name]!") @@ -545,10 +581,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) return FALSE /datum/game_mode/dynamic/process() - if (pop_last_updated < world.time - (60 SECONDS)) - pop_last_updated = world.time - update_playercounts() - for (var/datum/dynamic_ruleset/rule in current_rules) if(rule.rule_process() == RULESET_STOP_PROCESSING) // If rule_process() returns 1 (RULESET_STOP_PROCESSING), stop processing. current_rules -= rule @@ -556,63 +588,54 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) if (midround_injection_cooldown < world.time) if (GLOB.dynamic_forced_extended) return - + // Somehow it managed to trigger midround multiple times so this was moved here. // There is no way this should be able to trigger an injection twice now. - var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_midround_delay_max + GLOB.dynamic_midround_delay_min) - midround_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_midround_delay_min, GLOB.dynamic_midround_delay_max)) + world.time) - + var/midround_injection_cooldown_middle = 0.5*(midround_delay_max + midround_delay_min) + midround_injection_cooldown = (round(clamp(EXP_DISTRIBUTION(midround_injection_cooldown_middle), midround_delay_min, midround_delay_max)) + world.time) + // Time to inject some threat into the round if(EMERGENCY_ESCAPED_OR_ENDGAMED) // Unless the shuttle is gone return - message_admins("DYNAMIC: Checking for midround injection.") - log_game("DYNAMIC: Checking for midround injection.") - - update_playercounts() - if (get_injection_chance()) + dynamic_log("Checking for midround injection.") + + last_midround_injection_attempt = world.time + + if (prob(get_midround_injection_chance())) var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/midround/rule in midround_rules) - if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost) - // Classic secret : only autotraitor/minor roles - if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + if (!rule.weight) + continue + if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && mid_round_budget >= rule.cost) + // If admins have disabled dynamic from picking from the ghost pool + if(rule.ruletype == "Latejoin" && !(GLOB.ghost_role_flags & GHOSTROLE_MIDROUND_EVENT)) + continue + // If admins have disabled dynamic from picking from the ghost pool + if(rule.ruletype == "Latejoin" && !(GLOB.ghost_role_flags & GHOSTROLE_MIDROUND_EVENT)) continue rule.trim_candidates() if (rule.ready()) drafted_rules[rule] = rule.get_weight() if (drafted_rules.len > 0) - picking_midround_latejoin_rule(drafted_rules) - -/// Updates current_players. -/datum/game_mode/dynamic/proc/update_playercounts() - current_players[CURRENT_LIVING_PLAYERS] = list() - current_players[CURRENT_LIVING_ANTAGS] = list() - current_players[CURRENT_DEAD_PLAYERS] = list() - current_players[CURRENT_OBSERVERS] = list() - for (var/mob/M in GLOB.player_list) - if (istype(M, /mob/dead/new_player)) - continue - if (M.stat != DEAD) - current_players[CURRENT_LIVING_PLAYERS].Add(M) - if (M.mind && (M.mind.special_role || M.mind.antag_datums?.len > 0)) - current_players[CURRENT_LIVING_ANTAGS].Add(M) - else - if (istype(M,/mob/dead/observer)) - var/mob/dead/observer/O = M - if (O.started_as_observer) // Observers - current_players[CURRENT_OBSERVERS].Add(M) - continue - current_players[CURRENT_DEAD_PLAYERS].Add(M) // Players who actually died (and admins who ghosted, would be nice to avoid counting them somehow) + pick_midround_rule(drafted_rules) + else if (random_event_hijacked == HIJACKED_TOO_SOON) + log_game("DYNAMIC: Midround injection failed when random event was hijacked. Spawning another random event in its place.") + + // A random event antag would have rolled had this injection check passed. + // As a refund, spawn a non-ghost-role random event. + SSevents.spawnEvent() + SSevents.reschedule() + + random_event_hijacked = HIJACKED_NOTHING -/// Gets the chance for latejoin and midround injection, the dry_run argument is only used for forced injection. +/// Gets the chance for latejoin injection, the dry_run argument is only used for forced injection. /datum/game_mode/dynamic/proc/get_injection_chance(dry_run = FALSE) if(forced_injection) - forced_injection = !dry_run + forced_injection = dry_run return 100 var/chance = 0 - // If the high pop override is in effect, we reduce the impact of population on the antag injection chance - var/high_pop_factor = (current_players[CURRENT_LIVING_PLAYERS].len >= GLOB.dynamic_high_pop_limit) - var/max_pop_per_antag = max(5,15 - round(threat_level/10) - round(current_players[CURRENT_LIVING_PLAYERS].len/(high_pop_factor ? 10 : 5))) + var/max_pop_per_antag = max(5,15 - round(threat_level/10) - round(current_players[CURRENT_LIVING_PLAYERS].len/5)) if (!current_players[CURRENT_LIVING_ANTAGS].len) chance += 50 // No antags at all? let's boost those odds! else @@ -623,12 +646,22 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) chance += 25-10*(max_pop_per_antag-current_pop_per_antag) if (current_players[CURRENT_DEAD_PLAYERS].len > current_players[CURRENT_LIVING_PLAYERS].len) chance -= 30 // More than half the crew died? ew, let's calm down on antags - if (threat > 70) - chance += 15 - if (threat < 30) - chance -= 15 + if (mid_round_budget > higher_injection_chance_minimum_threat) + chance += higher_injection_chance + if (mid_round_budget < lower_injection_chance_minimum_threat) + chance -= lower_injection_chance return round(max(0,chance)) +/// Gets the chance for midround injection, the dry_run argument is only used for forced injection. +/// Usually defers to the latejoin injection chance. +/datum/game_mode/dynamic/proc/get_midround_injection_chance(dry_run) + var/chance = get_injection_chance(dry_run) + + if (random_event_hijacked != HIJACKED_NOTHING) + chance += hijacked_random_event_injection_chance + + return chance + /// Removes type from the list /datum/game_mode/dynamic/proc/remove_from_list(list/type_list, type) for(var/I in type_list) @@ -640,7 +673,8 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) /datum/game_mode/dynamic/proc/check_blocking(list/blocking_list, list/rule_list) if(blocking_list.len > 0) for(var/blocking in blocking_list) - for(var/datum/executed in rule_list) + for(var/_executed in rule_list) + var/datum/executed = _executed if(blocking == executed.type) return TRUE return FALSE @@ -660,53 +694,72 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) if(EMERGENCY_ESCAPED_OR_ENDGAMED) // No more rules after the shuttle has left return - update_playercounts() - if (forced_latejoin_rule) forced_latejoin_rule.candidates = list(newPlayer) forced_latejoin_rule.trim_candidates() log_game("DYNAMIC: Forcing ruleset [forced_latejoin_rule]") if (forced_latejoin_rule.ready(TRUE)) - picking_midround_latejoin_rule(list(forced_latejoin_rule), forced = TRUE) + if (!forced_latejoin_rule.repeatable) + latejoin_rules = remove_from_list(latejoin_rules, forced_latejoin_rule.type) + addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_midround_latejoin_rule, forced_latejoin_rule), forced_latejoin_rule.delay) forced_latejoin_rule = null else if (latejoin_injection_cooldown < world.time && prob(get_injection_chance())) var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/latejoin/rule in latejoin_rules) - if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost) - // Classic secret : only autotraitor/minor roles - if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) - continue - // No stacking : only one round-enter, unless > stacking_limit threat. - if (threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) - if(rule.flags & HIGHLANDER_RULESET && highlander_executed) + if (!rule.weight) + continue + if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && mid_round_budget >= rule.cost) + // No stacking : only one round-ender, unless threat level > stacking_limit. + if (threat_level < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) + if(rule.flags & HIGH_IMPACT_RULESET && high_impact_ruleset_executed) continue - + rule.candidates = list(newPlayer) rule.trim_candidates() if (rule.ready()) drafted_rules[rule] = rule.get_weight() - if (drafted_rules.len > 0 && picking_midround_latejoin_rule(drafted_rules)) - var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_latejoin_delay_max + GLOB.dynamic_latejoin_delay_min) - latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_latejoin_delay_min, GLOB.dynamic_latejoin_delay_max)) + world.time + if (drafted_rules.len > 0 && pick_latejoin_rule(drafted_rules)) + var/latejoin_injection_cooldown_middle = 0.5*(latejoin_delay_max + latejoin_delay_min) + latejoin_injection_cooldown = round(clamp(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), latejoin_delay_min, latejoin_delay_max)) + world.time + +/// Apply configurations to rule. +/datum/game_mode/dynamic/proc/configure_ruleset(datum/dynamic_ruleset/ruleset) + var/rule_conf = LAZYACCESSASSOC(configuration, ruleset.ruletype, ruleset.name) + for(var/variable in rule_conf) + if(!(variable in ruleset.vars)) + stack_trace("Invalid dynamic configuration variable [variable] in [ruleset.ruletype] [ruleset.name].") + continue + ruleset.vars[variable] = rule_conf[variable] + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + ruleset.restricted_roles |= ruleset.protected_roles + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) + ruleset.restricted_roles |= "Assistant" + if(CONFIG_GET(flag/protect_heads_from_antagonist)) + ruleset.restricted_roles |= GLOB.command_positions /// Refund threat, but no more than threat_level. /datum/game_mode/dynamic/proc/refund_threat(regain) - threat = min(threat_level,threat+regain) + mid_round_budget = min(threat_level, mid_round_budget + regain) /// Generate threat and increase the threat_level if it goes beyond, capped at 100 /datum/game_mode/dynamic/proc/create_threat(gain) - threat = min(100, threat+gain) - if(threat > threat_level) - threat_level = threat + mid_round_budget = min(100, mid_round_budget + gain) + if(mid_round_budget > threat_level) + threat_level = mid_round_budget -/// Expend threat, can't fall under 0. -/datum/game_mode/dynamic/proc/spend_threat(cost) - threat = max(threat-cost,0) +/// Expend round start threat, can't fall under 0. +/datum/game_mode/dynamic/proc/spend_roundstart_budget(cost) + round_start_budget = max(round_start_budget - cost,0) -/// Turns the value generated by lorentz distribution to threat value between 0 and 100. -/datum/game_mode/dynamic/proc/lorentz_to_threat(x) +/// Expend midround threat, can't fall under 0. +/datum/game_mode/dynamic/proc/spend_midround_budget(cost) + mid_round_budget = max(mid_round_budget - cost,0) + +/// Turns the value generated by lorentz distribution to number between 0 and 100. +/// Used for threat level and splitting the budgets. +/datum/game_mode/dynamic/proc/lorentz_to_amount(x) switch (x) if (-INFINITY to -20) return rand(0, 10) @@ -728,3 +781,12 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) return RULE_OF_THREE(40, 20, x) + 50 if (20 to INFINITY) return rand(90, 100) + +/// Log to messages and to the game +/datum/game_mode/dynamic/proc/dynamic_log(text) + message_admins("DYNAMIC: [text]") + log_game("DYNAMIC: [text]") + +#undef FAKE_REPORT_CHANCE +#undef REPORT_NEG_DIVERGENCE +#undef REPORT_POS_DIVERGENCE diff --git a/code/game/gamemodes/dynamic/dynamic_hijacking.dm b/code/game/gamemodes/dynamic/dynamic_hijacking.dm new file mode 100644 index 0000000000000..b2812babc9b84 --- /dev/null +++ b/code/game/gamemodes/dynamic/dynamic_hijacking.dm @@ -0,0 +1,28 @@ +/datum/game_mode/dynamic/proc/setup_hijacking() + RegisterSignal(SSdcs, COMSIG_GLOB_PRE_RANDOM_EVENT, .proc/on_pre_random_event) + +/datum/game_mode/dynamic/proc/on_pre_random_event(datum/source, datum/round_event_control/round_event_control) + SIGNAL_HANDLER + + if (!round_event_control.dynamic_should_hijack) + return + + if (random_event_hijacked != HIJACKED_NOTHING) + dynamic_log("Random event [round_event_control.name] tried to roll, but Dynamic vetoed it (random event has already ran).") + SSevents.spawnEvent() + SSevents.reschedule() + return CANCEL_PRE_RANDOM_EVENT + + var/time_range = rand(random_event_hijack_minimum, random_event_hijack_maximum) + + if (world.time - last_midround_injection_attempt < time_range) + random_event_hijacked = HIJACKED_TOO_RECENT + dynamic_log("Random event [round_event_control.name] tried to roll, but the last midround injection \ + was too recent. Injection chance has been raised to [get_midround_injection_chance(dry_run = TRUE)]%.") + return CANCEL_PRE_RANDOM_EVENT + + if (midround_injection_cooldown - world.time < time_range) + random_event_hijacked = HIJACKED_TOO_SOON + dynamic_log("Random event [round_event_control.name] tried to roll, but the next midround injection \ + is too soon. Injection chance has been raised to [get_midround_injection_chance(dry_run = TRUE)]%.") + return CANCEL_PRE_RANDOM_EVENT diff --git a/code/game/gamemodes/dynamic/dynamic_logging.dm b/code/game/gamemodes/dynamic/dynamic_logging.dm new file mode 100644 index 0000000000000..08eb1330550d2 --- /dev/null +++ b/code/game/gamemodes/dynamic/dynamic_logging.dm @@ -0,0 +1,97 @@ +/// A "snapshot" of dynamic at an important point in time. +/// Exported to JSON in the dynamic.json log file. +/datum/dynamic_snapshot + /// The remaining midround threat + var/remaining_threat + + /// The world.time when the snapshot was taken + var/time + + /// The total number of players in the server + var/total_players + + /// The number of alive players + var/alive_players + + /// The number of dead players + var/dead_players + + /// The number of observers + var/observers + + /// The number of alive antags + var/alive_antags + + /// The rulesets chosen this snapshot + var/datum/dynamic_snapshot_ruleset/ruleset_chosen + + /// The cached serialization of this snapshot + var/serialization + +/// A ruleset chosen during a snapshot +/datum/dynamic_snapshot_ruleset + /// The name of the ruleset chosen + var/name + + /// If it is a round start ruleset, how much it was scaled by + var/scaled + + /// The number of assigned antags + var/assigned + +/datum/dynamic_snapshot_ruleset/New(datum/dynamic_ruleset/ruleset) + name = ruleset.name + assigned = ruleset.assigned.len + + if (istype(ruleset, /datum/dynamic_ruleset/roundstart)) + scaled = ruleset.scaled_times + +/// Convert the snapshot to an associative list +/datum/dynamic_snapshot/proc/to_list() + if (!isnull(serialization)) + return serialization + + serialization = list( + "remaining_threat" = remaining_threat, + "time" = time, + "total_players" = total_players, + "alive_players" = alive_players, + "dead_players" = dead_players, + "observers" = observers, + "alive_antags" = alive_antags, + "ruleset_chosen" = list( + "name" = ruleset_chosen.name, + "scaled" = ruleset_chosen.scaled, + "assigned" = ruleset_chosen.assigned, + ), + ) + + return serialization + +/// Creates a new snapshot with the given rulesets chosen, and writes to the JSON output. +/datum/game_mode/dynamic/proc/new_snapshot(datum/dynamic_ruleset/ruleset_chosen) + var/datum/dynamic_snapshot/new_snapshot = new + + new_snapshot.remaining_threat = mid_round_budget + new_snapshot.time = world.time + new_snapshot.alive_players = current_players[CURRENT_LIVING_PLAYERS].len + new_snapshot.dead_players = current_players[CURRENT_DEAD_PLAYERS].len + new_snapshot.observers = current_players[CURRENT_OBSERVERS].len + new_snapshot.total_players = new_snapshot.alive_players + new_snapshot.dead_players + new_snapshot.observers + new_snapshot.alive_antags = current_players[CURRENT_LIVING_ANTAGS].len + new_snapshot.ruleset_chosen = new /datum/dynamic_snapshot_ruleset(ruleset_chosen) + + LAZYADD(snapshots, new_snapshot) + + var/list/serialized = list() + serialized["threat_level"] = threat_level + serialized["round_start_budget"] = initial_round_start_budget + serialized["mid_round_budget"] = threat_level - initial_round_start_budget + + var/list/serialized_snapshots = list() + for (var/_snapshot in snapshots) + var/datum/dynamic_snapshot/snapshot = _snapshot + serialized_snapshots += list(snapshot.to_list()) + serialized["snapshots"] = serialized_snapshots + + rustg_file_write(json_encode(serialized), "[GLOB.log_directory]/dynamic.json") diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm index 92c5bfb8116d9..48523457569e3 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm @@ -1,3 +1,6 @@ +#define REVOLUTION_VICTORY 1 +#define STATION_VICTORY 2 + /datum/dynamic_ruleset /// For admin logging and round end screen. var/name = "" @@ -31,21 +34,23 @@ var/required_enemies = list(1,1,0,0,0,0,0,0,0,0) /// The rule needs this many candidates (post-trimming) to be executed (example: Cult needs 4 players at round start) var/required_candidates = 0 - /// 1 -> 9, probability for this rule to be picked against other rules + /// 0 -> 9, probability for this rule to be picked against other rules. If zero this will effectively disable the rule. var/weight = 5 /// Threat cost for this rule, this is decreased from the mode's threat when the rule is executed. var/cost = 0 - /// A flag that determines how the ruleset is handled - /// HIGHLANDER_RULESET are rulesets can end the round. - /// TRAITOR_RULESET and MINOR_RULESET can't end the round and have no difference right now. - var/flags = 0 + /// Cost per level the rule scales up. + var/scaling_cost = 0 + /// How many times a rule has scaled up upon getting picked. + var/scaled_times = 0 + /// Used for the roundend report + var/total_cost = 0 + /// A flag that determines how the ruleset is handled. Check __DEFINES/dynamic.dm for an explanation of the accepted values. + var/flags = NONE /// Pop range per requirement. If zero defaults to mode's pop_per_requirement. var/pop_per_requirement = 0 /// Requirements are the threat level requirements per pop range. /// With the default values, The rule will never get drafted below 10 threat level (aka: "peaceful extended"), and it requires a higher threat level at lower pops. var/list/requirements = list(40,30,20,10,10,10,10,10,10,10) - /// An alternative, static requirement used instead when pop is over mode's high_pop_limit. - var/high_population_requirement = 10 /// Reference to the mode, use this instead of SSticker.mode. var/datum/game_mode/dynamic/mode = null /// If a role is to be considered another for the purpose of banning. @@ -57,28 +62,32 @@ /// The maximum amount of players required for the rule to be considered. /// Anything below zero or exactly zero is ignored. var/maximum_players = 0 + /// Calculated during acceptable(), used in scaling and team sizes. + var/indice_pop = 0 + /// Base probability used in scaling. The higher it is, the more likely to scale. Kept as a var to allow for config editing._SendSignal(sigtype, list/arguments) + var/base_prob = 60 + /// Delay for when execute will get called from the time of post_setup (roundstart) or process (midround/latejoin). + /// Make sure your ruleset works with execute being called during the game when using this, and that the clean_up proc reverts it properly in case of faliure. + var/delay = 0 + + /// Judges the amount of antagonists to apply, for both solo and teams. + /// Note that some antagonists (such as traitors, lings, heretics, etc) will add more based on how many times they've been scaled. + /// Written as a linear equation--ceil(x/denominator) + offset, or as a fixed constant. + /// If written as a linear equation, will be in the form of `list("denominator" = denominator, "offset" = offset). + var/antag_cap = 0 /datum/dynamic_ruleset/New() ..() - if(CONFIG_GET(flag/protect_roles_from_antagonist)) - restricted_roles += protected_roles - if(CONFIG_GET(flag/protect_assistant_from_antagonist)) - restricted_roles += "Assistant" - if(CONFIG_GET(flag/protect_heads_from_antagonist)) - restricted_roles += GLOB.command_positions if (istype(SSticker.mode, /datum/game_mode/dynamic)) mode = SSticker.mode - else if (GLOB.master_mode != "dynamic") // This is here to make roundstart forced ruleset function. + else if (!SSticker.is_mode("dynamic")) // This is here to make roundstart forced ruleset function. qdel(src) /datum/dynamic_ruleset/roundstart // One or more of those drafted at roundstart ruletype = "Roundstart" - /// Delay for when execute will get called from the time of post_setup. - /// Make sure your ruleset works with execute being called during the game when using this. - var/delay = 0 // Can be drafted when a player joins the server /datum/dynamic_ruleset/latejoin @@ -87,17 +96,41 @@ /// By default, a rule is acceptable if it satisfies the threat level/population requirements. /// If your rule has extra checks, such as counting security officers, do that in ready() instead /datum/dynamic_ruleset/proc/acceptable(population = 0, threat_level = 0) - pop_per_requirement = pop_per_requirement > 0 ? pop_per_requirement : (mode.pop_per_requirement > 0 ? mode.pop_per_requirement : 6) //sorry ike - if(minimum_players > population) return FALSE if(maximum_players > 0 && population > maximum_players) return FALSE - if (population >= GLOB.dynamic_high_pop_limit) - return (threat_level >= high_population_requirement) - else - var/indice_pop = min(10,round(population/pop_per_requirement)+1) //fuck - return (threat_level >= requirements[indice_pop]) + + pop_per_requirement = pop_per_requirement > 0 ? pop_per_requirement : mode.pop_per_requirement + indice_pop = min(requirements.len,round(population/pop_per_requirement)+1) + return (threat_level >= requirements[indice_pop]) + +/// When picking rulesets, if dynamic picks the same one multiple times, it will "scale up". +/// However, doing this blindly would result in lowpop rounds (think under 10 people) where over 80% of the crew is antags! +/// This function is here to ensure the antag ratio is kept under control while scaling up. +/// Returns how much threat to actually spend in the end. +/datum/dynamic_ruleset/proc/scale_up(population, max_scale) + if (!scaling_cost) + return 0 + + var/antag_fraction = 0 + for(var/_ruleset in (mode.executed_rules + list(src))) // we care about the antags we *will* assign, too + var/datum/dynamic_ruleset/ruleset = _ruleset + antag_fraction += ((1 + ruleset.scaled_times) * ruleset.get_antag_cap(population)) / mode.roundstart_pop_ready + + for(var/i in 1 to max_scale) + if(antag_fraction < 0.25) + scaled_times += 1 + antag_fraction += get_antag_cap(population) / mode.roundstart_pop_ready // we added new antags, gotta update the % + + return scaled_times * scaling_cost + +/// Returns what the antag cap with the given population is. +/datum/dynamic_ruleset/proc/get_antag_cap(population) + if (isnum(antag_cap)) + return antag_cap + + return CEILING(population / antag_cap["denominator"], 1) + (antag_cap["offset"] || 0) /// This is called if persistent variable is true everytime SSTicker ticks. /datum/dynamic_ruleset/proc/rule_process() @@ -124,6 +157,12 @@ return FALSE return TRUE +/// Runs from gamemode process() if ruleset fails to start, like delayed rulesets not getting valid candidates. +/// This one only handles refunding the threat, override in ruleset to clean up the rest. +/datum/dynamic_ruleset/proc/clean_up() + mode.refund_threat(cost + (scaled_times * scaling_cost)) + mode.threat_log += "[worldtime2text()]: [ruletype] [name] refunded [cost + (scaled_times * scaling_cost)]. Failed to execute." + /// Gets weight of the ruleset /// Note that this decreases weight if repeatable is TRUE and repeatable_weight_decrease is higher than 0 /// Note: If you don't want repeatable rulesets to decrease their weight use the weight variable directly @@ -141,14 +180,9 @@ return /// Set mode result and news report here. -/// Only called if ruleset is flagged as HIGHLANDER_RULESET +/// Only called if ruleset is flagged as HIGH_IMPACT_RULESET /datum/dynamic_ruleset/proc/round_result() -/// Checks if round is finished, return true to end the round. -/// Only called if ruleset is flagged as HIGHLANDER_RULESET -/datum/dynamic_ruleset/proc/check_finished() - return FALSE - ////////////////////////////////////////////// // // // ROUNDSTART RULESETS // @@ -158,25 +192,24 @@ /// Checks if candidates are connected and if they are banned or don't want to be the antagonist. /datum/dynamic_ruleset/roundstart/trim_candidates() for(var/mob/dead/new_player/P in candidates) - if (!P.client || !P.mind) // Are they connected? + var/client/client = GET_CLIENT(P) + if (!client || !P.mind) // Are they connected? candidates.Remove(P) - continue - if(!mode.check_age(P.client, minimum_required_age)) + else if(!mode.check_age(client, minimum_required_age)) candidates.Remove(P) continue if(P.mind.special_role) // We really don't want to give antag to an antag. candidates.Remove(P) - continue - if(antag_flag_override) - if(!(antag_flag_override in P.client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag_override, ROLE_SYNDICATE))) + else if(antag_flag_override) + if(!(antag_flag_override in client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag_override, ROLE_SYNDICATE))) candidates.Remove(P) continue else - if(!(antag_flag in P.client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag, ROLE_SYNDICATE))) + if(!(antag_flag in client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag, ROLE_SYNDICATE))) candidates.Remove(P) continue /// Do your checks if the ruleset is ready to be executed here. /// Should ignore certain checks if forced is TRUE -/datum/dynamic_ruleset/roundstart/ready(forced = FALSE) +/datum/dynamic_ruleset/roundstart/ready(population, forced = FALSE) return ..() diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index ff2ede2c9ecc3..08d236e9dfac4 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -16,7 +16,7 @@ if(!(antag_flag_override in P.client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag_override, ROLE_SYNDICATE))) candidates.Remove(P) continue - else + else if(!(antag_flag in P.client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag, ROLE_SYNDICATE))) candidates.Remove(P) continue @@ -59,15 +59,13 @@ name = "Syndicate Infiltrator" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_TRAITOR - protected_roles = list("Security Officer", "Warden", "Head of Personnel", "Detective", "Head of Security", "Captain") + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") restricted_roles = list("AI","Cyborg") required_candidates = 1 weight = 7 cost = 5 requirements = list(40,30,20,10,10,10,10,10,10,10) - high_population_requirement = 10 repeatable = TRUE - flags = TRAITOR_RULESET ////////////////////////////////////////////// // // @@ -77,6 +75,7 @@ /datum/dynamic_ruleset/latejoin/provocateur name = "Provocateur" + persistent = TRUE antag_datum = /datum/antagonist/rev/head antag_flag = ROLE_REV_HEAD antag_flag_override = ROLE_REV @@ -85,34 +84,65 @@ required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 2 + delay = 1 MINUTES // Prevents rule start while head is offstation. cost = 20 requirements = list(101,101,70,40,30,20,20,20,20,20) - high_population_requirement = 50 - flags = HIGHLANDER_RULESET - var/required_heads = 3 + flags = HIGH_IMPACT_RULESET + blocking_rules = list(/datum/dynamic_ruleset/roundstart/revs) + var/required_heads_of_staff = 3 + var/finished = FALSE + /// How much threat should be injected when the revolution wins? + var/revs_win_threat_injection = 20 + var/datum/team/revolution/revolution /datum/dynamic_ruleset/latejoin/provocateur/ready(forced=FALSE) if (forced) - required_heads = 1 + required_heads_of_staff = 1 if(!..()) return FALSE var/head_check = 0 for(var/mob/player in mode.current_players[CURRENT_LIVING_PLAYERS]) if (player.mind.assigned_role in GLOB.command_positions) head_check++ - return (head_check >= required_heads) + return (head_check >= required_heads_of_staff) /datum/dynamic_ruleset/latejoin/provocateur/execute() - var/mob/M = pick(candidates) - assigned += M.mind - M.mind.special_role = antag_flag - var/datum/antagonist/rev/head/new_head = new() - new_head.give_flash = TRUE - new_head.give_hud = TRUE - new_head.remove_clumsy = TRUE - new_head = M.mind.add_antag_datum(new_head) - new_head.rev_team.max_headrevs = 1 // Only one revhead if it is latejoin. - return TRUE + var/mob/M = pick(candidates) // This should contain a single player, but in case. + if(check_eligible(M.mind)) // Didnt die/run off z-level/get implanted since leaving shuttle. + assigned += M.mind + M.mind.special_role = antag_flag + revolution = new() + var/datum/antagonist/rev/head/new_head = new() + new_head.give_flash = TRUE + new_head.give_hud = TRUE + new_head.remove_clumsy = TRUE + new_head = M.mind.add_antag_datum(new_head, revolution) + revolution.update_objectives() + revolution.update_heads() + SSshuttle.registerHostileEnvironment(revolution) + return TRUE + else + log_game("DYNAMIC: [ruletype] [name] discarded [M.name] from head revolutionary due to ineligibility.") + log_game("DYNAMIC: [ruletype] [name] failed to get any eligible headrevs. Refunding [cost] threat.") + return FALSE + +/datum/dynamic_ruleset/latejoin/provocateur/rule_process() + var/winner = revolution.process_victory(revs_win_threat_injection) + if (isnull(winner)) + return + + finished = winner + return RULESET_STOP_PROCESSING + +/// Checks for revhead loss conditions and other antag datums. +/datum/dynamic_ruleset/latejoin/provocateur/proc/check_eligible(var/datum/mind/M) + var/turf/T = get_turf(M.current) + if(!considered_afk(M) && considered_alive(M) && is_station_level(T.z) && !M.antag_datums?.len && !HAS_TRAIT(M, TRAIT_MINDSHIELD)) + return TRUE + return FALSE + +/datum/dynamic_ruleset/latejoin/provocateur/round_result() + revolution.round_result(finished) ////////////////////////////////////////////// // // @@ -124,7 +154,7 @@ name = "Heretic Smuggler" antag_datum = /datum/antagonist/heretic antag_flag = ROLE_HERETIC - protected_roles = list("Security Officer", "Warden", "Head of Personnel", "Detective", "Head of Security", "Captain","Prisoner") + protected_roles = list("Security Officer", "Warden", "Head of Personnel", "Detective", "Head of Security", "Captain") restricted_roles = list("AI","Cyborg") required_candidates = 1 weight = 4 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index be421f3b88c4b..7f746c6e3bd91 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -8,7 +8,7 @@ ruletype = "Midround" /// If the ruleset should be restricted from ghost roles. var/restrict_ghost_roles = TRUE - /// What mob type the ruleset is restricted to. + /// What mob type the ruleset is restricted to. var/required_type = /mob/living/carbon/human var/list/living_players = list() var/list/living_antags = list() @@ -41,17 +41,17 @@ continue if(antag_flag_override) if(!(antag_flag_override in M.client.prefs.be_special) || is_banned_from(M.ckey, list(antag_flag_override, ROLE_SYNDICATE))) - candidates.Remove(M) + trimmed_list.Remove(M) continue else if(!(antag_flag in M.client.prefs.be_special) || is_banned_from(M.ckey, list(antag_flag, ROLE_SYNDICATE))) - candidates.Remove(M) + trimmed_list.Remove(M) continue if (M.mind) if (restrict_ghost_roles && (M.mind.assigned_role in GLOB.exp_specialmap[EXP_TYPE_SPECIAL])) // Are they playing a ghost role? trimmed_list.Remove(M) continue - if (M.mind.assigned_role in restricted_roles || HAS_TRAIT(M, TRAIT_MINDSHIELD)) // Does their job allow it or are they mindshielded? + if (M.mind.assigned_role in restricted_roles) // Does their job allow it? trimmed_list.Remove(M) continue if ((exclusive_roles.len > 0) && !(M.mind.assigned_role in exclusive_roles)) // Is the rule exclusive to their job? @@ -68,9 +68,9 @@ if (!forced) var/job_check = 0 if (enemy_roles.len > 0) - for (var/mob/M in living_players) - if (M.stat == DEAD) - continue // Dead players cannot count as opponents + for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS]) + if (M.stat == DEAD || !M.client) + continue // Dead/disconnected players cannot count as opponents if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles))) job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it @@ -97,13 +97,11 @@ message_admins("Polling [possible_volunteers.len] players to apply for the [name] ruleset.") log_game("DYNAMIC: Polling [possible_volunteers.len] players to apply for the [name] ruleset.") - candidates = pollGhostCandidates("The mode is looking for volunteers to become [antag_flag] for [name]", antag_flag, SSticker.mode, antag_flag, poll_time = 300) - + candidates = pollGhostCandidates("The mode is looking for volunteers to become [antag_flag] for [name]", antag_flag, SSticker.mode, antag_flag_override ? antag_flag_override : antag_flag, poll_time = 300) + if(!candidates || candidates.len <= 0) message_admins("The ruleset [name] received no applications.") log_game("DYNAMIC: The ruleset [name] received no applications.") - mode.refund_threat(cost) - mode.threat_log += "[worldtime2text()]: Rule [name] refunded [cost] (no applications)" mode.executed_rules -= src return @@ -118,15 +116,13 @@ if(candidates.len <= 0) if(i == 1) // We have found no candidates so far and we are out of applicants. - mode.refund_threat(cost) - mode.threat_log += "[worldtime2text()]: Rule [name] refunded [cost] (all applications invalid)" mode.executed_rules -= src break var/mob/applicant = pick(candidates) candidates -= applicant if(!isobserver(applicant)) if(applicant.stat == DEAD) // Not an observer? If they're dead, make them one. - applicant = applicant.ghostize(FALSE) + applicant = applicant.ghostize(FALSE,SENTIENCE_ERASE) else // Not dead? Disregard them, pick a new applicant i-- continue @@ -168,30 +164,36 @@ name = "Syndicate Sleeper Agent" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_TRAITOR - protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 1 weight = 7 cost = 10 requirements = list(50,40,30,20,10,10,10,10,10,10) repeatable = TRUE - high_population_requirement = 10 - flags = TRAITOR_RULESET /datum/dynamic_ruleset/midround/autotraitor/acceptable(population = 0, threat = 0) var/player_count = mode.current_players[CURRENT_LIVING_PLAYERS].len var/antag_count = mode.current_players[CURRENT_LIVING_ANTAGS].len var/max_traitors = round(player_count / 10) + 1 - if ((antag_count < max_traitors) && prob(mode.threat_level))//adding traitors if the antag population is getting low - return ..() - else + + // adding traitors if the antag population is getting low + var/too_little_antags = antag_count < max_traitors + if (!too_little_antags) + log_game("DYNAMIC: Too many living antags compared to living players ([antag_count] living antags, [player_count] living players, [max_traitors] max traitors)") + return FALSE + + if (!prob(mode.threat_level)) + log_game("DYNAMIC: Random chance to roll autotraitor failed, it was a [mode.threat_level]% chance.") return FALSE + return ..() + /datum/dynamic_ruleset/midround/autotraitor/trim_candidates() ..() for(var/mob/living/player in living_players) if(issilicon(player)) // Your assigned role doesn't change when you are turned into a silicon. - living_players -= player + living_players -= player continue if(is_centcom_level(player.z)) living_players -= player // We don't autotator people in CentCom @@ -223,21 +225,20 @@ name = "Malfunctioning AI" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_MALF - enemy_roles = list("Security Officer", "Warden","Detective","Head of Security", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer") exclusive_roles = list("AI") required_enemies = list(4,4,4,4,4,4,2,2,2,0) required_candidates = 1 weight = 3 - cost = 35 + cost = 20 requirements = list(101,101,80,70,60,60,50,50,40,40) - high_population_requirement = 35 required_type = /mob/living/silicon/ai var/ion_announce = 33 var/removeDontImproveChance = 10 /datum/dynamic_ruleset/midround/malf/trim_candidates() ..() - candidates = candidates[CURRENT_LIVING_PLAYERS] + candidates = living_players for(var/mob/living/player in candidates) if(!isAI(player)) candidates -= player @@ -257,7 +258,7 @@ M.mind.special_role = antag_flag M.mind.add_antag_datum(AI) if(prob(ion_announce)) - priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/ai/ionstorm.ogg') + priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", ANNOUNCER_IONSTORM) if(prob(removeDontImproveChance)) M.replace_random_law(generate_ion_law(), list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION)) else @@ -274,13 +275,12 @@ name = "Wizard" antag_datum = /datum/antagonist/wizard antag_flag = ROLE_WIZARD - enemy_roles = list("Security Officer","Detective","Head of Security", "Captain") + enemy_roles = list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Research Director") //RD doesn't believe in magic required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 1 cost = 20 requirements = list(90,90,70,40,30,20,10,10,10,10) - high_population_requirement = 50 repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/wizard/ready(forced = FALSE) @@ -306,21 +306,20 @@ name = "Nuclear Assault" antag_flag = ROLE_OPERATIVE antag_datum = /datum/antagonist/nukeop - enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden","Detective","Head of Security", "Captain") + enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_enemies = list(3,3,3,3,3,2,1,1,0,0) required_candidates = 5 weight = 5 - cost = 35 + cost = 20 requirements = list(90,90,90,80,60,40,30,20,10,10) - high_population_requirement = 10 - var/operative_cap = list(2,2,3,3,4,5,5,5,5,5) + var/list/operative_cap = list(2,2,3,3,4,5,5,5,5,5) var/datum/team/nuclear/nuke_team - flags = HIGHLANDER_RULESET + flags = HIGH_IMPACT_RULESET /datum/dynamic_ruleset/midround/from_ghosts/nuclear/acceptable(population=0, threat=0) if (locate(/datum/dynamic_ruleset/roundstart/nuclear) in mode.executed_rules) return FALSE // Unavailable if nuke ops were already sent at roundstart - var/indice_pop = min(10,round(living_players.len/5)+1) + indice_pop = min(operative_cap.len, round(living_players.len/5)+1) required_candidates = operative_cap[indice_pop] return ..() @@ -349,13 +348,12 @@ name = "Blob" antag_datum = /datum/antagonist/blob antag_flag = ROLE_BLOB - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") + enemy_roles = list("Security Officer", "Detective", "Warden", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 4 cost = 10 requirements = list(101,101,101,80,60,50,30,20,10,10) - high_population_requirement = 50 repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/blob/generate_ruleset_body(mob/applicant) @@ -372,13 +370,12 @@ name = "Alien Infestation" antag_datum = /datum/antagonist/xeno antag_flag = ROLE_ALIEN - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") + enemy_roles = list("Security Officer", "Detective", "Warden", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 3 cost = 10 requirements = list(101,101,101,70,50,40,20,15,10,10) - high_population_requirement = 50 repeatable = TRUE var/list/vents = list() @@ -419,13 +416,12 @@ antag_datum = /datum/antagonist/nightmare antag_flag = "Nightmare" antag_flag_override = ROLE_ALIEN - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") + enemy_roles = list("Security Officer", "Detective", "Warden", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 3 cost = 10 requirements = list(101,101,101,70,50,40,20,15,10,10) - high_population_requirement = 50 repeatable = TRUE var/list/spawn_locs = list() @@ -454,3 +450,41 @@ message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a Nightmare by the midround ruleset.") log_game("DYNAMIC: [key_name(S)] was spawned as a Nightmare by the midround ruleset.") return S + +////////////////////////////////////////////// +// // +// ABDUCTORS (GHOST) // +// // +////////////////////////////////////////////// +#define ABDUCTOR_MAX_TEAMS 4 + +/datum/dynamic_ruleset/midround/from_ghosts/abductors + name = "Abductors" + antag_flag = "Abductor" + antag_flag_override = ROLE_ABDUCTOR + enemy_roles = list("Security Officer", "Detective", "Warden", "Head of Security", "Captain") + required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_candidates = 2 + weight = 4 + cost = 10 + requirements = list(101,101,101,80,60,50,30,20,10,10) + repeatable = TRUE + var/datum/team/abductor_team/new_team + +/datum/dynamic_ruleset/midround/from_ghosts/abductors/ready(forced = FALSE) + if (required_candidates > (dead_players.len + list_observers.len)) + return FALSE + return ..() + +/datum/dynamic_ruleset/midround/from_ghosts/abductors/finish_setup(mob/new_character, index) + if (index == 1) // Our first guy is the scientist. We also initialize the team here as well since this should only happen once per pair of abductors. + new_team = new + if(new_team.team_number > ABDUCTOR_MAX_TEAMS) + return MAP_ERROR + var/datum/antagonist/abductor/scientist/new_role = new + new_character.mind.add_antag_datum(new_role, new_team) + else // Our second guy is the agent, team is already created, don't need to make another one. + var/datum/antagonist/abductor/agent/new_role = new + new_character.mind.add_antag_datum(new_role, new_team) + +#undef ABDUCTOR_MAX_TEAMS diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index a2f02cad28f45..5c40f2f31b822 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -9,20 +9,23 @@ name = "Traitors" persistent = TRUE antag_flag = ROLE_TRAITOR - antag_datum = /datum/antagonist/traitor/ + antag_datum = /datum/antagonist/traitor minimum_required_age = 0 protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") restricted_roles = list("Cyborg") required_candidates = 1 weight = 5 - cost = 10 + cost = 8 // Avoid raising traitor threat above 10, as it is the default low cost ruleset. + scaling_cost = 9 requirements = list(10,10,10,10,10,10,10,10,10,10) - high_population_requirement = 10 - var/autotraitor_cooldown = 450 // 15 minutes (ticks once per 2 sec) + antag_cap = list("denominator" = 24) + var/autotraitor_cooldown = (15 MINUTES) + COOLDOWN_DECLARE(autotraitor_cooldown_check) -/datum/dynamic_ruleset/roundstart/traitor/pre_execute() - var/traitor_scaling_coeff = 10 - max(0,round(mode.threat_level/10)-5) // Above 50 threat level, coeff goes down by 1 for every 10 levels - var/num_traitors = min(round(mode.candidates.len / traitor_scaling_coeff) + 1, candidates.len) +/datum/dynamic_ruleset/roundstart/traitor/pre_execute(population) + . = ..() + COOLDOWN_START(src, autotraitor_cooldown_check, autotraitor_cooldown) + var/num_traitors = get_antag_cap(population) * (scaled_times + 1) for (var/i = 1 to num_traitors) var/mob/M = pick_n_take(candidates) assigned += M.mind @@ -31,11 +34,8 @@ return TRUE /datum/dynamic_ruleset/roundstart/traitor/rule_process() - if (autotraitor_cooldown > 0) - autotraitor_cooldown-- - else - autotraitor_cooldown = 450 // 15 minutes - message_admins("Checking if we can turn someone into a traitor.") + if (COOLDOWN_FINISHED(src, autotraitor_cooldown_check)) + COOLDOWN_START(src, autotraitor_cooldown_check, autotraitor_cooldown) log_game("DYNAMIC: Checking if we can turn someone into a traitor.") mode.picking_specific_rule(/datum/dynamic_ruleset/midround/autotraitor) @@ -53,19 +53,16 @@ restricted_roles = list("Cyborg", "AI") required_candidates = 2 weight = 4 - cost = 10 + cost = 15 + scaling_cost = 15 requirements = list(40,30,30,20,20,15,15,15,10,10) - high_population_requirement = 15 + antag_cap = 2 // Can pick 3 per team, but rare enough it doesn't matter. var/list/datum/team/brother_team/pre_brother_teams = list() - var/const/team_amount = 2 // Hard limit on brother teams if scaling is turned off var/const/min_team_size = 2 -/datum/dynamic_ruleset/roundstart/traitorbro/pre_execute() - var/num_teams = team_amount - var/bsc = CONFIG_GET(number/brother_scaling_coeff) - if(bsc) - num_teams = max(1, round(mode.roundstart_pop_ready / bsc)) - +/datum/dynamic_ruleset/roundstart/traitorbro/pre_execute(population) + . = ..() + var/num_teams = (get_antag_cap(population)/min_team_size) * (scaled_times + 1) // 1 team per scaling for(var/j = 1 to num_teams) if(candidates.len < min_team_size || candidates.len < required_candidates) break @@ -104,13 +101,14 @@ restricted_roles = list("AI", "Cyborg") required_candidates = 1 weight = 3 - cost = 30 - requirements = list(80,70,60,50,40,20,20,10,10,10) - high_population_requirement = 10 - var/team_mode_probability = 30 + cost = 16 + scaling_cost = 10 + requirements = list(70,70,60,50,40,20,20,10,10,10) + antag_cap = list("denominator" = 29) -/datum/dynamic_ruleset/roundstart/changeling/pre_execute() - var/num_changelings = min(round(mode.candidates.len / 10) + 1, candidates.len) +/datum/dynamic_ruleset/roundstart/changeling/pre_execute(population) + . = ..() + var/num_changelings = get_antag_cap(population) * (scaled_times + 1) for (var/i = 1 to num_changelings) var/mob/M = pick_n_take(candidates) assigned += M.mind @@ -134,16 +132,19 @@ name = "Heretics" antag_flag = ROLE_HERETIC antag_datum = /datum/antagonist/heretic - protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Brig Physician") + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") restricted_roles = list("AI", "Cyborg") required_candidates = 1 weight = 3 - cost = 20 + cost = 15 + scaling_cost = 9 requirements = list(50,45,45,40,35,20,20,15,10,10) + antag_cap = list("denominator" = 24) -/datum/dynamic_ruleset/roundstart/heretics/pre_execute() + +/datum/dynamic_ruleset/roundstart/heretics/pre_execute(population) . = ..() - var/num_ecult = min(round(mode.candidates.len / 10) + 1, candidates.len) + var/num_ecult = get_antag_cap(population) * (scaled_times + 1) for (var/i = 1 to num_ecult) var/mob/picked_candidate = pick_n_take(candidates) @@ -173,13 +174,13 @@ name = "Wizard" antag_flag = ROLE_WIZARD antag_datum = /datum/antagonist/wizard + flags = LONE_RULESET minimum_required_age = 14 restricted_roles = list("Head of Security", "Captain") // Just to be sure that a wizard getting picked won't ever imply a Captain or HoS not getting drafted required_candidates = 1 weight = 2 - cost = 30 + cost = 20 requirements = list(90,90,70,40,30,20,10,10,10,10) - high_population_requirement = 10 var/list/roundstart_wizards = list() /datum/dynamic_ruleset/roundstart/wizard/acceptable(population=0, threat=0) @@ -192,7 +193,7 @@ /datum/dynamic_ruleset/roundstart/wizard/pre_execute() if(GLOB.wizardstart.len == 0) return FALSE - + mode.antags_rolled += 1 var/mob/M = pick_n_take(candidates) if (M) assigned += M.mind @@ -221,21 +222,19 @@ restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel") required_candidates = 2 weight = 3 - cost = 30 + cost = 20 requirements = list(100,90,80,60,40,30,10,10,10,10) - high_population_requirement = 10 - flags = HIGHLANDER_RULESET - var/cultist_cap = list(2,2,2,3,3,4,4,4,4,4) + flags = HIGH_IMPACT_RULESET + antag_cap = list("denominator" = 20, "offset" = 1) var/datum/team/cult/main_cult -/datum/dynamic_ruleset/roundstart/bloodcult/ready(forced = FALSE) - var/indice_pop = min(10,round(mode.roundstart_pop_ready/pop_per_requirement)+1) - required_candidates = cultist_cap[indice_pop] +/datum/dynamic_ruleset/roundstart/bloodcult/ready(population, forced = FALSE) + required_candidates = get_antag_cap(population) . = ..() -/datum/dynamic_ruleset/roundstart/bloodcult/pre_execute() - var/indice_pop = min(10,round(mode.roundstart_pop_ready/pop_per_requirement)+1) - var/cultists = cultist_cap[indice_pop] +/datum/dynamic_ruleset/roundstart/bloodcult/pre_execute(population) + . = ..() + var/cultists = get_antag_cap(population) for(var/cultists_number = 1 to cultists) if(candidates.len <= 0) break @@ -279,23 +278,20 @@ restricted_roles = list("Head of Security", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted required_candidates = 5 weight = 3 - cost = 40 + cost = 20 requirements = list(90,90,90,80,60,40,30,20,10,10) - high_population_requirement = 10 - flags = HIGHLANDER_RULESET - var/operative_cap = list(2,2,2,3,3,3,4,4,5,5) + flags = HIGH_IMPACT_RULESET + antag_cap = list("denominator" = 18, "offset" = 1) var/datum/team/nuclear/nuke_team -/datum/dynamic_ruleset/roundstart/nuclear/ready(forced = FALSE) - var/indice_pop = min(10,round(mode.roundstart_pop_ready/pop_per_requirement)+1) - required_candidates = operative_cap[indice_pop] +/datum/dynamic_ruleset/roundstart/nuclear/ready(population, forced = FALSE) + required_candidates = get_antag_cap(population) . = ..() -/datum/dynamic_ruleset/roundstart/nuclear/pre_execute() +/datum/dynamic_ruleset/roundstart/nuclear/pre_execute(population) + . = ..() // If ready() did its job, candidates should have 5 or more members in it - - var/indice_pop = min(10,round(mode.roundstart_pop_ready/5)+1) - var/operatives = operative_cap[indice_pop] + var/operatives = get_antag_cap(population) for(var/operatives_number = 1 to operatives) if(candidates.len <= 0) break @@ -366,20 +362,24 @@ minimum_required_age = 14 restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director") required_candidates = 3 - weight = 2 + weight = 3 delay = 7 MINUTES - cost = 35 + cost = 20 requirements = list(101,101,70,40,30,20,10,10,10,10) - high_population_requirement = 10 - flags = HIGHLANDER_RULESET + antag_cap = 3 + flags = HIGH_IMPACT_RULESET + blocking_rules = list(/datum/dynamic_ruleset/latejoin/provocateur) // I give up, just there should be enough heads with 35 players... minimum_players = 35 + /// How much threat should be injected when the revolution wins? + var/revs_win_threat_injection = 20 var/datum/team/revolution/revolution - var/finished = 0 + var/finished = FALSE -/datum/dynamic_ruleset/roundstart/revs/pre_execute() - var/max_canditates = 3 - for(var/i = 1 to max_canditates) +/datum/dynamic_ruleset/roundstart/revs/pre_execute(population) + . = ..() + var/max_candidates = get_antag_cap(population) + for(var/i = 1 to max_candidates) if(candidates.len <= 0) break var/mob/M = pick_n_take(candidates) @@ -391,56 +391,43 @@ /datum/dynamic_ruleset/roundstart/revs/execute() revolution = new() for(var/datum/mind/M in assigned) - var/datum/antagonist/rev/head/new_head = new antag_datum() - new_head.give_flash = TRUE - new_head.give_hud = TRUE - new_head.remove_clumsy = TRUE - M.add_antag_datum(new_head,revolution) - revolution.update_objectives() - revolution.update_heads() - SSshuttle.registerHostileEnvironment(src) - return TRUE + if(check_eligible(M)) + var/datum/antagonist/rev/head/new_head = new antag_datum() + new_head.give_flash = TRUE + new_head.give_hud = TRUE + new_head.remove_clumsy = TRUE + M.add_antag_datum(new_head,revolution) + else + assigned -= M + log_game("DYNAMIC: [ruletype] [name] discarded [M.name] from head revolutionary due to ineligibility.") + if(revolution.members.len) + revolution.update_objectives() + revolution.update_heads() + SSshuttle.registerHostileEnvironment(revolution) + return TRUE + log_game("DYNAMIC: [ruletype] [name] failed to get any eligible headrevs. Refunding [cost] threat.") + return FALSE + +/datum/dynamic_ruleset/roundstart/revs/clean_up() + qdel(revolution) + ..() /datum/dynamic_ruleset/roundstart/revs/rule_process() - if(!revolution) - log_game("DYNAMIC: Something went horrifically wrong with [name] - and the antag datum could not be created. Notify coders.") + var/winner = revolution.process_victory(revs_win_threat_injection) + if (isnull(winner)) return - if(check_rev_victory()) - finished = 1 - else if(check_heads_victory()) - finished = 2 - -/datum/dynamic_ruleset/roundstart/revs/check_finished() - if(CONFIG_GET(keyed_list/continuous)["revolution"]) - if(finished) - SSshuttle.clearHostileEnvironment(src) - return ..() - if(finished != 0) - return TRUE - else - return ..() - -/datum/dynamic_ruleset/roundstart/revs/proc/check_rev_victory() - for(var/datum/objective/mutiny/objective in revolution.objectives) - if(!(objective.check_completion())) - return FALSE - return TRUE + finished = winner + return RULESET_STOP_PROCESSING -/datum/dynamic_ruleset/roundstart/revs/proc/check_heads_victory() - for(var/datum/mind/rev_mind in revolution.head_revolutionaries()) - var/turf/T = get_turf(rev_mind.current) - if(!considered_afk(rev_mind) && considered_alive(rev_mind) && is_station_level(T.z)) - if(ishuman(rev_mind.current) || ismonkey(rev_mind.current)) - return FALSE - return TRUE +/// Checks for revhead loss conditions and other antag datums. +/datum/dynamic_ruleset/roundstart/revs/proc/check_eligible(var/datum/mind/M) + var/turf/T = get_turf(M.current) + if(!considered_afk(M) && considered_alive(M) && is_station_level(T.z) && !M.antag_datums?.len && !HAS_TRAIT(M, TRAIT_MINDSHIELD)) + return TRUE + return FALSE /datum/dynamic_ruleset/roundstart/revs/round_result() - if(finished == 1) - SSticker.mode_result = "win - heads killed" - SSticker.news_report = REVS_WIN - else if(finished == 2) - SSticker.mode_result = "loss - rev heads killed" - SSticker.news_report = REVS_LOSE + revolution.round_result(finished) // Admin only rulesets. The threat requirement is 101 so it is not possible to roll them. @@ -459,12 +446,14 @@ weight = 3 cost = 0 requirements = list(101,101,101,101,101,101,101,101,101,101) - high_population_requirement = 101 + flags = LONE_RULESET /datum/dynamic_ruleset/roundstart/extended/pre_execute() message_admins("Starting a round of extended.") log_game("Starting a round of extended.") - mode.spend_threat(mode.threat) + mode.spend_roundstart_budget(mode.round_start_budget) + mode.spend_midround_budget(mode.mid_round_budget) + mode.threat_log += "[worldtime2text()]: Extended ruleset set threat to 0." return TRUE ////////////////////////////////////////////// @@ -478,7 +467,6 @@ antag_datum = /datum/antagonist/nukeop/clownop antag_leader_datum = /datum/antagonist/nukeop/leader/clownop requirements = list(101,101,101,101,101,101,101,101,101,101) - high_population_requirement = 101 /datum/dynamic_ruleset/roundstart/nuclear/clown_ops/pre_execute() . = ..() @@ -502,22 +490,17 @@ name = "Devil" antag_flag = ROLE_DEVIL antag_datum = /datum/antagonist/devil - restricted_roles = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI", "Cyborg", "Security Officer", "Warden", "Detective", "Brig Physician") + restricted_roles = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI", "Cyborg", "Security Officer", "Warden", "Detective") required_candidates = 1 weight = 3 cost = 0 + flags = LONE_RULESET requirements = list(101,101,101,101,101,101,101,101,101,101) - high_population_requirement = 101 - var/devil_limit = 4 // Hard limit on devils if scaling is turned off - -/datum/dynamic_ruleset/roundstart/devil/pre_execute() - var/tsc = CONFIG_GET(number/traitor_scaling_coeff) - var/num_devils = 1 + antag_cap = list("denominator" = 30) - if(tsc) - num_devils = max(required_candidates, min(round(mode.roundstart_pop_ready / (tsc * 3)) + 2, round(mode.roundstart_pop_ready / (tsc * 1.5)))) - else - num_devils = max(required_candidates, min(mode.roundstart_pop_ready, devil_limit)) +/datum/dynamic_ruleset/roundstart/devil/pre_execute(population) + . = ..() + var/num_devils = get_antag_cap(population) * (scaled_times + 1) for(var/j = 0, j < num_devils, j++) if (!candidates.len) @@ -565,14 +548,15 @@ weight = 3 cost = 0 requirements = list(101,101,101,101,101,101,101,101,101,101) - high_population_requirement = 101 + flags = LONE_RULESET var/players_per_carrier = 30 var/monkeys_to_win = 1 var/escaped_monkeys = 0 var/datum/team/monkey/monkey_team -/datum/dynamic_ruleset/roundstart/monkey/pre_execute() - var/carriers_to_make = max(round(mode.roundstart_pop_ready / players_per_carrier, 1), 1) +/datum/dynamic_ruleset/roundstart/monkey/pre_execute(population) + . = ..() + var/carriers_to_make = get_antag_cap(population) * (scaled_times + 1) for(var/j = 0, j < carriers_to_make, j++) if (!candidates.len) @@ -624,7 +608,7 @@ weight = 3 cost = 0 requirements = list(101,101,101,101,101,101,101,101,101,101) - high_population_requirement = 101 + flags = LONE_RULESET var/meteordelay = 2000 var/nometeors = 0 var/rampupdelta = 5 @@ -645,3 +629,65 @@ var/ramp_up_final = CLAMP(round(meteorminutes/rampupdelta), 1, 10) spawn_meteors(ramp_up_final, wavetype) + +////////////////////////////////////////////// +// // +// CLOCKCULT // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/roundstart/clockcult + name = "Clockwork Cult" + antag_flag = ROLE_SERVANT_OF_RATVAR + antag_datum = /datum/antagonist/servant_of_ratvar + restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective","Head of Security", "Captain", "Chaplain", "Head of Personnel") + required_candidates = 4 + weight = 3 + cost = 35 + requirements = list(100,90,80,70,60,50,30,30,30,30) + flags = HIGH_IMPACT_RULESET + var/datum/team/clock_cult/main_cult + var/list/selected_servants = list() + +/datum/dynamic_ruleset/roundstart/clockcult/pre_execute() + //Load Reebe + LoadReebe() + //Make cultists + var/starter_servants = 4 + var/number_players = mode.roundstart_pop_ready + if(number_players > 30) + number_players -= 30 + starter_servants += round(number_players / 10) + starter_servants = min(starter_servants, 8) + for (var/i in 1 to starter_servants) + var/mob/servant = pick_n_take(candidates) + assigned += servant.mind + servant.mind.assigned_role = ROLE_SERVANT_OF_RATVAR + servant.mind.special_role = ROLE_SERVANT_OF_RATVAR + //Generate scriptures + generate_clockcult_scriptures() + return TRUE + +/datum/dynamic_ruleset/roundstart/clockcult/execute() + var/list/spawns = GLOB.servant_spawns.Copy() + main_cult = new + main_cult.setup_objectives() + //Create team + for(var/datum/mind/servant_mind in assigned) + servant_mind.current.forceMove(pick_n_take(spawns)) + servant_mind.current.set_species(/datum/species/human) + var/datum/antagonist/servant_of_ratvar/S = add_servant_of_ratvar(servant_mind.current, team=main_cult) + S.equip_carbon(servant_mind.current) + S.equip_servant() + S.prefix = CLOCKCULT_PREFIX_MASTER + //Setup the conversion limits for auto opening the ark + calculate_clockcult_values() + return ..() + +/datum/dynamic_ruleset/roundstart/clockcult/round_result() + if(GLOB.ratvar_risen) + SSticker.news_report = CLOCK_SUMMON + SSticker.mode_result = "win - servants completed their objective (summon ratvar)" + else + SSticker.news_report = CULT_FAILURE + SSticker.mode_result = "loss - servants failed their objective (summon ratvar)" diff --git a/code/game/gamemodes/dynamic/dynamic_simulations.dm b/code/game/gamemodes/dynamic/dynamic_simulations.dm new file mode 100644 index 0000000000000..3e312b65700ab --- /dev/null +++ b/code/game/gamemodes/dynamic/dynamic_simulations.dm @@ -0,0 +1,137 @@ +#ifdef TESTING +/datum/dynamic_simulation + var/datum/game_mode/dynamic/gamemode + var/datum/dynamic_simulation_config/config + var/list/mock_candidates = list() + +/datum/dynamic_simulation/proc/initialize_gamemode(forced_threat) + gamemode = new + + if (forced_threat) + gamemode.create_threat(forced_threat) + else + gamemode.generate_threat() + + gamemode.generate_budgets() + gamemode.set_cooldowns() + +/datum/dynamic_simulation/proc/create_candidates(players) + GLOB.new_player_list.Cut() + + for (var/_ in 1 to players) + var/mob/dead/new_player/mock_new_player = new + mock_new_player.ready = PLAYER_READY_TO_PLAY + + var/datum/mind/mock_mind = new + mock_new_player.mind = mock_mind + + var/datum/client_interface/mock_client = new + + var/datum/preferences/prefs = new + var/list/be_special = list() + for (var/special_role in GLOB.special_roles) + be_special += special_role + + prefs.be_special = be_special + mock_client.prefs = prefs + + mock_new_player.mock_client = mock_client + + mock_candidates += mock_new_player + +/datum/dynamic_simulation/proc/simulate(datum/dynamic_simulation_config/config) + src.config = config + + initialize_gamemode(config.forced_threat_level) + create_candidates(config.roundstart_players) + gamemode.pre_setup() + + var/total_antags = 0 + for (var/_ruleset in gamemode.executed_rules) + var/datum/dynamic_ruleset/ruleset = _ruleset + total_antags += ruleset.assigned.len + + return list( + "roundstart_players" = config.roundstart_players, + "threat_level" = gamemode.threat_level, + "snapshot" = list( + "antag_percent" = total_antags / config.roundstart_players, + "remaining_threat" = gamemode.mid_round_budget, + "rulesets" = gamemode.executed_rules.Copy(), + ), + ) + +/datum/dynamic_simulation_config + /// How many players round start should there be? + var/roundstart_players + + /// Optional, force this threat level instead of picking randomly through the lorentz distribution + var/forced_threat_level + +/client/proc/run_dynamic_simulations() + set name = "Run Dynamic Simulations" + set category = "Debug" + + var/simulations = input(usr, "Enter number of simulations") as num + var/roundstart_players = input(usr, "Enter number of round start players") as num + var/forced_threat_level = input(usr, "Enter forced threat level, if you want one") as num | null + + SSticker.mode = config.pick_mode("dynamic") + message_admins("Running dynamic simulations...") + + var/list/outputs = list() + + var/datum/dynamic_simulation_config/dynamic_config = new + + if (roundstart_players) + dynamic_config.roundstart_players = roundstart_players + + if (forced_threat_level) + dynamic_config.forced_threat_level = forced_threat_level + + for (var/count in 1 to simulations) + var/datum/dynamic_simulation/simulator = new + var/output = simulator.simulate(dynamic_config) + outputs += list(output) + + if (CHECK_TICK) + log_world("[count]/[simulations]") + + message_admins("Writing file...") + WRITE_FILE(file("[GLOB.log_directory]/dynamic_simulations.json"), json_encode(outputs)) + message_admins("Writing complete.") + +/proc/export_dynamic_json_of(ruleset_list) + var/list/export = list() + + for (var/_ruleset in ruleset_list) + var/datum/dynamic_ruleset/ruleset = _ruleset + export[ruleset.name] = list( + "repeatable_weight_decrease" = ruleset.repeatable_weight_decrease, + "weight" = ruleset.weight, + "cost" = ruleset.cost, + "scaling_cost" = ruleset.scaling_cost, + "antag_cap" = ruleset.antag_cap, + "pop_per_requirement" = ruleset.pop_per_requirement, + "requirements" = ruleset.requirements, + "base_prob" = ruleset.base_prob, + ) + + return export + +/client/proc/export_dynamic_json() + set name = "Export dynamic.json" + set category = "Debug" + + var/datum/game_mode/dynamic/dynamic = SSticker.mode + + var/list/export = list() + export["Roundstart"] = export_dynamic_json_of(dynamic.roundstart_rules) + export["Midround"] = export_dynamic_json_of(dynamic.midround_rules) + export["Latejoin"] = export_dynamic_json_of(dynamic.latejoin_rules) + + message_admins("Writing file...") + WRITE_FILE(file("[GLOB.log_directory]/dynamic.json"), json_encode(export)) + message_admins("Writing complete.") + +#endif diff --git a/code/game/gamemodes/dynamic/readme.md b/code/game/gamemodes/dynamic/readme.md index 5d979b4001637..778e322fa89a9 100644 --- a/code/game/gamemodes/dynamic/readme.md +++ b/code/game/gamemodes/dynamic/readme.md @@ -5,16 +5,47 @@ Dynamic rolls threat based on a special sauce formula: "dynamic_curve_width \* tan((3.1416 \* (rand() - 0.5) \* 57.2957795)) + dynamic_curve_centre" +This threat is split into two separate budgets--`round_start_budget` and `mid_round_budget`. For example, a round with 50 threat might be split into a 30 roundstart budget, and a 20 midround budget. The roundstart budget is used to apply antagonists applied on readied players when the roundstarts (`/datum/dynamic_ruleset/roundstart`). The midround budget is used for two types of rulesets: +- `/datum/dynamic_ruleset/midround` - Rulesets that apply to either existing alive players, or to ghosts. Think Blob or Space Ninja, which poll ghosts asking if they want to play as these roles. +- `/datum/dynamic_ruleset/latejoin` - Rulesets that apply to the next player that joins. Think Syndicate Infiltrator, which converts a player just joining an existing round into traitor. + +This split is done with a similar method, known as the ["lorentz distribution"](https://en.wikipedia.org/wiki/Cauchy_distribution), exists to create a bell curve that ensures that while most rounds will have a threat level around ~50, chaotic and tame rounds still exist for variety. + +The process of creating these numbers occurs in `/datum/game_mode/dynamic/proc/generate_threat` (for creating the threat level) and `/datum/game_mode/dynamic/proc/generate_budgets` (for splitting the threat level into budgets). + +## Deciding roundstart threats +In `/datum/game_mode/dynamic/proc/roundstart()` (called when no admin chooses the rulesets explicitly), Dynamic uses the available roundstart budget to pick threats. This is done through the following system: + +- All roundstart rulesets (remember, `/datum/dynamic_ruleset/roundstart`) are put into an associative list with their weight as the values (`drafted_rules`). +- Until there is either no roundstart budget left, or until there is no ruleset we can choose from with the available threat, a `pickweight` is done based on the drafted_rules. If the same threat is picked twice, it will "scale up". The meaning of this depends on the ruleset itself, using the `scaled_times` variable; traitors for instance will create more the higher they scale. + - If a ruleset is chosen with the `HIGH_IMPACT_RULESET` in its `flags`, then all other `HIGH_IMPACT_RULESET`s will be removed from `drafted_rules`. This is so that only one can ever be chosen. + - If a ruleset has `LONE_RULESET` in its `flags`, then it will be removed from `drafted_rules`. This is to ensure it will only ever be picked once. An example of this in use is Wizard, to avoid creating multiple wizards. +- After all roundstart threats are chosen, `/datum/dynamic_ruleset/proc/picking_roundstart_rule` is called for each, passing in the ruleset and the number of times it is scaled. + - In this stage, `pre_execute` is called, which is the function that will determine what players get what antagonists. If this function returns FALSE for whatever reason (in the case of an error), then its threat is refunded. + +After this process is done, any leftover roundstart threat will be given to the existing midround budget (done in `/datum/game_mode/dynamic/pre_setup()`). + +## Deciding midround threats + Latejoin and midround injection cooldowns are set using exponential distribution between 5 minutes and 25 for latejoin 15 minutes and 35 for midround this value is then added to world.time and assigned to the injection cooldown variables. -rigged_roundstart() is called instead if there are forced rules (an admin set the mode) +- 5 minutes and 25 for latejoin (configurable as latejoin_delay_min and latejoin_delay_max) +- 15 minutes and 35 for midround (configurable as midround_delay_min and midround_delay_max) + +this value is then added to `world.time` and assigned to the injection cooldown variables. -can_start() -> pre_setup() -> roundstart() OR rigged_roundstart() -> picking_roundstart_rule(drafted_rules) -> post_setup() +[rigged_roundstart][/datum/game_mode/dynamic/proc/rigged_roundstart] is called instead if there are forced rules (an admin set the mode) -## PROCESS +1. [setup_parameters][/datum/game_mode/proc/setup_parameters]\() +2. [pre_setup][/datum/game_mode/proc/pre_setup]\() +3. [roundstart][/datum/game_mode/dynamic/proc/roundstart]\() OR [rigged_roundstart][/datum/game_mode/dynamic/proc/rigged_roundstart]\() +4. [picking_roundstart_rule][/datum/game_mode/dynamic/proc/picking_roundstart_rule]\(drafted_rules) +5. [post_setup][/datum/game_mode/proc/post_setup]\() + +## Rule Processing Calls rule_process on every rule which is in the current_rules list. Every sixty seconds, update_playercounts() @@ -65,3 +96,91 @@ Midround: Instead of building a single list candidates, candidates contains four Midround - Rulesets have additional types /from_ghosts: execute() -> send_applications() -> review_applications() -> finish_setup(mob/newcharacter, index) -> setup_role(role) **NOTE: execute() here adds dead players and observers to candidates list + +## Configuration and variables + +### Configuration +Configuration can be done through a `config/dynamic.json` file. One is provided as example in the codebase. This config file, loaded in `/datum/game_mode/dynamic/pre_setup()`, directly overrides the values in the codebase, and so is perfect for making some rulesets harder/easier to get, turning them off completely, changing how much they cost, etc. + +The format of this file is: +```json +{ + "Dynamic": { + /* Configuration in here will directly override `/datum/game_mode/dynamic` itself. */ + /* Keys are variable names, values are their new values. */ + }, + + "Roundstart": { + /* Configuration in here will apply to `/datum/dynamic_ruleset/roundstart` instances. */ + /* Keys are the ruleset names, values are another associative list with keys being variable names and values being new values. */ + "Wizard": { + /* I, a head admin, have died to wizard, and so I made it cost a lot more threat than it does in the codebase. */ + "cost": 80 + } + }, + + "Midround": { + /* Same as "Roundstart", but for `/datum/dynamic_ruleset/midround` instead. */ + }, + + "Latejoin": { + /* Same as "Roundstart", but for `/datum/dynamic_ruleset/latejoin` instead. */ + } +} +``` + +Note: Comments are not possible in this format, and are just in this document for the sake of readability. + +### Rulesets +Rulesets have the following variables notable to developers and those interested in tuning. + +- `required_candidates` - The number of people that *must be willing* (in their preferences) to be an antagonist with this ruleset. If the candidates do not meet this requirement, then the ruleset will not bother to be drafted. +- `antag_cap` - Judges the amount of antagonists to apply, for both solo and teams. Note that some antagonists (such as traitors, lings, heretics, etc) will add more based on how many times they've been scaled. Written as a linear equation--ceil(x/denominator) + offset, or as a fixed constant. If written as a linear equation, will be in the form of `list("denominator" = denominator, "offset" = offset)`. + - Examples include: + - Traitor: `antag_cap = list("denominator" = 24)`. This means that for every 24 players, 1 traitor will be added (assuming no scaling). + - Nuclear Emergency: `antag_cap = list("denominator" = 18, "offset" = 1)`. For every 18 players, 1 nuke op will be added. Starts at 1, meaning at 30 players, 3 nuke ops will be created, rather than 2. + - Revolution: `antag_cap = 3`. There will always be 3 rev-heads, no matter what. +- `minimum_required_age` - The minimum age in order to apply for the ruleset. +- `weight` - How likely this ruleset is to be picked. A higher weight results in a higher chance of drafting. +- `cost` - The initial cost of the ruleset. This cost is taken from either the roundstart or midround budget, depending on the ruleset. +- `scaling_cost` - Cost for every *additional* application of this ruleset. + - Suppose traitors has a `cost` of 8, and a `scaling_cost` of 5. This means that buying 1 application of the traitor ruleset costs 8 threat, but buying two costs 13 (8 + 5). Buying it a third time is 18 (8 + 5 + 5), etc. +- `pop_per_requirement` - The range of population each value in `requirements` represents. By default, this is 6. + - If the value is five the range is 0-4, 5-9, 10-14, 15-19, 20-24, 25-29, 30-34, 35-39, 40-54, 45+. + - If it is six the range is 0-5, 6-11, 12-17, 18-23, 24-29, 30-35, 36-41, 42-47, 48-53, 54+. + - If it is seven the range is 0-6, 7-13, 14-20, 21-27, 28-34, 35-41, 42-48, 49-55, 56-62, 63+. +- `requirements` - A list that represents, per population range (see: `pop_per_requirement`), how much threat is required to *consider* this ruleset. This is independent of how much it'll actually cost. This uses *threat level*, not the budget--meaning if a round has 50 threat level, but only 10 points of round start threat, a ruleset with a requirement of 40 can still be picked if it can be bought. + - Suppose wizard has a `requirements` of `list(90,90,70,40,30,20,10,10,10,10)`. This means that, at 0-5 and 6-11 players, A station must have 90 threat in order for a wizard to be possible. At 12-17, 70 threat is required instead, etc. +- `restricted_roles` - A list of jobs that *can't* be drafted by this ruleset. For example, cyborgs cannot be changelings, and so are in the `restricted_roles`. +- `protected_roles` - Serves the same purpose of `restricted_roles`, except it can be turned off through configuration (`protect_roles_from_antagonist`). For example, security officers *shouldn't* be made traitor, so they are in Traitor's `protected_roles`. + - When considering putting a role in `protected_roles` or `restricted_roles`, the rule of thumb is if it is *technically infeasible* to support that job in that role. There's no *technical* reason a security officer can't be a traitor, and so they are simply in `protected_roles`. There *are* technical reasons a cyborg can't be a changeling, so they are in `restricted_roles` instead. + +### Dynamic + +The "Dynamic" key has the following configurable values: +- `pop_per_requirement` - The default value of `pop_per_requirement` for any ruleset that does not explicitly set it. Defaults to 6. +- `latejoin_delay_min`, `latejoin_delay_max` - The time range, in deciseconds (take your seconds, and multiply by 10), for a latejoin to attempt rolling. Once this timer is finished, a new one will be created within the same range. + - Suppose you have a `latejoin_delay_min` of 600 (60 seconds, 1 minute) and a `latejoin_delay_max` of 1800 (180 seconds, 3 minutes). Once the round starts, a random number in this range will be picked--let's suppose 1.5 minutes. After 1.5 minutes, Dynamic will decide if a latejoin threat should be created (a probability of `/datum/game_mode/dynamic/proc/get_injection_chance()`). Regardless of its decision, a new timer will be started within the range of 1 to 3 minutes, repeatedly. +- `midround_delay_min`, `midround_delay_max` - Same as `latejoin_delay_min` and `latejoin_delay_max`, except for midround threats instead of latejoin ones. +- `higher_injection_chance`, `higher_injection_chance_minimum_threat` - Manipulates the injection chance (`/datum/game_mode/dynamic/proc/get_injection_chance()`). If the *current midround budget* is above `higher_injection_chance_minimum_threat`, then this chance will be increased by `higher_injection_chance`. + - For example: suppose you have a `higher_injection_chance_minimum_threat` of 70, and a `higher_injection_chance` of 15. This means that, if when a midround threat is trying to roll, there is 75 midround budget left, then the injection chance will go up 15%. +- `lower_injection_chance`, `lower_injection_chance_minimum_threat` - The inverse of the `higher_injection_chance` variables. If the *current midround budget* is *below* `lower_injection_chance`, then the chance is lowered by `lower_injection_chance_minimum_threat`. + - For example: suppose you have a `lower_injection_chance_minimum_threat` of 30, and a `lower_injection_chance` of 15. This means if there is 20 midround budget left, then the chance will lower by 15%. +- `threat_curve_centre` - A number between -5 and +5. A negative value will give a more peaceful round and a positive value will give a round with higher threat. +- `threat_curve_width` - A number between 0.5 and 4. Higher value will favour extreme rounds and lower value rounds closer to the average. +- `roundstart_split_curve_centre` - A number between -5 and +5. Equivalent to threat_curve_centre, but for the budget split. A negative value will weigh towards midround rulesets, and a positive value will weight towards roundstart ones. +- `roundstart_split_curve_width` - A number between 0.5 and 4. Equivalent to threat_curve_width, but for the budget split. Higher value will favour more variance in splits and lower value rounds closer to the average. +- `random_event_hijack_minimum` - The minimum amount of time for antag random events to be hijacked. (See [Random Event Hijacking](#random-event-hijacking)) +- `random_event_hijack_maximum` - The maximum amount of time for antag random events to be hijacked. (See [Random Event Hijacking](#random-event-hijacking)) +- `hijacked_random_event_injection_chance` - The amount of injection chance to give to Dynamic when a random event is hijacked. (See [Random Event Hijacking](#random-event-hijacking)) + +## Random Event "Hijacking" +Random events have the potential to be hijacked by Dynamic to keep the pace of midround injections, while also allowing greenshifts to contain some antagonists. + +`/datum/round_event_control/dynamic_should_hijack` is a variable to random events to allow Dynamic to hijack them, and defaults to FALSE. This is set to TRUE for random events that spawn antagonists. + +In `/datum/game_mode/dynamic/on_pre_random_event` (in `dynamic_hijacking.dm`), Dynamic hooks to random events. If the `dynamic_should_hijack` variable is TRUE, the following sequence of events occurs: + + + +`n` is a random value between `random_event_hijack_minimum` and `random_event_hijack_maximum`. Injection chance, should it need to be raised, is increased by `hijacked_random_event_injection_chance`. diff --git a/code/game/gamemodes/dynamic/ruleset_picking.dm b/code/game/gamemodes/dynamic/ruleset_picking.dm new file mode 100644 index 0000000000000..9221e4a3c1527 --- /dev/null +++ b/code/game/gamemodes/dynamic/ruleset_picking.dm @@ -0,0 +1,118 @@ +#define ADMIN_CANCEL_MIDROUND_TIME (10 SECONDS) + +/// From a list of rulesets, returns one based on weight and availability. +/// Mutates the list that is passed into it to remove invalid rules. +/datum/game_mode/dynamic/proc/pick_ruleset(list/drafted_rules) + if (only_ruleset_executed) + return null + + while (TRUE) + var/datum/dynamic_ruleset/rule = pickweight(drafted_rules) + if (!rule) + return null + + if (check_blocking(rule.blocking_rules, executed_rules)) + drafted_rules -= rule + if(drafted_rules.len <= 0) + return null + continue + else if ( + rule.flags & HIGH_IMPACT_RULESET \ + && threat_level < GLOB.dynamic_stacking_limit \ + && GLOB.dynamic_no_stacking \ + && high_impact_ruleset_executed \ + ) + drafted_rules -= rule + if(drafted_rules.len <= 0) + return null + continue + + return rule + +/// Executes a random midround ruleset from the list of drafted rules. +/datum/game_mode/dynamic/proc/pick_midround_rule(list/drafted_rules) + var/datum/dynamic_ruleset/rule = pick_ruleset(drafted_rules) + if (isnull(rule)) + return + current_midround_rulesets = drafted_rules - rule + + midround_injection_timer_id = addtimer( + CALLBACK(src, .proc/execute_midround_rule, rule), \ + ADMIN_CANCEL_MIDROUND_TIME, \ + TIMER_STOPPABLE, \ + ) + + log_game("DYNAMIC: [rule] ruleset executing...") + message_admins("DYNAMIC: Executing midround ruleset [rule] in [DisplayTimeText(ADMIN_CANCEL_MIDROUND_TIME)]. \ + CANCEL | \ + SOMETHING ELSE") + +/// Fired after admins do not cancel a midround injection. +/datum/game_mode/dynamic/proc/execute_midround_rule(datum/dynamic_ruleset/rule) + current_midround_rulesets = null + midround_injection_timer_id = null + if (!rule.repeatable) + midround_rules = remove_from_list(midround_rules, rule.type) + addtimer(CALLBACK(src, .proc/execute_midround_latejoin_rule, rule), rule.delay) + +/// Executes a random latejoin ruleset from the list of drafted rules. +/datum/game_mode/dynamic/proc/pick_latejoin_rule(list/drafted_rules) + var/datum/dynamic_ruleset/rule = pick_ruleset(drafted_rules) + if (isnull(rule)) + return + if (!rule.repeatable) + latejoin_rules = remove_from_list(latejoin_rules, rule.type) + addtimer(CALLBACK(src, .proc/execute_midround_latejoin_rule, rule), rule.delay) + return TRUE + +/// Mainly here to facilitate delayed rulesets. All midround/latejoin rulesets are executed with a timered callback to this proc. +/datum/game_mode/dynamic/proc/execute_midround_latejoin_rule(sent_rule) + var/datum/dynamic_ruleset/rule = sent_rule + spend_midround_budget(rule.cost) + threat_log += "[worldtime2text()]: [rule.ruletype] [rule.name] spent [rule.cost]" + rule.pre_execute(current_players[CURRENT_LIVING_PLAYERS].len) + if (rule.execute()) + log_game("DYNAMIC: Injected a [rule.ruletype == "latejoin" ? "latejoin" : "midround"] ruleset [rule.name].") + if(rule.flags & HIGH_IMPACT_RULESET) + high_impact_ruleset_executed = TRUE + else if(rule.flags & ONLY_RULESET) + only_ruleset_executed = TRUE + if(rule.ruletype == "Latejoin") + var/mob/M = pick(rule.candidates) + dynamic_log("[key_name(M)] joined the station, and was selected by the [rule.name] ruleset.") + executed_rules += rule + rule.candidates.Cut() + if (rule.persistent) + current_rules += rule + new_snapshot(rule) + return TRUE + rule.clean_up() + stack_trace("The [rule.ruletype] rule \"[rule.name]\" failed to execute.") + return FALSE + +/// Fired when an admin cancels the current midround injection. +/datum/game_mode/dynamic/proc/admin_cancel_midround(mob/user, timer_id) + if (midround_injection_timer_id != timer_id || !deltimer(midround_injection_timer_id)) + to_chat(user, "Too late!") + return + + dynamic_log("[key_name(user)] cancelled the next midround injection.") + midround_injection_timer_id = null + current_midround_rulesets = null + +/// Fired when an admin requests a different midround injection. +/datum/game_mode/dynamic/proc/admin_different_midround(mob/user, timer_id) + if (midround_injection_timer_id != timer_id || !deltimer(midround_injection_timer_id)) + to_chat(user, "Too late!") + return + + midround_injection_timer_id = null + + if (isnull(current_midround_rulesets) || current_midround_rulesets.len == 0) + dynamic_log("[key_name(user)] asked for a different midround injection, but there were none left.") + return + + dynamic_log("[key_name(user)] asked for a different midround injection.") + pick_midround_rule(current_midround_rulesets) + +#undef ADMIN_CANCEL_MIDROUND_TIME diff --git a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm index 02a6b1551d335..40a56623f223d 100644 --- a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm +++ b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm @@ -4,7 +4,7 @@ report_type = "heresy" antag_flag = ROLE_HERETIC false_report_weight = 5 - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Brig Physician") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") restricted_jobs = list("AI", "Cyborg") required_players = 0 required_enemies = 1 @@ -12,6 +12,8 @@ reroll_friendly = 1 enemy_minimum_age = 0 + allowed_special = list(/datum/special_role/traitor/higher_chance) + announce_span = "danger" announce_text = "Heretics have been spotted on the station!\n\ Heretics: Accomplish your objectives.\n\ @@ -65,3 +67,13 @@ /datum/game_mode/heretics/generate_report() return "Cybersun Industries has announced that they have successfully raided a high-security library. The library contained a very dangerous book that was \ shown to posses anomalous properties. We suspect that the book has been copied over, Stay vigilant!" + +/datum/game_mode/heretics/generate_credit_text() + var/list/round_credits = list() + + round_credits += "
The Eldrich Cult:
" + for(var/datum/mind/M in culties) + round_credits += "[M.name] as a heretic
" + + round_credits += ..() + return round_credits diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 8a7181aaa3ddd..4503462051ecd 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -1,5 +1,5 @@ /proc/power_failure() - priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg') + priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", ANNOUNCER_POWEROFF) for(var/obj/machinery/power/smes/S in GLOB.machines) if(istype(get_area(S), /area/ai_monitored/turret_protected) || !is_station_level(S.z)) continue @@ -30,7 +30,7 @@ /proc/power_restore() - priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg') + priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", ANNOUNCER_POWERON) for(var/obj/machinery/power/apc/C in GLOB.machines) if(C.cell && is_station_level(C.z)) C.cell.charge = C.cell.maxcharge @@ -54,7 +54,7 @@ /proc/power_restore_quick() - priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg') + priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", ANNOUNCER_POWERON) for(var/obj/machinery/power/smes/S in GLOB.machines) if(!is_station_level(S.z)) continue diff --git a/code/game/gamemodes/events/event.dm b/code/game/gamemodes/events/event.dm index 5928817791806..4883557d8b6b1 100644 --- a/code/game/gamemodes/events/event.dm +++ b/code/game/gamemodes/events/event.dm @@ -20,7 +20,7 @@ /datum/game_mode/event/send_intercept(report = 0) if(intercept_message) - priority_announce(intercept_message, "Security Report", 'sound/ai/commandreport.ogg') + priority_announce(intercept_message, "Security Report", SSstation.announcer.get_rand_report_sound()) /datum/game_mode/event/generate_station_goals() return diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index 6cebda97575c4..289bb685fa32d 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -32,7 +32,10 @@ station_goals += G G.on_report() -/datum/game_mode/extended/send_intercept(report = 0) - if(secret) - return ..() - priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", 'sound/ai/commandreport.ogg') +/datum/game_mode/extended/announced/send_intercept() + var/greenshift_message = "Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!" + . += "Central Command Status Summary" + . += greenshift_message + + print_command_report(., "Central Command Status Summary", announce = FALSE) + priority_announce(greenshift_message, "Security Report", SSstation.announcer.get_rand_report_sound()) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 7350dbd415390..addfda8d20273 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -23,6 +23,7 @@ var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist var/list/protected_jobs = list() // Jobs that can't be traitors because + var/list/required_jobs = list() // alternative required job groups eg list(list(cap=1),list(hos=1,sec=2)) translates to one captain OR one hos and two secmans var/required_players = 0 var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations var/required_enemies = 0 @@ -53,6 +54,10 @@ var/gamemode_ready = FALSE //Is the gamemode all set up and ready to start checking for ending conditions. var/setup_error //What stopepd setting up the mode. + /// Associative list of current players, in order: living players, living antagonists, dead players and observers. + var/list/list/current_players = list(CURRENT_LIVING_PLAYERS = list(), CURRENT_LIVING_ANTAGS = list(), CURRENT_DEAD_PLAYERS = list(), CURRENT_OBSERVERS = list()) + + /datum/game_mode/proc/announce() //Shows the gamemode's name and a fast description. to_chat(world, "The gamemode is: [name]!") to_chat(world, "[announce_text]") @@ -64,20 +69,22 @@ /datum/game_mode/proc/can_start() var/playerC = 0 for(var/mob/dead/new_player/player in GLOB.player_list) - if((player.client)&&(player.ready == PLAYER_READY_TO_PLAY)) + if(player.client && (player.ready == PLAYER_READY_TO_PLAY) && player.has_valid_preferences(TRUE)) playerC++ if(!GLOB.Debug2) if(playerC < required_players || (maximum_players >= 0 && playerC > maximum_players)) - return 0 + return FALSE antag_candidates = get_players_for_role(antag_flag) if(!GLOB.Debug2) if(antag_candidates.len < required_enemies) - return 0 - return 1 + return FALSE + return TRUE else message_admins("DEBUG: GAME STARTING WITHOUT PLAYER NUMBER CHECKS, THIS WILL PROBABLY BREAK SHIT.") - return 1 + return TRUE +/datum/game_mode/proc/setup_maps() + return 1 ///Attempts to select players for special roles the mode might have. /datum/game_mode/proc/pre_setup() @@ -95,6 +102,7 @@ for(var/role_to_init in allowed_special) var/datum/special_role/new_role = new role_to_init + new_role.setup() if(!prob(new_role.probability)) continue new_role.add_to_pool() @@ -109,7 +117,11 @@ for(var/i in 1 to amount) if(candidates.len == 0) return //No more candidates, end the selection process, and active specials at this time will be handled by latejoins or not included - var/mob/person = pick_n_take(candidates) + var/mob/person + if(special.special_role_flag) + person = antag_pick(candidates, special.special_role_flag) + else + person = pick_n_take(candidates) if(is_banned_from(person.ckey, special.preference_type)) continue if(!person) @@ -117,7 +129,7 @@ var/datum/mind/selected_mind = person.mind if(selected_mind.special_role) continue - if(person.job in special.protected_jobs) + if(person.job in special.restricted_jobs) continue //Would be annoying trying to assasinate someone with special statuses if(selected_mind.isAntagTarget && !special.allowAntagTargets) @@ -156,10 +168,13 @@ ) query_round_game_mode.Execute() qdel(query_round_game_mode) - if(report) - addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h)) create_special_antags() generate_station_goals() + if(report) + addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h)) + else // goals only become purchasable when on_report is called, this also makes a replacement announcement. + for(var/datum/station_goal/G in station_goals) + G.prepare_report() gamemode_ready = TRUE return 1 @@ -251,6 +266,8 @@ replacementmode.restricted_jobs += replacementmode.protected_jobs if(CONFIG_GET(flag/protect_assistant_from_antagonist)) replacementmode.restricted_jobs += "Assistant" + if(CONFIG_GET(flag/protect_heads_from_antagonist)) + replacementmode.restricted_jobs += GLOB.command_positions message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit stop the creation of antags or end the round now.") log_game("Roundtype converted to [replacementmode.name]") @@ -258,14 +275,14 @@ . = 1 sleep(rand(600,1800)) + //somewhere between 1 and 3 minutes from now if(!SSticker.IsRoundInProgress()) message_admins("Roundtype conversion cancelled, the game appears to have finished!") round_converted = 0 return - //somewhere between 1 and 3 minutes from now if(!CONFIG_GET(keyed_list/midround_antag)[SSticker.mode.config_tag]) round_converted = 0 - return 1 + return for(var/mob/living/carbon/human/H in antag_candidates) if(H.client) replacementmode.make_antag_chance(H) @@ -273,10 +290,12 @@ round_converted = 2 message_admins("-- IMPORTANT: The roundtype has been converted to [replacementmode.name], antagonists may have been created! --") - -///Called by the gameSSticker -/datum/game_mode/process() - return 0 +/** + * ATTENTION: + * If you make some special process() for your gamemode, + * it'll be called by the SSticker, which ignores your + * return value. + */ //For things that do not die easily /datum/game_mode/proc/are_special_antags_dead() @@ -368,18 +387,28 @@ intercepttext += "
" intercepttext += report - if(station_goals.len) - intercepttext += "
Special Orders for [station_name()]:" - for(var/datum/station_goal/G in station_goals) - G.on_report() - intercepttext += G.get_report() + intercepttext += generate_station_goal_report() print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE) - priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/ai/intercept.ogg') + priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", ANNOUNCER_INTERCEPT) if(GLOB.security_level < SEC_LEVEL_BLUE) set_security_level(SEC_LEVEL_BLUE) +/* + * Generate a list of station goals available to purchase to report to the crew. + * + * Returns a formatted string all station goals that are available to the station. + */ +/datum/game_mode/proc/generate_station_goal_report() + if(!station_goals.len) + return + . = "
Special Orders for [station_name()]:
" + for(var/datum/station_goal/station_goal in station_goals) + station_goal.on_report() + . += station_goal.get_report() + return + // This is a frequency selection system. You may imagine it like a raffle where each player can have some number of tickets. The more tickets you have the more likely you are to // "win". The default is 100 tickets. If no players use any extra tickets (earned with the antagonist rep system) calling this function should be equivalent to calling the normal // pick() function. By default you may use up to 100 extra tickets per roll, meaning at maximum a player may double their chances compared to a player who has no extra tickets. @@ -576,6 +605,7 @@ valid_positions += GLOB.science_positions valid_positions += GLOB.supply_positions valid_positions += GLOB.civilian_positions + valid_positions += GLOB.gimmick_positions valid_positions += GLOB.security_positions if(CONFIG_GET(flag/reopen_roundstart_suicide_roles_command_positions)) valid_positions += GLOB.command_positions //add any remaining command positions @@ -813,7 +843,7 @@ var/list/human_garbage = list() round_credits += "
The Hardy Civilians:
" len_before_addition = round_credits.len - for(var/datum/mind/current in SSticker.mode.get_all_by_department(GLOB.civilian_positions)) + for(var/datum/mind/current in SSticker.mode.get_all_by_department(GLOB.civilian_positions | GLOB.gimmick_positions)) if(current.assigned_role == "Assistant") human_garbage += current else diff --git a/code/game/gamemodes/gangs/dominator.dm b/code/game/gamemodes/gangs/dominator.dm index 12bc687fffda6..8061f1260d3ac 100644 --- a/code/game/gamemodes/gangs/dominator.dm +++ b/code/game/gamemodes/gangs/dominator.dm @@ -13,7 +13,7 @@ max_integrity = 300 integrity_failure = 100 move_resist = INFINITY - armor = list("melee" = 20, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 10, "acid" = 70) + armor = list("melee" = 20, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 10, "acid" = 70, "stamina" = 0) var/datum/team/gang/gang var/operating = FALSE //false=standby or broken, true=takeover var/warned = FALSE //if this device has set off the warning at <3 minutes yet @@ -37,7 +37,6 @@ gang = null QDEL_NULL(spark_system) QDEL_NULL(countdown) - STOP_PROCESSING(SSmachines, src) return ..() /obj/machinery/dominator/emp_act(severity) @@ -81,7 +80,6 @@ to_chat(user, "System Integrity: [round((obj_integrity/max_integrity)*100,1)]%") /obj/machinery/dominator/process() - ..() if(gang && gang.domination_time != NOT_DOMINATING) var/time_remaining = gang.domination_time_remaining() if(time_remaining > 0) @@ -111,7 +109,7 @@ SSticker.force_ending = TRUE if(!.) - STOP_PROCESSING(SSmachines, src) + return PROCESS_KILL /obj/machinery/dominator/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) @@ -181,7 +179,7 @@ gang = tempgang gang.dom_attempts -- - priority_announce("Network breach detected in [locname]. The [gang.name] Gang is attempting to seize control of the station!","Network Alert") + priority_announce("Network breach detected in [locname]. The [gang.name] Gang is attempting to seize control of the station!", "Network Alert", SSstation.announcer.get_rand_alert_sound()) gang.domination() SSshuttle.registerHostileEnvironment(src) name = "[gang.name] Gang [name]" @@ -204,9 +202,8 @@ var/open = FALSE if(isclosedturf(loc)) return TRUE - for(var/turf/T in view(3, src)) - if(!isclosedturf(T)) - open++ + for(var/turf/open/T in view(3, src)) + open++ if(open < DOM_REQUIRED_TURFS) return TRUE else @@ -225,7 +222,7 @@ if(!takeover_in_progress) var/was_stranded = SSshuttle.emergency.mode == SHUTTLE_STRANDED if(!was_stranded) - priority_announce("All hostile activity within station systems has ceased.","Network Alert") + priority_announce("All hostile activity within station systems has ceased.","Network Alert", SSstation.announcer.get_rand_alert_sound()) if(get_security_level() == "delta") set_security_level("red") diff --git a/code/game/gamemodes/gangs/gang_items.dm b/code/game/gamemodes/gangs/gang_items.dm index f74d943cc3d04..184834a7621c5 100644 --- a/code/game/gamemodes/gangs/gang_items.dm +++ b/code/game/gamemodes/gangs/gang_items.dm @@ -44,8 +44,6 @@ /datum/gang_item/proc/get_extra_info(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) return - - /////////////////// //Essential Gang Tools /////////////////// @@ -53,11 +51,26 @@ /datum/gang_item/essentials category = "Purchase Essential Items:" +/datum/gang_item/essentials/spraycan + name = "Territory Spraycan" + id = "spraycan" + cost = 10 + item_path = /obj/item/toy/crayon/spraycan/gang +/datum/gang_item/essentials/implant_breaker + name = "Reprogramming Implant" + id = "implant_breaker" + cost = 25 + item_path = /obj/item/implanter/gang + spawn_msg = "The reprogramming implant is a single use implant that will reprogram its target to be part of your gang. Not strong enough to break the latest NT mindshield implants, or reprogram Lieutenants." + +/datum/gang_item/essentials/implant_breaker/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) + var/obj/item/O = new item_path(get_turf(user), gang) + user.put_in_hands(O) /datum/gang_item/essentials/gangtool id = "gangtool" - cost = 10 + cost = 50 /datum/gang_item/essentials/gangtool/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) var/item_type @@ -75,21 +88,14 @@ return "Promote a Gangster" return "Spare Gangtool" -/datum/gang_item/essentials/spraycan - name = "Territory Spraycan" - id = "spraycan" - cost = 5 - item_path = /obj/item/toy/crayon/spraycan/gang - /datum/gang_item/essentials/spraycan/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) var/obj/item/O = new item_path(user.loc, gang) user.put_in_hands(O) - /datum/gang_item/essentials/pen name = "Recruitment Pen" id = "pen" - cost = 10 + cost = 50 item_path = /obj/item/pen/gang spawn_msg = "More recruitment pens will allow you to recruit gangsters faster. Only gang leaders can recruit with pens." @@ -108,109 +114,88 @@ if(gangtool?.free_pen) return "(GET ONE FREE)" return ..() - - - -/datum/gang_item/essentials/dominator - name = "Station Dominator" - id = "dominator" - cost = 30 - item_path = /obj/machinery/dominator - spawn_msg = "The dominator will secure your gang's dominance over the station. Turn it on when you are ready to defend it." - -/datum/gang_item/essentials/dominator/can_buy(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - if(!gang || !gang.dom_attempts) - return FALSE - return ..() - -/datum/gang_item/essentials/dominator/get_name_display(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - if(!gang || !gang.dom_attempts) - return ..() - return "[..()]" - -/datum/gang_item/essentials/dominator/get_cost_display(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - if(!gang || !gang.dom_attempts) - return "(Out of stock)" - return ..() - -/datum/gang_item/essentials/dominator/get_extra_info(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - if(gang) - return "This device requires a 5x5 area clear of walls to work. (Estimated Takeover Time: [round(gang.determine_domination_time()/60,0.1)] minutes)" - -/datum/gang_item/essentials/dominator/purchase(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - var/area/userarea = get_area(user) - if(!(userarea.type in gang.territories|gang.new_territories)) - to_chat(user,"The dominator can be spawned only on territory controlled by your gang!") - return FALSE - for(var/obj/obj in get_turf(user)) - if(obj.density) - to_chat(user, "There's not enough room here!") - return FALSE - - return ..() - -/datum/gang_item/essentials/dominator/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - new item_path(user.loc) - to_chat(user, spawn_msg) - - - + +/datum/gang_item/essentials/reinforce + name = "Call Reinforcments" + id = "reinforce" + cost = 250 + item_path = /obj/item/antag_spawner/gangster /////////////////// //CLOTHING /////////////////// /datum/gang_item/clothing - category = "Purchase Gang Clothes (Only the jumpsuit and suit give you added influence):" + category = "Purchase Gang Clothes (Only the jumpsuit, hat and suit give you added influence):" -/datum/gang_item/clothing/under +/datum/gang_item/clothing/basic name = "Gang Uniform" id = "under" - cost = 1 - -/datum/gang_item/clothing/under/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - if(gang.inner_outfits.len) - var/outfit = pick(gang.inner_outfits) - if(outfit) - var/obj/item/O = new outfit(user.loc) - user.put_in_hands(O) - to_chat(user, " This is your gang's official uniform, wearing it will increase your influence") - return + cost = 5 + +/datum/gang_item/clothing/basic/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) + var/obj/item/storage/box/uniform_box = new (get_turf(user)) + + new gang.outfit(uniform_box) + new gang.suit(uniform_box) + new gang.hat(uniform_box) + + user.put_in_hands(uniform_box) + to_chat(user, " This is your gang's official uniform, wearing it will increase your influence") return TRUE -/datum/gang_item/clothing/suit +/datum/gang_item/clothing/armor name = "Gang Armored Outerwear" - id = "suit" - cost = 1 - -/datum/gang_item/clothing/suit/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - if(gang.outer_outfits.len) - var/outfit = pick(gang.outer_outfits) - if(outfit) - var/obj/item/O = new outfit(user.loc) - O.armor = O.armor.setRating(melee = 20, bullet = 35, laser = 10, energy = 10, bomb = 30, bio = 0, rad = 0, fire = 30, acid = 30) - O.desc += " Tailored for the [gang.name] Gang to offer the wearer moderate protection against ballistics and physical trauma." - user.put_in_hands(O) - to_chat(user, " This is your gang's official outerwear, wearing it will increase your influence") - return - return TRUE + id = "armor" + cost = 200 + +/datum/gang_item/clothing/armor/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) + var/obj/item/storage/box/armor_box = new (get_turf(user)) + var/obj/item/clothing/suit/suit = new gang.suit(armor_box) + suit.armor = suit.armor.setRating(melee = 20, bullet = 35, laser = 10, energy = 10, bomb = 30, bio = 0, rad = 0, fire = 30, acid = 30) + suit.desc += " Tailored for the [gang.name] Gang to offer the wearer moderate protection against ballistics and physical trauma." -/datum/gang_item/clothing/hat - name = "Pimp Hat" - id = "hat" - cost = 16 - item_path = /obj/item/clothing/head/collectable/petehat/gang + var/obj/item/clothing/head/hat = new gang.hat(armor_box) + hat.armor = hat.armor.setRating(melee = 20, bullet = 35, laser = 10, energy = 10, bomb = 30, bio = 0, rad = 0, fire = 30, acid = 30) + hat.desc += " Tailored for the [gang.name] Gang to offer the wearer moderate protection against ballistics and physical trauma." + user.put_in_hands(armor_box) + to_chat(user, " This is your gang's official uniform, wearing it will increase your influence") + return TRUE -/obj/item/clothing/head/collectable/petehat/gang - name = "pimpin' hat" - desc = "The undisputed king of style." +/datum/gang_item/clothing/ssuit + name = "Gang Spaceproof Outerwear" + id = "ssuit" + cost = 200 + +/datum/gang_item/clothing/ssuit/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) + var/obj/item/storage/box/armor_box = new (get_turf(user)) + + var/obj/item/clothing/suit/suit = new gang.suit(armor_box) + suit.clothing_flags |= STOPSPRESSUREDAMAGE | THICKMATERIAL + suit.cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + suit.heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + suit.min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT + suit.max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT + suit.desc += " Tailored for the [gang.name] Gang to offer the wearer moderate protection against ballistics and physical trauma." + + var/obj/item/clothing/head/hat = new gang.hat(armor_box) + hat.clothing_flags |= STOPSPRESSUREDAMAGE | THICKMATERIAL + hat.cold_protection = HEAD + hat.heat_protection = HEAD + hat.min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT + hat.max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT + hat.desc += " Tailored for the [gang.name] Gang to offer the wearer moderate protection against ballistics and physical trauma." + + user.put_in_hands(armor_box) + to_chat(user, " This is your gang's official uniform, wearing it will increase your influence") + return TRUE /datum/gang_item/clothing/mask name = "Golden Death Mask" id = "mask" - cost = 18 + cost = 50 item_path = /obj/item/clothing/mask/gskull /obj/item/clothing/mask/gskull @@ -221,7 +206,7 @@ /datum/gang_item/clothing/shoes name = "Bling Boots" id = "boots" - cost = 22 + cost = 50 item_path = /obj/item/clothing/shoes/gang /obj/item/clothing/shoes/gang @@ -232,13 +217,13 @@ /datum/gang_item/clothing/neck name = "Gold Necklace" id = "necklace" - cost = 9 + cost = 25 item_path = /obj/item/clothing/neck/necklace/dope /datum/gang_item/clothing/hands name = "Decorative Brass Knuckles" id = "hand" - cost = 11 + cost = 50 item_path = /obj/item/clothing/gloves/gang /obj/item/clothing/gloves/gang @@ -250,7 +235,7 @@ /datum/gang_item/clothing/belt name = "Badass Belt" id = "belt" - cost = 13 + cost = 25 item_path = /obj/item/storage/belt/military/gang /obj/item/storage/belt/military/gang @@ -266,115 +251,150 @@ /datum/gang_item/weapon category = "Purchase Weapons:" -/datum/gang_item/weapon/ammo - -/datum/gang_item/weapon/shuriken - name = "Shuriken" - id = "shuriken" - cost = 3 - item_path = /obj/item/throwing_star - -/datum/gang_item/weapon/frag - name = "Fragmentation Grenade" - id = "frag nade" - cost = 18 - item_path = /obj/item/grenade/syndieminibomb/concussion/frag +/datum/gang_item/weapon/emp + name = "EMP Grenade" + id = "EMP" + cost = 50 + item_path = /obj/item/grenade/empgrenade +/datum/gang_item/weapon/c4 + name = "C4 Explosive" + id = "c4" + cost = 100 + item_path = /obj/item/grenade/plastic/c4 /datum/gang_item/weapon/switchblade name = "Switchblade" id = "switchblade" - cost = 5 + cost = 100 item_path = /obj/item/switchblade -/datum/gang_item/weapon/surplus - name = "Surplus Rifle" - id = "surplus" - cost = 8 - item_path = /obj/item/gun/ballistic/automatic/surplus +/datum/gang_item/weapon/shuriken + name = "Shuriken box" + id = "shuriken" + cost = 150 + item_path = /obj/item/storage/box/shuriken_box -/datum/gang_item/weapon/ammo/surplus_ammo - name = "Surplus Rifle Ammo" - id = "surplus_ammo" - cost = 5 - item_path = /obj/item/ammo_box/magazine/m10mm/rifle +/obj/item/storage/box/shuriken_box + name = "shuriken Box" -/datum/gang_item/weapon/ammo/improvised_ammo - name = "Box of Buckshot" - id = "buckshot" - cost = 5 - item_path = /obj/item/storage/box/lethalshot +/obj/item/storage/box/shuriken_box/PopulateContents() + for (var/i in 1 to 4) + new /obj/item/throwing_star(src) /datum/gang_item/weapon/pistol name = "10mm Pistol" id = "pistol" - cost = 30 + cost = 500 item_path = /obj/item/gun/ballistic/automatic/pistol -/datum/gang_item/weapon/ammo/pistol_ammo +/datum/gang_item/weapon/pistol_ammo name = "10mm Ammo" id = "pistol_ammo" - cost = 10 + cost = 50 item_path = /obj/item/ammo_box/magazine/m10mm /datum/gang_item/weapon/uzi name = "Uzi SMG" id = "uzi" - cost = 60 + cost = 500 item_path = /obj/item/gun/ballistic/automatic/mini_uzi -/datum/gang_item/weapon/ammo/uzi_ammo +/datum/gang_item/weapon/uzi_ammo name = "Uzi Ammo" id = "uzi_ammo" - cost = 40 + cost = 50 item_path = /obj/item/ammo_box/magazine/uzim9mm +/datum/gang_item/weapon/laser + name = "Laser Gun" + id = "laser" + cost = 500 + item_path = /obj/item/gun/energy/laser/retro + /////////////////// //EQUIPMENT /////////////////// /datum/gang_item/equipment - category = "Purchase Equipment:" - - -/datum/gang_item/equipment/sharpener - name = "Sharpener" - id = "whetstone" - cost = 3 - item_path = /obj/item/sharpener + category = "Purchase Support Equipment:" - -/datum/gang_item/equipment/emp - name = "EMP Grenade" - id = "EMP" - cost = 5 - item_path = /obj/item/grenade/empgrenade - -/datum/gang_item/equipment/c4 - name = "C4 Explosive" - id = "c4" - cost = 7 - item_path = /obj/item/grenade/plastic/c4 - -/datum/gang_item/equipment/implant_breaker - name = "Implant Breaker" - id = "implant_breaker" - cost = 10 - item_path = /obj/item/implanter/gang - spawn_msg = "The implant breaker is a single-use device that destroys all implants within the target before trying to recruit them to your gang. Also works on enemy gangsters." - -/datum/gang_item/equipment/implant_breaker/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) - var/obj/item/O = new item_path(user.loc, gang) - user.put_in_hands(O) - -/datum/gang_item/equipment/wetwork_boots - name = "Wetwork boots" - id = "wetwork" +/datum/gang_item/equipment/healcigs + name = "Healing Cigs" + id = "healcigs" cost = 20 - item_path = /obj/item/clothing/shoes/combat/gang + item_path = /obj/item/storage/fancy/cigarettes/cigpack_syndicate + +/datum/gang_item/equipment/mulah + name = "Space Cash (1000cr)" + id = "mulah" + cost = 25 + item_path = /obj/item/stack/spacecash/c1000 + +/datum/gang_item/equipment/drugs + name = "Drug Supply" + id = "drugs" + cost = 50 + item_path = /obj/item/storage/box + +/datum/gang_item/equipment/drugs/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool) + var/obj/item/O + var/turf/T = get_turf(user) + switch (rand(1,10)) + if (1) + O = new /obj/item/storage/pill_bottle/lsd(T) + if (2) + O = new /obj/item/storage/pill_bottle/happy(T) + if (3) + O = new /obj/item/storage/pill_bottle/zoom(T) + if (4) + O = new /obj/item/storage/pill_bottle/aranesp(T) + if (5) + O = new /obj/item/storage/pill_bottle/happiness(T) + if (6) + O = new /obj/item/storage/pill_bottle/psicodine(T) + if (7) + O = new /obj/item/storage/pill_bottle/psicodine(T) + if (8) + O = new /obj/item/reagent_containers/food/snacks/grown/cannabis(T) + if (9) + O = new /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow(T) + if (10) + O = new /obj/item/reagent_containers/food/snacks/grown/cannabis/white(T) + if (O) + user.put_in_hands(O) -/obj/item/clothing/shoes/combat/gang - name = "Wetwork boots" - desc = "A gang's best hitmen are prepared for anything." - permeability_coefficient = 0.01 - clothing_flags = NOSLIP \ No newline at end of file +/datum/gang_item/equipment/aids + name = "Battlefield Aid Kit" + id = "aids" + cost = 75 + item_path = /obj/item/storage/firstaid/shifty/battle + +/datum/gang_item/equipment/hangover + name = "Bad Trip Kit" + id = "hangover" + cost = 75 + item_path = /obj/item/storage/firstaid/shifty/hangover + +/obj/item/storage/firstaid/shifty + name = "shifty medkit" + desc = "A shady medkit, assembled out of scraps and leftovers." + icon_state = "bezerk" + +/obj/item/storage/firstaid/shifty/battle/PopulateContents() + var/static/items_inside = list( + /obj/item/reagent_containers/pill/patch/silver_sulf = 2, + /obj/item/reagent_containers/pill/patch/styptic = 2, + /obj/item/reagent_containers/medspray/synthflesh = 1, + /obj/item/reagent_containers/hypospray/medipen = 1, + /obj/item/healthanalyzer = 1) + generate_items_inside(items_inside,src) + +/obj/item/storage/firstaid/shifty/hangover/PopulateContents() + var/static/items_inside = list( + /obj/item/storage/pill_bottle/charcoal = 1, + /obj/item/reagent_containers/syringe/antitoxin = 1, + /obj/item/reagent_containers/hypospray/medipen = 2, + /obj/item/reagent_containers/hypospray/medipen/dexalin = 2, + /obj/item/healthanalyzer = 1) + generate_items_inside(items_inside,src) diff --git a/code/game/gamemodes/gangs/gang_pen.dm b/code/game/gamemodes/gangs/gang_pen.dm index a307110ea8425..17dcc98a14d58 100644 --- a/code/game/gamemodes/gangs/gang_pen.dm +++ b/code/game/gamemodes/gangs/gang_pen.dm @@ -52,7 +52,7 @@ to_chat(user, "This mind is too strong to control!") return var/mob/living/carbon/human/H = gangster_mind.current // we are sure the dude's human cause it's checked in attack() - if(istype(H.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) + if(istype(H.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat)) to_chat(user, "This mind appears to be too delusional to register the mind-control waves!") return H.silent = max(H.silent, 5) diff --git a/code/game/gamemodes/gangs/gang_tags.dm b/code/game/gamemodes/gangs/gang_tags.dm new file mode 100644 index 0000000000000..f0e2f7932cf19 --- /dev/null +++ b/code/game/gamemodes/gangs/gang_tags.dm @@ -0,0 +1,30 @@ + +/obj/effect/decal/gang + icon = 'icons/effects/crayondecal.dmi' + icon_state = "rune1" + layer = ABOVE_NORMAL_TURF_LAYER //Harder to hide + plane = GAME_PLANE + gender = NEUTER + var/datum/team/gang/gang + +/obj/effect/decal/gang/Initialize(mapload, datum/team/gang/G, e_name = "gang tag", rotation = 0, mob/user) + if(!G) + qdel(src) + return + gang = G + var/area/territory = get_area(src) + G.new_territories |= list(territory.type = territory.name) + + name = e_name + desc = "A [name] vandalizing the station." + icon_state = G.name + add_atom_colour(G.color, FIXED_COLOUR_PRIORITY) + + +/obj/effect/decal/gang/Destroy() + if(gang) + var/area/territory = get_area(src) + gang.territories -= territory.type + gang.new_territories -= territory.type + gang.lost_territories |= list(territory.type = territory.name) + return ..() diff --git a/code/game/gamemodes/gangs/gangs.dm b/code/game/gamemodes/gangs/gangs.dm index d555aad6bef0e..b10af973eed58 100644 --- a/code/game/gamemodes/gangs/gangs.dm +++ b/code/game/gamemodes/gangs/gangs.dm @@ -6,16 +6,16 @@ GLOBAL_LIST_EMPTY(gangs) name = "gang war" config_tag = "gang" antag_flag = ROLE_GANG - restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Brig Physician") - required_players = 15 - required_enemies = 1 - recommended_enemies = 2 + restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security") + required_players = 30 + required_enemies = 2 + recommended_enemies = 3 enemy_minimum_age = 14 announce_span = "danger" announce_text = "A violent turf war has erupted on the station!\n\ - Gangsters: Take over the station with a dominator.\n\ - Crew: Prevent the gangs from expanding and initiating takeover." + Gangsters: Spread influence and expand the territory of your gang.\n\ + Crew: Spread awareness and prevent your coworkers from killing eachother in turf wars." title_icon = "gang" @@ -30,10 +30,10 @@ GLOBAL_LIST_EMPTY(gangs) //Spawn more bosses depending on server population var/gangs_to_create = 2 - if(prob(num_players()) && num_players() > 1.5*required_players) - gangs_to_create++ if(prob(num_players()) && num_players() > 2*required_players) gangs_to_create++ + if(prob(num_players()) && num_players() > 3*required_players) + gangs_to_create++ gangs_to_create = min(gangs_to_create, GLOB.possible_gangs.len) for(var/i in 1 to gangs_to_create) @@ -69,6 +69,19 @@ GLOBAL_LIST_EMPTY(gangs) /proc/is_gang_boss(mob/M) return M?.mind?.has_antag_datum(/datum/antagonist/gang/boss) +/datum/game_mode/gang/set_round_result() + ..() + var/datum/team/gang/winner + var/winner_territories = 0 + for(var/datum/team/gang/G in GLOB.gangs) + var/compare_territories = LAZYLEN(G.territories) + if (!winner || compare_territories > winner_territories || (compare_territories == winner_territories && G.victory_points > winner.victory_points)) + winner = G + winner_territories = LAZYLEN(winner.territories) + + if (winner) + winner.winner = TRUE //chicken dinner + /datum/game_mode/gang/generate_credit_text() var/list/round_credits = list() var/len_before_addition diff --git a/code/game/gamemodes/gangs/gangtool.dm b/code/game/gamemodes/gangs/gangtool.dm index 6bf3de09691b1..78b74c4381656 100644 --- a/code/game/gamemodes/gangs/gangtool.dm +++ b/code/game/gamemodes/gangs/gangtool.dm @@ -60,9 +60,6 @@ else dat += "This device is not authorized to promote." else - if(gang.domination_time != NOT_DOMINATING) - dat += "
[DisplayTimeText(gang.domination_time_remaining() * 10)] remain
" dat += "Organization Size: [gang.members.len] | Station Control: [gang.territories.len] territories under control. | Influence: [gang.influence]
" dat += "Time until Influence grows: [time2text(gang.next_point_time - world.time, "mm:ss")]
" @@ -207,7 +204,7 @@ gang.recalls-- return TRUE - to_chat(user, "[icon2html(src, loc)]No response recieved. Emergency shuttle cannot be recalled at this time.") + to_chat(user, "[icon2html(src, loc)]No response received. Emergency shuttle cannot be recalled at this time.") return /obj/item/device/gangtool/proc/recallchecks(mob/user) @@ -222,10 +219,6 @@ to_chat(user, "[icon2html(src, user)]Emergency shuttle cannot be recalled at this time.") recalling = FALSE return - if(!gang.dom_attempts) - to_chat(user, "[icon2html(src, user)]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.") - recalling = FALSE - return if(!is_station_level(user.z)) //Shuttle can only be recalled while on station to_chat(user, "[icon2html(src, user)]Error: Device out of range of station communication arrays.") recalling = FALSE @@ -248,6 +241,9 @@ if(!isnull(gang) && G.gang != gang) to_chat(user, "You cannot use gang tools owned by enemy gangs!") return + else if(!G.gang.check_gangster_swag(user)>1) + to_chat(user, "You cannot use gang tools while undercover!") + return return TRUE diff --git a/code/game/gamemodes/gangs/implant_gang.dm b/code/game/gamemodes/gangs/implant_gang.dm new file mode 100644 index 0000000000000..7f0b190381a65 --- /dev/null +++ b/code/game/gamemodes/gangs/implant_gang.dm @@ -0,0 +1,63 @@ +/obj/item/implant/gang + name = "gang implant" + desc = "Makes you a gangster or such." + activated = 0 + var/datum/team/gang/gang + +/obj/item/implant/gang/Initialize(loc, setgang) + ..() + gang = setgang + +/obj/item/implant/gang/get_data() + var/dat = {"Implant Specifications:
+ Name: Criminal brainwash implant
+ Life: A few seconds after injection.
+ Important Notes: Illegal
+
+ Implant Details:
+ Function: Contains a small pod of nanobots that change the host's brain to be loyal to a certain organization.
+ Notice: Latest NT Mindshield implants counteract the effect of this implant.
+ Integrity: Latest NT Mindshield will neutralize this implant."} + return dat + +/obj/item/implant/gang/implant(mob/living/target, mob/user, silent = 0) + if(!target || !target.mind || target.stat == DEAD || !ishuman(target) || !..()) + return FALSE + if (HAS_TRAIT(target, TRAIT_MINDSHIELD)) + target.visible_message("[target] seems to resist the implant!", "You resist the gang implant. You are reminded of the anti-gang PSA instead.") + return FALSE + + var/datum/antagonist/gang/G = target.mind.has_antag_datum(/datum/antagonist/gang) + if(G) + if(G.gang == G || istype(G, /datum/antagonist/gang/boss)) + return FALSE + target.mind.remove_antag_datum(/datum/antagonist/gang) + target.mind.add_antag_datum(/datum/antagonist/gang, gang) + qdel(src) + return TRUE + +/obj/item/implanter/gang + name = "implanter (gang)" + +/obj/item/implanter/gang/Initialize(loc, gang) + if(!gang) + qdel(src) + return + imp = new /obj/item/implant/gang(src,gang) + ..() + + + +/obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = FALSE) //putting this here, pls no bulli. - qwerty + if(..()) + if(!target.mind) + return TRUE + if(target.mind.has_antag_datum(/datum/antagonist/gang/boss)) + if(!silent) + target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!") + removed(target, 1) + qdel(src) + return FALSE + target.mind.remove_antag_datum(/datum/antagonist/gang) + return TRUE + return FALSE diff --git a/code/game/gamemodes/gangs/outfits.dm b/code/game/gamemodes/gangs/outfits.dm new file mode 100644 index 0000000000000..e62299deec6be --- /dev/null +++ b/code/game/gamemodes/gangs/outfits.dm @@ -0,0 +1,32 @@ +/datum/outfit/crook + name = "Level 1 - Crook" + uniform = /obj/item/clothing/under/color/grey + id = /obj/item/card/id + ears = /obj/item/radio/headset + back = /obj/item/storage/backpack + shoes = /obj/item/clothing/shoes/sneakers/black + + l_pocket = /obj/item/switchblade + r_pocket = /obj/item/crowbar/red + + backpack_contents = list( /obj/item/storage/box/survival=1,\ + /obj/item/toy/crayon/spraycan/gang = 1) + +/datum/outfit/boss + name = "Level 50 - Boss" + uniform = /obj/item/clothing/under/color/grey + id = /obj/item/card/id + belt = /obj/item/storage/belt/military/gang + gloves = /obj/item/clothing/gloves/gang + neck = /obj/item/clothing/neck/necklace/dope + shoes = /obj/item/clothing/shoes/gang + ears = /obj/item/radio/headset + back = /obj/item/storage/backpack + mask = /obj/item/clothing/mask/gskull + + l_pocket = /obj/item/pen/gang + r_pocket = /obj/item/switchblade + + backpack_contents = list( /obj/item/storage/box/survival=1,\ + /obj/item/device/gangtool/spare=1,\ + /obj/item/restraints/legcuffs/bola/energy = 1) \ No newline at end of file diff --git a/code/game/gamemodes/hivemind/radar.dm b/code/game/gamemodes/hivemind/radar.dm index 8df195705785f..8baaa69774d95 100644 --- a/code/game/gamemodes/hivemind/radar.dm +++ b/code/game/gamemodes/hivemind/radar.dm @@ -5,7 +5,7 @@ //Modified IA/changeling pinpointer, points to the nearest person who is afflicted with the hive tracker status effect /datum/status_effect/agent_pinpointer/hivemind id = "hive_pinpointer" - alert_type = /obj/screen/alert/status_effect/agent_pinpointer/hivemind + alert_type = /atom/movable/screen/alert/status_effect/agent_pinpointer/hivemind minimum_range = HIVEMIND_RADAR_MIN_DISTANCE tick_interval = HIVEMIND_RADAR_PING_TIME range_fuzz_factor = 0 @@ -69,6 +69,6 @@ duration = world.time + set_duration //Screen alert -/obj/screen/alert/status_effect/agent_pinpointer/hivemind +/atom/movable/screen/alert/status_effect/agent_pinpointer/hivemind name = "Psychic link" desc = "Somebody is there, and they're definitely not friendly." diff --git a/code/game/gamemodes/incursion/incursion.dm b/code/game/gamemodes/incursion/incursion.dm index 142d15c571e78..f85063b23cd49 100644 --- a/code/game/gamemodes/incursion/incursion.dm +++ b/code/game/gamemodes/incursion/incursion.dm @@ -6,7 +6,7 @@ name = "incursion" config_tag = "incursion" restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician") + protected_jobs = list("Security Officer", "Warden", "Detective","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") antag_flag = ROLE_INCURSION false_report_weight = 10 enemy_minimum_age = 0 diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 81ca9a5c394c5..9ed3060b7165f 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -18,7 +18,7 @@ return var/list/wavetype = GLOB.meteors_normal - var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60 + var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 600 if (prob(meteorminutes)) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 81175233ec210..c1fc5bb691f6f 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -21,17 +21,17 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event //Meteor spawning global procs /////////////////////////////// -/proc/spawn_meteors(number = 10, list/meteortypes) +/proc/spawn_meteors(number = 10, list/meteortypes, z = 0) for(var/i = 0; i < number; i++) - spawn_meteor(meteortypes) + spawn_meteor(meteortypes, z) -/proc/spawn_meteor(list/meteortypes) +/proc/spawn_meteor(list/meteortypes, z = 0) var/turf/pickedstart var/turf/pickedgoal var/max_i = 10//number of tries to spawn meteor. while(!isspaceturf(pickedstart)) var/startSide = pick(GLOB.cardinals) - var/startZ = pick(SSmapping.levels_by_trait(ZTRAIT_STATION)) + var/startZ = (z || pick(SSmapping.levels_by_trait(ZTRAIT_STATION))) pickedstart = spaceDebrisStartLoc(startSide, startZ) pickedgoal = spaceDebrisFinishLoc(startSide, startZ) max_i-- @@ -121,6 +121,10 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event GLOB.meteor_list -= src SSaugury.unregister_doom(src) walk(src,0) //this cancels the walk_towards() proc + if(istype(loc, /obj/effect/falling_meteor)) + var/obj/effect/falling_meteor/holder = loc + holder.contained_meteor = null + qdel(holder) . = ..() /obj/effect/meteor/Initialize(mapload, target) @@ -140,11 +144,19 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event /obj/effect/meteor/proc/ram_turf(turf/T) //first bust whatever is in the turf - for(var/atom/A in T) - if(A != src) - if(isliving(A)) - A.visible_message("[src] slams into [A].", "[src] slams into you!.") - A.ex_act(hitpwr) + for(var/thing in T) + if(thing == src) + continue + if(isliving(thing)) + var/mob/living/living_thing = thing + living_thing.visible_message("[src] slams into [living_thing].", "[src] slams into you!.") + switch(hitpwr) + if(EXPLODE_DEVASTATE) + SSexplosions.high_mov_atom += thing + if(EXPLODE_HEAVY) + SSexplosions.med_mov_atom += thing + if(EXPLODE_LIGHT) + SSexplosions.low_mov_atom += thing //then, ram the turf if it still exists if(T) @@ -195,7 +207,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event if((M.orbiting) && (SSaugury.watchers[M])) continue var/turf/T = get_turf(M) - if(!T || T.z != src.z) + if(!T || T.get_virtual_z_level() != src.get_virtual_z_level()) continue var/dist = get_dist(M.loc, src.loc) shake_camera(M, dist > 20 ? 2 : 4, dist > 20 ? 1 : 3) @@ -367,3 +379,68 @@ GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin)) meteorsound = pick('sound/hallucinations/im_here1.ogg','sound/hallucinations/im_here2.ogg') ////////////////////////// #undef DEFAULT_METEOR_LIFETIME + +////////////////////////// +// Falling meteors +///////////////////////// + +/obj/effect/falling_meteor + name = "falling meteor" + desc = "..." + alpha = 0 + var/obj/effect/meteor/contained_meteor + var/obj/effect/meteor_shadow/shadow + var/falltime = 2 SECONDS + var/prefalltime = 8 SECONDS + layer = METEOR_LAYER + +/obj/effect/falling_meteor/Initialize(loc, meteor_type) + . = ..() + if(!meteor_type) + meteor_type = /obj/effect/meteor/big + contained_meteor = new meteor_type(src) + name = contained_meteor.name + desc = contained_meteor.desc + icon = contained_meteor.icon + icon_state = contained_meteor.icon_state + var/matrix/M = new() + M.Scale(3, 3) + M.Translate(-1.5 * world.icon_size, -1.5 * world.icon_size) + M.Translate(0, world.icon_size * 7) + transform = M + INVOKE_ASYNC(src, .proc/fall_animation) + +/obj/effect/falling_meteor/Destroy(force) + if(contained_meteor) + QDEL_NULL(contained_meteor) + QDEL_NULL(shadow) + . = ..() + +/obj/effect/falling_meteor/proc/fall_animation() + //Create a dummy effect + shadow = new(get_turf(src)) + shadow.icon = icon + shadow.icon_state = icon_state + animate(shadow, time = (prefalltime + falltime), transform = matrix(), alpha = 255) + sleep(prefalltime) + animate(src, 5, alpha = 255) + animate(src, falltime, transform = matrix(), flags = ANIMATION_PARALLEL) + sleep(falltime) + contained_meteor.forceMove(loc) + contained_meteor.make_debris() + contained_meteor.meteor_effect() + qdel(src) + +/obj/effect/meteor_shadow + name = "shadow" + desc = "What the hell? Is something falling out the sky???" + alpha = 0 + layer = METEOR_SHADOW_LAYER + +/obj/effect/meteor_shadow/Initialize() + . = ..() + color = list(0, 0, 0, 0, 0, 0, 0, 0, 0) + var/matrix/M = matrix() + M.Scale(3, 3) + M.Translate(-1.5 * world.icon_size, -1.5 * world.icon_size) + transform = M diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index ae38d58baa10e..0e0e35d975432 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -122,7 +122,7 @@ gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack/fireproof ears = /obj/item/radio/headset/syndicate/alt - l_pocket = /obj/item/pinpointer/nuke/syndicate + l_pocket = /obj/item/modular_computer/tablet/nukeops id = /obj/item/card/id/syndicate belt = /obj/item/gun/ballistic/automatic/pistol backpack_contents = list(/obj/item/storage/box/syndie=1,\ @@ -153,7 +153,7 @@ if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc var/obj/item/U = new uplink_type(H, H.key, tc) - H.equip_to_slot_or_del(U, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(U, ITEM_SLOT_BACKPACK) var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(H) E.implant(H) @@ -169,7 +169,7 @@ mask = /obj/item/clothing/mask/gas/syndicate suit = /obj/item/clothing/suit/space/hardsuit/syndi r_pocket = /obj/item/tank/internals/emergency_oxygen/engi - internals_slot = SLOT_R_STORE + internals_slot = ITEM_SLOT_RPOCKET belt = /obj/item/storage/belt/military r_hand = /obj/item/gun/ballistic/shotgun/bulldog backpack_contents = list(/obj/item/storage/box/syndie=1,\ diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 5bcd23eecf0a2..886a83d8b6523 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -17,6 +17,11 @@ GLOBAL_LIST_EMPTY(objectives) if(text) explanation_text = text +//Apparently objectives can be qdel'd. Learn a new thing every day +/datum/objective/Destroy() + GLOB.objectives -= src + return ..() + /datum/objective/proc/get_owners() // Combine owner and team into a single list. . = (team && team.members) ? team.members.Copy() : list() if(owner) @@ -27,7 +32,7 @@ GLOBAL_LIST_EMPTY(objectives) //Shared by few objective types /datum/objective/proc/admin_simple_target_pick(mob/admin) - var/list/possible_targets = list("Free objective","Random") + var/list/possible_targets = list() var/def_value for(var/datum/mind/possible_target in SSticker.minds) if ((possible_target != src) && ishuman(possible_target.current)) @@ -37,7 +42,7 @@ GLOBAL_LIST_EMPTY(objectives) if(target?.current) def_value = target.current - var/mob/new_target = input(admin,"Select target:", "Objective target", def_value) as null|anything in sortNames(possible_targets) + var/mob/new_target = input(admin,"Select target:", "Objective target", def_value) as null|anything in (sortNames(possible_targets) | list("Free objective","Random")) if (!new_target) return @@ -104,16 +109,50 @@ GLOBAL_LIST_EMPTY(objectives) var/list/datum/mind/owners = get_owners() if(!dupe_search_range) dupe_search_range = get_owners() + var/list/prefered_targets = list() var/list/possible_targets = list() var/try_target_late_joiners = FALSE + var/owner_is_exploration_crew = FALSE + var/owner_is_shaft_miner = FALSE for(var/I in owners) var/datum/mind/O = I if(O.late_joiner) try_target_late_joiners = TRUE + if(O.assigned_role == "Exploration Crew") + owner_is_exploration_crew = TRUE + if(O.assigned_role == "Shaft Miner") + owner_is_shaft_miner = TRUE for(var/datum/mind/possible_target in get_crewmember_minds()) - if(!(possible_target in owners) && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && is_unique_objective(possible_target,dupe_search_range)) - if (!(possible_target in blacklist)) - possible_targets += possible_target + if(possible_target in owners) + continue + if(!ishuman(possible_target.current)) + continue + if(possible_target.current.stat == DEAD) + continue + if(!is_unique_objective(possible_target,dupe_search_range)) + continue + var/target_area = get_area(possible_target.current) + if(!HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && istype(target_area, /area/shuttle/arrival)) + continue + if(possible_target in blacklist) + continue + + if(possible_target.assigned_role == "Exploration Crew") + if(owner_is_exploration_crew) + prefered_targets += possible_target + else + //Reduced chance to get people off station + if(prob(70) && !owner_is_shaft_miner) + continue + else if(possible_target.assigned_role == "Shaft Miner") + if(owner_is_shaft_miner) + prefered_targets += possible_target + else + //Reduced chance to get people off station + if(prob(70) && !owner_is_exploration_crew) + continue + + possible_targets += possible_target if(try_target_late_joiners) var/list/all_possible_targets = possible_targets.Copy() for(var/I in all_possible_targets) @@ -122,7 +161,11 @@ GLOBAL_LIST_EMPTY(objectives) possible_targets -= PT if(!possible_targets.len) possible_targets = all_possible_targets - if(possible_targets.len > 0) + //30% chance to go for a prefered target + if(prefered_targets.len > 0 && prob(30)) + target = pick(prefered_targets) + target.isAntagTarget = TRUE + else if(possible_targets.len > 0) target = pick(possible_targets) target.isAntagTarget = TRUE update_explanation_text() @@ -160,9 +203,13 @@ GLOBAL_LIST_EMPTY(objectives) if(receiver && receiver.current) if(ishuman(receiver.current)) var/mob/living/carbon/human/H = receiver.current - var/list/slots = list("backpack" = SLOT_IN_BACKPACK) + var/static/list/slots = list( + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET, + "hands" = ITEM_SLOT_HANDS) for(var/eq_path in special_equipment) - var/obj/O = new eq_path + var/obj/O = new eq_path(get_turf(receiver.current)) H.equip_in_one_of_slots(O, slots) /datum/objective/assassinate @@ -320,9 +367,11 @@ GLOBAL_LIST_EMPTY(objectives) /datum/objective/hijack name = "hijack" - explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody." - team_explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody. Leave no team member behind." - martyr_compatible = 0 //Technically you won't get both anyway. + explanation_text = "Hijack the emergency shuttle by overriding the navigation protocols using the shuttle computer." + team_explanation_text = "Hijack the emergency shuttle by overriding the navigation protocols, using the shuttle computer. Leave no team member behind." + martyr_compatible = FALSE //Technically you won't get both anyway. + /// Overrides the hijack speed of any antagonist datum it is on ONLY, no other datums are impacted. + var/hijack_speed_override = 1 /datum/objective/hijack/check_completion() // Requires all owners to escape. if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) @@ -333,24 +382,33 @@ GLOBAL_LIST_EMPTY(objectives) return FALSE return SSshuttle.emergency.is_hijacked() -/datum/objective/hijack/single - name = "hijack" - explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody." - team_explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody. Team members lost is not a concern for this operation." - martyr_compatible = 0 //Technically you won't get both anyway. +/datum/objective/elimination + name = "elimination" + explanation_text = "Slaughter all loyalist crew aboard the shuttle. You, and any likeminded individuals, must be the only remaining people on the shuttle." + team_explanation_text = "Slaughter all loyalist crew aboard the shuttle. You, and any likeminded individuals, must be the only remaining people on the shuttle. Leave no team member behind." + martyr_compatible = FALSE -/datum/objective/hijack/single/check_completion() // Requires all owners to escape. +/datum/objective/elimination/check_completion() if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) return FALSE var/list/datum/mind/owners = get_owners() - var/single_escape = FALSE for(var/datum/mind/M in owners) - if(considered_alive(M) && SSshuttle.emergency.shuttle_areas[get_area(M.current)]) - single_escape = TRUE - break - if(!single_escape) + if(!considered_alive(M, enforce_human = FALSE) || !SSshuttle.emergency.shuttle_areas[get_area(M.current)]) + return FALSE + return SSshuttle.emergency.elimination_hijack() + +/datum/objective/elimination/highlander + name="highlander elimination" + explanation_text = "Escape on the shuttle alone. Ensure that nobody else makes it out." + +/datum/objective/elimination/highlander/check_completion() + if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) return FALSE - return SSshuttle.emergency.is_hijacked() + var/list/datum/mind/owners = get_owners() + for(var/datum/mind/M in owners) + if(!considered_alive(M, enforce_human = FALSE) || !SSshuttle.emergency.shuttle_areas[get_area(M.current)]) + return FALSE + return SSshuttle.emergency.elimination_hijack(filter_by_human = FALSE, solo_hijack = TRUE) /datum/objective/block name = "no organics on shuttle" @@ -818,7 +876,14 @@ GLOBAL_LIST_EMPTY(possible_items_special) return FALSE return TRUE +//Teratoma objective + +/datum/objective/chaos + name = "spread chaos" + explanation_text = "Spread misery and chaos upon the station." +/datum/objective/chaos/check_completion() + return TRUE //End Changeling Objectives /datum/objective/destroy diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 2bd194af3e37f..73f380cdfb0db 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -84,7 +84,7 @@ /datum/objective_item/steal/reactive name = "the reactive teleport armor." - targetitem = /obj/item/clothing/suit/armor/reactive + targetitem = /obj/item/clothing/suit/armor/reactive/teleport difficulty = 5 excludefromjob = list("Research Director") @@ -116,7 +116,7 @@ //Items with special checks! /datum/objective_item/steal/plasma - name = "28 moles of plasma (full tank)." + name = "28 moles of plasma (full tank). Be sure to fill up the tank with additional plasma since it doesn't start full!" targetitem = /obj/item/tank difficulty = 3 excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician") @@ -124,7 +124,7 @@ /datum/objective_item/steal/plasma/check_special_completion(obj/item/tank/T) var/target_amount = text2num(name) var/found_amount = 0 - found_amount += T.air_contents.get_moles(/datum/gas/plasma) + found_amount += T.air_contents.get_moles(GAS_PLASMA) return found_amount>=target_amount @@ -166,6 +166,12 @@ return 1 return 0 +/datum/objective_item/steal/blackbox + name = "the blackbox." + targetitem = /obj/item/blackbox + difficulty = 10 + excludefromjob = list("Chief Engineer","Station Engineer","Atmospheric Technician") + //Unique Objectives /datum/objective_item/unique/docs_red name = "the \"Red\" secret documents." diff --git a/code/game/gamemodes/overthrow/overthrow.dm b/code/game/gamemodes/overthrow/overthrow.dm index 4ab67be0925dc..042bdb4f55634 100644 --- a/code/game/gamemodes/overthrow/overthrow.dm +++ b/code/game/gamemodes/overthrow/overthrow.dm @@ -4,7 +4,7 @@ config_tag = "overthrow" report_type = "overthrow" antag_flag = ROLE_OVERTHROW - restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician") + restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") required_players = 20 // the core idea is of a swift, bloodless coup, so it shouldn't be as chaotic as revs. required_enemies = 2 // minimum two teams, otherwise it's just nerfed revs. recommended_enemies = 4 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 7961eb835e776..e5cf04998785c 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -13,7 +13,8 @@ report_type = "revolution" antag_flag = ROLE_REV false_report_weight = 10 - restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician") + restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") + required_jobs = list(list("Captain"=1),list("Head of Personnel"=1),list("Head of Security"=1),list("Chief Engineer"=1),list("Research Director"=1),list("Chief Medical Officer"=1)) //Any head present required_players = 30 required_enemies = 2 recommended_enemies = 3 @@ -118,7 +119,6 @@ if(!finished) SSticker.mode.check_win() check_counter = 0 - return FALSE ////////////////////////////////////// //Checks if the revs have won or not// @@ -128,7 +128,6 @@ finished = 1 else if(check_heads_victory()) finished = 2 - return /////////////////////////////// //Checks if the round is over// @@ -138,7 +137,7 @@ if(finished) SSshuttle.clearHostileEnvironment(src) return ..() - if(finished != 0 && end_when_heads_dead) + if(finished && end_when_heads_dead) return TRUE else return ..() @@ -211,7 +210,7 @@ return ..() /datum/game_mode/revolution/speedy/process() - . = ..() + ..() if(check_counter == 0) if (world.time > endtime && !fuckingdone) fuckingdone = TRUE diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm deleted file mode 100644 index ddb622ab08c54..0000000000000 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ /dev/null @@ -1,141 +0,0 @@ -/* - This is for the sandbox for now, - maybe useful later for an actual thing? - -Sayu -*/ - -/obj/structure/door_assembly - var/datum/airlock_maker/maker = null - -/obj/structure/door_assembly/attack_hand() - . = ..() - if(.) - return - if(maker) - maker.interact() - -/datum/airlock_maker - var/obj/structure/door_assembly/linked = null - - var/list/access_used = null - var/require_all = 1 - - var/paintjob = "none" - var/glassdoor = 0 - - var/doorname = "airlock" - -/datum/airlock_maker/New(var/atom/target_loc) - linked = new(target_loc) - linked.maker = src - linked.anchored = FALSE - access_used = list() - - interact() - -/datum/airlock_maker/proc/linkpretty(href,desc,active) - if(!desc) - var/static/list/defaults = list("No","Yes") - desc = defaults[active+1] - if(active) - return "[desc]" - return "[desc]" - -/datum/airlock_maker/proc/interact() - var/list/leftcolumn = list() - var/list/rightcolumn = list() - leftcolumn += "Required Access" - for(var/access in get_all_accesses()) - leftcolumn += linkpretty("access=[access]",get_access_desc(access),access in access_used) - leftcolumn += "Require all listed accesses: [linkpretty("reqall",null,require_all)]" - - rightcolumn += "Paintjob" - for(var/option in list("none","engineering","atmos","security","command","medical","research","mining","maintenance","external","highsecurity")) - rightcolumn += linkpretty("paint=[option]",option,option == paintjob) - rightcolumn += "Glass door: " + linkpretty("glass",null,glassdoor) + "
" - var/length = max(leftcolumn.len,rightcolumn.len) - - var/dat = "You may move the model airlock around. A new airlock will be built in its space when you click done, below.
" - dat += "Door name: \"[doorname]\"" - dat += "
| " - if(i<=leftcolumn.len) - dat += leftcolumn[i] - dat += " | " - if(i<=rightcolumn.len) - dat += rightcolumn[i] - dat += " |
Finalize Airlock Construction | Cancel and Destroy Airlock" - usr << browse(dat,"window=airlockmaker") - -/datum/airlock_maker/Topic(var/href,var/list/href_list) - if(!usr) - return - if(!src || !linked || !linked.loc) - usr << browse(null,"window=airlockmaker") - return - - if("rename" in href_list) - var/newname = stripped_input(usr,"New airlock name:","Name the airlock",doorname) - if(newname) - doorname = newname - if("access" in href_list) - var/value = text2num(href_list["access"]) - access_used ^= value - if("reqall" in href_list) - require_all = !require_all - if("paint" in href_list) - paintjob = href_list["paint"] - if("glass" in href_list) - glassdoor = !glassdoor - - if("cancel" in href_list) - usr << browse(null,"window=airlockmaker") - qdel(linked) - qdel(src) - return - - if("done" in href_list) - usr << browse(null,"window=airlockmaker") - var/turf/t_loc = linked.loc - qdel(linked) - if(!istype(t_loc)) - return - - var/target_type = "/obj/machinery/door/airlock" - if(glassdoor) - if(paintjob != "none") - if(paintjob in list("external","highsecurity","maintenance")) // no glass version - target_type += "/[paintjob]" - else - target_type += "/glass_[paintjob]" - else - target_type += "/glass" - else if(paintjob != "none") - target_type += "/[paintjob]" - var/final = target_type - target_type = text2path(final) - if(!target_type) - to_chat(usr, "Didn't work, contact Sayu with this: [final]") - usr << browse(null,"window=airlockmaker") - return - - var/obj/machinery/door/D = new target_type(t_loc) - - D.name = doorname - - if(access_used.len == 0) - D.req_access = null - D.req_one_access = null - else if(require_all) - D.req_access = access_used.Copy() - D.req_one_access = null - else - D.req_access = null - D.req_one_access = access_used.Copy() - - return - - interact() diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 609373b597e8a..c00b862abf12b 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -9,9 +9,11 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) sandbox.owner = src.ckey if(src.client.holder) sandbox.admin = 1 - verbs += new/mob/proc/sandbox_panel + + add_verb(/mob/proc/sandbox_panel) /mob/proc/sandbox_panel() set name = "Sandbox Panel" + set category = "Sandbox" if(sandbox) sandbox.update() @@ -41,6 +43,8 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) "Standard Tools", "Spawn Flashlight" = "hsbspawn&path=[/obj/item/flashlight]", "Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]", + "Spawn Tier 4 BSRPED" = "hsbspawn&path=[/obj/item/storage/part_replacer/bluespace/tier4]", + "Spawn Toolbelt" = "hsbspawn&path=[/obj/item/storage/belt/utility/chief/full]", "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/lightreplacer]", "Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]", "Spawn All-Access ID" = "hsbaaid", @@ -56,11 +60,11 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) "Spawn Inf. Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/infinite]", "Spawn Rapid Construction Device" = "hsbrcd", "Spawn RCD Ammo" = "hsb_safespawn&path=[/obj/item/rcd_ammo]", - "Spawn Airlock" = "hsbairlock", "Miscellaneous", "Spawn Air Scrubber" = "hsbscrubber", - "Spawn Welding Fuel Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/fueltank]", + "Spawn Debug Tech Disk" = "hsbspawn&path=[/obj/item/disk/tech_disk/debug]", + "Spawn All Materials" = "hsbspawn&path=[/obj/structure/closet/syndicate/resources/everything]", "Spawn Water Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/watertank]", "Bots", @@ -220,12 +224,6 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) new/obj/item/construction/rcd/combat(usr.loc) - // - // New sandbox airlock maker - // - if("hsbairlock") - new /datum/airlock_maker(usr.loc) - // // Object spawn window // diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 8d4846d579e38..afc5e2b1f344d 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -6,10 +6,13 @@ announce_span = "info" announce_text = "Build your own station... or just shoot each other!" - + allow_persistence_save = FALSE /datum/game_mode/sandbox/pre_setup() + + CONFIG_SET(flag/allow_random_events, FALSE) //stops harmful events + for(var/mob/M in GLOB.player_list) M.CanBuild() return 1 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 69dd3f033dab3..96a677682309b 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -12,7 +12,7 @@ antag_flag = ROLE_TRAITOR false_report_weight = 20 //Reports of traitors are pretty common. restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Brig Physician") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 8d849c8c145e5..05b6e0d7baa86 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -29,20 +29,15 @@ // update the icon_state /obj/machinery/bluespace_beacon/proc/updateicon() - var/state="floor_beacon" - if(invisibility) - icon_state = "[state]f" - + icon_state = "floor_beaconf" else - icon_state = "[state]" + icon_state = "floor_beacon" /obj/machinery/bluespace_beacon/process() - if(!Beacon) + if(QDELETED(Beacon)) //Don't move it out of nullspace BACK INTO THE GAME for the love of god var/turf/T = loc Beacon = new(T) Beacon.invisibility = INVISIBILITY_MAXIMUM else if (Beacon.loc != loc) Beacon.forceMove(loc) - - updateicon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index a11cccb4aeda4..1a5138c5f6797 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -48,6 +48,7 @@ for(var/i in 1 to I) available_chems |= possible_chems[i] reset_chem_buttons() + ui_update() /obj/machinery/sleeper/update_icon() if(state_open) @@ -61,6 +62,7 @@ open_machine() /obj/machinery/sleeper/Exited(atom/movable/user) + . = ..() if (!state_open && user == occupant) container_resist(user) @@ -68,6 +70,7 @@ if (!state_open) container_resist(user) +//Note: open_machine and close_machine already ui_update() /obj/machinery/sleeper/open_machine() if(!state_open && !panel_open) flick("[initial(icon_state)]-anim", src) @@ -129,6 +132,12 @@ open_machine() +/obj/machinery/sleeper/ui_requires_update(mob/user, datum/tgui/ui) + . = ..() + + if(occupant) + . = TRUE // Only autoupdate when occupied + /obj/machinery/sleeper/ui_state(mob/user) if(controls_inside) return GLOB.default_state @@ -233,6 +242,7 @@ occupant.reagents.add_reagent(chem_buttons[chem], 10) //emag effect kicks in here so that the "intended" chem is used for all checks, for extra FUUU if(user) log_combat(user, occupant, "injected [chem] into", addition = "via [src]") + use_power(100) return TRUE /obj/machinery/sleeper/proc/chem_allowed(chem) @@ -260,16 +270,8 @@ icon_state = "sleeper_s" controls_inside = TRUE -/obj/machinery/sleeper/syndie/fullupgrade/Initialize() - . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/machine/sleeper(null) - component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) - component_parts += new /obj/item/stock_parts/manipulator/femto(null) - component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new /obj/item/stack/cable_coil(null) - RefreshParts() +/obj/machinery/sleeper/syndie/fullupgrade + circuit = /obj/item/circuitboard/machine/sleeper/fullupgrade /obj/machinery/sleeper/clockwork name = "soothing sleeper" diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 0f46d648920bb..17ac11c6acaaa 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -92,6 +92,8 @@ Class Procs: pressure_resistance = 15 max_integrity = 200 layer = BELOW_OBJ_LAYER //keeps shit coming out of the machine from ending up underneath it. + flags_ricochet = RICOCHET_HARD + ricochet_chance_mod = 0.3 anchored = TRUE interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT @@ -113,7 +115,10 @@ Class Procs: var/critical_machine = FALSE //If this machine is critical to station operation and should have the area be excempted from power failures. var/list/occupant_typecache //if set, turned into typecache in Initialize, other wise, defaults to mob/living typecache var/atom/movable/occupant = null - var/speed_process = FALSE // Process as fast as possible? + /// Viable flags to go here are START_PROCESSING_ON_INIT, or START_PROCESSING_MANUALLY. See code\__DEFINES\machines.dm for more information on these flags. + var/processing_flags = START_PROCESSING_ON_INIT + /// What subsystem this machine will use, which is generally SSmachines or SSfastprocess. By default all machinery use SSmachines. This fires a machine's process() roughly every 2 seconds. + var/subsystem_type = /datum/controller/subsystem/machines var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created var/damage_deflection = 0 @@ -128,7 +133,7 @@ Class Procs: /obj/machinery/Initialize() if(!armor) - armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70) + armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70, "stamina" = 0) . = ..() GLOB.machines += src @@ -136,22 +141,29 @@ Class Procs: circuit = new circuit circuit.apply_default_parts(src) - if(!speed_process) - START_PROCESSING(SSmachines, src) - else - START_PROCESSING(SSfastprocess, src) + if(processing_flags & START_PROCESSING_ON_INIT) + begin_processing() + power_change() RegisterSignal(src, COMSIG_ENTER_AREA, .proc/power_change) - if (occupant_typecache) + if(occupant_typecache) occupant_typecache = typecacheof(occupant_typecache) +/// Helper proc for telling a machine to start processing with the subsystem type that is located in its `subsystem_type` var. +/obj/machinery/proc/begin_processing() + var/datum/controller/subsystem/processing/subsystem = locate(subsystem_type) in Master.subsystems + START_PROCESSING(subsystem, src) + +/// Helper proc for telling a machine to stop processing with the subsystem type that is located in its `subsystem_type` var. +/obj/machinery/proc/end_processing() + var/datum/controller/subsystem/processing/subsystem = locate(subsystem_type) in Master.subsystems + STOP_PROCESSING(subsystem, src) + /obj/machinery/Destroy() GLOB.machines.Remove(src) - if(!speed_process) - STOP_PROCESSING(SSmachines, src) - else - STOP_PROCESSING(SSfastprocess, src) + if(datum_flags & DF_ISPROCESSING) // A sizeable portion of machines stops processing before qdel + end_processing() dropContents() if(length(component_parts)) for(var/atom/A in component_parts) @@ -162,9 +174,6 @@ Class Procs: /obj/machinery/proc/locate_machinery() return -/obj/machinery/process()//If you dont use process or power why are you here - return PROCESS_KILL - /obj/machinery/proc/process_atmos()//If you dont use process why are you here return PROCESS_KILL @@ -175,12 +184,14 @@ Class Procs: new /obj/effect/temp_visual/emp(loc) /obj/machinery/proc/open_machine(drop = TRUE) + SEND_SIGNAL(src, COMSIG_MACHINE_OPEN, drop) state_open = TRUE density = FALSE if(drop) dropContents() update_icon() updateUsrDialog() + ui_update() /obj/machinery/proc/dropContents(list/subset = null) var/turf/T = get_turf(src) @@ -197,6 +208,7 @@ Class Procs: return occupant_typecache ? is_type_in_typecache(am, occupant_typecache) : isliving(am) /obj/machinery/proc/close_machine(atom/movable/target = null) + SEND_SIGNAL(src, COMSIG_MACHINE_CLOSE, target) state_open = FALSE density = TRUE if(!target) @@ -218,6 +230,7 @@ Class Procs: target.forceMove(src) updateUsrDialog() update_icon() + ui_update() /obj/machinery/proc/auto_use_power() if(!powered(power_channel)) @@ -311,11 +324,11 @@ Class Procs: /obj/machinery/Topic(href, href_list) ..() if(!can_interact(usr)) - return 1 + return TRUE if(!usr.canUseTopic(src)) - return 1 + return TRUE add_fingerprint(usr) - return 0 + return FALSE //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 4935c9d4d308f..0bb005c791ba4 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -6,7 +6,7 @@ layer = PROJECTILE_HIT_THRESHHOLD_LAYER plane = FLOOR_PLANE max_integrity = 200 - armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) + armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30, "stamina" = 0) var/uses = 20 var/cooldown = 0 diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 6c957acd4e70e..357edff1f6de7 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -98,7 +98,7 @@ var/datum/radio_frequency/radio_connection - var/on = TRUE + var/on = TRUE // Reviewer: I can't find any way to turn this thing off but it stays var/alert = FALSE /obj/machinery/airlock_sensor/incinerator_toxmix @@ -138,7 +138,9 @@ if(on) var/datum/gas_mixture/air_sample = return_air() var/pressure = round(air_sample.return_pressure(),0.1) - alert = (pressure < ONE_ATMOSPHERE*0.8) + if((pressure < ONE_ATMOSPHERE*0.8) != alert) + alert = !alert + update_icon() var/datum/signal/signal = new(list( "tag" = id_tag, @@ -148,8 +150,6 @@ radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) - update_icon() - /obj/machinery/airlock_sensor/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm index eed15b65e25e1..d4e8e014e2c25 100644 --- a/code/game/machinery/airlock_cycle_control.dm +++ b/code/game/machinery/airlock_cycle_control.dm @@ -53,8 +53,9 @@ req_access = list(ACCESS_ATMOSPHERICS) max_integrity = 250 integrity_failure = 80 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30, "stamina" = 0) resistance_flags = FIRE_PROOF + layer = ABOVE_WINDOW_LAYER var/cyclestate = AIRLOCK_CYCLESTATE_INOPEN var/interior_pressure = ONE_ATMOSPHERE @@ -291,7 +292,6 @@ door.unbolt() /obj/machinery/advanced_airlock_controller/process() - . = ..() process_atmos() /obj/machinery/advanced_airlock_controller/process_atmos() @@ -601,6 +601,7 @@ ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "AdvancedAirlockController") + ui.set_autoupdate(TRUE) // Pressure display, mode changes as part of the cycle process ui.open() /obj/machinery/advanced_airlock_controller/ui_data(mob/user) @@ -687,10 +688,12 @@ A.do_animate("deny") if(is_allowed) cycle_to(text2num(params["exterior"])) + . = TRUE if("skip") if((world.time - skip_timer) >= skip_delay && (cyclestate == AIRLOCK_CYCLESTATE_OUTCLOSING || cyclestate == AIRLOCK_CYCLESTATE_OUTOPENING || cyclestate == AIRLOCK_CYCLESTATE_INOPENING || cyclestate == AIRLOCK_CYCLESTATE_INCLOSING)) is_skipping = TRUE - if((locked && !usr.has_unlimited_silicon_privilege) || (usr.has_unlimited_silicon_privilege && aidisabled)) + . = TRUE + if(!. && ((locked && !usr.has_unlimited_silicon_privilege) || (usr.has_unlimited_silicon_privilege && aidisabled))) return switch(action) if("lock") @@ -708,34 +711,46 @@ vents[vent] = curr_role & ~(role_to_toggle) else vents[vent] = curr_role | role_to_toggle + . = TRUE if("set_airlock_role") var/airlock = locate(params["airlock_id"]) if(airlock == null || airlocks[airlock] == null) return airlocks[airlock] = !!text2num(params["val"]) + . = TRUE if("clear_vis") vis_target = null + . = TRUE if("set_vis_vent") var/vent = locate(params["vent_id"]) if(vent == null || vents[vent] == null) return vis_target = vent + . = TRUE if("set_vis_airlock") var/airlock = locate(params["airlock_id"]) if(airlock == null || airlocks[airlock] == null) return vis_target = airlock + . = TRUE if("scan") scan() + . = TRUE if("interior_pressure") interior_pressure = CLAMP(text2num(params["pressure"]), 0, ONE_ATMOSPHERE) + . = TRUE if("exterior_pressure") exterior_pressure = CLAMP(text2num(params["pressure"]), 0, ONE_ATMOSPHERE) + . = TRUE if("depressurization_margin") depressurization_margin = CLAMP(text2num(params["pressure"]), 0.15, 40) + . = TRUE if("skip_delay") skip_delay = CLAMP(text2num(params["skip_delay"]), 0, 1200) - update_icon(TRUE) + . = TRUE + + if(.) + update_icon(TRUE) /obj/machinery/advanced_airlock_controller/proc/request_from_door(airlock) var/role = airlocks[airlock] @@ -766,7 +781,6 @@ skip_timer = world.time /obj/machinery/advanced_airlock_controller/AltClick(mob/user) - ..() if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc)) return else @@ -780,7 +794,6 @@ locked = !locked update_icon() to_chat(user, "You [ locked ? "lock" : "unlock"] the airlock controller interface.") - updateUsrDialog() else to_chat(user, "Access denied.") return diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index a39056c895fe0..a3e37cd1e9e09 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) circuit = /obj/item/circuitboard/machine/announcement_system var/obj/item/radio/headset/radio - var/arrival = "%PERSON has signed up as %RANK" + var/arrival = "%PERSON has signed up as %RANK." var/arrivalToggle = 1 var/newhead = "%PERSON, %RANK, is the department head." var/newheadToggle = 1 @@ -93,7 +93,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) else if(message_type == "CRYOSTORAGE") message = CompileText("%PERSON, %RANK has been moved to cryo storage.", user, rank) else if(message_type == "ARRIVALS_BROKEN") - message = "The arrivals shuttle has been damaged. Docking for repairs..." + message = "The arrivals shuttle has been damaged. Docking for repairs." if(channels.len == 0) radio.talk_into(src, message, null) @@ -140,6 +140,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(NewMessage) arrival = NewMessage log_game("The arrivals announcement was updated: [NewMessage] by:[key_name(usr)]") + . = TRUE if("NewheadText") var/NewMessage = trim(html_encode(param["newText"]), MAX_MESSAGE_LEN) if(!usr.canUseTopic(src, !issilicon(usr))) @@ -147,13 +148,15 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(NewMessage) newhead = NewMessage log_game("The head announcement was updated: [NewMessage] by:[key_name(usr)]") + . = TRUE if("NewheadToggle") newheadToggle = !newheadToggle update_icon() + . = TRUE if("ArrivalToggle") arrivalToggle = !arrivalToggle update_icon() - add_fingerprint(usr) + . = TRUE /obj/machinery/announcement_system/attack_robot(mob/living/silicon/user) . = attack_ai(user) @@ -172,6 +175,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) arrival = pick("#!@%ERR-34%2 CANNOT LOCAT@# JO# F*LE!", "CRITICAL ERROR 99.", "ERR)#: DA#AB@#E NOT F(*ND!") newhead = pick("OV#RL()D: \[UNKNOWN??\] DET*#CT)D!", "ER)#R - B*@ TEXT F*O(ND!", "AAS.exe is not responding. NanoOS is searching for a solution to the problem.") + ui_update() /obj/machinery/announcement_system/emp_act(severity) . = ..() diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index bca88699016a0..224eeb0110d5b 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -129,7 +129,6 @@ to_chat(user, "[src] is empty.") /obj/machinery/aug_manipulator/AltClick(mob/living/user) - ..() if(!user.canUseTopic(src, !issilicon(user))) return else diff --git a/code/game/machinery/autodoc.dm b/code/game/machinery/autodoc.dm deleted file mode 100644 index 9d5c247736a03..0000000000000 --- a/code/game/machinery/autodoc.dm +++ /dev/null @@ -1,167 +0,0 @@ -/obj/machinery/autodoc - name = "autodoc" - desc = "An advanced machine used for inserting organs and implants into the occupant." - density = TRUE - state_open = FALSE - icon = 'icons/obj/machines/autodoc.dmi' - icon_state = "autodoc_machine" - verb_say = "states" - idle_power_usage = 50 - circuit = /obj/item/circuitboard/machine/autodoc - var/obj/item/organ/storedorgan - var/organ_type = /obj/item/organ - var/processing = FALSE - var/surgerytime = 300 - -/obj/machinery/autodoc/Initialize() - . = ..() - update_icon() - -/obj/machinery/autodoc/RefreshParts() - var/max_time = 350 - for(var/obj/item/stock_parts/L in component_parts) - max_time -= (L.rating*10) - surgerytime = max(max_time,10) - -/obj/machinery/autodoc/examine(mob/user) - . = ..() - if((obj_flags & EMAGGED) && panel_open) - . += "[src]'s surgery protocols have been corrupted!" - if(processing) - . += "[src] is currently inserting [storedorgan] into [occupant]." - else if(storedorgan) - . += "[src] has been prepared to insert [storedorgan]." - -/obj/machinery/autodoc/close_machine(mob/user) - ..() - playsound(src, 'sound/machines/click.ogg', 50) - if(occupant) - if(!iscarbon(occupant)) - occupant.forceMove(drop_location()) - occupant = null - return - to_chat(occupant, "The doors to [src] clamp shut behind you.") - - dosurgery() - -/obj/machinery/autodoc/proc/dosurgery() - if(!storedorgan && !(obj_flags & EMAGGED)) - to_chat(occupant, "[src] currently has no implant stored.") - return - - occupant.visible_message("[occupant] presses a button on [src]. A mechanical humming can be heard.", "You feel a sharp sting as [src] starts inserting the organ into your body.") - playsound(get_turf(occupant), 'sound/weapons/circsawhit.ogg', 50, 1) - processing = TRUE - update_icon() - var/mob/living/carbon/C = occupant - if(obj_flags & EMAGGED) - - for(var/obj/item/bodypart/BP in reverseList(C.bodyparts)) //Chest and head are first in bodyparts, so we invert it to make them suffer more - C.emote("scream") - if(!HAS_TRAIT(C, TRAIT_NODISMEMBER)) - BP.dismember() - else - C.apply_damage(40, BRUTE, BP) - sleep(5) //2 seconds to get outta there before dying - if(!processing) - return - - occupant.visible_message("[src] dismembers [occupant]!", "[src] saws up your body!") - - else - sleep(surgerytime) - if(!processing) - return - var/obj/item/organ/currentorgan = C.getorganslot(storedorgan.slot) - if(currentorgan) - currentorgan.Remove(C) - currentorgan.forceMove(get_turf(src)) - storedorgan.Insert(occupant)//insert stored organ into the user - storedorgan = null - occupant.visible_message("[src] completes the surgery procedure.", "[src] inserts the organ into your body.") - playsound(src, 'sound/machines/microwave/microwave-end.ogg', 100, 0) - processing = FALSE - open_machine() - -/obj/machinery/autodoc/open_machine(mob/user) - if(processing) - occupant.visible_message("[user] cancels [src]'s procedure.", "[src] stops inserting the organ into your body.") - processing = FALSE - if(occupant) - occupant.forceMove(drop_location()) - occupant = null - ..(FALSE) - -/obj/machinery/autodoc/interact(mob/user) - if(panel_open) - to_chat(user, "Close the maintenance panel first.") - return - - if(state_open) - close_machine() - return - - open_machine() - -/obj/machinery/autodoc/attackby(obj/item/I, mob/user, params) - if(istype(I, organ_type)) - if(storedorgan) - to_chat(user, "[src] already has an implant stored.") - return - if(!user.transferItemToLoc(I, src)) - return - storedorgan = I - I.forceMove(src) - to_chat(user, "You insert the [I] into [src].") - else - return ..() - -/obj/machinery/autodoc/screwdriver_act(mob/living/user, obj/item/I) - . = TRUE - if(..()) - return - if(occupant) - to_chat(user, "[src] is currently occupied!") - return - if(state_open) - to_chat(user, "[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!") - return - if(default_deconstruction_screwdriver(user, icon_state, icon_state, I)) - if(storedorgan) - storedorgan.forceMove(drop_location()) - storedorgan = null - update_icon() - return - return FALSE - -/obj/machinery/autodoc/crowbar_act(mob/living/user, obj/item/I) - if(default_deconstruction_crowbar(I)) - return TRUE - - -/obj/machinery/autodoc/update_icon() - overlays.Cut() - if(!state_open) - if(processing) - overlays += "[icon_state]_door_on" - overlays += "[icon_state]_stack" - overlays += "[icon_state]_smoke" - overlays += "[icon_state]_green" - else - overlays += "[icon_state]_door_off" - if(occupant) - if(powered(AREA_USAGE_EQUIP)) - overlays += "[icon_state]_stack" - overlays += "[icon_state]_yellow" - else - overlays += "[icon_state]_red" - else if(powered(AREA_USAGE_EQUIP)) - overlays += "[icon_state]_red" - if(panel_open) - overlays += "[icon_state]_panel" - -/obj/machinery/autodoc/emag_act(mob/user) - if(obj_flags & EMAGGED) - return - obj_flags |= EMAGGED - to_chat(user, "You reprogram [src]'s surgery procedures.") diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm deleted file mode 100644 index 7bee5202ff3bf..0000000000000 --- a/code/game/machinery/autolathe.dm +++ /dev/null @@ -1,610 +0,0 @@ -#define AUTOLATHE_MAX_POWER_USE 2000 - -/obj/machinery/autolathe - name = "autolathe" - desc = "It produces items using iron, copper, and glass." - icon_state = "autolathe" - density = TRUE - use_power = IDLE_POWER_USE - idle_power_usage = 10 - active_power_usage = 100 - circuit = /obj/item/circuitboard/machine/autolathe - layer = BELOW_OBJ_LAYER - - var/operating = FALSE - var/wants_operate = FALSE - var/disabled = 0 - var/shocked = FALSE - var/hack_wire - var/disable_wire - var/shock_wire - - //Security modes - var/security_interface_locked = TRUE - var/hacked = FALSE - - var/busy = FALSE - var/prod_coeff = 1 - - var/datum/design/being_built - var/process_completion_world_tick = 0 - var/total_build_time = 0 - var/datum/techweb/stored_research - - var/list/categories = list( - "Tools", - "Electronics", - "Construction", - "T-Comm", - "Security", - "Machinery", - "Medical", - "Misc", - "Dinnerware", - "Imported" - ) - - var/output_direction = 0 - var/obj/item/disk/design_disk/inserted_disk - - //A list of all the printable items - - //Queue items - - //Viewing mobs of the UI to update - var/list/mob/viewing_mobs = list() - //Associative list: item_queue[design_id] = list("amount" = int, "repeating" = bool, "build_mat" = something) - //These are the items in the build queue. (It's a queue that takes priority over item_queue) - var/list/build_queue = list() - //Associative list: item_queue[design_id] = list("amount" = int, "repeating" = bool, "build_mat" = something) - //The items in the item queue - var/list/item_queue = list() - //If true, once an item is processed it will be stuck right back on again - var/queue_repeating = FALSE - //The amount to readd to the queue when processing is done - var/stored_item_amount - -/obj/machinery/autolathe/Initialize() - AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/copper, /datum/material/gold, /datum/material/gold, /datum/material/silver, /datum/material/diamond, /datum/material/uranium, /datum/material/plasma, /datum/material/bluespace, /datum/material/bananium, /datum/material/titanium), 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert)) - . = ..() - - wires = new /datum/wires/autolathe(src) - stored_research = new /datum/techweb/specialized/autounlocking/autolathe - -/obj/machinery/autolathe/Destroy() - QDEL_NULL(wires) - return ..() - -/obj/machinery/autolathe/ui_state() - return GLOB.default_state - -/obj/machinery/autolathe/ui_interact(mob/user, datum/tgui/ui = null) - if(!is_operational()) - return - - if(shocked && !(stat & NOPOWER)) - shock(user,50) - - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "ModularFabricator") - ui.open() - ui.set_autoupdate(TRUE) - viewing_mobs += user - -/obj/machinery/autolathe/ui_close(mob/user) - . = ..() - viewing_mobs -= user - -/obj/machinery/autolathe/ui_static_data(mob/user) - var/list/data = list() - data["acceptsDisk"] = TRUE - - //Items - data["items"] = list() - var/list/categories_associative = list() - for(var/v in stored_research.researched_designs) - var/datum/design/D = SSresearch.techweb_design_by_id(v) - for(var/cat in D.category) - //Check if printable - if(!(cat in categories)) - continue - if(!islist(categories_associative[cat])) - categories_associative[cat] = list() - - //Calculate cost - var/list/material_cost = list() - for(var/material_id in D.materials) - material_cost += list(list( - "name" = material_id, - "amount" = D.materials[material_id] / MINERAL_MATERIAL_AMOUNT, - )) - - //Add - categories_associative[cat] += list(list( - "name" = D.name, - "design_id" = D.id, - "material_cost" = material_cost, - )) - - //Categories and their items - for(var/category in categories_associative) - data["items"] += list(list( - "category_name" = category, - "category_items" = categories_associative[category], - )) - - //Inserted data disk - data["diskInserted"] = inserted_disk - return data - -/obj/machinery/autolathe/ui_data(mob/user) - var/list/data = list() - //Output direction - data["outputDir"] = output_direction - - //Queue - data["queue"] = list() - - //Build queue at the top - for(var/item_design_id in build_queue) - var/datum/design/D = SSresearch.techweb_design_by_id(item_design_id) - var/list/additional_data = build_queue[item_design_id] - data["queue"] += list(list( - "name" = D.name, - "amount" = additional_data["amount"], - "repeat" = additional_data["repeating"], - "design_id" = item_design_id, - "build_queue" = 1, - )) - - //Real queue at the bottom - for(var/item_design_id in item_queue) - var/datum/design/D = SSresearch.techweb_design_by_id(item_design_id) - var/list/additional_data = item_queue[item_design_id] - data["queue"] += list(list( - "name" = D.name, - "amount" = additional_data["amount"], - "repeat" = additional_data["repeating"], - "design_id" = item_design_id, - "build_queue" = 0, - )) - - //Materials - data["materials"] = list() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - for(var/material in materials.materials) - var/datum/material/M = material - var/mineral_amount = materials.materials[material] - data["materials"] += list(list( - "name" = M.name, - "amount" = mineral_amount, - "datum" = M.type - )) - - //Thing being made - if(being_built && total_build_time && process_completion_world_tick) - data["being_build"] = list( - "design_id" = being_built.id, - "name" = being_built.name, - "progress" = 100-(100*((process_completion_world_tick - world.time)/total_build_time)), - ) - - //Security interface - data["sec_interface_unlock"] = !security_interface_locked - data["hacked"] = hacked - - //Being Build - return data - -/obj/machinery/autolathe/ui_act(action, params) - if(..()) - return - - switch(action) - if("toggle_safety") - if(security_interface_locked) - return - adjust_hacked(!hacked) - - if("toggle_lock") - if(obj_flags & EMAGGED) - return - security_interface_locked = TRUE - - if("output_dir") - output_direction = text2num(params["direction"]) - - if("upload_disk") - var/obj/item/disk/design_disk/D = inserted_disk - if(!istype(D)) - return - for(var/B in D.blueprints) - if(B) - stored_research.add_design(B) - update_viewer_statics() - - if("eject_disk") - if(!inserted_disk) - return - var/obj/item/disk/design_disk/disk = inserted_disk - disk.forceMove(get_turf(src)) - update_viewer_statics() - - if("eject_material") - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - var/material_datum = params["material_datum"] //Comes out as text - var/amount = text2num(params["amount"]) - if(amount <= 0 || amount > 50) - return - for(var/mat in materials.materials) - var/datum/material/M = mat - if("[M.type]" == material_datum) - materials.retrieve_sheets(amount, M, get_release_turf()) - break - - if("queue_repeat") - queue_repeating = text2num(params["repeating"]) - - if("clear_queue") - item_queue.Cut() - - if("item_repeat") - var/design_id = params["design_id"] - var/repeating_mode = text2num(params["repeating"]) - if(!item_queue["[design_id]"]) - return - item_queue["[design_id]"]["repeating"] = repeating_mode - - if("clear_item") - var/design_id = params["design_id"] - var/queue_type = text2num(params["build_queue"]) - if(queue_type) - build_queue -= design_id - else - item_queue -= design_id - - if("queue_item") - var/design_id = params["design_id"] - var/amount = text2num(params["amount"]) - add_to_queue(item_queue, design_id, amount) - - if("build_item") - var/design_id = params["design_id"] - var/amount = text2num(params["amount"]) - add_to_queue(build_queue, design_id, amount) - - if("begin_process") - begin_process() - - //Update the UI for them so it's smooth - ui_interact(usr) - -/obj/machinery/autolathe/proc/update_viewer_statics() - for(var/mob/M in viewing_mobs) - if(QDELETED(M) || !(M.client || M.mind)) - continue - update_static_data(M) - -/obj/machinery/autolathe/proc/add_to_queue(queue_list, design_id, amount, repeat=null) - if(queue_list["[design_id]"]) - queue_list["[design_id]"]["amount"] += amount - if(queue_list["[design_id]"]["amount"] <= 0) - queue_list -= "[design_id]" - return - if(amount <= 0) - return - //Check if the item uses custom materials - var/datum/design/requested_item = stored_research.isDesignResearchedID(design_id) - var/datum/material/used_material = repeat - if(!istype(used_material)) - for(var/MAT in requested_item.materials) - used_material = MAT - if(istext(used_material)) //This means its a category - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - var/list/list_to_show = list() - for(var/i in SSmaterials.materials_by_category[used_material]) - if(materials.materials[i] > 0) - list_to_show += i - used_material = input("Choose [used_material]", "Custom Material") as null|anything in sortList(list_to_show, /proc/cmp_typepaths_asc) - if(!used_material) - return //Didn't pick any material, so you can't build shit either. - - queue_list["[design_id]"] = list( - "amount" = amount, - "repeating" = repeat, - "build_mat" = used_material, - ) - -/obj/machinery/autolathe/proc/get_release_turf() - var/turf/T - if(output_direction) - T = get_step(src, output_direction) - if(is_blocked_turf(T, TRUE)) - T = get_turf(src) - else - T = get_turf(src) - return T - -/obj/machinery/autolathe/on_deconstruction() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.retrieve_all() - -/obj/machinery/autolathe/attackby(obj/item/O, mob/user, params) - - if(ACCESS_SECURITY in O.GetAccess() && !(obj_flags & EMAGGED)) - security_interface_locked = !security_interface_locked - to_chat(user, "You [security_interface_locked?"lock":"unlock"] the security controls of [src].") - return TRUE - - if (busy) - to_chat(user, "The autolathe is busy. Please wait for completion of previous operation.") - return TRUE - - if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", O)) - return TRUE - - if(default_deconstruction_crowbar(O)) - return TRUE - - if(panel_open && is_wire_tool(O)) - wires.interact(user) - return TRUE - - if(user.a_intent == INTENT_HARM) //so we can hit the machine - return ..() - - if(stat) - return TRUE - - if(istype(O, /obj/item/disk/design_disk)) - user.visible_message("[user] loads \the [O] into \the [src]...", - "You load a design from \the [O]...", - "You hear the chatter of a floppy drive.") - inserted_disk = O - O.forceMove(src) - update_viewer_statics() - return TRUE - - return ..() - - -/obj/machinery/autolathe/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted) - if(ispath(type_inserted, /obj/item/stack/ore/bluespace_crystal)) - use_power(MINERAL_MATERIAL_AMOUNT / 10) - else - switch(id_inserted) - if (/datum/material/iron) - flick("autolathe_o",src)//plays metal insertion animation - if(/datum/material/copper) - flick("autolathe_c",src)//plays metal insertion animation - else - flick("autolathe_r",src)//plays glass insertion animation by default otherwise - use_power(min(1000, amount_inserted / 100)) - //Begin processing to continue the queue if we had items in the queue - if(wants_operate) - begin_process() - -/obj/machinery/autolathe/proc/begin_process() - if(busy || operating || disabled) - return - var/requested_design_id = null - var/from_build_queue = FALSE - if(LAZYLEN(build_queue)) - requested_design_id = build_queue[1] - from_build_queue = TRUE - else if(LAZYLEN(item_queue)) - requested_design_id = item_queue[1] - //Queue processing done - if(!requested_design_id) - say("Queue processing completed.") - operating = FALSE - return - operating = TRUE - //Doubles as protection from bad things and makes sure we can still make the item. - being_built = stored_research.isDesignResearchedID(requested_design_id) - if(!being_built) - playsound(src, 'sound/machines/buzz-two.ogg', 50) - say("Unknown design requested, removing from queue.") - build_queue -= requested_design_id - item_queue -= requested_design_id - addtimer(CALLBACK(src, .proc/restart_process), 50) - return - - var/multiplier = 1 - var/is_stack = ispath(being_built.build_path, /obj/item/stack) - //Only items that can stack should be build en mass, since we now have queues. - if(is_stack) - if(from_build_queue) - multiplier = build_queue[requested_design_id]["amount"] - else - multiplier = item_queue[requested_design_id]["amount"] - multiplier = CLAMP(multiplier,1,50) - - ///////////////// - - var/coeff = (is_stack ? 1 : prod_coeff) //stacks are unaffected by production coefficient - var/total_amount = 0 - - for(var/MAT in being_built.materials) - total_amount += being_built.materials[MAT] - - var/power = max(AUTOLATHE_MAX_POWER_USE, (total_amount)*multiplier/5) //Change this to use all materials - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - - var/list/materials_used = list() - var/list/custom_materials = list() //These will apply their material effect, This should usually only be one. - - for(var/MAT in being_built.materials) - var/datum/material/used_material = MAT - var/amount_needed = being_built.materials[MAT] * coeff * multiplier - if(istext(used_material)) //This means its a category - if(from_build_queue) - used_material = build_queue[requested_design_id]["build_mat"] - else - used_material = item_queue[requested_design_id]["build_mat"] - if(!used_material) - build_queue -= requested_design_id - item_queue -= requested_design_id - addtimer(CALLBACK(src, .proc/restart_process), 50) - return //Didn't pick any material, so you can't build shit either. - custom_materials[used_material] += amount_needed - - materials_used[used_material] = amount_needed - - if(materials.has_materials(materials_used)) - busy = TRUE - use_power(power) - icon_state = "autolathe_n" - var/time = is_stack ? 32 : (32 * coeff * multiplier) ** 0.8 - //===Repeating mode=== - //Remove from queue - if(from_build_queue) - build_queue[requested_design_id]["amount"] -= multiplier - if(build_queue[requested_design_id]["amount"] <= 0) - build_queue -= requested_design_id - else - var/list/queue_data = item_queue[requested_design_id] - item_queue[requested_design_id]["amount"] -= multiplier - var/removed = FALSE - if(item_queue[requested_design_id]["amount"] <= 0) - item_queue -= requested_design_id - removed = TRUE - //Requeue if necessary - if(queue_repeating || queue_data["repeating"]) - stored_item_amount ++ - if(removed) - add_to_queue(item_queue, requested_design_id, stored_item_amount, queue_data["build_mat"]) - stored_item_amount = 0 - //Create item and restart - process_completion_world_tick = world.time + time - total_build_time = time - addtimer(CALLBACK(src, .proc/make_item, power, materials_used, custom_materials, multiplier, coeff, is_stack), time) - addtimer(CALLBACK(src, .proc/restart_process), time + 5) - else - say("Insufficient materials, operation will proceed when sufficient materials are available.") - operating = FALSE - wants_operate = TRUE - -/obj/machinery/autolathe/proc/restart_process() - operating = FALSE - wants_operate = FALSE - if(disabled) - return - begin_process() - -/obj/machinery/autolathe/proc/make_item(power, var/list/materials_used, var/list/picked_materials, multiplier, coeff, is_stack) - if(QDELETED(src)) - return - //Stops the queue - if(disabled) - operating = FALSE - return - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - var/turf/A = get_release_turf() - use_power(power) - materials.use_materials(materials_used) - if(is_stack) - var/obj/item/stack/N = new being_built.build_path(A, multiplier) - N.update_icon() - N.autolathe_crafted(src) - else - for(var/i=1, i<=multiplier, i++) - var/obj/item/new_item = new being_built.build_path(A) - new_item.materials = new_item.materials.Copy() - for(var/mat in materials_used) - new_item.materials[mat] = materials_used[mat] / multiplier - new_item.autolathe_crafted(src) - - if(length(picked_materials)) - new_item.set_custom_materials(picked_materials, 1 / multiplier) //Ensure we get the non multiplied amount - being_built = null - icon_state = "autolathe" - busy = FALSE - updateDialog() - -/obj/machinery/autolathe/RefreshParts() - var/T = 0 - for(var/obj/item/stock_parts/matter_bin/MB in component_parts) - T += MB.rating*75000 - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.max_amount = T - T=1.2 - for(var/obj/item/stock_parts/manipulator/M in component_parts) - T -= M.rating*0.2 - prod_coeff = min(1,max(0,T)) // Coeff going 1 -> 0,8 -> 0,6 -> 0,4 - -/obj/machinery/autolathe/examine(mob/user) - . += ..() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [prod_coeff*100]%." - -/obj/machinery/autolathe/proc/can_build(datum/design/D, amount = 1) - if(D.make_reagents.len) - return FALSE - - var/coeff = (ispath(D.build_path, /obj/item/stack) ? 1 : prod_coeff) - - var/list/required_materials = list() - - for(var/i in D.materials) - required_materials[i] = D.materials[i] * coeff * amount - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - - return materials.has_materials(required_materials) - -/obj/machinery/autolathe/proc/reset(wire) - switch(wire) - if(WIRE_HACK) - if(!wires.is_cut(wire)) - adjust_hacked(FALSE) - if(WIRE_SHOCK) - if(!wires.is_cut(wire)) - shocked = FALSE - if(WIRE_DISABLE) - if(!wires.is_cut(wire)) - disabled = FALSE - -/obj/machinery/autolathe/proc/shock(mob/user, prb) - if(stat & (BROKEN|NOPOWER)) // unpowered, no shock - return FALSE - if(!prob(prb)) - return FALSE - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(5, 1, src) - s.start() - if (electrocute_mob(user, get_area(src), src, 0.7, TRUE)) - return TRUE - else - return FALSE - -/obj/machinery/autolathe/proc/adjust_hacked(state) - hacked = state - for(var/id in SSresearch.techweb_designs) - var/datum/design/D = SSresearch.techweb_design_by_id(id) - if((D.build_type & AUTOLATHE) && ("hacked" in D.category)) - if(hacked) - stored_research.add_design(D) - else - stored_research.remove_design(D) - update_viewer_statics() - -/obj/machinery/autolathe/emag_act(mob/user) - if(obj_flags & EMAGGED) - return - security_interface_locked = FALSE - adjust_hacked(TRUE) - playsound(src, "sparks", 100, 1) - obj_flags |= EMAGGED - -/obj/machinery/autolathe/hacked/Initialize() - . = ..() - adjust_hacked(TRUE) - -//Called when the object is constructed by an autolathe -//Has a reference to the autolathe so you can do !!FUN!! things with hacked lathes -/obj/item/proc/autolathe_crafted(obj/machinery/autolathe/A) - return diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index ea9e8606ae11f..0067e3f1b70d1 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -38,25 +38,28 @@ return return ..() - -/obj/machinery/computer/bank_machine/process() +/obj/machinery/computer/bank_machine/process(delta_time) ..() if(siphoning) if (stat & (BROKEN|NOPOWER)) say("Insufficient power. Halting siphon.") end_syphon() + ui_update() + return + var/siphon_am = 100 * delta_time var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) - if(!D.has_money(200)) + if(!D.has_money(siphon_am)) say("Cargo budget depleted. Halting siphon.") end_syphon() + ui_update() return - playsound(src, 'sound/items/poster_being_created.ogg', 100, 1) - syphoning_credits += 200 - D.adjust_money(-200) + playsound(src, 'sound/items/poster_being_created.ogg', 100, TRUE) + syphoning_credits += siphon_am + D.adjust_money(-siphon_am) if(next_warning < world.time && prob(15)) var/area/A = get_area(loc) - var/message = "Unauthorized credit withdrawal underway in [A.map_name]!!" + var/message = "Unauthorized credit withdrawal underway in [initial(A.name)]!!" radio.talk_into(src, message, radio_channel) next_warning = world.time + minimum_time_between_warnings diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index a11d60e680acf..0f06149b255c0 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -4,13 +4,14 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "doorctrl" var/skin = "doorctrl" + layer = ABOVE_WINDOW_LAYER power_channel = AREA_USAGE_ENVIRON var/obj/item/assembly/device var/obj/item/electronics/airlock/board var/device_type = null var/id = null var/initialized_button = 0 - armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 70) + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 70, "stamina" = 0) use_power = IDLE_POWER_USE idle_power_usage = 2 resistance_flags = LAVA_PROOF | FIRE_PROOF @@ -111,6 +112,12 @@ playsound(src, "sparks", 100, 1) obj_flags |= EMAGGED +/obj/machinery/button/eminence_act(mob/living/simple_animal/eminence/eminence) + . = ..() + to_chat(usr, "You begin manipulating [src]!") + if(do_after(eminence, 20, target=get_turf(eminence))) + attack_hand(eminence) + /obj/machinery/button/attack_ai(mob/user) if(!panel_open) return attack_hand(user) @@ -272,7 +279,6 @@ icon_state = "launcher" skin = "launcher" device_type = /obj/item/assembly/control/crematorium - req_access = list() id = 1 /obj/machinery/button/crematorium/indestructible diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 73988b87d3904..3ad1c16347c9c 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -4,7 +4,7 @@ /obj/machinery/camera name = "security camera" - desc = "It's used to monitor rooms." + desc = "A wireless camera used to monitor rooms. It is powered by a long-life internal battery." icon = 'icons/obj/machines/camera.dmi' icon_state = "camera" //mapping icon to represent upgrade states. if you want a different base icon, update default_camera_icon as well as this. use_power = ACTIVE_POWER_USE @@ -13,7 +13,7 @@ layer = WALL_OBJ_LAYER resistance_flags = FIRE_PROOF - armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 50) + armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 50, "stamina" = 0) max_integrity = 100 integrity_failure = 50 var/default_camera_icon = "camera" //the camera's base icon used by update_icon - icon_state is primarily used for mapping display purposes. @@ -23,9 +23,13 @@ var/start_active = FALSE //If it ignores the random chance to start broken on round start var/invuln = null var/obj/item/camera_bug/bug = null - var/obj/structure/camera_assembly/assembly = null + var/datum/weakref/assembly_ref = null var/area/myarea = null + FASTDMM_PROP(\ + pinned_vars = list("name", "network", "c_tag")\ + ) + //OTHER var/view_range = 7 @@ -57,6 +61,7 @@ for(var/i in network) network -= i network += lowertext(i) + var/obj/structure/camera_assembly/assembly if(CA) assembly = CA if(assembly.xray_module) @@ -74,6 +79,7 @@ else assembly = new(src) assembly.state = 4 //STATE_FINISHED + assembly_ref = WEAKREF(assembly) GLOB.cameranet.cameras += src GLOB.cameranet.addCamera(src) if (isturf(loc)) @@ -89,17 +95,18 @@ /obj/machinery/camera/Destroy() if(can_use()) toggle_cam(null, 0) //kick anyone viewing out and remove from the camera chunks + GLOB.cameranet.removeCamera(src) GLOB.cameranet.cameras -= src + cancelCameraAlarm() if(isarea(myarea)) - LAZYREMOVE(myarea.cameras, src) - QDEL_NULL(assembly) + myarea.clear_camera(src) + QDEL_NULL(assembly_ref) QDEL_NULL(emp_component) if(bug) - bug.bugged_cameras -= src.c_tag + bug.bugged_cameras -= c_tag if(bug.current == src) bug.current = null bug = null - cancelCameraAlarm() return ..() /obj/machinery/camera/examine(mob/user) @@ -222,6 +229,9 @@ /obj/machinery/camera/attackby(obj/item/I, mob/living/user, params) // UPGRADES if(panel_open) + var/obj/structure/camera_assembly/assembly = assembly_ref?.resolve() + if(!assembly) + assembly_ref = null if(I.tool_behaviour == TOOL_ANALYZER) if(!isXRay(TRUE)) //don't reveal it was already upgraded if was done via MALF AI Upgrade Camera Network ability if(!user.temporarilyRemoveItemFromInventory(I)) @@ -297,7 +307,7 @@ else to_chat(user, "Camera bugged.") bug = I - bug.bugged_cameras[src.c_tag] = src + bug.bugged_cameras[src.c_tag] = WEAKREF(src) return else if(istype(I, /obj/item/pai_cable)) @@ -320,12 +330,13 @@ /obj/machinery/camera/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) if(disassembled) + var/obj/structure/camera_assembly/assembly = assembly_ref?.resolve() if(!assembly) assembly = new() assembly.forceMove(drop_location()) assembly.state = 1 assembly.setDir(dir) - assembly = null + assembly_ref = null else var/obj/item/I = new /obj/item/wallframe/camera (loc) I.obj_integrity = I.max_integrity * 0.5 @@ -343,7 +354,7 @@ else icon_state = "[xray_module][default_camera_icon][in_use_lights ? "_in_use" : ""]" -/obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = 1) +/obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = TRUE) status = !status if(can_use()) GLOB.cameranet.addCamera(src) @@ -397,6 +408,8 @@ return FALSE if(stat & EMPED) return FALSE + if(is_jammed()) + return FALSE return TRUE /obj/machinery/camera/proc/can_see() @@ -444,7 +457,7 @@ /obj/machinery/camera/get_remote_view_fullscreens(mob/user) if(view_range == short_range) //unfocused - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2) /obj/machinery/camera/update_remote_sight(mob/living/user) user.see_invisible = SEE_INVISIBLE_LIVING //can't see ghosts through cameras diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index af5093d6caf9a..e2e6e393e680c 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -38,10 +38,9 @@ return TRUE /obj/machinery/camera/Destroy() - var/area/ai_monitored/A = get_area(src) localMotionTargets = null - if(istype(A)) - A.motioncameras -= src + if(area_motion) + area_motion.motioncameras -= src cancelAlarm() return ..() diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index dcbff23b21ae5..e37c764e7375e 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -72,12 +72,14 @@ // UPGRADE PROCS /obj/machinery/camera/proc/isEmpProof(ignore_malf_upgrades) - return (upgrades & CAMERA_UPGRADE_EMP_PROOF) && (!(ignore_malf_upgrades && assembly.malf_emp_firmware_active)) + var/obj/structure/camera_assembly/assembly = assembly_ref?.resolve() + return (upgrades & CAMERA_UPGRADE_EMP_PROOF) && (!(ignore_malf_upgrades && assembly?.malf_emp_firmware_active)) /obj/machinery/camera/proc/upgradeEmpProof(malf_upgrade, ignore_malf_upgrades) if(isEmpProof(ignore_malf_upgrades)) //pass a malf upgrade to ignore_malf_upgrades so we can replace the malf module with the normal one return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version. emp_component = AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES | EMP_PROTECT_CONTENTS) + var/obj/structure/camera_assembly/assembly = assembly_ref?.resolve() if(malf_upgrade) assembly.malf_emp_firmware_active = TRUE //don't add parts to drop, update icon, ect. reconstructing it will also retain the upgrade. assembly.malf_emp_firmware_present = TRUE //so the upgrade is retained after incompatible parts are removed. @@ -98,11 +100,13 @@ /obj/machinery/camera/proc/isXRay(ignore_malf_upgrades) + var/obj/structure/camera_assembly/assembly = assembly_ref?.resolve() return (upgrades & CAMERA_UPGRADE_XRAY) && (!(ignore_malf_upgrades && assembly.malf_xray_firmware_active)) /obj/machinery/camera/proc/upgradeXRay(malf_upgrade, ignore_malf_upgrades) if(isXRay(ignore_malf_upgrades)) //pass a malf upgrade to ignore_malf_upgrades so we can replace the malf upgrade with the normal one return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version. + var/obj/structure/camera_assembly/assembly = assembly_ref?.resolve() if(malf_upgrade) assembly.malf_xray_firmware_active = TRUE //don't add parts to drop, update icon, ect. reconstructing it will also retain the upgrade. assembly.malf_xray_firmware_present = TRUE //so the upgrade is retained after incompatible parts are removed. @@ -128,6 +132,8 @@ /obj/machinery/camera/proc/upgradeMotion() if(isMotion()) return + var/obj/structure/camera_assembly/assembly = assembly_ref?.resolve() + if(name == initial(name)) name = "motion-sensitive security camera" if(!assembly.proxy_module) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index bf1b84fe5d4f8..767cb90abad74 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -49,9 +49,9 @@ track.namecounts[name] = 1 if(ishuman(L)) - track.humans[name] = L + track.humans[name] = WEAKREF(L) else - track.others[name] = L + track.others[name] = WEAKREF(L) var/list/targets = sortList(track.humans) + sortList(track.others) @@ -67,9 +67,9 @@ if(!track.initialized) trackable_mobs() - var/mob/target = (isnull(track.humans[target_name]) ? track.others[target_name] : track.humans[target_name]) + var/datum/weakref/target = (isnull(track.humans[target_name]) ? track.others[target_name] : track.humans[target_name]) - ai_actual_track(target) + ai_actual_track(target.resolve()) /mob/living/silicon/ai/proc/ai_actual_track(mob/living/target) if(!istype(target)) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 4d13f9d61b392..8f824e2864640 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -11,7 +11,7 @@ pass_flags = PASSTABLE var/obj/item/stock_parts/cell/charging = null var/chargelevel = -1 - var/charge_rate = 500 + var/charge_rate = 250 /obj/machinery/cell_charger/update_icon() cut_overlays() @@ -28,7 +28,7 @@ if(charging) . += "Current charge: [round(charging.percent(), 1)]%." if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Charge rate at [charge_rate]J per cycle." + . += "The status display reads: Charging power: [charge_rate]W." /obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell) && !panel_open) @@ -115,17 +115,17 @@ charging.emp_act(severity) /obj/machinery/cell_charger/RefreshParts() - charge_rate = 500 + charge_rate = 250 for(var/obj/item/stock_parts/capacitor/C in component_parts) charge_rate *= C.rating -/obj/machinery/cell_charger/process() +/obj/machinery/cell_charger/process(delta_time) if(!charging || !anchored || (stat & (BROKEN|NOPOWER))) return if(charging.percent() >= 100) return - use_power(charge_rate) - charging.give(charge_rate) //this is 2558, efficient batteries exist + use_power(charge_rate * delta_time) + charging.give(charge_rate * delta_time) //this is 2558, efficient batteries exist update_icon() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index da20066cc047b..1baf6947c205a 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -60,6 +60,7 @@ var/mob/living/mob_occupant = occupant go_out() if(mob_occupant) + // Random comment: this is a bad situation since breaking the pod ejects the occupant log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to Destroy().") QDEL_NULL(radio) QDEL_NULL(countdown) @@ -94,7 +95,6 @@ user.examinate(src) /obj/machinery/clonepod/AltClick(mob/user) - . = ..() if (alert(user, "Are you sure you want to empty the cloning pod?", "Empty Reagent Storage:", "Yes", "No") != "Yes") return to_chat(user, "You empty \the [src]'s release valve onto the floor.") @@ -112,13 +112,14 @@ . += "Synthflesh consumption at [round(fleshamnt*90, 1)]cm3 per clone.
" . += "The reagent display reads: [round(reagents.total_volume, 1)] / [reagents.maximum_volume] cm3" if(efficiency > 5) - . += "Pod has been upgraded to support autoprocessing and apply beneficial mutations." + . += "Pod has been upgraded to support autoprocessing and apply beneficial mutations." //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. /obj/item/disk/data name = "cloning data disk" icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. + var/list/genetic_makeup_buffer = list() var/list/fields = list() var/list/mutations = list() var/max_mutations = 6 @@ -138,6 +139,15 @@ . = ..() . += "The write-protect tab is set to [read_only ? "protected" : "unprotected"]." +/obj/item/disk/data/debug + name = "Debug genetic data disk" + desc = "A disk that contains all existing genetic mutations." + max_mutations = 100 + +/obj/item/disk/data/debug/Initialize() + . = ..() + for(var/datum/mutation/human/HM as() in GLOB.all_mutations) + mutations += new HM //Clonepod @@ -276,7 +286,7 @@ /obj/machinery/clonepod/process() var/mob/living/mob_occupant = occupant - if(!is_operational()) //Autoeject if power is lost + if(!is_operational()) //Autoeject if power is lost (or the pod is dysfunctional due to whatever reason) if(mob_occupant) go_out() log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to power loss.") @@ -319,7 +329,7 @@ mob_occupant.Unconscious(80) var/dmg_mult = CONFIG_GET(number/damage_multiplier) //Slowly get that clone healed and finished. - mob_occupant.adjustCloneLoss(-((speed_coeff / 2) * dmg_mult)) + mob_occupant.adjustCloneLoss(-((speed_coeff / 2) * dmg_mult), TRUE, TRUE) if(reagents.has_reagent(/datum/reagent/medicine/synthflesh, fleshamnt)) reagents.remove_reagent(/datum/reagent/medicine/synthflesh, fleshamnt) else if(reagents.has_reagent(/datum/reagent/blood, fleshamnt*3)) @@ -341,7 +351,7 @@ var/obj/item/bodypart/BP = I BP.attach_limb(mob_occupant) - use_power(7500) //This might need tweaking. + use_power(5000 * speed_coeff) //This might need tweaking. else if(mob_occupant && (mob_occupant.cloneloss <= (100 - heal_level))) connected_message("Cloning Process Complete.") @@ -436,7 +446,7 @@ connected.updateUsrDialog() return TRUE -/obj/machinery/clonepod/proc/go_out() +/obj/machinery/clonepod/proc/go_out(move = TRUE) countdown.stop() var/mob/living/mob_occupant = occupant var/turf/T = get_turf(src) @@ -456,6 +466,12 @@ if(!mob_occupant) return + + if(HAS_TRAIT(mob_occupant, TRAIT_NOCLONELOSS)) + var/cl_loss = mob_occupant.getCloneLoss() + mob_occupant.adjustBruteLoss(cl_loss, FALSE) + mob_occupant.setCloneLoss(0, FALSE, TRUE) + current_insurance = null REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, CLONING_POD_TRAIT) REMOVE_TRAIT(mob_occupant, TRAIT_STABLELIVER, CLONING_POD_TRAIT) @@ -469,7 +485,8 @@ to_chat(occupant, "There is a bright flash!
You feel like a new being.") mob_occupant.flash_act() - occupant.forceMove(T) + if(move) + occupant.forceMove(T) icon_state = "pod_0" mob_occupant.domutcheck(1) //Waiting until they're out before possible monkeyizing. The 1 argument forces powers to manifest. for(var/fl in unattached_flesh) @@ -479,6 +496,13 @@ occupant = null clonemind = null +// Guess they moved out on their own, remove any clone status effects +// If the occupant var is null, welp what can we do +/obj/machinery/clonepod/Exited(atom/movable/AM, atom/newloc) + if(AM == occupant) + go_out(FALSE) + . = ..() + /obj/machinery/clonepod/proc/malfunction() var/mob/living/mob_occupant = occupant if(mob_occupant) @@ -551,7 +575,7 @@ qdel(fl) unattached_flesh.Cut() - H.setCloneLoss(CLONE_INITIAL_DAMAGE) //Yeah, clones start with very low health, not with random, because why would they start with random health + H.setCloneLoss(CLONE_INITIAL_DAMAGE, TRUE, TRUE) //Yeah, clones start with very low health, not with random, because why would they start with random health // In addition to being cellularly damaged, they also have no limbs or internal organs. // Applying brainloss is done when the clone leaves the pod, so application of traumas can happen // based on the level of damage sustained. @@ -582,6 +606,16 @@ . = ..() reagents.add_reagent(/datum/reagent/medicine/synthflesh, 100) +//Experimental cloner; clones a body regardless of the owner's status. +/obj/machinery/clonepod/experimental + name = "experimental cloning pod" + desc = "An ancient cloning pod. It seems to be an early prototype of the experimental cloners used in Nanotrasen Stations." + icon = 'icons/obj/machines/cloning.dmi' + icon_state = "pod_0" + req_access = null + circuit = /obj/item/circuitboard/machine/clonepod/experimental + internal_radio = FALSE + /* * Manual -- A big ol' manual. */ diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 13c5d45a80ae1..e2872e8c31720 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -7,7 +7,7 @@ icon_screen = "crew" icon_keyboard = "med_key" circuit = /obj/item/circuitboard/computer/operating - var/mob/living/carbon/human/patient + var/obj/structure/table/optable/table var/obj/machinery/stasis/sbed var/list/advanced_surgeries = list() @@ -21,11 +21,11 @@ /obj/machinery/computer/operating/Destroy() for(var/direction in GLOB.cardinals) - table = locate(/obj/structure/table/optable, get_step(src, direction)) + table = locate(/obj/structure/table/optable) in get_step(src, direction) if(table && table.computer == src) table.computer = null else - sbed = locate(/obj/machinery/stasis, get_step(src, direction)) + sbed = locate(/obj/machinery/stasis) in get_step(src, direction) if(sbed && sbed.op_computer == src) sbed.op_computer = null . = ..() @@ -50,12 +50,12 @@ /obj/machinery/computer/operating/proc/find_table() for(var/direction in GLOB.cardinals) - table = locate(/obj/structure/table/optable, get_step(src, direction)) + table = locate(/obj/structure/table/optable) in get_step(src, direction) if(table) table.computer = src break else - sbed = locate(/obj/machinery/stasis, get_step(src, direction)) + sbed = locate(/obj/machinery/stasis) in get_step(src, direction) if(sbed) sbed.op_computer = src break @@ -69,6 +69,7 @@ if(!ui) ui = new(user, src, "OperatingComputer") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/computer/operating/ui_data(mob/user) var/list/data = list() @@ -80,20 +81,29 @@ surgery["desc"] = initial(S.desc) surgeries += list(surgery) data["surgeries"] = surgeries - data["patient"] = null + + //If there's no patient just hop to it yeah? + if(!table && !sbed) + data["patient"] = null + return data + + var/mob/living/carbon/human/patient + if(table) data["table"] = table - if(!table.check_patient()) + if(!table.check_eligible_patient()) return data data["patient"] = list() patient = table.patient else if(sbed) data["table"] = sbed - if(!sbed.check_patient()) + if(!ishuman(sbed.occupant) && !ismonkey(sbed.occupant)) return data data["patient"] = list() - patient = sbed.occupant + if(isliving(sbed.occupant)) + var/mob/living/live = sbed.occupant + patient = live else data["patient"] = null return data diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index fb7e568c88a5f..603225f0cdc1f 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -8,13 +8,16 @@ active_power_usage = 300 max_integrity = 200 integrity_failure = 100 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 20) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 20, "stamina" = 0) var/brightness_on = 2 var/icon_keyboard = "generic_key" var/icon_screen = "generic" var/clockwork = FALSE var/time_to_scewdrive = 20 + ///Should the [icon_state]_broken overlay be shown as an emissive or regular overlay? + var/broken_overlay_emissive = FALSE + /obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C) . = ..() power_change() @@ -38,6 +41,7 @@ icon_screen = "ratvar[rand(1, 3)]" icon_keyboard = "ratvar_key[rand(1, 2)]" icon_state = "ratvarcomputer" + broken_overlay_emissive = TRUE update_icon() /obj/machinery/computer/narsie_act() @@ -46,6 +50,7 @@ icon_screen = initial(icon_screen) icon_keyboard = initial(icon_keyboard) icon_state = initial(icon_state) + broken_overlay_emissive = initial(broken_overlay_emissive) update_icon() /obj/machinery/computer/update_icon() @@ -57,12 +62,17 @@ add_overlay(icon_keyboard) // This whole block lets screens ignore lighting and be visible even in the darkest room - // We can't do this for many things that emit light unfortunately because it layers over things that would be on top of it var/overlay_state = icon_screen if(stat & BROKEN) - overlay_state = "[icon_state]_broken" - SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, plane, dir) - SSvis_overlays.add_vis_overlay(src, icon, overlay_state, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir, alpha=128) + if(broken_overlay_emissive) + overlay_state = "[icon_state]_broken" + else + add_overlay("[icon_state]_broken") + overlay_state = null + + if(overlay_state) + SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, plane, dir) + SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, EMISSIVE_PLANE, dir) /obj/machinery/computer/power_change() ..() diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 877611f5168e8..33c69629d4266 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -21,6 +21,11 @@ return ..() +/obj/machinery/computer/aifixer/ui_requires_update(mob/user, datum/tgui/ui) + . = ..() + if(restoring) + . = TRUE + /obj/machinery/computer/aifixer/ui_state(mob/user) return GLOB.default_state @@ -29,6 +34,7 @@ if(!ui) ui = new(user, src, "AiRestorer") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/computer/aifixer/ui_data(mob/user) var/list/data = list() @@ -84,6 +90,8 @@ restoring = Fix() if(oldstat != occupier.stat) update_icon() + if(!restoring) + ui_update() // One final update /obj/machinery/computer/aifixer/update_icon() ..() @@ -116,6 +124,7 @@ to_chat(user, "Transfer Successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") card.AI = null update_icon() + ui_update() else //Uploading AI from terminal to card if(occupier && !restoring) @@ -125,6 +134,7 @@ card.AI = occupier occupier = null update_icon() + ui_update() else if (restoring) to_chat(user, "ERROR: Reconstruction in progress.") else if (!occupier) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index a0c6ffdc271b8..5be24afde5728 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -38,7 +38,7 @@ ..(user) /obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/APC) - return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors + return APC.get_virtual_z_level() == get_virtual_z_level() && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.stat && !istype(APC.area, /area/ai_monitored) && !APC.area.outdoors /obj/machinery/computer/apc_control/ui_interact(mob/living/user) . = ..() @@ -62,7 +62,7 @@ if(result_filters["Responsive"] && !APC.aidisabled) continue dat += "[A]
\ - Charge: [APC.cell ? "[DisplayEnergy(APC.cell.charge)] / [DisplayEnergy(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)" : "No Powercell Installed"]
\ + Charge: [APC.cell ? "[DisplayEnergy(APC.cell.charge)] / [DisplayEnergy(APC.cell.maxcharge)] ([round((APC.cell.charge / APC.cell.maxcharge) * 100)]%)" : "No power cell installed."]
\ Area: [APC.area]
\ [APC.aidisabled || APC.panel_open ? "APC does not respond to interface query." : "APC responds to interface query."]
" dat += "Check Logs
" diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 5172dbfdb48b4..1f696a9ac3eb1 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -30,6 +30,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/coin/antagtoken = 2, /obj/item/stack/tile/fakespace/loaded = 2, /obj/item/stack/tile/fakepit/loaded = 2, + /obj/item/stack/tile/eighties/loaded = 2, /obj/item/toy/toy_xeno = 2, /obj/item/storage/box/actionfigure = 1, /obj/item/restraints/handcuffs/fake = 2, @@ -43,12 +44,21 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/extendohand/acme = 1, /obj/item/hot_potato/harmless/toy = 1, /obj/item/card/emagfake = 1, + /obj/item/disk/nuclear/fake/obvious = 1, /obj/item/clothing/shoes/wheelys = 2, /obj/item/clothing/shoes/kindleKicks = 2, /obj/item/toy/plush/moth = 2, + /obj/item/toy/plush/rouny = 2, /obj/item/storage/box/heretic_asshole = 1, /obj/item/toy/eldrich_book = 1, - /obj/item/storage/belt/military/snack = 2)) + /obj/item/storage/belt/military/snack = 2, + /obj/item/choice_beacon/pet/cat = 1, + /obj/item/choice_beacon/pet/mouse = 1, + /obj/item/choice_beacon/pet/corgi = 1, + /obj/item/choice_beacon/pet/hamster = 1, + /obj/item/choice_beacon/pet/pug = 1, + /obj/item/choice_beacon/pet/pingu = 1, + /obj/item/choice_beacon/pet/clown = 1)) /obj/machinery/computer/arcade name = "random arcade" @@ -57,6 +67,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( icon_keyboard = "no_keyboard" icon_screen = "invaders" clockwork = TRUE //it'd look weird + broken_overlay_emissive = TRUE var/list/prize_override var/prizeselect = /obj/item/coin/arcade_token light_color = LIGHT_COLOR_GREEN @@ -80,29 +91,20 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/machinery/computer/arcade/proc/prizevend(mob/user) SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "arcade", /datum/mood_event/arcade) + var/atom/movable/the_prize if(prob(0.0001)) //1 in a million - new /obj/item/gun/energy/pulse/prize(src) + the_prize = new /obj/item/gun/energy/pulse/prize(drop_location()) SSmedals.UnlockMedal(MEDAL_PULSE, user.client) else - new prizeselect(src) + the_prize = new prizeselect(drop_location()) - var/atom/movable/the_prize = pick(contents) visible_message("[src] dispenses [the_prize]!", "You hear a chime and a clunk.") - the_prize.forceMove(get_turf(src)) - /obj/machinery/computer/arcade/proc/redeem(mob/user) - var/redeemselect - if(!contents.len) - if(prize_override) - redeemselect = pickweight(prize_override) - else - redeemselect = pickweight(GLOB.arcade_prize_pool) + var/redeemselect = pickweight(length(prize_override) ? prize_override : GLOB.arcade_prize_pool) - new redeemselect(src) - var/atom/movable/the_prize = pick(contents) + var/atom/movable/the_prize = new redeemselect(drop_location()) visible_message("[src] dispenses [the_prize]!", "You hear a chime and a clunk.") - the_prize.forceMove(get_turf(src)) /obj/machinery/computer/arcade/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/coin/arcade_token) || istype(W, /obj/item/coin/bananium)) @@ -196,7 +198,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( blocked = TRUE var/attackamt = rand(2,6) temp = "You attack for [attackamt] damage!" - playsound(loc, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) updateUsrDialog() if(turtle > 0) turtle-- @@ -210,7 +212,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( var/pointamt = rand(1,3) var/healamt = rand(6,8) temp = "You use [pointamt] magic to heal for [healamt] damage!" - playsound(loc, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) updateUsrDialog() turtle++ @@ -225,7 +227,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( blocked = TRUE var/chargeamt = rand(4,7) temp = "You regain [chargeamt] points" - playsound(loc, 'sound/arcade/mana.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/mana.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) player_mp += chargeamt if(turtle > 0) turtle-- @@ -260,7 +262,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(!gameover) gameover = TRUE temp = "[enemy_name] has fallen! Rejoice!" - playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) if(obj_flags & EMAGGED) new /obj/effect/spawner/newbomb/timer/syndicate(loc) @@ -277,13 +279,13 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( else if ((obj_flags & EMAGGED) && (turtle >= 4)) var/boomamt = rand(5,10) temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!" - playsound(loc, 'sound/arcade/boom.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/boom.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) player_hp -= boomamt else if ((enemy_mp <= 5) && (prob(70))) var/stealamt = rand(2,3) temp = "[enemy_name] steals [stealamt] of your power!" - playsound(loc, 'sound/arcade/steal.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/steal.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) player_mp -= stealamt updateUsrDialog() @@ -291,27 +293,27 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( gameover = TRUE sleep(10) temp = "You have been drained! GAME OVER" - playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) if(obj_flags & EMAGGED) usr.gib() SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "mana", (obj_flags & EMAGGED ? "emagged":"normal"))) else if ((enemy_hp <= 10) && (enemy_mp > 4)) temp = "[enemy_name] heals for 4 health!" - playsound(loc, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) enemy_hp += 4 enemy_mp -= 4 else var/attackamt = rand(3,6) temp = "[enemy_name] attacks for [attackamt] damage!" - playsound(loc, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) player_hp -= attackamt if ((player_mp <= 0) || (player_hp <= 0)) gameover = TRUE temp = "You have been crushed! GAME OVER" - playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10) + playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) if(obj_flags & EMAGGED) usr.gib() SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "hp", (obj_flags & EMAGGED ? "emagged":"normal"))) @@ -344,6 +346,15 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( // *** THE ORION TRAIL ** // +/obj/item/gamer_pamphlet + name = "pamphlet - \'Violent Video Games and You\'" + desc = "A pamphlet encouraging the reader to maintain a balanced lifestyle and take care of their mental health, while still enjoying video games in a healthy way. You probably don't need this..." + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "pamphlet" + item_state = "paper" + w_class = WEIGHT_CLASS_TINY + + #define ORION_TRAIL_WINTURN 9 //Orion Trail Events @@ -400,6 +411,16 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( var/gameStatus = ORION_STATUS_START var/canContinueEvent = 0 + var/obj/item/radio/Radio + var/static/list/gamers = list() + var/killed_crew = 0 + + +/obj/machinery/computer/arcade/orion_trail/Initialize() + . = ..() + Radio = new /obj/item/radio(src) + Radio.listening = 0 + /obj/machinery/computer/arcade/orion_trail/kobayashi name = "Kobayashi Maru control computer" desc = "A test for cadets" @@ -414,7 +435,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( stops = list("Pluto","Asteroid Belt","Proxima Centauri","Dead Space","Rigel Prime","Tau Ceti Beta","Black Hole","Space Outpost Beta-9","Orion Prime") stopblurbs = list( "Pluto, long since occupied with long-range sensors and scanners, stands ready to, and indeed continues to probe the far reaches of the galaxy.", - "At the edge of the Sol system lies a treacherous asteroid belt. Many have been crushed by stray asteroids and misguided judgement.", + "At the edge of the Sol system lies a treacherous asteroid belt. Many have been crushed by stray asteroids and misguided judgment.", "The nearest star system to Sol, in ages past it stood as a reminder of the boundaries of sub-light travel, now a low-population sanctuary for adventurers and traders.", "This region of space is particularly devoid of matter. Such low-density pockets are known to exist, but the vastness of it is astounding.", "Rigel Prime, the center of the Rigel system, burns hot, basking its planetary bodies in warmth and radiation.", @@ -441,12 +462,45 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( event = null gameStatus = ORION_STATUS_NORMAL lings_aboard = 0 + killed_crew = 0 //spaceport junk spaceport_raided = 0 spaceport_freebie = 0 last_spaceport_action = "" +/obj/machinery/computer/arcade/orion_trail/proc/report_player(mob/gamer) + if(gamers[gamer] == -2) + return // enough harassing them + + if(gamers[gamer] == -1) + say("WARNING: Continued antisocial behavior detected: Dispensing self-help literature.") + new /obj/item/gamer_pamphlet(get_turf(src)) + gamers[gamer]-- + return + + if(!(gamer in gamers)) + gamers[gamer] = 0 + + gamers[gamer]++ // How many times the player has 'prestiged' (massacred their crew) + + if(gamers[gamer] > 2 && prob(20 * gamers[gamer])) + + Radio.set_frequency(FREQ_SECURITY) + Radio.talk_into(src, "SECURITY ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please watch for violent behavior.", FREQ_SECURITY) + + Radio.set_frequency(FREQ_MEDICAL) + Radio.talk_into(src, "PSYCH ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please schedule psych evaluation.", FREQ_MEDICAL) + + gamers[gamer] = -1 + + if(!isnull(GLOB.data_core.general)) + for(var/datum/data/record/R in GLOB.data_core.general) + if(R.fields["name"] == gamer.name) + R.fields["m_stat"] = "*Unstable*" + return + + /obj/machinery/computer/arcade/orion_trail/ui_interact(mob/user) . = ..() if(fuel <= 0 || food <=0 || settlers.len == 0) @@ -570,16 +624,14 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(ORION_TRAIL_COLLISION) //by far the most damaging event if(prob(90)) playsound(loc, 'sound/effects/bang.ogg', 100, 1) - var/turf/open/floor/F - for(F in orange(1, src)) + for(var/turf/open/floor/F in RANGE_TURFS(1, src)) F.ScrapeAway() say("Something slams into the floor around [src], exposing it to space!") if(hull) sleep(10) say("A new floor suddenly appears around [src]. What the hell?") playsound(loc, 'sound/weapons/genhit.ogg', 100, 1) - var/turf/open/space/T - for(T in orange(1, src)) + for(var/turf/open/space/T in RANGE_TURFS(1, src)) T.PlaceOnTop(/turf/open/floor/plating) else say("Something slams into the floor around [src] - luckily, it didn't get through!") @@ -678,6 +730,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(gameStatus == ORION_STATUS_NORMAL || event == ORION_TRAIL_LING) var/sheriff = remove_crewmember() //I shot the sheriff playsound(loc,'sound/weapons/gunshot.ogg', 100, 1) + killed_crew++ if(settlers.len == 0 || alive == 0) say("The last crewmember [sheriff], shot themselves, GAME OVER!") @@ -686,6 +739,11 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( obj_flags &= EMAGGED gameStatus = ORION_STATUS_GAMEOVER event = null + + + if(killed_crew >= 4) + report_player(usr) + else if(obj_flags & EMAGGED) if(usr.name == sheriff) say("The crew of the ship chose to kill [usr.name]!") @@ -693,6 +751,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(event == ORION_TRAIL_LING) //only ends the ORION_TRAIL_LING event, since you can do this action in multiple places event = null + killed_crew-- // the kill was valid //Spaceport specific interactions //they get a header because most of them don't reset event (because it's a shop, you leave when you want to) @@ -705,6 +764,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( fuel -= 10 food -= 10 event() + killed_crew-- // I mean not really but you know else if(href_list["sellcrew"]) //sell a crewmember if(gameStatus == ORION_STATUS_MARKET) @@ -826,6 +886,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(ORION_TRAIL_OLDSHIP) eventdat += "
Your crew spots an old ship floating through space. It might have some supplies, but then again it looks rather unsafe." eventdat += "" + canContinueEvent = 1 if(ORION_TRAIL_SEARCH) switch(rand(100)) @@ -1125,6 +1186,10 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( newgame() obj_flags |= EMAGGED +/obj/machinery/computer/arcade/orion_trail/Destroy() + QDEL_NULL(Radio) + . = ..() + /mob/living/simple_animal/hostile/syndicate/ranged/smg/orion name = "spaceport security" desc = "Premier corporate security forces for all spaceports found along the Orion Trail." @@ -1183,23 +1248,51 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(!iscarbon(user)) return var/mob/living/carbon/c_user = user - if(!c_user.get_bodypart(BODY_ZONE_L_ARM) && !c_user.get_bodypart(BODY_ZONE_R_ARM)) - return - to_chat(c_user, "You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...") - if(do_after(c_user, 50, target = src)) - to_chat(c_user, "The guillotine drops on your arm, and the machine sucks it in!") - playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) - var/which_hand = BODY_ZONE_L_ARM - if(!(c_user.active_hand_index % 2)) - which_hand = BODY_ZONE_R_ARM - var/obj/item/bodypart/chopchop = c_user.get_bodypart(which_hand) - chopchop.dismember() - qdel(chopchop) - playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10) - for(var/i=1; i<=rand(3,5); i++) - prizevend(user) + if(obj_flags & EMAGGED) + if(!c_user.get_bodypart(BODY_ZONE_L_ARM) && !c_user.get_bodypart(BODY_ZONE_R_ARM)) + return + to_chat(c_user, "You move your hand towards the machine, and begin to hesitate as an extra-bloodied guillotine emerges from inside of it...") + if(do_after(c_user, 50, target = src)) + to_chat(c_user, "Robotic arms shoot out of the machine, remove all your limbs, and suck them in!") + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) + for(var/X in c_user.bodyparts) + var/obj/item/bodypart/BP = X + if(BP.body_part != HEAD && BP.body_part != CHEST) + if(BP.dismemberable) + BP.dismember() + qdel(BP) + playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) + for(var/i=1 to rand(20, 30)) + prizevend(user) + else + to_chat(c_user, "You (wisely) decide against putting your hand in the machine.") else - to_chat(c_user, "You (wisely) decide against putting your hand in the machine.") + if(!c_user.get_bodypart(BODY_ZONE_L_ARM) && !c_user.get_bodypart(BODY_ZONE_R_ARM)) + return + to_chat(c_user, "You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...") + if(do_after(c_user, 50, target = src)) + to_chat(c_user, "The guillotine drops on your arm, and the machine sucks it in!") + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) + var/which_hand = BODY_ZONE_L_ARM + if(!(c_user.active_hand_index % 2)) + which_hand = BODY_ZONE_R_ARM + var/obj/item/bodypart/chopchop = c_user.get_bodypart(which_hand) + chopchop.dismember() + qdel(chopchop) + playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) + for(var/i=1 to rand(3, 5)) + prizevend(user) + else + to_chat(c_user, "You (wisely) decide against putting your hand in the machine.") + + +/obj/machinery/computer/arcade/amputation/emag_act(mob/user) + if(obj_flags & EMAGGED) + return + to_chat(user, "You override the safety systems on the arcade machine.") + name = "Mediborg's Amputation Adventure: Deluxe Edition" + desc = "A picture of a blood-soaked medical cyborg flashes on the screen. The mediborg has glowing red eyes, and a speech bubble that says, \"Put your hand in the machine if you aren't a coward!\"" + obj_flags |= EMAGGED #undef ORION_TRAIL_WINTURN #undef ORION_TRAIL_RAIDERS diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm index 9493957df2f8b..38d90d406236a 100644 --- a/code/game/machinery/computer/arena.dm +++ b/code/game/machinery/computer/arena.dm @@ -187,7 +187,7 @@ to_chat(user,"[ckey] removed from [team] team.") /obj/machinery/computer/arena/proc/spawn_member(obj/machinery/arena_spawn/spawnpoint,ckey,team) - var/mob/oldbody = get_mob_by_key(ckey) + var/mob/oldbody = get_mob_by_ckey(ckey) if(!isobserver(oldbody)) return var/mob/living/carbon/human/M = new/mob/living/carbon/human(get_turf(spawnpoint)) @@ -217,7 +217,7 @@ . = list() for(var/team in team_keys) for(var/key in team_keys[team]) - var/mob/M = get_mob_by_key(key) + var/mob/M = get_mob_by_ckey(key) if(M) . += M @@ -336,7 +336,7 @@ dat += "
- "
for(var/ckey in team_keys[team])
var/player_status = "Not Present"
- var/mob/M = get_mob_by_key(ckey)
+ var/mob/M = get_mob_by_ckey(ckey)
if(M)
//Should define waiting room upper/lower corner and check if they're there instead of generic live/dead check
if(isobserver(M))
diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
index 454f459621bbd..60eeb51b1a79a 100644
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -57,7 +57,8 @@
to_chat(usr, "Minor alarm for [zone] cleared.")
minor_alarms -= zone
. = TRUE
- update_icon()
+ if(.)
+ update_icon()
/obj/machinery/computer/atmos_alert/proc/set_frequency(new_frequency)
SSradio.remove_object(src, receive_frequency)
@@ -81,6 +82,7 @@
else if (severity == "minor")
minor_alarms += zone
update_icon()
+ ui_update()
return
/obj/machinery/computer/atmos_alert/update_icon()
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index 0342825557dd2..548a2d69d3c18 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -63,7 +63,7 @@
var/total_moles = air_sample.total_moles()
if(total_moles)
for(var/gas_id in air_sample.get_gases())
- var/gas_name = GLOB.meta_gas_info[gas_id][META_GAS_NAME]
+ var/gas_name = GLOB.gas_data.names[gas_id]
signal.data["gases"][gas_name] = air_sample.get_moles(gas_id) / total_moles * 100
radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
@@ -76,11 +76,11 @@
/obj/machinery/air_sensor/Initialize()
. = ..()
- SSair.atmos_machinery += src
+ SSair.atmos_air_machinery += src
set_frequency(frequency)
/obj/machinery/air_sensor/Destroy()
- SSair.atmos_machinery -= src
+ SSair.atmos_air_machinery -= src
SSradio.remove_object(src, frequency)
return ..()
@@ -137,6 +137,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
if(!ui)
ui = new(user, src, "AtmosControlConsole")
ui.open()
+ ui.set_autoupdate(TRUE) // Gas sensors
/obj/machinery/computer/atmos_control/ui_data(mob/user)
var/data = list()
@@ -254,7 +255,16 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
/obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user)
var/list/IO = list()
var/datum/radio_frequency/freq = SSradio.return_frequency(frequency)
- var/list/devices = freq.devices["_default"]
+
+ var/list/devices = list()
+ var/list/device_refs = freq.devices["_default"]
+ for(var/datum/weakref/device_ref as anything in device_refs)
+ var/atom/device = device_ref.resolve()
+ if(!device)
+ device_refs -= device_ref
+ continue
+ devices += device
+
for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices)
var/list/text = splittext(U.id_tag, "_")
IO |= text[1]
@@ -288,6 +298,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "AtmosControlConsole")
+ ui.set_autoupdate(TRUE) // Gas sensors
ui.open()
/obj/machinery/computer/atmos_control/tank/ui_data(mob/user)
@@ -295,9 +306,10 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
data["tank"] = TRUE
data["inputting"] = input_info ? input_info["power"] : FALSE
data["inputRate"] = input_info ? input_info["volume_rate"] : 0
+ data["maxInputRate"] = input_info ? MAX_TRANSFER_RATE : 0
data["outputting"] = output_info ? output_info["power"] : FALSE
data["outputPressure"] = output_info ? output_info["internal"] : 0
-
+ data["maxOutputPressure"] = output_info ? MAX_OUTPUT_PRESSURE : 0
return data
/obj/machinery/computer/atmos_control/tank/ui_act(action, params)
@@ -323,7 +335,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
if("pressure")
var/target = text2num(params["pressure"])
if(!isnull(target))
- target = clamp(target, 0, 4500)
+ target = clamp(target, 0, MAX_OUTPUT_PRESSURE)
signal.data += list("tag" = output_tag, "set_internal_pressure" = target)
. = TRUE
radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index aae04e2ce3d59..858b72a208a15 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -132,7 +132,6 @@
..()
/obj/structure/frame/computer/AltClick(mob/user)
- ..()
if(!isliving(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index c485aeb0ee149..8485dfd09f4df 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -12,14 +12,16 @@
var/list/network = list("ss13")
var/obj/machinery/camera/active_camera
+ /// The turf where the camera was last updated.
+ var/turf/last_camera_turf
var/list/concurrent_users = list()
var/long_ranged = FALSE
// Stuff needed to render the map
var/map_name
- var/obj/screen/map_view/cam_screen
- var/obj/screen/plane_master/lighting/cam_plane_master
- var/obj/screen/background/cam_background
+ var/atom/movable/screen/map_view/cam_screen
+ var/atom/movable/screen/plane_master/lighting/cam_plane_master
+ var/atom/movable/screen/background/cam_background
/obj/machinery/computer/security/Initialize()
. = ..()
@@ -64,9 +66,10 @@
/obj/machinery/computer/security/ui_interact(mob/user, datum/tgui/ui)
// Update UI
ui = SStgui.try_update_ui(user, src, ui)
- // Show static if can't use the camera
- if(!active_camera?.can_use())
- show_camera_static()
+
+ // Update the camera, showing static if necessary and updating data if the location has moved.
+ update_active_camera_screen()
+
if(!ui)
var/user_ref = REF(user)
var/is_living = isliving(user)
@@ -85,6 +88,7 @@
// Open UI
ui = new(user, src, "CameraConsole")
ui.open()
+ ui.set_autoupdate(FALSE)
/obj/machinery/computer/security/ui_data()
var/list/data = list()
@@ -119,30 +123,52 @@
var/list/cameras = get_available_cameras()
var/obj/machinery/camera/C = cameras[c_tag]
active_camera = C
+ ui_update()
playsound(src, get_sfx("terminal_type"), 25, FALSE)
- // Show static if can't use the camera
- if(!active_camera?.can_use())
- show_camera_static()
+ if(!C)
return TRUE
- var/list/visible_turfs = list()
- for(var/turf/T in (C.isXRay() \
- ? range(C.view_range, C) \
- : view(C.view_range, get_turf(C))))
- visible_turfs += T
+ update_active_camera_screen()
- var/list/bbox = get_bbox_of_atoms(visible_turfs)
- var/size_x = bbox[3] - bbox[1] + 1
- var/size_y = bbox[4] - bbox[2] + 1
+ return TRUE
- cam_screen.vis_contents = visible_turfs
- cam_background.icon_state = "clear"
- cam_background.fill_rect(1, 1, size_x, size_y)
+/obj/machinery/computer/security/proc/update_active_camera_screen()
+ // Show static if can't use the camera
+ if(!active_camera?.can_use())
+ show_camera_static()
+ return
- return TRUE
+ var/list/visible_turfs = list()
-/obj/machinery/computer/security/ui_close(mob/user)
+ // Is this camera located in or attached to a living thing? If so, assume the camera's loc is the living thing.
+ var/atom/cam_location = isliving(active_camera.loc) ? active_camera.loc : active_camera
+
+ // If we're not forcing an update for some reason and the cameras are in the same location,
+ // we don't need to update anything.
+ // Most security cameras will end here as they're not moving.
+ var/newturf = get_turf(cam_location)
+ if(last_camera_turf == newturf)
+ return
+
+ // Cameras that get here are moving, and are likely attached to some moving atom such as cyborgs.
+ last_camera_turf = get_turf(cam_location)
+
+ if(active_camera.isXRay())
+ visible_turfs += RANGE_TURFS(active_camera.view_range, cam_location)
+ else
+ for(var/turf/T in view(active_camera.view_range, cam_location))
+ visible_turfs += T
+
+ var/list/bbox = get_bbox_of_atoms(visible_turfs)
+ var/size_x = bbox[3] - bbox[1] + 1
+ var/size_y = bbox[4] - bbox[2] + 1
+
+ cam_screen.vis_contents = visible_turfs
+ cam_background.icon_state = "clear"
+ cam_background.fill_rect(1, 1, size_x, size_y)
+
+/obj/machinery/computer/security/ui_close(mob/user, datum/tgui/tgui)
var/user_ref = REF(user)
var/is_living = isliving(user)
// Living creature or not, we remove you anyway.
@@ -164,7 +190,7 @@
/obj/machinery/computer/security/proc/get_available_cameras()
var/list/L = list()
for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
- if((is_away_level(z) || is_away_level(C.z)) && (C.z != z))//if on away mission, can only receive feed from same z_level cameras
+ if((is_away_level(z) || is_away_level(C.z)) && (C.get_virtual_z_level() != get_virtual_z_level()))//if on away mission, can only receive feed from same z_level cameras
continue
L.Add(C)
var/list/D = list()
@@ -189,6 +215,7 @@
icon_keyboard = "no_keyboard"
icon_screen = "detective_tv"
clockwork = TRUE //it'd look weird
+ broken_overlay_emissive = TRUE
pass_flags = PASSTABLE
/obj/machinery/computer/security/mining
@@ -235,6 +262,7 @@
density = FALSE
circuit = null
clockwork = TRUE //it'd look very weird
+ broken_overlay_emissive = TRUE
light_power = 0
/obj/machinery/computer/security/telescreen/update_icon()
@@ -252,16 +280,15 @@
density = FALSE
circuit = null
long_ranged = TRUE
- interaction_flags_atom = NONE // interact() is called by BigClick()
var/icon_state_off = "entertainment_blank"
var/icon_state_on = "entertainment"
-/obj/machinery/computer/security/telescreen/entertainment/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_CLICK, .proc/BigClick)
+//Can use this telescreen at long range.
+/obj/machinery/computer/security/telescreen/entertainment/ui_state(mob/user)
+ return GLOB.not_incapacitated_state
-// Bypass clickchain to allow humans to use the telescreen from a distance
-/obj/machinery/computer/security/telescreen/entertainment/proc/BigClick()
+/obj/machinery/computer/security/telescreen/entertainment/examine(mob/user)
+ . = ..()
interact(usr)
/obj/machinery/computer/security/telescreen/entertainment/proc/notify(on)
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 7bfdb568b64b7..995ac321dd657 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -5,7 +5,7 @@
icon_keyboard = "security_key"
var/list/z_lock = list() // Lock use to these z levels
var/lock_override = NONE
- var/mob/camera/aiEye/remote/eyeobj
+ var/mob/camera/ai_eye/remote/eyeobj
var/mob/living/current_user = null
var/list/networks = list("ss13")
var/datum/action/innate/camera_off/off_action = new
@@ -80,11 +80,10 @@
user.unset_machine()
/obj/machinery/computer/camera_advanced/Destroy()
- if(current_user)
- current_user.unset_machine()
if(eyeobj)
- qdel(eyeobj)
+ QDEL_NULL(eyeobj)
QDEL_LIST(actions)
+ current_user = null
return ..()
/obj/machinery/computer/camera_advanced/on_unset_machine(mob/M)
@@ -161,7 +160,7 @@
if(should_supress_view_changes )
user.client.view_size.supress()
-/mob/camera/aiEye/remote
+/mob/camera/ai_eye/remote
name = "Inactive Camera Eye"
ai_detector_visible = FALSE
var/sprint = 10
@@ -173,25 +172,25 @@
var/visible_icon = 0
var/image/user_image = null
-/mob/camera/aiEye/remote/update_remote_sight(mob/living/user)
+/mob/camera/ai_eye/remote/update_remote_sight(mob/living/user)
user.see_invisible = SEE_INVISIBLE_LIVING //can't see ghosts through cameras
user.sight = SEE_TURFS | SEE_BLACKNESS
user.see_in_dark = 2
return 1
-/mob/camera/aiEye/remote/Destroy()
+/mob/camera/ai_eye/remote/Destroy()
if(origin && eye_user)
origin.remove_eye_control(eye_user,src)
origin = null
. = ..()
eye_user = null
-/mob/camera/aiEye/remote/GetViewerClient()
+/mob/camera/ai_eye/remote/GetViewerClient()
if(eye_user)
return eye_user.client
return null
-/mob/camera/aiEye/remote/setLoc(T)
+/mob/camera/ai_eye/remote/setLoc(T)
if(eye_user)
T = get_turf(T)
if (T)
@@ -207,7 +206,7 @@
user_image = image(icon,loc,icon_state,FLY_LAYER)
eye_user.client.images += user_image
-/mob/camera/aiEye/remote/relaymove(mob/user,direct)
+/mob/camera/ai_eye/remote/relaymove(mob/user,direct)
var/initial = initial(sprint)
var/max_sprint = 50
@@ -234,7 +233,7 @@
if(!target || !isliving(target))
return
var/mob/living/C = target
- var/mob/camera/aiEye/remote/remote_eye = C.remote_control
+ var/mob/camera/ai_eye/remote/remote_eye = C.remote_control
var/obj/machinery/computer/camera_advanced/console = remote_eye.origin
console.remove_eye_control(target)
@@ -247,7 +246,7 @@
if(!target || !isliving(target))
return
var/mob/living/C = target
- var/mob/camera/aiEye/remote/remote_eye = C.remote_control
+ var/mob/camera/ai_eye/remote/remote_eye = C.remote_control
var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin
var/list/L = list()
@@ -273,7 +272,7 @@
if(final)
playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
remote_eye.setLoc(get_turf(final))
- C.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
+ C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console!
else
playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, 0)
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index f65ea0d01a2e6..63ab5004691f1 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -307,6 +307,21 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
var/list/alljobs = list("Unassigned")
alljobs += (istype(src, /obj/machinery/computer/card/centcom)? get_all_centcom_jobs() : get_all_jobs()) + "Custom"
for(var/job in alljobs)
+ if(job == "Assistant")
+ jobs_all += "
- None " - temp += "
- *Arrest* " + temp += "
- Arrest " + temp += "
- Search " + temp += "
- Monitor " temp += "
- Incarcerated " temp += "
- Paroled " temp += "
- Discharged " @@ -819,7 +953,11 @@ What a mess.*/ if("none") active2.fields["criminal"] = "None" if("arrest") - active2.fields["criminal"] = "*Arrest*" + active2.fields["criminal"] = "Arrest" + if("search") + active2.fields["criminal"] = "Search" + if("monitor") + active2.fields["criminal"] = "Monitor" if("incarcerated") active2.fields["criminal"] = "Incarcerated" if("paroled") @@ -838,6 +976,8 @@ What a mess.*/ if("Delete Record (ALL) Execute") if(active1) investigate_log("[key_name(usr)] has deleted all records for [active1.fields["name"]].", INVESTIGATE_RECORDS) + if(isAI(usr) || iscyborg(usr)) + message_admins("[ADMIN_LOOKUPFLW(usr)] has deleted all records for [active1.fields["name"]] as Borg/AI Player.") for(var/datum/data/record/R in GLOB.data_core.medical) if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) qdel(R) @@ -897,7 +1037,7 @@ What a mess.*/ if(3) R.fields["age"] = rand(5, 85) if(4) - R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Paroled", "Discharged") + R.fields["criminal"] = pick("None", "Arrest", "Search", "Monitor", "Incarcerated", "Paroled", "Discharged") if(5) R.fields["p_stat"] = pick("*Unconscious*", "Active", "Physically Unfit") if(6) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 7456e1f950776..ad05427011a6f 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -5,9 +5,6 @@ icon_keyboard = "atmos_key" circuit = /obj/item/circuitboard/computer/stationalert - - var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list()) - light_color = LIGHT_COLOR_CYAN /obj/machinery/computer/station_alert/Initialize() @@ -32,43 +29,61 @@ var/list/data = list() data["alarms"] = list() - for(var/class in alarms) + for(var/class in GLOB.alarms) data["alarms"][class] = list() - for(var/area in alarms[class]) + for(var/area in GLOB.alarms[class]) data["alarms"][class] += area return data -/obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/source) - if(source.z != z) +/obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/home, cameras, obj/source) + if(source.get_virtual_z_level() != get_virtual_z_level()) return if(stat & (BROKEN)) return - var/list/L = alarms[class] - for(var/I in L) - if (I == A.name) - var/list/alarm = L[I] + var/list/our_sort = GLOB.alarms[class] + for(var/areaname in our_sort) + if (areaname == home.name) + var/list/alarm = our_sort[areaname] var/list/sources = alarm[3] if (!(source in sources)) sources += source - return 1 - var/obj/machinery/camera/C = null - var/list/CL = null - if(O && islist(O)) - CL = O - if (CL.len == 1) - C = CL[1] - else if(O && istype(O, /obj/machinery/camera)) - C = O - L[A.name] = list(A, (C ? C : O), list(source)) - return 1 - + ui_update() + return TRUE + + var/obj/machinery/camera/cam = null + var/list/our_cams = null + if(cameras && islist(cameras)) + our_cams = cameras + if (our_cams.len == 1) + cam = our_cams[1] + else if(cameras && istype(cameras, /obj/machinery/camera)) + cam = cameras + our_sort[home.name] = list(home, (cam ? cam : cameras), list(source)) + ui_update() + return TRUE + +/obj/machinery/computer/station_alert/proc/freeCamera(area/home, obj/machinery/camera/cam) + for(var/class in GLOB.alarms) + var/our_area = GLOB.alarms[class][home.name] + if(!our_area) + continue + var/cams = our_area[2] //Get the cameras + if(!cams) + continue + if(islist(cams)) + cams -= cam + if(length(cams) == 1) + our_area[2] = cams[1] + else + our_area[2] = null + ui_update() /obj/machinery/computer/station_alert/proc/cancelAlarm(class, area/A, obj/origin) if(stat & (BROKEN)) return - var/list/L = alarms[class] + var/list/L = GLOB.alarms[class] var/cleared = 0 for (var/I in L) if (I == A.name) @@ -79,6 +94,7 @@ if (srcs.len == 0) cleared = 1 L -= I + ui_update() return !cleared /obj/machinery/computer/station_alert/update_icon() @@ -86,8 +102,8 @@ if(stat & (NOPOWER|BROKEN)) return var/active_alarms = FALSE - for(var/cat in alarms) - var/list/L = alarms[cat] + for(var/cat in GLOB.alarms) + var/list/L = GLOB.alarms[cat] if(L.len) active_alarms = TRUE if(active_alarms) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 3a1904ca3a433..08fb512cd733e 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -11,7 +11,10 @@ var/id var/obj/machinery/teleport/station/power_station var/calibrating - var/turf/target + ///Weakref to the target atom we're pointed at currently + var/datum/weakref/target_ref + + var/target_area_name /obj/machinery/computer/teleporter/Initialize() . = ..() @@ -31,9 +34,20 @@ power_station = locate(/obj/machinery/teleport/station, get_step(src, direction)) if(power_station) break + ui_update() return power_station +/obj/machinery/computer/teleporter/ui_requires_update(mob/user, datum/tgui/ui) + // Using ui_update here so the changes apply to all viewers, since ui_data updates those vars + if(target_ref) + var/atom/target = target_ref.resolve() + if(!target) + ui_update() // Update once if target is gone. There is probably a better way to do this. + else if(target_area_name != "[get_area(target)]") + ui_update() // Update if the area name changed. This should be fine, because autoupdate stringifies area every process anyways. + . = ..() // Call parent proc last so ui_update takes effect immediately + /obj/machinery/computer/teleporter/ui_state(mob/user) return GLOB.default_state @@ -44,14 +58,21 @@ ui.open() /obj/machinery/computer/teleporter/ui_data(mob/user) + var/atom/target + if(target_ref) + target = target_ref.resolve() + if(!target) + target_ref = null var/list/data = list() data["power_station"] = power_station ? TRUE : FALSE data["teleporter_hub"] = power_station?.teleporter_hub ? TRUE : FALSE data["regime_set"] = regime_set - data["target"] = !target ? "None" : "[get_area(target)] [(regime_set != "Gate") ? "" : "Teleporter"]" + if(target) + target_area_name = "[get_area(target)]" + data["target"] = !target ? "None" : "[target_area_name] [(regime_set != "Gate") ? "" : "Teleporter"]" data["calibrating"] = calibrating - if(power_station?.teleporter_hub?.calibrated || power_station?.teleporter_hub?.accuracy >= 3) + if(power_station?.teleporter_hub?.calibrated || power_station?.teleporter_hub?.accuracy >= 4) data["calibrated"] = TRUE else data["calibrated"] = FALSE @@ -83,26 +104,29 @@ set_target(usr) . = TRUE if("calibrate") - if(!target) + if(!target_ref) say("Error: No target set to calibrate to.") return - if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accuracy >= 3) + if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accuracy >= 4) say("Hub is already calibrated!") return say("Processing hub calibration to target...") calibrating = TRUE power_station.update_icon() - spawn(50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration - calibrating = FALSE - if(check_hub_connection()) - power_station.teleporter_hub.calibrated = TRUE - say("Calibration complete.") - else - say("Error: Unable to detect hub.") - power_station.update_icon() + var/calibrationtime = 50 * (3 - power_station.teleporter_hub.accuracy) + addtimer(CALLBACK(src, .proc/calibrate), calibrationtime) . = TRUE +/obj/machinery/computer/teleporter/proc/calibrate() + calibrating = FALSE + if(check_hub_connection()) + power_station.teleporter_hub.calibrated = TRUE + say("Calibration complete.") + else + say("Error: Unable to detect hub.") + power_station.update_icon() + /obj/machinery/computer/teleporter/proc/check_hub_connection() if(!power_station) return FALSE @@ -111,7 +135,7 @@ return TRUE /obj/machinery/computer/teleporter/proc/reset_regime() - target = null + target_ref = null if(regime_set == "Teleporter") regime_set = "Gate" else @@ -141,9 +165,9 @@ L[avoid_assoc_duplicate_keys("[M.real_name] ([get_area(M)])", areaindex)] = I var/desc = input("Please select a location to lock in.", "Locking Computer") as null|anything in sortList(L) - target = L[desc] - var/turf/T = get_turf(target) - log_game("[key_name(user)] has set the teleporter target to [target] at [AREACOORD(T)]") + target_ref = WEAKREF(L[desc]) + var/turf/T = get_turf(L[desc]) + log_game("[key_name(user)] has set the teleporter target to [L[desc]] at [AREACOORD(T)]") else var/list/S = power_station.linked_stations @@ -160,7 +184,7 @@ return var/turf/T = get_turf(target_station) log_game("[key_name(user)] has set the teleporter target to [target_station] at [AREACOORD(T)]") - target = target_station.teleporter_hub + target_ref = WEAKREF(target_station.teleporter_hub) target_station.linked_stations |= power_station target_station.stat &= ~NOPOWER if(target_station.teleporter_hub) @@ -177,6 +201,6 @@ if(is_centcom_level(T.z) || is_away_level(T.z)) return FALSE var/area/A = get_area(T) - if(!A || A.noteleport) + if(!A || A.teleport_restriction) return FALSE return TRUE diff --git a/code/game/machinery/computer/warrant.dm b/code/game/machinery/computer/warrant.dm index 3e6853d0994d8..22fd18ff72b21 100644 --- a/code/game/machinery/computer/warrant.dm +++ b/code/game/machinery/computer/warrant.dm @@ -19,11 +19,15 @@ var/background var/notice = "" switch(current.fields["criminal"]) - if("*Arrest*") + if("Arrest") background = "background-color:#990000;" notice = "
- [REF(T)] [T.name] ([T.id]) \[X\] " - dat += "
- [PDAIMG(medbot)]Bots Access " - if (cartridge.access & CART_JANITOR) - dat += "
- [PDAIMG(bucket)]Custodial Locator " if(cartridge.access & CART_MIME) dat += "
- [PDAIMG(emoji)]Emoji Guidebook " if (istype(cartridge.radio)) @@ -373,7 +372,7 @@ GLOBAL_LIST_EMPTY(PDAs) for(var/id in environment.get_gases()) var/gas_level = environment.get_moles(id)/total_moles if(gas_level > 0) - dat += "[GLOB.meta_gas_info[id][META_GAS_NAME]]: [round(gas_level*100, 0.01)]%
- Width: 1.8m
- Top speed: 5km/hour
- Operation in vacuum/hostile environment: Possible -
- Airtank Volume: 500liters +
- Airtank Volume: 500 liters
- Devices:
- Hydraulic Clamp
- High-speed Drill
- - Propulsion Device: Powercell-powered electro-hydraulic system. -
- Powercell capacity: Varies. +
- Propulsion Device: Electro-hydraulic system. +
- Power cell capacity: Varies.
- Connect all exosuit parts to the chassis frame -
- Connect all hydraulic fittings and tighten them up with a wrench -
- Adjust the servohydraulics with a screwdriver -
- Wire the chassis. (Cable is not included.) +
- Connect all exosuit parts to the chassis frame. +
- Connect all hydraulic fittings and tighten them up with a wrench. +
- Adjust the servohydraulics with a screwdriver. +
- Wire the chassis (cable is not included).
- Use the wirecutters to remove the excess cable if needed. -
- Install the central control module (Not included. Use supplied datadisk to create one). +
- Install the central control module (not included. Use supplied datadisk to create one).
- Secure the mainboard with a screwdriver. -
- Install the peripherals control module (Not included. Use supplied datadisk to create one). -
- Secure the peripherals control module with a screwdriver -
- Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 iron sheets.) -
- Secure the internal armor plating with a wrench -
- Weld the internal armor plating to the chassis -
- Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced iron sheets.) -
- Secure the external reinforced armor plating with a wrench -
- Weld the external reinforced armor plating to the chassis +
- Install the peripherals control module (not included. Use supplied datadisk to create one). +
- Secure the peripherals control module with a screwdriver. +
- Install the internal armor plating (not included due to Nanotrasen regulations. Can be made using 5 iron sheets). +
- Secure the internal armor plating with a wrench. +
- Weld the internal armor plating to the chassis. +
- Install the external reinforced armor plating (not included due to Nanotrasen regulations. Can be made using 5 reinforced iron sheets). +
- Secure the external reinforced armor plating with a wrench. +
- Weld the external reinforced armor plating to the chassis.
- Additional Information:
- The firefighting variation is made in a similar fashion.
- A firesuit must be connected to the Firefighter chassis for heat shielding.
- Internal armor is plasteel for additional strength.
- External armor must be installed in 2 parts, totaling 10 sheets. -
- Completed mech is more resiliant against fire, and is a bit more durable overall +
- Completed mech is more resiliant against fire, and is a bit more durable overall.
- Nanotrasen is determined to the safety of its
investmentsemployees. - Open the Syndicate Contract Uplink program.
- Here, you can accept a contract, and redeem your TC payments from completed contracts. -
- The payment number shown in brackets is the bonus you'll recieve when bringing your target alive. You recieve the +
- The payment number shown in brackets is the bonus you'll receive when bringing your target alive. You receive the other number regardless of if they were alive or dead.
- Contracts are completed by bringing the target to designated dropoff, calling for extraction, and putting them inside the pod.
- Grab your target, and drag them into the pod.
- Reward: [B.reward_string()] " info += "
- Completed: [B.completion_string()]
- [linked] \ - @ [linked.holder.displayed_name] " - words += "
- [linked] \ - @ [linked.holder.displayed_name] " - words += "
- [linked] \ - @ [linked.holder.displayed_name] " - words += "
- [linked] \ - @ [linked.holder.displayed_name] " - words += "
- [linked] \ - @ [linked.holder.displayed_name] " - words += "
- [linked] \ - @ [linked.holder.displayed_name] " - words += "
- Exempt (all jobs auto-unlocked) " - - for(var/dep in exp_data) - if(exp_data[dep] > 0) - if(exp_data[EXP_TYPE_LIVING] > 0) - var/percentage = num2text(round(exp_data[dep]/exp_data[EXP_TYPE_LIVING]*100)) - return_text += "
- [dep] [get_exp_format(exp_data[dep])] ([percentage]%) " - else - return_text += "
- [dep] [get_exp_format(exp_data[dep])] " - if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_rights_for(src,R_ADMIN)) - return_text += "
- Admin (all jobs auto-unlocked) " - return_text += "
- " - return_text += jobs_unlocked.Join("
- ") - return_text += "
- " - return_text += jobs_locked.Join("
- ") - return_text += "
- 145.9 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Service Channel
- 134.7 - Supply Channel " + info = "Greetings, Agent. I see you have awaken from your cryogenic slumber. This either means that the new Nanotransen space project is complete and operational in a nearby sector, or that Ashlanders have launched an assault on our base. We recommend you get rid of any pests and do not confuse them for humans.
- 145.9 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Service Channel
- 134.7 - Supply Channel
- 136.1 - Exploration Channel " \ No newline at end of file diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index 0945fbb125052..7024ed9177258 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -17,17 +17,26 @@ var/faction = list("ashwalker") var/meat_counter = 6 var/datum/team/ashwalkers/ashies + var/datum/linked_objective /obj/structure/lavaland/ash_walker/Initialize() .=..() ashies = new /datum/team/ashwalkers() var/datum/objective/protect_object/objective = new objective.set_target(src) + linked_objective = objective ashies.objectives += objective for(var/datum/mind/M in ashies.members) log_objective(M, objective.explanation_text) START_PROCESSING(SSprocessing, src) +/obj/structure/lavaland/ash_walker/Destroy() + ashies.objectives -= linked_objective + ashies = null + QDEL_NULL(linked_objective) + STOP_PROCESSING(SSprocessing, src) + return ..() + /obj/structure/lavaland/ash_walker/deconstruct(disassembled) new /obj/item/assembly/signaler/anomaly (get_step(loc, pick(GLOB.alldirs))) new /obj/effect/collapse(loc) @@ -38,7 +47,7 @@ spawn_mob() /obj/structure/lavaland/ash_walker/proc/consume() - for(var/mob/living/H in view(src, 1)) //Only for corpse right next to/on same tile + for(var/mob/living/H in hearers(1, src)) //Only for corpse right next to/on same tile if(H.stat) visible_message("Serrated tendrils eagerly pull [H] to [src], tearing the body apart as its blood seeps over the eggs.") playsound(get_turf(src),'sound/magic/demon_consume.ogg', 100, 1) @@ -51,8 +60,8 @@ meat_counter++ H.gib() obj_integrity = min(obj_integrity + max_integrity*0.05,max_integrity)//restores 5% hp of tendril - for(var/mob/living/L in view(src, 5)) - if(L.mind.has_antag_datum(/datum/antagonist/ashwalker)) + for(var/mob/living/L in viewers(5, src)) + if(L.mind?.has_antag_datum(/datum/antagonist/ashwalker)) SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "oogabooga", /datum/mood_event/sacrifice_good) else SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "oogabooga", /datum/mood_event/sacrifice_bad) diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm index dfcf854598b24..a9dff813be275 100644 --- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm @@ -182,7 +182,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) var/sound/legion_sound = sound('sound/creatures/legion_spawn.ogg') for(var/mob/M in GLOB.player_list) - if(M.z == z) + if(M.get_virtual_z_level() == get_virtual_z_level()) to_chat(M, "Discordant whispers flood your mind in a thousand voices. Each one speaks your name, over and over. Something horrible has been released.") M.playsound_local(T, null, 100, FALSE, 0, FALSE, pressure_affected = FALSE, S = legion_sound) flash_color(M, flash_color = "#FF0000", flash_time = 50) diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 733a4f0ba4c40..418f6f32a2cb7 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -115,7 +115,7 @@ "Perfect. Much better! Now nobody will be able to resist yo-") var/turf/T = get_turf(user) - var/list/levels = SSmapping.levels_by_trait(ZTRAIT_SPACE_RUINS) + var/list/levels = SSmapping.levels_by_trait(ZTRAIT_DYNAMIC_LEVEL) var/turf/dest if (levels.len) dest = locate(T.x, T.y, pick(levels)) diff --git a/code/modules/ruins/spaceruin_code/asteroid10.dm b/code/modules/ruins/spaceruin_code/asteroid10.dm new file mode 100644 index 0000000000000..67d3a071f6e98 --- /dev/null +++ b/code/modules/ruins/spaceruin_code/asteroid10.dm @@ -0,0 +1,23 @@ +/////////// asteroid4 items + +/obj/item/paper/fluff/ruins/asteroid10/welcome + name = "Welcome to Dog Heaven!" + info = "The ambassador of Dog Heaven welcomes you to our humble retreat!" + +/obj/item/reagent_containers/food/snacks/nugget/dog + name = "dog treat" + list_reagents = list(/datum/reagent/consumable/nutriment = 1,/datum/reagent/corgium = 10) + +/mob/living/simple_animal/pet/dog/corgi/chef/Initialize() + ..() + var/obj/item/clothing/head/chefhat/hat = new (src) + inventory_head = hat + update_corgi_fluff() + regenerate_icons() + +/mob/living/simple_animal/pet/dog/corgi/seccie/Initialize() + ..() + var/obj/item/clothing/head/helmet/hat = new (src) + inventory_head = hat + update_corgi_fluff() + regenerate_icons() \ No newline at end of file diff --git a/code/modules/ruins/spaceruin_code/caravanambush.dm b/code/modules/ruins/spaceruin_code/caravanambush.dm index 740850524cfd9..c58cab4d8999b 100644 --- a/code/modules/ruins/spaceruin_code/caravanambush.dm +++ b/code/modules/ruins/spaceruin_code/caravanambush.dm @@ -26,54 +26,34 @@ name = "experimental crowbar" toolspeed = 0.3 -/obj/machinery/computer/shuttle/caravan +/obj/machinery/computer/shuttle_flight/caravan /obj/item/circuitboard/computer/caravan - build_path = /obj/machinery/computer/shuttle/caravan + build_path = /obj/machinery/computer/shuttle_flight/caravan /obj/item/circuitboard/computer/caravan/trade1 - build_path = /obj/machinery/computer/shuttle/caravan/trade1 + build_path = /obj/machinery/computer/shuttle_flight/caravan/trade1 /obj/item/circuitboard/computer/caravan/pirate - build_path = /obj/machinery/computer/shuttle/caravan/pirate + build_path = /obj/machinery/computer/shuttle_flight/caravan/pirate /obj/item/circuitboard/computer/caravan/syndicate1 - build_path = /obj/machinery/computer/shuttle/caravan/syndicate1 + build_path = /obj/machinery/computer/shuttle_flight/caravan/syndicate1 /obj/item/circuitboard/computer/caravan/syndicate2 - build_path = /obj/machinery/computer/shuttle/caravan/syndicate2 + build_path = /obj/machinery/computer/shuttle_flight/caravan/syndicate2 /obj/item/circuitboard/computer/caravan/syndicate3 - build_path = /obj/machinery/computer/shuttle/caravan/syndicate3 + build_path = /obj/machinery/computer/shuttle_flight/caravan/syndicate3 -/obj/machinery/computer/shuttle/caravan/trade1 +/obj/machinery/computer/shuttle_flight/caravan/trade1 name = "Small Freighter Shuttle Console" desc = "Used to control the Small Freighter." circuit = /obj/item/circuitboard/computer/caravan/trade1 shuttleId = "caravantrade1" possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_lavaland;caravantrade1_custom;caravantrade1_ambush" -/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/Initialize() - . = ..() - GLOB.jam_on_wardec += src - -/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/Destroy() - GLOB.jam_on_wardec -= src - return ..() - -/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/trade1 - name = "Small Freighter Navigation Computer" - desc = "Used to designate a precise transit location for the Small Freighter." - shuttleId = "caravantrade1" - lock_override = NONE - shuttlePortId = "caravantrade1_custom" - jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "caravantrade1_ambush" = 1) - view_range = 6.5 - x_offset = -5 - y_offset = -5 - designate_time = 100 - -/obj/machinery/computer/shuttle/caravan/pirate +/obj/machinery/computer/shuttle_flight/caravan/pirate name = "Pirate Cutter Shuttle Console" desc = "Used to control the Pirate Cutter." icon_screen = "syndishuttle" @@ -83,20 +63,7 @@ shuttleId = "caravanpirate" possible_destinations = "caravanpirate_custom;caravanpirate_ambush" -/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/pirate - name = "Pirate Cutter Navigation Computer" - desc = "Used to designate a precise transit location for the Pirate Cutter." - icon_screen = "syndishuttle" - icon_keyboard = "syndie_key" - shuttleId = "caravanpirate" - lock_override = NONE - shuttlePortId = "caravanpirate_custom" - jumpto_ports = list("caravanpirate_ambush" = 1) - view_range = 6.5 - x_offset = 3 - y_offset = -6 - -/obj/machinery/computer/shuttle/caravan/syndicate1 +/obj/machinery/computer/shuttle_flight/caravan/syndicate1 name = "Syndicate Fighter Shuttle Console" desc = "Used to control the Syndicate Fighter." icon_screen = "syndishuttle" @@ -107,20 +74,7 @@ shuttleId = "caravansyndicate1" possible_destinations = "caravansyndicate1_custom;caravansyndicate1_ambush;caravansyndicate1_listeningpost" -/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1 - name = "Syndicate Fighter Navigation Computer" - desc = "Used to designate a precise transit location for the Syndicate Fighter." - icon_screen = "syndishuttle" - icon_keyboard = "syndie_key" - shuttleId = "caravansyndicate1" - lock_override = NONE - shuttlePortId = "caravansyndicate1_custom" - jumpto_ports = list("caravansyndicate1_ambush" = 1, "caravansyndicate1_listeningpost" = 1) - view_range = 0 - x_offset = 2 - y_offset = 0 - -/obj/machinery/computer/shuttle/caravan/syndicate2 +/obj/machinery/computer/shuttle_flight/caravan/syndicate2 name = "Syndicate Fighter Shuttle Console" desc = "Used to control the Syndicate Fighter." icon_screen = "syndishuttle" @@ -131,20 +85,7 @@ shuttleId = "caravansyndicate2" possible_destinations = "caravansyndicate2_custom;caravansyndicate2_ambush;caravansyndicate1_listeningpost" -/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate2 - name = "Syndicate Fighter Navigation Computer" - desc = "Used to designate a precise transit location for the Syndicate Fighter." - icon_screen = "syndishuttle" - icon_keyboard = "syndie_key" - shuttleId = "caravansyndicate2" - lock_override = NONE - shuttlePortId = "caravansyndicate2_custom" - jumpto_ports = list("caravansyndicate2_ambush" = 1, "caravansyndicate1_listeningpost" = 1) - view_range = 0 - x_offset = 0 - y_offset = 2 - -/obj/machinery/computer/shuttle/caravan/syndicate3 +/obj/machinery/computer/shuttle_flight/caravan/syndicate3 name = "Syndicate Drop Ship Console" desc = "Used to control the Syndicate Drop Ship." icon_screen = "syndishuttle" @@ -154,16 +95,3 @@ circuit = /obj/item/circuitboard/computer/caravan/syndicate3 shuttleId = "caravansyndicate3" possible_destinations = "caravansyndicate3_custom;caravansyndicate3_ambush;caravansyndicate3_listeningpost" - -/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate3 - name = "Syndicate Drop Ship Navigation Computer" - desc = "Used to designate a precise transit location for the Syndicate Drop Ship." - icon_screen = "syndishuttle" - icon_keyboard = "syndie_key" - shuttleId = "caravansyndicate3" - lock_override = NONE - shuttlePortId = "caravansyndicate3_custom" - jumpto_ports = list("caravansyndicate3_ambush" = 1, "caravansyndicate3_listeningpost" = 1) - view_range = 2.5 - x_offset = -1 - y_offset = -3 diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 5e518dc822bd6..ef0751c266786 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -1,6 +1,7 @@ GLOBAL_VAR_INIT(hhStorageTurf, null) GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) +// Someone for the love of god kill whoever indented this with spaces /obj/item/hilbertshotel name = "Hilbert's Hotel" desc = "A sphere of what appears to be an intricate network of bluespace. Observing it in detail seems to give you a headache as you try to comprehend the infinite amount of infinitesimally distinct points on its surface." @@ -124,6 +125,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) currentArea.storageTurf = storageTurf currentArea.roomnumber = currentRoomnumber currentArea.reservation = currentReservation + currentArea.virtual_z_value = get_new_virtual_z() for(var/turf/closed/indestructible/hoteldoor/door in currentArea) door.parentSphere = src door.desc = "The door to this hotel room. The placard reads 'Room [currentRoomnumber]'. Strange, this door doesnt even seem openable. The doorknob, however, seems to buzz with unusual energy...
- [telemetry_notices[notice]] " + . += "
- You can now replace test range firing pins with any other pin. -
- The plasma cutter is now a gun that comes in the mining vending machine. Use it to mine fast but expensively. -
- It's also cheaper in RnD, and there's an advanced version of it there too. Yay! -
- Ripleys and Firefighters have been buffed significantly. Go wild. -
- Precious mesons are cheaper in RnD. -
- Now you can mine bluespace crystals. They are extremely rare. -
- You can make remote bombs out of gibtonite. Figure out how. -
- Gibtonite is a bit less stable. Do not hit it with anything heavy. -
- Added a bowman headset for death squads and ERTs. -
- Deathsquad radio channel is now called the Centcom radio channel. -
- Fixed the admin buttons not spawning ERT Medic gear properly. -
- Expanded Emergency Shuttle dock to allow for more round end griff. -
- All 7 ERT members now spawn geared, not just the first 4. -
- Spawning an ERT or Deathsquad no longer stops a second ERT or Deathsquad from being spawned. -
- Pulse rifles now have 80 shots, not 40. -
- Deathsquads now use loyalty pinned Pulse rifles. -
- NTSL has been updated! It can now read and modify verbs (says, yells, asks)! You can set your own using $say, $yell, $ask, and $exclaim variables in your scripts. -
- NTSL can now also modify the font, italics, and bolding of radio messages in four ways! In a script, place $loud, $wacky, $emphasis, and/or $robot in a vector to $filters. -
- The admin's old player panel has been removed and the new one has taken it's name. -
- Adds the ability to shave corgis. -
- Spraycans for Revheads: instant use crayons that can be used on walls. -
- Spraycans can be used as ghetto pepper spray and leave their target with colored faces that can be removed with space cleaner. -
- Area ambience and ship ambience are now separate toggles. If you want one type of ambience but not the other, you only need to switch off the type you don't want. -
- Added cigar cases. They come in three flavors and can be bought from cigarette machines. -
- Added new wizard spell : Lightning Bolt -
- Added a hammer and gavel. Court is now in session. -
- You can now *flip. -
- Objects now spin when thrown. Please report any oddities. -
- Monkeys can now wear ANY mask, not just ones they had specific icons for. -
- Monkeys can now wear HATS, That's right, Monkey Hats! -
- Mining mobs vision adapted to darkness of the asteroids. -
- All slimes are now simple animals instead of carbon life forms. -
- Remove crit status from brain and slimes. -
- Simple animal aliens can now see in the dark like regular aliens. -
- The detective's forensic scanner has been resprited. -
- So has the cargo tagger. -
- And the RPED. -
- Admins now have a button to use Bluespace Artillery at their will. -
- You will no longer be slowed down by anything if you use a jetpack in zero gravity. -
- Engineering hardsuits come with an inbuilt jetpack. Requires an internals tank in suit storage and is slower than a normal jetpack. -
- Added an arrow graffiti, made arrow and body graffiti face the same way as the user -
- New changeling ability : Last Resort : Explode and infect corpses if the situation looks grim -
- Deleted the toy crossbow that wasn't a gun, but flung projectiles like a gun. Why was that even a thing? -
- Added an abstract new type of reusable ammo. -
- Added three new foam force guns and a foam force crossbow, all of which take the new foam dart ammo. -
- Added foam force dart boxes to the autolathe, and two crates orderable from cargo containing the new guns. -
- Added two new donksoft guns, the syndicate's own brand of Foam Force. Available in all good uplinks! -
- New crossbow can be won as an arcade prize. -
- All kinds of ammo containers can now be used to rapidly collect live ammunition on the ground. -
- Speedloaders and traditional ammo boxes can now be restocked. -
- Security bots now react to being shot. -
- Added a preference toggle for hearing instruments play as suggested by PKPenguin321. -
- Added a buildable Chem Master, board is in Circuit Imprinter. -
- Finally fixed the gulag shuttle missing a redemption console. -
- Adds pet collars. Use them to rename pets; Can also be worn if you're a weirdo. -
- Adds the matyr objective to be dead at the round's end. You can get this objective if you have no others that would need you to survive. -
- GAR glasses return. Yes, I got permission. Just who the hell do you think I am? -
- Summon Events has been reworked to be a bit less manic. -
- Summon Events will turn off if the wizard and all apprentices die. Any lingering effects are not reversed however. -
- Improving Summon Events will reduce the average time between events, but not the minimum time between events. -
- Departmental Uprising has been made admin only for being an RP heavy event that creates antags in an enviroment that doesn't really support that. -
- Added a cyborg upgrade module for the satchel of holding. -
- Added a fancy white dress and a jester outfit. Sprites by Nienhaus. -
- Nanotrasen Security has authorized modifications to the standard issue helmets for officers. These helmets are now issued with a mounted camera, automatically synced to your assigned station's camera network. In addition, the helmets also include mounting points for the Seclite model of flashlights, found in your station's security vendors. -
- Nanotrasen Security helmets are designed for easy repairs in the field. Officers may remove their Seclite attachment with any screwdriver, and the camera's assembly may be pried off with a crowbar. The assembly is also compatible with analyzer upgrades for scanning through the station's structure, and EMP shielding is possible by applying a sheet of plasma. -
- Fixes Morphine not knocking you out. -
- Hotline no longer exists. Poppies now have Saline-Glucose Solution. -
- Muriatic Acid, Caustic Soda, and Hydrogen Chloride have been removed, along with the secondary meth recipe. The original recipe still works. -
- Foam now produces more bang for your buck when mixed. Your foam grenades should be larger now to account for the slowdown. -
- Adds Stabilizing Agent. This chemical will prevent the effects of certain reactions from taking place in the container it is in, such as Smoke Powder and Flash Powder, allowing you to get the raw forms of the powders for heating up later. -
- Smoke Powder and Flash Powder can now be mixed along with Stabilizing Agent in order to produce a powder version of the effects. You can then heat these powders to 374K to get the effects. -
- Mixing them without Stabilizing Agent gives the default effects. -
- Adds Sonic Powder, a chemical that deafens and stuns within 5 tiles of the reaction. It also follows the reaction rules of the other 2 powders. -
- Liquid Dark Matter and Sorium also now work like the powders do. -
- CLF3 now has a higher chance of making plating tiles, and the burn damage caused by it scales based on your fire stacks. -
- Adds Pyrosium. This reagent heats up mobs by 30 degrees every 3 seconds if it has oxygen to react with. Useful for when you want a delayed mix inside of someone. -
- Adds Cryostylane. This reagent does the opposite of Pyrosium, but it still requires oxygen to react with. -
- Adds Phlogiston. This reagent ignites you and gives you a single fire stack every 3 seconds. Burn damage from this chemical scales up with the fire stacks you have. Counter this with literally any chemical that purges other chems. -
- Smoke now transfers reagents to the mob, and applies touch reactions on them. This means smoke can run out of reagents, no more infinite acid smoke. It also only works on mobs, use the new Reagent Foam(tm) for your hellfoam needs. I suggest a CLF3 Fluoroacid Black Powder mix. -
- Added a derelict medibot to the code, will place a few on the derelict when this PR is merged as to prevent mapping conflicts. -
- Adds Initropidril. 33% chance to hit with 5-25 TOX damage every 3 seconds, and a 5-10% chance to either stun, cause lots of oxygen damage, or cause your heart to stop. Get it from the traitor Poison Kit. -
- Adds Pancuronium. Paralyses you after 30 seconds, with a 7% chance to cause 3-5 loss of breath. Get it from the traitor Poison Kit. -
- Adds Sodium Thiopental. Knocks you out after 30 seconds, and destroys your stamina. Get it from the traitor Poison Kit. -
- Adds Sulfonal. +1 TOX per 3 seconds, knocks you out in 66 seconds. Mix it with Acetone, Diethylamine, and Sulfur. -
- Adds Amantin. On the last second it is in you, it hits you with a stack of TOX damage based on how long it's been in you. Get it from the traitor Poison Kit. -
- Adds Lipolicide. +1 TOX unless you have nutriment in you. Mix it with Mercury, Diethylamine, and Ephedrine. -
- Adds Coiine. +2 TOX and +5 loss of breath every 3 seconds. Get it from the traitor Poison Kit. -
- Adds Curare. +1 TOX, +1 OXY, paralyzes after 33 seconds. Get it from the traitor Poison Kit. -
- Adds a reagent_deleted() proc to reagents for effects upon the last time it processes in you, like with Amantin. -
- Neurotoxin required temperature for mixing has been set to 674K, it was 370K for some reason. -
- Added Cybernetic Implants: Security HUD, Medical HUD, X-Ray, Thermals, Anti-Drop, Anti-Stun. All implants are researchable and producible by R&D and Robotics. -
- Checkered skirts can be adjusted to be worn shorter. -
- Player controller uplifted mobs will be attacked by gold core mobs of different species. -
- The backup shuttle will no longer be called if the emergency shuttle is coming. -
- Adds 3 new bear-based foods. -
- Beary Pie -1 Plain Pie, 1 berry, 1 bear steak -
- Filet Migrawr - 5u of Manlydorf, 1 bear steak, 1 lighter(not used in crafting) -
- Bearger - 1 bun, 1 bear steak -
- Silicons are no longer blinded by welding. -
- A new software update has given the Orion Trail game a cheat code menu. While you can't access this normally (that's for a later software update), maybe an emag could do it...? -
- The chemical implant action button should now correctly inject all chemicals when pressed. -
- Adds normal security headsets to security lockers. -
- Fixed cables on catwalks being destroyed when creating plating floor. -
- Portable machines can be mounted on any turf that could hold a cable. -
- Adds a few cosmetic glasses to the autodrobe and clothing vendors. -
- Explosion relics will now destroy themselves in their own explosion. -
- The Experimentor can no longer re-roll the function of an already scanned relic. -
- Ghosts are now asked if they want to become a sentient slime. -
- Adds the :rollie: and :ambrosia: emojis. -
- ERT suits now use helmet toggling like hardsuits. -
- Fixed mechs ballistic guns not firing bullets. -
- Allows alt-clicking to adjust breath masks, flip caps, and unlock/lock closets. -
- Fixed jetpack trail animation. -
- Syndicate cigarettes' non-healing Doctor's Delight replaced with Omnizine. -
- Expanded the Centcom area for better station-Centcom interaction. -
- Acid blobs are less likely to melt equipment. -
- Adds the ability to spike bears on a meatspike for their pelt. Yields 5 meat instead of the usual 3 from a knife. -
- Two new shotgun shells. Ion shell, shotgun version of ion rifle, built with 1 x techshell, 1 x ultra microlaser, 1 x ansible crystal. -
- Laser slug, regular laser shot in a shotgun shell, build with 1 x techshell, 1 x high power microlaser, 1 x advanced capacitor. -
- Improvised shotgun shells can now be constructed with 1 x grenade casing, 1 x metal sheet, 1 x cable, 10 units welding fuel. Can be packed with a further 5 units of gunpowder to turn it into a potentially lethal diceroll. -
- FRAG-12 shotgun shells are no longer duds, now explosive. -
- Makes the message when you're attacked slightly bigger for better visibility. -
- Adds ass photocopying for drones -
- Nanotrasen has approved distribution of Loyalty Implant Firing Pin designs. They can be fabricated with sufficient research into weapons technology. If inserted into a firearm, it will only fire upon successful interface with a user's Loyalty Implant. -
- Utilizing a new magic mirror found in the den, wizards can now customize their appearance to a high degree before descending upon the station. -
- Firing delay for tasers has been shortened. -
- Beginning major rework and refactor of messy Ninja code. -
- Roleplay based, kill deathsquad and kill alien queen objectives removed. -
- Kamikaze mode removed. -
- AIs and pAIs can no longer be integrated into a ninja suit. -
- Energy blade power replaced by an energy katana that can be dropped but is more deadly. -
- Energy katana can emag any object it hits. -
- Bookbags have a new sprite and can hold bibles. -
- Adds egg yolk reagent. You can break eggs in open reagent containers or blend them to get egg yolk. -
- Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively soymilk instead of the eggyolk for vegans). -
- Change customizable snack max volume to 60 and buffs nutriment amount in doughs. -
- Doors can damage mechs by crushing them now. -
- The tablecrafting window now also shows partial recipes in grey, if there's some of the things required for the recipe on the table. Recipe requirements are now also shown next to the names of recipes listed in the window. -
- Adds a new vending machine, the Liberation Station. Consult your local patriot for more details. -
- Adds a patriotic jumpsuit and freedom sheets. Consult your local patriot for more details. -
- Added a toggle for ghosts that allows them to hear radio chatter without having to hover near intercoms/over people with headsets. -
- Adds the Slimecake and Slimecake slice. -
- Non-player Alien Queens/Drones now spread weeds. Can also lay eggs when enabled. -
- Nanotrasen scientists have recently reported mutations within the pink family line of slimes. Station scientists are encouraged to investigate. -
- Reworked reskinning and renaming guns, and added the ability to reskin the bartender's shotgun. Click it with an empty active hand to reskin. Warning, you can only do this once! Rename by hitting it with a pen. This also works with miner shotguns now. -
- Embedding from explosions has been tweaked, they will always throw objects fast enough to get embedded if they can. -
- Damage taken when embedded spears and throwing stars fall out has been increased. -
- Damage dealt by objects getting embedded has been decreased. -
- The Horsemask spell has now been altered, instead of just a horse mask it will now choose between three animal masks including the horse mask. -
- You can now burn papers using lighters, welders, or matches. Useful for secret messages. -
- Airlocks with their safety on no longer closes on dense objects (like mechs or tables). -
- Aliens, slimes, monkeys and ventcrawler mobs can now climb into disposal. Cyborgs and very large mobs can no longer climb into it. -
- Stuffing another mob in a disposal unit is now only done via grabbing. -
- Coffee now causes jittering only when you overdose on it. -
- Turrets now target occupied mechs and don't target drones. -
- Added more barsigns, sprites by yours truly. -
- Gang mode has been reworked to functionality without some of it's features. -
- Gang membership visibility, conversion pens and weapons are removed until fixed. -
- Gang bosses have been given uplinks to use in the meantime. -
- Chance of deconversion from repeated head trauma has been increased. -
- The skeleton and zombie hordes have been quelled, at least for the time being. -
- Added the ability to stop table climbers by clicking the table if present. -
- Labcoats and uniforms no longer use action buttons and object verbs to adjust their aesthetic style. Alt click them to adjust. -
- Alt click a PDA with an ID inside to eject the ID. -
- Renamed 'remove ID' verb to 'eject ID' so it's not immediately next to 'remove pen'. -
- Rebalanced the flash protection of thermal scanners. Syndicate thermals have the same flash weakness as the meson scanners they come disguised as. -
- Adds the Adminbus and Coderbus bar signs. -
- Added a mining satchel of holding to R&D that can hold an infinite amount of ores. It requires gold and uranium, in addition to a decently high bluespace and materials research. -
- Harvesting meat from dead simple animals now takes time, has a sound, and can be done with any sharp weapon. -
- Updated the sprite for Fire extinguishers. -
- Disposable lighters now come in more colors of the rainbow. -
- Server hosts can set a config option to make an unseen changelog pop up on connection. -
- Expanded the on-screen alerts you get on the top-right of your screen. You can shift-click them to get a description of what's wrong and maybe how to fix it. -
- Getting buckled to something will show an alert of what you're buckled to. If you're not handcuffed, you can click the alert to unbuckle. -
- Added Necromantic Stones as a buyable item for wizards -
- Necromantic Stones can cause up to 3 people to rise up as Skeleton Thralls bound to the wielder of the stone -
- Skeleton Thralls have a 33% Chance to drop all their gear on the floor and autoequip a more fitting thematic uniform -
- Allows the blob to reroll it's chemical for a cost. -
- Adds a lot of new plants to botany (red beet, parsnip, snap corn, blumpkin, rice, oat, vanilla, steel cap, mimana, blue cherries, holy melon, geranium, lily, sweet potato) and two new reagents (vanilla, rice). -
- Fixes taser stun duration being longer due to jitter animation. -
- Improvised heating! use lighters or other heat sources to heat beakers, bottles, etc. -
- We have purged the xenomicrobes contamination in the E.X.P.E.R.I-MENTOR using sulfuric acid. Take care not to be exposed should it leak! -
- Colorful reagent can be washed off with water now. -
- Oxygen blob deals breath loss damage. -
- Radioactive blobs irradiate for more. -
- Antagonist roles are now restricted by player client age. -
- The server's current local time is now displayed in status panel in ISO date format (YYYY-MM-DD hh:mm) -
- Added the ability to see pda messages as a ghost with GHOSTWHISPER toggled on. -
- Removed the degrees symbol from Kelvin units on atmos meters because not gramatically correct -
- Drones now see either Static, Black icons or Roguelike style lettering instead of actual mob icons -
- Icons for the above, from VG's SkowronX -
- Many icon procs for the above, from VG's ComicIronic -
- Drones moved into their own folder -
- Drone.dm replaced with seperate files for each functionality -
- Drones now have 2 skins to choose from, Maintenance Drone (Current drones) and Repair Drone (A modified VG/Bay sprite) -
- Much more support for alternate skins on drones -
- Added four new emoji: :1997:, :rune:, :blob:, and :onisoma:. -
- Added a surgery table and tools to the Nuke Ops ship. -
- Added Engineering Scanner Goggles to Engivend, Engineering Secure Closets and Research. -
- Doubled T-ray scanner range. -
- Resprited all owl items. Wings are now a seperate toggleable suit item. -
- Added The Griffin costume, arch nemesis of The Owl. Found in the autodrobe. -
- Added admin-only Owl hardsuit. Only for the most vengeful souls. -
- Added Owl and Griffin merchandise; The Nest barsign, Owl/Griffin toys and posters. -
- Fixes the recipe for meth. -
- Fixes sorium blobs flinging themselves. -
- On servers where malfunction, wizard, and blob rounds do not end with the death of the primary antagonist, new antagonists from traitor and changeling derivative modes will now sometimes spawn. This depends on the state of the station, the state of the crew, and the server's gamemode probabilities. Server owners should consider revising their configuration choices -
- If you would like to opt out of this midround chance, a new toggle to disable it can be found in your preferences -
- The barsign can be emagged and EMP'd; EMP'd signs can be repaired with a screwdriver and cables. -
- Fixed the protolathe not requiring displayed amount of materials to make items. -
- Adds a Panic Bunker! -
- This will prevent any player who has never connected before from connecting. (Admins are exempt) -
- Can be enabled per-round by any admin with +SERVER or for longer periods via the config. -
- Also adds some other config options relating to new joins, server operators should consult their configuration file for more details. -
- Fixes toggle darkness vision hiding other ghosts. -
- Admins fucking around with ghost icon and icon states in VV are going to want to change the icon and icon state of the ghostimage var of the ghost to change the image shown to ghosts who have darkness disabled. doing this via mass edit is not yet supported. -
- New ghost verb, toggle ghost vision. Switches the ghost's invisibility vision between that of a ghost and that of a human. So ghosts can hide other ghosts and in general get the old behaviour of toggle darkness. -
- Messages with two exclamation marks will be yelled in bold. -
- Cultists can't summon narsie until their sacrifice objective is complete. -
- Vines now can grow on any tiles that is not dense, including space, shuttles, centcomm tiles and so on. -
- Added 'Bluespace' mutation to vines, makes them be able to grow through absolutely everything. -
- Added 'Space Proofing' mutation to vines, after they grow if the tile under them is space it will become special vinetile, which is just resprited regular floor, if the vine on the vinetile dies the vineturf changes back to space. -
- Made vines spreading speed depend on the seed's production, can be both slower and faster than current. -
- Made vines mutation chance be 1/10th of the potency of the seed it is spawned from. -
- Special chemicals added to vine seeds durning their growth can increase/decrease their potency and productivity. -
- Special chemicals now can remove good, bad or neutral mutations from vine seeds while they are growing, cultivating actually helpful vines is now possible. -
- Plant analyzers now show the vine seeds mutations. -
- Buffed numbers in some of the more useless mutations. -
- Reworked and expanded areas of the derelict station. Featuring a repairable gravity generator, turret filled computer core and functional solars. -
- Chemists, Geneticists, Virologists, Scientists, and Botanists will now spawn with alternative backpacks and satchels in their lockers. Try them out! -
- Foam now carries reagents, similarly to smoke. Have fun with that. -
- Altered the sprite for security hardsuits. The old sprite is now a HoS specific hardsuit. -
- Turret's guns replaced by a heavy energy cannon. -
- Firing a heavy weapon sindlehandedly can make it recoil out of your hands. -
- Nanotrasen has released new design specifications for the prototype combination of standard night-vision equipment and Optical Meson Scanners. We believe that this will address the concerns many Shaft Miners have concerning visiblity in a potentially unsafe environment. -
- Fixed malf AI's turret upgrade power not working. -
- You can now go into hyperglycaemic shock from having over 200u of Sugar in your body at once. Treat it with Insulin. -
- Insulin has been added. Use it to treat hyperglycaemic shock. You can get it from medical vendors and the Cargo medicine supplies crate. -
- Medvendor contents have been reduced from medical having everything they need at roundstart level, and toxin bottles are now back in the vendor. -
- Medical Analyzers now have 2 modes, Medical Scan and Chemical Scan. You can swap between modes by clicking on it in hand. -
- Medical scan is default behavior. Chemical scan shows all the reagents inside the mob at the time, along with any addictions the mob has. It will show if a reagent is overdosing. -
- Tobacco and Space Tobacco have Nicotine in them now. -
- Adds Methamphetamine to the game. Mix it with Ephedrine, Iodine, Phosphorous, and Hydrogen at 374K. -
- Or, look around in Maintenance for Muriatic Acid, Caustic Soda, and Hydrogen Chloride. Recipes are also available for these. -
- Adds Saltpetre. Mix it with Potassium, Nitrogen, and Oxygen. -
- Adds Bath Salts, mix it with Bad Food, Saltpetre, Nutriment, Space Cleaner, Universal Enzyme, Tea, and Mercury at 374K. -
- Adds Aranesp. Mix it with Epinephrine, Atropine, and Morphine. -
- Adds Hotline. Get it from Poppy plants. -
- Strange Reagent revival was changed. It now won't gib but won't do anything above a 100 BRUTE or BURN threshold. -
- Carpet now applies carpet tiles to whatever flooring it hits. Mix it with Space Drugs and Blood. -
- Colorful Reagent colors have been improved drastically and now are more varied and nicer looking. -
- Corn Starch has been added. Get it from juicing Corn. -
- Corn Syrup has been added. Mix it with Corn Starch and S-Acid. -
- Corgium has been added. Mix it with Nutriment, Colorful Reagent, Strange Reagent, and Blood at 374K. -
- Adds Quantum Hair Dye. Mix it with Colorful Reagent, Radium, and Space Drugs. -
- Adds Barber's Aid. Mix it with Carpet, Radium, and Space Drugs. -
- Adds Concentrated Barber's Aid. Mix it with Barber's Aid and Unstable Mutagen. -
- Re-adds Chlorine Trifluoride. Mix it with Chlorine and Fluorine at 424K. -
- Adds Black Powder. Mix it with Saltpetre, Charcoal, and Sulfur. Ignite it for an explosion at 474K -
- Finally nerfs Salglu Solution. It's no longer tricord 2.0. -
- Salt recipe is now Water + Sodium + Chlorine due to problems with recipe mixing. -
- A new event has been added to the wizards summon events spell that gives the game a distictively more roleplaying flair. -
- Optional population cap functionality has been added to the game. By default all caps are disabled. Server owners should refer to config.txt to see their list of options. -
- Medical borgs now have access to a deployable onboard roller bed. Should the bed become lost, any roller bed may be used in its place. -
- Added interchangeable bar signs -
- Added bays fountain machines for the bar. Soda and Beer. Allowing bartenders to have easier access to mix drinks and making more to make their job a little less boring -
- Added color tiles to the light up floor tiles. -
- Added metal, glass, and cable to bar back room at round start for bartender to make colored light dance floors. -
- Fixes clown cuffing both mobs and two pairs of cuffs appearing. -
- Fixes clown not being able to use his stamp as antag so no meta. -
- Fixes sleepypen bug. Instead of only dispensing 50u it dispenses the full 55u. -
- Fixed silicons not being able to pass through holotape. -
- Getting into regenerative statis now puts the changeling into unconscious state. -
- Fixed changeling 'Revive' not working. -
- Added an assistant cap, unlimited by default. -
- Batons now slowly lose power when left on. -
- Batons, flashbangs and handcuffs can be seen when stored in a belt. -
- Computers now emit light when they're on or bluescreened. -
- Added hotkeys for OOC and custom emotes. Press O and M when in hotkey mode. Remember not to ick in ock! -
- Added megaphones for the HoS, HoP, and QM. -
- Goliath tentacles no longer stun you if you cross them. They will only stun you if you don't move away from them in time. They can do up to 15 damage now, in addition to stunning you. -
- Changed a lot of mining gear and prices. The resonator can now have up to 3 fields active at once, but the fields need to detonate before they crush rocks. Tweak the time before the fields detonate with a screwdriver and upgrade the amount of fields at once with sheets of diamond. -
- Overhauled straight mining tools. The sonic jackhammer is now the wall-crushing tool, the diamond drill simply mines really fast. Borgs can now get upgraded with the diamond mining tool with only a single sheet of diamond and an upgrade module, they don't need illegal tech modules. -
- Mining drills and the sonic jackhammer now draw power when they drill down mineral walls. They can be recharged using any type of weapon recharger or by replacing the cell using a screwdriver on them. -
- Space now emits a dim light to adjacent tiles. -
- Syndicate shotguns now start with buckshot instead of stunslugs. -
- Fixed welding tools using fuel when being switched on. -
- Added a firing delay between shooting electrodes. -
- Changed the stun revolver from a high-capacity taser to a disabler with extra capacity. -
- Added a unique stun pistol for the head of security. It is a double capacity taser with no shot delay and a loyalty pin, though it lacks a disable mode. -
- New brute treatment kit crate for cargo. -
- Explosions will now blow (throw) items away from the epicenter -
- Sharp items can now embedd themselves in a human's limbs -
- Embedded items have a chance to do some damage (based on w_class) each life() call -
- Embedded items have a chance to fall out doing some more damage, but removing the object -
- Adds a surgery to remove Embdedded objects -
- Adds throwing stars as an uplink item (100% chance to embedd) -
- Items placed on tables now center to exactly where you clicked. -
- SS13's Head of Security has received a new attempted 1:1 recreation of a Old Earth weapon, the Captain's Antique Laser Gun. -
- This gun features three firing modes, Tase, Laser and Disable. However this gun lacks the capability to recharge in the field, and is extreamly expensive. -
- INTERCEPTED TRANSMISSION REPORT: The Syndicate have expressed a interest in this new weapon, and have instructed field agents to do whatever they can to steal this weapon. -
- Box's vault nuke has been replaced with immobile Nuclear Self-Destruct Mechanism. -
- Vault's new green floor tiles turn flashing red when Self-Destruct is activated. -
- Syndicate contacts have discovered new ways to manipulate alarms. Malfunctioning AIs, as well as normal emags, can now disable the safeties on air and fire alarms. -
- When one emags an air alarm, its safeties are disabled, giving it the Flood environmental type, which disables scrubbers as well as vent pressure checks. Burn, pigs, burn! -
- When one emags a fire alarm, its thermal sesnsors are disabled. This will prevent automatic alerts due to the alarm being unable to recognize high temperatures. -
- Malf AIs gain two new modules, both of which disable ALL air alarm safeties and thermal sensors. These are separate abilities. -
- Air and fire alarms have notifications on their interface about the current safety status. One only has to glance at one to see that it's been tampered with. -
- Fixed arcade machines being usable from inside lockers to dupe rewards. -
- Silicons can no longer be grabbed by anyone. No more silicon choking -
- Custom food can now be renamed using a pen. -
- Added new graffiti: cyka, prolizard, antilizard -
- Added proper slurring when drunk. -
- Updated the ChemMaster's UI to the station default along with some functionality improvements. -
- You can now spam the 'Ready' button as much as you want without it setting you 'Not ready' again. -
- Added the ability to call Central Command for the nuclear authentication codes. This requires a captain-level ID and admin approval, and warns the crew. -
- E.X.P.E.R.I-MENTOR meteor storm event replaced with a fireball that targets random nearby mob. -
- EMP event range reduced. -
- Self-duplicating relics limited to 10 copies. -
- Nanotrasen has released a firmware patch for the Ore Redemption Machine, which now allows the station AI, cyborgs, and maintenance drones to smelt raw resources without the need of a valid identification card installed. -
- Nanotrasen scientists have completed their designs for a lightweight, compacted anti-armor ion weapon, without loss of efficiency. In theory, such a weapon could easily fit within standard issue backpacks and satchels. With sufficient research into weapons technology and materials, Nanotrasen believes a working prototype can be fabricated. -
- Buffs the shit out of Styptic Powder and Silver Sulf, they're now viable to use. Synthflesh is still good for general treatment, but overall Styptic and Silver Sulf deal with their respective damage types way better now. -
- Improves kinetic accelerator's mining strength. -
- The kinetic accelerator's cooldown can be decreased by tweaking the thermal exchanger with a screwdriver. -
- The range can be increased with plasma sheets -
- Medical borgs have been given full surgery tools which they can't fail a procedure with. -
- Medical borgs also have rechargeable gauze. -
- Borg hypo's omnizine replaced with salbutamol, salglu and charcoal. -
- Slime and Jelly mutant races now actually contain slime jelly. While playing as these races you will naturally produce it internally from your nutrition, so be sure to stay well fed as losing too much is dangerous to your health! Beware of chems that clear toxins, as they can be rapidly fatal to you! -
- Veil render and rifts changed to spawn with vars, rifts can be closed with a nullrod. -
- General record now contains a species field and a photo of the crewmember. Security record consoles allow you to update it with a photo taken in-game (with detective's camera, for example, or AI's). -
- Expanded functionality of security HUDs to display rank and photos. -
- Medical HUDs allow user to change others' mental and physical status. Currently has no gameplay effect other than changing records. -
- Medical HUDs can perform an examination at the distance, similrarly to how attacking yourself with help intent works. Has limited ability to detect suffocation and toxin damage. -
- Solar control computers remade with NanoUI -
- Added rnd requirements to borg upgrades and tweaked the prices. -
- Changed some clothing around. Added a turtleneck for the HoS. Removed 'civillian' armor and gave normal armor to the bartender and HoP. Added flash protection to the HoS' eyepatch, it functions like sunglasses now. Additionally, added the ability to store ammo on your shoulder holster as detective. -
- Removed the defib steal objective. Added a compact defibrillator for the CMO that equips to the belt. Removed defibrillators from RND. Removed the requirement for people to not wear armor to revive them with defibs. Doubled defib timers (10 minutes before permadeath). -
- Flashlights can be attached to pulse carbines. -
- Miners spawn with a brute patch. -
- Mining station's sleeper has been replaced with an IV drip and more medkits. -
- Added hard-light holotape. This holographic police or engineering hazard tape will block entry if you're running, so you need to walk to pass it. This is to help people not sprint into breaches or crime scenes. -
- Fixed being able to sling the strapless improvised shotgun on your back. -
- Reverted the price of the ebow to 12tc and removed the range limit of its bolts. -
- Novely pig mask prize from arcade machines, can be toggled to make you squeal like a pig. -
- Security Cyborgs Advance Taser have been replaced with a Disabler. -
- Adds plaid skirts and new schoolgirl outfits to the autodrobe -
- Novaflowers apply a firestack for every 20 potency they have. -
- You can now juice whole watermelons instead of slices. -
- Advancements in the field of virology by Nanotrasen's finest have uncovered three new disease symptoms for further research: -
- Ocular Restoration heals any eye trauma experienced by the infected patient. -
- Revitiligo increases the pigmentation levels of the infected patient's skin. -
- Spontaneous Combustion ignites the infected patient without warning. -
- Added shot glasses! Can be obtained from the Booze-o-Mat. -
- A new premium vodka has been added to the game, hidden in a special spot. -
- Due to constant attempts to break into the station's safe, the contents have been relocated and have not been replaced. We promise. There is absolutely NO reason to break into the vault's safe anymore. -
- Each shot glass now holds 15 units, and the drinker takes all 15 in one gulp instead of 5 at a time. This means you can mix certain shots (namely, the B-52 and Toxins Special) in a shot glass. Both drinks have been made exclusive to shot glasses and will no longer show their specific sprite in a normal glass. -
- Added new sprites for most alcohol in shot glasses. Everything else will show up as 'shot of... what?'. -
- Fixed shot glasses turning into regular glasses when filled. -
- Fixed tequila bottle sprites not showing up. -
- Fixed a typo! -
- Roboticists will now start with a full toolbelt instead of a toolbox. -
- Blobs who burst in space will be given a 30 second warning before dying. -
- If a blob does die from bursting in space, a new crewmember will be infected. -
- If there are no blobs or infected crew left after bursting, the round will now end properly, rather than becoming endless. -
- You no longer need to cut the syphon wire to deconstruct air alarms. -
- Cooking overhaul: microwave recipes are converted to tablecraft recipes. -
- Added customizable food (burger,sandwich,spaghettis,soup,salad,cake,bread,kebab,pie) with specific color depending on ingredients used. -
- Added new food ingredients (dough, flat dough, cake batter, pie dough, doughslice, bun, raw pastry base, pastry base, raw cutlet, cutlet, pizzabread). Dough is made by mixing egg and flour, then transformed by using knife, rollingpin, milk and microwave. Meat is now sliceable into rawcutlets (specific color for each meat type). -
- Changed food recipes a bit (replacing stuff with new food ingredients). -
- Repurposed the microwave to actually cook certain food items(no reagents required), renamed it microwave oven and added a power setting to it. -
- Bowl is no longer trash but a beaker-like container that is used in salad&soup recipes. Also, milk and soymilk cartons as well as flour packs are now condiment bottles. -
- Changed the hunger system a bit, sugar becomes a normal reagent again. Faster nutrition drain is now handled by a variable in junk food. Also added a slight buff to vitamin. -
- You now hear the voice of the chosen deity in prayers. -
- Added suicide messages for all gun types and various different items. -
- Compacted ERT room by removing equipment rooms, filler rooms and pre-spawned mechs. -
- Rebalanced Pulse weapons to have more shots, faster charge, EMP immunity and modified sprites. -
- ERT spawns fully equipped with no-slowdown suits. -
- Added blood and bleeding. If you take enough brute damage on a certain limb, you will start bleeding, and will need to patch your bleeding with gauze from medbay. You can replace lost blood by eating nutritious food and waiting for your heart to reproduce it, or by getting a blood transfusion from an IV drip. -
- Added a toy red button to the Arcade cabinets. -
- Fixes dufflebag's storage capacity. -
- Removes duplicate fluorine from Chemical Dispenser. -
- Added GoonChems to the Portable Chem Dispenser. -
- Added cancel buttons to the ChemMaster and CondiMaster when making bottles, pills, etc. -
- Added new foam armblade toy to arcade prizes. -
- Slimes can drag themselves to mobs to start feeding. -
- Attacking another slime will pull them off their victim if they're feeding or steal some of their mass. -
- Five new silicon emotes: *buzz2, *chime, *honk, *sad and *warn -
- New contraband crate containing fifty butterflies. -
- Shuttle will now always arrive, but won't launch in rounds where it would've been previously auto-recalled. -
- Fixed being unable to place cables on plating. -
- Helmets for hardsuits are stored inside the suit and cannot be equipped without the suit on. -
- EVA space suits are now lighter for faster movement but lack flash or welding protection, don't hide your identity and have less radiation protection. -
- Tweaked slowdown due to coldness when in in low gravity. -
- ERT base equipment rooms are now access restriction to each role. -
- ERT commander spawns wearing hardsuit for identification. -
- Two boxes of metal foam grenades added for ERT engineers. -
- Deep space sensors recently detected the derelict remains of the NTSS Omen, a outdated Medical Frigate thought lost, within close proximity to Space Station 13. -
- If any SS13 EVA Personal are able to locate this ship, they will be able to pilot it back to the station for recovery. The ship may also have cordinates for other locations. -
- Changelings now have the ability Strained Muscles, which lets them move at inhuman speeds at the cost of rapid stamina damage. It costs one evolution points=. -
- Changelings now have the ability Augmented Eyesight, which lets them see creatures through walls and see in the dark. It costs two evolution points. -
- After many failed raids, the Syndicate have finally done something about poor communications between cyborgs and operatives. -
- Syndicate Cyborgs now come equipped with operative pinpointers, which will automatically point to the nearest nuclear operative. -
- Handheld crew monitors can now be stored in medical belts. -
- Added fannypacks of multiple colors, 3 of which are accessible from the clothing vendor. -
- Added dufflebags to multiple lockers throughout the station and to the syndicate shuttle, more storage slots at the cost of move speed. -
- Fixed some bugs in PDA's NTRC Chatroom feature. -
- You can now use PaperBBCode/PenCode when writing news articles on the newscaster. -
- PDA's Notekeeper now uses PaperBBCode/PenCode rather than HTML. -
- Scanning paper with your PDA is now more informative. -
- We, at NanoTrasen, have recently upgraded the Kitchen Spikes to include the skin of both Monkeys and Aliens when you harvest their flesh! -
- In other news, a station in a nearby Sector has been making monkey and xeno costumes. We are not sure why. -
- Added the ability to reform mineral floortiles back into sheets/bars -
- Added a new config option MINIMAL_ACCESS_THRESHOLD that can be used to automatically give players more access during low-population rounds. See game_options.txt for more information. -
- The kitchen now contains a brand new food cart. It can store foods and liquids, mix them into cocktails and dispense where needed. Food delivery has never been easier! -
- Added briefcase filled with cash to uplink. -
- Addiction and Overdosing has been added to Chemistry. -
- Deal with Overdosing by purging the ODing chemical with Calomel or Penetic Acid. -
- Deal with Addiction by either going cold turkey on it and weathering the effects, eventually causing the addiction to subside, or by taking more of the addictive substance to keep the effects down. -
- Cryoxadane was heavily buffed. Clonex was removed as it was merged into Cryox. -
- Fixes a shitton of stuff adding Morphine instead of Ephedrine. Sorry, miners. -
- Fixes instances of Alkysine not being replaced with Mannitol. Same with Ryetalyn being replaced with Mutadone. -
- Adds Itching Powder. Welding Fuel and Ammonia. -
- Adds Antihol. Ethanol and Charcoal. -
- Adds Triple Citrus. Lemon Juice, Lime Juice, and Orange Juice. -
- Adds Colorful Reagent. Stable Plasma, Triple Citrus, -
- Morphine replaces sleep toxin now, not Hyperzine. Hyperzine is replaced by Ephedrine now. -
- Cryotubes will now autoeject you once you are fully healed. -
- Synthflesh damage values have been fixed. -
- Charcoal has been buffed to heal 3 TOX damage a cycle and it purges other chemicals faster. -
- Saline-Glucose Solution has been buffed. It now has a 50% chance per cycle to heal 3 BRUTE and BURN per tick. -
- Fixes Strange Reagent revivals dying right after being revived. They'll still need immediate medical treatment, however. -
- Cryoxadone has had a recipe change. It is now Stable Plasma, Acetone, and Unstable Mutagen. -
- Adds 9 new Disabilites and 2 new genetic powers. -
- You can now heat donk pockets once more. Rejoice. -
- The lockbox system for R&D has been replaced with a firing pin system. Ask the Warden or HoS for firing pins to allow normal operation of your firearms. Want to test them out at the range? Try printing a test-range pin. -
- Nuke Ops have used this new technology to lock some of their heavier weapons so that crew cannot use them. These implants replace their explosive implants. -
- Explosive implants are now purchasable in the uplink, and are much stronger. -
- NanoTrasen would like to report that our Mechanical Engineers at NTEngiCore has recently upgraded the capacity of the machines known as Biogenerators. They are now have the added ability to create various belts, and also weed/plantkillers and cartons of milk and cream! -
- Replaced Star Trek chemistry with Goon Chemistry. -
- Emergency Medic's Handbook Tip 1: Styptic Powder = BRUTE, Silver Sulfadiazine = BURN, Charcoal = TOX, Salbutamol = OXY -
- In recipes that used removed reagents, they have been replaced with their goon chemistry counterpart: -
- Hyperzine -> Morphine -
- Inaprovaline -> Epinephrine -
- Kelotane -> Saline-Glucose Solution -
- Bicardine -> Saline-Glucose Solution -
- Dermaline -> Saline-Glucose Solution -
- Dexalin -> Salbutamol -
- Dexalin Plus -> Salbutamol -
- Tricordrazine -> Omnizine -
- Anti-Toxin -> Charcoal -
- Hydronalin -> Penetic Acid -
- Arithrazine -> Penetic Acid -
- Imidazoline -> Oculine -
- Mannitol -> Alkysine -
- Ryetalyn -> Mutadone -
- The Emergency Response Team project has been activated by Nanotrasen. The ERT are a seven man squad that can be deployed by the Central Command (admins) to attempt to rescue the station from a overwhelming threat, or to render assistance in dealing with a significant problem. -
- The ERT consists of a single Commander, two Security Officers, two Engineering Officers and two Medical Officers. The Commander is preselected when the squad is being spawned in, however the remaining six officers are free to select their role in the squad. -
- Two new Pulse gun variants have been added to the game. They are the Pulse Carbine and the Pulse Pistol, both have significantly smaller ammunition capacities than the Pulse Rifle, however they both can fit in a backpack and the pistol can fit in a pocket. All ERT Officers have a Pulse Pistol for a sidearm, however the Security Officers get a Pulse Carbine as their primary longarm. -
- The two library consoles are now real buildable computers. The circuitboard design is available in R&D. -
- Added a new R&D machine, to replace the telescience room. The Machine is based on RND and various interdepartmental creations. -
- Adds a new spell: Repulse. (Cooldown: 40 seconds, 15 at max upgrade.) Repulse throws objects and creatures within 5 tiles of the caster away and stuns them for a very short time. Distance thrown decreases as the distance from the caster increases. (Max of 5, minimum of 3) Casting it while standing over someone will stun them for longer and cause brute damage but will not throw them. -
- Fixes the Exosuit Control Console having the unpowered icon state while powered. -
- Added Goonstation Chemistry! -
- Adds 14 medicines! -
- Adds 3 pyrotechnics! -
- Adds 3 drugs with actual gameplay uses! -
- Adds 7 toxins! -
- Adds a Chemical Heater for some new recipes! -
- Adds Chemical Patches for touch based applications! -
- Adds a Traitor Poison Kit! -
- Adds Morphine Medipens! -
- Adds Morphine bottles to Cargo! -
- Adds a bandanas in basic colors to lockers in the station. Activate in hand to switch between head and mask modes. -
- Adds more colored jumpsuits to the mixed locker. -
- Player controlled slimes can now change their face to match AI controlled slimes in kawaiiness. use *help as a slime to find the commands. -
- Fixed NTSL division. -
- Added new NTSL math functions, including 'sin,' 'cos,' 'asin,' 'acos,' and 'log.' -
- Adds emoji to OOC chat. -
- Buffs the RCD from 30 matter units to max capacity 100, and increases the value of matter charges. -
- Taser electrodes now have a limited range of 7 tiles. -
- The energy gun's stun mode has been replaced with a disable mode. -
- Security officers will now spawn with tasers. -
- Disabler beams now go through windows and grilles. -
- Disabler beams now do 33 stamina damage instead of 34. This means they will only stun in 3 hits on someone that is NOT 100% healthy. -
- Most ballistic projectiles now do stamina damage in addition to their regular damage instead of stunning. This includes nuke op c-20r .45, detective's revolver, etc. They are effectively better than disablers at stunning people, as well as do significant damage, but they do not stun instantly like a taser. Expect engagements to be a little longer and plan ahead for this. -
- Added an advanced taser for RnD, the child of a disabler and a taser. -
- Envoys from the distant Viji sector have brought an exotic contraption to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient alien artifact, believed to have a dangerous and mysterious power. This precious item has been made available to the Space Station 13 cargo team for the cost of a hundred supply points, as a reward for all your hard work. Good luck, and stay safe. -
- Reverted security armor and helmets to the old (Grey) style of armor/helmets. -
- Updated security jumpsuits to be more consistent across officer/warden/HoS ranks. -
- Added tactical armor and helmets to replace the largely unused bulletproof vest in the armory. This armor has higher bullet and explosive resistance than normal armor, and uses the previous, more military armor/helmet sprites. -
- Added a new injury doll to go along with the overall health meter. This will show you locational overall limb-based burn/brute damage, so you can tell the difference between being hurt with burn/brute or toxins/stamina damage which does not affect limbs. -
- Reverted some UI icons back to their older status and changed some around for readability. Thank you for your feedback. -
- Added a new FRAG-12 explosive shotgun shell, built from the unloaded technological shell, using tablecrafting. Constructed using an unloaded technological tech shell, 5 units sulphuric acid, 5 units polytrinic acid, 5 units glycerol, and requires a screwdriver. -
- Change to the hunger system. Eating food with sugar temporarily worsens your nutrition drop rate. Eating too much sugar too quickly can make you temporarily unable to eat any sugary food. The nutritional effect of sugar depends on how hungry you are thus it cannot easily raise your nutrition level past well fed and is best used when hungry. Lots of sugar can make you a bit jittery at times. Eating food with vitamin (new reagent) counteracts the sugar effects and can give you temporary buffs when well fed: it lowers your chance to catch or spread viruses,it makes your body's metabolism more efficient that is it keeps healing reagents longer and evacuate toxins faster and reduces damage from radioactive reagents. Your metabolism gets less efficient if starving. -
- New hunger hud icons: starving, hungry, fed, well fed, full, fat. -
- Snack vending machine get a chef compartment that can be loaded with non-sugary food by hand or with a tray by anyone with kitchen access (unless you hack the machine with multitool or emag). The food can be unloaded by anyone, like regular snacks -
- Cargo can get a nutritious pizza crate order for 60 points. -
- Grown and cooked food gets some vitamin while junk food gets less nutriment and more sugar (only hot donkpocket and ramen don't have sugar) -
- The number of junk food in snack vending machine is lowered from 6 to 5 of each type. -
- Fixing not being able to load an omelette du fromage on a tray. -
- The Nanotrasen firmware update 12.05.14 for station AI units and cyborgs includes a patch to give them more control of their automatic speech systems. They can now chose if the message should be broadcasted with their installed radio system and any frequency available to them. -
- Added winter coats and winter boots! Bundle up for space xmas! They are available in most wardrobe and job lockers, and come with special features depending on the flavor! -
- Added a new weapon for syndicate boarding parties, the C-90gl assault rifle. This is a hybrid rifle with a lot of damage and a grenade launcher alt-fire. Purchasable for 18TC. -
- Suppressors can now be used on the protolathe SMG and the C-20r. -
- Sounds in areas of low pressure (E.g. Space) are now much quieter -
- To hear someone in space you need to be stood next to them, or use a radio -
- We've discovered that slimes react to the introduction of certain chemicals in their bloodstream. Inaprovaline will decrease the slimes children's chance of mutation, and plasma will increase it. -
- We've also found that feeding slimes solid plasma bars makes them more friendly to humans. -
- Allows using replica pods to clone people without bodies. -
- Speeds up replica pod cloning by adjusting the starting production. -
- Replica pods will now only create plantmen. -
- Mixing blood in a beaker or taking it from a suicide victim will render the blood sample useless for replica pod cloning. -
- Our top Nanotrasen scientists have provided improved specifications for the Rapid Part Exchange Device (RPED)! The RPED can now contain up to 50 machine components, and will display identical items in groups when using its inventory interface. -
- Note that power cells, being somewhat bulkier, will take up more space inside the device. In addition, the RPED's firmware has also been updated to assist in new machine construction! Simply have the required components inside the RPED, apply it to an unfinished machine with its circuit board installed, and watch as the device does the work! -
- Nanotrasen has updated station bound Artificial Intelligence unit design specifications to include an integrated subspace radio transmitter. The transmitter is programmed with all standard department channels, along with the inclusion of its private channel. It is accessed using :o in its interface. -
- {INCOMING CLASSIFIED SYNDICATE TRANSMISSION} Greetings, agents! Today, we are happy to announce that we have successfully reverse engineered the new subspace radio found in Nanotrasen's newest AI build plans. We have included our encryption data into these transmitters. -
- Should you be deployed with one of our agent AIs, it may be wise of you to purchase a syndicate encryption key in order to contact it securely. Remember, as with other agents, a Syndicate AI is unlikely to be of the same Syndicate corporation as you, and you both may actually have conflicting mission parameters! Your channel, as always, is accessed using :t. -
- Changed the way flashbang protection works. Currently, only security helmets (and their derivatives like swat and riot), and some hardsuit helmets have flashbang protection. Ear items like earmuffs and 'bowman' headsets (alternative, larger headsets) have flashbang protection as well, so you're able to go hatless as security. The Head of security, warden, and detective's hat do NOT have flashbang protection, but their earpieces do, from the 'noise' part of the flashbang. The flashbang blind still works as before, with only sunglasses/hardsuit helmets protecting you. -
- Security/Medical HUDs are now more responsive and less laggy. -
- Made meteors more threatening. -
- Added three levels of danger for meteors waves, randomly selected at spawn. -
- Rumors speaks of a very rare meteor of unfathomable destructive power in the station sector... -
- Fixed infinigib/infinisplosion with meteors bumping -
- Added a defibrillator and an EMT alternative clothing set for medical doctors. These defibrillators will revive the recently deceased as long as their souls are occupying their body and they have no outstanding brute or burn damage. -
- Yes, they actually work now too! -
- Added a way for you to unload a round from a chambered projectile weapon. Simply click on the gun when it is in your active hand, and assuming it does not have a magazine, the round should pop out. You can also use this system to unload individual bullets from magazines and ammo boxes, like the detective's speed loaders. -
- Added glass tables and overhauled how table construction works. Now, you need to build a frame using either metal rods or wood planks, and then place a top on the table. -
- Table disassembly now works in two stages. Screwdriver the table to remove the top of it and reduce it back to a frame. Frames can be moved around and walked on top of. Wrench the table to deconstruct it entirely back to parts, this is quicker and much more like the old fashion. To deconstruct a frame, use your wrench on it as well. -
- Fixed traitor med analyzers not fitting in medical belts. -
- Fixed syringe box bug with medipens. -
- Added escape-with-identity objective for changelings. Completion requires the changeling to have transformed to their target and be wearing an ID card with the target's name on it when escaping. -
- Changelings can absorb someone even if they have that DNA in storage already. -
- Fixes hivemind being lost when readapting evolutions. -
- You can use AI Upload modules directly on unslaved cyborgs to change their laws. The panel has to be open to do this. -
- Newly emagged cyborgs get locked down for a little bit until their new laws get shown. Thank you to whoever bitched about it on singulo and filed an issue report. -
- Added an advanced mop for the janitor, available at the protolathe. This hi-tech custodian's friend can mop twice as many floor tiles before needing to return to your bucket! -
- Moved holosign projector to the protolathe and gave the janitor back his old signs. We hope you've enjoyed this free trial run of holo projectors, but our budget is tight! -
- Added a holosign projector to the janitor module for cyborgs. -
- Soap now has a delay. Different soap types clean faster than others, but expect to put it some extra arm work if you want to clean that fresh blood! -
- Cutting-edge research in a secret Nanotransen lab has shed light into a revolutionary form of communication technology known as 'chat'. The Personal Data Assistants of Space Station 13 have been deployed with an experimental module implementing this system, dubbed 'Nanotransen Relay Chat'. -
- Everything now drifts in space, not just mobs. -
- Mechs are just as maneuverable in space as you are. -
- Being weightless now slows movement down by a lot rather than speeding it up. Having your hands full will make movement even slower. -
- Removed spaceslipping (You slipped! x1000) -
- Jetpacking after being thrown out a mass driver will cancel out your momentum. -
- Shooting a gun causes you to drift the other direction like spraying a fire extinguisher. -
- Adds a new riot shotgun that spawns in the armory with a 6 round beanbag magazine. -
- Allowed constructs to assist in activating most runes. This includes conversion runes, but does NOT include sacrifice runes. -
- In light of the recent achievements of the Robotics department, new and upgraded exosuit schematics were delivered to SS13 exosuit fabricators as a reward from CentComm. -
- The countless hours of research, experimentation, and reverse-engineering of wrecks from the mining asteroid have paid off - the Research team has rediscovered the process of building Phazon exosuits. The parts and circuits have been made available in the exofabs and circuit printers. -
- The APLU Ripley exosuit has been refitted with asteroid mining purposes in mind. Its armour plating will provide extra protection against the brute attacks of asteroid alien lifeforms, and protect from gibtonite explosions. The leg servos were upgraded to provide faster movement. -
- There are rumours of some creative shaft miners discovering a way of augmenting APLU Ripley armour with trophy hides from goliath-type asteroid lifeforms... -
- Durand construction routines now require a phasic scanner module and a super capacitor to match Nanotrasen industry standards. -
- The exosuit fire extinguisher now boasts a larger watertank, and carries a whole 1000u of water from the old 200u tank. -
- The exosuit plasma converter's efficiency has been vastly improved upon, and its fuel consumption has been cut to nearly half of old values. -
- The exosuit sleeper interiors have been refitted to allow the occupants more freedom of movement, and the occupants may now eject at will. -
- The armour plating on all exosuits was fitted with reactive deflection systems specifically designed to stop the rapid slashes from xenomorph threats. -
- The Firefighter Ripley chassis were moved from the Exosuit Equipment section to the APLU Ripley section of exofab menus. -
- Fixed some minor errors in the exosuit construction message syntax. -
- Closets and its children can no longer contain a near infinite amount of mobs. Large mobs (juggernaut, alien emperess, etc) don't fit, small mobs (mouse, parrot, etc) still fit in the same amounts, human-sized mob (humanoid, slime, etc) fit but maximum two per body bag and three for all the other closets. Adding bluespace body bag to R&D, it can hold even large mobs and in large amounts. -
- girders and displaced girders now have a chance to let projectiles pass through them. -
- Major atmos update. Featuring pretty colors. -
- 4-Way pipes added. -
- Flip-able trinary devices (mixer & filter). -
- Pipe-painter added. -
- Most pipe icons have been tweaked with shading and such, making it look more uniform. -
- We have managed to re-discover drones! We improved the formula, and have discovered some cool stuff. -
- After some fiddling with audio recognition, drones can now understand human speech! -
- One of our engineers found some screws that were loose on some of our tests, screwing them in made the drone work as if it had just come out of robotics. -
- We had to sacrifice some of our NT brand EMP protection for the speech recognition, so drones can get damaged if subjected to heavy EMP radiation. -
- We figured out why drones couldn't remove objects from people, that has been fixed. -
- The standby light wasn't wired correctly. -
- Unfortunately one of our assistants tasked with transporting the only copy of the data dropped the flash drive in hot water because he wanted to see what "drone tea" tasted like. You'll have to discover them again. -
- Station's crayons have been upgraded to the version 2.0 of ColourOS. Don't worry, they are still edible! -
- Many items now have different stripping delays. Heavier and more armored pieces of clothing are generally more difficult to take off someone else, while smaller items can be very easy to snatch. Pockets always take 4 seconds to search. -
- Implants are activated via action buttons on the top-left corner of your screen instead of emotes. -
- Added zipties for security and nuke operatives. These have a slightly shorter 'breakout time' as normal cuffs but they are destroyed upon removal. Beepsky and sec borgs now use these by default. -
- Changed the medical HUD in the tactical medkit to a night vision HUD so syndicate medics don't stumble around in the dark. Can be purchased through nuke op uplinks. -
- Added a second roboticist roundstart job slot. -
- Added a third cargo tech job slot. -
- Added undershirts as a companion piece to jumpsuit adjusting. Beat the heat with a comfortable tank top, or warm up with an extra layer tshirt! -
- Added a holographic sign projector to replace the old wet floor signs to encourage janitors to warn crewmembers about wet floors. -
- Medical supplies crate now comes with a boxy full of bodybags -
- Added inaprovaline MediPens (autoinjectors) that replace inaprovaline syringes in medkits. Like the syringes, these can be used to stabilize patients in critical condition, but require no medical knowledge to use. -
- Reverted the mining scanner to a manual scanner. -
- Buffed the rate of the automatic scanner -
- Added automatic scanner to equipment locker. It is also available by redeeming your voucher. -
- Reduced the size of the mining jetpack, it now fits in backpacks. The capacity of the jetpack has been reduced as well, however. -
- Removed resonator from the mining voucher redemption. Replaced it with a mining drill. -
- Flash mechanics changed. Instead of a knockdown effect, it will cause a stumbling effect. This includes area-flashing. The five-use-per-minute limit has been removed. "Synthetic" flashes made in the protolathe are now normal flashes. -
- Added a unique shield to the Head of Security's locker. It can be concealed for storage and activated like an energy shield, but functions like a riot shield. It can also be made at the protolathe. -
- Marauders: Due to your extremely great performance as of late, we've added a new equipment room on Mother Base. A lot of your equipment has been moved to this room, as well as some new equipment added onto the Mothership. Take some extra time to familiarize yourself with the placement of your equipment. -
- Oh, and you guys have a space carp now too. -
- Added jumpsuit adjusting. Adjust your jumpsuit to wear it more casually by rolling it down or roll up those sleeves of that hard-worn suit! -
- Added a grey alternative to the detective's suit and trenchcoat. Now you can be a noir private investigator! -
- Space Station 13 has been deployed with transit tube dispensers. Central Command encourages the engineering department to repair and improve the station using this equipment. -
- Character Save Files will now remember Species. -
- Added 5 new maintenance ambience tracks, made by Cuboos. -
- Added examine descriptions to twenty eight objects. -
- Due to some payroll cuts affecting lower-rank crewmembers on Space Station 13, we fear that uprisings and mutinies might be approaching. To help defend themselves, all heads of staff have been given telescopic batons to subdue attackers should they be assaulted during their shifts. -
- Toolbelts can now hold pocket fire extinguishers. Atmos technicians spawn with them. -
- Remember those magboots we had our undercover agents steal? Well we've finally reverse engineered them. Not only that, but we gave them a killer paintjob. They will be available in the uplinks of boarding parties we send out to Nanoscum stations. -
- Listen up, Marauders! The Syndicate has recently cut back funding into boarding parties. What this means is no more hi-tech fancy energy guns. We've had to roll back to using cheaper, mass-produced automatic shotguns. But in retrospect, could this possibly be a downgrade? -
- Experienced smugglers have joined the Syndicate, adding their bag of tricks to its arsenal. These tricky pouches can even fit under floor plating! -
- Adds Gang War, a new game mode still in alpha development. -
- After a public relations nightmare in which a horde of 30 assistants violently dismembered a sole commander the revolution has begin tactically reducing their initial presence in stations with weak command structures. Should stations add to their command staff during the shift additional support will be provided. -
- Too many instances of crying CMOs hiding in the lockers of supposedly secured revoulutionary stations has lead to a crackdown on revolutionary policy. You must kill or maroon the entire command staff, reguardless of when they reached the station. -
- Intense study into the underlying structure of the universe has revealed that everything fits into a massive SPACECUBE. This deep and profound understanding has led to a revolution in cross surface movement, and spacemen can look forward to a new era of predictable and safe space-fairing. -
- Grille damage update, humans now deal less unarmed damage to grilles while projectiles and items deal more. -
- Replaced all AI turrets with porta-turrets that work on LoS instead of area and can be individually configured -
- Voice changer masks work again. -
- You can now turn voice changer masks on/off by activating them in your hand. They start off. -
- The amount of TC has been increased to 20, but the price of all items has been doubled as well -
- With this, the prices of stealthy items has been slightly decreased and the prices of offensive items slightly increased (+/- 1 TC) -
- New research in the area of robotics has been published on Maintenance Drones, little robots capable of repairing and improving the station. Unfortunately, all of the research was lost in a catastrophic server fire, but we know they can be made, so it's up to you to re-discover them! Make us proud! -
- Changed all clone damage descriptions to use the term cellular damage to avoid confusion with genetics mutations. -
- Nanotrasen scientists have released a Heads-Up-Display (HUD) upgrade for all AI and Cyborg units! Cyborgs have had Medical sensors and a Security datacore integrated into their core hardware, replacing the need for a specific module. -
- AI units are now able to have suit sensor or crew manifest data displayed to them as a visual overlay. When viewing a crewmember with suit sensors set to health monitoring, the health status will be available on the AI's medical HUD. In Security mode, the role as printed on the crewmember's ID card will be displayed to the AI. -
- Any entity with a Security or Medical HUD active will recieve appropriate messages on that HUD. -
- Server Operators: A new config option added to restrict command and security roles to humans only. Simply add/uncomment the line ENFORCE_HUMAN_AUTHORITY in game_options.txt. -
- Players: To check if this config option is enabled on your server, type show-server-revision into the game's command line. - -
- Tampered supply ordering consoles can now order dangerous devices directly from the Syndicate for 140 points. -
- Securitrons line units will no longer arrest individuals without IDs if their faces can still be read. -
- Enemy Agent ID cards have been reported to be able to interfere with the new securitron threat assessment protocols. -
- The Syndicate base has been modified to only allow the leading operative to launch the mission. - -
- All the objects found in BoxStation maintenance are now randomized at round start. -
- Cost of Syndicate bombs increased to 6 telecrystals. -
- Many new posters have been added. -
- Adds preference toggle for intent selection mode. -
- Direct selection mode switches intent to the one you click on instead of cycling them. - -
- New more detailed End-Round report. -
- Removes count of readied players from the lobby. - -
- Virology has been made the right color. -
- A major rework of saycode has been completed which fixes numerous issues and improves functionality. -
- Please report any issues you notice with any form of messaging to Github. - -
- Adds two new hairstyles. -
- Space Station 13 has been authorized to requisition additional Tank Transfer Valves from Centcom's supply lines for the price of 60 cargo points. -
- Security forces are advised to increase scrutiny on personnel coming into contact with AI systems. Central Intelligence suggests that Syndicate terrorist groups may have begun targeting our AIs for destruction. -
- For the preservation of corporate assets, Central Command would like to remind all personnel that evacuating during an emergency is mandatory. We suspect that terrorist groups may be attempting to abduct marooned personnel who failed to evacuate. -
- R&D; teams have released an urgent update to station teleporters. To eliminate the risk of mutation, personnel are advised to calibrate teleporters before attempting each use. -
- Centcom has approved the Captain's request to rig the display case in his office with a burglar alarm. Any attempts to breach the case will now trigger a lockdown of the room. -
- **Crew Monitoring Consoles now scan their own Z-level for suit sensors, instead of only scanning Z1. -
- **Server operators can now set a name for the station in config.txt. Simply add the line "STATIONNAME Space Station 13" anywhere on the text file. Replace Space Station 13 with your station name of choice. - -
- Ore redemption machine can now smelt plasteel. -
- Mulebot speed has been vastly increased by up to 300%. -
- Removed exploit where false walls can be used to cheese the AI chamber's defenses -
- The Phase Shift ability will no longer instantly gib players. Instead, they will be knocked out for a few seconds. Mechas will be damaged. -
- The Phase Slayer ability will no longer instantly gib players. Instead, they will be dealt 190 brute damage. Mechas will be dealt 380 damage. -
- ADMIN: Most Event buttons have been moved out of the secrets menu and into a Fun verb. -
- Three new shotgun shells added. Create them by first researching and printing an unloaded tech shell in R&D.; Afterwards, use table-crafting with the appropriate components with a screwdriver in-hand. -
- Meteorshot: tech shell + compressed matter cartridge + micro(or better) manipulator. -
- Pulse Slug: tech shell + advanced capacitor + ultra micro-laser. -
- Dragonsbreath: tech shell + 5 phosphorus (in container). -
- Incendiary rounds now leave a blazing trail as they pass. This includes existing incendiary rounds, new dragonsbreath rounds, and the Dark Gygax's carbine. -
- Brig cells and labour shuttle have both been modified to send a message to all security HUDs whenever a prisoner is automatically released. -
- The labour camp has been outfitted with a points checking console to allow prisoners to check their quota progress easier and better explain the punishment system of forced labour. -
- 25 new hairstyles have been added. -
- AI photography has been extended to Cyborgs. While connected to an AI, all images taken by cyborgs will be placed in the AI's album, and viewable by the AI and all linked Cyborgs. -
- When a Cyborgs AI link wire is pulsed, the images from the Cyborgs image album will be synced with the AI it gets linked to. -
- Additonally, Cyborgs are able to attach images to newscaster feeds from whichever album is active for them. Cyborgs are also mobile, inefficent, printers of same images. -
- Boxstation map updates:
- -Singularity engine walled from from outer space
- -Shutters for exterior Science windows
- -Teleporter board moved from RD's Office to Tech Storage now that the teleporter can be built again.
- -Security Deputy Armbands (red) added in HoS's Office
- - Added a new mutetoxin that can be made with 2 parts uranium, 1 part water and 1 part carbon and makes people mute temporarily -
- Parapens were renamed to sleepy pens and now contain 30 units of mutetoxin and 30 units of sleeptoxin instead of zombie powder. -
- C4 can no longer be attached to mobs -
- Reduced the C4 price to 1 telecrystal -
- We, of the NanoTrasen Botany Research and Developent(NTBiRD), has some important announcements for the Botany staff aboard our stations. -
- We have recently released a new strain of Tower Cap. It is now ensured that more planks can be gotten from a single log. -
- Head Scientist [REDACTED] is thanked for his new strain of Blood Tomatoes. It now not only contains human blood, but also chunks of human flesh! -
- We have also discovered a way to replant the infamous Cash Trees and 'Eggy' plants. We can now harvest their seeds, and the rare products are inside the fruit shells. -
- Similar to the new variety of Tower Caps, it is now possible to get various grass flooring depending on the plants potency! -
- Our sponsors at Knitters United has released a new variation of the botany Aprons and Coveralls which can hold a larger variety of items! -
- A new version of Plant-B-Gone was produced which are much more lethal to plants, yet at the same time has no extra effect on humans besides the norm. -
- Tweaked mining turf mineral droprates and reverted mesons to the 'old' style of mesons. This means mesons will be more powerful with the added side effect of not being able to track individual light sources through walls and such. This is a trial run; please provide feedback on the /tg/ codebase section of the forum. -
- Recently the Space Wizard Federation, with some assistance from the Cult of Nar-Sie, recently created a new strain of Killer Tomato. A sad side effect is this effected all current and future Killer Tomato strains in our galaxy. They are now reported to be extremely violent and deadly, use extreme caution when growing them. -
- Added slot machines to the game -
- Slot machines use reels. All prizes except for jackpots can be won on all lines -
- Simply put a coin into one of the slot machines in the bar to play! -
- Slot machines can also be emagged. -
- Central Security has approved an upgrade of the Securitron line of bots to a newer model.
Highlights include:
- - -An optional setting to arrest personnel without an ID on their uniform (Disabled by default) -
- -An optional setting to notify security personnel of arrests made by the bots (Enabled by default) -
- -A new "Weapon Permit" access type that securitrons will use during their weapons checks. Personnel who work with weapons will be granted this access by default. More can be assigned by the station's Head of Security and Personnel. -
- -A more robust threat assessment algorithm to improve accuracy in identifying perpetrators. -
- Fixed the irrigation system in hydroponics trays. Adding at least 30 units of liquid at once will activate the system, sharing the reagents between all connected trays. -
- Changelings can communicate while muzzled or monkified, and being monkified doesn't stop them from taking human form. -
- Mimes cannot break the laws of physics unless their vow is currently active. -
- Trays are rewritten to make sense and so borgs can actually use them. Service borgs can discretely carry small objects, hint hint. The items are easily knocked out of them. -
- The 'Enter Exosuit' button was removed, and you have to click + drag yourself to enter a mech now; like you would to enter a disposal unit. -
- NT Baton Refurbishment Team Notice: 'Released' option in security records has been renamed 'Discharged', and the sechud icon has been changed from a blue R to a blue D. Stop beating your released prisoners, dummies; they're not revheads. -
- NT Entertainment Department Notice: The prize-dispensing mechanism in Arcade machines has been replaced with a cheaper gas-powered motor. It should still be completely safe, unless an electromagnetic field disrupts it! -
- Pill code tweaked. In short, you can feed monkeys pills now #whoa -
- Casings ejected from guns will now spin #wow -
- Having the nuke disk will no longer prevent you from using teleporters or crossing Z-levels. Leaving the Z-level however, will cause you to "suddenly lose" the disk. -
- Pulled objects will now transition with you when as you transition Z-levels in space. -
- IEDs have been removed -
- Firebombs have been added -
- They're as reliable and predictable as you would expect from a soda can filled with flammable liquid and set off with an igniter contected to two wires. Use your branes and take proper precautions or leave a charred corpse, your choice. -
- Nanotrasen programmers have discovered a potential exploit involving a station's door control networks. With sufficient computing power, the network can be overloaded and forced to open or bolt closed every airlock at once. -
- Some reports suggest that the latest firmware update to Artifical Intelligence units installed in our research stations may contain this exploit. Any such reports that state that should a station's AI unit "malfunction", it may gain the ability to use this exploit to initate a full lockdown of the station. Fire locks and blast doors are also said to be affected. -
- Nanotrasen officially holds no validity to these reports. We recommend that station personnel disregard such rumors. -
- After the years of extensive research into xenobiology, and thousands of scientists lost to the slimes, we have finally come to admitting that we don't have a clue how they work. However, we've outlined a few facts, and managed to breed a new kind of slimes. They will be shipped to your station on the next shifts. They are different from the ones they are used to in the following: -
- Their sight is better than ever, and now they can finally see things that are not directly pressed against them. Beware, they may appear more aggressive! -
- Their memory has also become better, and they will now remember the people who fed them. As a note, you need to grab the monkey or push it to show to the slime that you're giving it to them, and it's not just walking in. -
- Apparently, not only we have studied them, but they have also studied us. Slimes are now capable of showing various emotions, mimicking humans. Use it to your advantage. -
- There are reports of slimes showing signs of sentience. Further research is recommended. -
- One of the reported signs is their speech capability. Following facts have been gathered: they talk more often to those who feed them; they react to being called by the number, but 'slimes' is also acceptable; they are able to understand being ordered to "follow" someone, or "stop". There is a report of slime releasing the assistant after a scientist shouted at it, and then calmly ordered a slime to stop. -
- We've made a modification of a health scanner that is intended for the use on slimes. Two are available in the smartfridge. -
- We've come to a conclusion that 5 units of reagents are not necessary to cause slime core reactions. You actually only need one unit. -
- Thanks to Nanotrasen's Engineering division, the power wiring of the station has a received a complete overhaul. Here are the highlight features in CentCom report : -
- Improved way of connecting cables! Finished is the time of "laying and praying" : it's now as simple as matching ends of each cables! -
- Unified way of connecting machines! Every machine is connected to a powernet through a node cable (it still needs to be anchored to receive power though)! -
- Lots of improvements in the cable cutting tools! Gone is the odd magic of physically separated yet still connected powernets (contact CentCom Engineering Division if you still witness something weird, we always have a fired form ready for our engineers!)! -
- Any conscientious (or not!) Station Engineer may check an "updated wiring manual" at http://www.tgstation13.org/wiki/Wiring#Power_Wires -
- A recent breakthrough in Plasma Materials Research has led to the development of a stronger, tougher plasteel alloy that can better resist extreme heat by up to four times. A live demonstration preformed during a press conference earlier today showed a segment of reinforced wall resisting an attack by Thermite. The corporation also announces that upgrades to its existing stations is already underway. -
- /tg/station code is now under a feature freeze until 7th June 2014. This means that the team will be concentrating on fixing bugs instead of adding features for the month. -
- You can find more information about the feature freeze here. http://tgstation13.org/phpBB/viewtopic.php?f=5&t;=273 -
- This is the perfect time to report bugs, which you can do so here. https://github.com/tgstation/-tg-station/issues/new -
- You now have to give a reason when calling the shuttle. -
- The amount of time it takes for the shuttle to refuel is now a config option, the default is 20 minutes. -
- Certain Enemies of the Corporation have discovered a critical exploit in the firmware of several NanoTrasen robots that could prevent the safe shutdown of units corrupted by illegally modified ID cards, dubbed "cryptographic sequencers". -
- NanoTrasen requires more research into this exploit, this we have issued a patch for AI and Cyborg software to simulate this malfunction. All NanoTrasen AI units are advised to only allow testing in a safe and contained environment. The robot can safely be reset at any time. -
- Unfortunately, a robot corrupted by a "cryptographic sequencer" still cannot be reset by any means. NanoTrasen urges regular maintenance and care of all robots to reduce replacement costs. -
- NT Human Resources announces an expansion of the List of Company-Approved Hair Styles, as well as more relaxed gender restrictions on hair styles. Check with your local company-sponsored hairstylist to learn more. -
- ID Computers have been modified to allow Station Heads of Staff to assign and remove access to their departments, as well as stripping the rank of their subordinates. An ID computer on the bridge is available for the use of this function. -
- NanoTrasen Emergency Alerts System 4.20 has been released! -
- In the unfortunate event of any nuclear device being armed, the station will enter Code Delta Alert. -
- Should the nuclear explosive be disarmed, the station shall automatically return to its previous alert level. -
- A new AI satellite has been constructed in orbit of Space Station 13! -
- The satellite exclusivly is used to hold a station's Artifical Intelligence Unit, the satellite contains a miried of turret and motion sensor defences. A transit tube network is used to connect the satellite to the station, with the transit room being located at engineering south of the engi escape pod. -
- The AI Upload however has been moved north slightly and is connected directly to the bridge. -
- In addition, the Gravity Generator has been relocated from its prior position in engineering to the location of the old AI Upload, increasing its defence and logical positioning. -
- Wood planks can be used to make wood walls and airlocks; flammability not included -
- Centcom officials have announced a new initiative to combat misuse of their Emergency Shuttle Service. After the shuttle has been recalled several times over the course of a simple work shift, Centcom will attempt to trace the signal origin and pinpoint its source for station authorities. -
- Thanks to Nanotrasen's Construction division, the brig has recieved a overhaul in its design, to increase ease of movement, including an addition of a "prisioner release room" and a insanity ward. -
- Furthing concerns among commentators, Nanotrasen has shipped out additional security equipment to station armories, including Riot Shotguns, tear gas grenades, additional securitron units and military grade Ion Guns. -
- JaniCo have released a new unique product called the JaniBelt. Capable of holding most standard issue janitorial equipment, designed to help relive inventory management among station janitors. In addition the Jani Water Tank has had its reserve of space clenaer increased to 500 units, up from 250. - -
- After concerns raised by security personel, new armor has been shipped that covers the lower waist and readjusts the helmet for comfort. -
- In addition, the aging riot shield has been replaced with a newer, more modern, apperance. - -
- NT AI Firmware version 2554.03.03 includes a function to notify the master AI when a new cyborg is slaved to it. -
- The syndicate suit is now black and red, because black and red is the new red. -
- The Ruskie DJ Station now has a classy orange syndicate suit. -
- Security officers have been equipped with the latest in flashlight technology. You can find a SecLite™ inside your security belt or you can dispense one from the security vending machine. -
- Nanotrasen Construction division is pleased to announce the unveiling of our brand now state-of-the-art Space Station 13 v2.1.3! -
- -Scaffolding used during construction has been repurposed as an expanded maintenance around the station. -
- -Our new Emergency Transport Shuttle Mk III will be making its debut in times of crisis. Includes a new cargo area and extra security features. -
- -A redesigned brig will give security staff more peace of mind with added security features -
- -The armory is now protected by a motion alarm. -
- -The armory is now equipped with security hardsuits. -
- -A new command EVA wing has been added to EVA Storage. Station heads of staff will be able to make use of suits stored here. -
- -A new garden area will be made publicly available for everyone to enjoy some R&R; during their company-endorsed break periods -
- -A new Testing Lab has been added to the Science department for any field experiments that need to be run. -
- -The mining ore redemption machine has been relocated to the Cargo Delivery Office. -
- Made combat more hardcore for hardcore players like myself. This won't be reverted. -
- Sacrifice Cult - Cult has received a massive overhaul to how it works, focusing more on cult magics and sacrificing unbelievers. The most important changes are: -
- Cult starts off with alot more cultists, 6 cultists below 30 players and 9 above. The HoP can no longer be a round start cultist but is still convertible. -
- Cultists start off with join, blood, self, and hell. These give the runes for the sacrifice and convert. -
- Conversions now require three cultists and converts no longer reward words, words must be obtained via sacrifice -
- Sacrificing players traps their soul in a soul stone, which can then be used on construct shells to implant the souls in them -
- Constructs shells can be summoned via a new rune (travel, hell, technology) -
- You can no longer convert the sacrifice target, you dozzy sods -
- Summoning Narsie when she is not an objective leads to !!FUN!! -
- Wrote a system to allow all mob types to be sacrificable - currently only corgis are in the new system -
- Holy Water will DECONVERT cultists, takes around 35 units and two minutes to succeed -
- Hitting a mob that contains holy water with a tome will convert that water to unholy water, conversely hitting any container that contains unholy water with a bible as chaplain will 'cleanse' the taint. -
- Unholy water works like a combination synaptazine and hyperzine, with a twist of branes dimarge and highly toxic to non-cultists -
- Cargo can order a religious supplies crate - it contains flasks of holy water, candles, bibles, and robes -
- Cultists have an innate ability to communicate to the cult hive mind (BE AWARE - THIS DOES A LOT OF DAMAGE), cultists can also communicate via the new Commune option on their tomes (the Read Tome option has been shifted under the Notes option) -
- Cyborgs can now use AI click shortcuts. (shift click on doors opens them, etc) (including ones added below) -
- New silicon click shortcut: Control+Shift click on doors toggles access override -
- New silicon click shortcut: Control click turret controls toggles them on or off -
- New silicon click shortcut: Alt click turret controls toggles lethal on or off -
- Cyborg hotkey mode was massively improved. 1-3 selects module slot, q unloads the active module. use hotkeys-help as cyborg for more details -
- Fabricator blueprints for cyborg parts have been updated to allow the debugging of cyborg units prior to boot. To access the debug functions, assemble a cyborg following standard procedure. Before inserting the MMI, use a multitool on the cyborg body. Note that this update also moves designation data into the system files, so pens can no longer be used to name cyborgs. -
- Toggling the "Play admin midis" preference will pause any playing songs. Turning midis back on will resume the current song where it was. -
- If there's a song playing while you have midis off and you then turn midis on, the current song will begin playing for you. -
- Workaround with the click cooldowns. They should feel faster. If you think that anything needs a click cooldown (like grilles, mobs, etc.), report it to me. -
- Here's the fun part, this is a test for the community and players, I hope I won't be forced to revert this and hear "this is why we can't have nice things". Again, if anything needs a cooldown, report it to me. Have fun with your fast clicks spessmans. -
- A security review committee has approved an update to all Nanotrasen airlocks to better resist cryptographic attacks by the enemy.
-
*New internal wiring will be able to withstand attacks, and panel wires will no longer be left unusable after an attack. -
*Welding tools will now be able to cut through welded doors that have been damaged. -
*Damaged electronics are now removable and replaceable following standard procedure. -
*Airlocks will not be able to operate autonomously until the electronics are replaced.
- - Hair sprites have been given a visual lift. For best results, set your hair color to be slightly lighter than how you want it to look. For dark hair, do not use a color darker than 80% black. -
- Gravity is no longer beamed from CentCom! Instead, there is a new gravity generator stored near Engineering that will provide all the gravity for the station and the z level. Please remember that it gives off a lot of radiation when charging or discharging, so wear protection. -
- Added a new, somewhat experimental system to delete things. This is basically a port from /vg/, so big thanks to N3X15. -
- As a result, bombs and the singularity should be much less laggy. -
- There may be issues with "phantom objects" or other problems with stuff that's suppoed to be deleted or objects interacting with deleted objects. Please report any issues right away! -
- NT R&D; releases AI Patch version 2553.03.18, allowing all Nanotrasen AIs to override the access restrictions on any airlock in case of emergency. Nanotrasen airlocks have been outfitted with new amber warning lights that will flash while the override is active. Should maintenance teams need to restore an airlock's restrictions without using the AI, pulsing the airlock's ID Scanner wire will reset the override. -
- Machines that had their programming overriden by a Malf AI will no longer attack loyal cyborgs; they will still attack cyborgs that aren't loyal, to the Malf AI that hacked them, though. -
- You only require a single unit of blood to mutate viruses now, instead of 5. -
- After a review with CentCom, all Security Officers will now begin their shifts with a Stun Baton in their backpack. To avoid inflating costs however all Stun Batons have been removed from Security lockers except from the brig. -
- After decades of usage CentCom has replaced the Security Uniform, Armor, Belt and Helmet with a newer, more modern design. -
- Nanotrasen Corporate announced a revised dress codes primarily affecting senior station officers. A new uniform for Heads of Personnel will be shipped out to all NT Research stations. -
- Cameras finally capture the direction you are facing. -
- Added two new plasma-level disease symptoms, both are very !FUN! and mess with your genetics. -
- Virologists now only need to use a single unit of virus food, mutagen or plasma to generate symptoms. You can take a single unit by using a dropper, if you change its unit transfer amount in the object tab.. -
- Changed the map to make it harder to escape from the Labor Camp. Please continue using it. -
- Added changeling space suits. These allow changelings to survive in space, internals are not needed. They do not provide any sort of armor and slow your chemical regeneration. -
- Ling rounds are LINGIER, with more lings at a given population. -
- Many simple animals can ventcrawl, including bats. All ventcrawlers must alt-click to ventcrawl. -
- An automatic tool to store and replace machine parts has been added to R&D.; -
- Most stuns have been reduced in from 10+ to 5 ticks in duration. -
- Shoes no longer speed you up. -
- Added fancy suits, which can be orderd from cargo. -
- Added sombrerors and ponches. -
- Cuff application time reduced 25%. -
- Fire will cause fuel tanks to explode. -
- Mutagen has been reduced in lethality. Notably, 15 units are not guaranteed to crit the recipient. -
- Round-end report now shows what items were bought with a traitor's or nuke-op's uplink and how many TCs they used. -
- Facehuggers no longer die to zero-force weapons or projectiles like lasertag beams. -
- Improved blob spores to zombify people adjacent to their tile. -
- If a hand-teleporter is activated while you're stuck inside a wall, you'll automatically go through it. -
- Decreased the lethality of Mutagen in small doses. -
- Added Incendiary Shotgun Shells made at a hacked autolathe; Xenos be wary. -
- Color blending Kitty Ears have returned. -
- Colored burgers! Include a crayon in your microwave when cooking a burger and it'll come out just like a Pretty Pattie. -
- Fixed AI's being able to interact with syndicate bombs. -
- Added Advanced Mesons and Night Vision Goggles to the protolathe. -
- Silicons no longer stop statues from moving when in sight. -
- Increased the health of statues. -
- Increased the range of statues's blinding spell. -
- Reduced the range of Violin notes. -
- Low quality violin midi-notes replaced with better .ogg-notes. -
- Improved the Syndicate Implant bundle to contain freedom, uplink, EMP, adrenalin and explosive implanters. -
- Added Mineral Storeroom to R&D; containing the Ore Redemption Machine; no more assistants stealing your ore in the open hallway. -
- No more removing cursed horseheads. -
- Fixed infinite telecrystal exploit. -
- Removed the chance of your hat falling off when slipping. -
- Added Iatot's cyborg module selection transformation animations. -
- Mining has been significantly overhauled. Hostile alien life has infested the western asteroid! Miners are given an equipment voucher to obtain equipment to protect themselves. There is a spare voucher in the HoP's office, should someone want to switch to mining mid-shift. -
- The Ore Redemption Machine has been added just outside of the Science wing. Ore goes in, Sheets go out, and points are tallied on the machine. Insert your ID to claim points, then spend them on goods at Mining Equipment Lockers. You require specific accesses to tell the Ore Redemption Machine to unload its sheets. -
- Should you not care for being eaten alive by horrible alien life, it is suggested you stick to the eastern asteroid, where there is no hostile alien life... though the yield on ore is not as good. -
- Most ore is no longer visible to the naked eye. You must ping it with a Mining Scanner (Available in all mining lockers) to locate nearby ore. Make sure to equip your mesons first, or it won't be visible. -
- Mesons no longer remove the darkness overlay, you must properly light your environment. Hull breaches to space can still be clearly seen, and it will still protect you from the singulo. -
- Mineral spawn rates have been significantly tweaked to cut down on unnecessary inflation of mineral economy. -
- The asteroid no longer has ambient power on the entire asteroid. AI's who go onto asteroid turf will slowly die of power loss. Mining outposts are unaffected. -
- Fixed an issue where projectiles shot by simple mobs or thrown would hit multiple times. -
- Reduced chicken crates to contain 1-3 chicks, down from 3-6 -
- Increased fertile chicken egg chance from 10% to 25% -
- Photograph now rendered crisp and clean, so that we may enjoy them in their 0.009 megapixel goodness. -
- Cameras should now capture more of what they should, and less of what they shouldn't. -
- The lawyer now spawns with a Sec Headset. -
- Banana peel size is based on banana size. -
- Bigger peels slip for longer than smaller ones. Remember that produce size is based on potency. -
- The clown now spawns with a decent sized banana. -
- The banana mortar now shoots 65 potency peels. -
- A new hostile statue mob, can only move when not being observed, tends to break lights and cause blindness. -
- Blob Zombies! When a Blob Spore moves over a dead human body it will infect the body and revive it as a more powerful varient of the spore. Has double the health and deals more damage. -
- Sec Belts can now hold Stun Batons. -
- Stun Batons now only take 10 seconds to fully recharge. -
- Tables can now be used as an alternative way to craft makeshift items. Simply click-drag table to yourself bring up a list. -
- Spray Bottles can no longer wet up to three tiles with water. -
- Spray Bottles have a third higher release volume that wets a single tile. -
- Water slip times are reduced to the same stun times as soap. -
- Added a NanoUI for the SMES -
- Adds more constructible and deconstructable machines! -
- Added constructible miniature chemical dispensers, upgradable -
- Sleepers are now constructible and upgradable, open and close like DNA scanners, and don't require a console -
- Cryogenic tubes are now constructible and upgradable, open and close like DNA scanners, and you can set the cryogenic tube's pipe's direction by opening its panel and wrenching it to connect it to piping -
- Telescience pads are now constructible and upgradable -
- Telescience consoles are now constructible -
- Telescience tweaked (you can save data on GPS units now) -
- Teleporters are now constructible and upgradable, the console has a new interface and you can lock onto places saved to GPS units in telescience -
- Teleporters start unconnected. You need to manually reconnect the console, station and hub by opening the panel of the station and applying wire cutters to it. -
- Biogenerators are now constructible and upgradable -
- Atmospherics heaters and freezers are now constructible and upgradable and can be rotated with a wrench when their panel is open to connect them to pipes. Screw the board to switch between heater and freezer. -
- Mech chargers are now constructible and upgradable -
- Microwaves are now constructible and upgradable -
- All kitchen machinery can now be wrenched free -
- SMES are now constructible -
- Dragging a human's sprite to a cryogenic tube or sleeper will put them inside and activate it if it's cryo -
- Constructible newscasters, their frames are made with autolathes -
- Constructible pandemics -
- Constructible power turbines and their computers -
- Constructible power compressors -
- Constructible vending machines. Screw the board to switch vendor type. -
- Constructible hydroponics trays -
- Sprites for all this -
- This update will have unforeseen bugs, please report those you find at https://github.com/tgstation/-tg-station/issues/new if you want them fixed. -
- As usual, machines are deconstructed by screwing open their panels and crowbarring them. While constructing machines, examining them will tell you what parts you're missing. -
- Handling a couple flashlights will no longer transform you into the sun. Each light source will have deminishing returns. -
- Inserting lights into containers should no longer dim other lights. -
- Changes windoor and newscaster attack messages to be consistent with windows and grilles. This removes the distracting boldness from windoor attack messages, which is reserved for userdanger, and names the attacker. -
- Thrown items now play a sound effect on impact. The volume of the sound is based on the item's throwforce and/or weight class. -
- The fireaxe now has 15 throwforce, when previously it had only 1. But why would you throw it away, anyway? -
- Projectiles now play a sound upon impact. The volume of the sound depends on the damage done by the projectile. Damageless projectiles such as electrodes have static volumes. Practise laser and laser tag beams have no impact sound. -
- Added sear.ogg for the impacts of damaging beams such as lasers. It may be replaced if player feedback proves negative. -
- Attack sounds for all melee weapons! No more silent attacks. -
- The volume of an object's attack sound is based on the weapon's force and/or weight class. -
- Welders, lighters, matches, cigarettes, energy swords and energy axes have different attack sounds based on whether they're on or off. -
- Weapons that do no damage play a tap sound. The exceptions are the bike horn, which still honks, and the banhammer, which plays adminhelp.ogg. Surely nothing can go wrong with that last one. -
- When you tap someone with an object, the message now uses "tapped" or "patted" instead of attacked. The horn still uses HONKED, and the banhammer still uses BANNED. -
- You won't get the "armour has blocked an attack" message for harmless attacks anymore. -
- Adds 5 force to the lighter when it's lit. Same as when you accidentally burn yourself lighting it. -
- Removes boldness from item attack messages on non-human mobs. The attack is bolded for a player controlling a non-human mob. Now your eyes won't jump to the chat when it's Pun Pun who's being brutalised. -
- Blood will no longer come out of non-human mobs if the attack is harmless. -
- Adds a period at the end of the catatonic human examine message. That's been bugging me for years. -
- The activation and deactivation sounds of toy swords, energy swords and energy shields are slightly quieter. Energy swords and shields are now slightly louder than toys. -
- You can no longer light things with burnt matches. -
- Match, cigarette and lighter attack verbs, forces and damage types change based on whether the object is lit or not. -
- Fixes a bug with the energy blade that kept it at weight class 5 after it was deactivated. Who cares, it disappears upon deactivation. -
- Changes the welder out of fuel message slightly to be less fragmented. -
- Removes dead air from a lot of weapon sound effects to make them more responsive. In other words, the fire extinguisher attack sound will play a lot sooner after you attack than before. -
- Equalised the peak volumes of most weapon sounds to be -0.1dB in an attempt to make volumes based on force more consistent across different sounds. -
- Walking Mushrooms will now attack and eat each other! They're all a little unique from each other, no two shrooms are exactly alike, and a better quality harvest means stronger Walking Shrooms. Pit them against each other for your entertainment. -
- Each mushroom will have a different colored cap to identify them. When mushrooms eat each other, they get stronger. The resulting mushroom will drop more slices when cut down to harvest, and will have better quality slices. -
- Don't hurt them yourself, though, or you'll bruise them, and mushrooms won't get stronger from eating a bruised mushroom. If your mushroom faints, feed it a mushroom such as a plump helmet to get it back on its feet. It will slowly regenerate to full health eventually. -
- Syndicate Playing Cards can now be found on the Syndicate Mothership and purchased from uplinks for 1 telecrystal. -
- Syndicate Playing Cards are lethal weapons both in melee and when thrown, but make the user's true allegiance to the Syndicate obvious. -
- Sprites are courtesy of Nienhaus. -
- Adds thud sounds to falling over -
- Known bug: Thuds play when cloning initialises or someone is put into cryo. This will be fixed. -
- Gibtonite, the explosive ore, can now be found on the asteroid. It's very hard to tell between it and diamonds, at first glance. -
- Gibtonite deposits will blow up after a countdown when you attempt to mine it, but you can stop it with an analyzer at any time. It makes for a good mining explosive. -
- The closer you were to the explosion when you analyze the Gibtonite deposit, the better the Gibtonite you can get from it. -
- Once extracted, it must be struck with a pickaxe or drill to activate it, where it will go through its countdown again to explode! -
- Explosives will no longer destroy the ore inside of asteroid walls or lying on the floor. -
- Adds changeling arm blades that cost 20 chems and do 25 brute damage. -
- Arm blades can pry open unpowered doors, replace surgical saws in brain removal, slice tables and smash computers. -
- Mobs now lie down via turning icons rather than preturned sprites. -
- You can lie down facing up or down and the turn can be 90 degrees clockwise or counterclockwise. -
- Resting will always make you lie to the right so you look good on beds. -
- Please report any bugs you find with this system. -
- Increased the walk speed. Legcuffed speed is unaffected, and is still suffering. -
- Sped up alien drones, they are now the same speed as sentinels. -
- Adds thud sounds to falling over -
- Known bug: Thuds play when cloning initialises or someone is put into cryo. This will be fixed. -
- Syndicate Playing Cards can now be found on the Syndicate Mothership and purchased from uplinks for 1 telecrystal. -
- Syndicate Playing Cards are lethal weapons both in melee and when thrown, but make the user's true allegiance to the Syndicate obvious. -
- Sprites are courtesy of Nienhaus. -
- Adds changeling arm blades that cost 20 chems and do 25 brute damage. -
- Arm blades can pry open unpowered doors, replace surgical saws in brain removal, slice tables and smash computers. -
- Gibtonite, the explosive ore, can now be found on the asteroid. It's very hard to tell between it and diamonds, at first glance. -
- Gibtonite deposits will blow up after a countdown when you attempt to mine it, but you can stop it with an analyzer at any time. It makes for a good mining explosive. -
- The closer you were to the explosion when you analyze the Gibtonite deposit, the better the Gibtonite you can get from it. -
- Once extracted, it must be struck with a pickaxe or drill to activate it, where it will go through its countdown again to explode! -
- Explosives will no longer destroy the ore inside of asteroid walls or lying on the floor. -
- Mobs now lie down via turning icons rather than preturned sprites. -
- You can lie down facing up or down and the turn can be 90 degrees clockwise or counterclockwise. -
- Resting will always make you lie to the right so you look good on beds. -
- Please report any bugs you find with this system. -
- The water cooler is now stocked with paper cups. You can refill the cups by putting paper in it. -
- You can now sell mutant seeds, from hydroponics, to Centcom via the supply shuttle. -
- Fixes powersinks causing APCs to stop automatically recharging. -
- Changed the way the Gygax worked. It now has less defense and shot deflection, but is faster and have less battery drain per step. -
- Nerfed the Carbine's brute damage and renamed it to FNX-99 "Hades" Carbine. -
- Nerfed the Gygax defense from 300 to 250.
- Nerfed the Gygax projectile deflection chance from 15 to 5.
- Buffed the Gygax speed from 3 to 2, making it faster.
- Reduced the battery use when moving from 5 to 3.
-
- The Mech Ion Rifle now has a faster cooldown, from 40 to 20.
- Nerfed the carbine's Brute Damage from 20 to 5.
-
- Please post feedback to these changes on the forums. -
- - EMPs affect the equipment of a human again. -
- EMP flashlight now recharges over time and its description no longer reveals the illegal nature of the device. -
- EMP implant now has two uses.
EMP kit now contains two grenades.
- - Added spider butchery. -
- Added spider meat, legs, and edible eggs. -
- Added new spider related meals. -
- Because of an emagged cyborg's explosion, the MMI will die with it. -
- The self-respiration symptom will now properly keep you from dying of oxygen loss. -
- The Stimulant symptom's activation chance was increased so you had a constant flow of hyperzine. -
- A new training bomb has been added to the armoury, which will allow you to train your wire cutting skills to disarm real syndicate bombs. -
- Updated research designs. -
- The Protolathe can now build a Ion Rifle. -
- The Exosuit Fabricator can now build a Mech Ion Rifle, a Mech Carbine and a Mech-Mounted Missile Rack. -
- Armor now reduces damage by the protection percentage, instead of randomly deciding to half or full block damage by those percentages. -
- Shotguns, with buckshot shells, will fire a spread of pellets at your target, like a real shotgun blast. -
- Added Syndicate Cyborgs. -
- They can be ordered for 25 telecrystals by Nuclear Operatives. A ghost / observer with "Be Operative" ticked in their game options will be chosen to control it. -
- Their loadout is: Crowbar, Flash, Emag, Esword, Ebow, Laser Rifle. Each weapon costs 100 charge to fire, except the Esword, which has a 500 charge hitcost. Each borg is equipped with a 25k cell by default. -
- Syndicate borgs can hear the binary channel, but they won't show up on the Robotics Control computer or be visible to the AI. Their lawset is the standard emag one. -
- Added two cyborg recharging stations to the Syndicate Shuttle. -
- You can now upgrade laser pointers with micro laser parts. It will increase the chance of blinding people. -
- Cyborg modules now use a new UI, which is much quicker than a menu. -
- The game will now have all background operations disabled, this will result in smoother gameplay but may result in some spike lags, before being set back to normal. The gradually increasing lag should now be gone. -
- You can now emag the crusher, in disposals, to remove the safety. You can use a screwdriver to reset it to the default factory settings. -
- The toxin compensation symptom will stop giving you toxin damage while at full health. -
- The new nuke toy can now be found in your local arcade machine. -
- Morgue Trays can detect players in their bodies and will now change colour depending on a few things. Red = Dead body with no player inside. Orange = No body but items. Green = A dead body with a player inside. -
- You can whisper while in critical, but you will immediately die afterwards DRAMATICALLY. The closer you are to death, the less you can say. -
- The wizard won't spawn so much smoke after they blink. -
- The detective's forensic scanner was upgraded so that it can now scan from afar. -
- Made the ghost's follow button less buggy. Please make an issue report if it still bugs out. -
- A new alt RD uniform spawns in his locker. -
- Janitor now spawns with a service headset. -
- Backpack watertank slowdown decreased. -
- Constructable machines now depend on R&D; parts! -
- DNA scanner: Laser quality lessens irradiation. Manipulator quality drastically improves precision (9x for best part) and scanner quality allows you to scan suicides/ling husks, with the best part enabling the cloner's autoprocess button, making it scan people in the scanner automatically. -
- Clone pod: Manipulator quality improves the speed of cloning. Scanning module quality affects with how much health people will be ejected, will they get negative mutation/no mutations/clean of all mutations/random good mutation, at best quality will enable clone console's autoprocess button and will try to clone all the dead people in records automatically, together with best DNA scanner parts cloning console will be able to work in full automatic regime autoscanning people and autocloning them. -
- Borg recharger: Capacitors' quality and powercell max charge affect the speed at which borgs recharge. Manipulator quality allows borg to be slowly repaired while inside the recharges, best manipulator allows even fire damage to be slowly repaired. -
- Portable power generators: Capacitors' quality produce more power. Better lasers consume less fuel and reduce heat production PACMAN with best parts can keep whole station powered with about sheet of plamsa per minute (approximately, wasn't potent enough to test). -
- Autolathe: Better manipulator reduces the production time and lowers the cost of things(they will also have less m_amt and g_amt to prevent production of infinity metal), stacks' cant be reduced in cost, because thatll make production of infinity metal/glass easy -
- Protolathe: Manipulators quality affects the cost of things(they will also have less m_amt and g_amt to prevent production of infinity metal), best manipulators reduces the cost 5 times (!) -
- Circuit imprinter: Manipulator quality affects the cost, best manipulator reduce cost(acid insluded) 4 times, i.e. 20 boards per 100 units of acid -
- Destructive analyzer: Better parts allow items with less reliability in. Redone how reliability is handled, you now see item reliability in the deconstruction menu and deconstructing items that has same or one point less research type level will rise the reliability of all known designs that has one or more research type requirements as the deconstructed item. Designs of the same type raise in reliability more. Critically broken things rise reliability of the design drastically. Whole reliability system is not used a lot but now at least on the R&D; part it finally matters. -
- Added different colours to departmental radio frequencies. Now you'll be able to filter out or pay attention to each frequency a lot easier. -
- Fixed bruisepacks and ointments not working. -
- Fixed injecting/stabbing mouth or eyes when only thick suit worn. -
- The damage overlay for humans starts a little later than before. It used to start at 10 points of fire + brute damage, it now starts at 35. -
- Paper no longer appears with words on it when blank input written or photocopied -
- Vending machine speaker toggle button now works -
- Building arcade machines works again -
- Light explosions will no longer gib dead bodies anymore. C4 will function the same and gib anything attached. -
- Syringe gun projectiles will now display a message when shots are deflected by space suits, biosuits and etc... -
- You can now move out of sleepers by moving, again. -
- Monkeys now have a resist button on their HUD. -
- Labcoats can now store bottles, beakers, pills, pill bottles and paper. -
- The Labor Camp has been changed based on feedback. Ore boxes added, internals added, safety pickaxes/shovels (might revert if unliked). -
- Labor Camp prisoners, who have earned enough points for freedom, will now have to be alone in the shuttle to move it and to open the middle door; this is in order to prevent free'd prisoners from releasing their comrades. -
- Monkeys no longer walk away when being pulled or grabbed. -
- Anti-breach shield generators have a greater range, and will cover more exposed space tiles. -
- Blowing up borgs from the Robotics Console will now actually make them explode. Emagged Cyborgs will explode even more. -
- Added more poster. -
- You can no longer slip while laying down. -
- Added new sprites for the sec-hailer, SWAT gear and riot armour. -
- Playing cards, just like the real thing! Play poker, blackjack, go fish, the limits are limitless! Recommended to use space cash as the poker chips for now -
- THE REALISM: Injectors such as syringes, parapens and hypos will not penetrate coveralls with thick material, this includes space suits, biosuits, bombsuits, and their head slot equivalent. Injectors now also consider where you aim, if you aim for the head it will try to use it through the head slot, otherwise it will aim for the body. To clarify, if you are wearing a space helmet and a doctor tries to inject you while aiming at your head, it will protect you until they aim for the unprotected body; same story for wearing a space suit and not a helmet. -
- The syndicate shuttle has been heavily upgraded with a brand new technology which allows the blast doors to the entrance of the shuttle to AUTOMATICALLY close. Whoa. This brand new technology will help keep out those snoopy crew members. -
- Lowered the cooldown of creating virus cultures to 5 seconds. You now only need to mix one unit of synaptizine, in a blood full of an advance virus, to get it to remove a random symptom. -
- Rounds will no longer end when the wizard dies and there are still apprentices or traitors/survivors.. -
- Transit tube tweaks. You can now put someone into a transit tube pod using grabs and you can empty a transit tube pod by clicking on it. -
- Replaced the digital valves in atmospherics with pumps. -
- Magic Mania! Powerful new magical tools and skills for wizard and crew alike! -
- Beware the new Summon Magic spell, which will grant the crew access to magical tools and spells and cause some to misuse it! -
- One Time Spellbooks that can be spawned during summon magic that can teach a low level magic skill to anyone! Beware the effects of reading pre-owned books, the magical rights management is potent! -
- Magical Wands that can be spawned during Summon Magic! They come in a variety of effects that mimic both classical wizard spells and all new ones. They come precharged but lack the means to refill them once their magical energy is depleted... Fire efficently! -
- Be aware of the new Charge spell, which can take normally useless spent wands and give them new life! This mysterious effect has been found to wear down the overall magical potency of wands over time however. Beyond wands the clever magical user can find ways to use this spell on other things that may benefit from a magical charge... -
- The Staff of Resurrection, which holds intense healing magics able to defeat death itself! Look out for this invaluable magical tool during castings of Summon Magic. -
- Be on the lookout for a new apprentice! This noble mage is a different beast from most wizards, trained in the arts of defending and healing. Too bad he still works for the wizard! -
- New colourful ghost sprites for BYOND members. Sprites by anonus. -
- Leather gloves can be used to removes lights. -
- Plant, ore, and trash bags have a new option to pick up all items of single type -
- Creating astroturf now works like sandstone, converting all the grass at once. -
- Uranium and radium can be used instead of mutagen. 10 can mutate species, 5 or 2 mutate traits. Highly toxic. -
- Plants require a little light to live. Mushroom require even less (2 units vs 4) and take less damage. -
- Reworked how ling stings are done, now when you click a sting in the changeling tab it becomes current active sting, the icon of that sting appears under the chem counter, alt+clicking anyone will sting them with current sting, clicking the icon of the sting will unset it. -
- Monkeys have ling chem counter and active sting icons in their UI. -
- Going monkey -> human will try to equip the human with everything on the ground below it. -
- A less annoying virology system! From now on, you can only get low level virus symptoms from virus food, medium level virus symptoms from unstable mutagen and high level virus symptoms from liquid plasma. You can find a list of symptoms, and which chemicals are required to get them, here: http://wiki.ss13.eu/index.php/Infections#Symptoms_Table -
- The virologist starts with a bottle of plasma in his smart fridge. -
- Made it so you cannot accidentally click in the gaps between chem masters. -
- Added three new buttons to the sandbox panel. -
- Removed canister menu, replaced it with buttons. -
- Players can no longer spawn "dangerous" canisters in sandbox, such as Plasma, N20, CO2, and Nitrogen. -
- The identification console will now require that ID and job names follow the same restrictions as player names. -
- NTSL scripts and parrots should now handle apostrophes and such properly. It's about time. -
- NTSL scripts now have a better sense of time. -
- Made the suit storage on the Captain's Tunic more useful than just a place to store your e-o2 tank. You can now store the nuke disk, stamps, medal box, flashes and melee weapons (mainly intended for the Chain of Command), and of course - smoking paraphernalia -
- Nanotrasen surgeons are now certified to perform Limb replacements, The robotic parts used in construction of Nanotrasen Cyborgs are the only parts authorized for crew augmentation, these replacement limbs can be repaired with standard welding tools and cables. -
- AI can now anchor and unanchor itself. In short, it means the AI can be dragged, if it wants to. -
- Nanotrasen Cyborg Upgrades:
-Standard issue Engineering cyborgs now come equipped with replacement floor tiles which they can replenish at recharge stations.
- - Mobs can now be lit on fire. Wearing a full firesuit (or similar) will protect you. Extinguishers, Showers, Space, Cryo, Resisting, being splashed with water can all extinguish you. Being splashed with fuel/ethanol/plasma makes you more flammable. Water makes you less flammable. -
- Nanotrasen Anomaly Primer:
- Unstable anomalies have been spotted in your region of space. These anomalies can be hazardous and destructive, though our initial encounters with these space oddities has discovered a method of neutralization. Method follows.
-Step 1. Upon confirmation of an anomaly sighting, report its location. Early detection is key.
- With the anomaly neutralized and the station brought out of danger, inspect the area for any remnants of the anomaly. Properly researched, we believe these events could provide vast amounts of valuable data.
- Step 2. Using an atmospheric analyzer at short range, determine the frequency that the anomaly's core is fluctuating at. - Step 3. Send a signal through the frequency using a radio signaller. Note that non-specialized signaller devices may possibly lack the frequency range needed.
- Did you find this report helpful?
- - Due to complaints about Security not announcing themselves before making arrests NT has now issued it's Sec team with loud hailer integrated gas masks, found in their standard equipment lockers. Users can adjust the mask's level of aggression with a screwdriver. -
- The sprites could be shaded better. Think you can do better? Post your submissions here. -
- Juggernaut's ablative armor has been adjusted. They have a greater chance to reflect lasers however on reflection they take half damage instead of no damage, basically this adjustment means you should be able to kill a Juggernaut with two laser guns instead of four! Also their reflection spread has been greatly widened, enjoy the lightshow -
- Cargo can now order exile implants. -
- Checking a collector's last power output via analyzers has been moved to multitools, because that actually made sense (betcha didn't know this existed, I know I didn't) -
- Analyzers can now be used to check the gas level of the tank in a loaded radiation collector (yay no more crowbars), you can also use them on pipes to check gas levels (yay no more pipe meters) -
- You can no longer strip people through windows and windoors -
- You can open doors by hand even if there is a firedoor in the way, making firedoor+airlock no longer an unbeatable combination -
- Ghosts can now click on anything to examine it, or double click to jump to a turf. Double clicking a mob, bot, or (heaven forbid) singularity/Nar-Sie will let you follow it. Double clicking your own corpse re-enters it. -
- AI can double click a mob to follow it, as well as double clicking turfs to jump. -
- Ventcrawling mobs can alt-click a vent to start ventcrawling. -
- Telekinesis is now part of the click system. You can click on buttons, items, etc, without having a telekinetic throw in hand; the throw will appear when you click on something you can move (with your mind). -
- We at Nanotrasen would like to assure you that we know the pain of waiting five minutes for the emergency shuttle to be dispatched in a high-alert situation due to our confirmation-of-distress policy. Therefore, we have amended our confirmation-of-distress policy so that, in the event of a red alert, the distress confirmation period is shortened to three minutes and we will hurry in preparing the shuttle for transit. This totals to 6 minutes, in hope that it will give our very expensive equipment a better chance of recovery. -
- Terbs Fun Week Day 5: Chef gets a Nanotrasen-issued icecream machine with four pre-approved icecream flavours and two official cone types. -
- Terbs Fun Week Day 4: Humans, aliens and cyborgs now show speech bubbles when they talk. -
- Terbs Fun Week Day 3: Detective can reskin his gun to one of five variants: Leopard Spots, Gold Trim, Black Panther, Peacemaker and the Original. -
- AI Photography: AIs now have two new verbs, Take Picture and View Picture. The pictures the AI takes are centered on the AI's eyeobj. You can use these pictures on a newscaster, and print them at a photocopier. -
- Terbs Fun Week Day 2: RD, lawyers and librarians now spawn with a laser pointer. Don't point them in anyone's eyes! -
- Terbs Fun Week Day 1: Added ghost chilis as a mutation of chili plants. Be careful, they're one of the hottest foods in the galaxy! -
- Replaced the EMP grenades from the uplink with an EMP kit. The kit contains a grenade, an implant and a flashlight with 5 uses that can EMP any object or mob in melee range. -
- Made time and date consistent across medical and security records, mecha logs and detective scanner reports -
- Added date to PDA -
- Malf AIs now have a new power which will spawn a "borging machine". This machine will turn living humans into loyal cyborgs which the AI can use to take over the station with. The AI will limit themselves by using this ability, such as no shunting, and the machine will have a long cooldown usage. -
- Changed the blob balance to make the blob start strong but grow slower, resulting in rounds where the blob doesn't instantly get killed off if found out and doesn't immediately dominate after being left alone long enough. AIs no longer have to quarantine the station. -
- Cargo Overhaul: Phase 1 -
- Ported Bay's cargo computer categoy system -
- Crates have been tweaked significantly. Crates have been reduced to single item types where possible, namely with expensive crates such as weapons and armor. A total of 28 new crates have been added, including chemical and tracking implants, and raw materials can also be bought from cargo for a significant number of points (subject to change) -
- This was a pretty large edit of repetitive data, so no doubt I've made a mistake or two. Please report any bugs to the usual place -
- NTSL no longer allows you to use a function within another function parameter. This was changed to help prevent server crashes; if your working script no longer compiles this is why. -
- Nanotrasen has recentely had to change its provider of alcoholic beverages to a provider of lower quality. Cases of the old ailment known as alcohol poisoning have returned. Bar goers are to be weary of this new condition. -
- Nanotrasen has re-arranged the station blueprint designs to have non-essential APCs moved to the maintenance hallways. Non-essential rooms that aren't connected to a maintenance hallway will have their APC remain. Station Engineers will now have easy access to a room's APC without needing access themselves. Nanotrasen also wishes to remind you that you should not sabotage these easy to access APCs to cause distractions or to lockdown someone in a location. Thank you for reading. -
- Atmospherics now has its own hardsuit. Instead of radiation protection it offers fire protection. -
- Cultists now start with two words each, and the starting talisman no longer damages you when you use it -
- Instead of a level-up system where it is possible to acquire all the skills, each skill now costs 1 point, and you can pick up to 5.Husking people, instead of giving you more XP to buy skills, now gives you a skill reset, allowing you to pick new ones. -
- DNA Extract Sting is now free, and is your main mode of acquiring DNA. You can hold up to 5 DNAs, and as you acquire more, the oldest one is removed. If you're currently using the oldest DNA strand, you will be required to transform before gaining more. -
- New abilities! An UI indicator for chemical storage! Fun! -
- Summary of my recent changes: Added a muzzle and a box of Prisoner ID cards to the perma wing, RnD can make a new combined gas mask with welding visor, added some atmos analyzers to atmospherics, air alarm circuit boards have their own sprites, package wrapped objects will now loop back round to the mail chute instead of auto-rerouting to disposals, and the detective and captain have access to securitrons through their PDA cartridges. -
- A new item has been added to the syndicate catalog. The AI detector is a device disguised as a multitool; it is not only able to be used as a real multitool but when it detects an AI looking at it, or it's holder, it will turn red to indicate to the holder that he should cease supiscious activities. A great and cheap, to produce, tool for undercover operations involving an AI as the security system. -
- Revamped blob mode and the blob random event to spawn a player controlled overmind that can expand the blob and upgrade pieces that perform particular functions. This will use resources which the core can slowly generate or you can place blob pieces that will give you more resources. -
- Nanotrasen R&D released a new firmware patch for their station AIs. Included among the changes is the new ability for AIs to interact with fire doors. R&D officials state they feel giving station AIs more influence could only lead to good things. -
- Job preferences menu now not only allows you to left-click the level (i.e. [Medium]) to raise it, but also to right-click it to lower it. That means you don't have to cycle through all the levels to get rid of a [Low]. -
- DNA-scanner pods (DNA-modifier + cloning), now open and close in a similar fashion to closets. This means you click on them to open/close them. This change was to fix a number of issues, like items being lost in the scanner-pods. -
- As a side-effect, borgs can now clone humans. No harm can become a dead human, so they are not necessarily lawbound to clone them, and such tasks are probably best left to qualified genetics staff. -
- Updated chemical grenades. The build process is much the same, except they require an igniter-X assembly instead of a single assembly item. You can also just use a cable coil to get regular grenade behaviour. -
- Server operators may now allow latejoiners to become antagonists. Check game_options.txt for more information. -
- Server operators may now set how traitors and changelings scale to population. Check game_options.txt for more information. -
- Emptying someone's pockets won't display a message. In theory you can now pickpocket! -
- Headsets can no longer broadcast into a channel that is disabled.
Headsets now have a button to turn off the power instead of the speaker. This button disables all communication functions.
EMPs now force affected radios off for about 20 seconds.
- - To reduce costs of security equipment, mounted flashers have been adjusted to use common handheld flashes as their flashbulbs. Although these flashbulbs are more prone to burnout, they can easily be replaced with wirecutters. -
- CentCom announced some minor restructuring within Space Station 13's command structure. Most notable of these changes is the removal of the Head of Personnel's access to the security radio channel. CentCom officials have stated the intention was to make the HoP's role more specialized and less partial towards security. -
- Nanotrasen seeks to further cut operating costs on experimental cyborg units.
-
-Cyborg chassis will now be made from a cheaper but less durable design. -
-RCDs found on engineering models have been replaced with a smaller model to make room for a metal rods module. -
-Cyborg arms will no longer be long enough to allow for self-repairs. -
NOTE: A cyborg's individual modules have been found to become non-operational should the unit sustain too much structural damage.
- - SecHuds now check for valid clearance before allowing you to change someone's arrest status. There is only one way to bypass the ID check, and its not the usual way. -
- As a part of the most recent round of budget cuts, toolboxes will now be made with a cheaper but heavier alloy. HR reminds employees to avoid being struck with toolboxes, as toolbox-related injuries are not covered under the company's standard health plan. -
- Cargo manifests from CentComm may contain errors. Stamp them DENIED for refunds. Doesn't apply to secure or large crates. Check the orders console for CentComm feedback. -
- You can now weld four floor tiles together to make a metal sheet -
- The All-In-One Grinder can now grind Metal, Plasteel, Glass, Reinforced Glass, and Wood sheets -
- Made grey backpacks slightly less ugly -
- Researchers have discovered that glass shards are, in fact, dangerous due to their typically sharp nature. Our internal Safety Committee advises that glass shards only be handled while using Nanotrasen-approved hand-protective equipment. -
- DNA reworked: All SE blocks are randomised. DNA-modifier emitter strength affects the size of the change in the hex-character hit. Emitter duration makes it more likely to hit the character you click on. Almost all DNA-modifier functions are on one screen.
Balancing -will- be off a bit. Is getting halk to hard/easy? Please report bugs/balancing issues/concerns here: http://forums.nanotrasen.com/viewtopic.php?f=15&t=13083 <3
- - Exosuit fabricators will now need to be manually updated -
- Commanding Officers of Nanotrasen Stations have been issued a box of medals to be awarded to crew members who display exemplary conduct. -
- Replaced the captain's run of the mill armored vest with his very own unique vest. Offers slightly better bullet protection. -
- Overhauled the thermal insulation system -
- All clothing that protected from one side of the thermal spectrum now protects from the other. -
- Armor (although most don't have full coverage) protects between 160 to 600 kelvin -
- Firesuits protect between 60 to 30,000 kelvin (Note: Hotspot damage still exists) -
- CE's hardsuit got its firesuit level protection back -
- Bomb suits function as ghetto riot gear -
- Stungloves removed 5eva. -
- Don't rage yet. Makeshift stunprods(similar in function to stungloves) and spears are now craftable. Make them by using a rod on cable restraits, then adding something. -
- Stun batons/prods now work off power cells, which can be removed and replaced! Use a screwdriver to remove the battery. -
- If the configuration option is enabled, AIs and or Cyborgs will not be able to communicate vocally. This means they cannot talk normally and need to use alternative methods to do so -
- You can now condense capsaicin into pepper spray with chemistry. -
- Pepper spray made slightly more effective. -
- Teargas grenades can be obtained in Weapons and Riot crates. -
- Riot crate comes with 2 sets of gear instead of 3, made cheaper. Beanbag crate removed entirely. Just make more at the autolathe instead. Bureaucracy crate cheaper, now has film roll. -
- NT bluespace engineers have ironed-out that little issue with the teleporter occasionally malfunctioning and dropping users into deep space. Please note, however, that bluespace teleporters are still sensitive experimental technology, and should be Test Fired before use to ensure proper function. -
- Liquid Plasma have been found to have strange and unexpected results on virion cultures. The executive chief science officer urges virologists to explore the possibilities this new discovery could bring. -
- After years or research, our scientists have engineered this cutting-edge technology born from the science of shaving. The Electric Space-Razor 5000! It uses moisturizers to refuel your face while you shave with not three, not four, but FIVE lazer-precise inner blades for maximum comfort. -
- When an AI shunts into an APC, the pinpointer will begin tracking it. When the AI returns to its core, the pinpointer will go back to locating the nuke disc. -
- New sechud icons for sec officers/HoS, medical doctors, and loyalty implants. -
- Empty character slots in your preferences screen will now randomize. So they won't initialise as bald, diaper-clad, white-guys. -
- Reworked the savefile versioning/updating code. Your preferences data is less likely to be lost. -
- You can now light cigarettes with other cigarettes, and candles. And cigars. Light a cigar with a candle! It's possible now! -
- You can now open and close job slots for some jobs at any IDcomputer. There is a cooldown when opening or closing a position. -
- You can now construct/destroy bookcases. This is super exciting and game changing. -
- Petethegoat says, "Added a new feature involvi-GLORF" -
- Overhauled how grabs work. There aren't any interesting mechanical differences yet, but they should be a lot more effective already. You don't have to double click them anymore. Report any bugs with grabbing directly to me, or on the issue tracker. -
- AI has been moved back to the center of the station. Telecoms has been moved to engineering. -
- Competely new UI overhaul! Most user interface have been converted. -
- Added cavity implant surgery. -
- Additionally, surgery must now be performed with help intent. Some procedures have also been updated. - As always, check the wiki for details. -
- The AI has been moved to Research Division, and Telecomms has been moved into the former AI chamber. Affected areas: Telecoms Satellite, Research Division South & Command Sector. -
- Added three new types of surgery- lipoplasty, plastic surgery, and gender reassignment. -
- The RD has lost access to telecomms, and basic engineers have gained it. -
- Updated surgery: you now initiate surgery with surgical drapes or a bedsheet. Most procedures have changed, check the wiki for details. Currently it's pretty boring, but this paves the way for exciting new stuff- new procedures are very simple to add. Report any bugs directly to me, or on the issue tracker. -
- There are now hackable wires for the PA computer. To open the interface, click on it while the wires are exposed/panel is open. All but one wire will do something interesting, see if you can figure it out. You can also attach signallers to the wires so have fun remotely releasing the singularity. -
- New staff of animation icon by Teh Wolf! -
- You can now hack plastic explosives (C4)! -
- You can now use NTSL to send signals! With the function signal(frequency, code) you can create some clever ways to trigger a bomb. NTSL also has two new additions; return in the global scope will now stop the remaining code from executing and NTSL now has "elseif"s, huzzah! -
- You've been asking for it for years, it's finally here. Wizards can spend points to buy apprentices. -
- A new wizard artefact, the scrying orb. -
- The spellbook now has descriptions of spells/items visible BEFORE you purchase them. -
- Traitors with the station blueprints steal objective can now use a photo of the blueprints instead! -
- Signallers, prox sensors, mouse traps and infrared beams can now be attacheed to grenades to create a variety of mines. -
- A slime core can be placed in a large grenade in place of a beaker. When the grenade goes off, the chemicals from the second container will be transfered to the slime core, triggering the usual reaction. -
- Implants can now be surgically removed. Hint: They're inside the skull. -
- The return of the Nanotrasen Scripting Language! (NTSL) If you haven't heard of NTSL, it is a scripting language within a game for telecomms. Yes, you can create scripts to interact with the radio! For more information, head here: http://wiki.nanotrasen.com/index.php?title=NT_Script But before you do, if you are not an antag, do not create bad scripts which hinders communication. -
- Cameras, mulebots, APCs, radios and cyborgs can have signallers attached to their wires, like airlocks! -
- Cameras have non-randomized wires and the power wire when pulsed will now toggle the camera on and off. -
- Cyborgs have a new wire, the lockdown wire! It will disable/enable the lockdown of a Cyborg when pulsed. -
- The traffic control computer (or more commonly known as the computer which lets you add NTSL scripts) will now have a user log, which will log all user activity. Other users can then view that log and see who has been uploading naughty scripts! -
- NTSL has two new functions! time() and timestamp(format) will help you increase the range of types of scripts you can make, especially time(); since you can then make the scripts know the different between each execution by storing the results in memory. -
- Two new advance disease symptoms! Their names are "Longevity" and "Anti-Bodies Metabolism". Have fun experimenting with them! -
- Four new slime types with their own reactions and two new reactions for old slimes. -
- Put a suit of reactive teleport armour back in the RD's office. -
- Chemistry now has two dispensers (with half charge each) so both chemists can actually work at the same time. -
- Security frequency chatter now appears in cyan (Similar to how command is gold)
- The plant bags in Hydroponics lockers have been replaced with upgraded models with seed-extraction tech. Activate with via right-click menu or Objects verb tab. -
- Obtaining grass tiles works a bit different now: grass is harvested as a normal plant item, clicking on it in-hand produces the tile. -
- Added hugging and kicking. I also updated the text styles for clicking on humans in most intents, but they should be pretty much the same. -
- All the equipment you spawn with will now contain your fingerprints, giving the detective more ability to tell where items came from and if a crewmember has changed clothing. -
- Better explosions: Explosion spreading will now be determined by walls, airlocks and poddoors and not just a flat circle. -
- Chickens will now lay a certain number of eggs after being fed wheat, rather than just laying them whenever they felt like it. No more chickensplosions. -
- Department Security can now be runned:
-
Department Security decentralizes security by assigning each officer to a different department. They will be given the radio channel and access to their assigned department along with a security post. The brig has been remapped to be smaller to accomodate this change. -
To run DeptSec: Before compiling, server operators must
tick jobs.dm (in WorkInProgress/Sigyn/Department Sec) and use map 2.1.1 instead of 2.1.0.
- - Curse of the Horseman. -
- Spiders which will breed and spread through vents. Different classes of vents. AI controlled only at the moment. -
- Farm animals! Cows, goats and chickens are now available. You can order them at Cargo Bay. -
- Staff of animation mimics will no longer care whether you are holding the staff or not, they will never attack their creator. -
- Brainrot will only need alkysine to be cured. -
- New spider infestation event based on Cael's spiders. The announcement will be the same as alien infestations. -
- Plasma (Air) will give the breather the plasma reagent, for a toxic effect, instead of just straight damage. -
- The agent card will now work inside PDAs/Wallets; meaning the AI won't be able to track you. -
- The owl mask now functions as a gasmask for increased crimestopping power. -
- Adds the missing icons for the arrest statuses of Parolled and Released, as well as a little blinking icon for chemical implants. -
- Many new icons for aliens (death, sleeping, unconscious, neurotox, thrown/impregnated facehugger etc) -
- Alien larva can now be removed by dangerous and unnecessary surgery (and actually chestburst if they aren't). -
- Alien larva now have sprites to represent their growth: bloody at 0%, pale at 25% and 75% the normal deep red. -
- New icon overlays for representing alien embryo progression. -
- Four new slime types with their own extract reactions have been added. Sprites this time were created by Reisyn, SuperElement, and LePinkyFace. -
- Slime breeding! There are now 13 varities of slime, each with its own extract reaction (inject five units of plasma). Some of these reactions are reused from the old cores, some are new. As to breeding, each colour of slime has a series of other slimes it may mutate into when it reproduces. -
- You can now use wallets as IDs and equip them in your ID slot. -
- Firesuits are once again effective at protecting you from heat. The flames themselves will still hurt you, even with a firesuit. The damage protection is much better with a firesuit though. -
- Engineering starts with a PACMAN generator for jump starting the singularity if the power runs out of the SMES. 30 plasma spawns in Secure Storage inside the crate, to use as fuel for the generator. -
- Simple animals (Corgis, Cats, Constructs, Mice, Etc...) can now pull people. -
- You can quickly stop pulling on someone by pulling them, while they're already being pulled by you. For example, CTRL+Click on something you are pulling to quickly stop pulling it. -
- Emitters now require to be wired in order to work. When there is not enough power it will stop shooting until there is enough power, meaning you do not have to turn it back on, just get the power flowing. -
- You can order shield generators from cargo. Teleporter access is required to open the crate. -
- Map: Reorganized the Command Sector. The Captain has his own private quarters in addition to his office. -
- An agent card is now required to use doors and controls on the Syndicate Shuttle (Nuke). -
- Scanning gas tanks is now a PDA-cart function. Only Atmos and Science PDA carts have this function. Have fun mislabelling gas tanks! -
- The syndicate Military PDA will not show up on possible PDAs to message anymore, even when the receive/signal is turned on. You can still send messages and people can still reply to you. -
- You can now sell processed plasma for supply points. The conversion rate is 2 plasma sheets for 1 point. You must put the plasma in a crate for it to count. -
- The mecha toy prize promotion has officially ended. You can no longer redeem all 11 action mecha figures for a real mech. New toy redeeming promotions in the future will be considered. -
- You can now use . to speak over headset department channels in addition to the : and # characters. -
- You can now use # to speak over headset department channels. For example say "#e Hello" will say "Hello" over the engineering channel. say ":e Hello" will still work as it always has. -
- You can now create your own solar arrays! Order the solar pack crate and you'll receive 21 solar assemblies, 1 electronic which you can put into an assembly to make it a solar tracker and finally the solar computer circuit board. You will get more detailed instructions in the crate, on a piece of paper. Engineering will also start with this crate to help repair destroyed solar arrays. -
- Added a new option to the key authorisation devices. It removes the maintenance access requirement from all doors. It's irreversible, so only use it in an emergency! -
- Swapped the locations of the Library and Chapel. Thanks to killerz104 for the remap. -
- Partial remap of atmos. Monitoring and Refill stations are now the same room. -
- Toxins Mixing should be working properly again. -
- Robotics is now a full Science department. -
- Completely remapped Research Division, Robotics, Medbay, and the Library. -
- Partially remapped Cargo Bay, Mining Dock, Engineering, and Atmospherics. -
- Changed the access of the HoS and HoP. For a list, refer to their respective wiki pages. -
- Miners now have to go through cargo to reach the Mining Dock. -
- The Detective's revolver no longer cares about how cool you look. It now spawns in his locker. -
- Added new inhands for most energy weapons, by Flashkirby! -
- Disintegrate (EI NATH) will leave behind the brain of the victim. Possible productive uses include: trophies, looking awesome as you gib someone and only their brain remains, people to talk to when you get an MMI, pocket brains, a way to get back into the game if the wizard didn't grab your brain and stuffed it into his bag. -
- The detective's scanner was upgraded, it can now scan for reagents in items and living beings. Potential uses include, scanning dead bodies for leftover poison or scanning items to see if they have been spiked. -
- You can now attach photos to newscaster news feeds and wanted posters. -
- You can now emag buttons to remove access from them. -
- The CentComm. Report has been changed so it no longer names potential antagonists. It will just announce the potential round type instead. -
- Agent cards have been upgraded with microscanners, allowing operatives in the field to copy access levels off of other ID cards. -
- The Chief Medical Officer, Research Director, Chief Engineer, and Lawyers now have basic Brig access (corridor only) -
- Merged Mining and Cargo radio channels into the Supply Radio. To use the supply channel, use :u -
- Mining Dock remapped to be more compact and closer to cargo. -
- The wizard's fireball spell is once again dumbfire. It will fire in the direction of the wizard instead of having to choose from a list of targets and then home in on them. -
- Added a new artefact called the "Staff of Animation". You can get it in the Wizard's Spellbook. It will animate objects and items, but not machines, to fight for you. The animated objects will not attack the bearer of the staff which animates them, meaning if you lose your staff, or if it gets stolen, your minions will turn on you. -
- Janitor has recieved a slightly upgrade mop bucket. The old one is still there too. -
- Swapped the locations of the Vault and Tech Storage. -
- Cargo Techs, Miners, and Roboticists no longer start with gloves. They are still available from their lockers. -
- Slimes have replaced roros (finally)! Right now they are functionally identical, but massive expansion of slimes and xenobio is planned. Sprites are by Cheridan. -
- Added new very high level symptoms which are only obtainable in the virus crate. Virus crate will also come with mutagen. -
- Removed clown planet! It'll return shortly in away mission form. -
- Added Gateway access. Only the RD, HoP, and Captain start with this. -
- New access levels in the brig:
-Brig access now opens the front doors of the brig, as well as other lower-risk security areas.
-Security access allows you into the break room and equipment lockers.
-Holding Cells allows you to use brig timers and lets you in the Prison Wing.
-The Detective no longer has Security Equipment access.
- - Significantly increased max cloneloss penalty for fresh clones to 40%. -
- Simplified detective stuff. The high-res scanner is gone and instead the detective's normal scanner will instantly report all fingerprints, dna and cloth fibers in full. This was needed because the system took too long to work with and disencouraged detectives. Not only that, it made detectives less of a threat for antagonists and made possible scenerios, such as framing someone by changing fingerprints with someone else, impratical. To replace the computer, the detective will have a full medical computer with access to it. Not only that, but his useless filing cabinet will be replaced with an empty one for serious investigators. Along with this, are fingerprint cards and built-in PDA scanning, as all of security had access to it which was really the detective's thing. The new scanner will also log every finding and you can print them out as a report by clicking the scanner while it is in your active hand. -
- You can toggle the pressure of your sprayer by clicking on it while it is in your active hand. With pressure, the sprayer will spray 10 units on the floor, otherwise it sprays 5. You'll need to turn pressure on to spray water on the floor and make it slippery. -
- AIs in intellicards can no longer move their camera. This will limit them in ability but without making creating and carding an AI to have as a personel door opener impossible. -
- Telecommunication Busses can now be set to change the frequency of a signal. (Allowing you to say.. set the command channel to broadcast to the common channel). -
- Telecommunication was changed to be more effecient. Because of this, Relays don't need a broadcaster or a receiver and you can setup a relay on it's own. You can still disable sending and or receiving from the relay's interface. -
- Plant Analysers now work on seed bags. -
- The nuke shuttle can now travel at will, and to any location. When travelling from syndicate space to the station, (and vice versa), it will travel through hyperspace. -
- Changed savefile structure. There's a bunch of unused files left lying around so old savefiles will be purged. Sorry for the inconvenience. Many preferences have been moved to the Preferences verb tab. Everything in that tab is persistent between rounds (it updates your savefile, so even DCing won't reset them). Enjoy x -
- Added female sprites for most mutant races. -
- SSU manufacturers have issued a product recall! It seems old models shipped with faulty wiring, causing them to short-circuit. -
- Added Exile Implants to the Gateway room. Someone implanted with an Exile Implant will be able to enter the away mission, but unable to return from it. Not only can they be used for getting rid of dangerous criminals, but revs/stationheads count as dead while on the away mission, and traitor/changeling/wizard assassination targets count as dead if they're on the away mission at round end, allowing for those objectives to be completed peacefully. -
- Added medical hardsuits, sprited by Majorsephiroth. Two of them spawn in EVA. Their most unique/medical oriented feature is being able to hold a medkit in the suit storage slot, allowing you to easily access medicine while keeping your hands free. -
- Malf AIs can only shunt to APCs from their core. Meaning their core needs to be alive before they can shunt to another APC. Malf AIs can start a takeover inside an APC now. -
- When taking damage, the next sequence of the overlay will show for a bit before reverting to the overlay you should have. This allows you to know you are taking damage without having to check the text screen. -
- Ported over BS12 style cameras. They now take a photo of a 3x3 area! -
- Catatonic people (those that have ghosted while alive) now count as dead for assasinate objectives. -
- You can now deconstruct and construct Air Alarms and Fire Alarms. Read wiki on howto. -
- Medical Cyborgs no longer lose the reagents in their hypospray when switching modes. -
- Spaceacillin will now help stop the spread of diseases. -
- You can once again make floors slippery by spraying water. This was done by increasing the amount the sprayer uses, which is from 5 to 10. You can also empty your sprayer's contents onto the floor with a verb in the Object tab. -
- Fixed the syndicate teleporter door, making teleport assaults possible. It will once again open when you open the outter door. -
- You can now name your advance diseases! You can't name already known diseases though. -
- Chemical implants can now hold 50 units instead of 10 units. -
- More work to advance diseases. Please report any bugs to the bug tracker, I have tried everything that I can on my own but I'll need lots of people playing to fix the more minor bugs. You can find a guide to making your own diseases here: LINK! -
- Reduced the cost to use Hive Absorb from 40 to 20. This is to help encourage people to use this power more and to use team work. -
- New symptom added! See if you can find it. -
- You can now remove symptoms from a disease using synaptizine. -
- Kor: You can once again debrain changelings. They won't make anyone half-lings though, and you won't be able to tell if the body of a debrained changeling is a changeling by putting a player brain in there. -
- Wizards can no longer cast spells when muzzled. It iss now actually possible to capture a live wizard without constantly injecting them with chloral. -
- You can no longer take bags of holding or mechs to the clown planet. -
- Admin-ranks changes
- Lots of changes. This is just a brief summary of the most recent changes; still working on proper documentation.
- All admins have access to view-vars, player-panel(for individual mobs), game panel and secrets panel. Most of the things on those pages have their own rights requirements. For instance, you can only use event orientated secrets in the secret panel if you have FUN rights. Debug secrets if you have DEBUG rights. etc.
- Spawn xeno and toggle gravity procs were moved into the secrets panel (fun).
- This may help with understanding which flags do what. Unfortuanately it's still somewhat vague.
- If you have any problems, feel free to PM me at irc.rizon.net #coderbus. I go by the username carn or carnie. -
- - New cyborg upgrade available for production that requires illegal and combat tech -
- Summon Guns has a new gun type created by Ausops. It also lets the user know when its been cast now to prevent people trying to buy it multiple times -
- Grilles are no longer immortal in regards to solid projectiles, you can now shoot out windows. -
- Cyborgs can now ping and beep! (Say "*beep" and "*ping") Thanks to Rahlzel for the proposal. -
- HULKS WILL NOW TALK IN ALL CAPS AND WILL RANDOMLY SAY HULK THINGS. Thanks to Brotemis for the proposal. -
- Sorry for the inconveniences with advance diseases. They are working much better now! -
- An improved APC sprite by TankNut! -
- AIs can now tweak with a bot's setting like a human who unlocked the bot. - -
- Being in an area with extremely low pressure will now deal some damage, if you're not protected. -
- Space suits and the captain's armor now protect against pressure damage -
- Slightly lowered all environment damage intakes (temperature, oxygen deprevation) to make up for low pressure damage. -
- Pressure protection finally works properly. Items that protect from pressure (firesuits, space suits, fire helmets, ...) will now properly protect. The pressure damage indicator will update properly based on the pressure effects on you. Black (low) and red (high) mean you are taking damage. -
- Slightly slowed down the speed at which your body temperature changes if you are in a very hot or very cold area. The speed at which you recover from an abnormal body temperature remains the same. -
- New APC sprite. -
- New Wraith sprite and jaunting animation. -
- New Ablative Armor sprite. -
- Airborne diseases will not spread through walls now. -
- Reduced queen healing rate to 5. The maximum health will be enough. -
- Aliens can now clear hatched eggs by clicking on them. - -
- You can once again travel to the station, derelict, satellite and mining z-levels through space. You will also never loop into the same level on transition - So if you are exiting the derelict z-level, you will enter one of the other z-levels. -
- Aliens now take x2 as much damage from fire based weaponary, instead of x1.5. -
- Doors are now weaker than walls; so normal weapons can destroy them much more easily. -
- Advance evolving diseases! Virology can now create, mutate and mix advance diseases together. I replaced the two bottles of blood in Virology with the advance disease. I'll write a wiki article soon enough. Here's a tip: Putting mutagen or virus food (a mixture of milk, water and oxygen) in blood with an existing disease will mutate it to gain symptoms. It can potentially lose old symptoms in the process, so keep backups! -
- You can now set your character's age up to 85. This used to be 45. -
- Mousetraps are now assemblies. -
- Added a new crate for cargo to order. - -
- Player Weekend begins! -
- Added a camera and hand labeler to art storage. -
- Added a medical records cabinet to the Detective's office. -
- Added a safe to the vault. Who'll be the first to crack it? -
- The CE has a new pet! -
- Added 18 new hairstyles! -
- Throwing eggs will result in the reagents of the egg reacting to the target. (Which can be a turf, object or mob) This creates possibilities like chloral eggs, lube eggs, and many more. -
- Aliens can now acid walls and floors! Not R-Walls though. -
- Facehugger throw range reduced to 5, so aim at humans that are 2 tiles apart from the edge of your screen. -
- Making eggs is a little more expensive but secreting resin is cheaper. (Both cost 75 now) -
- Aliens no longer have a random duration of stunning humans, it's a constant value now of the lower based value. -
- Acid is less random and will be more reliable. Don't bother aciding stuff more than once, as it will waste plasma. -
- You can now target non-dense items (such as facehuggers) with a gun. -
- You can now shoot canisters, computers and windoors to break them. -
- As an AI, you can type in the "track with camera" command and get a list of names to show up there. This also works with "list camera" verb. Remember to use space to auto-fill. -
- Welding goggles have been added. They are like welding helmets but they are for the glasses equipment slot. Science and the assembly line are given a pair. -
- Thanks to WJohnston for the welding goggle icons. -
- Small change to the Assembly Line. Instead of six normal flashes, the Assembly Line will instead have two normal flashes and eight synthetic flashes. Synthetic flashes only work once but are designed to be used in construction of Cyborgs. -
- Nar-Sie put on a few pounds. Thanks HornyGranny. -
- New changeling powers! -
- Hive Channel/Hive Absorb. Allows you to share your DNA with other changelings, very expensive chemical wise to absorb (download), not so much to channel (upload)! You cannot achieve your objective by sharing DNA. -
- Mimic Voice! You can form your voice of a name you enter. You won't look like them but when you talk, people will hear the name of who you selected. While you're mimicing, you can't regenerate chemicals. -
- Extract DNA! A power that allows you to silently sting someone and take their DNA! Meaning you do not have to absorb someone to become them. Extracting their DNA doesn't count towards completing your objectives. -
- You can now get flares from red emergency toolboxes. Has a 50% chance of a flash-light or a flare spawning. -
- Flare icon by Ausops! -
- Thanks to RavingManiac (Smoke Carter), Roros now lay eggs which can grow into baby roros or be used for cooking recipes. Scientists will need to expose the egg to plasma for it to hatch; while it is orange (grown). -
- A new icon for the map spawned x-ray cameras. Icon by Krutchen. -
- Facehuggers have a new animation, thanks to Sly. -
- Firelocks, glass-less airlocks and walls will stop heat. -
- Fires are now more deadly, especially the flames. -
- Fires will now break windows. -
- Larva grow a little bit faster when on weeds or when breathing in plasma. -
- Thanks to Skasi. Atmospherics has been changed to be made simpler and spawn with the new atmos features, such as the heaters. -
- Radio headsets can only be heard by people wearing them on their ear slot. This will let us do more fun stuff with headsets, such as a traitor encryption key which can listen to all the channels, but not talk in them. -
- A pen no longer spawns in your pocket. Instead, each PDA will spawn with a pen already in it. -
- Aliens can now be harmed by fire. They now also take double fire damage, meaning flame based weaponry is very effective. -
- Buffed alien facehuggers and eggs. Facehuggers don't go idle anymore, and they attach to anyone who walks past them. Eggs do the same; fully grown eggs will open to potential hosts. If you are still in the range of them, the facehugger inside will leap out and hug you. Removed "activate facehuggers", since it's useless now. Emote "roar" if you want to roar now. -
- There can be only one living queen at a time, if the queen dies then a drone can take her place as a princess. -
- Buffed queen regeneration a bit, so it's not the same as her underlings. It's also more important because there can only be one queen at a time. -
- Aliens don't slip in space anymore. -
- Hulks don't paralyze aliens anymore, they instead slow them down to a slow crawl. It is very effective for punching aliens out of weeds, so it can't regenerate it's health. -
- New egg opening and opened egg icons by WJohnston. -
A buncha crud nobody cares about lolAdded a light to the airlock wiring interface to show the status of the timing.
- - You can't fill sprays without being next to the dispenser. -
- Simple animals no longer freeze to death in places with normal temperature. -
- Mechs no longer freeze on the spot when they are using the Energy Relay on powerless areas. -
- Improvements to showers, they now clean gear on beltslot, back, ears and eyes. Showers only clean visible gear. -
- Replica pods works again! But you can't make potato people without a key or clone people who ghosted alive (Catatonic). -
- Engiborgs can deconstruct airlocks with their RCDs once again. -
- You can construct airlocks while standing on another airlock with RCDs. -
- Wizards have a new artifact added to their spellbooks. -
- Readded Volume Pumps - now they work as intended and are constructable -
- Readded Passive Gates - now they work as intended and are constructable -
- Readded Heat Exchangers - now they work as intended and are constructable -
- Added Heater - to warm up gasses to 300C -
- Pipe dispensers can produce the readded pieces. -
- New graphics for all of the above - courtesy by Ausops. -
- Airlocks now use the Environmental power channel, since they are airlocks after-all. Meaning, when power is low the airlocks will still work until the environmental channel on the APC is turned off. This applies to all the door control buttons too. Pipe meters now use the environmental power channel. If you have any comments have this change, please let me know in the feedback section of the forums. -
- Added new hotkeys. Type hotkeys-help for details or see the drop-down help menu at the top of the game window. -
- Mechs are once again spaceproof! -
- The YouTool machine is now all access -
- Cutting tower caps in hand no longer deletes the wood, and planks now auto stack -
- Reworked the Piano, now really optimized and new interface! -
- Hopefully fixed the stop midis button. It should now stop any midis that are currently playing. -
- Fixed an exploit which would allow the janitor to magically mop floors. -
- Added lipstick~ It's not available on station, as Nanotrasen has deemed it contraband. -
- If you encounter any issues with computers, notify an admin, or ask for assistance on #coderbus, on irc.rizon.net. -
- Updated the Package Tagger with new interface! -
- You can now dispense, remove and retag sort junctions properly! -
- Metroids have been replaced with Rorobeasts. Roros are strange latex-based lifeforms that hate light, fun, and gloves. -
- F5 is now a hotkey for adminghosting. F8 toggles ghost-like invisibility for admins. -
- Catatonia makes you fall down. Admins appear braindead when admin-ghosting. -
- "Set-observe"/"Set-play" renamed and merged into "Aghost". -
- "Lay down/Get up" renamed to "Rest" -
- Closets can't be sold on the supply shuttle anymore -
- Fixed all dat light -
- New Hotkeys (Trial period). Details can be found in the help menu or via the hotkeys-help verb. It's all client-side. It shouldn't intefere with regular controls (except ctrl+A, ctrl+S, ctrl+D and ctrl+W). -
- AIs can double click on mobs to instantly start tracking them. -
- The file /code/defines/hub.dm was moved into /code/hub.dm. To get your server back on the hub, open /code/hub.dm and set the hub variables again. Sorry for the inconvenience. -
- Added an additional check to stop changelings sharing powers/becomming un-absorbable/etc by absorbing eachother and then rejuvinating from death. -
- Cloaked Aliens are now slightly easier to see, so they should avoid strongly lit areas when possible. They can still lay down to become even stealthier though. Let me know what you think, it's only a minor sprite change. -
- -Changes flour from an item to a container-held reagent. All recipes have been updated to use 5 units of reagent flour for every item required previously. This has a few advantages: The 16(!) sacks of flour previously in the kitchen cabinet have been condensed to an equivalent 3 sacks. Beer is now brewable with universal enzyme, and converting lots of wheat into flour should be less tedious. Also, flour grenades, etc. Because of this, flour is now obtained from the all-in-one blender rather than the processor, and spaghetti noodles are made with 5 units of flour in the microwave. -
- Removed cameras from bots (NOT BORGS). They weren't working well with freelook and I felt that since they weren't used at all, they wouldn't be missed. -
- Cameras has changed quite a bit. They are no longer created from grenade canisters, instead you make them from an autolathe. The construction and deconstruction for them has also changed, so look it up or experiment it with yourself to see how to setup the cameras now. Cameras also get wires, like airlocks and APCs. There's two duds, a focus wire, a power wire, an alarm wire and a light wire. Protip: You can see which one is the alarm wire by pulsing it. -
- Added a red phone and placed it in the Cyborg Station. Sprite by Pewtershmitz! You'll also find an AI restorer there, replacing the computer frame. -
- Cameras aren't all X-ray anymore. The AI won't be able to see what room you are in if there's no normal camera inside that room or if there's no X-ray camera nearby.. -
- Cameras get upgrades! Currently there's X-ray, EMP-Proof and Motion. You'll find the EMP-Proof and Motion cameras in the normal places (Singularity Pen & EVA), the new X-ray cameras can be found in the Dormitory and Bathrooms, plus some extra ones to invade your privacy. See if you can smash them all. -
- Alien Larva can bite simple animals (see: Ian, Runtime, Mice) to kill them and gain a small amount of growing points. -
- Space travel was tweaked to be more random when changing Z levels. This will stop people and items from being stuck in an infinite loop, as they will eventually hit something to make them stop. -
- Overhauled newscasters. No visual additions but the thing is much more robust and everything works as intended. Wanted issues are fixed. Admins, check out Access News Network under Fun. -
- You can now create an EMP Pulse. Like an explosion, it is the mixing of two reagents that trigger this to happen. I will tell you the first required reagent. Uranium. Have fun! -
- I have made most chemicals need 3-5 or more chemicals in order to react to a turf. For instance, you need at least 5 units of thermite splashed on a wall for it to burn down."
- -
- The EMP kit, that you can buy through the uplink, has two more grenades in them now. Making the box full of EMP grenades! -
- Changed the EMP grenade's range to be much bigger. -
- Mice now work with the admin player panel. Admins can now turn players into mice with the 'Animalize' button in the player panel! -
- Space bear AI no longer runs when a player is controlling it. Admins can now turn players into space bears with the 'Animalize' button in the player panel! -
- The holodeck beach program once again has a beach. -
- The nuke op shuttle floor was pressure-washed a few days ago. We have since re-painted it with nanotrasen blood. Sorry for any confusion. -
- You can now toggle the bolt light of airlocks. An extra wire, that controls the airlock's bolt light, has been added. -
- Aliens can now tell who is and who isn't infected. They get a special facehugger icon that appears over mobs that have been impregnated. -
- Cameras have temporary X-Ray for the time being. -
- Admins now have an 'Animalize' button on a mob's player panel. This button allows admins to turn players into simple animals.
There are a few exceptions. Mice, Parrots, Bears and Space Worms all have issues that, until fixed, prevent me from allowing players those transformations.
- - New lighting. It should look and feel the same as the old lighting whilst being less taxing on the server. Space has a minimum brightness (IC starlight) and areas that do not use dynamic lighting default to a lighting level of 4, so they aren't dark, but they aren't superbright. Replacing turfs should preserve dynamic lighting. Singulo/bombs should cause a lot less lighting-related lag. There are some minor known issues, see the commit log for details. -
- Admins can now access most controller datums with the "Debug Controller" verb. Time to break all the things! -
- Supply shuttle now uses a controller datum. This means admins can see/edit supply orders etc. -
- Changeling fakedeath can be initiated after death again. Next time you want something reverted, just ask rather than being obnoxious. -
- AIs can now look around like a ghost with the exception that they cannot see what cameras cannot see. Meaning if you're in maintenance, and there's no cameras near you, the AI will not know what you are doing. This also means there's no X-Ray vision cameras anymore. -
- AIs can add links to Telecommunication Machines. Added some cameras for areas that should have it but instead relied on cameras nearby for vision. -
- Choking has been changed. You have to stand still while lethally choking someone. It takes time to get into that lethal choke. When you are lethaling choking someone, they are still concious until the lack of oxygen knocks them out. -
- Nerfed the Neurotoxin drink, it is now less effective than a stunbaton. But more effective than a Beepsky Smash. -
- Updated descriptions on various cocktails to be more accurate or more relevant to the drink itself. -
- Floorbots now actually pull up tiles when emagged -
- All helper bots (excluding MULEs) have an access panel and maint panel, access being for behavior and maint for internal work -
- To open the maint panel, the access panel needs to be unlocked, then you use a screwdriver. There you can emag/repair it to your heart's content. (Emagging the access panel will also unlock it permanently) -
- Helper bots are now repaired by using a welder when their maint panel is open -
- In-hand sprites once again update correctly when equipping items. -
- Changes were made to how heating and cooling of humans works. -
- You must wear both a space suit and space helmet to be protected from space! Likewise you must wear a firesuit and a fire helmet to be protected from fire! Fire helmets are red and white hardhats, found in all fire closets. -
- Fire suits now only protect from heat and space suits only protect from cold, so make your choice count. -
- DNA modifiers can be used if there is no occupant, primarily to handle the buffer. -
- Ion Rifles are only effected by max severity EMPs, so AOE from its own shot won't effect it -
- Pepper Spray fits on Sec belts again -
- Turrets now properly fire at simple_animals. -
- Borgs, AIs, and brains/MMIs can be sacrificed by cultists. -
- Grenades now automatically set throw on again. -
- Library has been redesigned. It's a whole lot more classy now. -
- Significant changes to Medbay. CMO's office is more centralized, genetics has a new exit into cryogenics, and a new break room has been installed -
- Changes to Med-Sci south and surrounding maintenance areas. Virology is more isolated and Science gets a new Misc. Research Lab. -
- Atmos techs get construction access now to do their little projects in. -
- Transformation Stings now work on living humans. -
- Gas masks now protect you from reagent smoke clouds -
- Changed the 'black overlay' you get when paralyzed, blind or in critical condition to include a small circle around you. -
- Dramatically lowered the amount of damage you get per breath while in critical condition. Critical condition now lasts for about 5 minutes if nothing is causing you any additional harm. This in combination with the new black image overlay is an attempt at making doctors more willing to help. -
- Borgs now have flashlights to allow them to see in lightless areas -
- Changes to Medbay: The sleeper and storage rooms have been swapped around. Hopefully this leads to more healing and less looting. -
- Borgs can now have an encryption key installed into their internal radios. Simply ID, open the panel, and use the key to insert it (Screwdriver to remove) -
- Due to that as well, borgs have a 'Toggle Broadcast Mode' button for their radios, which changes the broadcast type between station-bounced (Non-reliant on TComms), and subspace (Required for department channels) -
- Also changed the binary chat for consistency, now for the prefix is ':b' for everyone, not just one for humans and one for borgs/AIs/pAIs -
- Based on feedback, Nuke Op pinpointers now automagically change between shuttle and disk mode when the nuke is armed or disarmed. -
- Please update your BYOND clients! Ideally everybody should be running the latest version of byond (v496). People who fail to update to at least version 494 within a month's time may find themself unable to connect. Currently our code has no restrictions at all, which is rather bad. By getting the user-base to keep their clients up-to-date we can make use of newer BYOND features reliably. -
- I've made some adjustments to the Fireball spell. I've changed it to shoot in the player's facing direction instead of you having to pick a name from a list. It will explode upon contact of a person, if it hits an obstacle or if it shoots for too long. To make up for the fireball not being able to go diagonal I've shortened the cooldown to 10 seconds. It still can hurt you badly and knock you down if you shoot it at a wall. Lastly, it now lights up so it'll show up in dark rooms easily. -
- Removed passive throwing. You need at least an aggressive hold of the mob before you can throw them. -
- New map changes by Ikarrus. AI Upload Foyer is now Secure Tech Access, and the outer door only requires Bridge access. Attached to it are two new rooms: The messaging server room and the communications relay. The comms relay room runs off its own SMES unit like the AI, so it won't be affected by powersinks -
- All radios now only work in their Z level. This means that the CommSat has a few more additions to work with this change. There is now a new Telecomms Machine called the Relay which allows information to travel across Z levels. It it then linked to a new machine called the Hub, which will receive information from the Relays and send it to the buses. Because every Z level needs these relays, which are linked up with Receivers/Broadcasters, every Z level will get one. There is one in the station, in the RD's office, one in Telecomms as always, one in the Ruskie station which is turned off and hidden from the HUB's linked list. The last one is in Mining but the location for it has not been decided yet. -
- PDAs now need to be in a Z level with a functioning Relay/Comms Network in order to send messages. It will also send uncompressed (scrambled) messages like you would with the ordinary voice messages. -
- Added some of WJohnston's sprites. Added a new mining borg sprite, Added a new high tech security airlock, Added the new telecomm sprites for Relays. Hubs were given old Bus sprites. -
- You can now use crayons to color eggs -
- Mice have invaded the station! -
- Added a new mushroom for Hydroponics, the Reishi Mushroom! It is obtained like any other mushroom and it has relaxing properties. -
- Attacking mobs with items will now give new messages. Instead of "Monkeyman was attacked in the head with a wrench by Nodrak." it will read "Monkeyman was bashed in the head with a wrench by Nodrak." Diffrent items have diffrent verbs and some have multiple verbs. -
- Cultists can now read what words a rune was made with by examining the rune. Due to an error in the code, this was not possible before. -
- Clowns no longer have practice lasers or staves of change blow up in their face due to clumsyness. -
- Engineering cyborgs can now actually repair a cut AI wire in APCs. -
- I've removed a ton of pointless checks and redundant loops from metroid's which have been causing lag due to how often they get called. If metroids are behaving strangly ping me in #coderbus -
- Made a 'default' save slot (D), and whenever you connect it automatically selects the default slot to load from, but manually selecting a different slot will allow you to play on that one before it returns to default. -
- Added the ability to name your save slots with the '*'. Names can be up to 16 characters and contain letters, numbers, and basic symbols -
- The preview icon on the preference screen now takes into account any job you have set on high, and dresses up the icon accordingly. If assistant is set to 'yes', or AI/Cyborg are on high it will put the icon in a grey suit (So you can still customize). -
- Nuke Ops get a new pinpointer, changing modes with the verb will switch between pointing to the disk, and pointing to the shuttle. Also provides a notification when you leave the station z-level -
- Reworked how MMI Life() was done, now they will never lose consciousness, and many less things affect them now(Like deafening/blindness from explosions). However, they are vulnerable to EMPs, but all damage is temporary. -
- Clowns will no longer be killed trying to use holo eswords -
- Major tweaking to try and optimize many operations on the game's backend. Hopefully, this will reduce a large amount of lag by steamlining CPU-intensive operations, but at the same time there was so much changed that there is no real way for a small group to test everything. If anyone spots a bug involving being unable to 'find' mobs, characters, whatever, then put it on the issue tracker or at the very least let #coderbus know. We can't fix shit unless we know about it. -
- Players not buckled in when the emergency shuttle/pod starts moving get will get knocked down. -
- Added a YouTool vending machine to primary tool storage. -
- Both the chef and bartender have access to the bar area so both can serve if the other is incompetent or does not exist. Bartender's shotgun and shaker were moved to his back room and the booze-o-mat is now ID restricted to the bartender. -
- Added powercells into vending machines in engineering -
- Gave two beartraps to the janitor for pest control purposes................ -
- Mech toys can now be redeemed at the quartermaster's for a great reward! If you collect the full set of 11 toys you should put them in a crate and send them to centcom via the supply shuttle. -
- Supply shuttle arrival time reduced to 2 minutes -
- Hopefully fixed the toy haul problem which made it possible to get a million toys from arcade machines. -
- You can now make newlines with your PDA notes. -
- You can now research and build the Light Replacer. -
- You can now store donuts in the donut box. The next donut you pull out will be the last one you put in. -
- APCs will auto-turn on if there is enough power in the grid, even if the powercell is below 30%. The APC needs to be charged for a long enough time before it starts turning equipment on, to avoid spazzing out. If you have any problems with it, such as equipment turning off and on repeatedly then please make an issue report with a screenshot of the APC. -
- Added the Light Replacer. This is a device that can auto replace lights that are broken, missing or burnt. Currently it is found in the Janitor's closet and Janitor Borgs can equip it. You can refill it with glass, or if you're a Cyborg, just recharge. It is emaggable and will replace lights with rigged lights. The light's explosion was nerfed to help balance it and it is very noticable when you are holding an emagged Light Replacer. -
- The Janitor's equipment locator, on their PDA, will now tell you the direction of the equipment. -
- Added department satchels -
- Added Captain's Backpack and Satchel -
- Added three new hairstyles by Sly: Gelled, Flat Top, and Pigtails. Hair list has also been sorted by grouping similar styles. -
- Added a new wire for Cyborgs. See if you can figure out what it does. -
- You can now fill any container with a sink. You can change the amount to fill, from sinks, by setting your container's transfer amount. -
- All living mobs can now ghost whenever they want. Essentially making the suicide verb obsolete. If you ghost whilst still alive however, you may not re-enter your body for the rest of the round. -
- Humans can no longer suicide whilst restrained (this is purely to prevent meta whilst I finish up the new FUN suicides) -
- Fixed dem evidence bags. Fixed metroids getting at it like rabbits. Fixed stuff like welding masks not hiding your face. Bunch of other things -
- pAI Emoticons! Allows each pAI to set their screen to display an array of faces! Click on 'Screen Display' in the pAI OS for a list. -
- Added Russian Revolvers. This is a special Revolver that can only hold a single bullet randomly in it's chamber. This will allow you to play Russian Roulette with your fellow crew members! You can use it like a normal gun but you will need to cycle through the chamber slots until you hit the bullet. Only admin spawnable. -
- Added FLOORLENGTH HAIR. YEESSSSSSSS!!!! :3 If you like it say thanks to Ausops for fixing it up. Credits to Powerfulstation for the original sprite. -
- Save Slots! You can now have separate save slots for different character setups, with a customizable maximum of 3 slots per account. If you are wondering, you will not lose your old saved setup. -
- The character setup screen was updated to look nicer and to fit on the screen. -
- Added new Dwarf and Very Long hairstyles. Dwarf hair and beard by SuperCrayon. -
- pAI gets a better PDA that can actually receive messages from people. They can also instantly reply like everybody else now and they can toggle their receiver/signaller/ringer. -
- You can show the AI the notes on your PDA by holding it up to a camera. When you show up a paper/pda to the camera the AI can now click on your name to go to you, if you're near a camera. People who are Unknown will not have a link; which would've allowed the AI to track them. -
- Made the" common server" and the "preset right receiver" listen for frequencies 144.1 to 148.9. This will allow people to use different frequencies to talk to eachother without bothering the common channel. It will also allow Revs and Cultists to work with each other; everything is still logged though so it still has risks. -
- Increased the maximum frequency limit for handheld radios and intercoms. It will give you the option to just use station bounced radios on a higher frequency so that anyone with a headset can't simply tune in. -
- Created an All-In-One Grinder that is suppose to replace the blender, juicer and reagent grinder all together. Meaning any department that has a juicer, blender and grinder will instead get this. It will help people be more independent from Chemistry by recycling foods and plants. -
- Added a couple of Emergency Shield Projectors to Engineering secure storage.
-
Note: Credit goes to Barhardar for the original code and functionality. -
These devices can be used to quickly create an air-tight seal across a hull breach until repairs can been made. -
Wrench them in place and activate them near a hull breach. The shield should extend to all space tiles in range. -
They can be (un)locked by engineering IDs and can also be emagged and otherwise malfunction. As they can not be constructed, you can repair damage and malfunctions by opening the panel with a screwdriver and replacing the wires with a cable coil
- - Chemistry update: Pills can now be ground up in reagent grinders. You can now put custom amounts of reagent into things using chemmasters. Can now load pill-bottles into chemmasters for mass pill-production. -
- Clicks on inventory slots with items in now act like a click on the thing in that slot. So clicking smaller things (like pens) is easier and you can remove clothing that borks/goes invisible. Please continure to report those kinds of bug though please. Thanks x -
- Can no longer interact with your inventory with a mech. -
- You can now only adminhelp once every 2 minutes so please provide all necesary information in one adminhelp instead of 5! Also reply to admins in PM-s and not additional adminhelps. -
- A basketball simulation is now available at the holodeck. Credit to Sly and Ausops for the sprites. -
- Bottles can now be broken over people's heads! To do this, you must have the harm intent on and you must be targeting the person's head. This change affects alcoholic bottles only. It does not change pill bottles or chemistry bottles. Helmets help protect you from damage and the regents of the bottles will splash over the victim. -
- AI's now have access to a PDA. Note: It is not PDA-bomb-able -
- Health analyzers and medical PDAs now give a time of death when used on corpses. -
- Alien larva now chestburst even after their host has died. -
- Aliens can now slap facehuggers onto faces so they can infect mobs which lay down (or those stuck to nests). -
- Aliens can now slash security cameras to deactivate them. -
- Added alien nests. They're basically beds made of thick sticky resin which aliums can 'stick' (buckle) people to for sexytimes -
- Weed nodes are no longer dense. -
- Queens can secrete resin for walls/nests/membranes -
- Various bugfixes -
- Added Petethegoat's basic mirrors to the map. They allow you to change hairstyles. -
- Remapped Bar, Theatre, and Hydroponics. Bar and Kitchen are now more integrated with each other. -
- I'm currently working on cleaning up and moving around a large portion of the mob code. These changes do not directly affect players; HOWEVER, bugs, oversights or simple mistakes may cause problems for players. While I have tested as much as I can, there may be some lingering bugs I have missed.
This part of the mob code cleanup mainly focuses on damage variables and procs. So if you suspect something related to taking, dealing or examining damage is not working as intended please fill out an issue report here and be as detailed as possible. This includes what you were doing, steps to reproduce the problem, who you were doing it to, what you were using ect... Thank you.
- - Alien hunters will now cloak when using the 'stalk' movement intent. Whilst cloaked they will use up their plasma reserves. They can however cloak as long as they like. Using the Lay-down verb will allow them to remain cloaked without depleting their plasma reserves, hence allowing them to lay ambushes for unsuspecting prey. Should a hunter attack anybody, or get knocked down in any way, they will become visible. Hopefully this allows for more strategic/stealthy gameplay from aliens. On the other hand, I may have totally screwed the balance so feedback/other-ideas are welcome. -
- Removed the invisibility verb from the alien hunter caste. -
- Fixed the bug which prevented you from editing book's titles and authors with a pen. Also fixed the bug which prevented you from ordering a book by it's SS13ID. -
- Added the F12 hotkey which hides most of the UI. Currently only works for humans. -
- Pizza boxes! Fully stackable, tagable (with pen), and everythingelse-able. Fantastic icons by supercrayon!
Created with a sheet of cardboard.
- - Changeling parasting now only weakens for 10 game ticks. It no longer silences your target. -
- Reworked job randomizing system. Should be more fair. -
- List of players are now randomized before given antag, this means that declaring as fast as possible doesn't mean shit anymore! -
- Putting a blindfold on a human with lightly damaged eyes will speed up the healing process. Similar with earmuffs. -
- More overlay bug fixes. Most of it to do with little robots and construction stuff. Bugs go here if you have 2 minutes http://nanotrasen.com/phpBB3/viewtopic.php?f=15&t=9077 -
- Weakening is instant! That means if you stunbaton somebody they're gonna fall-down immediately. -
- Medical storage now requires Surgery access (Medical Doctors only) -
- AIs, Borgs are no longer able to be cultists or revolutionaries as their objectives completely contradict their laws. They can still be subverted of course. -
- pAI's no longer keep cult or rev icons. -
- -Both Ambrosia forms have had their reagent contents modified to prevent going over the 50-unit cap at high potencies. Ambrosia Deus now contains space drugs instead of poison. -
- -Drinking milk removes capsaicin from your body. REALISM! -
- -Frost oil hurts less upon consumption. -
- -Liquid plasma can be converted into solid plasma sheets, by mixing 20 plasma, 5 iron, and 5 frost oil. -
- -Added effects for holy water injection on hydroponics plants. -
- Fix for special characters on paper and from announcements -
- Various small bugfixes, check the commit log for full details -
- Fixed falsewalls not working -
- Made Lasertag ED-209's and turrets much more useful, including making their emag function more fitting -
- Added Mesons to the EngiVend to make up for how many lockers were removed -
- New Item: Sheet Snatcher. Right now only borgs have them, but they can hold up to 500 sheets of minerals (Of any combination), and auto-stacks them to boot. Used just like the mining satchels, meaning minerborgs can actually deliver metal -
- Mech drills can mine sand, and the diamond gets a much larger volume -
- If a borg has the satchel in its modules (Doesn't have to be the active one), it will auto-magically pick up any ores it walks over. -
- Bumping an asteroid wall with a pickaxe/drill in your hand makes you auto-magically start drilling the wall, making mining much less tedious (humans and borgs)(Also, gustavg's idea) -
- New afro hairstyles. Big Afro by Intigracy. -
- First update for update_icons stuffs:
Fixed husking and fatties
Fixed floor tiles still appearing in hand when laying them
Fixed runtimes with fatties.
- - Fixes for pre-existing bugs:
Fixed being unable to put belts & backpacks on other people
nodamage (godmode) now prevents all organ damage. It does not stop healing however.
Nerd stuff...
-
- - Greatly reduced the amount of damage high pressure does. -
- Fire suits, firefighting helmets (red harhats) and the chief engineer's white hardhat now protect against high pressure. -
- Ported over ponytail sprites from Baystation -
- FEAR NOT! You can now store a pen in your pda. (aka Best commit all commits) -
- Massive Mob-Icon Overhaul:
A large amount of the mob code has been replaced. The systems replaced were causing immense performance issues so the following are very necessary optimisations.
However, there is a downside: SS13 code is the equivilant of monkeys on typewriters. Despite weeks of constant coding/testing there -will- be things I've missed. The kinds of bugs I'm expecting are overlays not updating and/or in rare cases things not appearing in your hud. Most of these issues can be worked around simply by dropping the item and picking it back up. If all else fails ask an admin to regenerate your icons through view-vars.
Please report any bugs to me on #coderbus IRC or make an issue on the tracker as a matter of urgency. I will fix them ASAP.
Also a massive thankyou to Nodrak, Erro, Pete and Willox. :)
- - Massive rewrite of the overlays system (particularly for humans). Stuff is cached and only updates when necessary. In effect this means faster updates, less overheads/lag, and less reliance on the game-ticker. -
- Numerous bugfixes and tweaks for damage-procs and damage-overlays for humans. They should now be almost seamless, use very little overhead and update instantly. -
- TK grab can now be cancelled using the throw hotkey. (so now it toggles on/off like it used to). -
- Added verbs to the view-var drop-down list: "Regenerate Icons" will fix a mob's hud/overlays. "Set Mutantrace" will change a mob's mutantrace. -
- Damage icons were split up. They kinda look a bit crap so spriters feel free to replace them. Templates are provided in dam_human.dmi -
- More to come...
- -Added Lezowski's overalls to hydroponic supply closets. 50% chance per closet for them to replace the apron. -Removed some covers tags from things that made no sense to have them. -
- Fixed being able to lock yourself in or out of a locker using the verb. -
- Added lightfixture creating. -
- You can now use the resist verb or UI button when welded or locked in a closet. Takes 2 minutes to get out tho (Same as getting out of handcuffs or unbuckling yourself) -
- Making single-pane windows will now make the window in the direction you're facing. If a window already exists in that direction it will make it 90 degrees to your left and so on. -
- Cyborgs and AIs can now use the newscaster. It was a mistake on my part, forgetting to finish that part of them. -
- You can now make restraints from cable. It takes 15 lengths of cable to make a pair of restraints, they are applied the same way as handcuffs and have the same effects. It however only takes 30s to remove them by using the resist verb or button. You can also remove them from someone by using wirecutters on the handcuffed person. -
- Added four new cable colors: pink, orange, cyan and white. Engineer belts spawn with yellow, red or orange cables while toolboxes and tool closets spawn with all 8 colors. -
- Added a second ZIS suit to engineering. -
- Remapped CE office and surrounding areas. -
- Radiation now works properly, watch out for that Singularity! -
- Disposals are no longer the loudest machines in existence. -
- Building portable turrets with lasertag guns now makes them fire lasertag bolts based on team, and they will automatically target and prioritize people wearing opposing team gear. -
- The same can be done for ED-209s, simply using a lasertag vest and gun (same color) where you would use a security vest and taser in construction. -
- Added mineral walls and powered mineral door construction. More information can be found in the commit thread, but basically they are built the same way others are, apply mineral to girder for a mineral wall, mineral to airlock assembly for a powered mineral door. -
- Commit Thread -
- Throw hotkey (end) now works with TK. -
- Swap hands hotkey (page up) now cycles through borg modules. -
- Cargo's 'shuttle: station' and 'shuttle: dock' has been changed to 'shuttle: station' and 'shuttle: away' to help avoid confusion. -
- Maintenance shafts changed around. Renamed, less windows, more turns, and expanded in a few areas. -
- You can now add chemicals into cigarettes by injecting them directly or dipping individual cigarettes into a beaker. You can inject into cigarette packs directly to affect multiple cigarettes at once. -
- You can now click individual blocks/subblocks in the genetics console instead of having to scroll through the blocks with a forward/back button! -
- You can now Drag-Drop disposal pipes and machinery into the dispenser, in order to remove them. -
- You must now use wrench before welding a pipe to the ground -
- You can no longer remove a trunk untill the machinery ontop is unwelded and unwrenched -
- You are now forced to eject the disposal bin before unwelding it. -
- Readded fingerprints and detective work, after lots of debugging and optimization. -
- Any PDA with access to the Security Records can now, by the normal forensic scanner function, store data the same way as the detective's scanner. Scanning the PDA in the detective's computer will copy all scanned data into the database. -
- If something goes wrong, please contact SkyMarshal on the #bs12 channel on irc.sorcery.net -
- Glass Doors are now breakable. -
- Added more treasures to the secret mining room. -
- Changed mineral lockers from secret mining rooms: Instead of giving you two stacks of everything, you get stacks of ore based on rarity -
- Moved Engineering and Bridge deliveries. -
- -Adjusted balaclavas and added luchador masks. Wearing luchador masks give you latin charisma. They replace the boxing gloves in the fitness room. Boxing gloves are still available in the holodeck. -Fake moustache tweaked and given new sprites. -
- You can now dispense Disposal Bins, Outlets and Chutes from the disposal dispenser. These are movable and you can attach them above open trunks with a wrench, then weld them to attach them completely. You can remove Bins by turning off their pump, then screwdriver, then weld, then wrench. Same with outlet and chute except for the pump part. -
- Ported over Flashkirby99's RIG suit sprites from Bay12 -
- Department PDA Carts moved out of lockers and into head offices. -
- -Reverted default UI sprites to Erro's old-style UI. Config options for UI color styles coming soon. -Driest Martinis will no longer be invisible. -Braincakes are now sliceable. -
- -Medical borg overhaul. Instead of a dozen random pills and syringes, they get a hypospray that can switch between auto-replenishing tricordrazine, inprovaline, and spaceacillin. -
- Some of the more pressing issues with the new user interface were addressed. These include the health indicator being too far up, the open inventory taking a lot of space, hotkey buttons not being removable and suit storage not being accessible enough. -
- A toggle-hotkey-buttons verb was added to the OOC tab, which hides the pull, drop and throw buttons for people who prefer to use hotkeys and never use the buttons. -
- Added a character setup option which allows you to pick between the Midnight, Orange and Old iconsets for the user interface. -
- RIG helmets can now be used as flashlights, just like hardhats. Credit to Sly for the sprites. -
- HoP's office has been remapped and made into his private office. Conference Room can now be accessed from the main hall. -
- The new user interface is here. If anything is broken or something should be done differently please post feedback on the forum. Spriters are encouraged to make new sprites for the UI. -
- When you receive a PDA message, the content is displayed to you if the PDA is located somewhere on your person (so not in your backpack). You will also get a reply button there. This will hopefully make PDA communication easier. -
- New hotkeys! delete is the now the 'stop dragging' hotkey, insert is the 'cycle intents' hotkey. -
- You can now swap hands by clicking with your middle mouse button (you have to click on a visible object though, that's the catch). -
- Tweaked the DNA modifier consoles a little bit so that it's much easier to see individual blocks instead of one jumbled mess of hexadecimal. -
- You can now properly emag AI turret controls and commsat turret controls. -
- Brand new ending animations! -
- Removed hat storage, which was useless. -
- Implanting someone now takes 5 seconds, both people need to remain still. Implanting yourself remains instant. -
- Wallets once again spawn in the cabinets in the dormitory -
- Wallets now fit in pockets -
- Individual dorms now have a button inside that bolts/unbolts the door -
- New sprites for Cargo, HoP, and Captain's lockers -
- More department-specific door sprites. Most noticable changes in medsci and supply departments. -
- Added WJohnston's scrubs to Medical Doctor lockers. Comes in blue, green, and purple. -
- Added two new syndicate bundles -
- Reduced cost of thermals to 3 telecrystals (formerly 4) -
- Singularity Beacons are now spawned from a smaller, portable device. -
- CMO and QM jumpsuits made more unique. -
- Reinforced table parts are now made by using four metal rods on regular table parts. No plasteel involved. -
- Beakers, small and large can now be made/recycled in autolathes. -
- Added a 'random item' button to traitor uplinks. You can potentially get ANY item that shows up on the traitor item list, provided you have enough crystals for it. -
- New design for security. This should be the last time it sees major changes for a while. -
- Added a new construction area. What could it be for? -
- Readded the RD's genetics access. -
- RD is still without chemistry access, but I'm going to review this decision in a week and see if R&D is useless due to lack of acid. -
- Added Flashkirby99's SMES sprites! -
- Sexy new warpspace (or whatever) tiles. -
- Reverted dismemberment, the recent gun changes, and Tarajans. Before you shit up the forums, read this: -
- Dismemberment was ported from Bay12, but only halfway, and there were several problems with it. I know many people really liked it, but as it stood it did not fit the playstyle here at all. This had to be removed, there is work on a more fitting system, but this had to be taken out first regardless, and the longer people beat around the bush the worse the situation got. -
- The gun change was made for no real reason and was pretty problematic, so reverting that should mean there are a lot less 'accidental suicides.' -
- Tarjans were reverted by request as well, and since keeping them working after removing dismemberment would be a stupid amount of work. -
- -New booze sprites for the drinks that were removed! Re-enabled the recipes for the removed drinks. Get cracking, bartenders. -You now need 10 sheets of metal instead of 2 to make a gas canister, people can't FILL ENTIRE ROOMS WITH THEM. -
- -Emergency Toolboxes now contain smaller, lighter fire extinguishers that actually fit inside them! -
- RD get the fuck out of chemistry and genetics -
- CHEMISTS, DON'T BE DICKS TO RESEARCH, GIVE THEM ACID YOU TIGHT FUCKS -
- Updates to Sec, including a stationary scrubber for the prison area. -
- Swapped around cryogenics and the patient rooms in medbay. -
- -Added fat jumpsuit sprites for orange, pink, yellow, owl, security, and warden jumpsuits. -
- -Somatoray is hopefully more useful and less buggy when used on trays. -Botanists now have morgue access, because of their ability to clone via replica pods. Try not to get this removed like all your other access, okay hippies? -
- Updated genetics, medbay and security. -
- Adds BS12 dismemberment! -
- Adds greater changeling for 30 points -
- Added a verb to the PDA which you can use to remove an ID in it. If your active hand is empy, it puts it there otherwise it puts it on the floor under you. -
- -New sprites for lemons, oranges, and walking mushroom critters. -Added Invisty's new blob sprites. -
- -Added a new chemical: lipozine, a weight loss drug. Made with sodium chloride, ethanol, and radium. -
- New layout for Security, including a prison area instead of permacells. -
- New layout for the library, bar, and botany. -
- Medbay and R&D now have three-tile halls. -
- Fakedeath changelings can no longer have their brains cut out. -
- Rev checkwin changed to fire every five ticks (from twenty) and actually use the right objective type so revs being off station counts as success. -
- Powercells now have unique icons for cell types -
- Implemented mech construction sprite by WJohnston for the Ripley, Firefighter, Gygax, and Durand -
- Durand construction is reversible -
- Power Cells can now be made in Mechfabs, provided the proper research level has been achieved -
- Added a new item, the Synthetic Flash. Works just like a normal flash, except they can only withstand one use, but can be produced in the Mechfab(To replace the need for normal flashes) -
- Added a new type of gloves, ones that are cheap copies of the coveted Insulated Gloves, but be warned, quality control wasn't too thorough -
- Added a new Cyborg Upgrade, a jetpack for use by Miner Cyborgs. Can be refilled on any air canister -
- Miner Cyborgs now have a Diamond Drill equivalent along with an upgraded Ore Satchel -
- Mechfabs no longer brick if there are parts in the quene on sync -
- MMIs can be built in the Mechfabs again -
- Crabs are no longer immortal, and are now especially vulnerable to wirecutters -
- Bibles printed in the library now retain the religion's deity -
- Added Construction Sprites for the Ripley, Firefighter, Gygax, and Durand by WJohnston -
- Added Particle Accelerator sprites by Invisity -
- Added Power Cell, Synthetic Flash, Robot Upgrades, and made some modifications to the PA sprites -
- Added Invisty's field generator sprites. -
- CATCHING UP ON MY CHANGELOG. Some of this has been in for a while: -Added carved pumpkins and corncob pipes. -Added mutations for ambrosia and lemon trees. -Added more wood items for tower cap wood construction. -Added soil to plant seeds in. Make it by crushing up sandstone. Soil does not have indicators like trays do! Watch your plants carefully! -
- -The biogenerator is now more robust. It can dispense fertilizer in batches, and make simple leather items. -RnD can create a new tool for botanists: The floral somatoray. Has two modes. Use it on your plants to induce mutations or boost yield. -
- -Added plump helmet biscuits, mushroom soup, pumpkin pie and slices, chawanmushi, and beet soup recipes for the chef to make. -
- -Added transparency to biohelmets. -Normalized grass harvests. -Changed the name of "Generic Weeds". -Blenders can now be filled directly from plant bags. -Added low chance for a species mutation whenever a plant's stats mutate. -You now get more descriptive messages when applying mutagen to plant trays. -Removed sugarcane seeds from the vending machine. Added the sugarcane seeds to the seeds crate. -
- New gasmask sprites. Removed emergency gasmasks, so there's only one type now. -
- New shotgun sprites by Khodoque! -
- The barman's double-barrel actually works like a double-barrel instead of a pump-action! Rejoice! -
- Sneaky barmen may be able to illegally modify their shotgun, if they so choose. -
- Trimmed the changelog, vastly. -
- Maintenance door outside of tech storage now requires maintenance OR tech storage access instead of maintenance AND robotics accesses. -
- Rewrote the cinematic system to try and simplify and optimise it. Please report any bugs asap to me or coderbus, thanks. -
- Engineering jobs now have their PDA spawn in their pocket, and their toolbelt on their belt -
- The nuke going off on station will now gib everyone on the Z level. -
- Two more core displays are available for the AI -
- The Artificer can now build cult floors and walls -
- Updated the robotics layout. -
- Nerfed the librarian by removing the r-walls from his cubbyhole thing, fuck WGW readers hiding out in there. -
- Fixed the ability to move while lying down/resting. -
- Sleep has been fixed and works as intended again. Anaesthetic and toxins can now properly put people to sleep, permanently if you keep the administration stable. Sleeplocs are now viable again. The sleep button and *faint emote work again. -
- Droppers are now used at the eyes, and thus, access to the eyes is required to have an effect. -
- CONTRABAND-CON UPDATE: Added posters. I'm sorry to add it seperately with the rest of contraband, but there was a lack of sprites for everything else. Hopefully, people will gain interest and get me some damn sprites this way :3 - As I said, this is an ongoing project of mine. So starting of, we've got... -
- POSTERS! Posters come in rolled packages that can adhere to any wall or r_wall, if it's uncluttered enough.
-
How they get on-board: The quartermaster can now set the receiver frequency of his supplycomp circuit board. A bit simplistic as of now, will work on it later. Building a supplycomp with a properly set up circuitboard will give access to the Contraband crate. -
How they're used: Unfold the rolled poster on any wall or r_wall to create the poster. There are currently 17 designs, with the possibility of me adding more. -
How to get rid of them: You can rip them using your hand... To cleanly extract them and not ruin them for future use, however, you can use a pair of wirecutters. -
How they're classified: They're contraband, so it's perfectly okay for security officers to confiscate them. Punishment for contraband-providers (or end-users, if you want to go full nazi) is up to the situational commanding officers. - - - Merged 'Game' and 'Lobby' tabs during pre-game into one tab -
- Added the little red x to the late-join job list -
- Late-joiners are warned if the shuttle is past the point of recall, and if the shuttle has already left the station -
- Late-joiners now see how long the round has been going on. -
- Mining shuttle computer no longer spits out both 'Shuttle has been sent' and 'The shuttle is already moving' every time. -
- TORE OUT DETECTIVE WORK! THIS IS A TEMPORARY PATCH TO SEE IF THIS FIXES THE CRASHING. -
- DETECTIVE SCANNERS AND EVIDENCE BAGS (AND FINGERPRINTS) ARE GONE. -
- Secret little rooms now spawn on the mining asteroid, containing various artifacts. -
- Added the beginnings of a borg upgrade system. Currently, can be used to reset a borg's module. -
- ERP is gone. Hope you enjoyed it while it lasted! -
- Security officers can modify people's criminal status by simply examining them with a security hud on and clicking a link that will show up as part of the character's description. -
- Less jobs have maintenance access. The only jobs that will have it now are engineers, atmos techs, cargo techs, heads, and the detective. -
- Changed Runtime's sprite to look more catlike. -
- View Variables can now better list associative lists. -
- Miscellaneous bugfixes for the NT Script IDE. -
- Minor bugfixes to borg deathsquad, adds borg deathsquad to potential tensioner (set so high it's never going to happen) -
- Adds consiterable support for ERP! (If enabled.) -
- Increases cost for changeling unstun to 45 -
- You can now stick papers back in to paperbins, text will persist. -
- Added a [field] bbcode tag to the pen writing. Lets your start writing from that point. -
- Changed fonts a bit for papers to make [sign] stand out more. -
- Gave pill bottles the ability to scoop up pills like ore satchels scoop ore. (There you go, /vg/ Anon.) -
- Security Officers and Wardens now start with maintenance acceess. -
- Exosuits now provide a message when someone is getting in, someone getting in must remain stationary and unstunned, and getting in takes four seconds. -
- Fixed turrets shooting people that leave the area and the telecomm turret controls. -
- Updated air alarm's GUI. -
- Security borgs now have modified tasers. -
- Security borgs have gone back to having the same movement speed as all other borgs. -
- Escape shuttles/pods now spend about 2 minutes in high-speed transit before they reach centcom/recon shuttle. This is a warning: regular after-round shuttle grief is NOT OKAY while the shuttle is still in transit! Save it for when the shuttle gets to centcom! The purpose of this is to give potential antagonists and protagonists a chance to have a final showdown in the shuttle. The round does not end until the shutle comes to a stop and docks. Don't step outside while the shuttle is moving!
For example; if you are a traitor and have an escape-alone objective and a couple of people manage to squeeze in the shuttle, you have two minutes to kill/toss them out to win. Or you can just chill for the duration and reflect on the round.
- - A bunch new standard-namespace NTSL functions added! Check them out at the NT Script wiki page! -
- Medical Lockers, Security Lockers, Research Lockers, Warden Locker, CMO Locker, and RD locker all have new sprites. -
- Encryption keys now each have their own invidual sprites. -
- Added a prototype holodeck to fitness! -
- Assorted tensioner fixes -
- Lasertag vests and guns have been added to fitness. -
- Art storage has replaced the emergency storage near arrivals. Emergency storage has replaced chem storage (has anyone ever used that?) -
- Wraiths can now see in the dark -
- Added LSD sting to modular changeling by popular demand. -
- Silence sting no longer provides a message to the victim. -
- Tensioner will no longer assign dead people as assassination targets. -
- The medical record computers can finally search for DNA and not just name and ID. -
- Modular changeling added! Changelings now purchase the powers they want. Balancing still underway, but should be playable. -
- Janitor cyborgs have been massively upgraded. Suffice to say they're pretty ballin' now... -
- You can now choose whether to spawn with a backpack, satchel, or nothing. Excess items will spawn in your hands if necessary. -
- You can now choose what kind of underwear you'd like to wear, per a request. -
- Added 6 female hairstyles -- credits go to Erthilo of Baystation. Added a male hairstyle -- credits go to WJohnston of TG. If you can sprite some unique and decent-looking hair sprites, feel free to PM me on the TG forums. -
- The way objects appear to be splattered with blood has been rewritten in an effort to fix stupid things happening with icons. It should be called far less frequently now. PLEASE, if you experience crashes that could in anyway be related to blood, report them with DETAILED information. Thanks -
- Fixed the way flashes break. Long story short: They'll never break on first use so rev don't get screwed over. They run out of charge temporarily when spammed but recharge. Spamming them also increases the chance of them breaking a little, so use them sparingly. -
- Ablative Armor now has a high chance of reflecting energy-based projectiles. -
- Riot shields were buffed; they now block more attacks and they will prevent their wielder from being pushed (most of the time). -
- PDA messages now require an active messaging server to be properly sent. -
- The AI can now open doors with shift+click, bolt them with ctrl+click, and shock them with alt+click -
- Tratior borgs who hack themselves cannot be blown by the robotics console, and can override lockdowns. -
- Adds a new wire to doors that controls the time delay before they close. If pulsed, they close like a sliding glass door. If cut, they do not close by themselves. -
- Borgs who have died, ghosts, and are then blown up will now have their ghosts properly transfered to their dropped MMIs. -
- You can now request AI presence at a holopad for immediate private communication with the AI anywhere. AIs can click a quick button to zoom to the holopad. -
- Nodrak: Fixed crayon boxes and stuff getting stuck in pockets. -
- Nodrak: 'Steal item' objectives will report correctly when wrapped up in paper now. -
- Carn: fixed the vent in the freezer...poor chef kept suffocating. -
- Fixed a number of issues with mob examining. Including: not being able to see burns unless they were bruised; vast amounts of grammar; and icons. Updated them to use stylesheet classes. -
- Borgs can no-longer drop their module items on conveyor belts. -
- Names input into the setup screen are now lower-cased and then have their first letters capitalised. This is to fix problems with BYOND's text-parsing system. -
- Runtime fix for lighting. -
- Over the next few commits I will be updating a tonne of item names to fix text-parsing. Please inform me if I've typoed anything. -
- Removed cloakers. Removed Security's thermals. Added disguised thermals as a traitor item. -
- Tweak/Bugfix for Hallucinations. Much more robust. -
- Ported BS12 Detective Work System -
- Head revolutionaries no longer spawn with traitor uplinks. -
- BS12 Hallucination and Dreaming port -
- Integrated BS12's improved uplink code -
- The insane crashing has finally been fixed! -
- Telecommunications has been refined, with many new features and modules implemented. -
- NTSL (Nanotrasen Scripting Language) is ONLINE! This is a brand new, fully operational scripting language embedded within SS13 itself. The intended purpose is to eventually expand this scripting language to Robotics and possibly other jobs, but for now you may play with the TCS (Traffic Control Systems) implementation of NTSL in the Telecommunications Satellite. Recommended you read the NT Script wiki page for information on how to use the language itself. Other than that, there's not a lot of documentation. -
- Radio systems have been further optimized, bugfixed, etc. Should be more stable. -
- Intercoms now require power to work. -
- Headsets are now modular! Use a screwdriver on them to pop out their encrpytion keys, and use a key on one to put it in. A headset can hold two keys. Normal headsets start with 1 key, department headsets with two. The standard chip does nothing, and is not required for listening to the common radio. -
- Binary translators made into a encrpytion key, and fixed. They now broadcast to AIs properly. -
- MMIs/pAIs no longer lip read, and thus can now hear in the dark. -
- Borg rechargers are no longer Faraday cages, and thus can now receive radio while they're recharging. -
- Glass airlocks now make a different sound than regular airlocks. -
- in 1997 nanotrasen's first AI malfunctioned -
- Toggle ambience probably works now! -
- Runtime is
dead. - - The Research Director's consoles were moved into the completely empty cage in the back of his office. -
- Changed alt+click to ctrl+click for pulling. -
- New stationary scrubber sprites~ -
- Removed the mint. Coins can still be found and used in vending machines. PACMANs now run off sheets. -
- New sprites for HoS and Captain lockers. -
- New sprites for the orebox. -
- The jetpacks now display correctly when worn. -
- Buckling to chairs no longer causes you to drop your weapon -
- Ghosts now have a "Jump to Mob" verb. -
- Mining lanterns work properly once again!. -
- The armoury now includes a box of spare Sec cartridges. -
- The jetpacks in EVA have been replaced with CO2 ones, painted a classy black. -
- Additionally, jetpacks will now run on gases other than oxygen, as you would expect. -
- Chair overhaul! You shouldn't notice anything different, but if you encounter bugs with chairs or beds, please report those asap. -
- New electric chair sprites, by myself. -
- Electric chairs will only electrocute people buckled into them. -
- Karma should be fixed. -
- A new construct type: Artificer. It is capable of constructing defenses, repairing fellow constructs, and summoning raw materials to construct further constructs -
- Simple animals (constructs, Ian, etc) can now see their health in the Status tab -
- Detective's revolver is non-lethal again. Was fun while it lasted -
- Foam has a reduced range to prevent spamming -
- Stopped the unholy Radium/Uranium/Carbon smoke that crashed the server. And for anyone that did this, you are a horrible person -
- Cleanbots clean dirt -
- Cleanbots automatically patrol on construction -
- Removed silicate because it is not useful enough for how much lag it caused -
- Newscasters now alert people of new feeds and wanted-alerts simultaneously. -
- Terrorists Win! Desert Eagles and Riot Shields now spawn on the syndicate shuttle, replacing the c20r -
- The Detectives gun still uses .38, but they're now fully lethal bullets. Go ahead, make his day. -
- The Veil Render has been nerfed, the Nar-Sie it spawns will not pull anchored objects. This is a temporary measure, more nerfs/reworking to come -
- Spacevines added to the random events. -
- The bug where doors kept opening when a borg tried to close them at close range is now fixed. -
- Security officers, the warden and the HoS have new jumpsuits. -
- Clicking the internals button on your user interface (The one that shows if you have internals on or not) will now toggle internals even if they are in your pockets. (humans only) - It now works if your internals are on your back, suit storage, belt, hands and pockets. -
- The public autolathe has been removed. If you want some some stuff from a lathe, go to cargo. -
- A new item, the null rod, protects the one bearing it from cult magic. One starts in the chaplains office, and this replaces the job based immunity he had. The null rod also is capable of dispelling runes upon hitting them (the bible can no longer do this) -
- Shooting fuel tanks with lasers or bullets now causes them to explode -
- A construct shell is now waiting to be found in space. -
- Chaplains can no longer self heal with the bible -
- Simple animals, including constructs, can now attack mechs and critters -
- You can no longer attach photos to ID cards. This never worked properly and if anything, it was misleading. -
- Backpacks can now hold 7 normal sized items (box size) as opposed to 6 normal sized items + 1 small item -
- Added several fire alarms to areas around the station including the brig, engineering and others -
- The atmospherics department now has a few hazard vests available for atmos techs to wear if they don't like the fire suit -
- Roboticist now have engineering + science headsets, virologists now have medsci headsets with medical + science channels -
- Added some headsets to the jobs that didn't have any extras: roboticist, qm, scientist, virologist and geneticist. -
- Station engineers now have construction site access (vacent office by arrivals) -
- Replaced a few airlocks with glass airlocks (detective, autolathe, assistant storage, robotics, checkpoint) -
- Removed the wall that was blocking the entrance to the theater -
- Made a small redesign for the HoP's office so that people running towards it from the escape hallway don't run right into the queue, annoying everyong -
- The engineering, command and security airlocks now glow green when closing instead of red to match all the other airlocks -
- The disposal units now auto trigger every 30 game ticks, if there is something (or someone) in them. So no more hiding in disposal units! -
- You can no longer control the disposal unit from within it. You will have to wait for it to trigger itself. -
- You can no longer strip items off of Ian while dead / a ghost -
- Updated fitness, athletic shorts are now available! -
- You can now take individual crayons out of the crayon box the same way as from boxes -
- Clicking a grille with a glass or reinforced glass pane in your hand will glaze the grille from the direction you're looking from (don't forget to fasten the window tho) -
- When you click somewhere with the intent to interact, you will automaticaly face the item you're trying to interact with. This won't slow you down when running and firing guns behind you. -
- A new passive mob ability: Relentless. Relentless mobs cannot be shoved (though may still swap places with help intent) -
- Alien Queens, Juggernaut constructs, and Medical Borgs are all Relentless. Maybe the medborg can actually drag people to medbay on time now -
- Two constructs, the Juggernaut and the Wraith are now available for wizards and cultists to use soul stones with -
- A new highly destructive artefact, Veil Render, is now available for wizards -
- A new one time use global spell, Summon Guns, is now available for wizards. -
- DEEPSTRIKING! There is now a partially constructed teleporter on the nuke shuttle, and for a large sum of telecrystals they may purchase the circuitboard needed to complete it. -
- The Chaplain is immune to cult stun, blind, deafen, and blood boil -
- Added a new toy: Water balloons. They can be filled with any reagent and when thrown apply the reagents to the tile and everything on it. -
- Engineering and security lockers now spawn with their respective backpacks in them so job-changers can look as they should. HoS locker now also contains an armored vest, for the convenience of the HoS who wants to play with one. -
- Slightly changed the spawn order of items in the CE and HoS lockers to make starting up a hint less tedious. -
- Added Exosuit Jetpack -
- Added Exosuit Nuclear Reactor (runs of normal, everyday uranium, maybe I'll switch it to run on enriched) - requires research (level 3 in Materials, Power Manipulation and Engineering) -
- Added Ripley construction steps sprites (courtesy of WJohnston - man, you're awesome) -
- Exosuit Sleeper can now inject occupant with reagents taken from Syringe Gun -
- Exosuit Cable Layer will now auto-dismantle floors -
- Exosuit Heavy Lazer cooldown increased, Scattershot now fires medium calibre ammo (less damage) -
- Exosuit wreckage can be pulled -
- EMP now drains half of current exosuit cell charge, not half of maximum charge. -
- Fixed several possible exosuit equipment runtimes -
- Introduced new markup to changelog. Javascript is extremely slow (in byond embedded browser) for some reason. -
- Examining humans now works a bit differently. Some external suits and helmets can hide certain pieces of clothing so you don't see them when examining. Glasses are also now displayed when examining. -
- The job selection screen has been changed a little to hopefully make making changes there easier. -
- Carn updated:
-
-
-
- Grammar & various bug-fixes -
- Thank-you to everyone who reported spelling/grammar mistakes. I'm still working on it, so if you spot anymore please leave a comment here. There's still lots to fix. -
- Mining station areas should no longer lose air. -
- Sieve updated:
-
-
-
- This stuff is actually already implemented, it just didn't make it to the changelog -
- Firefighter Mech - A reinforced Ripley that is more resistant to better cope with fires, simply look in the Ripley Contruction manual for instructions. -
- Mech contruction now has sounds for each step, not just 1/4 of them. -
- Mech Fabricators are fixed, Manual Sync now works and certain reseach will reduce the time needed to build components. -
- Added special flaps to the mining station that disallow air-flow, removing the need to shuffle Ore Boxes through the Airlocks. -
- Each outpost has it's own system for the conveyors so they won't interfere with each other. -
- Powercell chargers have been buffed so now higher capacity cells are actually useable. -
- A diamond mech drill has been added. While it isn't any stronger than the standard drill, it is much faster. - -
- Agouri updated:
-
-
-
- UPDATE ON THE UPDATE: Newspapers are now fully working, sorry for that. Some minor icon bugs fixed. Now I'm free to work on the contest prizes :3 -
- Newscasters are now LIVE! Bug reports, suggestions for extra uses, tears etc go here. -
- What ARE newscasters? Fans of the Transmetropolitan series might find them familiar. Basically, they're terminals connected to a station-wide news network. Users are able to submit channels of their own (one per identified user, with channels allowing feed stories by other people or, if you want the channel to be your very own SpaceJournal, being submit-locked to you), while others are able to read the channels, either through the terminals or a printed newspaper which contains every news-story circulating at the time of printing. -
- About censorship: You can censor channels and feed stories through Security casters, found in the HoS'es office and the Bridge. Alternatively, if you want a channel to stop operating completely, you can mark it with a D-Notice which will freeze it and make all its messages unreadable for the duration it is in effect. If you've got the access, of course. -
- Basically I think of the newscaster as nothing more as an additional Roleplaying tool. Grab a newspaper along with your donuts and coffee from the machines, read station rumors when you're manning your desk, be a station adventurer or journalist with your very own network journal! -
- I would ask for a bit of respect when using the machine, though. I removed all and any channel and story restrictions regarding content, so you might end up seeing channels that violate the rules, Report those to the admins. -
- Finally, due to the removal of the enforced "Channel" string, it's recommended to name your channels properly ("Station Paranormal Activity Channel" instead of "Station Paranormal Activity", for example") - -
- BubbleWrap updated:
-
-
-
- Arresting buff! -
- A person in handcuffs being pulled cannot be bumped out of the way, nor can the person pulling them. They can still push through a crowd (they get bumped back to behind the person being pulled, or pushed ahead depending on intent). -
- LastyScratch updated:
-
-
-
- Toggle-Ambience now works properly and has been moved from the OOC tab to the Special Verbs tab to be with all the other toggles. -
- RavingManiac updated:
-
-
-
- The bar now has a "stage" area for performances. -
- Blaank updated:
-
-
-
- Added a vending machine to atmopherics reception desk that dispenses large -oxygen tanks, plasma tanks, emergency oxegen tanks, extended capacity emergency -oxygen tanks, and breath masks. -
- Petethegoat updated (for a bunch of other people):
-
-
-
- Lattice is now removed when you create plating or floor (credit Donkieyo). -
- Monkeys now take damage while in crit (credit Nodrak). -
- The warden now has his own jacket. (credit Shiftyeyesshady). -
- Spectacular new dice that will display the proper side when rolled!! (credit TedJustice) -
- Spectacular new dice that will display the proper side when rolled!! (credit TedJustice) - -
- Borg RCDs can no longer take down R-walls. (headcoder orders)
- Petethegoat updated:
-
-
-
- Exciting new pen additions! Get the low-down at the wiki. -
- Doohl updated:
-
-
-
- Syndicate shuttle now starts with a All-In-One telecommunication machine, which acts as a mini-network for the syndie channel. It intercepts all station radio activity, too, how cool is that? -
- Doohl updated:
-
-
-
- The radio overhaul 'Telecommunications' is now LIVE. Please submit any opinions/feedback in the forums and check the wiki article on Telecommunications for some more info for the curious. -
- The AI satellite has been replaced with a communications satellite. You can get there via teleporter or space, just like the AI satellite. I highly recommend not bum-rushing the new satellite, as you may be killed if you don't have access. It's a very secure place. -
- Once a human's toxicity level reaches a certain point, they begin throwing up. This is a natural, but overall ineffective method of purging toxins from the body. -
- You can now travel Z-levels in Nuclear Emergency mode (the nuke disk is still bound to the station). This means the nuclear agents can and probably will fly off into space to blow up the comm satellite and shut down communications. -
- ConstantA updated:
-
-
-
- Reworked exosuit internal atmospherics (the situation when exosuit is set to take air from internal tank, otherwise cabin air = location air):
-
-
-
- If current cabin presure is lower than "tank output pressure", the air will be taken from internal tank (if possible), to equalize cabin pressure to "tank output pressure" -
- If current cabin presure is higher than "tank output pressure", the air will be siphoned from cabin to location until cabin pressure is equal to "tank output pressure" -
- Tank air is not altered in any way even if it's overheated or overpressured - connect exosuit to atmos connector port to vent it -
- "Tank output pressure" can be set through Maintenance window - Initiate maintenance protocol to get the option -
- - Fixed bug that prevented exosuit tank air updates if exosuit was connected to connector port -
- Combat exosuits melee won't gib dead mobs anymore -
- QM exosuit circuit crates cost lowered to 30 points -
- Exosuit plasma converter effectiveness +50% -
- Reworked exosuit internal atmospherics (the situation when exosuit is set to take air from internal tank, otherwise cabin air = location air):
-
- Agouri updated:
-
-
-
- I'm back home and resumed work on Newscasters and Contraband. -
- But I got bored and made cargo softcaps instead. Flippable! Enjoy, now all we need is deliverable pizzas. -
- Oh, also enjoy some new bodybag functionality and sounds I had ready a while ago, with sprites from Farart. Use a pen to create a visible tag on the bodybag. Wirecutters to cut it off. Also it's no longer weldable because it makes no goddamn sense. -
- Donkieyo updated:
-
-
-
- You must now repair damaged plating with a welder before placing a floor tile. -
- You can now relabel canisters if they're under 1kPa. -
- Polymorph updated:
-
-
-
- Dragging your PDA onto your person from your inventory will bring up the PDA screen. -
- You can now send emergancy messages to Centcomm (Or, with some.. tampering, the Syndicate.) via a comms console. (This occurs in much the fashion as a prayer.) -
- Erro updated:
-
-
-
- Shift-clicking will now examine whatever you clicked on! -
- Polymorph updated:
-
-
-
- Alt-clicking will now pull whatever you clicked on! -
- Doohl updated:
-
-
-
- XENOS ARE NOW IMMUNE TO STUNNING! To compensate, stunning via tasers/batons now slows them down significantly. -
- Polymorph updated:
-
-
-
- Doors no longer close if they have a mob in the tile. (Generally!) Door safties can now be overriden to close a door with a mob in the tile and injure them severely. -
- ConstantA updated:
-
-
-
- Added some new Odysseus parts and tweaked old ones. -
- Added Exosuit Syringe Gun Module -
- New Odysseus sprites - courtesy of Veyveyr -
- Polymorph updated:
-
-
-
- Air Alarms can now be hacked. -
- Too much of a good thing is just as bad as too little. Pressures over 3000 kPa will do brute damage. -
- RavingManiac updated:
-
-
-
- Wrapped objects can now be labelled with a pen -
- Wrapped small packages can be picked up, and are now opened by being used on themselves -
- Mail office remapped such that packages flushed down disposals end up on a special table -
- Package wrappers placed in most of the station departments -
- In short, you can now mail things to other departments by wrapping the object, labelling it with the desired destination using a pen, and flushing it down disposals. At the mail room, the cargo tech will then tag and send the package to the department. -
- Errorage updated:
-
-
-
- Engineering's been remapped -
- RavingManiac updated:
-
-
-
- Refrigerators and freezer crates will now preserve meat -
- ConstantA updated:
-
-
-
- Circuit boards for Odysseus mech can be ordered by QM -
- Designs for them were added to R&D -
- - Kor updated:
-
-
-
- Soul Stones Added: Like intellicards for dead or dying humans! Full details are too long for the changelog -
- A belt full of six soul stones is available as an artefact for the wizard -
- Cultists can buy soulstones with their supply talisman -
- The chaplain has a single soulstone on his desk -
- The reactive teleport armour's test run is over. It no longer spawns in the RD's office. -
- - Rockdtben updated:
-
-
-
- Added sprites for soda can in left and right hands on mob: sodawater, tonic, purple_can, ice_tea_can, energy_drink, thirteen_loko, space_mountain_wind, dr_gibb, starkist, space-up, and lemon-lime. -
-
- - ConstantA updated:
-
-
-
- Mech Fabricators now require robotics ID to operate. Emag removes this restriction. -
- Added Odysseus Medical Exosuit. Has integrated Medical Hud and ability to mount medical modules. -
- Added Sleeper Medical module for exosuits. Similar to common sleepers, but no ability to inject reagents. -
- Added Cable Layer module for exosuits. Load with cable (attack cable with it), activate, walk over dismantled floor. -
- Added another exosuit internal damage type - short circuit. Short-circuited exosuits will drain powercell charge and power relay won't work. -
- You should be able to send messages to exosuit operators using Exosuit Control Console -
- Gygax armour and module capacity nerfed. -
- Exosuit weapon recharge time raised. -
- Bugfix: EMP actually drains exosuit cell and damages it -
- - RavingManiac updated:
-
-
-
- Meat will now spoil within three minutes at temperatures between 0C and 100C. -
- Rotten meat has the same nutritional value as normal meat, and can be used in -the same recipes. However, it is toxic, and ingesting a badly-prepared big bite -burger can kill you. -
- Because refrigeration serves a purpose now, the kitchen cold room freezing unit -is turned off by default. Chefs should remember to turn the freezer on at the -start of their shift. -
- - RavingManiac updated:
-
-
-
- Kitchen cold room is now cooled by a freezing unit. Temperature is about 240K by default, but can be raised to room temperature or lowered to lethal coldness. -
- Kor updated:
-
-
-
- General/Misc Changes
-
-
-
- Escape pods no longer go to the horrific gibbing chambers. Rather, they will be picked up by a salvage ship in deep space. (This basically changes nothing mechanics wise, just fluff) -
- An ion rifle now spawns on the nuclear operative shuttle. Maybe this will help with them getting destroyed by sec borgs every round? -
- - Wizard Changes
-
-
-
- The wizard can now purchase magic artefacts in addition to spells in a subsection of the spellbook. -
- The first (and currently only) new artefact is the Staff of Change, which functions as a self recharging energy weapon with some special effects. -
- The wizard has a new alternative set of robes on his shuttle. -
-
- General/Misc Changes
-
- Cult Changes
-
-
- Cultists now each start with three words (join, blood, self). No more will you suffer at the hands of cultists who refuse to share words. -
- The starting supply talisman can now be used five times and can now be used to spawn armor and a blade. -
- Replaced the sprites on the cultist robes/hood. -
- - Carnwennan updated:
-
-
-
- Thanks to the wonders of modern technology and the Nanotrasen steel press Ian's head has been shaped to fit even more silly hats. The taxpayers will be pleased. -
- - Doohl updated:
-
-
-
- Vending machines got yet another overhaul! Good lord, when will they stop assfucking those damned vendors?? -
- - Erro updated:
-
-
-
- Your direct supervisors are now displayed when you are assigned a job at round start or late join. -
- - Erro updated:
-
-
-
- Meteor mode is hopefully deadly again! -
- - Kor updated:
-
-
-
- Research director has a new toy: Reactive Teleport Armour. Click it in your hand to activate it and try it out! -
- - NEO updated:
-
-
-
- AIs actually consume power from APCs now -
- Bigass malf overhaul. tl;dr no more AI sat, instead you have to play whackamole with APCs. -
- - Doohl updated:
-
-
-
- Title music now plays in the pregame lobby. You can toggle this with a verb in "Special Verbs" if you really want to. -
- User Interface preferences now properly get transferred when you get cloned. -
- - Erro updated:
-
-
-
- Escape pods have been added to test the concept. -
- Escaping alone in a pod does not count towards the escape alone objective, it counts towards the escape alive objective tho. Escape alone only requires you to escape alone on the emergency shuttle, it doesn't require you to ensure all pods are empty. Cult members that escape on the pods do not ocunt towards the cult escaping acolyte number objective. Escaping on a pod is a valid way to survive meteor. -
- - Polymorph updated:
-
-
-
- Fire is now actually dangerous. Do not touch fire. -
-
-
- - Errorage updated:
-
-
-
- Fixed the comms console locking up when you tried to change the alert level. -
- Added a keycard authentication device, which is used for high-security events. The idea behind it is the same as the two-key thing from submarine movies. You select the event you wish to trigger on one of the devices and then swipe your ID, if someone swipes their ID on one of the other devices within 2 seconds, the event is enacted. These devices are in each of the head's offices and all heads have the access level to confirm an event, it can also be added to cards at the HoP's ID computer. The only event that can currently be enacted is Red alert. -
- - Kor updated:
-
-
-
- The chef now has a fancy dinner mint in his kitchen. It is only wafer thin! -
- - Pete & Erro Christmas update:
-
-
-
- Reinforced metal renamed to steel and steel floor tile renamed to metal floor tile to avoid confusion before it even happens. -
- It is no longer possible to make steel from metal or vice versa or from the autolathe. You can however make metal from the autolathe and still insert steel to increase the metal resource. -
- To make steel you can now use the mining smelting unit and smelt iron and plasma ore. -
- The RCD can no longer take down reinforced walls. -
- - Errorage updated:
-
-
-
- Grass plants in hydro now make grass floor tiles instead of the awkward patches. -
- - Petethegoat updated:
-
-
-
- Fixed all known vending machine issues. -
- Fixed a minor visual bug with emagged lockers. -
- Clarified some of the APC construction/deconstruction messages. -
- - Numbers updated:
-
-
-
- Potency variations tipped in favour of bigger changes over smaller periods of time. -
- - PolymorphBlue updated:
-
-
-
- Traitors in the escape shuttle's prison cell will now fail their objective. -
- Lockers are no longer soundproof! (or flashproof, for that matter) -
- Headrevs can no longer be borged, revs are dereved when borged. -
- - Vinyl Scratch updated:
-
-
-
- New ambient sounds for the station and AI Sat. -
- He's baaaaaack... -
- - Kor updated:
-
-
-
- Changeling husks are now borgable again (though not clonable) and genome requirements were lowered -
- De-revved revolutionaries had their message clarified a bit. You remember the person who flashed you, and so can out ONE revhead -
- Light tubes/bulbs can now be created in the autolathe. Recycle those broken lights! -
- - Doohl updated:
-
-
-
- The firing range now has a purpose. Go check it out; there's a few surprises! -
- - Doohl updated:
-
-
-
- Toggling admin midis will now DISABLE THE CURRENT MIDI OH MY GOSH! -
- - Tobba updated:
-
-
-
- We're looking for feedback on the updated chem dispenser! It no longer dispenses beakers of the reagent, and instead places a variable amount of the reagent into the beaker of your choosing. -
- - Petethegoat updated:
-
-
-
- Diagonal movement is gone on account of them proving to be a bad idea in practice. A grand experiment nonetheless. -
- - Kor updated:
-
-
-
- The PALADIN lawset in the AI upload has been replaced with the corporate lawset -
- - Tobba updated:
-
-
-
- Report any issues with the updated vending machines! -
- - Petethegoat updated:
-
-
-
- Security, Engineer, Medical, and Janitor borgs no longer get a choice of skin. This is for purposes of quick recognition, and is the first part of a series of upcoming cyborg updates. -
- - Kor updated:
-
-
-
- Repair bots (mechs) are now adminspawn only -
- Extra loyalty implants are now orderable via cargo bay (60 points for 4 implants) -
- Changeling regen stasis now takes two full minutes to use, but can be used while dead. Burning and gibbing are the only way to keep them dead now. -
- - ConstantA updated:
-
-
-
- Added step and turn sounds for mechs -
- Added another mecha equipment - plasma converter. Works similar to portable generator. Uses solid plasma as fuel. Can be refueled either by clicking on it with plasma in hand, or directly from mecha - selecting it and clicking on plasma. -
- Added mecha laser cannon. -
- Added damage absorption for mechs. Different mechs have different absorption for different types of damage. -
- Metal foam now blocks air movement. -
- - Petethegoat updated:
-
-
-
- Fixed sticking C4 to containers. -
- Rearranged the armoury, and changed the medical treatment room in Sec to an interrogation room. -
- Mr Fixit has been powered off and returned to the armoury. Deploying him every round is still recommended! -
- - Petethegoat updated:
-
-
-
- Stunglove overhaul: part one. Stun gloves are now made by wiring a pair of gloves, and then attaching a battery- this shows up on the object sprite, but not on your character. Stungloves use 2500 charge per stun! This means that some low capacity batteries will make useless stungloves. To get your old inconspicous gloves back, simply cut away the wire and battery. Note that insulated gloves lose their insulation when you wire them up! Yet to come: stungloves taking extra damage from shocked doors. -
- Removed sleepypens! Paralysis pens have been changed to look like normal pens instead of penlights, and have been slightly nerfed. They will paralyse for about fifteen seconds, and cause minor brain damage and dizziness. -
- Uplink Implants now have five telecrystals instead of four. -
- - Doohl updated:
-
-
-
- More hairs added and a very long beard. -
- Finally fixed the request console announcements going AMP AMP AMP all the time when you use punctuation. -
- - Mport updated:
-
-
-
- New WIP TK system added. To activate your TK click the throw button with an empty hand. This will bring up a tkgrab item. Click on a non-anchored (currently) non mob Object to select it as your "focus". Once a focus is selected so long as you are in range of the focus you can now click somewhere to throw the focus at the target. To quit using TK just drop the tkgrab item. -
- - Errorage updated:
-
-
-
- Old keyboard hotkey layout option available again! home, end, page down and page up now once again do what they did before by default. To use diagonal movement you will need to use your numpad with NUM LOCK enabled.
- The new list of hotkeys is as follows: (Valid as of 21.10.2011) --
-
- Numpad with Num Lock enabled = movement in wanted direction. -
- Numpad with Num Lock disabled = as it was before. movement north-south-east-west and throw, drop, swap hands, use item on itself. -
- Page up (also numpad 9 with num lock disabled) = swap hands -
- Page down (also numpad 3 with num lock disabled) = use item in hand on itself -
- home (also numpad 7 with num lock disabled) = drop -
- end (also numpad 1 with num lock disabled) = throw -
- CTRL + A = throw -
- CTRL + S = swap hands -
- CTRL + D = drop -
- CTRL + W = use item in hand on itself -
- Numpad divide (/) = throw -
- Numpad multiply (*) = swap hands -
- Numpad subtract (-) = drop -
- Numpad add (+) = use item in hand on itself -
-
- - Old keyboard hotkey layout option available again! home, end, page down and page up now once again do what they did before by default. To use diagonal movement you will need to use your numpad with NUM LOCK enabled.
- Errorage updated:
-
-
-
- You can now move diagonally! To do so, use the numpad. The keybaord has been remapped to make this possible:
-
-
-
- CTRL + A = throw -
- CTRL + S = swap hands -
- CTRL + D = drop -
- CTRL + W = use item in hand on itself -
- Numpad divide (/) = throw -
- Numpad multiply (*) = swap hands -
- Numpad subtract (-) = drop -
- Numpad add (+) = use item in hand on itself -
-
- - You can now move diagonally! To do so, use the numpad. The keybaord has been remapped to make this possible:
-
- Agouri updated:
-
-
-
- There has been a tidal wave of bugfixes over the last 5 or so days. If you had previously tried something on the station, saw that it was bugged and never tried it again, chances are it got fixed. I don't want you to neglect using stuff because you think it was bugged, which it was at one point, but no longer is. Thanks, happy new semester to everyone~ -
- - Errorage updated:
-
-
-
- When you're unconscious, paralyzed, sleeping, etc. you will still see the same blackness as always, but it will rarely flicker a bit to allow you to see a little of your surroundings. -
- - Doohl updated:
-
-
-
- New hairstyles! YOU never asked for this! -
- - ConstantA updated:
-
-
-
- Added radios to exosuits. Setting can be found in 'Electronics' menu. -
- Exosuit maintenance can be initiated even if it's occupied. The pilot must permit maintenance through 'Permissions & Logging' - 'Permit maintenance protocols'. For combat exosuits it's disabled by default. While in maintenance mode, exosuit can't move or use equipment. -
- - Doohl updated:
-
-
-
- You can put things on trays and mass-transport them now. To put stuff on trays, simply pick up a tray with items underneath/on top of it and they'll be automatically carried on top of the tray. Be careful not to make a mess~! -
- - Mport updated:
-
-
-
- Telekenesis now only allows you to pick up objects. -
- Stun gloves ignore intent. -
- Moved the loyalty implants to the HoS' locker. -
- Job system redone, remember to setup your prefs. -
- - Petethegoat updated:
-
-
-
- Pandemic recharge speed is affected by the number of different types of antibodies in the blood sample. For maximum efficiency, use blood samples with only a single type of antibody. (Blood samples with two types of antibodies will still let the Pandemic recharge slightly faster than it used to.) -
- - Errorage updated:
-
-
-
- Opening a storage item on your belt will now display the proper number of slots even if the number is different from 7. -
- Less ponies, gryphons, and Tohou. -
- - Knognob Lungsparkle updated:
-
-
-
- Xenomorphic aliens can now shape resin membranes (organic windows basically). -
- The AI can no longer see runes. Instead, they will see blood splatters. -
- - Rolan7 updated:
-
-
-
- New method for job assignment. Remember to review your preferences. Send all your hate and bug reports to me. -
- - Doohl updated:
-
-
-
- Putting someone inside a cloning machine's DNA scanner will notify the person that they are about to be cloned. This completely removes the necessity to announce over OOC for someone to get back in their body. -
- - Errorage updated:
-
-
-
- Added an additional 9 colors, into which you can color bedsheets, jumpsuits, gloves and shoes at the washing machine. -
- A new click proc will need to be live-tested. The testing will be announced via OOC and you will get a message when it happens. When testing is going on, the new click proc will be used. If testing is going on and you notice a bug, please report it via adminhelp. If you find yourself unable to perform an action, you can double click (By that I mean spam the shit out of clicking) to use the old proc, which is unchanged and will behave like you're used to. Standard roleplay rules apply during tests, they're not an excuse to murder eachother. -
- - Errorage updated:
-
-
-
- You can no longer clone people who suicided. I REPEAT! You can no longer clone people who have suicided! So use suiciding more carefully and only if you ACTUALLY want to get out of a round. You can normally clone people who succumbed tho, so don't worry about that. -
- Washing your hands in the sink will now only wash your hands and gloves. You can wash items if you have them in your hands. Both of these actions are no longer instant tho. -
- - Errorage updated:
-
-
-
- Added the most fun activity in your every-day life. Laundry. Check the dormitory. (Sprites by Hempuli) -
- You can now change the color of jumpsuits, shoes, gloves and bedsheets using the washing machine. -
- Some religions (currently Islam, Scientology and Atheism) set your chapel's symbols to the symbols of that religion. -
- A new old-style cabinet's been added to the detective's office. (Sprite by Hempuli) -
- Runtime the cat ran away!! And it gets even worse! Mr. Deempisi met a premature end during an excursion to the kitchen's freezer! -- I was ORDERED to do this... don't kill me! :( -
- Kudzu can now be spawned (Currently admin-only. Will test a bit, balance it properly and add it as a random event) (Original code and sprites donated by I Said No) -
- - Kor updated:
-
-
-
- Added purple goggles to chemistry (you're welcome Lasty) -
- Added a third MMI to robotics and monkey cubes to xenobio (dont fucking spam them in the halls) -
- - Mport updated:
-
-
-
- Turns out tasers and a few other weapons were slightly bugged when it came to checking the internal powercell. Tasers and such gained an extra shot. -
- Ion Rifle shots lowered to 5 per charge. -
- - Errorage updated:
-
-
-
- You can now insert a coin into vending machines. Some machines (currently only the cigarette vending machine) have special items that you can only get to with a coin. No, hacking will not let you get the items, coin only. -
- - Lasty updated:
-
-
-
- Runtime now actually spawns in medbay because nobody cared whether it is a tiny smugfaced espeon that explodes violently on death or a spacecat that presumably doesn't. -
- You can no longer put someone into a sleeper and erase them from existence by climbing into the same sleeper. -
- Players who haven't entered the game will no longer be able to hear administrators in deadchat. -
- - Pete updated:
-
-
-
- Added new sprites for the light tube and glasses boxes. -
- Fixed the bug where syndicate bundles would have an emergency O2 tank and breath mask. -
- - Mport, SECOND REMOVER OF SUNS updated:
-
-
-
- Singularity absorbtion explosion range lowered and is now dependent on singularity size. -
- Bag of Holding no longer instakills singularity, and the chance for bombs to destroy a singularity has been changed from 10% to 25%. -
- Removed THE SUN. -
- Damage and stun duration from shocked doors has been lowered to account for a larger amount of energy in the powernet. -
- - Errorage updated:
-
-
-
- Healing, attacking or 'gently tapping' Ian will now properly display the name of the attacker to all people. -
- - Vinyl Scratch updated:
-
-
-
- Runtime! -
- Mine ambience now fades out at the end so that not only is it less jarring when it ends, but it also loops properly. -
- Malfunctioning AI's runtime message now has a voice clip to go with it (courtesy of Rosen Ritter) -
- Every headset will now display the commands for their respective channels upon examine. -
- - Miss Phaeron updated:
-
-
-
- E-Swords now have a chance to deflect projectiles when active -
- Taser/Laser shots now drain 40 battery per use from a borg, as opposed to 20 -
- EMPs do 60 damage to borgs now, up from 25. They also stun them momentarily and drain 1k charge -
- As part of a joint effort between Mport, Falazameer, and myself an Ion Rifle has been added to the armoury -
- The Mutate spell now gives Laser Vision and Hulk -
-
- - Errorage updated:
-
-
-
- Ian can now be toolboxed. -
- Ian can now be healed with bruisepacks, unless he's already dead. -
- You can now walk over Ian when he's killed. -
- Ian will chase food, if you leave it on the floor. If he notices it and you pick it up, he'll chase you around, if you stay close enough. -
- - Errorage updated:
-
-
-
- A new pet on the bridge. -
- The pet can now be buckled and will no longer escape from closed containers, such as closets or the cloning pods. -
- Vending machines and request consoles are the first to use the new in-built browser in the upper-right of the user interface. If feedback is positive on these, more machines will be added to this. Hoping that this will eventually reduce the number of popup micromanagement. -
- - Lasty updated:
-
-
-
- The collectible hats have been removed from the theatre, doomed to rot forever in the hat crates they spawned from. No longer shall you see racks full of "collectible hard hat"! -
- - TLE updated:
-
-
-
- You can now toggle the message for becoming a pAI on and off in your prefs. -
- - Mport updated:
-
-
-
- Synaptizine now once again helps you recover from being stunned, however it is now also slightly toxic and may cause a small amount of toxins damage for every tick that it is in your system. -
- Assembly updating! -
- Original blob is back, though it still has lava sprites. -
- The bug where you would spawn on the wizard shuttle for a second at the start of the round should no longer occur. -
- - Lasty updated:
-
-
-
- Suicide has been changed to biting your tongue off instead of holding your breath, and examining someone who has comitted suicide will give you a message stating that their tongue is missing. -
- Chemsprayers are now large items instead of small, meaning they can no longer fit in your pocket. -
- - Greek Rioter updated:
-
-
-
- Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again. EDIT: FIXED DRINK MIXING -
- More info here: rev2136 -
- - Lasty updated:
-
-
-
- Fixed the karma exploit! Uhangi can rest in peace knowing his -87 karma ways were not his own. -
- Added new ambient sound for space and the mines. -
- Examining an oxygen tank will now tell you if it is about to run out of air. If it is, you will recieve a beep and a message, and if not, then you'll just get the default "this is an oxygentank!" message. -
- - Rageroro updated:
-
-
-
- Sleeper update! Sleepers can now only inject soporific, dermaline, bicaridine, and dexaline into people with 1% or more health. They can also inject inaprovaline into people with -100% or more health. Nothing can be injected into people who are dead. -
- - Superxpdude updated:
-
-
-
- Virology is now part of medbay, and as such the RD no longer has Virology access and the CMO and Virologist no longer have Research access. -
- - Uhangi updated:
-
-
-
- Electropacks, screwdrivers, headsets, radio signalers, and station bounced radios can now be constructed from the autolathe. -
- Added a courtroom to Centcom. -
- Fixed electropack bug regarding using screwdrivers on electropacks. -
- - Microwave updated:
-
-
-
- Nuka Cola re-added. -
- - Urist McDorf updated:
-
-
-
- Added XCom aliens, by Xerif (Donated by the Foundation project ) -
- - Cheridan updated:
-
-
-
- New sprites for beds and air, plasma and nitrogen tanks (The ones found in maintenance shafts). -
- - Rageroro updated:
-
-
-
- Updates made to the HoP's ID computer. New interface and removing a card will now put it directly in your hand, if it's empty. Using your card on the computer will place it in the appropriate spot. If it has access to edit cards it will put it as the authentication card, otherwise as the card to be modified. If you have two cards with ID computer access first insert the authentication card, then the one you wish to midify, or do it manually like before. -
- Placed extra fire suits in maintenance (Near eva and mining) and an extra fire closet to atmos. -
- - Urist McDorf updated:
-
-
-
- People who have been infected by facehuggers can no longer suicide. -
- Stammering has been reworked. -
- The chaplain can now no longer discern what ghosts are saying, instead receiving flavour text indicating that ghosts are speaking to him. -
- Walking Mushroom yield decreased from 4 to 1. -
- Glowshrooms now only spread on asteroid tiles. -
- Fixed rev round end message reporting everyone as dead. -
- Gave the changeling an unfat sting. -
- Erro updated:
-
-
-
- R'n'D and Gas Storage locations have been swapped in order for R&D to be given a hallway-facing table, just like Chemistry. -
- Buckling someone to a chair now causes them to face in the same direction as the chair. -
- Conveyor will now move only 10 items per game cycle. This is to prevent miners from overloading the belts with 2000 pieces of ore and slowing down time by turning it on. Does not apply to mobs on belt. -
- Doohl updated:
-
-
-
- New escape shuttle! -
- Metroids get hungry slower, but gain more nutrients from eating. -
- Kor updated:
-
-
-
- Added Necronomicon bible (credit Joseph Curwen) -
- Removed Doc Scratch clothing from chaplain? locker and added as a random spawn in the theatre. -
- Shaft Miners now start with regular oxygen tanks. -
- Mutate now gives the wizard hulk and OPTIC BLAST instead of hulk and TK. -
- Spiderman suit is no longer armoured or space worthy. -
- Crayons -
- Superxpdude updated:
-
-
-
- New, more appropriate arrivals message. -
- Shuttle escape doors fixed. -
- New RIG sprite. -
- Lasty updated:
-
-
-
- Switched xenomorph weeds to run in the background, hopefully causing them to destroy the server slightly less. -
- Microwave updated:
-
-
-
- Added sink to hydroponics -
- Cleaned up autolathe menu -
- Glasses and cups can now be filled with water from sinks. -
- Lasty updated:
-
-
-
- The costumes that spawn in the theatre are now randomized. -
- The kitchen now has a Smartfridge which can be directly loaded from the Botanist? plantbags. No more crates! (credit to Rolan7). -
- Snappops can now be acquired from the arcade machines. Amaze your friends! (credit to Petethegoat) -
- Bangindonk.ogg added to random end sounds list. -
- Urist McDorf updated:
-
-
-
- Players can no longer be randomly assigned to Librarian, Atmospherics Technician, Chaplain, and Lawyer unless all other non-assisstant job slots are full or they have those jobs in their preferences. -
- Changeling mode now has multiple changelings. -
- Superpxdude updated:
-
-
-
- The mail system actually works properly now! Probably! -
- Most hats had their ?eadspace?tag removed, meaning they will no longer substitute for a space helmet in protecting you from the dangers of space. -
- Doohl updated:
-
-
-
- Chaplains can now select different bible icons when they start. The selection is applied globally and the library's bible printer will print the same bibles. -
- Joy to the world! The Library's bible-printing function now has a one-minute cooldown. One minute may seem a little extreme, but it is necessary to prevent people from spamming the fuck out of everything with 100,000,000,000,000 carbon-copy bibles. -
- Tweaked Metroids a bit; they are slightly more aggressive and become hungrier faster. To compensate, they now move slightly slower. -
- Mport updated:
-
-
-
- Rev: -
- Station Heads or Head Revs who leave z1 will count as dead so long as they are off of the z level. -
- Once a player has been unconverted they may not be reconverted. -
- Cult: -
- Heads other than the Captain and HoS are now able to start as or be converted to a cultist. -
- New Item: Loyalty Implant, which will prevent revving/culting. 4 spawn in the armory. -
- If a rev (not cultist) is injected with one he will unconvert, if a revhead is injected it will display a resist message. -
- Loyalty Implants show up on the SecHud -
- New Machine: Loyalty Implanter - Is on the prison station, shove a guy inside it to implant a loyalty implant. It can implant 5 times before it needs a 10 minute cooldown. -
-
-
-
-
- Doohl updated:
-
-
-
- The smoke chemistry recipe has been upgraded! You can lace smoke with chemicals that can bathe people or enter their lungs through inhalation. Yes, this means you can make chloral hydrate smoke bombs. No, this doesn't mean you can make napalm smoke or foam smoke. -
- Superxpdude updated:
-
-
-
- Traitor item bundles: Contains a random selection of traitor gear -
- Uhangi updated:
-
-
-
- .38 Special Ammo can now be made from unhacked autolathes -
- Superxpdude updated:
-
-
-
- NEW MINING STATION, POST YOUR OPINIONS AND BUGS HERE -
- Added some new awesome mining-related sprites by Petethegoat. All credit for the sprites goes to him. -
- Mport updated:
-
-
-
- Cyborgs once again have open cover/cell icons. -
- To override a cyborg's laws you must emag it when the cover is open. -
- Emags can unlock a cyborgs cover. -
- Xbow radiation damage has been lowered from 100 to 20 a hit -
- Mport updated:
-
-
-
- The various assemblies should be working now. -
- Old style bombs and suicide vests temporarily removed. -
- Superxpdude updated:
-
-
-
- Virology Airlock changed to no longer cycle air. Should work faster and prevent virologists from suffocating. -
- Server Room APC is now connected to the power grid. -
- Stun Batons now start OFF. Make sure to turn them on before hitting people with them. -
- Agouri updated:
-
-
-
- SSUs now correctly cycle and dump the unlucky occupant when designated to supercycle, when the criteria to do so are met. -
- Fixed bugshit -
- You can now make normal martinis again, removed a silly recipe conflict (Thanks, muskets.). Good barmen are urged to blend the good ol' recipes since the new ones have sprites that SUCK ASS JESUS CHRIST -
- Doohl updated:
-
-
-
- Speech bubbles: you can toggle them on in the character setup window. Basically, whenever someone around you talks, you see a speech bubble appear above them. -
- You can no longer create wizarditis and xenomicrobes with metroid cores. -
- Tweak: Using an exclamation mark as an AI, pAI, or cyborg will not longer get rid of the last exclamation mark. -
- Superxpdude Updated:
-
-
-
- Engineer and CE space helmets now have built-in lights. -
- Rockdtben updated:
-
-
-
- Bugfix: Fixed a bug where you could dupe diamonds -
- Doohl updated:
-
-
-
- New virus: Retrovirus. It basically screws over your DNA. -
- You can now do CTRL+MOVEMENT to face any direction you want. See those chairs in Medbay and the Escape Wing? You can do CTRL+EAST to actually RP that you're sitting on them. Is this cool or what?! -
- Doohl updated:
-
-
-
- Bugfix: Metroids should never "shut down" and just die in a corner when they begin starving. And so, hungry Metroids are a force to be feared. -
- The Cargo computers now have the ability to cancel pending orders to refund credits. This was put in place so that idiots couldn't waste all the cargo points and run off. However, if the shuttle is en route to the station you won't be able to cancel orders. -
- Bugfix: the manifest has been fixed! Additionally, the manfiest is now updated realtime; job changes and new arrivals will be automatically updated into the manifest. Joy! -
- Metroids, when wrestled off of someone's head or beaten off, now get stunned for a few seconds. -
- Agouri updated:
-
-
-
- I was always bothered by how unprofessional it was of Nanotransen (in before >Nanotransen >professionalism) to just lay expensive spacesuits in racks and just let them be. Well, no more. Introducing... -
- Suit Storage Units. Rumored to actually be repurposed space radiators, these wondrous machines will store any kind of spacesuit in a clean and sterile environment. -
- The user can interact with the unit in various ways. You can start a UV cauterisation cycle to disinfect its contents, effectively sterilising and cleaning eveyrthing from the suits/helmets stored inside. -
- A sneaky yordle can also hide in it, if he so desires, or hack it, or lock it or do a plethora of shady stuff with it. Beware, though, there's plenty of dangerous things you can do with it, both to you and your target. -
- The Unit's control panel can be accessed by screwdriving it. That's all I'm willing to say, I'd like to let the players find out what each hack option does and doesn't. Will add more stuff later. -
- Added Command Space suit, Chief Engineer space suit and Chief Medical Officer spacesuit (In a new space that you'll probably notice by yourself) to make it easier for you to look like a special snowflake. -
- EVA and CMO office modified to accomodate the new suits and SSUs. Look, I'm not a competent mapper, okay? Fuck you too. A mapper is strongly recommended to rearrange my half assed shit. -
- Soda cans, cigarette packets, cigarettes and cigars as well as bullet casings are now considered trash and can be picked up by the trashbag. Now you can annoy the janitor even more! -
- Sprite credit goes to Alex Jones, his portfolio can be found here: http://bspbox.com. Thanks a lot, bro. -
- With the recent forum fuss and all that, I've got a thread to specifically contain rants and bug reports about this update. Click me -
- Uhangi updated:
-
-
-
- EVA redesigned -
- An electropack is now available once again on the prison station -
- Errorage updated:
-
-
-
- Hopefully fixed the derelict 'hotspots'. Derelict medbay has also been fixed. -
- Trubble Bass updated (committed by Superxpdude):
-
-
-
- Hat crates. Hat Station 13. -
- Matty:
-
-
-
- Engineers and miners now start off with the new industrial backpack. -
- Agouri:
-
-
-
- Sleepers are now OP and heal every kind of damage. -
- Made cloning 30% faster, due to popular demand. -
- Superxpdude updated:
-
-
-
- Added in the Submachine Gun to R&D. -
- Syndicate agents now have Mini-Uzis. -
- Added an exosuit recharged to the mining station. -
- New labcoats for scientists, virologists, chemists, and genetecists. -
- Moved the vault and added a bridge meeting room next to the HoP's office. -
- Deathsquad armor now functions like a space suit. -
- Added in security jackboots. -
- Uhangi updated:
-
-
-
- Traitors can now purchase syndicate balloons, which serve no purpose other than to blow your cover. For a limited time only, you can get them at a bargain price - just 10 telecrystals! -
- Removed security shotguns from the armory. No fun allowed. -
- Changed some bullet damage stuff. -
- Microwave updated:
-
-
-
- Monkey boxes: -
- Contains a score of monkey cubes, which you apply water to create monkies. Nanotrasen provides only the finest technology! -
- You can order monkey crates from the cargo bay. They contain monkey boxes. -
- Changed the amount of labels labelers have to 30. 10 was too low and 30 should not be too griefy. -
- Maximum label text length increased from 10 to 64. -
- You can no longer label people because they can just peel the labels off. Sorry, clowns! -
- Jelly dooonnuuuutsss! Happy birthday, officers! -
- Made xenomeat not give any nutrition. -
- Added some new reagents. -
- Made it possible to feed monkies and xenos things, as well as making it possible for them to eat themselves (please don't read that too literally). -
- Added in synthiflesh. -
- Plasma is now not used in reactions, instead, is treated as a catalyst that is not used up. This only applies to certain reactions. -
- Made it possible to grind more things in the chemistry grinder. -
- Errorage updated:
-
-
-
- Increased environmental damage by a factor of 1.5. -
- Made firesuits a lot more resistant to heat. Previously, they stopped protecting at around 4,500 degrees. They now go up to around 10,000 (which is also the temperature which the floor starts melting) -
- Edited the quartermaster's office a bit. -
- Cargo technicians now have access to a cargo ordering console. -
- Added different-colored hardhats. The CE gets a white hardhat. - -
- Rastaf.Zero updated:
-
-
-
- Botanists get a new toy: Biogenerator. Insert biological items, recieve biological items. -
- Added roller beds, otherwise known as stretchers, to medbay. You can buckle people onto them and pull them. -
- Added egg-smashing and tomato-smashing decals. -
- Muskets updated:
-
-
-
- The prepackaged songs (Space Asshole, Cuban Pete, Darkest Honk, etc) have been removed. This doesn't mean admins can't play midis, this just gets rid of a lot of unnecessary download time. -
- Firecage updated:
-
-
-
- A whole bunch of new drinks and food. Seriously, there's alot! -
- New weapons such as the shock revolver and large energy crossbow. -
- Hydroponics can now grow a bunch more stuff. A lot of these new crops have some very interesting mutations. -
- Added a command for AIs to change their icon. -
- New costumes to the costume room. -
- Urist McDorf updated:
-
-
-
- Adding shading to pills. -
- Detective's office noir look has been removed. The icon operations required to render everything in monochrome was too heavy on the players. -
- Added in an uplink implant. -
- Doohl updated:
-
-
-
- A new alien race: Metroids! They are a mostly non-sentient race of jellyfish-like organisms that float in the air and feed on the life energy of other organisms. While most Metroids have never shown signs of self-awareness, they do exhibit signs of basic logic and reasoning skills as well as very sophisticated perception. Nanotrasen has shipped two baby Metroids for the xenobiology department. They should be handled with the utmost care - they are some of the deadliest beings in the known universe! -
- R&D gets a new toy: the freeze gun. Despite popular belief, this will not literally freeze things! -
- Every single chemical reagent has been assigned a color. -
- You can now see beakers fill up with chemicals. You can also observe how the colors mix inside the beakers. Spray bottles also will also show the color of whatever you're spraying. -
- Added a timestamp to combat logs. -
- Non-insulated gloves now need to be wrapped in wire in order to be electrified. -
- You can now shoot at people on the ground by simply clicking on the tile they're on. -
- Changeling husks are now uncloneable. To clarify: when a changeling sucks out a victim's DNA, the victim is said to become a "husk". -
- Agouri updated:
-
-
- Medical stuff overhaul in preparation of Erro's big Medic update:
-
- Sleepers are now able to heal every kind of damage. Drag your ass to medbay and ask a doctor to get you in one. -
- A lil' bit faster cloning (about 30% faster) due to popular demand. -
- Sleepers are now all located in the inner part of medbay, except for the examination room one. -
- Added Dermaline, burn-healing drug that outpowers kelotane (and kelotane is getting a major nerf, so be sure to know how to get this). Recipe is on the wiki if you need to make it. -
- Drugs no longer heal or metabolise when injected in dead bodies, fuck. Thank god you guys missed this major bug or we'd have cloning-by-injecting-healing-drugs. -
- Reminder to coders: Goddamn, update the changelog. -
-
- - Matty updated:
-
-
-
- New engineering backpacks. Enjoy! -
- - Agouri updated:
-
-
-
- Bugfixes: The reagent grinding now works, allowing the miners to FINALLY bring plasma to the chemistry. -
- Bugfixes: Pill bottles and clipboards can now be removed from the pockets once placed there. -
- - TLE updated:
-
-
-
- Wiped/suicided pAIs should be eligible for being candidates again (5 minute cooldown between prompts.) -
- pAIs are now affected by EMP bursts. pAIs hit with a burst will be silenced (no speech or PDA messaging) for two minutes and may have their directives or master modified. A sufficiently powerful EMP burst will have a 20% chance of killing a pAI. -
- - Neo updated:
-
-
-
- Nar-sie is now a more vengeful eldritch being. When summoned into our world, he first rewards his loyal cultists by chasing down and eating them first, then turns his attention to any remaining humans. -
- - Darem updated:
-
-
-
- Gun Code Overhaul Phase 1. -
- Taser guns shoot ONE WHOLE SHOT more then they do now. -
- Energy Crossbow has a slightly higher shot capacity (still automatically recharges). -
- Revolvers can either be loaded one shell at a time or all at once with an ammo box. -
- Shotguns no longer need to be pumped before firing (will change back in phase 2). -
- - K0000 updated:
-
-
-
- Arcane tome now has a "notes" option. Set English translations for runewords which come up when scribing runes. Attack an arcane tome with another arcane tome to copy your notes to the target tome. -
- Stun rune buffed considerably. Its a 1-use item so it deserved longer stun time. -
- Tome text: Added missing word description for stun rune. -
- - Noise updated:
-
-
-
- Changed holopad speaking to :h on request. -
- Ninja fixes, changes, etc. Refer to the code changelog for more info. -
- - Neo updated:
-
-
-
- Department radio chat now shows with the department name instead of the frequency. -
- - Veyveyr updated:
-
-
-
- Spent casing sprites + SMG sprite. -
- Sprites for 1x4 and 1x2 pod doors. -
- - Errorage updated:
-
-
-
- Fixed twohanded weapon throwing, which left the 'off-hand' object in your other hand. -
- Doors now hide items under them when closed, mobs are still always above. -
- Singularity engine emitter is now much quieter. -
- Mining station redesigned. -
- Atmospherics' misc gasses tank now starts with N2O. -
- Hitting the resist button while handcuffed and buckled to something will make you attempt to free yourself. The process is the same as trying to remove handcuffs. When the 2 minutes pass you will be unbuckled but still handcuffed. -
- - ConstantA updated:
-
-
-
- Added exosuit energy relay equipment. Uses area power (any power channel -available) instead of powercell for movement and actions, recharges powercell. -
- Exosuits can be renamed. Command is in Permissions & Logging menu. -
- Lowered construction time for Ripley parts. -
- Exosuit wreckage can be salvaged for exosuit parts (torso, limbs etc). -
- Speed-up for mecha. -
- New malf-AI sprite. (Sprite donated by the D2K5 server) -
- - Cheridan updated:
-
-
-
- Updated mine floor and wall edge sprites. -
- - Urist McDorf updated:
-
-
-
- AIs no longer bleed when they reach 0HP (Critical health). -
- Added 2 more security HUDs to security. -
- Security HUDs now show if a person has a tracking implant. -
- - Microwave updated:
-
-
-
- Barman renamed to Bartender. -
- The amount of drink you get when mixing things in the bar has been rebalanced. -
- Fixed arrivals maintenance shaft not having air at round start. -
- - Deuryn updated:
-
-
-
- Meteors now do a bit more damage and they're not stopped by grills. -
- - TLE updated:
-
-
-
- Added personal AIs (pAI). -
- - Errorage updated:
-
-
-
- Asteroid floors can be built on by adding tiles -
- Mining satchels now fit in rig suit storage, on belts and in pockets. -
- Cables now come in four colors: Red, yellow, green and blue. -
-
- - NEO updated:
-
-
-
- Armour overhaul, phase 3. See rev notes for details. -
- AI cores should now block movement. -
- MMIs are now properly buildable with the mecha fabricator. -
-
- - Urist updated:
-
-
-
- Added sandstone and mineral doors. Mineral boors cannot be opened by the AI or NPCs. -
- Removed Imperium robes from map. -
- Added the ability to draw letters and graffiti with crayons. -
- Removed fire axes except for bridge and atmospherics. -
-
- - Veyveyr updated:
-
-
-
- New serviceborg sprite option. -
- Map changes to robotics; removed borg fabricators and added second exosuit fabricator. -
- Cyborg parts are now built from exosuit fabricators and benefit from research. -
- New exosuit fabricator and borg frame sprites. -
- - K0000 updated:
-
-
-
- Cult updates: -
- New rune! Stun rune. When used as rune, briefly stuns everyone around (including cultists). When imbued into a talisman, hit someone to stun and briefly mute them. Spawnable with the starter talisman. -
- Imbue rune doesnt disappear after succesful invocation, only the source rune. -
- Chaplain's bible now has 20% chance to convert a cultist (was 10%), and gives a message on success. -
- Also, wrapping paper is back! Find it in the mailroom. -
-
- - NEO updated:
-
-
-
- Beginning of armor overhaul. Armor now has slightly better defence against melee, and weaker against shots. More coming soon...someday -
- Cyborgs finally drop their MMI when gibbed like they were supposed to back when I added MMIs. Round- start cyborgs use whatever name you have selected for your character for the brain that gets spawned for them. -
-
- - Darem updated:
-
-
-
- Chemistry update -
- In containers where there isn't a perfect ratio of reagents, reactions won't consume ALL of the related reagents (so if you mix 10 anti-toxin with 20 inaprovaline, you get 10 tricordrazine and 10 inaprovaline rather then just 10 tricodrazine) -
- Catalysts: some reactions might need presence of an element, while not directly consuming it. -
- Reactions changed to use catalysts: all recipes that require Universal Enzyme now require 5 units of the enzyme but the enzyme isn't consumed (So Tofu, Cheese, Moonshine, Wine, Vodka, and Kahlua recipes). -
- - Errorage updated:
-
-
-
- Smooth tables: Tables now automatically determine which direction and sprite they'll use. They will connect to any adjacent table unless there is a window between them (regular, reinforced, tinted, whichever) -
- - Agouri updated:
-
-
-
- Fireaxes now work. Derp. -
-
- - Erro updated:
-
-
-
- New sprites for thermited walls and girders. Rework of thermited walls. Thermited walls leave a remnant damaged wall, crowbar it to scrap it. -
- More colors for the lightfloors CANCELLED/POSTPONED -
-
- - Noise updated:
-
-
-
- Codephrases for traitors. More details here -
- New mech sprite -
- - DANGERCON UPDATE:Agouri and Erro updated(I'm in the DangerCon team now, nyoro~n :3):
-
-
-
- Backpacks removed from all players. It was unrealistic. You can now had to the living quarters to get one from the personal closets there. -
- Any firearms now send you to critical in 1-2 shots. Doctors need to get the wounded man to surgery to provide good treatment. Guide for bullet removal is up on the wiki. -
- Brute packs and kelotane removed altogether to encourage use of surgery for heavy injury. -
- Just kidding -
- Fireaxe cabinets and Extinguisher wall-mounted closets now added around the station, thank Nanotransen for that. -
- Because of Nanotransen being Nanotransen, the fire cabinets are electrically operated. AIs can lock them and you can hack them if you want the precious axe inside and it's locked. The axe itself uses an experimental two-handed system, so while it's FUCKING ROBUST you need to wield it to fully unlock its capabilities. Pick up axe and click it in your hand to wield it, click it again or drop to unwield and carry it.You can also use it as a crowbar for cranking doors and firedoors open when wielded, utilising the lever on the back of the blade. And I didn't lie to you. It's fucking robust. -
- Fireaxe, when wielded, fully takes up your other hand as well. You can't switch hands and the fireaxe itself is unwieldy and won't fit anywhere. -
- A fireaxe cabinet can also be smashed if you've got a strong enough object in your hand.
- -
- EXTINGUISHER CLOSETS, made by dear Erro, can be found in abundance around the station. Click once to open them, again to retrieve the extinguisher, attack with extinguisher to place it back. Limited uses, but we've got plans for our little friend. -
- Sprite kudos go to: Cheridan for most of them, Khodoque for the fantastic fireaxe head. I merged those two. Also thanks to matty and Arcalane for giving it a shot. -
- Has the piano got TOO annoying? Try the fire axe... -
- Oh, and tou can now construct Light floors! To do it: Use wires on glass, then metal on the produced assembly, then place it on an uncovered floor like you would when replacing broken floor tiles. To deconstruct: Crowbar on light floor, use crowbar on produced assembly to remove metal, wirecutters to seperate the wires from the glass. Sprites by delicious Hempuli. -
- Got something to bitch about? Got a bug to report? Want to create drama? Did the clown destroy your piano while you were playing an amazing space remix of the moonlight sonata? Give it here - -
-
- - Rastaf.Zero updated:
-
-
-
- New uniforms added for captain and chaplain, in their respective lockers. Credits to Farart. -
-
- - Urist McDorf updated:
-
-
-
- Mime and Clown now spawn with Crayons. You can eat those crayons. And use them for other nefarious purposes. -
- Health Scanners (A new type of Goggles) now spawn in medbay. Use them, doctors! -
- New Arcade toy. -
- Glowshrooms! What other lifeform will threaten the welfare of the station now?! -
- Bananas growable in hydroponics. Also soap is now on-board. -
- Added new "Lights out!" random event. -
- - ConstantA updated:
-
-
-
- Mech pilots are now immune to zapping, thank you very much. -
- - Microwave updated:
-
-
-
- Rabbit ears have a small tail, night vision goggle sprites updated. -
- Space tea has a nice, calming effect. -
- Space drugs? Liberty cap... something like that. Microwave, make your changelog entries more understandable! -
- Brobot merged with Service Borg with a Rapid Service Fabricator. -
- Arcade machine prizes look and sound realistic once again. -
- New arcade toy: Syndicate space suit costume, can hold arcade toys in suit storage. -
- Empty cap gun loaders can be recycled in an autolathe. -
- Seizure man has laying down sprites now. Update to wizard den. -
- Mech bay has two more borg chargers. -
- Beepsky is back! -
- Detective's office grille has been electrified. -
- You can now see if someone is wearing an emergency oxygen tank on their belt on the mob itself. -
- Lexorin - Now deals 3 oxygen damage per tick. Countered with Dexalin or Dexalin Pkus, which remove 2 units of it from your body per tick. -
- Bilk - Shares the effects of beer and milk. Disgusting! -
- Sugar - Gives nutrition! -
- Arithrazine - Now extremely good against radiation damage. -
- Hyronalin - Stronger radiation removal -
- Space cleaner spray bottles now contain enough cleaner for 50 uses. Making space cleaner now yields more cleaner. -
- - Errorage updated:
-
-
-
- Shuttle diagonal sprites now work for any kind of floor. -
- You can now make plaques from gold. Place them on a wall and engrave an epitaph. -
- Placed a single wall tile in the AI satellite so you don't have a clear LOS of the AI from the door. -
- Added arrivals lobby. (Map by Superxpdude, updated by Microwave) -
- Lattice now connects to the solar shields. -
- Law office maintenance is now connected with Tech storage maintenance. (Some rewiring dont in the area) -
- Xenobiology now has it's own access level. (Also fixed xeno pen access and blast doors) -
- You might soon start to see different airlocks and airlock assemblies around the station. (Sprites donated by Baystation 12) -
- Chemical storage added, discussion on which chemicals it should store is on the forums. You're welcome to contribute. -
- Hot fires will now melt floors. -
- Added a pair of market stalls south of the teleporter. LET THERE BE CLOWNMART! -
- Screwdrivers and wirecutters can now spawn in different colors. -
- Electrical toolboxes have a 5% chance of spawning a pair of insulated gloves. A set spawns in tech storage. -
- Oxygen canisters now spawn in emergency storage, near disposal, in the incinerator and the CE's office. -
- A plasma canister now spawns in toxins, near the maintenance door. -
- Wooden tables now look nicer. -
- - Agouri updated:
-
-
-
- 2001 space suits added to AI Satellite! -
- New look for the 2001 space suit. -
- 2001 space suit jetpack added. -
- Improved TRAYS! -
- - Noise updated:
-
-
-
- Thermals and mesons no longer give slightly better night vision. -
- NINJAS! (Too many things to list) -
- Wizards are no longer trackable by the AI when in their den. -
- Removed all old notes, except for the last one. -
- Nuke team now cannot return with their shuttle until the bomb is armed and counting down. -
- Energy blades can no longer cut through r-walls, walls take 7 seconds to cut through. -
- Turrets are now destructible. Bash them with stuff when they pop out or (more likely) die trying. -
- Updated Ripley Mech sprite. -
- - Neo updated:
-
-
-
- You can now aim guns at body parts, armor and helmets properly protect you from projectiles. -
- Cat ears now match the hair color of the wearer. -
- Robots can no longer stick their items onto/into things. -
- Meson, thermal and x-ray vision are now modules for borgs. -
- Welding now uses less fuel when on and idle but more when welding. -
- Hopefully fixed the bug when running into airlocks didn't open them and running into objects didn't push them. -
- - HAL updated:
-
-
-
- Added air alarm to security checkpoint, added cameras to aux. arrival docks so the AI can see everything. -
- Added fire alarm, fire locks and air alarm to delivery office. -
- - ConstantA updated:
-
-
-
- Added mecha DNA-locking. Only the person with matching UE can operate such mechs. -
- Added two mecha armor booster modules and a repair droid module. -
- Mech fabricator is now buildable. -
- Gygax construction is now reversible. -
- - Rastaf0 and Farart updated:
-
-
-
- Ghosts should now always properly hear people. -
- Monkeyized people (genetics or jungle fever disease) no longer lose their genetic mutations and diseases. -
- People who get bitten by monkeys get jungle fever. -
- Most chemicals should now heal and harm humans properly. -
- Many new (and updated) recipes for the microwave including Pizza, Meatball Soup, Hot Chili and many more. -
- Items should no longer spawn under vendomats and microwaves. -
- Runes are now drawn under doors and tables. -
- Penlights fit in medical belts. -
- People will scream if they get cremated while still alive. -
- Diseases should now properly make you loose health. -
- Monkeys wearing masks now get acid protection too. -
- You should probably turn off your stun baton before washing it. -
- latex loves + short piece of wire + some air from tank = balloon! -
- Kitchen was expanded, also a new look for the kitchen sink. -
- New dishware vending machine - dispenses knives, forks, trays and drinking glasses. -
- Water cooler was added to kitchen. -
- New uniform - Waiter Outfit. Chef can give it to his assistant. -
- - Deeaych updated:
-
-
-
- Updated satchel, bananimum, shovel, jackhammer and pick-in-hand sprites. -
- Many unneeded r-walls removed, detective's office reinforced. -
- Captain armor now acts as a space suit, added a unique captain's space helmet to captain's quarters. -
- Golems cannot speak, but should be perfectly spawnable. Also added golem fat sprite. -
- Security borgs have side sprites. -
- - Matty406 updated:
-
-
-
- AIs can now feel a little more dorfy. -
- Many ores, both raw and smelted, look much better. -
- - Urist_McDorf updated:
-
-
-
- You can now light other people's cigarettes by targeting their mouth with a lighter. -
- - Veyveyr updated:
-
-
-
- New tool sprites. -
- New sprites for smooth-lattice. -
- - Muskets updated:
-
-
-
- Kabobs now return the bar used to make them. -
- - Microwave updated:
-
-
-
- New look for the mining cyborg, jackhammer, kitchen sink. -
- Singularity is now enclosed again (still airless tho). -
- Wizard has a new starting area. -
- Chemists and CMOs now have their own jumpsuits. -
- - ConstantA updated:
-
-
-
- You can now put Mind-machine-interface (MMI)'d brains into mecha. -
- - Errorage updated:
-
-
-
- Added smooth lattice. -
- - Rastaf0 updated:
-
-
-
- Food sprites from Farart -
- New food: popcorn (corn in microwave), tofuburger (tofu+flour in microwave), carpburger (carp meat+floor in microwave) -
- Medical belts are finally in medbay (credits belong to errorage, I only added it) -
- Pill bottles now can fit in containers (boxes, medbelts, etc) and in pockets. -
- Cutting camera now leaves fingerprints. -
- - Microwave updated:
-
-
-
- Armor Can hold revolvers, and so can the detective's coat. -
- Chef's apron is going live, it can carry a knife, and has a slight heat -resistance (only slight don't run into a fire). -
- Kitty Ears! -
- Various food nutriment changes. -
- Added RIGs to the Mine EVA. -
- Night vision goggles. They have a range of five tiles. -
- Added Foods: Very Berry Pie, Tofu Pie, Tofu Kebab. -
- Modified foods: Custard Pie is now banana cream pie. -
- - ConstantA updated:
-
-
-
- Removed redundand steps from Gygax and HONK construction. -
- Added some mecha equipment designs to R&D. -
- - Neo updated:
-
-
-
- Fixed PacMan (and affiliates) generator construction. -
- It is now possible to actually eat omelettes with the fork now, instead of just stabbing yourself (or others) in the eye with it. -
- Welding masks can now be flipped up or down. Note that when they're up they don't hide your identity or protect you from welding. -
- Reagent based healing should now work properly. -
- Revolver has been balanced and made cheaper. -
- Tasers now effect borgs. -
- Plastic explosives are now bought in single bricks. -
- Nuke team slightly buffed and their uplink updated with recently added items. -
- Player verbs have been reorganized into tabs. -
- Energy swords now come in blue, green, purple and red. -
- Cameras are now constructable and dismantlable. (Code donated by Powerful Station 13) -
- Updated the change network verb for AIs. (Code donated by Powerful Station 13) -
- Added gold, silver and diamond pickaxes to R&D which mine faster. -
- - Agouri updated:
-
-
-
- New look for the Request consoles. -
- - Rastaf0 updated:
-
-
-
- Brig cell timers should now tick closer-to-real seconds. -
- New look for food, including meat pie, carrot cake, loaded baked potato, omelette, pie, xenopie and others. (some sprites by Farart) -
- Hearing in lockers now works as intended. -
- Fixed electronic blink sprite. -
- Added the 'ghost ears' verb, which allows ghosts to not hear anything but deadcast. -
- - XSI updated:
-
-
-
- New AI core design. -
- HoP now has a coffee machine! -
- - Veyveyr updated:
-
-
-
- Replaced nuke storage with a vault. -
- Redesigned the mint, moved the public autolathe and n2o storage. -
- New look for the coin press. (Sprite by Cheridan) -
- - Errorage updated:
-
-
-
- You can now manually add coins into money bags, also fixed money bag interaction window formatting. -
- QM no longer has access to the entire mining station to stop him from stealing supplies. -
- New machine loading sprite for mining machinery. (sprites by Cheridan) -
- Added a messanging server to the server room. It'll be used for messanging, but ignore it for now. -
- The delivery office now requires delivery office access. It's also no longer called "Construction Zone" -
- Almost all the mecha parts now have sprites. (Sprites by Cheridan) -
- Tinted and frosted glass now look darker. -
- There are now more money sprites. -
- Department closets now contain the correct headsets. -
- - Microwave updated:
-
-
-
- Bicaridine now heals a lot better than before. -
- Added Diethylamine, Dry Ramen, Hot Ramen, Hell Ramen, Ice, Iced Coffee, Iced Tea, Hot Chocolate. Each with it's own effects. -
- Re-added pest spray to hydroponics. -
- Carrots now contain a little imidazoline. -
- HoS, Warden and Security Officer starting equipment changed. -
- New crate, which contains armored vests and helmets. Requires security access, costs 20. -
- Miner lockers now contain meson scanners and mining jumpsuits. -
- Food crate now contains milk, instead of meatballs. Lightbulb crates cost reduced to 5. Riot crates cost reduced to 20. Emergency crate contains 2 med bots instead of floor bots. Hydroponics crate no longer contains weed spray, pest spray. It's latex gloves were replaced with leather ones and an apron. -
- Added chef's apron (can hold a kitchen knife) and a new service borg sprite. -
- Autolathe can now construct kitchen knives. -
- Biosuit and syndicate space suits can now fit into backpacks. -
- Mime's mask can now be used as a gas mask. -
- Added welding helmet 'off' sprites. -
- - Errorage updated:
-
-
-
- You can now use the me command for emotes! It works the same as say "*custom" set to visible. -
- There is now a wave emote. -
- Enjoy your tea! -
- - Deeaych updated:
-
-
-
- The exam room has some extra prominence and features. -
- A new costume for the clown or mime to enjoy. -
- Service Cyborgs can be picked! Shaker, dropper, tray, pen, paper, and DOSH to show their class off. When emagged, the friendly butler-borg is able to serve up a deadly last meal. -
- It should now be possible to spawn as a cyborg at round start. Spawned cyborgs have a lower battery life than created cyborgs and begin the round in the AI Foyer. -
- - Rastaf0 updated:
-
-
-
- Fixed an issue with examining several objects in your hands (such as beakers). -
- Fixed bug with random last name being empty in rare cases. -
- - hunterluthi updated:
-
-
-
- It is now possible to make 3x3 sets of tables. -
- Fixed some missplaced grilles/lattices on the port solar. -
- There is now a breakroom for the station and atmos engineers. It has everything an intelligent young engineer needs. Namely, Cheesy Honkers and arcade games. -
- - Errorage updated:
-
-
-
- Autolathe deconstruction fixed. -
- Atmos Entrance fixed. -
- AI no longer gibs themselves if they click on the singularity. -
- Fixed all the issues I knew of about storage items. -
- Redesigned Assembly line and surrounding maintenance shafts. -
- Redesigned Tech storage. (Map by Veyveyr) -
- - TLE updated:
-
-
-
- Forum account activation added. Use the 'Activate Forum Account' verb. -
- - Neo updated:
-
-
-
- New R&D Item: The 'Bag of holding'. (Sprite by Cheridan) -
- Getting someone out of the cloner now leaves damage, which can only be fixed in the cryo tube. -
- New reagent: Clonexadone, for use with the cryo tube. -
- Fixed using syringes on plants. -
- - Constanta updated:
-
-
-
- Added queueing to fabricator. -
- - Rastaf0 updated:
-
-
-
- Air alarms upgraded. -
- Fixed problem with AI clicking on mulebot. -
- Airlock controller (as in EVA) now react to commands faster. -
- Fixed toxins mixing airlocks. -
- - Neo updated:
-
-
-
- Neo deserves a medal for all the bugfixing he's done! --errorage -
- - Errorage updated:
-
-
-
- No. I did not code on my birthday! -
- Windows can now be rotated clockwise and counter clockwise. -
- Window creating process slightly changed to make it easier. -
- Fixed the newly made reinforced windows bug where they weren't properly unfastened and unscrewed. -
- Examination room has a few windows now. -
- Can you tell I reinstalled Windows? -
- Robotics has health analyzers. -
- Bugfixing. -
- - Deeyach updated:
-
-
-
- Roboticists now spawn with a lab coat and an engineering pda -
- - Errorage updated:
-
-
-
- Mapping updates including Atmospherics department map fixes, CE's office and some lights being added here and there. -
- Mining once again given to the quartermaster and HoP. The CE has no business with mining. -
- Removed the overstuffed Atmos/Engineering supply room. -
- Replaced all 'engineering' doors in mining with maintenance doors as they were causing confusion as to which department mining belongs to. -
- The incinerator is now maintenance access only. -
- - Neo updated:
-
-
-
- New look for the advanced energy gun. (Sprite by Cheridan) -
- Mech fabricator accepts non-standard materials. -
- Mules accesses fixed, so they can be unlocked once again. -
- Atmospherics department mapping overhaul. (Map by Hawk_v3) -
- Added more name options to arcade machines. -
- - ConstantA updated:
-
-
-
- Added mecha control console and mecha tracking beacons. -
- Some changes to gygax construction. -
- - Darem updated:
-
-
-
- R&D minor bugfixes. -
- AI computer can now be deconstructed (right click and select 'accessinternals'). -
- Server room updated, added server equipment to use with R&D. -
- Wizard and ghost teleport lists are now in alphabetical order, ghosts can now teleport to the mining station. -
- Rightclicking and examining a constructable frame now tells you what parts still need to be finished. -
- Large grenades added to R&D. -
- - Deeyach updated:
-
-
-
- Mining given to the CE. (Reverted by Errorage) -
- Clowns can now pick a new name upon entering the game (like wizards previously). -
- - Darem updated:
-
-
-
- Lighting code fixed for mining and thermite. -
- R&D instruction manual added to the R&D lab. -
- Fixed R&D disk commands not working. -
- Added portable power generators which run on solid plasma. -
- You can now set the numer of coins to produce in the mint. -
- Added two more portable power generators to R&D. -
- - Deeyach updated:
-
-
-
- New uniform for roboticists -
- - Neo updated:
-
-
-
- Game speed increased -
- Mining stacking machine no longer devours stacks larger than 1 sheet (it was only increasing its stock by 1 when given a stacked stack) -
- Stackable uranium ore added (a better sprite is needed, contributions are welcome) -
- Made Meteor gamemode actually do stuff -
- Made a bigger class of meteor -
- New R&D item: Advanced Energy Gun -
- Law priority clarified with regards to ion laws and law 0. -
-
- - Veyveyr updated:
-
-
-
- Minor mapping fixes -
- - Uhangi updated:
-
-
-
- New red bomb suit for security. -
-
- - Errorage updated:
-
-
-
- Slight mapping change to arrival hallway. -
- - Uhangi updated:
-
-
-
- Antitox and Inaprovaline now mixable via chemistry. -
- Explosive Ordinance Disosal (EOD) suits added to armory and security. -
- Large beaker now holds 100 units of chemicals. (code by Slith) -
- - Rastaf0 updated:
-
-
-
- Secbot interface updated. -
- Syringe auto-toggels mode when full. -
- Captain's flask volume increased. -
- - Neo updated:
-
-
-
- Fixed the 'be syndicate' choice to actually work on nuke rounds. -
- Syndicates no longer win if they detonate the nuke on their ship. -
-
- - Errorage updated:
-
-
-
- Added cloning manual. (Written by Perapsam) -
- - K0000 updated:
-
-
-
- Cult mode updates. -
- You can now read the arcane tome. It contains a simple guide for making runes. -
- Converting people doesnt give them word knowledge. -
- Sacrifice monkeys or humans to gain new words. -
- Total number of rune words set to 10 -
- Some minor bugfixes. -
- - Errorage updated:
-
-
-
- Slight updates to processing unit and stacking machine at the mining outpost. -
- Digging now yields sand, which can be smelted into glass. -
- Stacking machine can now stack reinforced metal, regular and reinforced glass too. -
- Engineers now have two copies of the singularity safety manual. -
- - Neo updated:
-
-
-
- Magboots now have a verb toggle like jumpsuit sensors. -
- Jumpsuit sensors are now in all jumpsuits, except tactical turtlenecks. -
- Tweaks to the AI report at round start. -
- Syndi-cakes now heal traitors/rev heads/etc much more than anyone else. -
- Containment fields zap once again. -
- Fire damage meter no longer lies about fire damage. -
- - Darem updated:
-
-
-
- Mass Spectrometer added to R&D. Load it with a syringe of blood and it will tell you the chemicals in it. Low reliability devices may yield false information. -
- Not all devices have a 100% reliability now. -
- Miners now have access to mint foyer and loading area. Only captain has access to the vault. -
- More stuff can be analyzed in the destructive analyzer, protolathe can produce intelicards. -
- - Rastaf0 updated:
-
-
-
- Added blast door button to atmospherics. -
- Toxins timer-igniter assemblies fixed. -
- Engineering secure storage expanded. -
- Added singularity telescreen. -
- - Errorage updated:
-
-
-
- New look for the bio suits. (Biosuit and hood sprites by Cheridan) -
- New radiation suits added along with radiation hoods and masks. Must wear complete set to get full protection. -
- - Rastaf0 updated:
-
-
-
- Binary translator cost reduced to 1 telecrystal.
- - AtomicTroop updated:
-
-
-
- Mail Sorter job added. -
- Disposal system redone to allow for package transfers. Packages are routed to mail sorter room and then routed to the rest of the station -
- Disposal area moved. Old disposal area now just an incinerator and a small disposal into space. -
- New wrapping paper for sending packages. -
- - Veyveyr updates:
-
-
-
- New machine frame sprite. -
- Braincase sprites for mechs added. Not actually used, yet. -
- - Darem updates:
-
-
-
- Research and Development system is LIVE. Scientists can now research new advancements in technology. Not much can be made, right now, but the system is there. Technologies are researched by shoving items into the destructive analyzer. Circuit Imprinter, Destructive Analyzer, and Protolathe are controlled from the R&D console. -
- Autolathe, Protolathe, Destructive Analyzer, and Circuit Imprinter can now be built, taken apart, and upgraded. The basic frame for all of the above requires 5 metal. -
- - Rastaf0 updated:
-
-
-
- Added radio channels and headsets for miners (:h or :d ("diggers" lol)) and for cargo techs (:h or :q ) -
- Added a personal headsets to HoP and QM. -
- Aliens now attack bots instead of opening control window. -
- All bots can be damaged and repaired. -
- All bots are effected to EMP now. -
- Atmos now starts with nitrous oxide in storage tank. -
- - Veyveyr updated:
-
-
-
- New look for the pipe dispenser. -
- Errorage updated:
-
-
-
- Mining station will now charge properly. -
- Duffle bags (Money bags) can now be emptied. -
- - Errorage updated:
-
-
-
- New Job! - Shaft Miners have finally been added and are available to play. -
- Mining outpost - A new mining outpost has been built, the mining dock on SS13 has been updated. -
- - ConstantA updated:
-
-
-
- Slight speed up for combat mechs.. -
- Added H.O.N.K construction -
- Fixed bug with switching intent while in mecha. -
- - Added Durand combat exosuit. -
- Players can modify operation permissions of newly constructed civilian mechs. Click on mech with ID card or PDA with ID inside. -
- Added robotics access to default mecha maintenance permissions (all mechs) and operation permissions (civilian models only). -
- Fixed double adminlog message of explosion proc. -
- Fixed accidental mecha wreckage deletion. -
- Tweaked mecha internal fire processing. -
- Added some mecha-related sounds. -
- Moved GaussRand to helpers.dm and added GaussRandRound helper proc. -
- Other small changes. -
- Headsets upgraded. Shortcuts for channels are: :command :security scie:nce :engineering :medical. Also there is :binary :whisper :traitor and old good :h for your department. -
- "One Click Queue" added: When you quickly click on two things in a row, it will automatically queue the second click and execute it after the default 'action delay' of 1 second after the first click. Previously you had to spam-click until 1 second had passed. THIS AFFECTS EVERYTHING. NEEDS TESTING. - Skie -
- EMP effects added for further revisions. - Darem -
- Goon stuff removed, AI/Bots leave behind hidden fingerprints, firedoors fixed, powersinks eat more, small map changes. - Mport -
- Big map changes in engineering/robotics/science wing. - errorage -
- Welder Fixed. Now burns your eyes again. - errorage -
- 9x9 singularity sprite added. - Skie/Mport -
- Ghetto surgery added. - Neophyte -
- Nasty vent pump lag fixed. - Neophyte -
- Mech gameplay and building updates. - ConstantA -
- The amount of power the station uses should be lower. -
- The singularity now changes size based upon how much energy it has -
- New Machine: Particle Accelerator. -
- It might need a better name/sprite but when put together properly and turned on it will shoot Accelerated Particles. -
- The particles irradiate mobs who get in the way and move through solid objects for a short time. -
- The Particle Accelerator parts are set up by using a Wrench followed by a Cable Coil, then finished with a screwdriver. -
- When you shoot the Singularity Generator with Accelerated Particles it will spawn a Singularity. -
- New layout for Engineering, might be changed up slightly in the next few days. -
- Jesus christ it's a new map what the fuck -
- Just kidding, it's only minor changes to medbay/mechbay/cybernetics/R&D/toxins/robotics/chapel/theatre -
- Okay so there's too many changes to list completely, but basically: toxins/R&D/virology/xenobiology are south through medbay; robotics/cybernetics/mechbay are where toxins used to be, the theatre and chapel are above medbay. -
- Theatre is a new place for the Clown and Mime to play, there are some costumes available, a stage and backstage, and seating for the audience. -
- R&D and Toxins have been combined together. R&D is still work in progress. You need to head south through medbay to get there. -
- Medbay has been re-arranged slightly. Honestly, it's nothing, I bet you won't even notice anything different. There's also a new surgery suite, complete with pre-op and post-op rooms. -
- Virology's been rearranged, but it is mostly in the same place still. -
- Xenobiology is work in progress. [There's some fun stuff still being coded] -
- The Chapel is now to the north. You'll probably be thinking something like "Goddamn, this place is fucking huge", but it's actually smaller than the previous chapel. -
- Robotics and related stuff is also work in progress - however, everything needed for making borgs is there. Note: de-braining will now be done by surgeons in medbay, rather than roboticists in robotics, in case you're wondering where your optable went. -
- I added color-coded pipes in the areas I was working on. Red pipes run from air siphons and feed into the waste loop; blue pipes run from air vents and pump whatever atmos is set to pump. Yeah, there's TWO pipe networks on the station, who knew? Well, some of you probably did, but I didn't! -
- Please bring all complaints/ideas/suggestions/bugfixes to: This awesome thread on our forums -
- This update brought to you by: veyveyr and Rookie, with help from friends! [Now you know who to strangle, please be gentle q_q] -
- This really needs to be updated more often. -
- Various map updates have been applied with many more to come. Expect overhauls! -
- Mining system nearing completion. -
- Massive overhaul to the electricity systems, the way singularity makes power, and various related functions. -
- Mime spawns with White Gloves instead of Latex Gloves (apparently there's a difference!) -
- A new event has been- CLANG! What the fuck was that? -
- Ion storm laws should be much more interesting. -
- Security reports should no longer list traitor heads/AIs as possible revs/cultists, nor should nuke operatives ever get named for anything. -
- Pens are much more versatile and user friendly. -
- Mech building is rapidly on its way! Ripleys can be built, consult your quartermasters. -
- Traitors now have several new things they can steal. -
- Some surgeries coded to accompany the new operating room and surgery tools. -
- Research and Design is continuing development and should be rolled out shortly. -
- Various sprites added, tweaked, scrapped and fixed. -
- This really needs to be updated more often. -
- Various map updates have been applied with many more to come. Expect overhauls! -
- Mining system nearing completion. -
- Massive overhaul to the electricity systems, the way singularity makes power, and various related functions. -
- Mime spawns with White Gloves instead of Latex Gloves (apparently there's a difference!) -
- A new event has been- CLANG! What the fuck was that? -
- Ion storm laws should be much more interesting. -
- Security reports should no longer list traitor heads/AIs as possible revs/cultists, nor should nuke operatives ever get named for anything. -
- Pens are much more versatile and user friendly. -
- Mech building is rapidly on its way! Ripleys can be built, consult your quartermasters. -
- Traitors now have several new things they can steal. -
- Some surgeries coded to accompany the new operating room and surgery tools. -
- Research and Design is continuing development and should be rolled out shortly. -
- Various sprites added, tweaked, scrapped and fixed. -
- Pipes can now be removed and re-attached by wrenching them. -
- Mining system continues to develop. Still unaccessible to players. -
- Various map changes. Some minor lag causing things were fixed. -
- Admins have a new tool: They can now give any spell to anyone. Hurray! -
- Imadolazine now works. Maybe? -
- Singularity now releases itself if fed too much and will potentially explode. -
- Magboots now successfully prevent you from getting pulled into the singularity. -
- Strike teams immune to facehuggers. Why? I dunno. -
- Many reagent containers are adjustable so you can pour the exact amount you need. -
- No more emitters working in space, Collectors and collector controllers now ID lockable. -
- Christmas Contest plaque finally added. It's near the armor/warden's office. -
- Rocks fall, everyone dies. -
- All cyborgs and robots can now be named. Just use a pen on the cyborg's frame before the brain is inserted. -
- Knock spell now unbolts doors as well as opens them. -
- New cultist runs and other changes. -
- Added surgery tools for eventual surgery system. -
- Autolathe and Circuit Printer animations redone. Yay pretty icons. -
- AI law changes/uploads are now tracked (admin viewable). -
- Revheads now get a PDA uplink instead of a headset one. -
- Added a penlight. -
- Science Research and Development tech tree uploaded. Not really accessible by anyone yet, though. -
- Changlings Overhauled. Now function kinda like alium (using an internal chemical reserve instead of plasma) with each ability requiring a certain amount of chemicals to activate. Both venoms removed. Several "Dart" abiliites added. They allow the changling to deafen, blind, mute, paralyze, or even transform (dead) targets. -
- Carp meat now contaminated with Carpotoxin. Anti-toxin negates the poison, however. -
- New Reagent: Zombie Powder: Puts subjects into a deathlike state (they remain aware, though). Each unit of Zombie Powder requires 5 units of Carpotoxin, Sleeping Toxin, and Copper. -
- Various alium fixes. -
- Matches now available from smokes machine. -
- Megabomb bug fixed. Bombs with timers/signalers won't detonate after the timer/ signaler is removed. -
- New Disease: Rhumba Beat. Functions like GBS with a few exceptions. Not only available by admindickery. -
- More mining fixes/changes. -
- Ghost can now teleport to AI sat, Thunderdome, and Derelict. -
- New gimmick clothes -
- Constructing Glass Airlocks now use one sheet of R.Glass. -
- Windows mow always appear above grills and pipes always above lattices. -
- Added FireFighter mecha and various mecha fixes. -
- Deconstructed walls now leave proper floor tiles (that can be pried up like normal) and remember what kind of floor they were before the wall was made. -
- Carded AIs no longer take damage while in unpowered areas. -
- Chaplains can now name their religion at round start. -
- New Recipies: Clown Burger (1 Clown wig, 5 flour), Mime Burger (1 beret, 5 flour), Cuban Carp (1 carp fillet, 1 chili, 5 flour). -
- Napalm nerfed a bit. Produces ~25% less plasma but it's all concentrated in a single tile (will still spread, though). -
- Reagent bottles can, once again, be put into grenades. -
- Various minor map changes. -
- Holograms (AI controled psudo-mobs) added. Currently only admin spawn. -
- Pre-spawned pills no longer have randomized image. -
- Bridge reorganized. -
- Automated turrets now less dumb. Additionally, turrets won't target people laying down. -
- Cultists now automatically start known words for add cultist ritual. Also, converted cultists start knowning a word. -
- Supply ship no longer can transport monkeys. Also, monkeys are no longer orderable from QM. -
- Meat Crate added to QM. -
- Corn can now be blended in a blender to produce corn oil which is used to create glycern. -
- Request Consoles added across the station. Can be used to request things from departments (and slightly easier to notice then the radio). -
- Centcom reoragnized a fair bit. Not that players care but admins might enjoy it. -
- There is now a toggable verb that changes whether you'll turn into an alium or not. -
- Hair sprited modified. -
- Napalm and Incendiary Grenades both work now. Have fun setting things on fire. -
- Binary Translater traitor item added. It allows traitors to hear the AI (it functions like a headset). -
- New Disease: Pierrot's Throat. Enjoy, HONK! -
- Robotic Transformation (from Robrugers) and Xenomorph Transformation (from xenoburgers) now curable. -
- Mining added. Only accessible by admins (and those sent by admins). Very much WIP. -
- Alium Overhaul. Divided into multiple castes with distinct abilities. -
- New AI Modules: The goody two-shoes P.A.L.A.D.I.N. module and it's evil twin T.Y.R.A.N.T. Only the former actually spawns on the station. -
- Lizards added. They run away and shit. -
- PDA overhaul. Doesn't change anything for humans, just makes coders happy. -
- Firesuits redone to look less like pajamas and instead like firesuits. Fire lockers also added. -
- New Mecha: H.O.N.K. -
- Deployable barriers added. Can be locked and unlocked. -
- Mecha bay (with recharging stations) added. -
- Bunny Ears, Security Backpacks, Medical Backpacks, Clown Backpacks, and skirt added. -
- Various wizard changes. New Wizard Spell: Mind Swap. Swap your mind with the targets. Be careful, however: You may lose one of your spells. Wizards are no longer part of the crew and get a random name like the AI does. Wizards can change their known spells with their spellbook but only while on the wizard shuttle. -
- Circuit Imprinter: Using disks from the various deparments, new circuit boards and AI modules can be produced. -
- Heat Exchanging pipes added and various pipe/atmos changes. -
- Ghost/Observer teleport now works 100% of the time. -
- You need an agressive grip to table now, as well as being within one tile of the table (to nerf teletabling). -
- Teleport only runs once at the beginning of the round, hopefully reducing the lag in wizard rounds. -
- Wizards can't telepot back to their shuttle to afk now. -
- Someone added it a while ago and forgot to update the changelog - syndies in nuke need to move their shuttle to the station's zlevel first. -
- Bunch of other stuff. -
- Bug fixes, not going into detail. Lots and lots of bug fixes, mostly regarding the new map -
- CMO has a more obvious lab coat, that looks nicer than the original -
- CMO also has a stamp now -
- QM has a denied stamp -
- Cyborgs got tweaked. Laws only update when checked. Also have wires that can be toyed - with for various effects, including AI sync, and law control -
- Second construction site similar to the original -
- Prison station has been tweaked, now includes a lounge, and toilets -
- Detective's revolver starts with a reasonable number of bullets -
- Prison teleporter to the courtroom now exists -
- AI related stuff: More cameras, oh, and bug fixes! -
- Emergency storage moved -
- Random AI law changes. New law templates, and variables. Old variables were tweaked and some of the crappy templates were removed -
- Ghosts can teleport to the derelict now -
- Respriting of a bunch of stuff as well as graphical fixes -
- Kitchen is attached to the bar again -
- General map tweaks and fixes -
- Wardens fixed for rev rounds -
- 5-unit pills now work -
- APCs added and moved -
- Cola machine added. Contains various flavours of soda. Also added new snacks to the now named snack machine. Water cooler added, just apply an empty glass to it -
- Salt & Pepper have been added, as part of the food overhaul -
- More bug fixes. There was a lot -
- Cruazy Guest's map is now live. -
- Entire station has been rearranged. -
- Prison Station added, with Prison Shuttle to transport to and from. -
- New Job: Warden. Distributes security items. -
- The new map is still in testing, so please report any bugs or suggestions you have to the forums. -
- AI Liquid Dispensers, Codename SLIPPER, have been added to the AI core. They dispense cleaning foam twenty times each with a cooldown of ten seconds between uses. Mounted flashes have also been included. -
- Clown stamp added to clown's backpack. -
- Major food/drink code overhaul. Food items heal for more but not instantly. Poison, Drug, and "Heat" effects from food items are also non-instant. -
- Preperation for one-way containers and condiments. -
- New Reagents: Nutriment, Ketchup, Soysauce, Salt, Pepper, Capsaicin Oil, Frost Oil, Amatoxin, Psilocybin, Sprinkles -
- New Food Item: Chaos Donut: 1 Hot Sauce + 1 Cold Sauce + 1 Flour + 1 Egg. Has a variable effect. NOT DEADLY (usually). -
- New Drug: Ethylredoxrazine: Carbon + Oxygen + Anti-Toxin. Binds strongly with Ethanol. -
- Tape Recorders added! Now you can actually PROVE someone said something! -
- Amospherics Overhaul Started: It actually works now. You can also build pipes and create function air and disposal systems! -
- Walls are now smooth. -
- Alcohol no longer gets you as wasted or for as long. -
- QM job split into QM and Cargo Technicians. QM has his own office. -
- Doors can no longer be disassembled unless powered down and unbolted. -
- New Job: Chief Medical Officer. Counts as a head of staff and is in charge of medbay. Has his/her own office and coat. -
- Wizarditis Bottle no longer in virus crate. -
- The ban appeals URL can now be set in config.txt -
- Secret mode default probabilities in config.txt made sane -
- Admin send-to-thunderdome command fixed to no longer send people to the other team's spawn. -
- Having another disease no longer makes you immune to facehuggers. -
- Magboots are now available from EVA. -
- Changeling death timer shortened. Destroying the changeling's body no longer stops the death timer. -
- Cult mode fixes. -
- Fixed cyborgs pressing Cancel when choosing AIs. -
- The play MIDIs setting now carries over when ghosting. -
- Admins can now see if a cyborg is emagged via the player panel. -
- PAPERWORK UPDATE v1: Supply crates contain manifest slips, in a later update these will be returnable for supply points. -
- The Supply Ordering Console (Request computer in the QM lobby) can now print requisition forms for ordering crates. In conjunction with the rubber stamps, these can be used to demonstrate proper authorisation for supply orders. -
- Rubber stamps now spawn for each head of staff. -
- The use of DNA Injectors and fueltank detonations are now admin-logged. -
- Removed old debug code from gib() -
- Finished work on the "cult" gamemode. I'll still add features to it later, but it is safe to be put on secret rotation now. -
- Added an energy cutlass and made a pirate version of the space suit in preparation for a later nuke update. -
- Changeling now ends 15 minutes after changeling death, unless he's ressurected. -
- Further fixing of wizarditis teleporting into space. -
- Fixed the wise beard sprite. -
- Fixed missing sprite for monkeyburgers. -
- Fixed Beepsky automatically adding 2 treason points to EVERYONE. - -
- Sleepers and disposals now require two seconds to climb inside - -
- Hydroponics crate ordered in QMs doesnt spawn too many items -
- Replacement lights crate can be ordered in QM. -
- Added space cleaner and hand labeler to Virology. -
- Welder fuel tanks now explode when you try to refuel a lit welder. -
- Made clown's mask work as a gas mask. -
- 9 new cocktails: Irish Coffee, B-52, Margarita, Long Island Iced Tea, Whiskey Soda, Black Russian, Manhattan, Vodka and Tonic, Gin Fizz. Refer to the wiki for the recipes. -
- Kitchen update:
-
-
-
- -New Microwave Recipies: Carrot Cake (3 Flour, 3 egg, 1 milk, 1 Carrot), Soylen Viridians (3 flour, 1 soybeans), Eggplant Parmigania (2 cheese, 1 eggplant), and Jelly Donuts (1 flour, 1 egg, 1 Berry Jam), Regular Cake (3 flour, 3 egg, 1 milk), Cheese Cake (3 flour, 3 egg, 1 milk), Meat Pies (1 meat of any kind, 2 flour), Wing Fang Chu (1 soysauce, 1 xeno meat), and Human and Monkey Kabob (2 human or monkey meat, metal rods). -
- - Ingredients from Processor: Soysauce, Coldsauce, Soylent Green, Berry Jam. -
- - Sink added to kitchen to clean all the inevitable blood stains and as preperation for future cooking changes. -
- - The food processor can't be abused to make tons of food now. -
- - Multiple tweaks to virology and diseases:
-
-
-
- - Added wizarditis disease. -
- - Spaceacillin no longer heals all viruses. -
- - Some diseases must be cured with two or more chemicals simultaneously. -
- - New Virology design including an airlock and quarantine chambers. -
- - Made vaccine bottles contain 3 portions of vaccine. -
- - Lots of minor bug fixes. -
-
-
-
-
- - Added virology profession with a cosy lab in northwestern part of medbay. -
- Virology related things, like taking blood samples, making vaccines, splashing contagious blood all over the station and so on. -
- Added one pathetic disease. -
- Virus crates are now available from the quartermasters for 20 points. -
- The DNA console bug (issue #40) was fixed, but I still made the DNA pod to lock itself while mutating someone. -
- Added icons for unpowered CheMaster and Pandemic computers -
- Added some sign decals. The icons were already there, but unused for reasons unknown. -
- Some map-related changes. -
- Crawling through vents (alien) now takes time. The farther destination vent is, the more time it takes. -
- Cryo cell healing ability depends on wound severity. Grave wounds will heal slower. Use proper chemicals to speed up the process. -
- Added sink to the medbay. -
- Bugfixes:
-
-
-
- - Some reagents were not metabolized, remaining in mob indefinitely (this includes Space Cola, Cryoxadone and cocktails Kahlua, Irish Cream and The Manly Dorf). -
- - Fixed placement bug with container contents window. Also, utility belt window now doesn't obscure view. -
- - Scrubbers in the area can be controlled by air alarms. Air alarm interface must be unlocked with an ID card (minimum access level - atmospheric technician), usable only by humans and AI. Panic syphon drains the air from affected room (simple syphoning does too, but much slower). -
- Sleeper consoles inject soporific and track the amounts of rejuvination chemicals and sleep toxins in occupants bloodstream. -
- Flashlights can be used to check if mob is dead, blind or has certain superpower. Aim for the eyes. -
- Radiation collectors and collector controls can be moved. Secured\unsecured with a wrench. -
- Air sensors report nitrogen and carbon dioxide in air composition(if set to). -
- Air Control console in Toxins. -
- Additional DNA console in genetics -
- Enough equipment to build another singularity engine can be found in engineering secure storage -
- Air scrubber, vent and air alarm added to library -
- Air alarm added to brig -
- Air scrubbers in Toxins turned on, set to filter toxins -
- Empty tanks, portable air pumps and similar can be filled with air in Aft Primary Hallway, just connect them to the port. Target pressure is set by Mixed Air Supply console in Atmospherics (defaults to 4000kPa). -
- Fixed the Librarian's suit - its worn iconstate wasn't set. -
- Fixed some typos. -
- Monkey crates are now available from the quartermasters for 20 points. -
- Corpse props removed from zlevel 8 as they were causing issues with admin tools and the communications intercept. -
- Cleaned up the default config.txt -
- Added a readme.txt with installation instructions. -
- Changed the ban appeals link to point to our forums for now - this'll be a config file setting soon. -
- Fixes to various nonworking cocktails. -
- More map and runtime error fixes. -
- Nuke operative headsets should be on an unreachable frequency like department headsets. -
- Another AI Malfunction change: Now once the AI thinks enough APCs have been hacked, it must press a button to start the timer, which alerts the station to its treachery. -
- Blob reskinned to magma and increased in power. -
- The HoS now has an armored greatcoat instead of a regular armor vest. -
- Admin logs now show who killswitched a cyborg. -
- The roboticist terminal now lets you see which AI a cyborg is linked to. -
- Malf AIs are no longer treated as inactive for the purpose of law updates and cyborg sync while hacking APCs. -
- Traitor AIs are now affected by Reset/Purge/Asimov modules, except law 0. -
- AI core construction sprites updated. -
- Securitrons removed from the Thunderdome. -
- An APC now supplies power to the bomb testing area, and has external cabling to supply it in turn. -
- A new variant freeform module has been added to the AI Upload room. -
- The changeling's neurotoxic dart has been made more powerful - this will likely be an optional upgrade from a set of choices, akin to wizard spells. -
- Some gimmick clothes moved to a different object path. -
- The chameleon jumpsuit should now be more useful - it includes job-specific jumpsuits as well as flat colours. -
- Bartender update! Bartender now has a Booze-O-Mat vending machine dispensing spirits and glasses, which he can use to mix cocktails. Recipes for cocktails are available on the wiki. -
- The barman also now has a shotgun hidden under a table in the bar. He spawns with beanbag shells and blanks. Lethal ammo is obtainable from hacked autolathes. -
- Dead AIs can once more be intelicarded, however in order to be restored to functionality they must be repaired using a machine in the RD office. -
- Silicon-based lifeforms have metal gibs and motor oil instead of blood. -
- Aliens now have a death message. -
- Intelicarded AIs can now have their ability to interact with things within their view range reactivated by the person carrying the card. -
- New AI cores can be constructed from
victimsvolunteers.
- - Verbs tweaked. -
- Intelicarded AIs can be deleted. -
- RD office redesigned, and the RD now spawns there. -
- The AI can now choose to destroy the station on winning a Malf round. -
- General bugfixes to AIs, constructed AIs and decoy AIs. -
- Hats no longer prevent choking. -
- Some extra gimmick costumes are now adminspawnable. -
- AI health is now displayed on their status tab. -
- AI upload module now requires you to select which AI to upload laws to in case of multiple AIs. -
- Cyborgs now choose an AI to sync laws with upon creation. -
- Law office redesigned. -
- Roboticists no longer have Engineering access. -
- More fixes to areas which had infinite power due to having no assosciated APC. -
- Meatbread slices are no longer infinite. -
- Malf rounds no longer end if a non-malfunctioning AI is killed. -
- Cigarettes now have directional sprites. -
- AI Core circuitboard spawns in the RD office. -
- AI Satellite now has cameras and properly-wired SMES batteries. -
- Decoy AIs can no longer be moved. -
- Several runtime errors have been fixed. -
- Nuke rounds will now end properly on a station or neutral victory. -
- Riot shields have been nerfed and are now only available in the armory and in riot crates. -
- Foam dart crossbows, cap guns and caps can now be won as arcade prizes. -
- AI Malfunction has been redesigned - the AI must now hack APCs in order to win. More APCs hacked makes the timer tick faster. -
- Hydroponics now has a MULEbot station. -
- Changeling mode has been added to the game and is now in testing. -
- Electrified airlocks should now only zap you once if you bump into them while running. -
- Chemistry and Toxins access has been removed from Botanists. -
- General bugfixes and map tweaks. -
- Riot shields! One in every security closet, and a few in armory. Also orderable from QM. -
- New experimental UI for humans by Skie. Voice out if it has problems or you don't like it. - ---> YOU CAN CHOOSE UI FROM PREFERENCES <--- -
- Hydroponics: Now you can inject chemicals into plants with a syringe. Every reagent works differently. -
- Hydroponics: Added a small hoe for uprooting weeds safely. Botanists now have sissy aprons. -
- New random station/command names and verbs. -
- Dead AIs can no longer be intellicarded and the steal AI objective is now working. -
- Aliens now bleed when you hit them, as well as monkeys. -
- Hurt people and bodies leave blood behind if dragged around when they are lying. Sprites to be updated soon... -
- Fixed several run-time errors in the code. Also food doesn't deal damage anylonger in some cases. -
- Blobs and alien weeds slowed down some. Plant-b-gone buffed some. -
- Fixed monkeys and aliens not being able to deal damage to humans with items. -
- Monkeys now slip on wet floor. -
- The Lawyer now starts in his snazzy new office. -
- Law Office accesslevel added. Currently, the Lawyer and the HoP begin with this. -
- Robotics access can now be added or removed from the HoP's computer. -
- Robotics, the captain's quarters, the cargo lobby and the staff heads office now have APCs and can lose power like the rest of the station. -
- Toxins mixing room is now a separate area for power and fire alarm purposes, as it already had its own APC. -
- Added the Lawyer job. -
- Doors can now be constructed and deconstructed. This is being playtested, expect the specifics to change. -
- Fixed certain jobs which were supposed to have stuff spawning in their backpack that just wasn't getting spawned. -
- Bunch of new announcer sounds added -
- Minor lag fix implementation in the pipe system -
- You can now hear ghosts... sometimes -
- Seed bags and nutrients can now be pocketed -
- New kitchen stuff: New recipes (Meatbread, Cheese, Omelette Du Fromage, Muffins), new chef's knife and trays (Spawn in the meat locker) and milk (spawns in the fridge). Recipes are as follows: - -Cheese: milk on food processor - -Cheese wedge: Slice the cheese wheel with the chef's knife - -Omelette Du Fromage: 2 eggs 2 cheese wedges - -Muffin: 2 eggs 1 flour 1 carton of milk - -Meatbread: 3 meats (whatever meats) 3 flour 3 cheese. Can be sliced. - Cheese_amount is actually displayed on the microwave. -
- Profession-special radio channels now have color. -
- AI card not retardedly lethal anymore, for anyone that didn't notice -
- HYDROPONICS OVERHAUL, credit goes to Skie and Numbers. Wood doesn't have the entity so the tower caps cannot be harvested. For now. -
- Bar is now barman-only, access-wise. No more shall the entire station trump inside the bar and choke the monkey. -
- Prepping ground for Barman update (SPRITE ME SOME GODDAMN BOTTLES) -
- Ghosts can no longer release the singularity. -
- Sprites added in preparation for a Hydroponics update -
- A decoy AI now spawns in the AI core during Malfunction rounds to reduce metagaming. -
- libmysql.dll added to distribution. -
- Aircode options restored to default configuration. -
- AIs properly enter powerloss mode if the APC in their area loses equipment power. -
- Hydroponics crates added to Hydroponics, containing Weed-B-Gone -
- Airlock electrification now actually works properly. -
- Karma database error message updated. -
- Cyborgs choosing the standard module no longer become invisible except for a pair of glowing red eyes. -
- Aliens now have a hivemind channel, accessed like departmental radio channels or robot talk with ':a'. -
- Full donut boxes no longer eat whatever item is used on them and disappear. -
- PDA user interface has been given a graphical overhaul. Please report any problems with it on the issue tracker. -
- Personal lockers are once again available in the lockerroom -
- BUGFIX: Xenoburger iconstate was accidentally removed in an earlier revision. This has been fixed. -
- Some of the default messages have been changed. -
- Additional sprites added for plants and weeds in preparation for an expansion of Hydroponics. -
- A schema script is now available for setting up the SQL database. -
- The Robotics Crate no longer exists. Quartermasters can now order a MULEbot crate for 20 points, or a Robotics Assembly crate for 10 points. The latter provides 4 flashes, 3 proximity sensors, two 10k charge power cells and an electrical toolbox, and requires a roboticist or a head of staff to open. -
- Traitor AIs no longer lose their Law 0 in the event of power loss. -
- Administrators can now toggle the availiabilty of their right-click verbs to prevent accidental usage while playing. -
- Tool Storage vending machine is now a proper object. (code cleanup) -
- Buckets are now available from autolathes. -
- Four generic remote signaller PDA cartridges are now stocked in the Tool Storage vending machine. -
- AI status display density adjusted. -
- Open Source Release Thanks to Mport for releasable singularity code. -
- Cyborgs redone Thanks again to Mport for this, cyborgs are totally different now. -
- Engine Monitor PDA app is now Power Monitor PDA app, and actually works. -
- AI State Laws verb now allows the AI to choose which laws to state, in case of traitor AIs or laws ordering it not to state them. Hopefully this will cut down on 'OMG THE AI IS COPYING AND PASTING' metagaming. -
- Power Monitor circuitboard isn't mislabeled as Mass Driver Control any more. -
- Traitor and Rev-head clowns lose the clumsiness gene - this should make trying to flash people in Rev mode less of an exercise in frustration. -
- A sink has been added to the Fitness room - this lets you wash dirty and bloodstained clothing and equipment. -
- Blast doors and firedoors no longer open by just bumping into them. -
- The bar and kitchen now open onto the same seating area. The old cafeteria area is now used as a lockerroom to replace the old one which was displaced by Hydroponics. -
- The bar now has a space piano with which you can entertain and annoy the crew. -
- LIBRARY A library has been added to the station in the escape arm in order to educate the crew. The new Librarian job is available to manage it. Crewmembers can request and read books, or write and bind their own books for upload to a persistent database. -
- The supply of flashbangs available from Security has been reduced to cut down on people constantly flashbanging the escape shuttle. -
- InteliCards are available in various locations to allow the retrieval of valuable AI personality data in the event of catastrophic station damage. -
- Hydroponics/Botany Added Credit goes to Skie and the folks over at the independent opensource SS13 branch, this is their code. It's lacking a lot, but it's a great start! -
- Way more tweaks than I can remember. Shouldn't wait so long between changelog updates. -
- Singularity Engine Added Oh God we're all going to die (All credit on this one goes to Mport2004) -
- 'Purge' AI module added - purges ALL laws (except for law 0). Will probably change this to a Syndicate only item -
- Cyborgs now spawn with a power cell. Should prevent stupid cyborg deaths (and also pave the way for starting as a cyborg once more bugs are fixed) -
- Examining a player will now tell you if their client has disconnected. -
- Examining a brain will now tell you if it's owner is still connected to the game. -
- Alien Queens can make facehuggers. Facehuggers can make larva. Larva can grow into xenos! Xenos can become queens! The circle of life~ -
- Some powernet bug fixes: Bad list and division by zero. -
- Tweaked crate costs for Quartermaster. -
- Increased metal available in Robotics. -
- Added department-specific headsets. Engineering, Medical, Command, and Security all receive special headsets capable of broadcasting on a standard frequency PLUS a secure frequency only available to headsets of the same type. Precede say messages with ":h" to use. -
- Prayer command added. -
- State Laws command for AI added. -
- Disabled Lockdown command for AI. Too server heavy. -
- Crew manifest and various station databases should properly update when late arrivals join the game, now. -
- Quartermasters will receive 10 points every five minutes. This will probably be nerfed heavily, but we'll give it a shot anyhow. -
- Fixed a bug with doors/airlocks. (Thanks Mport2004) -
-
- New graphics:
-
-
-
- - Side Facing Sprites: Player sprites will now face in all directions when moving. Holy shit! - -
-
- -
- New features:
-
-
-
- - Disposal System: The station now has a fully functional disposal system for throwing away nuclear authentication disks and old, dirty clowns. - -
- - Breakable Windows: Windows are breakable by projectiles and thrown items (including people), shards hurt your feet. - -
- - Status Display: Station escape shuttle timers now function as status displays modifiable from the bridge. - -
- - Space Heater: Space heaters for heating up cold spaces, in space. -
- -
- New items:
-
-
-
- - Welding Mask: Helps engineers shield their eyes when welding. - -
- - Utility Belt: Function as toolboxes equippable in the belt slot. - -
- - Mouse Trap: Hurt your feet, especially if you aren't wearing shoes! - -
- - Power Sink: Traitor item that rapidly drains power. - -
- -
- New graphics:
-
-
-
- - North Facing Sprites: Player sprites will now face north when moving north. - -
- - Hidden Pipes: Pipes are now hidden underneath floor tiles. - -
- -
- New robot: Medibot
-
-
-
- - Automatically attempts to keep crewmembers alive by injecting them with stuff. - -
- -
- New robot: Mulebot
-
-
-
- - Allows quartermasters to automatically ship crates to different parts of the station. - -
- -
- Changes:
-
-
-
- - Atmos system GREATLY OPTIMIZED! - -
- - Brand new station layout! - -
- - Robust chemical interaction system! - -
- - HOLY FUCK PLAYING THIS GAME ISN'T LIKE TRODDING THROUGH MOLASSES ANYMORE - -
- - Feature: If two players collide with "Help" intent, they swap positions. - -
- - - OH NO STRANGLING GOT NERFED: Insta-strangling (hopefully) removed. Victim no longer instantly loses consciousness. - -
-
- Cloning Machine: The Geneticist spilled coffee on the Genetics Machine's revival module and it was too costly to replace!
-
-
-
- - Clones may or may not have horrible genetic defects. - -
- - - New feature: Obesity from overeating in a short period of time. - -
- - New feature: Station destruction cinematic if the crew loses in AI Malfunction or Nuclear Emergency. - -
-
- New Position: Tourist
-
-
-
- - Centcom has entered the lucrative business of space tourism! Enjoy an event-filled vacation on the station, and try not to get killed. - -
- - Guest accounts are now restricted to selecting Tourist in Character Setup. - -
- - - AI: Added 30 second cooldown to prevent spamming lockdowns. - -
- - Feature: Character preview in Character Setup! - -
- - New item: Drinking glasses that you can fill with water. - -
- - Feature: Sounds now pan in stereo depending on your position from the source. - -
- - Traitor tweak: Agent cards can now be forged into a fake ID. - -
- - Supply Dock 2.0: The Supply Dock has been redesigned and now features conveyer belts! Amazing! - -
- - New uniforms: The Research Director, Chief Engineer, and the research jobs have new uniforms. The Head of Security has a cool new hat which happens to be his most prized possession. - -
- - Merged research: The first act of the Research Director is to merge Toxins and Chemistry into a single Chemical Lab. Hooray! - -
- - Robot tweak: You can now observe robots using the observe command. - -
- - Stamps: The heads now have stamps to stamp papers with, for whatever reason. - -
- - Supply Shuttle 1.0: Now you can order new supplies using Cargo Bay north of the autolathe. - -
- - New containers: The game now features a variety of crates to hold all sorts of imaginary space supplies. - -
-
- New position: Quartermaster
-
-
-
- - A master of supplies. Manages the cargo bay by taking shipments and distributing them to the crew. - -
- -
- New position: Research Director
-
-
-
- - The head of the SS13 research department. He directs research and makes sure that the research crew are working. - -
- -
- New position: Chief Engineer
-
-
-
- - Boss of all the engineers. Makes sure the engine is loaded and that the station has the necessary amount of power to run. - -
- -
- New robot: Securibot
-
-
-
- - Automatically stuns and handcuffs criminals listed in the security records. It's also really goddamn slow. - -
- - - New jumpsuits: Engineers and Atmos Techs have new jumpsuits to distinguish between them easier. - -
- - Monkey AI 2.0: Monkeys will now get angry, going after random human targets with the ability to wield weapons, throw random objects, open doors, and break through glass/grilles. They're basically terminators. - -
-
- New gamemode: Monkey Survival
-
-
-
- - Survive a horde of angry monkeys busting through the station's airvents and rampaging through the station for 25 minutes. - -
- -
- New robots: Cleanbot and Floorbot
-
-
-
- - Cleanbots automatically clean up messes and Floorbots repair floors. - -
- -
- New spell: Mindblast
-
-
-
- - Causes brain damage, progressively causing other players to become even more retarded. - -
- -
- Alien Races
-
-
-
- - Wizards may randomly spawn as illithids, who gain Mind Blast for free, and nuke agents may randomly spawn as lizardmen. - -
- - - Station shields: The station now has a toggleable forcefield that can only be destroyed by meteors or bombs. Takes a lot of station power to use. - -
- - Traitor scaling: Number of traitors/wizards/agents now scales to number of players. - -
-
- New food item: Donk pockets
-
-
-
- - Delicious and microwavable, gives a bigger health boost for traitors. - -
- - - Cigarettes: Now you can fulfill your horrible nicotine cravings. The detective starts with a zippo lighter and pack of cigarettes. Other packs can be be obtained via vending machines. - -
- - Warning signs: The station is now filled with various warning signs and such. - -
- - Updated graphics: Many, many objects have had their graphics updated including pipes, windows, tables, and closets. HUD graphics have been updated to be easier to understand. - -
- - Lighting fixes: New turf is now correctly lit instead of being completely dark. - -
- - Meteor fixes: The code and graphics for meteors has been fixed so the meteor gametype is more playable, sort of. - -
- - Escape shuttle fix: The shuttle can now be called in Revolution and Malfunction, but the shuttle will be recalled before it arrives. This way players can no longer call the shuttle to figure out the game mode during secret. - -
- - Changelog updated: New changelog entry for Thanksgiving thanks to Haruhi who will probably update the changelog from now on after almost a month of neglect. - -
- - Bug fix: Made most pop-up windows respect the close button. - -
- - Randomized naming: Names for Central Command and Syndicate are now randomized. - -
- - Bug fix: PDAs had their code cleaned up. Notice any problems? Report them. - -
- - New syndicate item: Detomatix Cartridge, allows remote detonation of PDAs (rather weak explosion)! - -
- - Feature: Remotely detonating PDAs has a chance of failure depending on the PDA target, a critical failure will result in the detonation of your own PDA. - -
- - Gibbing update: Gibbing stuff has been rewritten, robots now gib nicer. - -
- - LIGHTING!!!: The station now has dynamic lighting and associated items. - -
- - Poo v1.0~: This has caused many ragequits. - -
- - Flushable toilets: You can now use toilets to place your vile, disgusting and irreprehensible excretions (you disgusting children). Just be careful what you flush! - -
- - Feature: Emergency oxygen bottles can be clipped to your belt now. - -
- - Clothing update: Bedsheets are now wearable. - -
- - Updated HUD: A few minor tweaks to the inventory panel. Things might not be exactly where you're used to them being. - -
-
- New position: Chef
-
-
-
- - Maintains the Cafeteria, has access to Kitchen and Freezer, Food creation will be in shortly. - -
- - - Food update: Food items now heal Brute/Burn damage. The amount recovered varies between items. - -
- - AI laws update: Nanotrasen has updated its AI laws to better reflect how they wish AIs to - operate their stations. - -
- - Traitor item change: E-mag renamed to Cryptographic Sequencer. - -
- I'm really sorry everyone I just HAD to add a gib all verb. -
- Decided to add the creation of bombs to bombers list -
- Made the new bombing list EVEN BETTER!!! -
- Fixed a bug with admin jumping AND the traitor death message -
- Oops, fixed a bug that returned the right click pm thing thinking the admin was - muted. -
- Made a new improved way of tracking who bombs shit. -
- More formatting shit. -
- Fixed up some mute code and made it so that if a player is muted they cannot PM - us. -
- Adminhelps now logged in the admin file not ooc -
- Changed the way admin reviving is dealt with. (It was coded kind of weirdly - before) -
- Added a few areas to the observe teleport. Fixed some adminjump things. Modified - the paths of some areas. -
- You can now ban people who have logged out and admins can now jump to people - using the player panel. -
- Added in jump to key coded in a much better way than showtime originally did it. -
- Fixed magical wind when laying pipes. They start out empty!! -
- Made blink safer. Fixed the crew-quarters to ai sattelite teleport problem. -
- Forgot the message again. Added an emp spell. thanks copy&paste. -
- OH MY GOD I HAVE RUINED ASAY -
- Added electronic items to the pipe dispenser -
- fixed a formatting error with the changelog (I didn't break it, it was showtime) -
- Fixed a formatting error -
- Cleaned up sandbox object spawn code -
- New and improved admin log so we can keep an eye on these fuckers -
- Fixed adminjump because I realise most people use it for the right click option -
- Mushed together jump to mob and jump to key -
- Fixed a compilation error and made my test room more secure! -
- Multitools can now be used to measure the power in cables. -
- Fixed a bug where the canister message would repeat and spam the user when - attackby analyzer. Fixed an admin formatting error. -
- Replaced all range checks with a in_range proc. pretty good chance I broke - something or everything. -
- Mutations use bitfields -
- Fixed a bug with my traitor panel. -
- Fixed the turrets, ruined Pantaloons map (test map). Did some things with - turrets and added a few areas. -
- Some stuff in here you know the usual shit. Bugfixes, formatting etc. -
- Stunbaton nerf. -
- Tempban longer than 1 year -> permaban. -
- Turfs > spawnable. -
- Shaking someone now slowly removes paralysis, stuns and the 'weakened' stuff. -
- CTF flags now check if someone has them equipped every 20 seconds, if they are - not then they delete themselves and respawn. -
- Fixed the r-wall-welder-message-thing. -
- Change to the CTF code, flag captures can now only happen if your team has their - flag in the starting position. -
- Pruning my test room. -
- Instead of the red and green team its now the American and Irish teams! -
- BACKUP BACKUP TELL ME WHAT YOU GONNA DO NOW Changed the monkey name code. Re-did - my antimatter engine code so it actually puts out power now -
- Fixed a bug that gave everyone modify ticker variables you silly sausage. -
- Sorted the AIs track list. -
- Constructable filter inlets and filter controls. -
- Added in admin messages for when someone is banned. -
- Bannana and honk honk. -
- Pipe construction now works completely. //Nannek -
- Many many other things that never gets recorded in the changelog!! -
- The Michael Jackson Memorial Changelog Update -
- Pipe filters adjusted for more ideal environmentals //Pantaloons -
- Added in job tracking //Showtime -
- Crew Manifest and Security Records now automagically update when someone joins //Nannek -
- Fixed a bug where sometimes you get a screwdriver stuck in your hand //Pantaloons -
- Flamethrowers can now be disassembled //Pantaloons -
- OBJECTION! Added suits and briefcases //stuntwaffle -
- Added automatic brig lockers //Nannek -
- Added brig door control authorization and redid brig layout //Nannek -
- Emergency toolboxes now have radios and flashlights, and mechanical toolboxes now have crowbars //Pantaloons -
- New whisper system //lallander -
- Some more gay fixes //everybody -
- Some really cool fixes //everybody -
- Really boring code cleanup //Pantaloons -
- ~~In Loving Memory of MJ~~ Sham on! -
- Looking back through the SVN commit log, I spy... -
- Keelin doing some more performance enhancements -
- Fixed one person being all 3 revs at once (hopefully) -
- Some gay fixes -
- New admin system installed -
- Fixed a bug where mass drivers could be used to crash the server -
- Various pipe changes and fixes -
- Death commando deathmatch mode added. -
- Ghosts can no longer wander from space into the dread blackness that lies beyond. -
- Those other losers probably did a bunch of other stuff since May 6th but they don't comment their revisions so fuck 'em. -
- Crematorium -
- Goon? button makes all your dreams come true. -
- Restructured medbay -
- Does anyone update this anymore? -
- New atmos computer promises to make atmos easier -
- Autolathe -
- Couple of map changes -
- Some computer code reorganised. -
- I'm pretty sure theres a couple things -
- Weld an open closet (only the normal kind), gayes. -
- Chaplin has a higher chance of hearing the dead. -
- New traitor objective -
- Power traitor objective removed -
- New job system implemented for latecomers. -
- Head of Research quits forever and ever, is replaced by Head of Security (who gets his own office) -
- Admins are now notified when the traitor is dead. -
- Unprison verb (again, for admins). -
- Medical redone, doctors do your jobs! (Tell me what you think of this - compared to the old one) -
- Clickable tracking for the AI -
- Only the heads can launch the shuttle early now. Or an emag. -
- Sounds. Turn on your speakers & sound downloads. -
- Scan something with blood on it detective. -
- A large icon for the headset, no reason it should be so small. -
- Emergency closets now spawn an 'emergency gas mask' which are just recolored gas masks, no other difference other than making it obvious where the gas mask came from. -
- Constructable rocket launchers: 10 rods, 10 metal, 5 thermite and heated plasma from the prototype. -
- Emergency closets have randomized contents now. -
- Fixed a bug where someone who was jobbaned from being Captain could still be picked randomly -
- Fixed a bug where monkeys couldn't be stunned. -
- Change mode votes before game starts delays the game. -
- The brig is now pimped out with special new gadgets. -
- Upgraded the admin traitor menu. -
- GALOSHES! -
- A certain item will now protect you from stun batons, tasers and stungloves when worn. -
- Say / radio / death talk systems recoded, hopefully improving it. -
- Announcements of late joiners are now done by the AI if it's alive :-) -
- Random station names. -
- Changes to the message stylesheet. -
- Admin messages in OOC will now be colored red. -
- Added a command to list your medals. -
- ETA no longer shows when it doesn't matter. -
- Nerfed the ability to spam shuttle restabalization. -
- Fixed the 'Ow My Balls!' medal to only apply from brute damage rather than both brute and burn damage. -
- Job banning. -
- Genetic Researcher renamed to Geneticist. -
- Toxins Researcher renamed to Scientist. -
- Help reformatted. -
- Fixed a bug where combining bruise packs or ointments resulted in an incorrectly combined amount. -
- Renamed memory and add memory commands to Notes and Add Note. -
- Medals! MEDALS! -
- Trimmed the excessively long changelog. -
- Janitor job complete! Report any bugs to adminhelp -
- Wizard now needs his staff for spells -
- Be careful with APCs now okay?! -
- Fixed Memory and made it more efficient in the code -
- Crowbars now open apcs, not screwdrivers. They do something else entirely -
- Hackable APCs -
- When APCs are emagged they now stay unlocked -
- Re-did a shit tonne of admin stuff -
- New admin system is pretty much finished -
- FINALLY backpacks can now be looked in while on the ground. -
- Ghosts no longer able to open secret doors -
- Suicide vests now work as armor -
- Blood no longer comes out of the guy if you pull him due to lag -
- Admin panel has been touched up to include html tables -
- Mines now added, only spawnable right now however -
- Fixed the syndicate nuclear victory bug -
- Wizard now spawns with wizard outfit which he must wear to cast spells -
- Blood bug fixes -
- Fixed a retarded bug that meant I didn't have the power to kick admins -
- THUNDERDOME! -
- Several new facial hair options and a bitchin' mohawk -
- Blood by Culka -
- Nuke disk now spawns in ALL game modes so that during secret rounds the syndicate now have the element of surprise! -
- Implemented unstable's "observer" mode -
- Halerina's wizard mode -
- Non-interesting stuff -
- Began addition to the new admin system - right now only available to coders for testing -
- Admins can now click on the multikeying offenders name to pm them, instead of hunting for them in the pm list -
- Halerina's chemistry system -
- You can now deathgasp without being dead, hopefully so people can fake their own deaths. -
- Redid Medlab -
- New chemist job -
- New DNA system. 200th Revision special. -
- Various bugfixes -
- Maze -
- Added a new game mode into rotation. -
- Added an AI satellite -
- Lockdowns can be disabled with the communications console -
- Prison shuttle can be called on the comm console, but only if its enabled by admins first -
- When you slip into space you'll have a 50% chance of going to z=4 instead of z=3 -
- Fixed Cakehat -
- Dead people can now see all turfs, mobs and objs not in their line of sight. -
- Modified the map slightly -
- Stungloves can now be "made" -
- Flashes can now have their bulbs burning out. -
- Batons can now be turned on and off for different effects. They also now have 10 uses before they need to be recharged. -
- Fixed all the autoclose bugs -
- Due to it being myself and Keelin's 100th revision we have added a super-secret special item. Don't ask because we won't tell! Figure it out! -
- Modified doors in engineering so that they do not autoclose - Autoclose now handled by a variable -
- Fixed toxin researcher spawn bug -
- Changed the "You hear a faint voice" message. -
- Gave the host new commands to disable admin jumping, admin reviving and admin item spawning -
- Fixed some airlock autoclose bugs -
- Changed some doors to not autoclose. -
- Nerfed the toolbox down. -
- Doors now close after 15 seconds -
- Fixed some p cool bugs -
- Cakehat -
- Added another suit -
- Walls now take 5 seconds to build -
- Added sam0rz, thesoldierlljk and kelson's revolution gamemode. Thanks guys! -
- Fixed a couple of bugs -
- Improved bar ;) -
- Beer acts like pills and syringes -
- Added 'Make AI' Option for Admins -
- Added dissolving pills in beer (cyanide and sleeping pills) -
- Modified engine AGAIN, but personally I love it now -
- Moved bar due to popular demand -
- Captains room is now a security checkpoint -
- Assistants now have access to maint tunnels again -
- Courtroom -
- Engine has been redone slightly to make it easier to load -
- Nerfed beer a lot more -
- Added a bartender job + Bar -
- Captains panic room -
- Voice changer traitor item -
- Bartender suit -
- Made taking a table apart take longer -
- Balanced beer a bit more. -
- Assistants can no longer open external air locks and maint tunnels, sorry guys. Get a job you bums. -
- Engineers CAN access external air locks and maint tunnels. -
- Fixed traitor AI bug -
- Added traitor menu for admins - The ability to turn people into "traitors" as well as keep track of their objectives. -
- Implemented Keelins revive system - Primary Admins can now revive people. -
- Moved and redid security to prevent clusterfucks and everyone just crowding around security. -
- Redid the brig to make it bigger and so that people can break others more easily out since it isn't right in security. -
- Moved and redid captains quarters/heads quarters. Captains made much smaller and heads is now more of a meeting room. -
- Added Stungloves and an axe - right now only admin spawnable. -
- Implemented Persh's adminjump back in - admins can now jump to set locations. -
- Added a feature that if someone logs off their character moves around and says things - Change what they say from the config/names/loggedsay.txt file. -
- Added in adminwho verb - tells the user if there are any admins on and who they are. -
- Freedom implant has been changed so that it will have a random emote associated with it to activate it rather than always chuckle. -
- There is now a pinpointer tool for use in Nuclear Emergency. It works similar to the existing locator, in that it will detect the presence of nuclear disks and in what direction it is. -
- The nuke being detonated in Nuclear Emergency should now properly end the game. -
- Spacesuits now cause you to move slower when not in space. -
- Syndicate in Nuclear Emergency now have syndicate-themed spacesuits. -
- Blob mode should properly end now. -
- Syndicate Uplink has been changed up, allowing traitor more freedom in his ability to be... traitorus. -
- Syndicate Uplink can now spawn a ammo-357, syndicate card, energy sword, or timer bomb. -
- Fixed an issue where Syndicate Uplink looked different than a normal radio. -
- You can choose to be a nudist now. -
- Facial hair! -
- Added constructable flamethrowers. -
- Redid internal naming scheme for human/uniform sprites. -
- Helmet visors are now translucent. -
- Held item graphics corrected for basically everything, internally only uses one dmi file instead of two. -
- Config settings reorganized for.. organization. -
- Seperated male and female names. -
- Females have pink underwear. -
- Guests can no longer save/load profiles, as this just created useless profiles that weren't used again. -
- You can now replace test range firing pins with any other pin. +
- The plasma cutter is now a gun that comes in the mining vending machine. Use it to mine fast but expensively. +
- It's also cheaper in RnD, and there's an advanced version of it there too. Yay! +
- Ripleys and Firefighters have been buffed significantly. Go wild. +
- Precious mesons are cheaper in RnD. +
- Now you can mine bluespace crystals. They are extremely rare. +
- You can make remote bombs out of gibtonite. Figure out how. +
- Gibtonite is a bit less stable. Do not hit it with anything heavy. +
- Added a bowman headset for death squads and ERTs. +
- Deathsquad radio channel is now called the Centcom radio channel. +
- Fixed the admin buttons not spawning ERT Medic gear properly. +
- Expanded Emergency Shuttle dock to allow for more round end griff. +
- All 7 ERT members now spawn geared, not just the first 4. +
- Spawning an ERT or Deathsquad no longer stops a second ERT or Deathsquad from being spawned. +
- Pulse rifles now have 80 shots, not 40. +
- Deathsquads now use loyalty pinned Pulse rifles. +
- NTSL has been updated! It can now read and modify verbs (says, yells, asks)! You can set your own using $say, $yell, $ask, and $exclaim variables in your scripts. +
- NTSL can now also modify the font, italics, and bolding of radio messages in four ways! In a script, place $loud, $wacky, $emphasis, and/or $robot in a vector to $filters. +
- The admin's old player panel has been removed and the new one has taken it's name. +
- Adds the ability to shave corgis. +
- Spraycans for Revheads: instant use crayons that can be used on walls. +
- Spraycans can be used as ghetto pepper spray and leave their target with colored faces that can be removed with space cleaner. +
- Area ambience and ship ambience are now separate toggles. If you want one type of ambience but not the other, you only need to switch off the type you don't want. +
- Added cigar cases. They come in three flavors and can be bought from cigarette machines. +
- Added new wizard spell : Lightning Bolt +
- Added a hammer and gavel. Court is now in session. +
- You can now *flip. +
- Objects now spin when thrown. Please report any oddities. +
- Monkeys can now wear ANY mask, not just ones they had specific icons for. +
- Monkeys can now wear HATS, That's right, Monkey Hats! +
- Mining mobs vision adapted to darkness of the asteroids. +
- All slimes are now simple animals instead of carbon life forms. +
- Remove crit status from brain and slimes. +
- Simple animal aliens can now see in the dark like regular aliens. +
- The detective's forensic scanner has been resprited. +
- So has the cargo tagger. +
- And the RPED. +
- Admins now have a button to use Bluespace Artillery at their will. +
- You will no longer be slowed down by anything if you use a jetpack in zero gravity. +
- Engineering hardsuits come with an inbuilt jetpack. Requires an internals tank in suit storage and is slower than a normal jetpack. +
- Added an arrow graffiti, made arrow and body graffiti face the same way as the user +
- New changeling ability : Last Resort : Explode and infect corpses if the situation looks grim +
- Deleted the toy crossbow that wasn't a gun, but flung projectiles like a gun. Why was that even a thing? +
- Added an abstract new type of reusable ammo. +
- Added three new foam force guns and a foam force crossbow, all of which take the new foam dart ammo. +
- Added foam force dart boxes to the autolathe, and two crates orderable from cargo containing the new guns. +
- Added two new donksoft guns, the syndicate's own brand of Foam Force. Available in all good uplinks! +
- New crossbow can be won as an arcade prize. +
- All kinds of ammo containers can now be used to rapidly collect live ammunition on the ground. +
- Speedloaders and traditional ammo boxes can now be restocked. +
- Security bots now react to being shot. +
- Added a preference toggle for hearing instruments play as suggested by PKPenguin321. +
- Added a buildable Chem Master, board is in Circuit Imprinter. +
- Finally fixed the gulag shuttle missing a redemption console. +
- Adds pet collars. Use them to rename pets; Can also be worn if you're a weirdo. +
- Adds the matyr objective to be dead at the round's end. You can get this objective if you have no others that would need you to survive. +
- GAR glasses return. Yes, I got permission. Just who the hell do you think I am? +
- Summon Events has been reworked to be a bit less manic. +
- Summon Events will turn off if the wizard and all apprentices die. Any lingering effects are not reversed however. +
- Improving Summon Events will reduce the average time between events, but not the minimum time between events. +
- Departmental Uprising has been made admin only for being an RP heavy event that creates antags in an enviroment that doesn't really support that. +
- Added a cyborg upgrade module for the satchel of holding. +
- Added a fancy white dress and a jester outfit. Sprites by Nienhaus. +
- Nanotrasen Security has authorized modifications to the standard issue helmets for officers. These helmets are now issued with a mounted camera, automatically synced to your assigned station's camera network. In addition, the helmets also include mounting points for the Seclite model of flashlights, found in your station's security vendors. +
- Nanotrasen Security helmets are designed for easy repairs in the field. Officers may remove their Seclite attachment with any screwdriver, and the camera's assembly may be pried off with a crowbar. The assembly is also compatible with analyzer upgrades for scanning through the station's structure, and EMP shielding is possible by applying a sheet of plasma. +
- Fixes Morphine not knocking you out. +
- Hotline no longer exists. Poppies now have Saline-Glucose Solution. +
- Muriatic Acid, Caustic Soda, and Hydrogen Chloride have been removed, along with the secondary meth recipe. The original recipe still works. +
- Foam now produces more bang for your buck when mixed. Your foam grenades should be larger now to account for the slowdown. +
- Adds Stabilizing Agent. This chemical will prevent the effects of certain reactions from taking place in the container it is in, such as Smoke Powder and Flash Powder, allowing you to get the raw forms of the powders for heating up later. +
- Smoke Powder and Flash Powder can now be mixed along with Stabilizing Agent in order to produce a powder version of the effects. You can then heat these powders to 374K to get the effects. +
- Mixing them without Stabilizing Agent gives the default effects. +
- Adds Sonic Powder, a chemical that deafens and stuns within 5 tiles of the reaction. It also follows the reaction rules of the other 2 powders. +
- Liquid Dark Matter and Sorium also now work like the powders do. +
- CLF3 now has a higher chance of making plating tiles, and the burn damage caused by it scales based on your fire stacks. +
- Adds Pyrosium. This reagent heats up mobs by 30 degrees every 3 seconds if it has oxygen to react with. Useful for when you want a delayed mix inside of someone. +
- Adds Cryostylane. This reagent does the opposite of Pyrosium, but it still requires oxygen to react with. +
- Adds Phlogiston. This reagent ignites you and gives you a single fire stack every 3 seconds. Burn damage from this chemical scales up with the fire stacks you have. Counter this with literally any chemical that purges other chems. +
- Smoke now transfers reagents to the mob, and applies touch reactions on them. This means smoke can run out of reagents, no more infinite acid smoke. It also only works on mobs, use the new Reagent Foam(tm) for your hellfoam needs. I suggest a CLF3 Fluoroacid Black Powder mix. +
- Added a derelict medibot to the code, will place a few on the derelict when this PR is merged as to prevent mapping conflicts. +
- Adds Initropidril. 33% chance to hit with 5-25 TOX damage every 3 seconds, and a 5-10% chance to either stun, cause lots of oxygen damage, or cause your heart to stop. Get it from the traitor Poison Kit. +
- Adds Pancuronium. Paralyses you after 30 seconds, with a 7% chance to cause 3-5 loss of breath. Get it from the traitor Poison Kit. +
- Adds Sodium Thiopental. Knocks you out after 30 seconds, and destroys your stamina. Get it from the traitor Poison Kit. +
- Adds Sulfonal. +1 TOX per 3 seconds, knocks you out in 66 seconds. Mix it with Acetone, Diethylamine, and Sulfur. +
- Adds Amantin. On the last second it is in you, it hits you with a stack of TOX damage based on how long it's been in you. Get it from the traitor Poison Kit. +
- Adds Lipolicide. +1 TOX unless you have nutriment in you. Mix it with Mercury, Diethylamine, and Ephedrine. +
- Adds Coiine. +2 TOX and +5 loss of breath every 3 seconds. Get it from the traitor Poison Kit. +
- Adds Curare. +1 TOX, +1 OXY, paralyzes after 33 seconds. Get it from the traitor Poison Kit. +
- Adds a reagent_deleted() proc to reagents for effects upon the last time it processes in you, like with Amantin. +
- Neurotoxin required temperature for mixing has been set to 674K, it was 370K for some reason. +
- Added Cybernetic Implants: Security HUD, Medical HUD, X-Ray, Thermals, Anti-Drop, Anti-Stun. All implants are researchable and producible by R&D and Robotics. +
- Checkered skirts can be adjusted to be worn shorter. +
- Player controller uplifted mobs will be attacked by gold core mobs of different species. +
- The backup shuttle will no longer be called if the emergency shuttle is coming. +
- Adds 3 new bear-based foods. +
- Beary Pie -1 Plain Pie, 1 berry, 1 bear steak +
- Filet Migrawr - 5u of Manlydorf, 1 bear steak, 1 lighter(not used in crafting) +
- Bearger - 1 bun, 1 bear steak +
- Silicons are no longer blinded by welding. +
- A new software update has given the Orion Trail game a cheat code menu. While you can't access this normally (that's for a later software update), maybe an emag could do it...? +
- The chemical implant action button should now correctly inject all chemicals when pressed. +
- Adds normal security headsets to security lockers. +
- Fixed cables on catwalks being destroyed when creating plating floor. +
- Portable machines can be mounted on any turf that could hold a cable. +
- Adds a few cosmetic glasses to the autodrobe and clothing vendors. +
- Explosion relics will now destroy themselves in their own explosion. +
- The Experimentor can no longer re-roll the function of an already scanned relic. +
- Ghosts are now asked if they want to become a sentient slime. +
- Adds the :rollie: and :ambrosia: emojis. +
- ERT suits now use helmet toggling like hardsuits. +
- Fixed mechs ballistic guns not firing bullets. +
- Allows alt-clicking to adjust breath masks, flip caps, and unlock/lock closets. +
- Fixed jetpack trail animation. +
- Syndicate cigarettes' non-healing Doctor's Delight replaced with Omnizine. +
- Expanded the Centcom area for better station-Centcom interaction. +
- Acid blobs are less likely to melt equipment. +
- Adds the ability to spike bears on a meatspike for their pelt. Yields 5 meat instead of the usual 3 from a knife. +
- Two new shotgun shells. Ion shell, shotgun version of ion rifle, built with 1 x techshell, 1 x ultra microlaser, 1 x ansible crystal. +
- Laser slug, regular laser shot in a shotgun shell, build with 1 x techshell, 1 x high power microlaser, 1 x advanced capacitor. +
- Improvised shotgun shells can now be constructed with 1 x grenade casing, 1 x metal sheet, 1 x cable, 10 units welding fuel. Can be packed with a further 5 units of gunpowder to turn it into a potentially lethal diceroll. +
- FRAG-12 shotgun shells are no longer duds, now explosive. +
- Makes the message when you're attacked slightly bigger for better visibility. +
- Adds ass photocopying for drones +
- Nanotrasen has approved distribution of Loyalty Implant Firing Pin designs. They can be fabricated with sufficient research into weapons technology. If inserted into a firearm, it will only fire upon successful interface with a user's Loyalty Implant. +
- Utilizing a new magic mirror found in the den, wizards can now customize their appearance to a high degree before descending upon the station. +
- Firing delay for tasers has been shortened. +
- Beginning major rework and refactor of messy Ninja code. +
- Roleplay based, kill deathsquad and kill alien queen objectives removed. +
- Kamikaze mode removed. +
- AIs and pAIs can no longer be integrated into a ninja suit. +
- Energy blade power replaced by an energy katana that can be dropped but is more deadly. +
- Energy katana can emag any object it hits. +
- Bookbags have a new sprite and can hold bibles. +
- Adds egg yolk reagent. You can break eggs in open reagent containers or blend them to get egg yolk. +
- Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively soymilk instead of the eggyolk for vegans). +
- Change customizable snack max volume to 60 and buffs nutriment amount in doughs. +
- Doors can damage mechs by crushing them now. +
- The tablecrafting window now also shows partial recipes in grey, if there's some of the things required for the recipe on the table. Recipe requirements are now also shown next to the names of recipes listed in the window. +
- Adds a new vending machine, the Liberation Station. Consult your local patriot for more details. +
- Adds a patriotic jumpsuit and freedom sheets. Consult your local patriot for more details. +
- Added a toggle for ghosts that allows them to hear radio chatter without having to hover near intercoms/over people with headsets. +
- Adds the Slimecake and Slimecake slice. +
- Non-player Alien Queens/Drones now spread weeds. Can also lay eggs when enabled. +
- Nanotrasen scientists have recently reported mutations within the pink family line of slimes. Station scientists are encouraged to investigate. +
- Reworked reskinning and renaming guns, and added the ability to reskin the bartender's shotgun. Click it with an empty active hand to reskin. Warning, you can only do this once! Rename by hitting it with a pen. This also works with miner shotguns now. +
- Embedding from explosions has been tweaked, they will always throw objects fast enough to get embedded if they can. +
- Damage taken when embedded spears and throwing stars fall out has been increased. +
- Damage dealt by objects getting embedded has been decreased. +
- The Horsemask spell has now been altered, instead of just a horse mask it will now choose between three animal masks including the horse mask. +
- You can now burn papers using lighters, welders, or matches. Useful for secret messages. +
- Airlocks with their safety on no longer closes on dense objects (like mechs or tables). +
- Aliens, slimes, monkeys and ventcrawler mobs can now climb into disposal. Cyborgs and very large mobs can no longer climb into it. +
- Stuffing another mob in a disposal unit is now only done via grabbing. +
- Coffee now causes jittering only when you overdose on it. +
- Turrets now target occupied mechs and don't target drones. +
- Added more barsigns, sprites by yours truly. +
- Gang mode has been reworked to functionality without some of it's features. +
- Gang membership visibility, conversion pens and weapons are removed until fixed. +
- Gang bosses have been given uplinks to use in the meantime. +
- Chance of deconversion from repeated head trauma has been increased. +
- The skeleton and zombie hordes have been quelled, at least for the time being. +
- Added the ability to stop table climbers by clicking the table if present. +
- Labcoats and uniforms no longer use action buttons and object verbs to adjust their aesthetic style. Alt click them to adjust. +
- Alt click a PDA with an ID inside to eject the ID. +
- Renamed 'remove ID' verb to 'eject ID' so it's not immediately next to 'remove pen'. +
- Rebalanced the flash protection of thermal scanners. Syndicate thermals have the same flash weakness as the meson scanners they come disguised as. +
- Adds the Adminbus and Coderbus bar signs. +
- Added a mining satchel of holding to R&D that can hold an infinite amount of ores. It requires gold and uranium, in addition to a decently high bluespace and materials research. +
- Harvesting meat from dead simple animals now takes time, has a sound, and can be done with any sharp weapon. +
- Updated the sprite for Fire extinguishers. +
- Disposable lighters now come in more colors of the rainbow. +
- Server hosts can set a config option to make an unseen changelog pop up on connection. +
- Expanded the on-screen alerts you get on the top-right of your screen. You can shift-click them to get a description of what's wrong and maybe how to fix it. +
- Getting buckled to something will show an alert of what you're buckled to. If you're not handcuffed, you can click the alert to unbuckle. +
- Added Necromantic Stones as a buyable item for wizards +
- Necromantic Stones can cause up to 3 people to rise up as Skeleton Thralls bound to the wielder of the stone +
- Skeleton Thralls have a 33% Chance to drop all their gear on the floor and autoequip a more fitting thematic uniform +
- Allows the blob to reroll it's chemical for a cost. +
- Adds a lot of new plants to botany (red beet, parsnip, snap corn, blumpkin, rice, oat, vanilla, steel cap, mimana, blue cherries, holy melon, geranium, lily, sweet potato) and two new reagents (vanilla, rice). +
- Fixes taser stun duration being longer due to jitter animation. +
- Improvised heating! use lighters or other heat sources to heat beakers, bottles, etc. +
- We have purged the xenomicrobes contamination in the E.X.P.E.R.I-MENTOR using sulfuric acid. Take care not to be exposed should it leak! +
- Colorful reagent can be washed off with water now. +
- Oxygen blob deals breath loss damage. +
- Radioactive blobs irradiate for more. +
- Antagonist roles are now restricted by player client age. +
- The server's current local time is now displayed in status panel in ISO date format (YYYY-MM-DD hh:mm) +
- Added the ability to see pda messages as a ghost with GHOSTWHISPER toggled on. +
- Removed the degrees symbol from Kelvin units on atmos meters because not gramatically correct +
- Drones now see either Static, Black icons or Roguelike style lettering instead of actual mob icons +
- Icons for the above, from VG's SkowronX +
- Many icon procs for the above, from VG's ComicIronic +
- Drones moved into their own folder +
- Drone.dm replaced with seperate files for each functionality +
- Drones now have 2 skins to choose from, Maintenance Drone (Current drones) and Repair Drone (A modified VG/Bay sprite) +
- Much more support for alternate skins on drones +
- Added four new emoji: :1997:, :rune:, :blob:, and :onisoma:. +
- Added a surgery table and tools to the Nuke Ops ship. +
- Added Engineering Scanner Goggles to Engivend, Engineering Secure Closets and Research. +
- Doubled T-ray scanner range. +
- Resprited all owl items. Wings are now a seperate toggleable suit item. +
- Added The Griffin costume, arch nemesis of The Owl. Found in the autodrobe. +
- Added admin-only Owl hardsuit. Only for the most vengeful souls. +
- Added Owl and Griffin merchandise; The Nest barsign, Owl/Griffin toys and posters. +
- Fixes the recipe for meth. +
- Fixes sorium blobs flinging themselves. +
- On servers where malfunction, wizard, and blob rounds do not end with the death of the primary antagonist, new antagonists from traitor and changeling derivative modes will now sometimes spawn. This depends on the state of the station, the state of the crew, and the server's gamemode probabilities. Server owners should consider revising their configuration choices +
- If you would like to opt out of this midround chance, a new toggle to disable it can be found in your preferences +
- The barsign can be emagged and EMP'd; EMP'd signs can be repaired with a screwdriver and cables. +
- Fixed the protolathe not requiring displayed amount of materials to make items. +
- Adds a Panic Bunker! +
- This will prevent any player who has never connected before from connecting. (Admins are exempt) +
- Can be enabled per-round by any admin with +SERVER or for longer periods via the config. +
- Also adds some other config options relating to new joins, server operators should consult their configuration file for more details. +
- Fixes toggle darkness vision hiding other ghosts. +
- Admins fucking around with ghost icon and icon states in VV are going to want to change the icon and icon state of the ghostimage var of the ghost to change the image shown to ghosts who have darkness disabled. doing this via mass edit is not yet supported. +
- New ghost verb, toggle ghost vision. Switches the ghost's invisibility vision between that of a ghost and that of a human. So ghosts can hide other ghosts and in general get the old behaviour of toggle darkness. +
- Messages with two exclamation marks will be yelled in bold. +
- Cultists can't summon narsie until their sacrifice objective is complete. +
- Vines now can grow on any tiles that is not dense, including space, shuttles, centcomm tiles and so on. +
- Added 'Bluespace' mutation to vines, makes them be able to grow through absolutely everything. +
- Added 'Space Proofing' mutation to vines, after they grow if the tile under them is space it will become special vinetile, which is just resprited regular floor, if the vine on the vinetile dies the vineturf changes back to space. +
- Made vines spreading speed depend on the seed's production, can be both slower and faster than current. +
- Made vines mutation chance be 1/10th of the potency of the seed it is spawned from. +
- Special chemicals added to vine seeds durning their growth can increase/decrease their potency and productivity. +
- Special chemicals now can remove good, bad or neutral mutations from vine seeds while they are growing, cultivating actually helpful vines is now possible. +
- Plant analyzers now show the vine seeds mutations. +
- Buffed numbers in some of the more useless mutations. +
- Reworked and expanded areas of the derelict station. Featuring a repairable gravity generator, turret filled computer core and functional solars. +
- Chemists, Geneticists, Virologists, Scientists, and Botanists will now spawn with alternative backpacks and satchels in their lockers. Try them out! +
- Foam now carries reagents, similarly to smoke. Have fun with that. +
- Altered the sprite for security hardsuits. The old sprite is now a HoS specific hardsuit. +
- Turret's guns replaced by a heavy energy cannon. +
- Firing a heavy weapon sindlehandedly can make it recoil out of your hands. +
- Nanotrasen has released new design specifications for the prototype combination of standard night-vision equipment and Optical Meson Scanners. We believe that this will address the concerns many Shaft Miners have concerning visiblity in a potentially unsafe environment. +
- Fixed malf AI's turret upgrade power not working. +
- You can now go into hyperglycaemic shock from having over 200u of Sugar in your body at once. Treat it with Insulin. +
- Insulin has been added. Use it to treat hyperglycaemic shock. You can get it from medical vendors and the Cargo medicine supplies crate. +
- Medvendor contents have been reduced from medical having everything they need at roundstart level, and toxin bottles are now back in the vendor. +
- Medical Analyzers now have 2 modes, Medical Scan and Chemical Scan. You can swap between modes by clicking on it in hand. +
- Medical scan is default behavior. Chemical scan shows all the reagents inside the mob at the time, along with any addictions the mob has. It will show if a reagent is overdosing. +
- Tobacco and Space Tobacco have Nicotine in them now. +
- Adds Methamphetamine to the game. Mix it with Ephedrine, Iodine, Phosphorous, and Hydrogen at 374K. +
- Or, look around in Maintenance for Muriatic Acid, Caustic Soda, and Hydrogen Chloride. Recipes are also available for these. +
- Adds Saltpetre. Mix it with Potassium, Nitrogen, and Oxygen. +
- Adds Bath Salts, mix it with Bad Food, Saltpetre, Nutriment, Space Cleaner, Universal Enzyme, Tea, and Mercury at 374K. +
- Adds Aranesp. Mix it with Epinephrine, Atropine, and Morphine. +
- Adds Hotline. Get it from Poppy plants. +
- Strange Reagent revival was changed. It now won't gib but won't do anything above a 100 BRUTE or BURN threshold. +
- Carpet now applies carpet tiles to whatever flooring it hits. Mix it with Space Drugs and Blood. +
- Colorful Reagent colors have been improved drastically and now are more varied and nicer looking. +
- Corn Starch has been added. Get it from juicing Corn. +
- Corn Syrup has been added. Mix it with Corn Starch and S-Acid. +
- Corgium has been added. Mix it with Nutriment, Colorful Reagent, Strange Reagent, and Blood at 374K. +
- Adds Quantum Hair Dye. Mix it with Colorful Reagent, Radium, and Space Drugs. +
- Adds Barber's Aid. Mix it with Carpet, Radium, and Space Drugs. +
- Adds Concentrated Barber's Aid. Mix it with Barber's Aid and Unstable Mutagen. +
- Re-adds Chlorine Trifluoride. Mix it with Chlorine and Fluorine at 424K. +
- Adds Black Powder. Mix it with Saltpetre, Charcoal, and Sulfur. Ignite it for an explosion at 474K +
- Finally nerfs Salglu Solution. It's no longer tricord 2.0. +
- Salt recipe is now Water + Sodium + Chlorine due to problems with recipe mixing. +
- A new event has been added to the wizards summon events spell that gives the game a distictively more roleplaying flair. +
- Optional population cap functionality has been added to the game. By default all caps are disabled. Server owners should refer to config.txt to see their list of options. +
- Medical borgs now have access to a deployable onboard roller bed. Should the bed become lost, any roller bed may be used in its place. +
- Added interchangeable bar signs +
- Added bays fountain machines for the bar. Soda and Beer. Allowing bartenders to have easier access to mix drinks and making more to make their job a little less boring +
- Added color tiles to the light up floor tiles. +
- Added metal, glass, and cable to bar back room at round start for bartender to make colored light dance floors. +
- Fixes clown cuffing both mobs and two pairs of cuffs appearing. +
- Fixes clown not being able to use his stamp as antag so no meta. +
- Fixes sleepypen bug. Instead of only dispensing 50u it dispenses the full 55u. +
- Fixed silicons not being able to pass through holotape. +
- Getting into regenerative statis now puts the changeling into unconscious state. +
- Fixed changeling 'Revive' not working. +
- Added an assistant cap, unlimited by default. +
- Batons now slowly lose power when left on. +
- Batons, flashbangs and handcuffs can be seen when stored in a belt. +
- Computers now emit light when they're on or bluescreened. +
- Added hotkeys for OOC and custom emotes. Press O and M when in hotkey mode. Remember not to ick in ock! +
- Added megaphones for the HoS, HoP, and QM. +
- Goliath tentacles no longer stun you if you cross them. They will only stun you if you don't move away from them in time. They can do up to 15 damage now, in addition to stunning you. +
- Changed a lot of mining gear and prices. The resonator can now have up to 3 fields active at once, but the fields need to detonate before they crush rocks. Tweak the time before the fields detonate with a screwdriver and upgrade the amount of fields at once with sheets of diamond. +
- Overhauled straight mining tools. The sonic jackhammer is now the wall-crushing tool, the diamond drill simply mines really fast. Borgs can now get upgraded with the diamond mining tool with only a single sheet of diamond and an upgrade module, they don't need illegal tech modules. +
- Mining drills and the sonic jackhammer now draw power when they drill down mineral walls. They can be recharged using any type of weapon recharger or by replacing the cell using a screwdriver on them. +
- Space now emits a dim light to adjacent tiles. +
- Syndicate shotguns now start with buckshot instead of stunslugs. +
- Fixed welding tools using fuel when being switched on. +
- Added a firing delay between shooting electrodes. +
- Changed the stun revolver from a high-capacity taser to a disabler with extra capacity. +
- Added a unique stun pistol for the head of security. It is a double capacity taser with no shot delay and a loyalty pin, though it lacks a disable mode. +
- New brute treatment kit crate for cargo. +
- Explosions will now blow (throw) items away from the epicenter +
- Sharp items can now embedd themselves in a human's limbs +
- Embedded items have a chance to do some damage (based on w_class) each life() call +
- Embedded items have a chance to fall out doing some more damage, but removing the object +
- Adds a surgery to remove Embdedded objects +
- Adds throwing stars as an uplink item (100% chance to embedd) +
- Items placed on tables now center to exactly where you clicked. +
- SS13's Head of Security has received a new attempted 1:1 recreation of a Old Earth weapon, the Captain's Antique Laser Gun. +
- This gun features three firing modes, Tase, Laser and Disable. However this gun lacks the capability to recharge in the field, and is extreamly expensive. +
- INTERCEPTED TRANSMISSION REPORT: The Syndicate have expressed a interest in this new weapon, and have instructed field agents to do whatever they can to steal this weapon. +
- Box's vault nuke has been replaced with immobile Nuclear Self-Destruct Mechanism. +
- Vault's new green floor tiles turn flashing red when Self-Destruct is activated. +
- Syndicate contacts have discovered new ways to manipulate alarms. Malfunctioning AIs, as well as normal emags, can now disable the safeties on air and fire alarms. +
- When one emags an air alarm, its safeties are disabled, giving it the Flood environmental type, which disables scrubbers as well as vent pressure checks. Burn, pigs, burn! +
- When one emags a fire alarm, its thermal sesnsors are disabled. This will prevent automatic alerts due to the alarm being unable to recognize high temperatures. +
- Malf AIs gain two new modules, both of which disable ALL air alarm safeties and thermal sensors. These are separate abilities. +
- Air and fire alarms have notifications on their interface about the current safety status. One only has to glance at one to see that it's been tampered with. +
- Fixed arcade machines being usable from inside lockers to dupe rewards. +
- Silicons can no longer be grabbed by anyone. No more silicon choking +
- Custom food can now be renamed using a pen. +
- Added new graffiti: cyka, prolizard, antilizard +
- Added proper slurring when drunk. +
- Updated the ChemMaster's UI to the station default along with some functionality improvements. +
- You can now spam the 'Ready' button as much as you want without it setting you 'Not ready' again. +
- Added the ability to call Central Command for the nuclear authentication codes. This requires a captain-level ID and admin approval, and warns the crew. +
- E.X.P.E.R.I-MENTOR meteor storm event replaced with a fireball that targets random nearby mob. +
- EMP event range reduced. +
- Self-duplicating relics limited to 10 copies. +
- Nanotrasen has released a firmware patch for the Ore Redemption Machine, which now allows the station AI, cyborgs, and maintenance drones to smelt raw resources without the need of a valid identification card installed. +
- Nanotrasen scientists have completed their designs for a lightweight, compacted anti-armor ion weapon, without loss of efficiency. In theory, such a weapon could easily fit within standard issue backpacks and satchels. With sufficient research into weapons technology and materials, Nanotrasen believes a working prototype can be fabricated. +
- Buffs the shit out of Styptic Powder and Silver Sulf, they're now viable to use. Synthflesh is still good for general treatment, but overall Styptic and Silver Sulf deal with their respective damage types way better now. +
- Improves kinetic accelerator's mining strength. +
- The kinetic accelerator's cooldown can be decreased by tweaking the thermal exchanger with a screwdriver. +
- The range can be increased with plasma sheets +
- Medical borgs have been given full surgery tools which they can't fail a procedure with. +
- Medical borgs also have rechargeable gauze. +
- Borg hypo's omnizine replaced with salbutamol, salglu and charcoal. +
- Slime and Jelly mutant races now actually contain slime jelly. While playing as these races you will naturally produce it internally from your nutrition, so be sure to stay well fed as losing too much is dangerous to your health! Beware of chems that clear toxins, as they can be rapidly fatal to you! +
- Veil render and rifts changed to spawn with vars, rifts can be closed with a nullrod. +
- General record now contains a species field and a photo of the crewmember. Security record consoles allow you to update it with a photo taken in-game (with detective's camera, for example, or AI's). +
- Expanded functionality of security HUDs to display rank and photos. +
- Medical HUDs allow user to change others' mental and physical status. Currently has no gameplay effect other than changing records. +
- Medical HUDs can perform an examination at the distance, similrarly to how attacking yourself with help intent works. Has limited ability to detect suffocation and toxin damage. +
- Solar control computers remade with NanoUI +
- Added rnd requirements to borg upgrades and tweaked the prices. +
- Changed some clothing around. Added a turtleneck for the HoS. Removed 'civillian' armor and gave normal armor to the bartender and HoP. Added flash protection to the HoS' eyepatch, it functions like sunglasses now. Additionally, added the ability to store ammo on your shoulder holster as detective. +
- Removed the defib steal objective. Added a compact defibrillator for the CMO that equips to the belt. Removed defibrillators from RND. Removed the requirement for people to not wear armor to revive them with defibs. Doubled defib timers (10 minutes before permadeath). +
- Flashlights can be attached to pulse carbines. +
- Miners spawn with a brute patch. +
- Mining station's sleeper has been replaced with an IV drip and more medkits. +
- Added hard-light holotape. This holographic police or engineering hazard tape will block entry if you're running, so you need to walk to pass it. This is to help people not sprint into breaches or crime scenes. +
- Fixed being able to sling the strapless improvised shotgun on your back. +
- Reverted the price of the ebow to 12tc and removed the range limit of its bolts. +
- Novely pig mask prize from arcade machines, can be toggled to make you squeal like a pig. +
- Security Cyborgs Advance Taser have been replaced with a Disabler. +
- Adds plaid skirts and new schoolgirl outfits to the autodrobe +
- Novaflowers apply a firestack for every 20 potency they have. +
- You can now juice whole watermelons instead of slices. +
- Advancements in the field of virology by Nanotrasen's finest have uncovered three new disease symptoms for further research: +
- Ocular Restoration heals any eye trauma experienced by the infected patient. +
- Revitiligo increases the pigmentation levels of the infected patient's skin. +
- Spontaneous Combustion ignites the infected patient without warning. +
- Added shot glasses! Can be obtained from the Booze-o-Mat. +
- A new premium vodka has been added to the game, hidden in a special spot. +
- Due to constant attempts to break into the station's safe, the contents have been relocated and have not been replaced. We promise. There is absolutely NO reason to break into the vault's safe anymore. +
- Each shot glass now holds 15 units, and the drinker takes all 15 in one gulp instead of 5 at a time. This means you can mix certain shots (namely, the B-52 and Toxins Special) in a shot glass. Both drinks have been made exclusive to shot glasses and will no longer show their specific sprite in a normal glass. +
- Added new sprites for most alcohol in shot glasses. Everything else will show up as 'shot of... what?'. +
- Fixed shot glasses turning into regular glasses when filled. +
- Fixed tequila bottle sprites not showing up. +
- Fixed a typo! +
- Roboticists will now start with a full toolbelt instead of a toolbox. +
- Blobs who burst in space will be given a 30 second warning before dying. +
- If a blob does die from bursting in space, a new crewmember will be infected. +
- If there are no blobs or infected crew left after bursting, the round will now end properly, rather than becoming endless. +
- You no longer need to cut the syphon wire to deconstruct air alarms. +
- Cooking overhaul: microwave recipes are converted to tablecraft recipes. +
- Added customizable food (burger,sandwich,spaghettis,soup,salad,cake,bread,kebab,pie) with specific color depending on ingredients used. +
- Added new food ingredients (dough, flat dough, cake batter, pie dough, doughslice, bun, raw pastry base, pastry base, raw cutlet, cutlet, pizzabread). Dough is made by mixing egg and flour, then transformed by using knife, rollingpin, milk and microwave. Meat is now sliceable into rawcutlets (specific color for each meat type). +
- Changed food recipes a bit (replacing stuff with new food ingredients). +
- Repurposed the microwave to actually cook certain food items(no reagents required), renamed it microwave oven and added a power setting to it. +
- Bowl is no longer trash but a beaker-like container that is used in salad&soup recipes. Also, milk and soymilk cartons as well as flour packs are now condiment bottles. +
- Changed the hunger system a bit, sugar becomes a normal reagent again. Faster nutrition drain is now handled by a variable in junk food. Also added a slight buff to vitamin. +
- You now hear the voice of the chosen deity in prayers. +
- Added suicide messages for all gun types and various different items. +
- Compacted ERT room by removing equipment rooms, filler rooms and pre-spawned mechs. +
- Rebalanced Pulse weapons to have more shots, faster charge, EMP immunity and modified sprites. +
- ERT spawns fully equipped with no-slowdown suits. +
- Added blood and bleeding. If you take enough brute damage on a certain limb, you will start bleeding, and will need to patch your bleeding with gauze from medbay. You can replace lost blood by eating nutritious food and waiting for your heart to reproduce it, or by getting a blood transfusion from an IV drip. +
- Added a toy red button to the Arcade cabinets. +
- Fixes dufflebag's storage capacity. +
- Removes duplicate fluorine from Chemical Dispenser. +
- Added GoonChems to the Portable Chem Dispenser. +
- Added cancel buttons to the ChemMaster and CondiMaster when making bottles, pills, etc. +
- Added new foam armblade toy to arcade prizes. +
- Slimes can drag themselves to mobs to start feeding. +
- Attacking another slime will pull them off their victim if they're feeding or steal some of their mass. +
- Five new silicon emotes: *buzz2, *chime, *honk, *sad and *warn +
- New contraband crate containing fifty butterflies. +
- Shuttle will now always arrive, but won't launch in rounds where it would've been previously auto-recalled. +
- Fixed being unable to place cables on plating. +
- Helmets for hardsuits are stored inside the suit and cannot be equipped without the suit on. +
- EVA space suits are now lighter for faster movement but lack flash or welding protection, don't hide your identity and have less radiation protection. +
- Tweaked slowdown due to coldness when in in low gravity. +
- ERT base equipment rooms are now access restriction to each role. +
- ERT commander spawns wearing hardsuit for identification. +
- Two boxes of metal foam grenades added for ERT engineers. +
- Deep space sensors recently detected the derelict remains of the NTSS Omen, a outdated Medical Frigate thought lost, within close proximity to Space Station 13. +
- If any SS13 EVA Personal are able to locate this ship, they will be able to pilot it back to the station for recovery. The ship may also have cordinates for other locations. +
- Changelings now have the ability Strained Muscles, which lets them move at inhuman speeds at the cost of rapid stamina damage. It costs one evolution points=. +
- Changelings now have the ability Augmented Eyesight, which lets them see creatures through walls and see in the dark. It costs two evolution points. +
- After many failed raids, the Syndicate have finally done something about poor communications between cyborgs and operatives. +
- Syndicate Cyborgs now come equipped with operative pinpointers, which will automatically point to the nearest nuclear operative. +
- Handheld crew monitors can now be stored in medical belts. +
- Added fannypacks of multiple colors, 3 of which are accessible from the clothing vendor. +
- Added dufflebags to multiple lockers throughout the station and to the syndicate shuttle, more storage slots at the cost of move speed. +
- Fixed some bugs in PDA's NTRC Chatroom feature. +
- You can now use PaperBBCode/PenCode when writing news articles on the newscaster. +
- PDA's Notekeeper now uses PaperBBCode/PenCode rather than HTML. +
- Scanning paper with your PDA is now more informative. +
- We, at NanoTrasen, have recently upgraded the Kitchen Spikes to include the skin of both Monkeys and Aliens when you harvest their flesh! +
- In other news, a station in a nearby Sector has been making monkey and xeno costumes. We are not sure why. +
- Added the ability to reform mineral floortiles back into sheets/bars +
- Added a new config option MINIMAL_ACCESS_THRESHOLD that can be used to automatically give players more access during low-population rounds. See game_options.txt for more information. +
- The kitchen now contains a brand new food cart. It can store foods and liquids, mix them into cocktails and dispense where needed. Food delivery has never been easier! +
- Added briefcase filled with cash to uplink. +
- Addiction and Overdosing has been added to Chemistry. +
- Deal with Overdosing by purging the ODing chemical with Calomel or Penetic Acid. +
- Deal with Addiction by either going cold turkey on it and weathering the effects, eventually causing the addiction to subside, or by taking more of the addictive substance to keep the effects down. +
- Cryoxadane was heavily buffed. Clonex was removed as it was merged into Cryox. +
- Fixes a shitton of stuff adding Morphine instead of Ephedrine. Sorry, miners. +
- Fixes instances of Alkysine not being replaced with Mannitol. Same with Ryetalyn being replaced with Mutadone. +
- Adds Itching Powder. Welding Fuel and Ammonia. +
- Adds Antihol. Ethanol and Charcoal. +
- Adds Triple Citrus. Lemon Juice, Lime Juice, and Orange Juice. +
- Adds Colorful Reagent. Stable Plasma, Triple Citrus, +
- Morphine replaces sleep toxin now, not Hyperzine. Hyperzine is replaced by Ephedrine now. +
- Cryotubes will now autoeject you once you are fully healed. +
- Synthflesh damage values have been fixed. +
- Charcoal has been buffed to heal 3 TOX damage a cycle and it purges other chemicals faster. +
- Saline-Glucose Solution has been buffed. It now has a 50% chance per cycle to heal 3 BRUTE and BURN per tick. +
- Fixes Strange Reagent revivals dying right after being revived. They'll still need immediate medical treatment, however. +
- Cryoxadone has had a recipe change. It is now Stable Plasma, Acetone, and Unstable Mutagen. +
- Adds 9 new Disabilites and 2 new genetic powers. +
- You can now heat donk pockets once more. Rejoice. +
- The lockbox system for R&D has been replaced with a firing pin system. Ask the Warden or HoS for firing pins to allow normal operation of your firearms. Want to test them out at the range? Try printing a test-range pin. +
- Nuke Ops have used this new technology to lock some of their heavier weapons so that crew cannot use them. These implants replace their explosive implants. +
- Explosive implants are now purchasable in the uplink, and are much stronger. +
- NanoTrasen would like to report that our Mechanical Engineers at NTEngiCore has recently upgraded the capacity of the machines known as Biogenerators. They are now have the added ability to create various belts, and also weed/plantkillers and cartons of milk and cream! +
- Replaced Star Trek chemistry with Goon Chemistry. +
- Emergency Medic's Handbook Tip 1: Styptic Powder = BRUTE, Silver Sulfadiazine = BURN, Charcoal = TOX, Salbutamol = OXY +
- In recipes that used removed reagents, they have been replaced with their goon chemistry counterpart: +
- Hyperzine -> Morphine +
- Inaprovaline -> Epinephrine +
- Kelotane -> Saline-Glucose Solution +
- Bicardine -> Saline-Glucose Solution +
- Dermaline -> Saline-Glucose Solution +
- Dexalin -> Salbutamol +
- Dexalin Plus -> Salbutamol +
- Tricordrazine -> Omnizine +
- Anti-Toxin -> Charcoal +
- Hydronalin -> Penetic Acid +
- Arithrazine -> Penetic Acid +
- Imidazoline -> Oculine +
- Mannitol -> Alkysine +
- Ryetalyn -> Mutadone +
- The Emergency Response Team project has been activated by Nanotrasen. The ERT are a seven man squad that can be deployed by the Central Command (admins) to attempt to rescue the station from a overwhelming threat, or to render assistance in dealing with a significant problem. +
- The ERT consists of a single Commander, two Security Officers, two Engineering Officers and two Medical Officers. The Commander is preselected when the squad is being spawned in, however the remaining six officers are free to select their role in the squad. +
- Two new Pulse gun variants have been added to the game. They are the Pulse Carbine and the Pulse Pistol, both have significantly smaller ammunition capacities than the Pulse Rifle, however they both can fit in a backpack and the pistol can fit in a pocket. All ERT Officers have a Pulse Pistol for a sidearm, however the Security Officers get a Pulse Carbine as their primary longarm. +
- The two library consoles are now real buildable computers. The circuitboard design is available in R&D. +
- Added a new R&D machine, to replace the telescience room. The Machine is based on RND and various interdepartmental creations. +
- Adds a new spell: Repulse. (Cooldown: 40 seconds, 15 at max upgrade.) Repulse throws objects and creatures within 5 tiles of the caster away and stuns them for a very short time. Distance thrown decreases as the distance from the caster increases. (Max of 5, minimum of 3) Casting it while standing over someone will stun them for longer and cause brute damage but will not throw them. +
- Fixes the Exosuit Control Console having the unpowered icon state while powered. +
- Added Goonstation Chemistry! +
- Adds 14 medicines! +
- Adds 3 pyrotechnics! +
- Adds 3 drugs with actual gameplay uses! +
- Adds 7 toxins! +
- Adds a Chemical Heater for some new recipes! +
- Adds Chemical Patches for touch based applications! +
- Adds a Traitor Poison Kit! +
- Adds Morphine Medipens! +
- Adds Morphine bottles to Cargo! +
- Adds a bandanas in basic colors to lockers in the station. Activate in hand to switch between head and mask modes. +
- Adds more colored jumpsuits to the mixed locker. +
- Player controlled slimes can now change their face to match AI controlled slimes in kawaiiness. use *help as a slime to find the commands. +
- Fixed NTSL division. +
- Added new NTSL math functions, including 'sin,' 'cos,' 'asin,' 'acos,' and 'log.' +
- Adds emoji to OOC chat. +
- Buffs the RCD from 30 matter units to max capacity 100, and increases the value of matter charges. +
- Taser electrodes now have a limited range of 7 tiles. +
- The energy gun's stun mode has been replaced with a disable mode. +
- Security officers will now spawn with tasers. +
- Disabler beams now go through windows and grilles. +
- Disabler beams now do 33 stamina damage instead of 34. This means they will only stun in 3 hits on someone that is NOT 100% healthy. +
- Most ballistic projectiles now do stamina damage in addition to their regular damage instead of stunning. This includes nuke op c-20r .45, detective's revolver, etc. They are effectively better than disablers at stunning people, as well as do significant damage, but they do not stun instantly like a taser. Expect engagements to be a little longer and plan ahead for this. +
- Added an advanced taser for RnD, the child of a disabler and a taser. +
- Envoys from the distant Viji sector have brought an exotic contraption to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient alien artifact, believed to have a dangerous and mysterious power. This precious item has been made available to the Space Station 13 cargo team for the cost of a hundred supply points, as a reward for all your hard work. Good luck, and stay safe. +
- Reverted security armor and helmets to the old (Grey) style of armor/helmets. +
- Updated security jumpsuits to be more consistent across officer/warden/HoS ranks. +
- Added tactical armor and helmets to replace the largely unused bulletproof vest in the armory. This armor has higher bullet and explosive resistance than normal armor, and uses the previous, more military armor/helmet sprites. +
- Added a new injury doll to go along with the overall health meter. This will show you locational overall limb-based burn/brute damage, so you can tell the difference between being hurt with burn/brute or toxins/stamina damage which does not affect limbs. +
- Reverted some UI icons back to their older status and changed some around for readability. Thank you for your feedback. +
- Added a new FRAG-12 explosive shotgun shell, built from the unloaded technological shell, using tablecrafting. Constructed using an unloaded technological tech shell, 5 units sulphuric acid, 5 units polytrinic acid, 5 units glycerol, and requires a screwdriver. +
- Change to the hunger system. Eating food with sugar temporarily worsens your nutrition drop rate. Eating too much sugar too quickly can make you temporarily unable to eat any sugary food. The nutritional effect of sugar depends on how hungry you are thus it cannot easily raise your nutrition level past well fed and is best used when hungry. Lots of sugar can make you a bit jittery at times. Eating food with vitamin (new reagent) counteracts the sugar effects and can give you temporary buffs when well fed: it lowers your chance to catch or spread viruses,it makes your body's metabolism more efficient that is it keeps healing reagents longer and evacuate toxins faster and reduces damage from radioactive reagents. Your metabolism gets less efficient if starving. +
- New hunger hud icons: starving, hungry, fed, well fed, full, fat. +
- Snack vending machine get a chef compartment that can be loaded with non-sugary food by hand or with a tray by anyone with kitchen access (unless you hack the machine with multitool or emag). The food can be unloaded by anyone, like regular snacks +
- Cargo can get a nutritious pizza crate order for 60 points. +
- Grown and cooked food gets some vitamin while junk food gets less nutriment and more sugar (only hot donkpocket and ramen don't have sugar) +
- The number of junk food in snack vending machine is lowered from 6 to 5 of each type. +
- Fixing not being able to load an omelette du fromage on a tray. +
- The Nanotrasen firmware update 12.05.14 for station AI units and cyborgs includes a patch to give them more control of their automatic speech systems. They can now chose if the message should be broadcasted with their installed radio system and any frequency available to them. +
- Added winter coats and winter boots! Bundle up for space xmas! They are available in most wardrobe and job lockers, and come with special features depending on the flavor! +
- Added a new weapon for syndicate boarding parties, the C-90gl assault rifle. This is a hybrid rifle with a lot of damage and a grenade launcher alt-fire. Purchasable for 18TC. +
- Suppressors can now be used on the protolathe SMG and the C-20r. +
- Sounds in areas of low pressure (E.g. Space) are now much quieter +
- To hear someone in space you need to be stood next to them, or use a radio +
- We've discovered that slimes react to the introduction of certain chemicals in their bloodstream. Inaprovaline will decrease the slimes children's chance of mutation, and plasma will increase it. +
- We've also found that feeding slimes solid plasma bars makes them more friendly to humans. +
- Allows using replica pods to clone people without bodies. +
- Speeds up replica pod cloning by adjusting the starting production. +
- Replica pods will now only create plantmen. +
- Mixing blood in a beaker or taking it from a suicide victim will render the blood sample useless for replica pod cloning. +
- Our top Nanotrasen scientists have provided improved specifications for the Rapid Part Exchange Device (RPED)! The RPED can now contain up to 50 machine components, and will display identical items in groups when using its inventory interface. +
- Note that power cells, being somewhat bulkier, will take up more space inside the device. In addition, the RPED's firmware has also been updated to assist in new machine construction! Simply have the required components inside the RPED, apply it to an unfinished machine with its circuit board installed, and watch as the device does the work! +
- Nanotrasen has updated station bound Artificial Intelligence unit design specifications to include an integrated subspace radio transmitter. The transmitter is programmed with all standard department channels, along with the inclusion of its private channel. It is accessed using :o in its interface. +
- {INCOMING CLASSIFIED SYNDICATE TRANSMISSION} Greetings, agents! Today, we are happy to announce that we have successfully reverse engineered the new subspace radio found in Nanotrasen's newest AI build plans. We have included our encryption data into these transmitters. +
- Should you be deployed with one of our agent AIs, it may be wise of you to purchase a syndicate encryption key in order to contact it securely. Remember, as with other agents, a Syndicate AI is unlikely to be of the same Syndicate corporation as you, and you both may actually have conflicting mission parameters! Your channel, as always, is accessed using :t. +
- Changed the way flashbang protection works. Currently, only security helmets (and their derivatives like swat and riot), and some hardsuit helmets have flashbang protection. Ear items like earmuffs and 'bowman' headsets (alternative, larger headsets) have flashbang protection as well, so you're able to go hatless as security. The Head of security, warden, and detective's hat do NOT have flashbang protection, but their earpieces do, from the 'noise' part of the flashbang. The flashbang blind still works as before, with only sunglasses/hardsuit helmets protecting you. +
- Security/Medical HUDs are now more responsive and less laggy. +
- Made meteors more threatening. +
- Added three levels of danger for meteors waves, randomly selected at spawn. +
- Rumors speaks of a very rare meteor of unfathomable destructive power in the station sector... +
- Fixed infinigib/infinisplosion with meteors bumping +
- Added a defibrillator and an EMT alternative clothing set for medical doctors. These defibrillators will revive the recently deceased as long as their souls are occupying their body and they have no outstanding brute or burn damage. +
- Yes, they actually work now too! +
- Added a way for you to unload a round from a chambered projectile weapon. Simply click on the gun when it is in your active hand, and assuming it does not have a magazine, the round should pop out. You can also use this system to unload individual bullets from magazines and ammo boxes, like the detective's speed loaders. +
- Added glass tables and overhauled how table construction works. Now, you need to build a frame using either metal rods or wood planks, and then place a top on the table. +
- Table disassembly now works in two stages. Screwdriver the table to remove the top of it and reduce it back to a frame. Frames can be moved around and walked on top of. Wrench the table to deconstruct it entirely back to parts, this is quicker and much more like the old fashion. To deconstruct a frame, use your wrench on it as well. +
- Fixed traitor med analyzers not fitting in medical belts. +
- Fixed syringe box bug with medipens. +
- Added escape-with-identity objective for changelings. Completion requires the changeling to have transformed to their target and be wearing an ID card with the target's name on it when escaping. +
- Changelings can absorb someone even if they have that DNA in storage already. +
- Fixes hivemind being lost when readapting evolutions. +
- You can use AI Upload modules directly on unslaved cyborgs to change their laws. The panel has to be open to do this. +
- Newly emagged cyborgs get locked down for a little bit until their new laws get shown. Thank you to whoever bitched about it on singulo and filed an issue report. +
- Added an advanced mop for the janitor, available at the protolathe. This hi-tech custodian's friend can mop twice as many floor tiles before needing to return to your bucket! +
- Moved holosign projector to the protolathe and gave the janitor back his old signs. We hope you've enjoyed this free trial run of holo projectors, but our budget is tight! +
- Added a holosign projector to the janitor module for cyborgs. +
- Soap now has a delay. Different soap types clean faster than others, but expect to put it some extra arm work if you want to clean that fresh blood! +
- Cutting-edge research in a secret Nanotransen lab has shed light into a revolutionary form of communication technology known as 'chat'. The Personal Data Assistants of Space Station 13 have been deployed with an experimental module implementing this system, dubbed 'Nanotransen Relay Chat'. +
- Everything now drifts in space, not just mobs. +
- Mechs are just as maneuverable in space as you are. +
- Being weightless now slows movement down by a lot rather than speeding it up. Having your hands full will make movement even slower. +
- Removed spaceslipping (You slipped! x1000) +
- Jetpacking after being thrown out a mass driver will cancel out your momentum. +
- Shooting a gun causes you to drift the other direction like spraying a fire extinguisher. +
- Adds a new riot shotgun that spawns in the armory with a 6 round beanbag magazine. +
- Allowed constructs to assist in activating most runes. This includes conversion runes, but does NOT include sacrifice runes. +
- In light of the recent achievements of the Robotics department, new and upgraded exosuit schematics were delivered to SS13 exosuit fabricators as a reward from CentComm. +
- The countless hours of research, experimentation, and reverse-engineering of wrecks from the mining asteroid have paid off - the Research team has rediscovered the process of building Phazon exosuits. The parts and circuits have been made available in the exofabs and circuit printers. +
- The APLU Ripley exosuit has been refitted with asteroid mining purposes in mind. Its armour plating will provide extra protection against the brute attacks of asteroid alien lifeforms, and protect from gibtonite explosions. The leg servos were upgraded to provide faster movement. +
- There are rumours of some creative shaft miners discovering a way of augmenting APLU Ripley armour with trophy hides from goliath-type asteroid lifeforms... +
- Durand construction routines now require a phasic scanner module and a super capacitor to match Nanotrasen industry standards. +
- The exosuit fire extinguisher now boasts a larger watertank, and carries a whole 1000u of water from the old 200u tank. +
- The exosuit plasma converter's efficiency has been vastly improved upon, and its fuel consumption has been cut to nearly half of old values. +
- The exosuit sleeper interiors have been refitted to allow the occupants more freedom of movement, and the occupants may now eject at will. +
- The armour plating on all exosuits was fitted with reactive deflection systems specifically designed to stop the rapid slashes from xenomorph threats. +
- The Firefighter Ripley chassis were moved from the Exosuit Equipment section to the APLU Ripley section of exofab menus. +
- Fixed some minor errors in the exosuit construction message syntax. +
- Closets and its children can no longer contain a near infinite amount of mobs. Large mobs (juggernaut, alien emperess, etc) don't fit, small mobs (mouse, parrot, etc) still fit in the same amounts, human-sized mob (humanoid, slime, etc) fit but maximum two per body bag and three for all the other closets. Adding bluespace body bag to R&D, it can hold even large mobs and in large amounts. +
- girders and displaced girders now have a chance to let projectiles pass through them. +
- Major atmos update. Featuring pretty colors. +
- 4-Way pipes added. +
- Flip-able trinary devices (mixer & filter). +
- Pipe-painter added. +
- Most pipe icons have been tweaked with shading and such, making it look more uniform. +
- We have managed to re-discover drones! We improved the formula, and have discovered some cool stuff. +
- After some fiddling with audio recognition, drones can now understand human speech! +
- One of our engineers found some screws that were loose on some of our tests, screwing them in made the drone work as if it had just come out of robotics. +
- We had to sacrifice some of our NT brand EMP protection for the speech recognition, so drones can get damaged if subjected to heavy EMP radiation. +
- We figured out why drones couldn't remove objects from people, that has been fixed. +
- The standby light wasn't wired correctly. +
- Unfortunately one of our assistants tasked with transporting the only copy of the data dropped the flash drive in hot water because he wanted to see what "drone tea" tasted like. You'll have to discover them again. +
- Station's crayons have been upgraded to the version 2.0 of ColourOS. Don't worry, they are still edible! +
- Many items now have different stripping delays. Heavier and more armored pieces of clothing are generally more difficult to take off someone else, while smaller items can be very easy to snatch. Pockets always take 4 seconds to search. +
- Implants are activated via action buttons on the top-left corner of your screen instead of emotes. +
- Added zipties for security and nuke operatives. These have a slightly shorter 'breakout time' as normal cuffs but they are destroyed upon removal. Beepsky and sec borgs now use these by default. +
- Changed the medical HUD in the tactical medkit to a night vision HUD so syndicate medics don't stumble around in the dark. Can be purchased through nuke op uplinks. +
- Added a second roboticist roundstart job slot. +
- Added a third cargo tech job slot. +
- Added undershirts as a companion piece to jumpsuit adjusting. Beat the heat with a comfortable tank top, or warm up with an extra layer tshirt! +
- Added a holographic sign projector to replace the old wet floor signs to encourage janitors to warn crewmembers about wet floors. +
- Medical supplies crate now comes with a boxy full of bodybags +
- Added inaprovaline MediPens (autoinjectors) that replace inaprovaline syringes in medkits. Like the syringes, these can be used to stabilize patients in critical condition, but require no medical knowledge to use. +
- Reverted the mining scanner to a manual scanner. +
- Buffed the rate of the automatic scanner +
- Added automatic scanner to equipment locker. It is also available by redeeming your voucher. +
- Reduced the size of the mining jetpack, it now fits in backpacks. The capacity of the jetpack has been reduced as well, however. +
- Removed resonator from the mining voucher redemption. Replaced it with a mining drill. +
- Flash mechanics changed. Instead of a knockdown effect, it will cause a stumbling effect. This includes area-flashing. The five-use-per-minute limit has been removed. "Synthetic" flashes made in the protolathe are now normal flashes. +
- Added a unique shield to the Head of Security's locker. It can be concealed for storage and activated like an energy shield, but functions like a riot shield. It can also be made at the protolathe. +
- Marauders: Due to your extremely great performance as of late, we've added a new equipment room on Mother Base. A lot of your equipment has been moved to this room, as well as some new equipment added onto the Mothership. Take some extra time to familiarize yourself with the placement of your equipment. +
- Oh, and you guys have a space carp now too. +
- Added jumpsuit adjusting. Adjust your jumpsuit to wear it more casually by rolling it down or roll up those sleeves of that hard-worn suit! +
- Added a grey alternative to the detective's suit and trenchcoat. Now you can be a noir private investigator! +
- Space Station 13 has been deployed with transit tube dispensers. Central Command encourages the engineering department to repair and improve the station using this equipment. +
- Character Save Files will now remember Species. +
- Added 5 new maintenance ambience tracks, made by Cuboos. +
- Added examine descriptions to twenty eight objects. +
- Due to some payroll cuts affecting lower-rank crewmembers on Space Station 13, we fear that uprisings and mutinies might be approaching. To help defend themselves, all heads of staff have been given telescopic batons to subdue attackers should they be assaulted during their shifts. +
- Toolbelts can now hold pocket fire extinguishers. Atmos technicians spawn with them. +
- Remember those magboots we had our undercover agents steal? Well we've finally reverse engineered them. Not only that, but we gave them a killer paintjob. They will be available in the uplinks of boarding parties we send out to Nanoscum stations. +
- Listen up, Marauders! The Syndicate has recently cut back funding into boarding parties. What this means is no more hi-tech fancy energy guns. We've had to roll back to using cheaper, mass-produced automatic shotguns. But in retrospect, could this possibly be a downgrade? +
- Experienced smugglers have joined the Syndicate, adding their bag of tricks to its arsenal. These tricky pouches can even fit under floor plating! +
- Adds Gang War, a new game mode still in alpha development. +
- After a public relations nightmare in which a horde of 30 assistants violently dismembered a sole commander the revolution has begin tactically reducing their initial presence in stations with weak command structures. Should stations add to their command staff during the shift additional support will be provided. +
- Too many instances of crying CMOs hiding in the lockers of supposedly secured revoulutionary stations has lead to a crackdown on revolutionary policy. You must kill or maroon the entire command staff, reguardless of when they reached the station. +
- Intense study into the underlying structure of the universe has revealed that everything fits into a massive SPACECUBE. This deep and profound understanding has led to a revolution in cross surface movement, and spacemen can look forward to a new era of predictable and safe space-fairing. +
- Grille damage update, humans now deal less unarmed damage to grilles while projectiles and items deal more. +
- Replaced all AI turrets with porta-turrets that work on LoS instead of area and can be individually configured +
- Voice changer masks work again. +
- You can now turn voice changer masks on/off by activating them in your hand. They start off. +
- The amount of TC has been increased to 20, but the price of all items has been doubled as well +
- With this, the prices of stealthy items has been slightly decreased and the prices of offensive items slightly increased (+/- 1 TC) +
- New research in the area of robotics has been published on Maintenance Drones, little robots capable of repairing and improving the station. Unfortunately, all of the research was lost in a catastrophic server fire, but we know they can be made, so it's up to you to re-discover them! Make us proud! +
- Changed all clone damage descriptions to use the term cellular damage to avoid confusion with genetics mutations. +
- Nanotrasen scientists have released a Heads-Up-Display (HUD) upgrade for all AI and Cyborg units! Cyborgs have had Medical sensors and a Security datacore integrated into their core hardware, replacing the need for a specific module. +
- AI units are now able to have suit sensor or crew manifest data displayed to them as a visual overlay. When viewing a crewmember with suit sensors set to health monitoring, the health status will be available on the AI's medical HUD. In Security mode, the role as printed on the crewmember's ID card will be displayed to the AI. +
- Any entity with a Security or Medical HUD active will recieve appropriate messages on that HUD. +
- Server Operators: A new config option added to restrict command and security roles to humans only. Simply add/uncomment the line ENFORCE_HUMAN_AUTHORITY in game_options.txt. +
- Players: To check if this config option is enabled on your server, type show-server-revision into the game's command line. + +
- Tampered supply ordering consoles can now order dangerous devices directly from the Syndicate for 140 points. +
- Securitrons line units will no longer arrest individuals without IDs if their faces can still be read. +
- Enemy Agent ID cards have been reported to be able to interfere with the new securitron threat assessment protocols. +
- The Syndicate base has been modified to only allow the leading operative to launch the mission. + +
- All the objects found in BoxStation maintenance are now randomized at round start. +
- Cost of Syndicate bombs increased to 6 telecrystals. +
- Many new posters have been added. +
- Adds preference toggle for intent selection mode. +
- Direct selection mode switches intent to the one you click on instead of cycling them. + +
- New more detailed End-Round report. +
- Removes count of readied players from the lobby. + +
- Virology has been made the right color. +
- A major rework of saycode has been completed which fixes numerous issues and improves functionality. +
- Please report any issues you notice with any form of messaging to Github. + +
- Adds two new hairstyles. +
- Space Station 13 has been authorized to requisition additional Tank Transfer Valves from Centcom's supply lines for the price of 60 cargo points. +
- Security forces are advised to increase scrutiny on personnel coming into contact with AI systems. Central Intelligence suggests that Syndicate terrorist groups may have begun targeting our AIs for destruction. +
- For the preservation of corporate assets, Central Command would like to remind all personnel that evacuating during an emergency is mandatory. We suspect that terrorist groups may be attempting to abduct marooned personnel who failed to evacuate. +
- R&D; teams have released an urgent update to station teleporters. To eliminate the risk of mutation, personnel are advised to calibrate teleporters before attempting each use. +
- Centcom has approved the Captain's request to rig the display case in his office with a burglar alarm. Any attempts to breach the case will now trigger a lockdown of the room. +
- **Crew Monitoring Consoles now scan their own Z-level for suit sensors, instead of only scanning Z1. +
- **Server operators can now set a name for the station in config.txt. Simply add the line "STATIONNAME Space Station 13" anywhere on the text file. Replace Space Station 13 with your station name of choice. + +
- Ore redemption machine can now smelt plasteel. +
- Mulebot speed has been vastly increased by up to 300%. +
- Removed exploit where false walls can be used to cheese the AI chamber's defenses +
- The Phase Shift ability will no longer instantly gib players. Instead, they will be knocked out for a few seconds. Mechas will be damaged. +
- The Phase Slayer ability will no longer instantly gib players. Instead, they will be dealt 190 brute damage. Mechas will be dealt 380 damage. +
- ADMIN: Most Event buttons have been moved out of the secrets menu and into a Fun verb. +
- Three new shotgun shells added. Create them by first researching and printing an unloaded tech shell in R&D.; Afterwards, use table-crafting with the appropriate components with a screwdriver in-hand. +
- Meteorshot: tech shell + compressed matter cartridge + micro(or better) manipulator. +
- Pulse Slug: tech shell + advanced capacitor + ultra micro-laser. +
- Dragonsbreath: tech shell + 5 phosphorus (in container). +
- Incendiary rounds now leave a blazing trail as they pass. This includes existing incendiary rounds, new dragonsbreath rounds, and the Dark Gygax's carbine. +
- Brig cells and labour shuttle have both been modified to send a message to all security HUDs whenever a prisoner is automatically released. +
- The labour camp has been outfitted with a points checking console to allow prisoners to check their quota progress easier and better explain the punishment system of forced labour. +
- 25 new hairstyles have been added. +
- AI photography has been extended to Cyborgs. While connected to an AI, all images taken by cyborgs will be placed in the AI's album, and viewable by the AI and all linked Cyborgs. +
- When a Cyborgs AI link wire is pulsed, the images from the Cyborgs image album will be synced with the AI it gets linked to. +
- Additonally, Cyborgs are able to attach images to newscaster feeds from whichever album is active for them. Cyborgs are also mobile, inefficent, printers of same images. +
- Boxstation map updates:
+ -Singularity engine walled from from outer space
+ -Shutters for exterior Science windows
+ -Teleporter board moved from RD's Office to Tech Storage now that the teleporter can be built again.
+ -Security Deputy Armbands (red) added in HoS's Office
+ - Added a new mutetoxin that can be made with 2 parts uranium, 1 part water and 1 part carbon and makes people mute temporarily +
- Parapens were renamed to sleepy pens and now contain 30 units of mutetoxin and 30 units of sleeptoxin instead of zombie powder. +
- C4 can no longer be attached to mobs +
- Reduced the C4 price to 1 telecrystal +
- We, of the NanoTrasen Botany Research and Developent(NTBiRD), has some important announcements for the Botany staff aboard our stations. +
- We have recently released a new strain of Tower Cap. It is now ensured that more planks can be gotten from a single log. +
- Head Scientist [REDACTED] is thanked for his new strain of Blood Tomatoes. It now not only contains human blood, but also chunks of human flesh! +
- We have also discovered a way to replant the infamous Cash Trees and 'Eggy' plants. We can now harvest their seeds, and the rare products are inside the fruit shells. +
- Similar to the new variety of Tower Caps, it is now possible to get various grass flooring depending on the plants potency! +
- Our sponsors at Knitters United has released a new variation of the botany Aprons and Coveralls which can hold a larger variety of items! +
- A new version of Plant-B-Gone was produced which are much more lethal to plants, yet at the same time has no extra effect on humans besides the norm. +
- Tweaked mining turf mineral droprates and reverted mesons to the 'old' style of mesons. This means mesons will be more powerful with the added side effect of not being able to track individual light sources through walls and such. This is a trial run; please provide feedback on the /tg/ codebase section of the forum. +
- Recently the Space Wizard Federation, with some assistance from the Cult of Nar-Sie, recently created a new strain of Killer Tomato. A sad side effect is this effected all current and future Killer Tomato strains in our galaxy. They are now reported to be extremely violent and deadly, use extreme caution when growing them. +
- Added slot machines to the game +
- Slot machines use reels. All prizes except for jackpots can be won on all lines +
- Simply put a coin into one of the slot machines in the bar to play! +
- Slot machines can also be emagged. +
- Central Security has approved an upgrade of the Securitron line of bots to a newer model.
Highlights include:
+ - -An optional setting to arrest personnel without an ID on their uniform (Disabled by default) +
- -An optional setting to notify security personnel of arrests made by the bots (Enabled by default) +
- -A new "Weapon Permit" access type that securitrons will use during their weapons checks. Personnel who work with weapons will be granted this access by default. More can be assigned by the station's Head of Security and Personnel. +
- -A more robust threat assessment algorithm to improve accuracy in identifying perpetrators. +
- Fixed the irrigation system in hydroponics trays. Adding at least 30 units of liquid at once will activate the system, sharing the reagents between all connected trays. +
- Changelings can communicate while muzzled or monkified, and being monkified doesn't stop them from taking human form. +
- Mimes cannot break the laws of physics unless their vow is currently active. +
- Trays are rewritten to make sense and so borgs can actually use them. Service borgs can discretely carry small objects, hint hint. The items are easily knocked out of them. +
- The 'Enter Exosuit' button was removed, and you have to click + drag yourself to enter a mech now; like you would to enter a disposal unit. +
- NT Baton Refurbishment Team Notice: 'Released' option in security records has been renamed 'Discharged', and the sechud icon has been changed from a blue R to a blue D. Stop beating your released prisoners, dummies; they're not revheads. +
- NT Entertainment Department Notice: The prize-dispensing mechanism in Arcade machines has been replaced with a cheaper gas-powered motor. It should still be completely safe, unless an electromagnetic field disrupts it! +
- Pill code tweaked. In short, you can feed monkeys pills now #whoa +
- Casings ejected from guns will now spin #wow +
- Having the nuke disk will no longer prevent you from using teleporters or crossing Z-levels. Leaving the Z-level however, will cause you to "suddenly lose" the disk. +
- Pulled objects will now transition with you when as you transition Z-levels in space. +
- IEDs have been removed +
- Firebombs have been added +
- They're as reliable and predictable as you would expect from a soda can filled with flammable liquid and set off with an igniter contected to two wires. Use your branes and take proper precautions or leave a charred corpse, your choice. +
- Nanotrasen programmers have discovered a potential exploit involving a station's door control networks. With sufficient computing power, the network can be overloaded and forced to open or bolt closed every airlock at once. +
- Some reports suggest that the latest firmware update to Artifical Intelligence units installed in our research stations may contain this exploit. Any such reports that state that should a station's AI unit "malfunction", it may gain the ability to use this exploit to initate a full lockdown of the station. Fire locks and blast doors are also said to be affected. +
- Nanotrasen officially holds no validity to these reports. We recommend that station personnel disregard such rumors. +
- After the years of extensive research into xenobiology, and thousands of scientists lost to the slimes, we have finally come to admitting that we don't have a clue how they work. However, we've outlined a few facts, and managed to breed a new kind of slimes. They will be shipped to your station on the next shifts. They are different from the ones they are used to in the following: +
- Their sight is better than ever, and now they can finally see things that are not directly pressed against them. Beware, they may appear more aggressive! +
- Their memory has also become better, and they will now remember the people who fed them. As a note, you need to grab the monkey or push it to show to the slime that you're giving it to them, and it's not just walking in. +
- Apparently, not only we have studied them, but they have also studied us. Slimes are now capable of showing various emotions, mimicking humans. Use it to your advantage. +
- There are reports of slimes showing signs of sentience. Further research is recommended. +
- One of the reported signs is their speech capability. Following facts have been gathered: they talk more often to those who feed them; they react to being called by the number, but 'slimes' is also acceptable; they are able to understand being ordered to "follow" someone, or "stop". There is a report of slime releasing the assistant after a scientist shouted at it, and then calmly ordered a slime to stop. +
- We've made a modification of a health scanner that is intended for the use on slimes. Two are available in the smartfridge. +
- We've come to a conclusion that 5 units of reagents are not necessary to cause slime core reactions. You actually only need one unit. +
- Thanks to Nanotrasen's Engineering division, the power wiring of the station has a received a complete overhaul. Here are the highlight features in CentCom report : +
- Improved way of connecting cables! Finished is the time of "laying and praying" : it's now as simple as matching ends of each cables! +
- Unified way of connecting machines! Every machine is connected to a powernet through a node cable (it still needs to be anchored to receive power though)! +
- Lots of improvements in the cable cutting tools! Gone is the odd magic of physically separated yet still connected powernets (contact CentCom Engineering Division if you still witness something weird, we always have a fired form ready for our engineers!)! +
- Any conscientious (or not!) Station Engineer may check an "updated wiring manual" at http://www.tgstation13.org/wiki/Wiring#Power_Wires +
- A recent breakthrough in Plasma Materials Research has led to the development of a stronger, tougher plasteel alloy that can better resist extreme heat by up to four times. A live demonstration preformed during a press conference earlier today showed a segment of reinforced wall resisting an attack by Thermite. The corporation also announces that upgrades to its existing stations is already underway. +
- /tg/station code is now under a feature freeze until 7th June 2014. This means that the team will be concentrating on fixing bugs instead of adding features for the month. +
- You can find more information about the feature freeze here. http://tgstation13.org/phpBB/viewtopic.php?f=5&t;=273 +
- This is the perfect time to report bugs, which you can do so here. https://github.com/tgstation/-tg-station/issues/new +
- You now have to give a reason when calling the shuttle. +
- The amount of time it takes for the shuttle to refuel is now a config option, the default is 20 minutes. +
- Certain Enemies of the Corporation have discovered a critical exploit in the firmware of several NanoTrasen robots that could prevent the safe shutdown of units corrupted by illegally modified ID cards, dubbed "cryptographic sequencers". +
- NanoTrasen requires more research into this exploit, this we have issued a patch for AI and Cyborg software to simulate this malfunction. All NanoTrasen AI units are advised to only allow testing in a safe and contained environment. The robot can safely be reset at any time. +
- Unfortunately, a robot corrupted by a "cryptographic sequencer" still cannot be reset by any means. NanoTrasen urges regular maintenance and care of all robots to reduce replacement costs. +
- NT Human Resources announces an expansion of the List of Company-Approved Hair Styles, as well as more relaxed gender restrictions on hair styles. Check with your local company-sponsored hairstylist to learn more. +
- ID Computers have been modified to allow Station Heads of Staff to assign and remove access to their departments, as well as stripping the rank of their subordinates. An ID computer on the bridge is available for the use of this function. +
- NanoTrasen Emergency Alerts System 4.20 has been released! +
- In the unfortunate event of any nuclear device being armed, the station will enter Code Delta Alert. +
- Should the nuclear explosive be disarmed, the station shall automatically return to its previous alert level. +
- A new AI satellite has been constructed in orbit of Space Station 13! +
- The satellite exclusivly is used to hold a station's Artifical Intelligence Unit, the satellite contains a miried of turret and motion sensor defences. A transit tube network is used to connect the satellite to the station, with the transit room being located at engineering south of the engi escape pod. +
- The AI Upload however has been moved north slightly and is connected directly to the bridge. +
- In addition, the Gravity Generator has been relocated from its prior position in engineering to the location of the old AI Upload, increasing its defence and logical positioning. +
- Wood planks can be used to make wood walls and airlocks; flammability not included +
- Centcom officials have announced a new initiative to combat misuse of their Emergency Shuttle Service. After the shuttle has been recalled several times over the course of a simple work shift, Centcom will attempt to trace the signal origin and pinpoint its source for station authorities. +
- Thanks to Nanotrasen's Construction division, the brig has recieved a overhaul in its design, to increase ease of movement, including an addition of a "prisioner release room" and a insanity ward. +
- Furthing concerns among commentators, Nanotrasen has shipped out additional security equipment to station armories, including Riot Shotguns, tear gas grenades, additional securitron units and military grade Ion Guns. +
- JaniCo have released a new unique product called the JaniBelt. Capable of holding most standard issue janitorial equipment, designed to help relive inventory management among station janitors. In addition the Jani Water Tank has had its reserve of space clenaer increased to 500 units, up from 250. + +
- After concerns raised by security personel, new armor has been shipped that covers the lower waist and readjusts the helmet for comfort. +
- In addition, the aging riot shield has been replaced with a newer, more modern, apperance. + +
- NT AI Firmware version 2554.03.03 includes a function to notify the master AI when a new cyborg is slaved to it. +
- The syndicate suit is now black and red, because black and red is the new red. +
- The Ruskie DJ Station now has a classy orange syndicate suit. +
- Security officers have been equipped with the latest in flashlight technology. You can find a SecLite™ inside your security belt or you can dispense one from the security vending machine. +
- Nanotrasen Construction division is pleased to announce the unveiling of our brand now state-of-the-art Space Station 13 v2.1.3! +
- -Scaffolding used during construction has been repurposed as an expanded maintenance around the station. +
- -Our new Emergency Transport Shuttle Mk III will be making its debut in times of crisis. Includes a new cargo area and extra security features. +
- -A redesigned brig will give security staff more peace of mind with added security features +
- -The armory is now protected by a motion alarm. +
- -The armory is now equipped with security hardsuits. +
- -A new command EVA wing has been added to EVA Storage. Station heads of staff will be able to make use of suits stored here. +
- -A new garden area will be made publicly available for everyone to enjoy some R&R; during their company-endorsed break periods +
- -A new Testing Lab has been added to the Science department for any field experiments that need to be run. +
- -The mining ore redemption machine has been relocated to the Cargo Delivery Office. +
- Made combat more hardcore for hardcore players like myself. This won't be reverted. +
- Sacrifice Cult - Cult has received a massive overhaul to how it works, focusing more on cult magics and sacrificing unbelievers. The most important changes are: +
- Cult starts off with alot more cultists, 6 cultists below 30 players and 9 above. The HoP can no longer be a round start cultist but is still convertible. +
- Cultists start off with join, blood, self, and hell. These give the runes for the sacrifice and convert. +
- Conversions now require three cultists and converts no longer reward words, words must be obtained via sacrifice +
- Sacrificing players traps their soul in a soul stone, which can then be used on construct shells to implant the souls in them +
- Constructs shells can be summoned via a new rune (travel, hell, technology) +
- You can no longer convert the sacrifice target, you dozzy sods +
- Summoning Narsie when she is not an objective leads to !!FUN!! +
- Wrote a system to allow all mob types to be sacrificable - currently only corgis are in the new system +
- Holy Water will DECONVERT cultists, takes around 35 units and two minutes to succeed +
- Hitting a mob that contains holy water with a tome will convert that water to unholy water, conversely hitting any container that contains unholy water with a bible as chaplain will 'cleanse' the taint. +
- Unholy water works like a combination synaptazine and hyperzine, with a twist of branes dimarge and highly toxic to non-cultists +
- Cargo can order a religious supplies crate - it contains flasks of holy water, candles, bibles, and robes +
- Cultists have an innate ability to communicate to the cult hive mind (BE AWARE - THIS DOES A LOT OF DAMAGE), cultists can also communicate via the new Commune option on their tomes (the Read Tome option has been shifted under the Notes option) +
- Cyborgs can now use AI click shortcuts. (shift click on doors opens them, etc) (including ones added below) +
- New silicon click shortcut: Control+Shift click on doors toggles access override +
- New silicon click shortcut: Control click turret controls toggles them on or off +
- New silicon click shortcut: Alt click turret controls toggles lethal on or off +
- Cyborg hotkey mode was massively improved. 1-3 selects module slot, q unloads the active module. use hotkeys-help as cyborg for more details +
- Fabricator blueprints for cyborg parts have been updated to allow the debugging of cyborg units prior to boot. To access the debug functions, assemble a cyborg following standard procedure. Before inserting the MMI, use a multitool on the cyborg body. Note that this update also moves designation data into the system files, so pens can no longer be used to name cyborgs. +
- Toggling the "Play admin midis" preference will pause any playing songs. Turning midis back on will resume the current song where it was. +
- If there's a song playing while you have midis off and you then turn midis on, the current song will begin playing for you. +
- Workaround with the click cooldowns. They should feel faster. If you think that anything needs a click cooldown (like grilles, mobs, etc.), report it to me. +
- Here's the fun part, this is a test for the community and players, I hope I won't be forced to revert this and hear "this is why we can't have nice things". Again, if anything needs a cooldown, report it to me. Have fun with your fast clicks spessmans. +
- A security review committee has approved an update to all Nanotrasen airlocks to better resist cryptographic attacks by the enemy.
+
*New internal wiring will be able to withstand attacks, and panel wires will no longer be left unusable after an attack. +
*Welding tools will now be able to cut through welded doors that have been damaged. +
*Damaged electronics are now removable and replaceable following standard procedure. +
*Airlocks will not be able to operate autonomously until the electronics are replaced.
+ - Hair sprites have been given a visual lift. For best results, set your hair color to be slightly lighter than how you want it to look. For dark hair, do not use a color darker than 80% black. +
- Gravity is no longer beamed from CentCom! Instead, there is a new gravity generator stored near Engineering that will provide all the gravity for the station and the z level. Please remember that it gives off a lot of radiation when charging or discharging, so wear protection. +
- Added a new, somewhat experimental system to delete things. This is basically a port from /vg/, so big thanks to N3X15. +
- As a result, bombs and the singularity should be much less laggy. +
- There may be issues with "phantom objects" or other problems with stuff that's suppoed to be deleted or objects interacting with deleted objects. Please report any issues right away! +
- NT R&D; releases AI Patch version 2553.03.18, allowing all Nanotrasen AIs to override the access restrictions on any airlock in case of emergency. Nanotrasen airlocks have been outfitted with new amber warning lights that will flash while the override is active. Should maintenance teams need to restore an airlock's restrictions without using the AI, pulsing the airlock's ID Scanner wire will reset the override. +
- Machines that had their programming overriden by a Malf AI will no longer attack loyal cyborgs; they will still attack cyborgs that aren't loyal, to the Malf AI that hacked them, though. +
- You only require a single unit of blood to mutate viruses now, instead of 5. +
- After a review with CentCom, all Security Officers will now begin their shifts with a Stun Baton in their backpack. To avoid inflating costs however all Stun Batons have been removed from Security lockers except from the brig. +
- After decades of usage CentCom has replaced the Security Uniform, Armor, Belt and Helmet with a newer, more modern design. +
- Nanotrasen Corporate announced a revised dress codes primarily affecting senior station officers. A new uniform for Heads of Personnel will be shipped out to all NT Research stations. +
- Cameras finally capture the direction you are facing. +
- Added two new plasma-level disease symptoms, both are very !FUN! and mess with your genetics. +
- Virologists now only need to use a single unit of virus food, mutagen or plasma to generate symptoms. You can take a single unit by using a dropper, if you change its unit transfer amount in the object tab.. +
- Changed the map to make it harder to escape from the Labor Camp. Please continue using it. +
- Added changeling space suits. These allow changelings to survive in space, internals are not needed. They do not provide any sort of armor and slow your chemical regeneration. +
- Ling rounds are LINGIER, with more lings at a given population. +
- Many simple animals can ventcrawl, including bats. All ventcrawlers must alt-click to ventcrawl. +
- An automatic tool to store and replace machine parts has been added to R&D.; +
- Most stuns have been reduced in from 10+ to 5 ticks in duration. +
- Shoes no longer speed you up. +
- Added fancy suits, which can be orderd from cargo. +
- Added sombrerors and ponches. +
- Cuff application time reduced 25%. +
- Fire will cause fuel tanks to explode. +
- Mutagen has been reduced in lethality. Notably, 15 units are not guaranteed to crit the recipient. +
- Round-end report now shows what items were bought with a traitor's or nuke-op's uplink and how many TCs they used. +
- Facehuggers no longer die to zero-force weapons or projectiles like lasertag beams. +
- Improved blob spores to zombify people adjacent to their tile. +
- If a hand-teleporter is activated while you're stuck inside a wall, you'll automatically go through it. +
- Decreased the lethality of Mutagen in small doses. +
- Added Incendiary Shotgun Shells made at a hacked autolathe; Xenos be wary. +
- Color blending Kitty Ears have returned. +
- Colored burgers! Include a crayon in your microwave when cooking a burger and it'll come out just like a Pretty Pattie. +
- Fixed AI's being able to interact with syndicate bombs. +
- Added Advanced Mesons and Night Vision Goggles to the protolathe. +
- Silicons no longer stop statues from moving when in sight. +
- Increased the health of statues. +
- Increased the range of statues's blinding spell. +
- Reduced the range of Violin notes. +
- Low quality violin midi-notes replaced with better .ogg-notes. +
- Improved the Syndicate Implant bundle to contain freedom, uplink, EMP, adrenalin and explosive implanters. +
- Added Mineral Storeroom to R&D; containing the Ore Redemption Machine; no more assistants stealing your ore in the open hallway. +
- No more removing cursed horseheads. +
- Fixed infinite telecrystal exploit. +
- Removed the chance of your hat falling off when slipping. +
- Added Iatot's cyborg module selection transformation animations. +
- Mining has been significantly overhauled. Hostile alien life has infested the western asteroid! Miners are given an equipment voucher to obtain equipment to protect themselves. There is a spare voucher in the HoP's office, should someone want to switch to mining mid-shift. +
- The Ore Redemption Machine has been added just outside of the Science wing. Ore goes in, Sheets go out, and points are tallied on the machine. Insert your ID to claim points, then spend them on goods at Mining Equipment Lockers. You require specific accesses to tell the Ore Redemption Machine to unload its sheets. +
- Should you not care for being eaten alive by horrible alien life, it is suggested you stick to the eastern asteroid, where there is no hostile alien life... though the yield on ore is not as good. +
- Most ore is no longer visible to the naked eye. You must ping it with a Mining Scanner (Available in all mining lockers) to locate nearby ore. Make sure to equip your mesons first, or it won't be visible. +
- Mesons no longer remove the darkness overlay, you must properly light your environment. Hull breaches to space can still be clearly seen, and it will still protect you from the singulo. +
- Mineral spawn rates have been significantly tweaked to cut down on unnecessary inflation of mineral economy. +
- The asteroid no longer has ambient power on the entire asteroid. AI's who go onto asteroid turf will slowly die of power loss. Mining outposts are unaffected. +
- Fixed an issue where projectiles shot by simple mobs or thrown would hit multiple times. +
- Reduced chicken crates to contain 1-3 chicks, down from 3-6 +
- Increased fertile chicken egg chance from 10% to 25% +
- Photograph now rendered crisp and clean, so that we may enjoy them in their 0.009 megapixel goodness. +
- Cameras should now capture more of what they should, and less of what they shouldn't. +
- The lawyer now spawns with a Sec Headset. +
- Banana peel size is based on banana size. +
- Bigger peels slip for longer than smaller ones. Remember that produce size is based on potency. +
- The clown now spawns with a decent sized banana. +
- The banana mortar now shoots 65 potency peels. +
- A new hostile statue mob, can only move when not being observed, tends to break lights and cause blindness. +
- Blob Zombies! When a Blob Spore moves over a dead human body it will infect the body and revive it as a more powerful varient of the spore. Has double the health and deals more damage. +
- Sec Belts can now hold Stun Batons. +
- Stun Batons now only take 10 seconds to fully recharge. +
- Tables can now be used as an alternative way to craft makeshift items. Simply click-drag table to yourself bring up a list. +
- Spray Bottles can no longer wet up to three tiles with water. +
- Spray Bottles have a third higher release volume that wets a single tile. +
- Water slip times are reduced to the same stun times as soap. +
- Added a NanoUI for the SMES +
- Adds more constructible and deconstructable machines! +
- Added constructible miniature chemical dispensers, upgradable +
- Sleepers are now constructible and upgradable, open and close like DNA scanners, and don't require a console +
- Cryogenic tubes are now constructible and upgradable, open and close like DNA scanners, and you can set the cryogenic tube's pipe's direction by opening its panel and wrenching it to connect it to piping +
- Telescience pads are now constructible and upgradable +
- Telescience consoles are now constructible +
- Telescience tweaked (you can save data on GPS units now) +
- Teleporters are now constructible and upgradable, the console has a new interface and you can lock onto places saved to GPS units in telescience +
- Teleporters start unconnected. You need to manually reconnect the console, station and hub by opening the panel of the station and applying wire cutters to it. +
- Biogenerators are now constructible and upgradable +
- Atmospherics heaters and freezers are now constructible and upgradable and can be rotated with a wrench when their panel is open to connect them to pipes. Screw the board to switch between heater and freezer. +
- Mech chargers are now constructible and upgradable +
- Microwaves are now constructible and upgradable +
- All kitchen machinery can now be wrenched free +
- SMES are now constructible +
- Dragging a human's sprite to a cryogenic tube or sleeper will put them inside and activate it if it's cryo +
- Constructible newscasters, their frames are made with autolathes +
- Constructible pandemics +
- Constructible power turbines and their computers +
- Constructible power compressors +
- Constructible vending machines. Screw the board to switch vendor type. +
- Constructible hydroponics trays +
- Sprites for all this +
- This update will have unforeseen bugs, please report those you find at https://github.com/tgstation/-tg-station/issues/new if you want them fixed. +
- As usual, machines are deconstructed by screwing open their panels and crowbarring them. While constructing machines, examining them will tell you what parts you're missing. +
- Handling a couple flashlights will no longer transform you into the sun. Each light source will have deminishing returns. +
- Inserting lights into containers should no longer dim other lights. +
- Changes windoor and newscaster attack messages to be consistent with windows and grilles. This removes the distracting boldness from windoor attack messages, which is reserved for userdanger, and names the attacker. +
- Thrown items now play a sound effect on impact. The volume of the sound is based on the item's throwforce and/or weight class. +
- The fireaxe now has 15 throwforce, when previously it had only 1. But why would you throw it away, anyway? +
- Projectiles now play a sound upon impact. The volume of the sound depends on the damage done by the projectile. Damageless projectiles such as electrodes have static volumes. Practise laser and laser tag beams have no impact sound. +
- Added sear.ogg for the impacts of damaging beams such as lasers. It may be replaced if player feedback proves negative. +
- Attack sounds for all melee weapons! No more silent attacks. +
- The volume of an object's attack sound is based on the weapon's force and/or weight class. +
- Welders, lighters, matches, cigarettes, energy swords and energy axes have different attack sounds based on whether they're on or off. +
- Weapons that do no damage play a tap sound. The exceptions are the bike horn, which still honks, and the banhammer, which plays adminhelp.ogg. Surely nothing can go wrong with that last one. +
- When you tap someone with an object, the message now uses "tapped" or "patted" instead of attacked. The horn still uses HONKED, and the banhammer still uses BANNED. +
- You won't get the "armour has blocked an attack" message for harmless attacks anymore. +
- Adds 5 force to the lighter when it's lit. Same as when you accidentally burn yourself lighting it. +
- Removes boldness from item attack messages on non-human mobs. The attack is bolded for a player controlling a non-human mob. Now your eyes won't jump to the chat when it's Pun Pun who's being brutalised. +
- Blood will no longer come out of non-human mobs if the attack is harmless. +
- Adds a period at the end of the catatonic human examine message. That's been bugging me for years. +
- The activation and deactivation sounds of toy swords, energy swords and energy shields are slightly quieter. Energy swords and shields are now slightly louder than toys. +
- You can no longer light things with burnt matches. +
- Match, cigarette and lighter attack verbs, forces and damage types change based on whether the object is lit or not. +
- Fixes a bug with the energy blade that kept it at weight class 5 after it was deactivated. Who cares, it disappears upon deactivation. +
- Changes the welder out of fuel message slightly to be less fragmented. +
- Removes dead air from a lot of weapon sound effects to make them more responsive. In other words, the fire extinguisher attack sound will play a lot sooner after you attack than before. +
- Equalised the peak volumes of most weapon sounds to be -0.1dB in an attempt to make volumes based on force more consistent across different sounds. +
- Walking Mushrooms will now attack and eat each other! They're all a little unique from each other, no two shrooms are exactly alike, and a better quality harvest means stronger Walking Shrooms. Pit them against each other for your entertainment. +
- Each mushroom will have a different colored cap to identify them. When mushrooms eat each other, they get stronger. The resulting mushroom will drop more slices when cut down to harvest, and will have better quality slices. +
- Don't hurt them yourself, though, or you'll bruise them, and mushrooms won't get stronger from eating a bruised mushroom. If your mushroom faints, feed it a mushroom such as a plump helmet to get it back on its feet. It will slowly regenerate to full health eventually. +
- Syndicate Playing Cards can now be found on the Syndicate Mothership and purchased from uplinks for 1 telecrystal. +
- Syndicate Playing Cards are lethal weapons both in melee and when thrown, but make the user's true allegiance to the Syndicate obvious. +
- Sprites are courtesy of Nienhaus. +
- Adds thud sounds to falling over +
- Known bug: Thuds play when cloning initialises or someone is put into cryo. This will be fixed. +
- Gibtonite, the explosive ore, can now be found on the asteroid. It's very hard to tell between it and diamonds, at first glance. +
- Gibtonite deposits will blow up after a countdown when you attempt to mine it, but you can stop it with an analyzer at any time. It makes for a good mining explosive. +
- The closer you were to the explosion when you analyze the Gibtonite deposit, the better the Gibtonite you can get from it. +
- Once extracted, it must be struck with a pickaxe or drill to activate it, where it will go through its countdown again to explode! +
- Explosives will no longer destroy the ore inside of asteroid walls or lying on the floor. +
- Adds changeling arm blades that cost 20 chems and do 25 brute damage. +
- Arm blades can pry open unpowered doors, replace surgical saws in brain removal, slice tables and smash computers. +
- Mobs now lie down via turning icons rather than preturned sprites. +
- You can lie down facing up or down and the turn can be 90 degrees clockwise or counterclockwise. +
- Resting will always make you lie to the right so you look good on beds. +
- Please report any bugs you find with this system. +
- Increased the walk speed. Legcuffed speed is unaffected, and is still suffering. +
- Sped up alien drones, they are now the same speed as sentinels. +
- Adds thud sounds to falling over +
- Known bug: Thuds play when cloning initialises or someone is put into cryo. This will be fixed. +
- Syndicate Playing Cards can now be found on the Syndicate Mothership and purchased from uplinks for 1 telecrystal. +
- Syndicate Playing Cards are lethal weapons both in melee and when thrown, but make the user's true allegiance to the Syndicate obvious. +
- Sprites are courtesy of Nienhaus. +
- Adds changeling arm blades that cost 20 chems and do 25 brute damage. +
- Arm blades can pry open unpowered doors, replace surgical saws in brain removal, slice tables and smash computers. +
- Gibtonite, the explosive ore, can now be found on the asteroid. It's very hard to tell between it and diamonds, at first glance. +
- Gibtonite deposits will blow up after a countdown when you attempt to mine it, but you can stop it with an analyzer at any time. It makes for a good mining explosive. +
- The closer you were to the explosion when you analyze the Gibtonite deposit, the better the Gibtonite you can get from it. +
- Once extracted, it must be struck with a pickaxe or drill to activate it, where it will go through its countdown again to explode! +
- Explosives will no longer destroy the ore inside of asteroid walls or lying on the floor. +
- Mobs now lie down via turning icons rather than preturned sprites. +
- You can lie down facing up or down and the turn can be 90 degrees clockwise or counterclockwise. +
- Resting will always make you lie to the right so you look good on beds. +
- Please report any bugs you find with this system. +
- The water cooler is now stocked with paper cups. You can refill the cups by putting paper in it. +
- You can now sell mutant seeds, from hydroponics, to Centcom via the supply shuttle. +
- Fixes powersinks causing APCs to stop automatically recharging. +
- Changed the way the Gygax worked. It now has less defense and shot deflection, but is faster and have less battery drain per step. +
- Nerfed the Carbine's brute damage and renamed it to FNX-99 "Hades" Carbine. +
- Nerfed the Gygax defense from 300 to 250.
+ Nerfed the Gygax projectile deflection chance from 15 to 5.
+ Buffed the Gygax speed from 3 to 2, making it faster.
+ Reduced the battery use when moving from 5 to 3.
+
+ The Mech Ion Rifle now has a faster cooldown, from 40 to 20.
+ Nerfed the carbine's Brute Damage from 20 to 5.
+
+ Please post feedback to these changes on the forums. +
+ - EMPs affect the equipment of a human again. +
- EMP flashlight now recharges over time and its description no longer reveals the illegal nature of the device. +
- EMP implant now has two uses.
EMP kit now contains two grenades.
+ - Added spider butchery. +
- Added spider meat, legs, and edible eggs. +
- Added new spider related meals. +
- Because of an emagged cyborg's explosion, the MMI will die with it. +
- The self-respiration symptom will now properly keep you from dying of oxygen loss. +
- The Stimulant symptom's activation chance was increased so you had a constant flow of hyperzine. +
- A new training bomb has been added to the armoury, which will allow you to train your wire cutting skills to disarm real syndicate bombs. +
- Updated research designs. +
- The Protolathe can now build a Ion Rifle. +
- The Exosuit Fabricator can now build a Mech Ion Rifle, a Mech Carbine and a Mech-Mounted Missile Rack. +
- Armor now reduces damage by the protection percentage, instead of randomly deciding to half or full block damage by those percentages. +
- Shotguns, with buckshot shells, will fire a spread of pellets at your target, like a real shotgun blast. +
- Added Syndicate Cyborgs. +
- They can be ordered for 25 telecrystals by Nuclear Operatives. A ghost / observer with "Be Operative" ticked in their game options will be chosen to control it. +
- Their loadout is: Crowbar, Flash, Emag, Esword, Ebow, Laser Rifle. Each weapon costs 100 charge to fire, except the Esword, which has a 500 charge hitcost. Each borg is equipped with a 25k cell by default. +
- Syndicate borgs can hear the binary channel, but they won't show up on the Robotics Control computer or be visible to the AI. Their lawset is the standard emag one. +
- Added two cyborg recharging stations to the Syndicate Shuttle. +
- You can now upgrade laser pointers with micro laser parts. It will increase the chance of blinding people. +
- Cyborg modules now use a new UI, which is much quicker than a menu. +
- The game will now have all background operations disabled, this will result in smoother gameplay but may result in some spike lags, before being set back to normal. The gradually increasing lag should now be gone. +
- You can now emag the crusher, in disposals, to remove the safety. You can use a screwdriver to reset it to the default factory settings. +
- The toxin compensation symptom will stop giving you toxin damage while at full health. +
- The new nuke toy can now be found in your local arcade machine. +
- Morgue Trays can detect players in their bodies and will now change colour depending on a few things. Red = Dead body with no player inside. Orange = No body but items. Green = A dead body with a player inside. +
- You can whisper while in critical, but you will immediately die afterwards DRAMATICALLY. The closer you are to death, the less you can say. +
- The wizard won't spawn so much smoke after they blink. +
- The detective's forensic scanner was upgraded so that it can now scan from afar. +
- Made the ghost's follow button less buggy. Please make an issue report if it still bugs out. +
- A new alt RD uniform spawns in his locker. +
- Janitor now spawns with a service headset. +
- Backpack watertank slowdown decreased. +
- Constructable machines now depend on R&D; parts! +
- DNA scanner: Laser quality lessens irradiation. Manipulator quality drastically improves precision (9x for best part) and scanner quality allows you to scan suicides/ling husks, with the best part enabling the cloner's autoprocess button, making it scan people in the scanner automatically. +
- Clone pod: Manipulator quality improves the speed of cloning. Scanning module quality affects with how much health people will be ejected, will they get negative mutation/no mutations/clean of all mutations/random good mutation, at best quality will enable clone console's autoprocess button and will try to clone all the dead people in records automatically, together with best DNA scanner parts cloning console will be able to work in full automatic regime autoscanning people and autocloning them. +
- Borg recharger: Capacitors' quality and powercell max charge affect the speed at which borgs recharge. Manipulator quality allows borg to be slowly repaired while inside the recharges, best manipulator allows even fire damage to be slowly repaired. +
- Portable power generators: Capacitors' quality produce more power. Better lasers consume less fuel and reduce heat production PACMAN with best parts can keep whole station powered with about sheet of plamsa per minute (approximately, wasn't potent enough to test). +
- Autolathe: Better manipulator reduces the production time and lowers the cost of things(they will also have less m_amt and g_amt to prevent production of infinity metal), stacks' cant be reduced in cost, because thatll make production of infinity metal/glass easy +
- Protolathe: Manipulators quality affects the cost of things(they will also have less m_amt and g_amt to prevent production of infinity metal), best manipulators reduces the cost 5 times (!) +
- Circuit imprinter: Manipulator quality affects the cost, best manipulator reduce cost(acid insluded) 4 times, i.e. 20 boards per 100 units of acid +
- Destructive analyzer: Better parts allow items with less reliability in. Redone how reliability is handled, you now see item reliability in the deconstruction menu and deconstructing items that has same or one point less research type level will rise the reliability of all known designs that has one or more research type requirements as the deconstructed item. Designs of the same type raise in reliability more. Critically broken things rise reliability of the design drastically. Whole reliability system is not used a lot but now at least on the R&D; part it finally matters. +
- Added different colours to departmental radio frequencies. Now you'll be able to filter out or pay attention to each frequency a lot easier. +
- Fixed bruisepacks and ointments not working. +
- Fixed injecting/stabbing mouth or eyes when only thick suit worn. +
- The damage overlay for humans starts a little later than before. It used to start at 10 points of fire + brute damage, it now starts at 35. +
- Paper no longer appears with words on it when blank input written or photocopied +
- Vending machine speaker toggle button now works +
- Building arcade machines works again +
- Light explosions will no longer gib dead bodies anymore. C4 will function the same and gib anything attached. +
- Syringe gun projectiles will now display a message when shots are deflected by space suits, biosuits and etc... +
- You can now move out of sleepers by moving, again. +
- Monkeys now have a resist button on their HUD. +
- Labcoats can now store bottles, beakers, pills, pill bottles and paper. +
- The Labor Camp has been changed based on feedback. Ore boxes added, internals added, safety pickaxes/shovels (might revert if unliked). +
- Labor Camp prisoners, who have earned enough points for freedom, will now have to be alone in the shuttle to move it and to open the middle door; this is in order to prevent free'd prisoners from releasing their comrades. +
- Monkeys no longer walk away when being pulled or grabbed. +
- Anti-breach shield generators have a greater range, and will cover more exposed space tiles. +
- Blowing up borgs from the Robotics Console will now actually make them explode. Emagged Cyborgs will explode even more. +
- Added more poster. +
- You can no longer slip while laying down. +
- Added new sprites for the sec-hailer, SWAT gear and riot armour. +
- Playing cards, just like the real thing! Play poker, blackjack, go fish, the limits are limitless! Recommended to use space cash as the poker chips for now +
- THE REALISM: Injectors such as syringes, parapens and hypos will not penetrate coveralls with thick material, this includes space suits, biosuits, bombsuits, and their head slot equivalent. Injectors now also consider where you aim, if you aim for the head it will try to use it through the head slot, otherwise it will aim for the body. To clarify, if you are wearing a space helmet and a doctor tries to inject you while aiming at your head, it will protect you until they aim for the unprotected body; same story for wearing a space suit and not a helmet. +
- The syndicate shuttle has been heavily upgraded with a brand new technology which allows the blast doors to the entrance of the shuttle to AUTOMATICALLY close. Whoa. This brand new technology will help keep out those snoopy crew members. +
- Lowered the cooldown of creating virus cultures to 5 seconds. You now only need to mix one unit of synaptizine, in a blood full of an advance virus, to get it to remove a random symptom. +
- Rounds will no longer end when the wizard dies and there are still apprentices or traitors/survivors.. +
- Transit tube tweaks. You can now put someone into a transit tube pod using grabs and you can empty a transit tube pod by clicking on it. +
- Replaced the digital valves in atmospherics with pumps. +
- Magic Mania! Powerful new magical tools and skills for wizard and crew alike! +
- Beware the new Summon Magic spell, which will grant the crew access to magical tools and spells and cause some to misuse it! +
- One Time Spellbooks that can be spawned during summon magic that can teach a low level magic skill to anyone! Beware the effects of reading pre-owned books, the magical rights management is potent! +
- Magical Wands that can be spawned during Summon Magic! They come in a variety of effects that mimic both classical wizard spells and all new ones. They come precharged but lack the means to refill them once their magical energy is depleted... Fire efficently! +
- Be aware of the new Charge spell, which can take normally useless spent wands and give them new life! This mysterious effect has been found to wear down the overall magical potency of wands over time however. Beyond wands the clever magical user can find ways to use this spell on other things that may benefit from a magical charge... +
- The Staff of Resurrection, which holds intense healing magics able to defeat death itself! Look out for this invaluable magical tool during castings of Summon Magic. +
- Be on the lookout for a new apprentice! This noble mage is a different beast from most wizards, trained in the arts of defending and healing. Too bad he still works for the wizard! +
- New colourful ghost sprites for BYOND members. Sprites by anonus. +
- Leather gloves can be used to removes lights. +
- Plant, ore, and trash bags have a new option to pick up all items of single type +
- Creating astroturf now works like sandstone, converting all the grass at once. +
- Uranium and radium can be used instead of mutagen. 10 can mutate species, 5 or 2 mutate traits. Highly toxic. +
- Plants require a little light to live. Mushroom require even less (2 units vs 4) and take less damage. +
- Reworked how ling stings are done, now when you click a sting in the changeling tab it becomes current active sting, the icon of that sting appears under the chem counter, alt+clicking anyone will sting them with current sting, clicking the icon of the sting will unset it. +
- Monkeys have ling chem counter and active sting icons in their UI. +
- Going monkey -> human will try to equip the human with everything on the ground below it. +
- A less annoying virology system! From now on, you can only get low level virus symptoms from virus food, medium level virus symptoms from unstable mutagen and high level virus symptoms from liquid plasma. You can find a list of symptoms, and which chemicals are required to get them, here: http://wiki.ss13.eu/index.php/Infections#Symptoms_Table +
- The virologist starts with a bottle of plasma in his smart fridge. +
- Made it so you cannot accidentally click in the gaps between chem masters. +
- Added three new buttons to the sandbox panel. +
- Removed canister menu, replaced it with buttons. +
- Players can no longer spawn "dangerous" canisters in sandbox, such as Plasma, N20, CO2, and Nitrogen. +
- The identification console will now require that ID and job names follow the same restrictions as player names. +
- NTSL scripts and parrots should now handle apostrophes and such properly. It's about time. +
- NTSL scripts now have a better sense of time. +
- Made the suit storage on the Captain's Tunic more useful than just a place to store your e-o2 tank. You can now store the nuke disk, stamps, medal box, flashes and melee weapons (mainly intended for the Chain of Command), and of course - smoking paraphernalia +
- Nanotrasen surgeons are now certified to perform Limb replacements, The robotic parts used in construction of Nanotrasen Cyborgs are the only parts authorized for crew augmentation, these replacement limbs can be repaired with standard welding tools and cables. +
- AI can now anchor and unanchor itself. In short, it means the AI can be dragged, if it wants to. +
- Nanotrasen Cyborg Upgrades:
+Standard issue Engineering cyborgs now come equipped with replacement floor tiles which they can replenish at recharge stations.
+ - Mobs can now be lit on fire. Wearing a full firesuit (or similar) will protect you. Extinguishers, Showers, Space, Cryo, Resisting, being splashed with water can all extinguish you. Being splashed with fuel/ethanol/plasma makes you more flammable. Water makes you less flammable. +
- Nanotrasen Anomaly Primer:
+ Unstable anomalies have been spotted in your region of space. These anomalies can be hazardous and destructive, though our initial encounters with these space oddities has discovered a method of neutralization. Method follows.
+Step 1. Upon confirmation of an anomaly sighting, report its location. Early detection is key.
+ With the anomaly neutralized and the station brought out of danger, inspect the area for any remnants of the anomaly. Properly researched, we believe these events could provide vast amounts of valuable data.
+ Step 2. Using an atmospheric analyzer at short range, determine the frequency that the anomaly's core is fluctuating at. + Step 3. Send a signal through the frequency using a radio signaller. Note that non-specialized signaller devices may possibly lack the frequency range needed.
+ Did you find this report helpful?
+ - Due to complaints about Security not announcing themselves before making arrests NT has now issued it's Sec team with loud hailer integrated gas masks, found in their standard equipment lockers. Users can adjust the mask's level of aggression with a screwdriver. +
- The sprites could be shaded better. Think you can do better? Post your submissions here. +
- Juggernaut's ablative armor has been adjusted. They have a greater chance to reflect lasers however on reflection they take half damage instead of no damage, basically this adjustment means you should be able to kill a Juggernaut with two laser guns instead of four! Also their reflection spread has been greatly widened, enjoy the lightshow +
- Cargo can now order exile implants. +
- Checking a collector's last power output via analyzers has been moved to multitools, because that actually made sense (betcha didn't know this existed, I know I didn't) +
- Analyzers can now be used to check the gas level of the tank in a loaded radiation collector (yay no more crowbars), you can also use them on pipes to check gas levels (yay no more pipe meters) +
- You can no longer strip people through windows and windoors +
- You can open doors by hand even if there is a firedoor in the way, making firedoor+airlock no longer an unbeatable combination +
- Ghosts can now click on anything to examine it, or double click to jump to a turf. Double clicking a mob, bot, or (heaven forbid) singularity/Nar-Sie will let you follow it. Double clicking your own corpse re-enters it. +
- AI can double click a mob to follow it, as well as double clicking turfs to jump. +
- Ventcrawling mobs can alt-click a vent to start ventcrawling. +
- Telekinesis is now part of the click system. You can click on buttons, items, etc, without having a telekinetic throw in hand; the throw will appear when you click on something you can move (with your mind). +
- We at Nanotrasen would like to assure you that we know the pain of waiting five minutes for the emergency shuttle to be dispatched in a high-alert situation due to our confirmation-of-distress policy. Therefore, we have amended our confirmation-of-distress policy so that, in the event of a red alert, the distress confirmation period is shortened to three minutes and we will hurry in preparing the shuttle for transit. This totals to 6 minutes, in hope that it will give our very expensive equipment a better chance of recovery. +
- Terbs Fun Week Day 5: Chef gets a Nanotrasen-issued icecream machine with four pre-approved icecream flavours and two official cone types. +
- Terbs Fun Week Day 4: Humans, aliens and cyborgs now show speech bubbles when they talk. +
- Terbs Fun Week Day 3: Detective can reskin his gun to one of five variants: Leopard Spots, Gold Trim, Black Panther, Peacemaker and the Original. +
- AI Photography: AIs now have two new verbs, Take Picture and View Picture. The pictures the AI takes are centered on the AI's eyeobj. You can use these pictures on a newscaster, and print them at a photocopier. +
- Terbs Fun Week Day 2: RD, lawyers and librarians now spawn with a laser pointer. Don't point them in anyone's eyes! +
- Terbs Fun Week Day 1: Added ghost chilis as a mutation of chili plants. Be careful, they're one of the hottest foods in the galaxy! +
- Replaced the EMP grenades from the uplink with an EMP kit. The kit contains a grenade, an implant and a flashlight with 5 uses that can EMP any object or mob in melee range. +
- Made time and date consistent across medical and security records, mecha logs and detective scanner reports +
- Added date to PDA +
- Malf AIs now have a new power which will spawn a "borging machine". This machine will turn living humans into loyal cyborgs which the AI can use to take over the station with. The AI will limit themselves by using this ability, such as no shunting, and the machine will have a long cooldown usage. +
- Changed the blob balance to make the blob start strong but grow slower, resulting in rounds where the blob doesn't instantly get killed off if found out and doesn't immediately dominate after being left alone long enough. AIs no longer have to quarantine the station. +
- Cargo Overhaul: Phase 1 +
- Ported Bay's cargo computer categoy system +
- Crates have been tweaked significantly. Crates have been reduced to single item types where possible, namely with expensive crates such as weapons and armor. A total of 28 new crates have been added, including chemical and tracking implants, and raw materials can also be bought from cargo for a significant number of points (subject to change) +
- This was a pretty large edit of repetitive data, so no doubt I've made a mistake or two. Please report any bugs to the usual place +
- NTSL no longer allows you to use a function within another function parameter. This was changed to help prevent server crashes; if your working script no longer compiles this is why. +
- Nanotrasen has recentely had to change its provider of alcoholic beverages to a provider of lower quality. Cases of the old ailment known as alcohol poisoning have returned. Bar goers are to be weary of this new condition. +
- Nanotrasen has re-arranged the station blueprint designs to have non-essential APCs moved to the maintenance hallways. Non-essential rooms that aren't connected to a maintenance hallway will have their APC remain. Station Engineers will now have easy access to a room's APC without needing access themselves. Nanotrasen also wishes to remind you that you should not sabotage these easy to access APCs to cause distractions or to lockdown someone in a location. Thank you for reading. +
- Atmospherics now has its own hardsuit. Instead of radiation protection it offers fire protection. +
- Cultists now start with two words each, and the starting talisman no longer damages you when you use it +
- Instead of a level-up system where it is possible to acquire all the skills, each skill now costs 1 point, and you can pick up to 5.Husking people, instead of giving you more XP to buy skills, now gives you a skill reset, allowing you to pick new ones. +
- DNA Extract Sting is now free, and is your main mode of acquiring DNA. You can hold up to 5 DNAs, and as you acquire more, the oldest one is removed. If you're currently using the oldest DNA strand, you will be required to transform before gaining more. +
- New abilities! An UI indicator for chemical storage! Fun! +
- Summary of my recent changes: Added a muzzle and a box of Prisoner ID cards to the perma wing, RnD can make a new combined gas mask with welding visor, added some atmos analyzers to atmospherics, air alarm circuit boards have their own sprites, package wrapped objects will now loop back round to the mail chute instead of auto-rerouting to disposals, and the detective and captain have access to securitrons through their PDA cartridges. +
- A new item has been added to the syndicate catalog. The AI detector is a device disguised as a multitool; it is not only able to be used as a real multitool but when it detects an AI looking at it, or it's holder, it will turn red to indicate to the holder that he should cease supiscious activities. A great and cheap, to produce, tool for undercover operations involving an AI as the security system. +
- Revamped blob mode and the blob random event to spawn a player controlled overmind that can expand the blob and upgrade pieces that perform particular functions. This will use resources which the core can slowly generate or you can place blob pieces that will give you more resources. +
- Nanotrasen R&D released a new firmware patch for their station AIs. Included among the changes is the new ability for AIs to interact with fire doors. R&D officials state they feel giving station AIs more influence could only lead to good things. +
- Job preferences menu now not only allows you to left-click the level (i.e. [Medium]) to raise it, but also to right-click it to lower it. That means you don't have to cycle through all the levels to get rid of a [Low]. +
- DNA-scanner pods (DNA-modifier + cloning), now open and close in a similar fashion to closets. This means you click on them to open/close them. This change was to fix a number of issues, like items being lost in the scanner-pods. +
- As a side-effect, borgs can now clone humans. No harm can become a dead human, so they are not necessarily lawbound to clone them, and such tasks are probably best left to qualified genetics staff. +
- Updated chemical grenades. The build process is much the same, except they require an igniter-X assembly instead of a single assembly item. You can also just use a cable coil to get regular grenade behaviour. +
- Server operators may now allow latejoiners to become antagonists. Check game_options.txt for more information. +
- Server operators may now set how traitors and changelings scale to population. Check game_options.txt for more information. +
- Emptying someone's pockets won't display a message. In theory you can now pickpocket! +
- Headsets can no longer broadcast into a channel that is disabled.
Headsets now have a button to turn off the power instead of the speaker. This button disables all communication functions.
EMPs now force affected radios off for about 20 seconds.
+ - To reduce costs of security equipment, mounted flashers have been adjusted to use common handheld flashes as their flashbulbs. Although these flashbulbs are more prone to burnout, they can easily be replaced with wirecutters. +
- CentCom announced some minor restructuring within Space Station 13's command structure. Most notable of these changes is the removal of the Head of Personnel's access to the security radio channel. CentCom officials have stated the intention was to make the HoP's role more specialized and less partial towards security. +
- Nanotrasen seeks to further cut operating costs on experimental cyborg units.
+
-Cyborg chassis will now be made from a cheaper but less durable design. +
-RCDs found on engineering models have been replaced with a smaller model to make room for a metal rods module. +
-Cyborg arms will no longer be long enough to allow for self-repairs. +
NOTE: A cyborg's individual modules have been found to become non-operational should the unit sustain too much structural damage.
+ - SecHuds now check for valid clearance before allowing you to change someone's arrest status. There is only one way to bypass the ID check, and its not the usual way. +
- As a part of the most recent round of budget cuts, toolboxes will now be made with a cheaper but heavier alloy. HR reminds employees to avoid being struck with toolboxes, as toolbox-related injuries are not covered under the company's standard health plan. +
- Cargo manifests from CentComm may contain errors. Stamp them DENIED for refunds. Doesn't apply to secure or large crates. Check the orders console for CentComm feedback. +
- You can now weld four floor tiles together to make a metal sheet +
- The All-In-One Grinder can now grind Metal, Plasteel, Glass, Reinforced Glass, and Wood sheets +
- Made grey backpacks slightly less ugly +
- Researchers have discovered that glass shards are, in fact, dangerous due to their typically sharp nature. Our internal Safety Committee advises that glass shards only be handled while using Nanotrasen-approved hand-protective equipment. +
- DNA reworked: All SE blocks are randomised. DNA-modifier emitter strength affects the size of the change in the hex-character hit. Emitter duration makes it more likely to hit the character you click on. Almost all DNA-modifier functions are on one screen.
Balancing -will- be off a bit. Is getting halk to hard/easy? Please report bugs/balancing issues/concerns here: http://forums.nanotrasen.com/viewtopic.php?f=15&t=13083 <3
+ - Exosuit fabricators will now need to be manually updated +
- Commanding Officers of Nanotrasen Stations have been issued a box of medals to be awarded to crew members who display exemplary conduct. +
- Replaced the captain's run of the mill armored vest with his very own unique vest. Offers slightly better bullet protection. +
- Overhauled the thermal insulation system +
- All clothing that protected from one side of the thermal spectrum now protects from the other. +
- Armor (although most don't have full coverage) protects between 160 to 600 kelvin +
- Firesuits protect between 60 to 30,000 kelvin (Note: Hotspot damage still exists) +
- CE's hardsuit got its firesuit level protection back +
- Bomb suits function as ghetto riot gear +
- Stungloves removed 5eva. +
- Don't rage yet. Makeshift stunprods(similar in function to stungloves) and spears are now craftable. Make them by using a rod on cable restraits, then adding something. +
- Stun batons/prods now work off power cells, which can be removed and replaced! Use a screwdriver to remove the battery. +
- If the configuration option is enabled, AIs and or Cyborgs will not be able to communicate vocally. This means they cannot talk normally and need to use alternative methods to do so +
- You can now condense capsaicin into pepper spray with chemistry. +
- Pepper spray made slightly more effective. +
- Teargas grenades can be obtained in Weapons and Riot crates. +
- Riot crate comes with 2 sets of gear instead of 3, made cheaper. Beanbag crate removed entirely. Just make more at the autolathe instead. Bureaucracy crate cheaper, now has film roll. +
- NT bluespace engineers have ironed-out that little issue with the teleporter occasionally malfunctioning and dropping users into deep space. Please note, however, that bluespace teleporters are still sensitive experimental technology, and should be Test Fired before use to ensure proper function. +
- Liquid Plasma have been found to have strange and unexpected results on virion cultures. The executive chief science officer urges virologists to explore the possibilities this new discovery could bring. +
- After years or research, our scientists have engineered this cutting-edge technology born from the science of shaving. The Electric Space-Razor 5000! It uses moisturizers to refuel your face while you shave with not three, not four, but FIVE lazer-precise inner blades for maximum comfort. +
- When an AI shunts into an APC, the pinpointer will begin tracking it. When the AI returns to its core, the pinpointer will go back to locating the nuke disc. +
- New sechud icons for sec officers/HoS, medical doctors, and loyalty implants. +
- Empty character slots in your preferences screen will now randomize. So they won't initialise as bald, diaper-clad, white-guys. +
- Reworked the savefile versioning/updating code. Your preferences data is less likely to be lost. +
- You can now light cigarettes with other cigarettes, and candles. And cigars. Light a cigar with a candle! It's possible now! +
- You can now open and close job slots for some jobs at any IDcomputer. There is a cooldown when opening or closing a position. +
- You can now construct/destroy bookcases. This is super exciting and game changing. +
- Petethegoat says, "Added a new feature involvi-GLORF" +
- Overhauled how grabs work. There aren't any interesting mechanical differences yet, but they should be a lot more effective already. You don't have to double click them anymore. Report any bugs with grabbing directly to me, or on the issue tracker. +
- AI has been moved back to the center of the station. Telecoms has been moved to engineering. +
- Competely new UI overhaul! Most user interface have been converted. +
- Added cavity implant surgery. +
- Additionally, surgery must now be performed with help intent. Some procedures have also been updated. + As always, check the wiki for details. +
- The AI has been moved to Research Division, and Telecomms has been moved into the former AI chamber. Affected areas: Telecoms Satellite, Research Division South & Command Sector. +
- Added three new types of surgery- lipoplasty, plastic surgery, and gender reassignment. +
- The RD has lost access to telecomms, and basic engineers have gained it. +
- Updated surgery: you now initiate surgery with surgical drapes or a bedsheet. Most procedures have changed, check the wiki for details. Currently it's pretty boring, but this paves the way for exciting new stuff- new procedures are very simple to add. Report any bugs directly to me, or on the issue tracker. +
- There are now hackable wires for the PA computer. To open the interface, click on it while the wires are exposed/panel is open. All but one wire will do something interesting, see if you can figure it out. You can also attach signallers to the wires so have fun remotely releasing the singularity. +
- New staff of animation icon by Teh Wolf! +
- You can now hack plastic explosives (C4)! +
- You can now use NTSL to send signals! With the function signal(frequency, code) you can create some clever ways to trigger a bomb. NTSL also has two new additions; return in the global scope will now stop the remaining code from executing and NTSL now has "elseif"s, huzzah! +
- You've been asking for it for years, it's finally here. Wizards can spend points to buy apprentices. +
- A new wizard artefact, the scrying orb. +
- The spellbook now has descriptions of spells/items visible BEFORE you purchase them. +
- Traitors with the station blueprints steal objective can now use a photo of the blueprints instead! +
- Signallers, prox sensors, mouse traps and infrared beams can now be attacheed to grenades to create a variety of mines. +
- A slime core can be placed in a large grenade in place of a beaker. When the grenade goes off, the chemicals from the second container will be transfered to the slime core, triggering the usual reaction. +
- Implants can now be surgically removed. Hint: They're inside the skull. +
- The return of the Nanotrasen Scripting Language! (NTSL) If you haven't heard of NTSL, it is a scripting language within a game for telecomms. Yes, you can create scripts to interact with the radio! For more information, head here: http://wiki.nanotrasen.com/index.php?title=NT_Script But before you do, if you are not an antag, do not create bad scripts which hinders communication. +
- Cameras, mulebots, APCs, radios and cyborgs can have signallers attached to their wires, like airlocks! +
- Cameras have non-randomized wires and the power wire when pulsed will now toggle the camera on and off. +
- Cyborgs have a new wire, the lockdown wire! It will disable/enable the lockdown of a Cyborg when pulsed. +
- The traffic control computer (or more commonly known as the computer which lets you add NTSL scripts) will now have a user log, which will log all user activity. Other users can then view that log and see who has been uploading naughty scripts! +
- NTSL has two new functions! time() and timestamp(format) will help you increase the range of types of scripts you can make, especially time(); since you can then make the scripts know the different between each execution by storing the results in memory. +
- Two new advance disease symptoms! Their names are "Longevity" and "Anti-Bodies Metabolism". Have fun experimenting with them! +
- Four new slime types with their own reactions and two new reactions for old slimes. +
- Put a suit of reactive teleport armour back in the RD's office. +
- Chemistry now has two dispensers (with half charge each) so both chemists can actually work at the same time. +
- Security frequency chatter now appears in cyan (Similar to how command is gold)
- The plant bags in Hydroponics lockers have been replaced with upgraded models with seed-extraction tech. Activate with via right-click menu or Objects verb tab. +
- Obtaining grass tiles works a bit different now: grass is harvested as a normal plant item, clicking on it in-hand produces the tile. +
- Added hugging and kicking. I also updated the text styles for clicking on humans in most intents, but they should be pretty much the same. +
- All the equipment you spawn with will now contain your fingerprints, giving the detective more ability to tell where items came from and if a crewmember has changed clothing. +
- Better explosions: Explosion spreading will now be determined by walls, airlocks and poddoors and not just a flat circle. +
- Chickens will now lay a certain number of eggs after being fed wheat, rather than just laying them whenever they felt like it. No more chickensplosions. +
- Department Security can now be runned:
+
Department Security decentralizes security by assigning each officer to a different department. They will be given the radio channel and access to their assigned department along with a security post. The brig has been remapped to be smaller to accomodate this change. +
To run DeptSec: Before compiling, server operators must
tick jobs.dm (in WorkInProgress/Sigyn/Department Sec) and use map 2.1.1 instead of 2.1.0.
+ - Curse of the Horseman. +
- Spiders which will breed and spread through vents. Different classes of vents. AI controlled only at the moment. +
- Farm animals! Cows, goats and chickens are now available. You can order them at Cargo Bay. +
- Staff of animation mimics will no longer care whether you are holding the staff or not, they will never attack their creator. +
- Brainrot will only need alkysine to be cured. +
- New spider infestation event based on Cael's spiders. The announcement will be the same as alien infestations. +
- Plasma (Air) will give the breather the plasma reagent, for a toxic effect, instead of just straight damage. +
- The agent card will now work inside PDAs/Wallets; meaning the AI won't be able to track you. +
- The owl mask now functions as a gasmask for increased crimestopping power. +
- Adds the missing icons for the arrest statuses of Parolled and Released, as well as a little blinking icon for chemical implants. +
- Many new icons for aliens (death, sleeping, unconscious, neurotox, thrown/impregnated facehugger etc) +
- Alien larva can now be removed by dangerous and unnecessary surgery (and actually chestburst if they aren't). +
- Alien larva now have sprites to represent their growth: bloody at 0%, pale at 25% and 75% the normal deep red. +
- New icon overlays for representing alien embryo progression. +
- Four new slime types with their own extract reactions have been added. Sprites this time were created by Reisyn, SuperElement, and LePinkyFace. +
- Slime breeding! There are now 13 varities of slime, each with its own extract reaction (inject five units of plasma). Some of these reactions are reused from the old cores, some are new. As to breeding, each colour of slime has a series of other slimes it may mutate into when it reproduces. +
- You can now use wallets as IDs and equip them in your ID slot. +
- Firesuits are once again effective at protecting you from heat. The flames themselves will still hurt you, even with a firesuit. The damage protection is much better with a firesuit though. +
- Engineering starts with a PACMAN generator for jump starting the singularity if the power runs out of the SMES. 30 plasma spawns in Secure Storage inside the crate, to use as fuel for the generator. +
- Simple animals (Corgis, Cats, Constructs, Mice, Etc...) can now pull people. +
- You can quickly stop pulling on someone by pulling them, while they're already being pulled by you. For example, CTRL+Click on something you are pulling to quickly stop pulling it. +
- Emitters now require to be wired in order to work. When there is not enough power it will stop shooting until there is enough power, meaning you do not have to turn it back on, just get the power flowing. +
- You can order shield generators from cargo. Teleporter access is required to open the crate. +
- Map: Reorganized the Command Sector. The Captain has his own private quarters in addition to his office. +
- An agent card is now required to use doors and controls on the Syndicate Shuttle (Nuke). +
- Scanning gas tanks is now a PDA-cart function. Only Atmos and Science PDA carts have this function. Have fun mislabelling gas tanks! +
- The syndicate Military PDA will not show up on possible PDAs to message anymore, even when the receive/signal is turned on. You can still send messages and people can still reply to you. +
- You can now sell processed plasma for supply points. The conversion rate is 2 plasma sheets for 1 point. You must put the plasma in a crate for it to count. +
- The mecha toy prize promotion has officially ended. You can no longer redeem all 11 action mecha figures for a real mech. New toy redeeming promotions in the future will be considered. +
- You can now use . to speak over headset department channels in addition to the : and # characters. +
- You can now use # to speak over headset department channels. For example say "#e Hello" will say "Hello" over the engineering channel. say ":e Hello" will still work as it always has. +
- You can now create your own solar arrays! Order the solar pack crate and you'll receive 21 solar assemblies, 1 electronic which you can put into an assembly to make it a solar tracker and finally the solar computer circuit board. You will get more detailed instructions in the crate, on a piece of paper. Engineering will also start with this crate to help repair destroyed solar arrays. +
- Added a new option to the key authorisation devices. It removes the maintenance access requirement from all doors. It's irreversible, so only use it in an emergency! +
- Swapped the locations of the Library and Chapel. Thanks to killerz104 for the remap. +
- Partial remap of atmos. Monitoring and Refill stations are now the same room. +
- Toxins Mixing should be working properly again. +
- Robotics is now a full Science department. +
- Completely remapped Research Division, Robotics, Medbay, and the Library. +
- Partially remapped Cargo Bay, Mining Dock, Engineering, and Atmospherics. +
- Changed the access of the HoS and HoP. For a list, refer to their respective wiki pages. +
- Miners now have to go through cargo to reach the Mining Dock. +
- The Detective's revolver no longer cares about how cool you look. It now spawns in his locker. +
- Added new inhands for most energy weapons, by Flashkirby! +
- Disintegrate (EI NATH) will leave behind the brain of the victim. Possible productive uses include: trophies, looking awesome as you gib someone and only their brain remains, people to talk to when you get an MMI, pocket brains, a way to get back into the game if the wizard didn't grab your brain and stuffed it into his bag. +
- The detective's scanner was upgraded, it can now scan for reagents in items and living beings. Potential uses include, scanning dead bodies for leftover poison or scanning items to see if they have been spiked. +
- You can now attach photos to newscaster news feeds and wanted posters. +
- You can now emag buttons to remove access from them. +
- The CentComm. Report has been changed so it no longer names potential antagonists. It will just announce the potential round type instead. +
- Agent cards have been upgraded with microscanners, allowing operatives in the field to copy access levels off of other ID cards. +
- The Chief Medical Officer, Research Director, Chief Engineer, and Lawyers now have basic Brig access (corridor only) +
- Merged Mining and Cargo radio channels into the Supply Radio. To use the supply channel, use :u +
- Mining Dock remapped to be more compact and closer to cargo. +
- The wizard's fireball spell is once again dumbfire. It will fire in the direction of the wizard instead of having to choose from a list of targets and then home in on them. +
- Added a new artefact called the "Staff of Animation". You can get it in the Wizard's Spellbook. It will animate objects and items, but not machines, to fight for you. The animated objects will not attack the bearer of the staff which animates them, meaning if you lose your staff, or if it gets stolen, your minions will turn on you. +
- Janitor has recieved a slightly upgrade mop bucket. The old one is still there too. +
- Swapped the locations of the Vault and Tech Storage. +
- Cargo Techs, Miners, and Roboticists no longer start with gloves. They are still available from their lockers. +
- Slimes have replaced roros (finally)! Right now they are functionally identical, but massive expansion of slimes and xenobio is planned. Sprites are by Cheridan. +
- Added new very high level symptoms which are only obtainable in the virus crate. Virus crate will also come with mutagen. +
- Removed clown planet! It'll return shortly in away mission form. +
- Added Gateway access. Only the RD, HoP, and Captain start with this. +
- New access levels in the brig:
-Brig access now opens the front doors of the brig, as well as other lower-risk security areas.
-Security access allows you into the break room and equipment lockers.
-Holding Cells allows you to use brig timers and lets you in the Prison Wing.
-The Detective no longer has Security Equipment access.
+ - Significantly increased max cloneloss penalty for fresh clones to 40%. +
- Simplified detective stuff. The high-res scanner is gone and instead the detective's normal scanner will instantly report all fingerprints, dna and cloth fibers in full. This was needed because the system took too long to work with and disencouraged detectives. Not only that, it made detectives less of a threat for antagonists and made possible scenerios, such as framing someone by changing fingerprints with someone else, impratical. To replace the computer, the detective will have a full medical computer with access to it. Not only that, but his useless filing cabinet will be replaced with an empty one for serious investigators. Along with this, are fingerprint cards and built-in PDA scanning, as all of security had access to it which was really the detective's thing. The new scanner will also log every finding and you can print them out as a report by clicking the scanner while it is in your active hand. +
- You can toggle the pressure of your sprayer by clicking on it while it is in your active hand. With pressure, the sprayer will spray 10 units on the floor, otherwise it sprays 5. You'll need to turn pressure on to spray water on the floor and make it slippery. +
- AIs in intellicards can no longer move their camera. This will limit them in ability but without making creating and carding an AI to have as a personel door opener impossible. +
- Telecommunication Busses can now be set to change the frequency of a signal. (Allowing you to say.. set the command channel to broadcast to the common channel). +
- Telecommunication was changed to be more effecient. Because of this, Relays don't need a broadcaster or a receiver and you can setup a relay on it's own. You can still disable sending and or receiving from the relay's interface. +
- Plant Analysers now work on seed bags. +
- The nuke shuttle can now travel at will, and to any location. When travelling from syndicate space to the station, (and vice versa), it will travel through hyperspace. +
- Changed savefile structure. There's a bunch of unused files left lying around so old savefiles will be purged. Sorry for the inconvenience. Many preferences have been moved to the Preferences verb tab. Everything in that tab is persistent between rounds (it updates your savefile, so even DCing won't reset them). Enjoy x +
- Added female sprites for most mutant races. +
- SSU manufacturers have issued a product recall! It seems old models shipped with faulty wiring, causing them to short-circuit. +
- Added Exile Implants to the Gateway room. Someone implanted with an Exile Implant will be able to enter the away mission, but unable to return from it. Not only can they be used for getting rid of dangerous criminals, but revs/stationheads count as dead while on the away mission, and traitor/changeling/wizard assassination targets count as dead if they're on the away mission at round end, allowing for those objectives to be completed peacefully. +
- Added medical hardsuits, sprited by Majorsephiroth. Two of them spawn in EVA. Their most unique/medical oriented feature is being able to hold a medkit in the suit storage slot, allowing you to easily access medicine while keeping your hands free. +
- Malf AIs can only shunt to APCs from their core. Meaning their core needs to be alive before they can shunt to another APC. Malf AIs can start a takeover inside an APC now. +
- When taking damage, the next sequence of the overlay will show for a bit before reverting to the overlay you should have. This allows you to know you are taking damage without having to check the text screen. +
- Ported over BS12 style cameras. They now take a photo of a 3x3 area! +
- Catatonic people (those that have ghosted while alive) now count as dead for assasinate objectives. +
- You can now deconstruct and construct Air Alarms and Fire Alarms. Read wiki on howto. +
- Medical Cyborgs no longer lose the reagents in their hypospray when switching modes. +
- Spaceacillin will now help stop the spread of diseases. +
- You can once again make floors slippery by spraying water. This was done by increasing the amount the sprayer uses, which is from 5 to 10. You can also empty your sprayer's contents onto the floor with a verb in the Object tab. +
- Fixed the syndicate teleporter door, making teleport assaults possible. It will once again open when you open the outter door. +
- You can now name your advance diseases! You can't name already known diseases though. +
- Chemical implants can now hold 50 units instead of 10 units. +
- More work to advance diseases. Please report any bugs to the bug tracker, I have tried everything that I can on my own but I'll need lots of people playing to fix the more minor bugs. You can find a guide to making your own diseases here: LINK! +
- Reduced the cost to use Hive Absorb from 40 to 20. This is to help encourage people to use this power more and to use team work. +
- New symptom added! See if you can find it. +
- You can now remove symptoms from a disease using synaptizine. +
- Kor: You can once again debrain changelings. They won't make anyone half-lings though, and you won't be able to tell if the body of a debrained changeling is a changeling by putting a player brain in there. +
- Wizards can no longer cast spells when muzzled. It iss now actually possible to capture a live wizard without constantly injecting them with chloral. +
- You can no longer take bags of holding or mechs to the clown planet. +
- Admin-ranks changes
+ Lots of changes. This is just a brief summary of the most recent changes; still working on proper documentation.
+ All admins have access to view-vars, player-panel(for individual mobs), game panel and secrets panel. Most of the things on those pages have their own rights requirements. For instance, you can only use event orientated secrets in the secret panel if you have FUN rights. Debug secrets if you have DEBUG rights. etc.
+ Spawn xeno and toggle gravity procs were moved into the secrets panel (fun).
+ This may help with understanding which flags do what. Unfortuanately it's still somewhat vague.
+ If you have any problems, feel free to PM me at irc.rizon.net #coderbus. I go by the username carn or carnie. +
+ - New cyborg upgrade available for production that requires illegal and combat tech +
- Summon Guns has a new gun type created by Ausops. It also lets the user know when its been cast now to prevent people trying to buy it multiple times +
- Grilles are no longer immortal in regards to solid projectiles, you can now shoot out windows. +
- Cyborgs can now ping and beep! (Say "*beep" and "*ping") Thanks to Rahlzel for the proposal. +
- HULKS WILL NOW TALK IN ALL CAPS AND WILL RANDOMLY SAY HULK THINGS. Thanks to Brotemis for the proposal. +
- Sorry for the inconveniences with advance diseases. They are working much better now! +
- An improved APC sprite by TankNut! +
- AIs can now tweak with a bot's setting like a human who unlocked the bot. + +
- Being in an area with extremely low pressure will now deal some damage, if you're not protected. +
- Space suits and the captain's armor now protect against pressure damage +
- Slightly lowered all environment damage intakes (temperature, oxygen deprevation) to make up for low pressure damage. +
- Pressure protection finally works properly. Items that protect from pressure (firesuits, space suits, fire helmets, ...) will now properly protect. The pressure damage indicator will update properly based on the pressure effects on you. Black (low) and red (high) mean you are taking damage. +
- Slightly slowed down the speed at which your body temperature changes if you are in a very hot or very cold area. The speed at which you recover from an abnormal body temperature remains the same. +
- New APC sprite. +
- New Wraith sprite and jaunting animation. +
- New Ablative Armor sprite. +
- Airborne diseases will not spread through walls now. +
- Reduced queen healing rate to 5. The maximum health will be enough. +
- Aliens can now clear hatched eggs by clicking on them. + +
- You can once again travel to the station, derelict, satellite and mining z-levels through space. You will also never loop into the same level on transition - So if you are exiting the derelict z-level, you will enter one of the other z-levels. +
- Aliens now take x2 as much damage from fire based weaponary, instead of x1.5. +
- Doors are now weaker than walls; so normal weapons can destroy them much more easily. +
- Advance evolving diseases! Virology can now create, mutate and mix advance diseases together. I replaced the two bottles of blood in Virology with the advance disease. I'll write a wiki article soon enough. Here's a tip: Putting mutagen or virus food (a mixture of milk, water and oxygen) in blood with an existing disease will mutate it to gain symptoms. It can potentially lose old symptoms in the process, so keep backups! +
- You can now set your character's age up to 85. This used to be 45. +
- Mousetraps are now assemblies. +
- Added a new crate for cargo to order. + +
- Player Weekend begins! +
- Added a camera and hand labeler to art storage. +
- Added a medical records cabinet to the Detective's office. +
- Added a safe to the vault. Who'll be the first to crack it? +
- The CE has a new pet! +
- Added 18 new hairstyles! +
- Throwing eggs will result in the reagents of the egg reacting to the target. (Which can be a turf, object or mob) This creates possibilities like chloral eggs, lube eggs, and many more. +
- Aliens can now acid walls and floors! Not R-Walls though. +
- Facehugger throw range reduced to 5, so aim at humans that are 2 tiles apart from the edge of your screen. +
- Making eggs is a little more expensive but secreting resin is cheaper. (Both cost 75 now) +
- Aliens no longer have a random duration of stunning humans, it's a constant value now of the lower based value. +
- Acid is less random and will be more reliable. Don't bother aciding stuff more than once, as it will waste plasma. +
- You can now target non-dense items (such as facehuggers) with a gun. +
- You can now shoot canisters, computers and windoors to break them. +
- As an AI, you can type in the "track with camera" command and get a list of names to show up there. This also works with "list camera" verb. Remember to use space to auto-fill. +
- Welding goggles have been added. They are like welding helmets but they are for the glasses equipment slot. Science and the assembly line are given a pair. +
- Thanks to WJohnston for the welding goggle icons. +
- Small change to the Assembly Line. Instead of six normal flashes, the Assembly Line will instead have two normal flashes and eight synthetic flashes. Synthetic flashes only work once but are designed to be used in construction of Cyborgs. +
- Nar-Sie put on a few pounds. Thanks HornyGranny. +
- New changeling powers! +
- Hive Channel/Hive Absorb. Allows you to share your DNA with other changelings, very expensive chemical wise to absorb (download), not so much to channel (upload)! You cannot achieve your objective by sharing DNA. +
- Mimic Voice! You can form your voice of a name you enter. You won't look like them but when you talk, people will hear the name of who you selected. While you're mimicing, you can't regenerate chemicals. +
- Extract DNA! A power that allows you to silently sting someone and take their DNA! Meaning you do not have to absorb someone to become them. Extracting their DNA doesn't count towards completing your objectives. +
- You can now get flares from red emergency toolboxes. Has a 50% chance of a flash-light or a flare spawning. +
- Flare icon by Ausops! +
- Thanks to RavingManiac (Smoke Carter), Roros now lay eggs which can grow into baby roros or be used for cooking recipes. Scientists will need to expose the egg to plasma for it to hatch; while it is orange (grown). +
- A new icon for the map spawned x-ray cameras. Icon by Krutchen. +
- Facehuggers have a new animation, thanks to Sly. +
- Firelocks, glass-less airlocks and walls will stop heat. +
- Fires are now more deadly, especially the flames. +
- Fires will now break windows. +
- Larva grow a little bit faster when on weeds or when breathing in plasma. +
- Thanks to Skasi. Atmospherics has been changed to be made simpler and spawn with the new atmos features, such as the heaters. +
- Radio headsets can only be heard by people wearing them on their ear slot. This will let us do more fun stuff with headsets, such as a traitor encryption key which can listen to all the channels, but not talk in them. +
- A pen no longer spawns in your pocket. Instead, each PDA will spawn with a pen already in it. +
- Aliens can now be harmed by fire. They now also take double fire damage, meaning flame based weaponry is very effective. +
- Buffed alien facehuggers and eggs. Facehuggers don't go idle anymore, and they attach to anyone who walks past them. Eggs do the same; fully grown eggs will open to potential hosts. If you are still in the range of them, the facehugger inside will leap out and hug you. Removed "activate facehuggers", since it's useless now. Emote "roar" if you want to roar now. +
- There can be only one living queen at a time, if the queen dies then a drone can take her place as a princess. +
- Buffed queen regeneration a bit, so it's not the same as her underlings. It's also more important because there can only be one queen at a time. +
- Aliens don't slip in space anymore. +
- Hulks don't paralyze aliens anymore, they instead slow them down to a slow crawl. It is very effective for punching aliens out of weeds, so it can't regenerate it's health. +
- New egg opening and opened egg icons by WJohnston. +
A buncha crud nobody cares about lolAdded a light to the airlock wiring interface to show the status of the timing.
+ - You can't fill sprays without being next to the dispenser. +
- Simple animals no longer freeze to death in places with normal temperature. +
- Mechs no longer freeze on the spot when they are using the Energy Relay on powerless areas. +
- Improvements to showers, they now clean gear on beltslot, back, ears and eyes. Showers only clean visible gear. +
- Replica pods works again! But you can't make potato people without a key or clone people who ghosted alive (Catatonic). +
- Engiborgs can deconstruct airlocks with their RCDs once again. +
- You can construct airlocks while standing on another airlock with RCDs. +
- Wizards have a new artifact added to their spellbooks. +
- Readded Volume Pumps - now they work as intended and are constructable +
- Readded Passive Gates - now they work as intended and are constructable +
- Readded Heat Exchangers - now they work as intended and are constructable +
- Added Heater - to warm up gasses to 300C +
- Pipe dispensers can produce the readded pieces. +
- New graphics for all of the above - courtesy by Ausops. +
- Airlocks now use the Environmental power channel, since they are airlocks after-all. Meaning, when power is low the airlocks will still work until the environmental channel on the APC is turned off. This applies to all the door control buttons too. Pipe meters now use the environmental power channel. If you have any comments have this change, please let me know in the feedback section of the forums. +
- Added new hotkeys. Type hotkeys-help for details or see the drop-down help menu at the top of the game window. +
- Mechs are once again spaceproof! +
- The YouTool machine is now all access +
- Cutting tower caps in hand no longer deletes the wood, and planks now auto stack +
- Reworked the Piano, now really optimized and new interface! +
- Hopefully fixed the stop midis button. It should now stop any midis that are currently playing. +
- Fixed an exploit which would allow the janitor to magically mop floors. +
- Added lipstick~ It's not available on station, as Nanotrasen has deemed it contraband. +
- If you encounter any issues with computers, notify an admin, or ask for assistance on #coderbus, on irc.rizon.net. +
- Updated the Package Tagger with new interface! +
- You can now dispense, remove and retag sort junctions properly! +
- Metroids have been replaced with Rorobeasts. Roros are strange latex-based lifeforms that hate light, fun, and gloves. +
- F5 is now a hotkey for adminghosting. F8 toggles ghost-like invisibility for admins. +
- Catatonia makes you fall down. Admins appear braindead when admin-ghosting. +
- "Set-observe"/"Set-play" renamed and merged into "Aghost". +
- "Lay down/Get up" renamed to "Rest" +
- Closets can't be sold on the supply shuttle anymore +
- Fixed all dat light +
- New Hotkeys (Trial period). Details can be found in the help menu or via the hotkeys-help verb. It's all client-side. It shouldn't intefere with regular controls (except ctrl+A, ctrl+S, ctrl+D and ctrl+W). +
- AIs can double click on mobs to instantly start tracking them. +
- The file /code/defines/hub.dm was moved into /code/hub.dm. To get your server back on the hub, open /code/hub.dm and set the hub variables again. Sorry for the inconvenience. +
- Added an additional check to stop changelings sharing powers/becomming un-absorbable/etc by absorbing eachother and then rejuvinating from death. +
- Cloaked Aliens are now slightly easier to see, so they should avoid strongly lit areas when possible. They can still lay down to become even stealthier though. Let me know what you think, it's only a minor sprite change. +
- -Changes flour from an item to a container-held reagent. All recipes have been updated to use 5 units of reagent flour for every item required previously. This has a few advantages: The 16(!) sacks of flour previously in the kitchen cabinet have been condensed to an equivalent 3 sacks. Beer is now brewable with universal enzyme, and converting lots of wheat into flour should be less tedious. Also, flour grenades, etc. Because of this, flour is now obtained from the all-in-one blender rather than the processor, and spaghetti noodles are made with 5 units of flour in the microwave. +
- Removed cameras from bots (NOT BORGS). They weren't working well with freelook and I felt that since they weren't used at all, they wouldn't be missed. +
- Cameras has changed quite a bit. They are no longer created from grenade canisters, instead you make them from an autolathe. The construction and deconstruction for them has also changed, so look it up or experiment it with yourself to see how to setup the cameras now. Cameras also get wires, like airlocks and APCs. There's two duds, a focus wire, a power wire, an alarm wire and a light wire. Protip: You can see which one is the alarm wire by pulsing it. +
- Added a red phone and placed it in the Cyborg Station. Sprite by Pewtershmitz! You'll also find an AI restorer there, replacing the computer frame. +
- Cameras aren't all X-ray anymore. The AI won't be able to see what room you are in if there's no normal camera inside that room or if there's no X-ray camera nearby.. +
- Cameras get upgrades! Currently there's X-ray, EMP-Proof and Motion. You'll find the EMP-Proof and Motion cameras in the normal places (Singularity Pen & EVA), the new X-ray cameras can be found in the Dormitory and Bathrooms, plus some extra ones to invade your privacy. See if you can smash them all. +
- Alien Larva can bite simple animals (see: Ian, Runtime, Mice) to kill them and gain a small amount of growing points. +
- Space travel was tweaked to be more random when changing Z levels. This will stop people and items from being stuck in an infinite loop, as they will eventually hit something to make them stop. +
- Overhauled newscasters. No visual additions but the thing is much more robust and everything works as intended. Wanted issues are fixed. Admins, check out Access News Network under Fun. +
- You can now create an EMP Pulse. Like an explosion, it is the mixing of two reagents that trigger this to happen. I will tell you the first required reagent. Uranium. Have fun! +
- I have made most chemicals need 3-5 or more chemicals in order to react to a turf. For instance, you need at least 5 units of thermite splashed on a wall for it to burn down."
- +
- The EMP kit, that you can buy through the uplink, has two more grenades in them now. Making the box full of EMP grenades! +
- Changed the EMP grenade's range to be much bigger. +
- Mice now work with the admin player panel. Admins can now turn players into mice with the 'Animalize' button in the player panel! +
- Space bear AI no longer runs when a player is controlling it. Admins can now turn players into space bears with the 'Animalize' button in the player panel! +
- The holodeck beach program once again has a beach. +
- The nuke op shuttle floor was pressure-washed a few days ago. We have since re-painted it with nanotrasen blood. Sorry for any confusion. +
- You can now toggle the bolt light of airlocks. An extra wire, that controls the airlock's bolt light, has been added. +
- Aliens can now tell who is and who isn't infected. They get a special facehugger icon that appears over mobs that have been impregnated. +
- Cameras have temporary X-Ray for the time being. +
- Admins now have an 'Animalize' button on a mob's player panel. This button allows admins to turn players into simple animals.
There are a few exceptions. Mice, Parrots, Bears and Space Worms all have issues that, until fixed, prevent me from allowing players those transformations.
+ - New lighting. It should look and feel the same as the old lighting whilst being less taxing on the server. Space has a minimum brightness (IC starlight) and areas that do not use dynamic lighting default to a lighting level of 4, so they aren't dark, but they aren't superbright. Replacing turfs should preserve dynamic lighting. Singulo/bombs should cause a lot less lighting-related lag. There are some minor known issues, see the commit log for details. +
- Admins can now access most controller datums with the "Debug Controller" verb. Time to break all the things! +
- Supply shuttle now uses a controller datum. This means admins can see/edit supply orders etc. +
- Changeling fakedeath can be initiated after death again. Next time you want something reverted, just ask rather than being obnoxious. +
- AIs can now look around like a ghost with the exception that they cannot see what cameras cannot see. Meaning if you're in maintenance, and there's no cameras near you, the AI will not know what you are doing. This also means there's no X-Ray vision cameras anymore. +
- AIs can add links to Telecommunication Machines. Added some cameras for areas that should have it but instead relied on cameras nearby for vision. +
- Choking has been changed. You have to stand still while lethally choking someone. It takes time to get into that lethal choke. When you are lethaling choking someone, they are still concious until the lack of oxygen knocks them out. +
- Nerfed the Neurotoxin drink, it is now less effective than a stunbaton. But more effective than a Beepsky Smash. +
- Updated descriptions on various cocktails to be more accurate or more relevant to the drink itself. +
- Floorbots now actually pull up tiles when emagged +
- All helper bots (excluding MULEs) have an access panel and maint panel, access being for behavior and maint for internal work +
- To open the maint panel, the access panel needs to be unlocked, then you use a screwdriver. There you can emag/repair it to your heart's content. (Emagging the access panel will also unlock it permanently) +
- Helper bots are now repaired by using a welder when their maint panel is open +
- In-hand sprites once again update correctly when equipping items. +
- Changes were made to how heating and cooling of humans works. +
- You must wear both a space suit and space helmet to be protected from space! Likewise you must wear a firesuit and a fire helmet to be protected from fire! Fire helmets are red and white hardhats, found in all fire closets. +
- Fire suits now only protect from heat and space suits only protect from cold, so make your choice count. +
- DNA modifiers can be used if there is no occupant, primarily to handle the buffer. +
- Ion Rifles are only effected by max severity EMPs, so AOE from its own shot won't effect it +
- Pepper Spray fits on Sec belts again +
- Turrets now properly fire at simple_animals. +
- Borgs, AIs, and brains/MMIs can be sacrificed by cultists. +
- Grenades now automatically set throw on again. +
- Library has been redesigned. It's a whole lot more classy now. +
- Significant changes to Medbay. CMO's office is more centralized, genetics has a new exit into cryogenics, and a new break room has been installed +
- Changes to Med-Sci south and surrounding maintenance areas. Virology is more isolated and Science gets a new Misc. Research Lab. +
- Atmos techs get construction access now to do their little projects in. +
- Transformation Stings now work on living humans. +
- Gas masks now protect you from reagent smoke clouds +
- Changed the 'black overlay' you get when paralyzed, blind or in critical condition to include a small circle around you. +
- Dramatically lowered the amount of damage you get per breath while in critical condition. Critical condition now lasts for about 5 minutes if nothing is causing you any additional harm. This in combination with the new black image overlay is an attempt at making doctors more willing to help. +
- Borgs now have flashlights to allow them to see in lightless areas +
- Changes to Medbay: The sleeper and storage rooms have been swapped around. Hopefully this leads to more healing and less looting. +
- Borgs can now have an encryption key installed into their internal radios. Simply ID, open the panel, and use the key to insert it (Screwdriver to remove) +
- Due to that as well, borgs have a 'Toggle Broadcast Mode' button for their radios, which changes the broadcast type between station-bounced (Non-reliant on TComms), and subspace (Required for department channels) +
- Also changed the binary chat for consistency, now for the prefix is ':b' for everyone, not just one for humans and one for borgs/AIs/pAIs +
- Based on feedback, Nuke Op pinpointers now automagically change between shuttle and disk mode when the nuke is armed or disarmed. +
- Please update your BYOND clients! Ideally everybody should be running the latest version of byond (v496). People who fail to update to at least version 494 within a month's time may find themself unable to connect. Currently our code has no restrictions at all, which is rather bad. By getting the user-base to keep their clients up-to-date we can make use of newer BYOND features reliably. +
- I've made some adjustments to the Fireball spell. I've changed it to shoot in the player's facing direction instead of you having to pick a name from a list. It will explode upon contact of a person, if it hits an obstacle or if it shoots for too long. To make up for the fireball not being able to go diagonal I've shortened the cooldown to 10 seconds. It still can hurt you badly and knock you down if you shoot it at a wall. Lastly, it now lights up so it'll show up in dark rooms easily. +
- Removed passive throwing. You need at least an aggressive hold of the mob before you can throw them. +
- New map changes by Ikarrus. AI Upload Foyer is now Secure Tech Access, and the outer door only requires Bridge access. Attached to it are two new rooms: The messaging server room and the communications relay. The comms relay room runs off its own SMES unit like the AI, so it won't be affected by powersinks +
- All radios now only work in their Z level. This means that the CommSat has a few more additions to work with this change. There is now a new Telecomms Machine called the Relay which allows information to travel across Z levels. It it then linked to a new machine called the Hub, which will receive information from the Relays and send it to the buses. Because every Z level needs these relays, which are linked up with Receivers/Broadcasters, every Z level will get one. There is one in the station, in the RD's office, one in Telecomms as always, one in the Ruskie station which is turned off and hidden from the HUB's linked list. The last one is in Mining but the location for it has not been decided yet. +
- PDAs now need to be in a Z level with a functioning Relay/Comms Network in order to send messages. It will also send uncompressed (scrambled) messages like you would with the ordinary voice messages. +
- Added some of WJohnston's sprites. Added a new mining borg sprite, Added a new high tech security airlock, Added the new telecomm sprites for Relays. Hubs were given old Bus sprites. +
- You can now use crayons to color eggs +
- Mice have invaded the station! +
- Added a new mushroom for Hydroponics, the Reishi Mushroom! It is obtained like any other mushroom and it has relaxing properties. +
- Attacking mobs with items will now give new messages. Instead of "Monkeyman was attacked in the head with a wrench by Nodrak." it will read "Monkeyman was bashed in the head with a wrench by Nodrak." Diffrent items have diffrent verbs and some have multiple verbs. +
- Cultists can now read what words a rune was made with by examining the rune. Due to an error in the code, this was not possible before. +
- Clowns no longer have practice lasers or staves of change blow up in their face due to clumsyness. +
- Engineering cyborgs can now actually repair a cut AI wire in APCs. +
- I've removed a ton of pointless checks and redundant loops from metroid's which have been causing lag due to how often they get called. If metroids are behaving strangly ping me in #coderbus +
- Made a 'default' save slot (D), and whenever you connect it automatically selects the default slot to load from, but manually selecting a different slot will allow you to play on that one before it returns to default. +
- Added the ability to name your save slots with the '*'. Names can be up to 16 characters and contain letters, numbers, and basic symbols +
- The preview icon on the preference screen now takes into account any job you have set on high, and dresses up the icon accordingly. If assistant is set to 'yes', or AI/Cyborg are on high it will put the icon in a grey suit (So you can still customize). +
- Nuke Ops get a new pinpointer, changing modes with the verb will switch between pointing to the disk, and pointing to the shuttle. Also provides a notification when you leave the station z-level +
- Reworked how MMI Life() was done, now they will never lose consciousness, and many less things affect them now(Like deafening/blindness from explosions). However, they are vulnerable to EMPs, but all damage is temporary. +
- Clowns will no longer be killed trying to use holo eswords +
- Major tweaking to try and optimize many operations on the game's backend. Hopefully, this will reduce a large amount of lag by steamlining CPU-intensive operations, but at the same time there was so much changed that there is no real way for a small group to test everything. If anyone spots a bug involving being unable to 'find' mobs, characters, whatever, then put it on the issue tracker or at the very least let #coderbus know. We can't fix shit unless we know about it. +
- Players not buckled in when the emergency shuttle/pod starts moving get will get knocked down. +
- Added a YouTool vending machine to primary tool storage. +
- Both the chef and bartender have access to the bar area so both can serve if the other is incompetent or does not exist. Bartender's shotgun and shaker were moved to his back room and the booze-o-mat is now ID restricted to the bartender. +
- Added powercells into vending machines in engineering +
- Gave two beartraps to the janitor for pest control purposes................ +
- Mech toys can now be redeemed at the quartermaster's for a great reward! If you collect the full set of 11 toys you should put them in a crate and send them to centcom via the supply shuttle. +
- Supply shuttle arrival time reduced to 2 minutes +
- Hopefully fixed the toy haul problem which made it possible to get a million toys from arcade machines. +
- You can now make newlines with your PDA notes. +
- You can now research and build the Light Replacer. +
- You can now store donuts in the donut box. The next donut you pull out will be the last one you put in. +
- APCs will auto-turn on if there is enough power in the grid, even if the powercell is below 30%. The APC needs to be charged for a long enough time before it starts turning equipment on, to avoid spazzing out. If you have any problems with it, such as equipment turning off and on repeatedly then please make an issue report with a screenshot of the APC. +
- Added the Light Replacer. This is a device that can auto replace lights that are broken, missing or burnt. Currently it is found in the Janitor's closet and Janitor Borgs can equip it. You can refill it with glass, or if you're a Cyborg, just recharge. It is emaggable and will replace lights with rigged lights. The light's explosion was nerfed to help balance it and it is very noticable when you are holding an emagged Light Replacer. +
- The Janitor's equipment locator, on their PDA, will now tell you the direction of the equipment. +
- Added department satchels +
- Added Captain's Backpack and Satchel +
- Added three new hairstyles by Sly: Gelled, Flat Top, and Pigtails. Hair list has also been sorted by grouping similar styles. +
- Added a new wire for Cyborgs. See if you can figure out what it does. +
- You can now fill any container with a sink. You can change the amount to fill, from sinks, by setting your container's transfer amount. +
- All living mobs can now ghost whenever they want. Essentially making the suicide verb obsolete. If you ghost whilst still alive however, you may not re-enter your body for the rest of the round. +
- Humans can no longer suicide whilst restrained (this is purely to prevent meta whilst I finish up the new FUN suicides) +
- Fixed dem evidence bags. Fixed metroids getting at it like rabbits. Fixed stuff like welding masks not hiding your face. Bunch of other things +
- pAI Emoticons! Allows each pAI to set their screen to display an array of faces! Click on 'Screen Display' in the pAI OS for a list. +
- Added Russian Revolvers. This is a special Revolver that can only hold a single bullet randomly in it's chamber. This will allow you to play Russian Roulette with your fellow crew members! You can use it like a normal gun but you will need to cycle through the chamber slots until you hit the bullet. Only admin spawnable. +
- Added FLOORLENGTH HAIR. YEESSSSSSSS!!!! :3 If you like it say thanks to Ausops for fixing it up. Credits to Powerfulstation for the original sprite. +
- Save Slots! You can now have separate save slots for different character setups, with a customizable maximum of 3 slots per account. If you are wondering, you will not lose your old saved setup. +
- The character setup screen was updated to look nicer and to fit on the screen. +
- Added new Dwarf and Very Long hairstyles. Dwarf hair and beard by SuperCrayon. +
- pAI gets a better PDA that can actually receive messages from people. They can also instantly reply like everybody else now and they can toggle their receiver/signaller/ringer. +
- You can show the AI the notes on your PDA by holding it up to a camera. When you show up a paper/pda to the camera the AI can now click on your name to go to you, if you're near a camera. People who are Unknown will not have a link; which would've allowed the AI to track them. +
- Made the" common server" and the "preset right receiver" listen for frequencies 144.1 to 148.9. This will allow people to use different frequencies to talk to eachother without bothering the common channel. It will also allow Revs and Cultists to work with each other; everything is still logged though so it still has risks. +
- Increased the maximum frequency limit for handheld radios and intercoms. It will give you the option to just use station bounced radios on a higher frequency so that anyone with a headset can't simply tune in. +
- Created an All-In-One Grinder that is suppose to replace the blender, juicer and reagent grinder all together. Meaning any department that has a juicer, blender and grinder will instead get this. It will help people be more independent from Chemistry by recycling foods and plants. +
- Added a couple of Emergency Shield Projectors to Engineering secure storage.
+
Note: Credit goes to Barhardar for the original code and functionality. +
These devices can be used to quickly create an air-tight seal across a hull breach until repairs can been made. +
Wrench them in place and activate them near a hull breach. The shield should extend to all space tiles in range. +
They can be (un)locked by engineering IDs and can also be emagged and otherwise malfunction. As they can not be constructed, you can repair damage and malfunctions by opening the panel with a screwdriver and replacing the wires with a cable coil
+ - Chemistry update: Pills can now be ground up in reagent grinders. You can now put custom amounts of reagent into things using chemmasters. Can now load pill-bottles into chemmasters for mass pill-production. +
- Clicks on inventory slots with items in now act like a click on the thing in that slot. So clicking smaller things (like pens) is easier and you can remove clothing that borks/goes invisible. Please continure to report those kinds of bug though please. Thanks x +
- Can no longer interact with your inventory with a mech. +
- You can now only adminhelp once every 2 minutes so please provide all necesary information in one adminhelp instead of 5! Also reply to admins in PM-s and not additional adminhelps. +
- A basketball simulation is now available at the holodeck. Credit to Sly and Ausops for the sprites. +
- Bottles can now be broken over people's heads! To do this, you must have the harm intent on and you must be targeting the person's head. This change affects alcoholic bottles only. It does not change pill bottles or chemistry bottles. Helmets help protect you from damage and the regents of the bottles will splash over the victim. +
- AI's now have access to a PDA. Note: It is not PDA-bomb-able +
- Health analyzers and medical PDAs now give a time of death when used on corpses. +
- Alien larva now chestburst even after their host has died. +
- Aliens can now slap facehuggers onto faces so they can infect mobs which lay down (or those stuck to nests). +
- Aliens can now slash security cameras to deactivate them. +
- Added alien nests. They're basically beds made of thick sticky resin which aliums can 'stick' (buckle) people to for sexytimes +
- Weed nodes are no longer dense. +
- Queens can secrete resin for walls/nests/membranes +
- Various bugfixes +
- Added Petethegoat's basic mirrors to the map. They allow you to change hairstyles. +
- Remapped Bar, Theatre, and Hydroponics. Bar and Kitchen are now more integrated with each other. +
- I'm currently working on cleaning up and moving around a large portion of the mob code. These changes do not directly affect players; HOWEVER, bugs, oversights or simple mistakes may cause problems for players. While I have tested as much as I can, there may be some lingering bugs I have missed.
This part of the mob code cleanup mainly focuses on damage variables and procs. So if you suspect something related to taking, dealing or examining damage is not working as intended please fill out an issue report here and be as detailed as possible. This includes what you were doing, steps to reproduce the problem, who you were doing it to, what you were using ect... Thank you.
+ - Alien hunters will now cloak when using the 'stalk' movement intent. Whilst cloaked they will use up their plasma reserves. They can however cloak as long as they like. Using the Lay-down verb will allow them to remain cloaked without depleting their plasma reserves, hence allowing them to lay ambushes for unsuspecting prey. Should a hunter attack anybody, or get knocked down in any way, they will become visible. Hopefully this allows for more strategic/stealthy gameplay from aliens. On the other hand, I may have totally screwed the balance so feedback/other-ideas are welcome. +
- Removed the invisibility verb from the alien hunter caste. +
- Fixed the bug which prevented you from editing book's titles and authors with a pen. Also fixed the bug which prevented you from ordering a book by it's SS13ID. +
- Added the F12 hotkey which hides most of the UI. Currently only works for humans. +
- Pizza boxes! Fully stackable, tagable (with pen), and everythingelse-able. Fantastic icons by supercrayon!
Created with a sheet of cardboard.
+ - Changeling parasting now only weakens for 10 game ticks. It no longer silences your target. +
- Reworked job randomizing system. Should be more fair. +
- List of players are now randomized before given antag, this means that declaring as fast as possible doesn't mean shit anymore! +
- Putting a blindfold on a human with lightly damaged eyes will speed up the healing process. Similar with earmuffs. +
- More overlay bug fixes. Most of it to do with little robots and construction stuff. Bugs go here if you have 2 minutes http://nanotrasen.com/phpBB3/viewtopic.php?f=15&t=9077 +
- Weakening is instant! That means if you stunbaton somebody they're gonna fall-down immediately. +
- Medical storage now requires Surgery access (Medical Doctors only) +
- AIs, Borgs are no longer able to be cultists or revolutionaries as their objectives completely contradict their laws. They can still be subverted of course. +
- pAI's no longer keep cult or rev icons. +
- -Both Ambrosia forms have had their reagent contents modified to prevent going over the 50-unit cap at high potencies. Ambrosia Deus now contains space drugs instead of poison. +
- -Drinking milk removes capsaicin from your body. REALISM! +
- -Frost oil hurts less upon consumption. +
- -Liquid plasma can be converted into solid plasma sheets, by mixing 20 plasma, 5 iron, and 5 frost oil. +
- -Added effects for holy water injection on hydroponics plants. +
- Fix for special characters on paper and from announcements +
- Various small bugfixes, check the commit log for full details +
- Fixed falsewalls not working +
- Made Lasertag ED-209's and turrets much more useful, including making their emag function more fitting +
- Added Mesons to the EngiVend to make up for how many lockers were removed +
- New Item: Sheet Snatcher. Right now only borgs have them, but they can hold up to 500 sheets of minerals (Of any combination), and auto-stacks them to boot. Used just like the mining satchels, meaning minerborgs can actually deliver metal +
- Mech drills can mine sand, and the diamond gets a much larger volume +
- If a borg has the satchel in its modules (Doesn't have to be the active one), it will auto-magically pick up any ores it walks over. +
- Bumping an asteroid wall with a pickaxe/drill in your hand makes you auto-magically start drilling the wall, making mining much less tedious (humans and borgs)(Also, gustavg's idea) +
- New afro hairstyles. Big Afro by Intigracy. +
- First update for update_icons stuffs:
Fixed husking and fatties
Fixed floor tiles still appearing in hand when laying them
Fixed runtimes with fatties.
+ - Fixes for pre-existing bugs:
Fixed being unable to put belts & backpacks on other people
nodamage (godmode) now prevents all organ damage. It does not stop healing however.
Nerd stuff...
+
+ - Greatly reduced the amount of damage high pressure does. +
- Fire suits, firefighting helmets (red harhats) and the chief engineer's white hardhat now protect against high pressure. +
- Ported over ponytail sprites from Baystation +
- FEAR NOT! You can now store a pen in your pda. (aka Best commit all commits) +
- Massive Mob-Icon Overhaul:
A large amount of the mob code has been replaced. The systems replaced were causing immense performance issues so the following are very necessary optimisations.
However, there is a downside: SS13 code is the equivilant of monkeys on typewriters. Despite weeks of constant coding/testing there -will- be things I've missed. The kinds of bugs I'm expecting are overlays not updating and/or in rare cases things not appearing in your hud. Most of these issues can be worked around simply by dropping the item and picking it back up. If all else fails ask an admin to regenerate your icons through view-vars.
Please report any bugs to me on #coderbus IRC or make an issue on the tracker as a matter of urgency. I will fix them ASAP.
Also a massive thankyou to Nodrak, Erro, Pete and Willox. :)
+ - Massive rewrite of the overlays system (particularly for humans). Stuff is cached and only updates when necessary. In effect this means faster updates, less overheads/lag, and less reliance on the game-ticker. +
- Numerous bugfixes and tweaks for damage-procs and damage-overlays for humans. They should now be almost seamless, use very little overhead and update instantly. +
- TK grab can now be cancelled using the throw hotkey. (so now it toggles on/off like it used to). +
- Added verbs to the view-var drop-down list: "Regenerate Icons" will fix a mob's hud/overlays. "Set Mutantrace" will change a mob's mutantrace. +
- Damage icons were split up. They kinda look a bit crap so spriters feel free to replace them. Templates are provided in dam_human.dmi +
- More to come...
- -Added Lezowski's overalls to hydroponic supply closets. 50% chance per closet for them to replace the apron. -Removed some covers tags from things that made no sense to have them. +
- Fixed being able to lock yourself in or out of a locker using the verb. +
- Added lightfixture creating. +
- You can now use the resist verb or UI button when welded or locked in a closet. Takes 2 minutes to get out tho (Same as getting out of handcuffs or unbuckling yourself) +
- Making single-pane windows will now make the window in the direction you're facing. If a window already exists in that direction it will make it 90 degrees to your left and so on. +
- Cyborgs and AIs can now use the newscaster. It was a mistake on my part, forgetting to finish that part of them. +
- You can now make restraints from cable. It takes 15 lengths of cable to make a pair of restraints, they are applied the same way as handcuffs and have the same effects. It however only takes 30s to remove them by using the resist verb or button. You can also remove them from someone by using wirecutters on the handcuffed person. +
- Added four new cable colors: pink, orange, cyan and white. Engineer belts spawn with yellow, red or orange cables while toolboxes and tool closets spawn with all 8 colors. +
- Added a second ZIS suit to engineering. +
- Remapped CE office and surrounding areas. +
- Radiation now works properly, watch out for that Singularity! +
- Disposals are no longer the loudest machines in existence. +
- Building portable turrets with lasertag guns now makes them fire lasertag bolts based on team, and they will automatically target and prioritize people wearing opposing team gear. +
- The same can be done for ED-209s, simply using a lasertag vest and gun (same color) where you would use a security vest and taser in construction. +
- Added mineral walls and powered mineral door construction. More information can be found in the commit thread, but basically they are built the same way others are, apply mineral to girder for a mineral wall, mineral to airlock assembly for a powered mineral door. +
- Commit Thread +
- Throw hotkey (end) now works with TK. +
- Swap hands hotkey (page up) now cycles through borg modules. +
- Cargo's 'shuttle: station' and 'shuttle: dock' has been changed to 'shuttle: station' and 'shuttle: away' to help avoid confusion. +
- Maintenance shafts changed around. Renamed, less windows, more turns, and expanded in a few areas. +
- You can now add chemicals into cigarettes by injecting them directly or dipping individual cigarettes into a beaker. You can inject into cigarette packs directly to affect multiple cigarettes at once. +
- You can now click individual blocks/subblocks in the genetics console instead of having to scroll through the blocks with a forward/back button! +
- You can now Drag-Drop disposal pipes and machinery into the dispenser, in order to remove them. +
- You must now use wrench before welding a pipe to the ground +
- You can no longer remove a trunk untill the machinery ontop is unwelded and unwrenched +
- You are now forced to eject the disposal bin before unwelding it. +
- Readded fingerprints and detective work, after lots of debugging and optimization. +
- Any PDA with access to the Security Records can now, by the normal forensic scanner function, store data the same way as the detective's scanner. Scanning the PDA in the detective's computer will copy all scanned data into the database. +
- If something goes wrong, please contact SkyMarshal on the #bs12 channel on irc.sorcery.net +
- Glass Doors are now breakable. +
- Added more treasures to the secret mining room. +
- Changed mineral lockers from secret mining rooms: Instead of giving you two stacks of everything, you get stacks of ore based on rarity +
- Moved Engineering and Bridge deliveries. +
- -Adjusted balaclavas and added luchador masks. Wearing luchador masks give you latin charisma. They replace the boxing gloves in the fitness room. Boxing gloves are still available in the holodeck. -Fake moustache tweaked and given new sprites. +
- You can now dispense Disposal Bins, Outlets and Chutes from the disposal dispenser. These are movable and you can attach them above open trunks with a wrench, then weld them to attach them completely. You can remove Bins by turning off their pump, then screwdriver, then weld, then wrench. Same with outlet and chute except for the pump part. +
- Ported over Flashkirby99's RIG suit sprites from Bay12 +
- Department PDA Carts moved out of lockers and into head offices. +
- -Reverted default UI sprites to Erro's old-style UI. Config options for UI color styles coming soon. -Driest Martinis will no longer be invisible. -Braincakes are now sliceable. +
- -Medical borg overhaul. Instead of a dozen random pills and syringes, they get a hypospray that can switch between auto-replenishing tricordrazine, inprovaline, and spaceacillin. +
- Some of the more pressing issues with the new user interface were addressed. These include the health indicator being too far up, the open inventory taking a lot of space, hotkey buttons not being removable and suit storage not being accessible enough. +
- A toggle-hotkey-buttons verb was added to the OOC tab, which hides the pull, drop and throw buttons for people who prefer to use hotkeys and never use the buttons. +
- Added a character setup option which allows you to pick between the Midnight, Orange and Old iconsets for the user interface. +
- RIG helmets can now be used as flashlights, just like hardhats. Credit to Sly for the sprites. +
- HoP's office has been remapped and made into his private office. Conference Room can now be accessed from the main hall. +
- The new user interface is here. If anything is broken or something should be done differently please post feedback on the forum. Spriters are encouraged to make new sprites for the UI. +
- When you receive a PDA message, the content is displayed to you if the PDA is located somewhere on your person (so not in your backpack). You will also get a reply button there. This will hopefully make PDA communication easier. +
- New hotkeys! delete is the now the 'stop dragging' hotkey, insert is the 'cycle intents' hotkey. +
- You can now swap hands by clicking with your middle mouse button (you have to click on a visible object though, that's the catch). +
- Tweaked the DNA modifier consoles a little bit so that it's much easier to see individual blocks instead of one jumbled mess of hexadecimal. +
- You can now properly emag AI turret controls and commsat turret controls. +
- Brand new ending animations! +
- Removed hat storage, which was useless. +
- Implanting someone now takes 5 seconds, both people need to remain still. Implanting yourself remains instant. +
- Wallets once again spawn in the cabinets in the dormitory +
- Wallets now fit in pockets +
- Individual dorms now have a button inside that bolts/unbolts the door +
- New sprites for Cargo, HoP, and Captain's lockers +
- More department-specific door sprites. Most noticable changes in medsci and supply departments. +
- Added WJohnston's scrubs to Medical Doctor lockers. Comes in blue, green, and purple. +
- Added two new syndicate bundles +
- Reduced cost of thermals to 3 telecrystals (formerly 4) +
- Singularity Beacons are now spawned from a smaller, portable device. +
- CMO and QM jumpsuits made more unique. +
- Reinforced table parts are now made by using four metal rods on regular table parts. No plasteel involved. +
- Beakers, small and large can now be made/recycled in autolathes. +
- Added a 'random item' button to traitor uplinks. You can potentially get ANY item that shows up on the traitor item list, provided you have enough crystals for it. +
- New design for security. This should be the last time it sees major changes for a while. +
- Added a new construction area. What could it be for? +
- Readded the RD's genetics access. +
- RD is still without chemistry access, but I'm going to review this decision in a week and see if R&D is useless due to lack of acid. +
- Added Flashkirby99's SMES sprites! +
- Sexy new warpspace (or whatever) tiles. +
- Reverted dismemberment, the recent gun changes, and Tarajans. Before you shit up the forums, read this: +
- Dismemberment was ported from Bay12, but only halfway, and there were several problems with it. I know many people really liked it, but as it stood it did not fit the playstyle here at all. This had to be removed, there is work on a more fitting system, but this had to be taken out first regardless, and the longer people beat around the bush the worse the situation got. +
- The gun change was made for no real reason and was pretty problematic, so reverting that should mean there are a lot less 'accidental suicides.' +
- Tarjans were reverted by request as well, and since keeping them working after removing dismemberment would be a stupid amount of work. +
- -New booze sprites for the drinks that were removed! Re-enabled the recipes for the removed drinks. Get cracking, bartenders. -You now need 10 sheets of metal instead of 2 to make a gas canister, people can't FILL ENTIRE ROOMS WITH THEM. +
- -Emergency Toolboxes now contain smaller, lighter fire extinguishers that actually fit inside them! +
- RD get the fuck out of chemistry and genetics +
- CHEMISTS, DON'T BE DICKS TO RESEARCH, GIVE THEM ACID YOU TIGHT FUCKS +
- Updates to Sec, including a stationary scrubber for the prison area. +
- Swapped around cryogenics and the patient rooms in medbay. +
- -Added fat jumpsuit sprites for orange, pink, yellow, owl, security, and warden jumpsuits. +
- -Somatoray is hopefully more useful and less buggy when used on trays. -Botanists now have morgue access, because of their ability to clone via replica pods. Try not to get this removed like all your other access, okay hippies? +
- Updated genetics, medbay and security. +
- Adds BS12 dismemberment! +
- Adds greater changeling for 30 points +
- Added a verb to the PDA which you can use to remove an ID in it. If your active hand is empy, it puts it there otherwise it puts it on the floor under you. +
- -New sprites for lemons, oranges, and walking mushroom critters. -Added Invisty's new blob sprites. +
- -Added a new chemical: lipozine, a weight loss drug. Made with sodium chloride, ethanol, and radium. +
- New layout for Security, including a prison area instead of permacells. +
- New layout for the library, bar, and botany. +
- Medbay and R&D now have three-tile halls. +
- Fakedeath changelings can no longer have their brains cut out. +
- Rev checkwin changed to fire every five ticks (from twenty) and actually use the right objective type so revs being off station counts as success. +
- Powercells now have unique icons for cell types +
- Implemented mech construction sprite by WJohnston for the Ripley, Firefighter, Gygax, and Durand +
- Durand construction is reversible +
- Power Cells can now be made in Mechfabs, provided the proper research level has been achieved +
- Added a new item, the Synthetic Flash. Works just like a normal flash, except they can only withstand one use, but can be produced in the Mechfab(To replace the need for normal flashes) +
- Added a new type of gloves, ones that are cheap copies of the coveted Insulated Gloves, but be warned, quality control wasn't too thorough +
- Added a new Cyborg Upgrade, a jetpack for use by Miner Cyborgs. Can be refilled on any air canister +
- Miner Cyborgs now have a Diamond Drill equivalent along with an upgraded Ore Satchel +
- Mechfabs no longer brick if there are parts in the quene on sync +
- MMIs can be built in the Mechfabs again +
- Crabs are no longer immortal, and are now especially vulnerable to wirecutters +
- Bibles printed in the library now retain the religion's deity +
- Added Construction Sprites for the Ripley, Firefighter, Gygax, and Durand by WJohnston +
- Added Particle Accelerator sprites by Invisity +
- Added Power Cell, Synthetic Flash, Robot Upgrades, and made some modifications to the PA sprites +
- Added Invisty's field generator sprites. +
- CATCHING UP ON MY CHANGELOG. Some of this has been in for a while: -Added carved pumpkins and corncob pipes. -Added mutations for ambrosia and lemon trees. -Added more wood items for tower cap wood construction. -Added soil to plant seeds in. Make it by crushing up sandstone. Soil does not have indicators like trays do! Watch your plants carefully! +
- -The biogenerator is now more robust. It can dispense fertilizer in batches, and make simple leather items. -RnD can create a new tool for botanists: The floral somatoray. Has two modes. Use it on your plants to induce mutations or boost yield. +
- -Added plump helmet biscuits, mushroom soup, pumpkin pie and slices, chawanmushi, and beet soup recipes for the chef to make. +
- -Added transparency to biohelmets. -Normalized grass harvests. -Changed the name of "Generic Weeds". -Blenders can now be filled directly from plant bags. -Added low chance for a species mutation whenever a plant's stats mutate. -You now get more descriptive messages when applying mutagen to plant trays. -Removed sugarcane seeds from the vending machine. Added the sugarcane seeds to the seeds crate. +
- New gasmask sprites. Removed emergency gasmasks, so there's only one type now. +
- New shotgun sprites by Khodoque! +
- The barman's double-barrel actually works like a double-barrel instead of a pump-action! Rejoice! +
- Sneaky barmen may be able to illegally modify their shotgun, if they so choose. +
- Trimmed the changelog, vastly. +
- Maintenance door outside of tech storage now requires maintenance OR tech storage access instead of maintenance AND robotics accesses. +
- Rewrote the cinematic system to try and simplify and optimise it. Please report any bugs asap to me or coderbus, thanks. +
- Engineering jobs now have their PDA spawn in their pocket, and their toolbelt on their belt +
- The nuke going off on station will now gib everyone on the Z level. +
- Two more core displays are available for the AI +
- The Artificer can now build cult floors and walls +
- Updated the robotics layout. +
- Nerfed the librarian by removing the r-walls from his cubbyhole thing, fuck WGW readers hiding out in there. +
- Fixed the ability to move while lying down/resting. +
- Sleep has been fixed and works as intended again. Anaesthetic and toxins can now properly put people to sleep, permanently if you keep the administration stable. Sleeplocs are now viable again. The sleep button and *faint emote work again. +
- Droppers are now used at the eyes, and thus, access to the eyes is required to have an effect. +
- CONTRABAND-CON UPDATE: Added posters. I'm sorry to add it seperately with the rest of contraband, but there was a lack of sprites for everything else. Hopefully, people will gain interest and get me some damn sprites this way :3 + As I said, this is an ongoing project of mine. So starting of, we've got... +
- POSTERS! Posters come in rolled packages that can adhere to any wall or r_wall, if it's uncluttered enough.
+
How they get on-board: The quartermaster can now set the receiver frequency of his supplycomp circuit board. A bit simplistic as of now, will work on it later. Building a supplycomp with a properly set up circuitboard will give access to the Contraband crate. +
How they're used: Unfold the rolled poster on any wall or r_wall to create the poster. There are currently 17 designs, with the possibility of me adding more. +
How to get rid of them: You can rip them using your hand... To cleanly extract them and not ruin them for future use, however, you can use a pair of wirecutters. +
How they're classified: They're contraband, so it's perfectly okay for security officers to confiscate them. Punishment for contraband-providers (or end-users, if you want to go full nazi) is up to the situational commanding officers. + + - Merged 'Game' and 'Lobby' tabs during pre-game into one tab +
- Added the little red x to the late-join job list +
- Late-joiners are warned if the shuttle is past the point of recall, and if the shuttle has already left the station +
- Late-joiners now see how long the round has been going on. +
- Mining shuttle computer no longer spits out both 'Shuttle has been sent' and 'The shuttle is already moving' every time. +
- TORE OUT DETECTIVE WORK! THIS IS A TEMPORARY PATCH TO SEE IF THIS FIXES THE CRASHING. +
- DETECTIVE SCANNERS AND EVIDENCE BAGS (AND FINGERPRINTS) ARE GONE. +
- Secret little rooms now spawn on the mining asteroid, containing various artifacts. +
- Added the beginnings of a borg upgrade system. Currently, can be used to reset a borg's module. +
- ERP is gone. Hope you enjoyed it while it lasted! +
- Security officers can modify people's criminal status by simply examining them with a security hud on and clicking a link that will show up as part of the character's description. +
- Less jobs have maintenance access. The only jobs that will have it now are engineers, atmos techs, cargo techs, heads, and the detective. +
- Changed Runtime's sprite to look more catlike. +
- View Variables can now better list associative lists. +
- Miscellaneous bugfixes for the NT Script IDE. +
- Minor bugfixes to borg deathsquad, adds borg deathsquad to potential tensioner (set so high it's never going to happen) +
- Adds consiterable support for ERP! (If enabled.) +
- Increases cost for changeling unstun to 45 +
- You can now stick papers back in to paperbins, text will persist. +
- Added a [field] bbcode tag to the pen writing. Lets your start writing from that point. +
- Changed fonts a bit for papers to make [sign] stand out more. +
- Gave pill bottles the ability to scoop up pills like ore satchels scoop ore. (There you go, /vg/ Anon.) +
- Security Officers and Wardens now start with maintenance acceess. +
- Exosuits now provide a message when someone is getting in, someone getting in must remain stationary and unstunned, and getting in takes four seconds. +
- Fixed turrets shooting people that leave the area and the telecomm turret controls. +
- Updated air alarm's GUI. +
- Security borgs now have modified tasers. +
- Security borgs have gone back to having the same movement speed as all other borgs. +
- Escape shuttles/pods now spend about 2 minutes in high-speed transit before they reach centcom/recon shuttle. This is a warning: regular after-round shuttle grief is NOT OKAY while the shuttle is still in transit! Save it for when the shuttle gets to centcom! The purpose of this is to give potential antagonists and protagonists a chance to have a final showdown in the shuttle. The round does not end until the shutle comes to a stop and docks. Don't step outside while the shuttle is moving!
For example; if you are a traitor and have an escape-alone objective and a couple of people manage to squeeze in the shuttle, you have two minutes to kill/toss them out to win. Or you can just chill for the duration and reflect on the round.
+ - A bunch new standard-namespace NTSL functions added! Check them out at the NT Script wiki page! +
- Medical Lockers, Security Lockers, Research Lockers, Warden Locker, CMO Locker, and RD locker all have new sprites. +
- Encryption keys now each have their own invidual sprites. +
- Added a prototype holodeck to fitness! +
- Assorted tensioner fixes +
- Lasertag vests and guns have been added to fitness. +
- Art storage has replaced the emergency storage near arrivals. Emergency storage has replaced chem storage (has anyone ever used that?) +
- Wraiths can now see in the dark +
- Added LSD sting to modular changeling by popular demand. +
- Silence sting no longer provides a message to the victim. +
- Tensioner will no longer assign dead people as assassination targets. +
- The medical record computers can finally search for DNA and not just name and ID. +
- Modular changeling added! Changelings now purchase the powers they want. Balancing still underway, but should be playable. +
- Janitor cyborgs have been massively upgraded. Suffice to say they're pretty ballin' now... +
- You can now choose whether to spawn with a backpack, satchel, or nothing. Excess items will spawn in your hands if necessary. +
- You can now choose what kind of underwear you'd like to wear, per a request. +
- Added 6 female hairstyles -- credits go to Erthilo of Baystation. Added a male hairstyle -- credits go to WJohnston of TG. If you can sprite some unique and decent-looking hair sprites, feel free to PM me on the TG forums. +
- The way objects appear to be splattered with blood has been rewritten in an effort to fix stupid things happening with icons. It should be called far less frequently now. PLEASE, if you experience crashes that could in anyway be related to blood, report them with DETAILED information. Thanks +
- Fixed the way flashes break. Long story short: They'll never break on first use so rev don't get screwed over. They run out of charge temporarily when spammed but recharge. Spamming them also increases the chance of them breaking a little, so use them sparingly. +
- Ablative Armor now has a high chance of reflecting energy-based projectiles. +
- Riot shields were buffed; they now block more attacks and they will prevent their wielder from being pushed (most of the time). +
- PDA messages now require an active messaging server to be properly sent. +
- The AI can now open doors with shift+click, bolt them with ctrl+click, and shock them with alt+click +
- Tratior borgs who hack themselves cannot be blown by the robotics console, and can override lockdowns. +
- Adds a new wire to doors that controls the time delay before they close. If pulsed, they close like a sliding glass door. If cut, they do not close by themselves. +
- Borgs who have died, ghosts, and are then blown up will now have their ghosts properly transfered to their dropped MMIs. +
- You can now request AI presence at a holopad for immediate private communication with the AI anywhere. AIs can click a quick button to zoom to the holopad. +
- Nodrak: Fixed crayon boxes and stuff getting stuck in pockets. +
- Nodrak: 'Steal item' objectives will report correctly when wrapped up in paper now. +
- Carn: fixed the vent in the freezer...poor chef kept suffocating. +
- Fixed a number of issues with mob examining. Including: not being able to see burns unless they were bruised; vast amounts of grammar; and icons. Updated them to use stylesheet classes. +
- Borgs can no-longer drop their module items on conveyor belts. +
- Names input into the setup screen are now lower-cased and then have their first letters capitalised. This is to fix problems with BYOND's text-parsing system. +
- Runtime fix for lighting. +
- Over the next few commits I will be updating a tonne of item names to fix text-parsing. Please inform me if I've typoed anything. +
- Removed cloakers. Removed Security's thermals. Added disguised thermals as a traitor item. +
- Tweak/Bugfix for Hallucinations. Much more robust. +
- Ported BS12 Detective Work System +
- Head revolutionaries no longer spawn with traitor uplinks. +
- BS12 Hallucination and Dreaming port +
- Integrated BS12's improved uplink code +
- The insane crashing has finally been fixed! +
- Telecommunications has been refined, with many new features and modules implemented. +
- NTSL (Nanotrasen Scripting Language) is ONLINE! This is a brand new, fully operational scripting language embedded within SS13 itself. The intended purpose is to eventually expand this scripting language to Robotics and possibly other jobs, but for now you may play with the TCS (Traffic Control Systems) implementation of NTSL in the Telecommunications Satellite. Recommended you read the NT Script wiki page for information on how to use the language itself. Other than that, there's not a lot of documentation. +
- Radio systems have been further optimized, bugfixed, etc. Should be more stable. +
- Intercoms now require power to work. +
- Headsets are now modular! Use a screwdriver on them to pop out their encrpytion keys, and use a key on one to put it in. A headset can hold two keys. Normal headsets start with 1 key, department headsets with two. The standard chip does nothing, and is not required for listening to the common radio. +
- Binary translators made into a encrpytion key, and fixed. They now broadcast to AIs properly. +
- MMIs/pAIs no longer lip read, and thus can now hear in the dark. +
- Borg rechargers are no longer Faraday cages, and thus can now receive radio while they're recharging. +
- Glass airlocks now make a different sound than regular airlocks. +
- in 1997 nanotrasen's first AI malfunctioned +
- Toggle ambience probably works now! +
- Runtime is
dead. + - The Research Director's consoles were moved into the completely empty cage in the back of his office. +
- Changed alt+click to ctrl+click for pulling. +
- New stationary scrubber sprites~ +
- Removed the mint. Coins can still be found and used in vending machines. PACMANs now run off sheets. +
- New sprites for HoS and Captain lockers. +
- New sprites for the orebox. +
- The jetpacks now display correctly when worn. +
- Buckling to chairs no longer causes you to drop your weapon +
- Ghosts now have a "Jump to Mob" verb. +
- Mining lanterns work properly once again!. +
- The armoury now includes a box of spare Sec cartridges. +
- The jetpacks in EVA have been replaced with CO2 ones, painted a classy black. +
- Additionally, jetpacks will now run on gases other than oxygen, as you would expect. +
- Chair overhaul! You shouldn't notice anything different, but if you encounter bugs with chairs or beds, please report those asap. +
- New electric chair sprites, by myself. +
- Electric chairs will only electrocute people buckled into them. +
- Karma should be fixed. +
- A new construct type: Artificer. It is capable of constructing defenses, repairing fellow constructs, and summoning raw materials to construct further constructs +
- Simple animals (constructs, Ian, etc) can now see their health in the Status tab +
- Detective's revolver is non-lethal again. Was fun while it lasted +
- Foam has a reduced range to prevent spamming +
- Stopped the unholy Radium/Uranium/Carbon smoke that crashed the server. And for anyone that did this, you are a horrible person +
- Cleanbots clean dirt +
- Cleanbots automatically patrol on construction +
- Removed silicate because it is not useful enough for how much lag it caused +
- Newscasters now alert people of new feeds and wanted-alerts simultaneously. +
- Terrorists Win! Desert Eagles and Riot Shields now spawn on the syndicate shuttle, replacing the c20r +
- The Detectives gun still uses .38, but they're now fully lethal bullets. Go ahead, make his day. +
- The Veil Render has been nerfed, the Nar-Sie it spawns will not pull anchored objects. This is a temporary measure, more nerfs/reworking to come +
- Spacevines added to the random events. +
- The bug where doors kept opening when a borg tried to close them at close range is now fixed. +
- Security officers, the warden and the HoS have new jumpsuits. +
- Clicking the internals button on your user interface (The one that shows if you have internals on or not) will now toggle internals even if they are in your pockets. (humans only) - It now works if your internals are on your back, suit storage, belt, hands and pockets. +
- The public autolathe has been removed. If you want some some stuff from a lathe, go to cargo. +
- A new item, the null rod, protects the one bearing it from cult magic. One starts in the chaplains office, and this replaces the job based immunity he had. The null rod also is capable of dispelling runes upon hitting them (the bible can no longer do this) +
- Shooting fuel tanks with lasers or bullets now causes them to explode +
- A construct shell is now waiting to be found in space. +
- Chaplains can no longer self heal with the bible +
- Simple animals, including constructs, can now attack mechs and critters +
- You can no longer attach photos to ID cards. This never worked properly and if anything, it was misleading. +
- Backpacks can now hold 7 normal sized items (box size) as opposed to 6 normal sized items + 1 small item +
- Added several fire alarms to areas around the station including the brig, engineering and others +
- The atmospherics department now has a few hazard vests available for atmos techs to wear if they don't like the fire suit +
- Roboticist now have engineering + science headsets, virologists now have medsci headsets with medical + science channels +
- Added some headsets to the jobs that didn't have any extras: roboticist, qm, scientist, virologist and geneticist. +
- Station engineers now have construction site access (vacent office by arrivals) +
- Replaced a few airlocks with glass airlocks (detective, autolathe, assistant storage, robotics, checkpoint) +
- Removed the wall that was blocking the entrance to the theater +
- Made a small redesign for the HoP's office so that people running towards it from the escape hallway don't run right into the queue, annoying everyong +
- The engineering, command and security airlocks now glow green when closing instead of red to match all the other airlocks +
- The disposal units now auto trigger every 30 game ticks, if there is something (or someone) in them. So no more hiding in disposal units! +
- You can no longer control the disposal unit from within it. You will have to wait for it to trigger itself. +
- You can no longer strip items off of Ian while dead / a ghost +
- Updated fitness, athletic shorts are now available! +
- You can now take individual crayons out of the crayon box the same way as from boxes +
- Clicking a grille with a glass or reinforced glass pane in your hand will glaze the grille from the direction you're looking from (don't forget to fasten the window tho) +
- When you click somewhere with the intent to interact, you will automaticaly face the item you're trying to interact with. This won't slow you down when running and firing guns behind you. +
- A new passive mob ability: Relentless. Relentless mobs cannot be shoved (though may still swap places with help intent) +
- Alien Queens, Juggernaut constructs, and Medical Borgs are all Relentless. Maybe the medborg can actually drag people to medbay on time now +
- Two constructs, the Juggernaut and the Wraith are now available for wizards and cultists to use soul stones with +
- A new highly destructive artefact, Veil Render, is now available for wizards +
- A new one time use global spell, Summon Guns, is now available for wizards. +
- DEEPSTRIKING! There is now a partially constructed teleporter on the nuke shuttle, and for a large sum of telecrystals they may purchase the circuitboard needed to complete it. +
- The Chaplain is immune to cult stun, blind, deafen, and blood boil +
- Added a new toy: Water balloons. They can be filled with any reagent and when thrown apply the reagents to the tile and everything on it. +
- Engineering and security lockers now spawn with their respective backpacks in them so job-changers can look as they should. HoS locker now also contains an armored vest, for the convenience of the HoS who wants to play with one. +
- Slightly changed the spawn order of items in the CE and HoS lockers to make starting up a hint less tedious. +
- Added Exosuit Jetpack +
- Added Exosuit Nuclear Reactor (runs of normal, everyday uranium, maybe I'll switch it to run on enriched) - requires research (level 3 in Materials, Power Manipulation and Engineering) +
- Added Ripley construction steps sprites (courtesy of WJohnston - man, you're awesome) +
- Exosuit Sleeper can now inject occupant with reagents taken from Syringe Gun +
- Exosuit Cable Layer will now auto-dismantle floors +
- Exosuit Heavy Lazer cooldown increased, Scattershot now fires medium calibre ammo (less damage) +
- Exosuit wreckage can be pulled +
- EMP now drains half of current exosuit cell charge, not half of maximum charge. +
- Fixed several possible exosuit equipment runtimes +
- Introduced new markup to changelog. Javascript is extremely slow (in byond embedded browser) for some reason. +
- Examining humans now works a bit differently. Some external suits and helmets can hide certain pieces of clothing so you don't see them when examining. Glasses are also now displayed when examining. +
- The job selection screen has been changed a little to hopefully make making changes there easier. +
- Carn updated:
+
-
+
- Grammar & various bug-fixes +
- Thank-you to everyone who reported spelling/grammar mistakes. I'm still working on it, so if you spot anymore please leave a comment here. There's still lots to fix. +
- Mining station areas should no longer lose air. +
- Sieve updated:
+
-
+
- This stuff is actually already implemented, it just didn't make it to the changelog +
- Firefighter Mech - A reinforced Ripley that is more resistant to better cope with fires, simply look in the Ripley Contruction manual for instructions. +
- Mech contruction now has sounds for each step, not just 1/4 of them. +
- Mech Fabricators are fixed, Manual Sync now works and certain reseach will reduce the time needed to build components. +
- Added special flaps to the mining station that disallow air-flow, removing the need to shuffle Ore Boxes through the Airlocks. +
- Each outpost has it's own system for the conveyors so they won't interfere with each other. +
- Powercell chargers have been buffed so now higher capacity cells are actually useable. +
- A diamond mech drill has been added. While it isn't any stronger than the standard drill, it is much faster. + +
- Agouri updated:
+
-
+
- UPDATE ON THE UPDATE: Newspapers are now fully working, sorry for that. Some minor icon bugs fixed. Now I'm free to work on the contest prizes :3 +
- Newscasters are now LIVE! Bug reports, suggestions for extra uses, tears etc go here. +
- What ARE newscasters? Fans of the Transmetropolitan series might find them familiar. Basically, they're terminals connected to a station-wide news network. Users are able to submit channels of their own (one per identified user, with channels allowing feed stories by other people or, if you want the channel to be your very own SpaceJournal, being submit-locked to you), while others are able to read the channels, either through the terminals or a printed newspaper which contains every news-story circulating at the time of printing. +
- About censorship: You can censor channels and feed stories through Security casters, found in the HoS'es office and the Bridge. Alternatively, if you want a channel to stop operating completely, you can mark it with a D-Notice which will freeze it and make all its messages unreadable for the duration it is in effect. If you've got the access, of course. +
- Basically I think of the newscaster as nothing more as an additional Roleplaying tool. Grab a newspaper along with your donuts and coffee from the machines, read station rumors when you're manning your desk, be a station adventurer or journalist with your very own network journal! +
- I would ask for a bit of respect when using the machine, though. I removed all and any channel and story restrictions regarding content, so you might end up seeing channels that violate the rules, Report those to the admins. +
- Finally, due to the removal of the enforced "Channel" string, it's recommended to name your channels properly ("Station Paranormal Activity Channel" instead of "Station Paranormal Activity", for example") + +
- BubbleWrap updated:
+
-
+
- Arresting buff! +
- A person in handcuffs being pulled cannot be bumped out of the way, nor can the person pulling them. They can still push through a crowd (they get bumped back to behind the person being pulled, or pushed ahead depending on intent). +
- LastyScratch updated:
+
-
+
- Toggle-Ambience now works properly and has been moved from the OOC tab to the Special Verbs tab to be with all the other toggles. +
- RavingManiac updated:
+
-
+
- The bar now has a "stage" area for performances. +
- Blaank updated:
+
-
+
- Added a vending machine to atmopherics reception desk that dispenses large +oxygen tanks, plasma tanks, emergency oxegen tanks, extended capacity emergency +oxygen tanks, and breath masks. +
- Petethegoat updated (for a bunch of other people):
+
-
+
- Lattice is now removed when you create plating or floor (credit Donkieyo). +
- Monkeys now take damage while in crit (credit Nodrak). +
- The warden now has his own jacket. (credit Shiftyeyesshady). +
- Spectacular new dice that will display the proper side when rolled!! (credit TedJustice) +
- Spectacular new dice that will display the proper side when rolled!! (credit TedJustice) + +
- Borg RCDs can no longer take down R-walls. (headcoder orders)
- Petethegoat updated:
+
-
+
- Exciting new pen additions! Get the low-down at the wiki. +
- Doohl updated:
+
-
+
- Syndicate shuttle now starts with a All-In-One telecommunication machine, which acts as a mini-network for the syndie channel. It intercepts all station radio activity, too, how cool is that? +
- Doohl updated:
+
-
+
- The radio overhaul 'Telecommunications' is now LIVE. Please submit any opinions/feedback in the forums and check the wiki article on Telecommunications for some more info for the curious. +
- The AI satellite has been replaced with a communications satellite. You can get there via teleporter or space, just like the AI satellite. I highly recommend not bum-rushing the new satellite, as you may be killed if you don't have access. It's a very secure place. +
- Once a human's toxicity level reaches a certain point, they begin throwing up. This is a natural, but overall ineffective method of purging toxins from the body. +
- You can now travel Z-levels in Nuclear Emergency mode (the nuke disk is still bound to the station). This means the nuclear agents can and probably will fly off into space to blow up the comm satellite and shut down communications. +
- ConstantA updated:
+
-
+
- Reworked exosuit internal atmospherics (the situation when exosuit is set to take air from internal tank, otherwise cabin air = location air):
+
-
+
- If current cabin presure is lower than "tank output pressure", the air will be taken from internal tank (if possible), to equalize cabin pressure to "tank output pressure" +
- If current cabin presure is higher than "tank output pressure", the air will be siphoned from cabin to location until cabin pressure is equal to "tank output pressure" +
- Tank air is not altered in any way even if it's overheated or overpressured - connect exosuit to atmos connector port to vent it +
- "Tank output pressure" can be set through Maintenance window - Initiate maintenance protocol to get the option +
+ - Fixed bug that prevented exosuit tank air updates if exosuit was connected to connector port +
- Combat exosuits melee won't gib dead mobs anymore +
- QM exosuit circuit crates cost lowered to 30 points +
- Exosuit plasma converter effectiveness +50% +
- Reworked exosuit internal atmospherics (the situation when exosuit is set to take air from internal tank, otherwise cabin air = location air):
+
- Agouri updated:
+
-
+
- I'm back home and resumed work on Newscasters and Contraband. +
- But I got bored and made cargo softcaps instead. Flippable! Enjoy, now all we need is deliverable pizzas. +
- Oh, also enjoy some new bodybag functionality and sounds I had ready a while ago, with sprites from Farart. Use a pen to create a visible tag on the bodybag. Wirecutters to cut it off. Also it's no longer weldable because it makes no goddamn sense. +
- Donkieyo updated:
+
-
+
- You must now repair damaged plating with a welder before placing a floor tile. +
- You can now relabel canisters if they're under 1kPa. +
- Polymorph updated:
+
-
+
- Dragging your PDA onto your person from your inventory will bring up the PDA screen. +
- You can now send emergancy messages to Centcomm (Or, with some.. tampering, the Syndicate.) via a comms console. (This occurs in much the fashion as a prayer.) +
- Erro updated:
+
-
+
- Shift-clicking will now examine whatever you clicked on! +
- Polymorph updated:
+
-
+
- Alt-clicking will now pull whatever you clicked on! +
- Doohl updated:
+
-
+
- XENOS ARE NOW IMMUNE TO STUNNING! To compensate, stunning via tasers/batons now slows them down significantly. +
- Polymorph updated:
+
-
+
- Doors no longer close if they have a mob in the tile. (Generally!) Door safties can now be overriden to close a door with a mob in the tile and injure them severely. +
- ConstantA updated:
+
-
+
- Added some new Odysseus parts and tweaked old ones. +
- Added Exosuit Syringe Gun Module +
- New Odysseus sprites - courtesy of Veyveyr +
- Polymorph updated:
+
-
+
- Air Alarms can now be hacked. +
- Too much of a good thing is just as bad as too little. Pressures over 3000 kPa will do brute damage. +
- RavingManiac updated:
+
-
+
- Wrapped objects can now be labelled with a pen +
- Wrapped small packages can be picked up, and are now opened by being used on themselves +
- Mail office remapped such that packages flushed down disposals end up on a special table +
- Package wrappers placed in most of the station departments +
- In short, you can now mail things to other departments by wrapping the object, labelling it with the desired destination using a pen, and flushing it down disposals. At the mail room, the cargo tech will then tag and send the package to the department. +
- Errorage updated:
+
-
+
- Engineering's been remapped +
- RavingManiac updated:
+
-
+
- Refrigerators and freezer crates will now preserve meat +
- ConstantA updated:
+
-
+
- Circuit boards for Odysseus mech can be ordered by QM +
- Designs for them were added to R&D +
+ - Kor updated:
+
-
+
- Soul Stones Added: Like intellicards for dead or dying humans! Full details are too long for the changelog +
- A belt full of six soul stones is available as an artefact for the wizard +
- Cultists can buy soulstones with their supply talisman +
- The chaplain has a single soulstone on his desk +
- The reactive teleport armour's test run is over. It no longer spawns in the RD's office. +
+ - Rockdtben updated:
+
-
+
- Added sprites for soda can in left and right hands on mob: sodawater, tonic, purple_can, ice_tea_can, energy_drink, thirteen_loko, space_mountain_wind, dr_gibb, starkist, space-up, and lemon-lime. +
+
+ - ConstantA updated:
+
-
+
- Mech Fabricators now require robotics ID to operate. Emag removes this restriction. +
- Added Odysseus Medical Exosuit. Has integrated Medical Hud and ability to mount medical modules. +
- Added Sleeper Medical module for exosuits. Similar to common sleepers, but no ability to inject reagents. +
- Added Cable Layer module for exosuits. Load with cable (attack cable with it), activate, walk over dismantled floor. +
- Added another exosuit internal damage type - short circuit. Short-circuited exosuits will drain powercell charge and power relay won't work. +
- You should be able to send messages to exosuit operators using Exosuit Control Console +
- Gygax armour and module capacity nerfed. +
- Exosuit weapon recharge time raised. +
- Bugfix: EMP actually drains exosuit cell and damages it +
+ - RavingManiac updated:
+
-
+
- Meat will now spoil within three minutes at temperatures between 0C and 100C. +
- Rotten meat has the same nutritional value as normal meat, and can be used in +the same recipes. However, it is toxic, and ingesting a badly-prepared big bite +burger can kill you. +
- Because refrigeration serves a purpose now, the kitchen cold room freezing unit +is turned off by default. Chefs should remember to turn the freezer on at the +start of their shift. +
+ - RavingManiac updated:
+
-
+
- Kitchen cold room is now cooled by a freezing unit. Temperature is about 240K by default, but can be raised to room temperature or lowered to lethal coldness. +
- Kor updated:
+
-
+
- General/Misc Changes
+
-
+
- Escape pods no longer go to the horrific gibbing chambers. Rather, they will be picked up by a salvage ship in deep space. (This basically changes nothing mechanics wise, just fluff) +
- An ion rifle now spawns on the nuclear operative shuttle. Maybe this will help with them getting destroyed by sec borgs every round? +
+ - Wizard Changes
+
-
+
- The wizard can now purchase magic artefacts in addition to spells in a subsection of the spellbook. +
- The first (and currently only) new artefact is the Staff of Change, which functions as a self recharging energy weapon with some special effects. +
- The wizard has a new alternative set of robes on his shuttle. +
+
- General/Misc Changes
+
- Cult Changes
-
+
- Cultists now each start with three words (join, blood, self). No more will you suffer at the hands of cultists who refuse to share words. +
- The starting supply talisman can now be used five times and can now be used to spawn armor and a blade. +
- Replaced the sprites on the cultist robes/hood. +
+ - Carnwennan updated:
+
-
+
- Thanks to the wonders of modern technology and the Nanotrasen steel press Ian's head has been shaped to fit even more silly hats. The taxpayers will be pleased. +
+ - Doohl updated:
+
-
+
- Vending machines got yet another overhaul! Good lord, when will they stop assfucking those damned vendors?? +
+ - Erro updated:
+
-
+
- Your direct supervisors are now displayed when you are assigned a job at round start or late join. +
+ - Erro updated:
+
-
+
- Meteor mode is hopefully deadly again! +
+ - Kor updated:
+
-
+
- Research director has a new toy: Reactive Teleport Armour. Click it in your hand to activate it and try it out! +
+ - NEO updated:
+
-
+
- AIs actually consume power from APCs now +
- Bigass malf overhaul. tl;dr no more AI sat, instead you have to play whackamole with APCs. +
+ - Doohl updated:
+
-
+
- Title music now plays in the pregame lobby. You can toggle this with a verb in "Special Verbs" if you really want to. +
- User Interface preferences now properly get transferred when you get cloned. +
+ - Erro updated:
+
-
+
- Escape pods have been added to test the concept. +
- Escaping alone in a pod does not count towards the escape alone objective, it counts towards the escape alive objective tho. Escape alone only requires you to escape alone on the emergency shuttle, it doesn't require you to ensure all pods are empty. Cult members that escape on the pods do not ocunt towards the cult escaping acolyte number objective. Escaping on a pod is a valid way to survive meteor. +
+ - Polymorph updated:
+
-
+
- Fire is now actually dangerous. Do not touch fire. +
+
+
+ - Errorage updated:
+
-
+
- Fixed the comms console locking up when you tried to change the alert level. +
- Added a keycard authentication device, which is used for high-security events. The idea behind it is the same as the two-key thing from submarine movies. You select the event you wish to trigger on one of the devices and then swipe your ID, if someone swipes their ID on one of the other devices within 2 seconds, the event is enacted. These devices are in each of the head's offices and all heads have the access level to confirm an event, it can also be added to cards at the HoP's ID computer. The only event that can currently be enacted is Red alert. +
+ - Kor updated:
+
-
+
- The chef now has a fancy dinner mint in his kitchen. It is only wafer thin! +
+ - Pete & Erro Christmas update:
+
-
+
- Reinforced metal renamed to steel and steel floor tile renamed to metal floor tile to avoid confusion before it even happens. +
- It is no longer possible to make steel from metal or vice versa or from the autolathe. You can however make metal from the autolathe and still insert steel to increase the metal resource. +
- To make steel you can now use the mining smelting unit and smelt iron and plasma ore. +
- The RCD can no longer take down reinforced walls. +
+ - Errorage updated:
+
-
+
- Grass plants in hydro now make grass floor tiles instead of the awkward patches. +
+ - Petethegoat updated:
+
-
+
- Fixed all known vending machine issues. +
- Fixed a minor visual bug with emagged lockers. +
- Clarified some of the APC construction/deconstruction messages. +
+ - Numbers updated:
+
-
+
- Potency variations tipped in favour of bigger changes over smaller periods of time. +
+ - PolymorphBlue updated:
+
-
+
- Traitors in the escape shuttle's prison cell will now fail their objective. +
- Lockers are no longer soundproof! (or flashproof, for that matter) +
- Headrevs can no longer be borged, revs are dereved when borged. +
+ - Vinyl Scratch updated:
+
-
+
- New ambient sounds for the station and AI Sat. +
- He's baaaaaack... +
+ - Kor updated:
+
-
+
- Changeling husks are now borgable again (though not clonable) and genome requirements were lowered +
- De-revved revolutionaries had their message clarified a bit. You remember the person who flashed you, and so can out ONE revhead +
- Light tubes/bulbs can now be created in the autolathe. Recycle those broken lights! +
+ - Doohl updated:
+
-
+
- The firing range now has a purpose. Go check it out; there's a few surprises! +
+ - Doohl updated:
+
-
+
- Toggling admin midis will now DISABLE THE CURRENT MIDI OH MY GOSH! +
+ - Tobba updated:
+
-
+
- We're looking for feedback on the updated chem dispenser! It no longer dispenses beakers of the reagent, and instead places a variable amount of the reagent into the beaker of your choosing. +
+ - Petethegoat updated:
+
-
+
- Diagonal movement is gone on account of them proving to be a bad idea in practice. A grand experiment nonetheless. +
+ - Kor updated:
+
-
+
- The PALADIN lawset in the AI upload has been replaced with the corporate lawset +
+ - Tobba updated:
+
-
+
- Report any issues with the updated vending machines! +
+ - Petethegoat updated:
+
-
+
- Security, Engineer, Medical, and Janitor borgs no longer get a choice of skin. This is for purposes of quick recognition, and is the first part of a series of upcoming cyborg updates. +
+ - Kor updated:
+
-
+
- Repair bots (mechs) are now adminspawn only +
- Extra loyalty implants are now orderable via cargo bay (60 points for 4 implants) +
- Changeling regen stasis now takes two full minutes to use, but can be used while dead. Burning and gibbing are the only way to keep them dead now. +
+ - ConstantA updated:
+
-
+
- Added step and turn sounds for mechs +
- Added another mecha equipment - plasma converter. Works similar to portable generator. Uses solid plasma as fuel. Can be refueled either by clicking on it with plasma in hand, or directly from mecha - selecting it and clicking on plasma. +
- Added mecha laser cannon. +
- Added damage absorption for mechs. Different mechs have different absorption for different types of damage. +
- Metal foam now blocks air movement. +
+ - Petethegoat updated:
+
-
+
- Fixed sticking C4 to containers. +
- Rearranged the armoury, and changed the medical treatment room in Sec to an interrogation room. +
- Mr Fixit has been powered off and returned to the armoury. Deploying him every round is still recommended! +
+ - Petethegoat updated:
+
-
+
- Stunglove overhaul: part one. Stun gloves are now made by wiring a pair of gloves, and then attaching a battery- this shows up on the object sprite, but not on your character. Stungloves use 2500 charge per stun! This means that some low capacity batteries will make useless stungloves. To get your old inconspicous gloves back, simply cut away the wire and battery. Note that insulated gloves lose their insulation when you wire them up! Yet to come: stungloves taking extra damage from shocked doors. +
- Removed sleepypens! Paralysis pens have been changed to look like normal pens instead of penlights, and have been slightly nerfed. They will paralyse for about fifteen seconds, and cause minor brain damage and dizziness. +
- Uplink Implants now have five telecrystals instead of four. +
+ - Doohl updated:
+
-
+
- More hairs added and a very long beard. +
- Finally fixed the request console announcements going AMP AMP AMP all the time when you use punctuation. +
+ - Mport updated:
+
-
+
- New WIP TK system added. To activate your TK click the throw button with an empty hand. This will bring up a tkgrab item. Click on a non-anchored (currently) non mob Object to select it as your "focus". Once a focus is selected so long as you are in range of the focus you can now click somewhere to throw the focus at the target. To quit using TK just drop the tkgrab item. +
+ - Errorage updated:
+
-
+
- Old keyboard hotkey layout option available again! home, end, page down and page up now once again do what they did before by default. To use diagonal movement you will need to use your numpad with NUM LOCK enabled.
+ The new list of hotkeys is as follows: (Valid as of 21.10.2011) +-
+
- Numpad with Num Lock enabled = movement in wanted direction. +
- Numpad with Num Lock disabled = as it was before. movement north-south-east-west and throw, drop, swap hands, use item on itself. +
- Page up (also numpad 9 with num lock disabled) = swap hands +
- Page down (also numpad 3 with num lock disabled) = use item in hand on itself +
- home (also numpad 7 with num lock disabled) = drop +
- end (also numpad 1 with num lock disabled) = throw +
- CTRL + A = throw +
- CTRL + S = swap hands +
- CTRL + D = drop +
- CTRL + W = use item in hand on itself +
- Numpad divide (/) = throw +
- Numpad multiply (*) = swap hands +
- Numpad subtract (-) = drop +
- Numpad add (+) = use item in hand on itself +
+
+ - Old keyboard hotkey layout option available again! home, end, page down and page up now once again do what they did before by default. To use diagonal movement you will need to use your numpad with NUM LOCK enabled.
- Errorage updated:
+
-
+
- You can now move diagonally! To do so, use the numpad. The keybaord has been remapped to make this possible:
+
-
+
- CTRL + A = throw +
- CTRL + S = swap hands +
- CTRL + D = drop +
- CTRL + W = use item in hand on itself +
- Numpad divide (/) = throw +
- Numpad multiply (*) = swap hands +
- Numpad subtract (-) = drop +
- Numpad add (+) = use item in hand on itself +
+
+ - You can now move diagonally! To do so, use the numpad. The keybaord has been remapped to make this possible:
+
- Agouri updated:
+
-
+
- There has been a tidal wave of bugfixes over the last 5 or so days. If you had previously tried something on the station, saw that it was bugged and never tried it again, chances are it got fixed. I don't want you to neglect using stuff because you think it was bugged, which it was at one point, but no longer is. Thanks, happy new semester to everyone~ +
+ - Errorage updated:
+
-
+
- When you're unconscious, paralyzed, sleeping, etc. you will still see the same blackness as always, but it will rarely flicker a bit to allow you to see a little of your surroundings. +
+ - Doohl updated:
+
-
+
- New hairstyles! YOU never asked for this! +
+ - ConstantA updated:
+
-
+
- Added radios to exosuits. Setting can be found in 'Electronics' menu. +
- Exosuit maintenance can be initiated even if it's occupied. The pilot must permit maintenance through 'Permissions & Logging' - 'Permit maintenance protocols'. For combat exosuits it's disabled by default. While in maintenance mode, exosuit can't move or use equipment. +
+ - Doohl updated:
+
-
+
- You can put things on trays and mass-transport them now. To put stuff on trays, simply pick up a tray with items underneath/on top of it and they'll be automatically carried on top of the tray. Be careful not to make a mess~! +
+ - Mport updated:
+
-
+
- Telekenesis now only allows you to pick up objects. +
- Stun gloves ignore intent. +
- Moved the loyalty implants to the HoS' locker. +
- Job system redone, remember to setup your prefs. +
+ - Petethegoat updated:
+
-
+
- Pandemic recharge speed is affected by the number of different types of antibodies in the blood sample. For maximum efficiency, use blood samples with only a single type of antibody. (Blood samples with two types of antibodies will still let the Pandemic recharge slightly faster than it used to.) +
+ - Errorage updated:
+
-
+
- Opening a storage item on your belt will now display the proper number of slots even if the number is different from 7. +
- Less ponies, gryphons, and Tohou. +
+ - Knognob Lungsparkle updated:
+
-
+
- Xenomorphic aliens can now shape resin membranes (organic windows basically). +
- The AI can no longer see runes. Instead, they will see blood splatters. +
+ - Rolan7 updated:
+
-
+
- New method for job assignment. Remember to review your preferences. Send all your hate and bug reports to me. +
+ - Doohl updated:
+
-
+
- Putting someone inside a cloning machine's DNA scanner will notify the person that they are about to be cloned. This completely removes the necessity to announce over OOC for someone to get back in their body. +
+ - Errorage updated:
+
-
+
- Added an additional 9 colors, into which you can color bedsheets, jumpsuits, gloves and shoes at the washing machine. +
- A new click proc will need to be live-tested. The testing will be announced via OOC and you will get a message when it happens. When testing is going on, the new click proc will be used. If testing is going on and you notice a bug, please report it via adminhelp. If you find yourself unable to perform an action, you can double click (By that I mean spam the shit out of clicking) to use the old proc, which is unchanged and will behave like you're used to. Standard roleplay rules apply during tests, they're not an excuse to murder eachother. +
+ - Errorage updated:
+
-
+
- You can no longer clone people who suicided. I REPEAT! You can no longer clone people who have suicided! So use suiciding more carefully and only if you ACTUALLY want to get out of a round. You can normally clone people who succumbed tho, so don't worry about that. +
- Washing your hands in the sink will now only wash your hands and gloves. You can wash items if you have them in your hands. Both of these actions are no longer instant tho. +
+ - Errorage updated:
+
-
+
- Added the most fun activity in your every-day life. Laundry. Check the dormitory. (Sprites by Hempuli) +
- You can now change the color of jumpsuits, shoes, gloves and bedsheets using the washing machine. +
- Some religions (currently Islam, Scientology and Atheism) set your chapel's symbols to the symbols of that religion. +
- A new old-style cabinet's been added to the detective's office. (Sprite by Hempuli) +
- Runtime the cat ran away!! And it gets even worse! Mr. Deempisi met a premature end during an excursion to the kitchen's freezer! -- I was ORDERED to do this... don't kill me! :( +
- Kudzu can now be spawned (Currently admin-only. Will test a bit, balance it properly and add it as a random event) (Original code and sprites donated by I Said No) +
+ - Kor updated:
+
-
+
- Added purple goggles to chemistry (you're welcome Lasty) +
- Added a third MMI to robotics and monkey cubes to xenobio (dont fucking spam them in the halls) +
+ - Mport updated:
+
-
+
- Turns out tasers and a few other weapons were slightly bugged when it came to checking the internal powercell. Tasers and such gained an extra shot. +
- Ion Rifle shots lowered to 5 per charge. +
+ - Errorage updated:
+
-
+
- You can now insert a coin into vending machines. Some machines (currently only the cigarette vending machine) have special items that you can only get to with a coin. No, hacking will not let you get the items, coin only. +
+ - Lasty updated:
+
-
+
- Runtime now actually spawns in medbay because nobody cared whether it is a tiny smugfaced espeon that explodes violently on death or a spacecat that presumably doesn't. +
- You can no longer put someone into a sleeper and erase them from existence by climbing into the same sleeper. +
- Players who haven't entered the game will no longer be able to hear administrators in deadchat. +
+ - Pete updated:
+
-
+
- Added new sprites for the light tube and glasses boxes. +
- Fixed the bug where syndicate bundles would have an emergency O2 tank and breath mask. +
+ - Mport, SECOND REMOVER OF SUNS updated:
+
-
+
- Singularity absorbtion explosion range lowered and is now dependent on singularity size. +
- Bag of Holding no longer instakills singularity, and the chance for bombs to destroy a singularity has been changed from 10% to 25%. +
- Removed THE SUN. +
- Damage and stun duration from shocked doors has been lowered to account for a larger amount of energy in the powernet. +
+ - Errorage updated:
+
-
+
- Healing, attacking or 'gently tapping' Ian will now properly display the name of the attacker to all people. +
+ - Vinyl Scratch updated:
+
-
+
- Runtime! +
- Mine ambience now fades out at the end so that not only is it less jarring when it ends, but it also loops properly. +
- Malfunctioning AI's runtime message now has a voice clip to go with it (courtesy of Rosen Ritter) +
- Every headset will now display the commands for their respective channels upon examine. +
+ - Miss Phaeron updated:
+
-
+
- E-Swords now have a chance to deflect projectiles when active +
- Taser/Laser shots now drain 40 battery per use from a borg, as opposed to 20 +
- EMPs do 60 damage to borgs now, up from 25. They also stun them momentarily and drain 1k charge +
- As part of a joint effort between Mport, Falazameer, and myself an Ion Rifle has been added to the armoury +
- The Mutate spell now gives Laser Vision and Hulk +
+
+ - Errorage updated:
+
-
+
- Ian can now be toolboxed. +
- Ian can now be healed with bruisepacks, unless he's already dead. +
- You can now walk over Ian when he's killed. +
- Ian will chase food, if you leave it on the floor. If he notices it and you pick it up, he'll chase you around, if you stay close enough. +
+ - Errorage updated:
+
-
+
- A new pet on the bridge. +
- The pet can now be buckled and will no longer escape from closed containers, such as closets or the cloning pods. +
- Vending machines and request consoles are the first to use the new in-built browser in the upper-right of the user interface. If feedback is positive on these, more machines will be added to this. Hoping that this will eventually reduce the number of popup micromanagement. +
+ - Lasty updated:
+
-
+
- The collectible hats have been removed from the theatre, doomed to rot forever in the hat crates they spawned from. No longer shall you see racks full of "collectible hard hat"! +
+ - TLE updated:
+
-
+
- You can now toggle the message for becoming a pAI on and off in your prefs. +
+ - Mport updated:
+
-
+
- Synaptizine now once again helps you recover from being stunned, however it is now also slightly toxic and may cause a small amount of toxins damage for every tick that it is in your system. +
- Assembly updating! +
- Original blob is back, though it still has lava sprites. +
- The bug where you would spawn on the wizard shuttle for a second at the start of the round should no longer occur. +
+ - Lasty updated:
+
-
+
- Suicide has been changed to biting your tongue off instead of holding your breath, and examining someone who has comitted suicide will give you a message stating that their tongue is missing. +
- Chemsprayers are now large items instead of small, meaning they can no longer fit in your pocket. +
+ - Greek Rioter updated:
+
-
+
- Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again. EDIT: FIXED DRINK MIXING +
- More info here: rev2136 +
+ - Lasty updated:
+
-
+
- Fixed the karma exploit! Uhangi can rest in peace knowing his -87 karma ways were not his own. +
- Added new ambient sound for space and the mines. +
- Examining an oxygen tank will now tell you if it is about to run out of air. If it is, you will recieve a beep and a message, and if not, then you'll just get the default "this is an oxygentank!" message. +
+ - Rageroro updated:
+
-
+
- Sleeper update! Sleepers can now only inject soporific, dermaline, bicaridine, and dexaline into people with 1% or more health. They can also inject inaprovaline into people with -100% or more health. Nothing can be injected into people who are dead. +
+ - Superxpdude updated:
+
-
+
- Virology is now part of medbay, and as such the RD no longer has Virology access and the CMO and Virologist no longer have Research access. +
+ - Uhangi updated:
+
-
+
- Electropacks, screwdrivers, headsets, radio signalers, and station bounced radios can now be constructed from the autolathe. +
- Added a courtroom to Centcom. +
- Fixed electropack bug regarding using screwdrivers on electropacks. +
+ - Microwave updated:
+
-
+
- Nuka Cola re-added. +
+ - Urist McDorf updated:
+
-
+
- Added XCom aliens, by Xerif (Donated by the Foundation project ) +
+ - Cheridan updated:
+
-
+
- New sprites for beds and air, plasma and nitrogen tanks (The ones found in maintenance shafts). +
+ - Rageroro updated:
+
-
+
- Updates made to the HoP's ID computer. New interface and removing a card will now put it directly in your hand, if it's empty. Using your card on the computer will place it in the appropriate spot. If it has access to edit cards it will put it as the authentication card, otherwise as the card to be modified. If you have two cards with ID computer access first insert the authentication card, then the one you wish to midify, or do it manually like before. +
- Placed extra fire suits in maintenance (Near eva and mining) and an extra fire closet to atmos. +
+ - Urist McDorf updated:
+
-
+
- People who have been infected by facehuggers can no longer suicide. +
- Stammering has been reworked. +
- The chaplain can now no longer discern what ghosts are saying, instead receiving flavour text indicating that ghosts are speaking to him. +
- Walking Mushroom yield decreased from 4 to 1. +
- Glowshrooms now only spread on asteroid tiles. +
- Fixed rev round end message reporting everyone as dead. +
- Gave the changeling an unfat sting. +
- Erro updated:
+
-
+
- R'n'D and Gas Storage locations have been swapped in order for R&D to be given a hallway-facing table, just like Chemistry. +
- Buckling someone to a chair now causes them to face in the same direction as the chair. +
- Conveyor will now move only 10 items per game cycle. This is to prevent miners from overloading the belts with 2000 pieces of ore and slowing down time by turning it on. Does not apply to mobs on belt. +
- Doohl updated:
+
-
+
- New escape shuttle! +
- Metroids get hungry slower, but gain more nutrients from eating. +
- Kor updated:
+
-
+
- Added Necronomicon bible (credit Joseph Curwen) +
- Removed Doc Scratch clothing from chaplain? locker and added as a random spawn in the theatre. +
- Shaft Miners now start with regular oxygen tanks. +
- Mutate now gives the wizard hulk and OPTIC BLAST instead of hulk and TK. +
- Spiderman suit is no longer armoured or space worthy. +
- Crayons +
- Superxpdude updated:
+
-
+
- New, more appropriate arrivals message. +
- Shuttle escape doors fixed. +
- New RIG sprite. +
- Lasty updated:
+
-
+
- Switched xenomorph weeds to run in the background, hopefully causing them to destroy the server slightly less. +
- Microwave updated:
+
-
+
- Added sink to hydroponics +
- Cleaned up autolathe menu +
- Glasses and cups can now be filled with water from sinks. +
- Lasty updated:
+
-
+
- The costumes that spawn in the theatre are now randomized. +
- The kitchen now has a Smartfridge which can be directly loaded from the Botanist? plantbags. No more crates! (credit to Rolan7). +
- Snappops can now be acquired from the arcade machines. Amaze your friends! (credit to Petethegoat) +
- Bangindonk.ogg added to random end sounds list. +
- Urist McDorf updated:
+
-
+
- Players can no longer be randomly assigned to Librarian, Atmospherics Technician, Chaplain, and Lawyer unless all other non-assisstant job slots are full or they have those jobs in their preferences. +
- Changeling mode now has multiple changelings. +
- Superpxdude updated:
+
-
+
- The mail system actually works properly now! Probably! +
- Most hats had their ?eadspace?tag removed, meaning they will no longer substitute for a space helmet in protecting you from the dangers of space. +
- Doohl updated:
+
-
+
- Chaplains can now select different bible icons when they start. The selection is applied globally and the library's bible printer will print the same bibles. +
- Joy to the world! The Library's bible-printing function now has a one-minute cooldown. One minute may seem a little extreme, but it is necessary to prevent people from spamming the fuck out of everything with 100,000,000,000,000 carbon-copy bibles. +
- Tweaked Metroids a bit; they are slightly more aggressive and become hungrier faster. To compensate, they now move slightly slower. +
- Mport updated:
+
-
+
- Rev: +
- Station Heads or Head Revs who leave z1 will count as dead so long as they are off of the z level. +
- Once a player has been unconverted they may not be reconverted. +
- Cult: +
- Heads other than the Captain and HoS are now able to start as or be converted to a cultist. +
- New Item: Loyalty Implant, which will prevent revving/culting. 4 spawn in the armory. +
- If a rev (not cultist) is injected with one he will unconvert, if a revhead is injected it will display a resist message. +
- Loyalty Implants show up on the SecHud +
- New Machine: Loyalty Implanter - Is on the prison station, shove a guy inside it to implant a loyalty implant. It can implant 5 times before it needs a 10 minute cooldown. +
-
+
-
+
- Doohl updated:
+
-
+
- The smoke chemistry recipe has been upgraded! You can lace smoke with chemicals that can bathe people or enter their lungs through inhalation. Yes, this means you can make chloral hydrate smoke bombs. No, this doesn't mean you can make napalm smoke or foam smoke. +
- Superxpdude updated:
+
-
+
- Traitor item bundles: Contains a random selection of traitor gear +
- Uhangi updated:
+
-
+
- .38 Special Ammo can now be made from unhacked autolathes +
- Superxpdude updated:
+
-
+
- NEW MINING STATION, POST YOUR OPINIONS AND BUGS HERE +
- Added some new awesome mining-related sprites by Petethegoat. All credit for the sprites goes to him. +
- Mport updated:
+
-
+
- Cyborgs once again have open cover/cell icons. +
- To override a cyborg's laws you must emag it when the cover is open. +
- Emags can unlock a cyborgs cover. +
- Xbow radiation damage has been lowered from 100 to 20 a hit +
- Mport updated:
+
-
+
- The various assemblies should be working now. +
- Old style bombs and suicide vests temporarily removed. +
- Superxpdude updated:
+
-
+
- Virology Airlock changed to no longer cycle air. Should work faster and prevent virologists from suffocating. +
- Server Room APC is now connected to the power grid. +
- Stun Batons now start OFF. Make sure to turn them on before hitting people with them. +
- Agouri updated:
+
-
+
- SSUs now correctly cycle and dump the unlucky occupant when designated to supercycle, when the criteria to do so are met. +
- Fixed bugshit +
- You can now make normal martinis again, removed a silly recipe conflict (Thanks, muskets.). Good barmen are urged to blend the good ol' recipes since the new ones have sprites that SUCK ASS JESUS CHRIST +
- Doohl updated:
+
-
+
- Speech bubbles: you can toggle them on in the character setup window. Basically, whenever someone around you talks, you see a speech bubble appear above them. +
- You can no longer create wizarditis and xenomicrobes with metroid cores. +
- Tweak: Using an exclamation mark as an AI, pAI, or cyborg will not longer get rid of the last exclamation mark. +
- Superxpdude Updated:
+
-
+
- Engineer and CE space helmets now have built-in lights. +
- Rockdtben updated:
+
-
+
- Bugfix: Fixed a bug where you could dupe diamonds +
- Doohl updated:
+
-
+
- New virus: Retrovirus. It basically screws over your DNA. +
- You can now do CTRL+MOVEMENT to face any direction you want. See those chairs in Medbay and the Escape Wing? You can do CTRL+EAST to actually RP that you're sitting on them. Is this cool or what?! +
- Doohl updated:
+
-
+
- Bugfix: Metroids should never "shut down" and just die in a corner when they begin starving. And so, hungry Metroids are a force to be feared. +
- The Cargo computers now have the ability to cancel pending orders to refund credits. This was put in place so that idiots couldn't waste all the cargo points and run off. However, if the shuttle is en route to the station you won't be able to cancel orders. +
- Bugfix: the manifest has been fixed! Additionally, the manfiest is now updated realtime; job changes and new arrivals will be automatically updated into the manifest. Joy! +
- Metroids, when wrestled off of someone's head or beaten off, now get stunned for a few seconds. +
- Agouri updated:
+
-
+
- I was always bothered by how unprofessional it was of Nanotransen (in before >Nanotransen >professionalism) to just lay expensive spacesuits in racks and just let them be. Well, no more. Introducing... +
- Suit Storage Units. Rumored to actually be repurposed space radiators, these wondrous machines will store any kind of spacesuit in a clean and sterile environment. +
- The user can interact with the unit in various ways. You can start a UV cauterisation cycle to disinfect its contents, effectively sterilising and cleaning eveyrthing from the suits/helmets stored inside. +
- A sneaky yordle can also hide in it, if he so desires, or hack it, or lock it or do a plethora of shady stuff with it. Beware, though, there's plenty of dangerous things you can do with it, both to you and your target. +
- The Unit's control panel can be accessed by screwdriving it. That's all I'm willing to say, I'd like to let the players find out what each hack option does and doesn't. Will add more stuff later. +
- Added Command Space suit, Chief Engineer space suit and Chief Medical Officer spacesuit (In a new space that you'll probably notice by yourself) to make it easier for you to look like a special snowflake. +
- EVA and CMO office modified to accomodate the new suits and SSUs. Look, I'm not a competent mapper, okay? Fuck you too. A mapper is strongly recommended to rearrange my half assed shit. +
- Soda cans, cigarette packets, cigarettes and cigars as well as bullet casings are now considered trash and can be picked up by the trashbag. Now you can annoy the janitor even more! +
- Sprite credit goes to Alex Jones, his portfolio can be found here: http://bspbox.com. Thanks a lot, bro. +
- With the recent forum fuss and all that, I've got a thread to specifically contain rants and bug reports about this update. Click me +
- Uhangi updated:
+
-
+
- EVA redesigned +
- An electropack is now available once again on the prison station +
- Errorage updated:
+
-
+
- Hopefully fixed the derelict 'hotspots'. Derelict medbay has also been fixed. +
- Trubble Bass updated (committed by Superxpdude):
+
-
+
- Hat crates. Hat Station 13. +
- Matty:
+
-
+
- Engineers and miners now start off with the new industrial backpack. +
- Agouri:
+
-
+
- Sleepers are now OP and heal every kind of damage. +
- Made cloning 30% faster, due to popular demand. +
- Superxpdude updated:
+
-
+
- Added in the Submachine Gun to R&D. +
- Syndicate agents now have Mini-Uzis. +
- Added an exosuit recharged to the mining station. +
- New labcoats for scientists, virologists, chemists, and genetecists. +
- Moved the vault and added a bridge meeting room next to the HoP's office. +
- Deathsquad armor now functions like a space suit. +
- Added in security jackboots. +
- Uhangi updated:
+
-
+
- Traitors can now purchase syndicate balloons, which serve no purpose other than to blow your cover. For a limited time only, you can get them at a bargain price - just 10 telecrystals! +
- Removed security shotguns from the armory. No fun allowed. +
- Changed some bullet damage stuff. +
- Microwave updated:
+
-
+
- Monkey boxes: +
- Contains a score of monkey cubes, which you apply water to create monkies. Nanotrasen provides only the finest technology! +
- You can order monkey crates from the cargo bay. They contain monkey boxes. +
- Changed the amount of labels labelers have to 30. 10 was too low and 30 should not be too griefy. +
- Maximum label text length increased from 10 to 64. +
- You can no longer label people because they can just peel the labels off. Sorry, clowns! +
- Jelly dooonnuuuutsss! Happy birthday, officers! +
- Made xenomeat not give any nutrition. +
- Added some new reagents. +
- Made it possible to feed monkies and xenos things, as well as making it possible for them to eat themselves (please don't read that too literally). +
- Added in synthiflesh. +
- Plasma is now not used in reactions, instead, is treated as a catalyst that is not used up. This only applies to certain reactions. +
- Made it possible to grind more things in the chemistry grinder. +
- Errorage updated:
+
-
+
- Increased environmental damage by a factor of 1.5. +
- Made firesuits a lot more resistant to heat. Previously, they stopped protecting at around 4,500 degrees. They now go up to around 10,000 (which is also the temperature which the floor starts melting) +
- Edited the quartermaster's office a bit. +
- Cargo technicians now have access to a cargo ordering console. +
- Added different-colored hardhats. The CE gets a white hardhat. + +
- Rastaf.Zero updated:
+
-
+
- Botanists get a new toy: Biogenerator. Insert biological items, recieve biological items. +
- Added roller beds, otherwise known as stretchers, to medbay. You can buckle people onto them and pull them. +
- Added egg-smashing and tomato-smashing decals. +
- Muskets updated:
+
-
+
- The prepackaged songs (Space Asshole, Cuban Pete, Darkest Honk, etc) have been removed. This doesn't mean admins can't play midis, this just gets rid of a lot of unnecessary download time. +
- Firecage updated:
+
-
+
- A whole bunch of new drinks and food. Seriously, there's alot! +
- New weapons such as the shock revolver and large energy crossbow. +
- Hydroponics can now grow a bunch more stuff. A lot of these new crops have some very interesting mutations. +
- Added a command for AIs to change their icon. +
- New costumes to the costume room. +
- Urist McDorf updated:
+
-
+
- Adding shading to pills. +
- Detective's office noir look has been removed. The icon operations required to render everything in monochrome was too heavy on the players. +
- Added in an uplink implant. +
- Doohl updated:
+
-
+
- A new alien race: Metroids! They are a mostly non-sentient race of jellyfish-like organisms that float in the air and feed on the life energy of other organisms. While most Metroids have never shown signs of self-awareness, they do exhibit signs of basic logic and reasoning skills as well as very sophisticated perception. Nanotrasen has shipped two baby Metroids for the xenobiology department. They should be handled with the utmost care - they are some of the deadliest beings in the known universe! +
- R&D gets a new toy: the freeze gun. Despite popular belief, this will not literally freeze things! +
- Every single chemical reagent has been assigned a color. +
- You can now see beakers fill up with chemicals. You can also observe how the colors mix inside the beakers. Spray bottles also will also show the color of whatever you're spraying. +
- Added a timestamp to combat logs. +
- Non-insulated gloves now need to be wrapped in wire in order to be electrified. +
- You can now shoot at people on the ground by simply clicking on the tile they're on. +
- Changeling husks are now uncloneable. To clarify: when a changeling sucks out a victim's DNA, the victim is said to become a "husk". +
- Agouri updated:
+
-
+ Medical stuff overhaul in preparation of Erro's big Medic update:
+
- Sleepers are now able to heal every kind of damage. Drag your ass to medbay and ask a doctor to get you in one. +
- A lil' bit faster cloning (about 30% faster) due to popular demand. +
- Sleepers are now all located in the inner part of medbay, except for the examination room one. +
- Added Dermaline, burn-healing drug that outpowers kelotane (and kelotane is getting a major nerf, so be sure to know how to get this). Recipe is on the wiki if you need to make it. +
- Drugs no longer heal or metabolise when injected in dead bodies, fuck. Thank god you guys missed this major bug or we'd have cloning-by-injecting-healing-drugs. +
- Reminder to coders: Goddamn, update the changelog. +
+
+ - Matty updated:
+
-
+
- New engineering backpacks. Enjoy! +
+ - Agouri updated:
+
-
+
- Bugfixes: The reagent grinding now works, allowing the miners to FINALLY bring plasma to the chemistry. +
- Bugfixes: Pill bottles and clipboards can now be removed from the pockets once placed there. +
+ - TLE updated:
+
-
+
- Wiped/suicided pAIs should be eligible for being candidates again (5 minute cooldown between prompts.) +
- pAIs are now affected by EMP bursts. pAIs hit with a burst will be silenced (no speech or PDA messaging) for two minutes and may have their directives or master modified. A sufficiently powerful EMP burst will have a 20% chance of killing a pAI. +
+ - Neo updated:
+
-
+
- Nar-sie is now a more vengeful eldritch being. When summoned into our world, he first rewards his loyal cultists by chasing down and eating them first, then turns his attention to any remaining humans. +
+ - Darem updated:
+
-
+
- Gun Code Overhaul Phase 1. +
- Taser guns shoot ONE WHOLE SHOT more then they do now. +
- Energy Crossbow has a slightly higher shot capacity (still automatically recharges). +
- Revolvers can either be loaded one shell at a time or all at once with an ammo box. +
- Shotguns no longer need to be pumped before firing (will change back in phase 2). +
+ - K0000 updated:
+
-
+
- Arcane tome now has a "notes" option. Set English translations for runewords which come up when scribing runes. Attack an arcane tome with another arcane tome to copy your notes to the target tome. +
- Stun rune buffed considerably. Its a 1-use item so it deserved longer stun time. +
- Tome text: Added missing word description for stun rune. +
+ - Noise updated:
+
-
+
- Changed holopad speaking to :h on request. +
- Ninja fixes, changes, etc. Refer to the code changelog for more info. +
+ - Neo updated:
+
-
+
- Department radio chat now shows with the department name instead of the frequency. +
+ - Veyveyr updated:
+
-
+
- Spent casing sprites + SMG sprite. +
- Sprites for 1x4 and 1x2 pod doors. +
+ - Errorage updated:
+
-
+
- Fixed twohanded weapon throwing, which left the 'off-hand' object in your other hand. +
- Doors now hide items under them when closed, mobs are still always above. +
- Singularity engine emitter is now much quieter. +
- Mining station redesigned. +
- Atmospherics' misc gasses tank now starts with N2O. +
- Hitting the resist button while handcuffed and buckled to something will make you attempt to free yourself. The process is the same as trying to remove handcuffs. When the 2 minutes pass you will be unbuckled but still handcuffed. +
+ - ConstantA updated:
+
-
+
- Added exosuit energy relay equipment. Uses area power (any power channel +available) instead of powercell for movement and actions, recharges powercell. +
- Exosuits can be renamed. Command is in Permissions & Logging menu. +
- Lowered construction time for Ripley parts. +
- Exosuit wreckage can be salvaged for exosuit parts (torso, limbs etc). +
- Speed-up for mecha. +
- New malf-AI sprite. (Sprite donated by the D2K5 server) +
+ - Cheridan updated:
+
-
+
- Updated mine floor and wall edge sprites. +
+ - Urist McDorf updated:
+
-
+
- AIs no longer bleed when they reach 0HP (Critical health). +
- Added 2 more security HUDs to security. +
- Security HUDs now show if a person has a tracking implant. +
+ - Microwave updated:
+
-
+
- Barman renamed to Bartender. +
- The amount of drink you get when mixing things in the bar has been rebalanced. +
- Fixed arrivals maintenance shaft not having air at round start. +
+ - Deuryn updated:
+
-
+
- Meteors now do a bit more damage and they're not stopped by grills. +
+ - TLE updated:
+
-
+
- Added personal AIs (pAI). +
+ - Errorage updated:
+
-
+
- Asteroid floors can be built on by adding tiles +
- Mining satchels now fit in rig suit storage, on belts and in pockets. +
- Cables now come in four colors: Red, yellow, green and blue. +
+
+ - NEO updated:
+
-
+
- Armour overhaul, phase 3. See rev notes for details. +
- AI cores should now block movement. +
- MMIs are now properly buildable with the mecha fabricator. +
+
+ - Urist updated:
+
-
+
- Added sandstone and mineral doors. Mineral boors cannot be opened by the AI or NPCs. +
- Removed Imperium robes from map. +
- Added the ability to draw letters and graffiti with crayons. +
- Removed fire axes except for bridge and atmospherics. +
+
+ - Veyveyr updated:
+
-
+
- New serviceborg sprite option. +
- Map changes to robotics; removed borg fabricators and added second exosuit fabricator. +
- Cyborg parts are now built from exosuit fabricators and benefit from research. +
- New exosuit fabricator and borg frame sprites. +
+ - K0000 updated:
+
-
+
- Cult updates: +
- New rune! Stun rune. When used as rune, briefly stuns everyone around (including cultists). When imbued into a talisman, hit someone to stun and briefly mute them. Spawnable with the starter talisman. +
- Imbue rune doesnt disappear after succesful invocation, only the source rune. +
- Chaplain's bible now has 20% chance to convert a cultist (was 10%), and gives a message on success. +
- Also, wrapping paper is back! Find it in the mailroom. +
+
+ - NEO updated:
+
-
+
- Beginning of armor overhaul. Armor now has slightly better defence against melee, and weaker against shots. More coming soon...someday +
- Cyborgs finally drop their MMI when gibbed like they were supposed to back when I added MMIs. Round- start cyborgs use whatever name you have selected for your character for the brain that gets spawned for them. +
+
+ - Darem updated:
+
-
+
- Chemistry update +
- In containers where there isn't a perfect ratio of reagents, reactions won't consume ALL of the related reagents (so if you mix 10 anti-toxin with 20 inaprovaline, you get 10 tricordrazine and 10 inaprovaline rather then just 10 tricodrazine) +
- Catalysts: some reactions might need presence of an element, while not directly consuming it. +
- Reactions changed to use catalysts: all recipes that require Universal Enzyme now require 5 units of the enzyme but the enzyme isn't consumed (So Tofu, Cheese, Moonshine, Wine, Vodka, and Kahlua recipes). +
+ - Errorage updated:
+
-
+
- Smooth tables: Tables now automatically determine which direction and sprite they'll use. They will connect to any adjacent table unless there is a window between them (regular, reinforced, tinted, whichever) +
+ - Agouri updated:
+
-
+
- Fireaxes now work. Derp. +
+
+ - Erro updated:
+
-
+
- New sprites for thermited walls and girders. Rework of thermited walls. Thermited walls leave a remnant damaged wall, crowbar it to scrap it. +
- More colors for the lightfloors CANCELLED/POSTPONED +
+
+ - Noise updated:
+
-
+
- Codephrases for traitors. More details here +
- New mech sprite +
+ - DANGERCON UPDATE:Agouri and Erro updated(I'm in the DangerCon team now, nyoro~n :3):
+
-
+
- Backpacks removed from all players. It was unrealistic. You can now had to the living quarters to get one from the personal closets there. +
- Any firearms now send you to critical in 1-2 shots. Doctors need to get the wounded man to surgery to provide good treatment. Guide for bullet removal is up on the wiki. +
- Brute packs and kelotane removed altogether to encourage use of surgery for heavy injury. +
- Just kidding +
- Fireaxe cabinets and Extinguisher wall-mounted closets now added around the station, thank Nanotransen for that. +
- Because of Nanotransen being Nanotransen, the fire cabinets are electrically operated. AIs can lock them and you can hack them if you want the precious axe inside and it's locked. The axe itself uses an experimental two-handed system, so while it's FUCKING ROBUST you need to wield it to fully unlock its capabilities. Pick up axe and click it in your hand to wield it, click it again or drop to unwield and carry it.You can also use it as a crowbar for cranking doors and firedoors open when wielded, utilising the lever on the back of the blade. And I didn't lie to you. It's fucking robust. +
- Fireaxe, when wielded, fully takes up your other hand as well. You can't switch hands and the fireaxe itself is unwieldy and won't fit anywhere. +
- A fireaxe cabinet can also be smashed if you've got a strong enough object in your hand.
- +
- EXTINGUISHER CLOSETS, made by dear Erro, can be found in abundance around the station. Click once to open them, again to retrieve the extinguisher, attack with extinguisher to place it back. Limited uses, but we've got plans for our little friend. +
- Sprite kudos go to: Cheridan for most of them, Khodoque for the fantastic fireaxe head. I merged those two. Also thanks to matty and Arcalane for giving it a shot. +
- Has the piano got TOO annoying? Try the fire axe... +
- Oh, and tou can now construct Light floors! To do it: Use wires on glass, then metal on the produced assembly, then place it on an uncovered floor like you would when replacing broken floor tiles. To deconstruct: Crowbar on light floor, use crowbar on produced assembly to remove metal, wirecutters to seperate the wires from the glass. Sprites by delicious Hempuli. +
- Got something to bitch about? Got a bug to report? Want to create drama? Did the clown destroy your piano while you were playing an amazing space remix of the moonlight sonata? Give it here + +
+
+ - Rastaf.Zero updated:
+
-
+
- New uniforms added for captain and chaplain, in their respective lockers. Credits to Farart. +
+
+ - Urist McDorf updated:
+
-
+
- Mime and Clown now spawn with Crayons. You can eat those crayons. And use them for other nefarious purposes. +
- Health Scanners (A new type of Goggles) now spawn in medbay. Use them, doctors! +
- New Arcade toy. +
- Glowshrooms! What other lifeform will threaten the welfare of the station now?! +
- Bananas growable in hydroponics. Also soap is now on-board. +
- Added new "Lights out!" random event. +
+ - ConstantA updated:
+
-
+
- Mech pilots are now immune to zapping, thank you very much. +
+ - Microwave updated:
+
-
+
- Rabbit ears have a small tail, night vision goggle sprites updated. +
- Space tea has a nice, calming effect. +
- Space drugs? Liberty cap... something like that. Microwave, make your changelog entries more understandable! +
- Brobot merged with Service Borg with a Rapid Service Fabricator. +
- Arcade machine prizes look and sound realistic once again. +
- New arcade toy: Syndicate space suit costume, can hold arcade toys in suit storage. +
- Empty cap gun loaders can be recycled in an autolathe. +
- Seizure man has laying down sprites now. Update to wizard den. +
- Mech bay has two more borg chargers. +
- Beepsky is back! +
- Detective's office grille has been electrified. +
- You can now see if someone is wearing an emergency oxygen tank on their belt on the mob itself. +
- Lexorin - Now deals 3 oxygen damage per tick. Countered with Dexalin or Dexalin Pkus, which remove 2 units of it from your body per tick. +
- Bilk - Shares the effects of beer and milk. Disgusting! +
- Sugar - Gives nutrition! +
- Arithrazine - Now extremely good against radiation damage. +
- Hyronalin - Stronger radiation removal +
- Space cleaner spray bottles now contain enough cleaner for 50 uses. Making space cleaner now yields more cleaner. +
+ - Errorage updated:
+
-
+
- Shuttle diagonal sprites now work for any kind of floor. +
- You can now make plaques from gold. Place them on a wall and engrave an epitaph. +
- Placed a single wall tile in the AI satellite so you don't have a clear LOS of the AI from the door. +
- Added arrivals lobby. (Map by Superxpdude, updated by Microwave) +
- Lattice now connects to the solar shields. +
- Law office maintenance is now connected with Tech storage maintenance. (Some rewiring dont in the area) +
- Xenobiology now has it's own access level. (Also fixed xeno pen access and blast doors) +
- You might soon start to see different airlocks and airlock assemblies around the station. (Sprites donated by Baystation 12) +
- Chemical storage added, discussion on which chemicals it should store is on the forums. You're welcome to contribute. +
- Hot fires will now melt floors. +
- Added a pair of market stalls south of the teleporter. LET THERE BE CLOWNMART! +
- Screwdrivers and wirecutters can now spawn in different colors. +
- Electrical toolboxes have a 5% chance of spawning a pair of insulated gloves. A set spawns in tech storage. +
- Oxygen canisters now spawn in emergency storage, near disposal, in the incinerator and the CE's office. +
- A plasma canister now spawns in toxins, near the maintenance door. +
- Wooden tables now look nicer. +
+ - Agouri updated:
+
-
+
- 2001 space suits added to AI Satellite! +
- New look for the 2001 space suit. +
- 2001 space suit jetpack added. +
- Improved TRAYS! +
+ - Noise updated:
+
-
+
- Thermals and mesons no longer give slightly better night vision. +
- NINJAS! (Too many things to list) +
- Wizards are no longer trackable by the AI when in their den. +
- Removed all old notes, except for the last one. +
- Nuke team now cannot return with their shuttle until the bomb is armed and counting down. +
- Energy blades can no longer cut through r-walls, walls take 7 seconds to cut through. +
- Turrets are now destructible. Bash them with stuff when they pop out or (more likely) die trying. +
- Updated Ripley Mech sprite. +
+ - Neo updated:
+
-
+
- You can now aim guns at body parts, armor and helmets properly protect you from projectiles. +
- Cat ears now match the hair color of the wearer. +
- Robots can no longer stick their items onto/into things. +
- Meson, thermal and x-ray vision are now modules for borgs. +
- Welding now uses less fuel when on and idle but more when welding. +
- Hopefully fixed the bug when running into airlocks didn't open them and running into objects didn't push them. +
+ - HAL updated:
+
-
+
- Added air alarm to security checkpoint, added cameras to aux. arrival docks so the AI can see everything. +
- Added fire alarm, fire locks and air alarm to delivery office. +
+ - ConstantA updated:
+
-
+
- Added mecha DNA-locking. Only the person with matching UE can operate such mechs. +
- Added two mecha armor booster modules and a repair droid module. +
- Mech fabricator is now buildable. +
- Gygax construction is now reversible. +
+ - Rastaf0 and Farart updated:
+
-
+
- Ghosts should now always properly hear people. +
- Monkeyized people (genetics or jungle fever disease) no longer lose their genetic mutations and diseases. +
- People who get bitten by monkeys get jungle fever. +
- Most chemicals should now heal and harm humans properly. +
- Many new (and updated) recipes for the microwave including Pizza, Meatball Soup, Hot Chili and many more. +
- Items should no longer spawn under vendomats and microwaves. +
- Runes are now drawn under doors and tables. +
- Penlights fit in medical belts. +
- People will scream if they get cremated while still alive. +
- Diseases should now properly make you loose health. +
- Monkeys wearing masks now get acid protection too. +
- You should probably turn off your stun baton before washing it. +
- latex loves + short piece of wire + some air from tank = balloon! +
- Kitchen was expanded, also a new look for the kitchen sink. +
- New dishware vending machine - dispenses knives, forks, trays and drinking glasses. +
- Water cooler was added to kitchen. +
- New uniform - Waiter Outfit. Chef can give it to his assistant. +
+ - Deeaych updated:
+
-
+
- Updated satchel, bananimum, shovel, jackhammer and pick-in-hand sprites. +
- Many unneeded r-walls removed, detective's office reinforced. +
- Captain armor now acts as a space suit, added a unique captain's space helmet to captain's quarters. +
- Golems cannot speak, but should be perfectly spawnable. Also added golem fat sprite. +
- Security borgs have side sprites. +
+ - Matty406 updated:
+
-
+
- AIs can now feel a little more dorfy. +
- Many ores, both raw and smelted, look much better. +
+ - Urist_McDorf updated:
+
-
+
- You can now light other people's cigarettes by targeting their mouth with a lighter. +
+ - Veyveyr updated:
+
-
+
- New tool sprites. +
- New sprites for smooth-lattice. +
+ - Muskets updated:
+
-
+
- Kabobs now return the bar used to make them. +
+ - Microwave updated:
+
-
+
- New look for the mining cyborg, jackhammer, kitchen sink. +
- Singularity is now enclosed again (still airless tho). +
- Wizard has a new starting area. +
- Chemists and CMOs now have their own jumpsuits. +
+ - ConstantA updated:
+
-
+
- You can now put Mind-machine-interface (MMI)'d brains into mecha. +
+ - Errorage updated:
+
-
+
- Added smooth lattice. +
+ - Rastaf0 updated:
+
-
+
- Food sprites from Farart +
- New food: popcorn (corn in microwave), tofuburger (tofu+flour in microwave), carpburger (carp meat+floor in microwave) +
- Medical belts are finally in medbay (credits belong to errorage, I only added it) +
- Pill bottles now can fit in containers (boxes, medbelts, etc) and in pockets. +
- Cutting camera now leaves fingerprints. +
+ - Microwave updated:
+
-
+
- Armor Can hold revolvers, and so can the detective's coat. +
- Chef's apron is going live, it can carry a knife, and has a slight heat +resistance (only slight don't run into a fire). +
- Kitty Ears! +
- Various food nutriment changes. +
- Added RIGs to the Mine EVA. +
- Night vision goggles. They have a range of five tiles. +
- Added Foods: Very Berry Pie, Tofu Pie, Tofu Kebab. +
- Modified foods: Custard Pie is now banana cream pie. +
+ - ConstantA updated:
+
-
+
- Removed redundand steps from Gygax and HONK construction. +
- Added some mecha equipment designs to R&D. +
+ - Neo updated:
+
-
+
- Fixed PacMan (and affiliates) generator construction. +
- It is now possible to actually eat omelettes with the fork now, instead of just stabbing yourself (or others) in the eye with it. +
- Welding masks can now be flipped up or down. Note that when they're up they don't hide your identity or protect you from welding. +
- Reagent based healing should now work properly. +
- Revolver has been balanced and made cheaper. +
- Tasers now effect borgs. +
- Plastic explosives are now bought in single bricks. +
- Nuke team slightly buffed and their uplink updated with recently added items. +
- Player verbs have been reorganized into tabs. +
- Energy swords now come in blue, green, purple and red. +
- Cameras are now constructable and dismantlable. (Code donated by Powerful Station 13) +
- Updated the change network verb for AIs. (Code donated by Powerful Station 13) +
- Added gold, silver and diamond pickaxes to R&D which mine faster. +
+ - Agouri updated:
+
-
+
- New look for the Request consoles. +
+ - Rastaf0 updated:
+
-
+
- Brig cell timers should now tick closer-to-real seconds. +
- New look for food, including meat pie, carrot cake, loaded baked potato, omelette, pie, xenopie and others. (some sprites by Farart) +
- Hearing in lockers now works as intended. +
- Fixed electronic blink sprite. +
- Added the 'ghost ears' verb, which allows ghosts to not hear anything but deadcast. +
+ - XSI updated:
+
-
+
- New AI core design. +
- HoP now has a coffee machine! +
+ - Veyveyr updated:
+
-
+
- Replaced nuke storage with a vault. +
- Redesigned the mint, moved the public autolathe and n2o storage. +
- New look for the coin press. (Sprite by Cheridan) +
+ - Errorage updated:
+
-
+
- You can now manually add coins into money bags, also fixed money bag interaction window formatting. +
- QM no longer has access to the entire mining station to stop him from stealing supplies. +
- New machine loading sprite for mining machinery. (sprites by Cheridan) +
- Added a messanging server to the server room. It'll be used for messanging, but ignore it for now. +
- The delivery office now requires delivery office access. It's also no longer called "Construction Zone" +
- Almost all the mecha parts now have sprites. (Sprites by Cheridan) +
- Tinted and frosted glass now look darker. +
- There are now more money sprites. +
- Department closets now contain the correct headsets. +
+ - Microwave updated:
+
-
+
- Bicaridine now heals a lot better than before. +
- Added Diethylamine, Dry Ramen, Hot Ramen, Hell Ramen, Ice, Iced Coffee, Iced Tea, Hot Chocolate. Each with it's own effects. +
- Re-added pest spray to hydroponics. +
- Carrots now contain a little imidazoline. +
- HoS, Warden and Security Officer starting equipment changed. +
- New crate, which contains armored vests and helmets. Requires security access, costs 20. +
- Miner lockers now contain meson scanners and mining jumpsuits. +
- Food crate now contains milk, instead of meatballs. Lightbulb crates cost reduced to 5. Riot crates cost reduced to 20. Emergency crate contains 2 med bots instead of floor bots. Hydroponics crate no longer contains weed spray, pest spray. It's latex gloves were replaced with leather ones and an apron. +
- Added chef's apron (can hold a kitchen knife) and a new service borg sprite. +
- Autolathe can now construct kitchen knives. +
- Biosuit and syndicate space suits can now fit into backpacks. +
- Mime's mask can now be used as a gas mask. +
- Added welding helmet 'off' sprites. +
+ - Errorage updated:
+
-
+
- You can now use the me command for emotes! It works the same as say "*custom" set to visible. +
- There is now a wave emote. +
- Enjoy your tea! +
+ - Deeaych updated:
+
-
+
- The exam room has some extra prominence and features. +
- A new costume for the clown or mime to enjoy. +
- Service Cyborgs can be picked! Shaker, dropper, tray, pen, paper, and DOSH to show their class off. When emagged, the friendly butler-borg is able to serve up a deadly last meal. +
- It should now be possible to spawn as a cyborg at round start. Spawned cyborgs have a lower battery life than created cyborgs and begin the round in the AI Foyer. +
+ - Rastaf0 updated:
+
-
+
- Fixed an issue with examining several objects in your hands (such as beakers). +
- Fixed bug with random last name being empty in rare cases. +
+ - hunterluthi updated:
+
-
+
- It is now possible to make 3x3 sets of tables. +
- Fixed some missplaced grilles/lattices on the port solar. +
- There is now a breakroom for the station and atmos engineers. It has everything an intelligent young engineer needs. Namely, Cheesy Honkers and arcade games. +
+ - Errorage updated:
+
-
+
- Autolathe deconstruction fixed. +
- Atmos Entrance fixed. +
- AI no longer gibs themselves if they click on the singularity. +
- Fixed all the issues I knew of about storage items. +
- Redesigned Assembly line and surrounding maintenance shafts. +
- Redesigned Tech storage. (Map by Veyveyr) +
+ - TLE updated:
+
-
+
- Forum account activation added. Use the 'Activate Forum Account' verb. +
+ - Neo updated:
+
-
+
- New R&D Item: The 'Bag of holding'. (Sprite by Cheridan) +
- Getting someone out of the cloner now leaves damage, which can only be fixed in the cryo tube. +
- New reagent: Clonexadone, for use with the cryo tube. +
- Fixed using syringes on plants. +
+ - Constanta updated:
+
-
+
- Added queueing to fabricator. +
+ - Rastaf0 updated:
+
-
+
- Air alarms upgraded. +
- Fixed problem with AI clicking on mulebot. +
- Airlock controller (as in EVA) now react to commands faster. +
- Fixed toxins mixing airlocks. +
+ - Neo updated:
+
-
+
- Neo deserves a medal for all the bugfixing he's done! --errorage +
+ - Errorage updated:
+
-
+
- No. I did not code on my birthday! +
- Windows can now be rotated clockwise and counter clockwise. +
- Window creating process slightly changed to make it easier. +
- Fixed the newly made reinforced windows bug where they weren't properly unfastened and unscrewed. +
- Examination room has a few windows now. +
- Can you tell I reinstalled Windows? +
- Robotics has health analyzers. +
- Bugfixing. +
+ - Deeyach updated:
+
-
+
- Roboticists now spawn with a lab coat and an engineering pda +
+ - Errorage updated:
+
-
+
- Mapping updates including Atmospherics department map fixes, CE's office and some lights being added here and there. +
- Mining once again given to the quartermaster and HoP. The CE has no business with mining. +
- Removed the overstuffed Atmos/Engineering supply room. +
- Replaced all 'engineering' doors in mining with maintenance doors as they were causing confusion as to which department mining belongs to. +
- The incinerator is now maintenance access only. +
+ - Neo updated:
+
-
+
- New look for the advanced energy gun. (Sprite by Cheridan) +
- Mech fabricator accepts non-standard materials. +
- Mules accesses fixed, so they can be unlocked once again. +
- Atmospherics department mapping overhaul. (Map by Hawk_v3) +
- Added more name options to arcade machines. +
+ - ConstantA updated:
+
-
+
- Added mecha control console and mecha tracking beacons. +
- Some changes to gygax construction. +
+ - Darem updated:
+
-
+
- R&D minor bugfixes. +
- AI computer can now be deconstructed (right click and select 'accessinternals'). +
- Server room updated, added server equipment to use with R&D. +
- Wizard and ghost teleport lists are now in alphabetical order, ghosts can now teleport to the mining station. +
- Rightclicking and examining a constructable frame now tells you what parts still need to be finished. +
- Large grenades added to R&D. +
+ - Deeyach updated:
+
-
+
- Mining given to the CE. (Reverted by Errorage) +
- Clowns can now pick a new name upon entering the game (like wizards previously). +
+ - Darem updated:
+
-
+
- Lighting code fixed for mining and thermite. +
- R&D instruction manual added to the R&D lab. +
- Fixed R&D disk commands not working. +
- Added portable power generators which run on solid plasma. +
- You can now set the numer of coins to produce in the mint. +
- Added two more portable power generators to R&D. +
+ - Deeyach updated:
+
-
+
- New uniform for roboticists +
+ - Neo updated:
+
-
+
- Game speed increased +
- Mining stacking machine no longer devours stacks larger than 1 sheet (it was only increasing its stock by 1 when given a stacked stack) +
- Stackable uranium ore added (a better sprite is needed, contributions are welcome) +
- Made Meteor gamemode actually do stuff +
- Made a bigger class of meteor +
- New R&D item: Advanced Energy Gun +
- Law priority clarified with regards to ion laws and law 0. +
+
+ - Veyveyr updated:
+
-
+
- Minor mapping fixes +
+ - Uhangi updated:
+
-
+
- New red bomb suit for security. +
+
+ - Errorage updated:
+
-
+
- Slight mapping change to arrival hallway. +
+ - Uhangi updated:
+
-
+
- Antitox and Inaprovaline now mixable via chemistry. +
- Explosive Ordinance Disosal (EOD) suits added to armory and security. +
- Large beaker now holds 100 units of chemicals. (code by Slith) +
+ - Rastaf0 updated:
+
-
+
- Secbot interface updated. +
- Syringe auto-toggels mode when full. +
- Captain's flask volume increased. +
+ - Neo updated:
+
-
+
- Fixed the 'be syndicate' choice to actually work on nuke rounds. +
- Syndicates no longer win if they detonate the nuke on their ship. +
+
+ - Errorage updated:
+
-
+
- Added cloning manual. (Written by Perapsam) +
+ - K0000 updated:
+
-
+
- Cult mode updates. +
- You can now read the arcane tome. It contains a simple guide for making runes. +
- Converting people doesnt give them word knowledge. +
- Sacrifice monkeys or humans to gain new words. +
- Total number of rune words set to 10 +
- Some minor bugfixes. +
+ - Errorage updated:
+
-
+
- Slight updates to processing unit and stacking machine at the mining outpost. +
- Digging now yields sand, which can be smelted into glass. +
- Stacking machine can now stack reinforced metal, regular and reinforced glass too. +
- Engineers now have two copies of the singularity safety manual. +
+ - Neo updated:
+
-
+
- Magboots now have a verb toggle like jumpsuit sensors. +
- Jumpsuit sensors are now in all jumpsuits, except tactical turtlenecks. +
- Tweaks to the AI report at round start. +
- Syndi-cakes now heal traitors/rev heads/etc much more than anyone else. +
- Containment fields zap once again. +
- Fire damage meter no longer lies about fire damage. +
+ - Darem updated:
+
-
+
- Mass Spectrometer added to R&D. Load it with a syringe of blood and it will tell you the chemicals in it. Low reliability devices may yield false information. +
- Not all devices have a 100% reliability now. +
- Miners now have access to mint foyer and loading area. Only captain has access to the vault. +
- More stuff can be analyzed in the destructive analyzer, protolathe can produce intelicards. +
+ - Rastaf0 updated:
+
-
+
- Added blast door button to atmospherics. +
- Toxins timer-igniter assemblies fixed. +
- Engineering secure storage expanded. +
- Added singularity telescreen. +
+ - Errorage updated:
+
-
+
- New look for the bio suits. (Biosuit and hood sprites by Cheridan) +
- New radiation suits added along with radiation hoods and masks. Must wear complete set to get full protection. +
+ - Rastaf0 updated:
+
-
+
- Binary translator cost reduced to 1 telecrystal.
+ - AtomicTroop updated:
+
-
+
- Mail Sorter job added. +
- Disposal system redone to allow for package transfers. Packages are routed to mail sorter room and then routed to the rest of the station +
- Disposal area moved. Old disposal area now just an incinerator and a small disposal into space. +
- New wrapping paper for sending packages. +
+ - Veyveyr updates:
+
-
+
- New machine frame sprite. +
- Braincase sprites for mechs added. Not actually used, yet. +
+ - Darem updates:
+
-
+
- Research and Development system is LIVE. Scientists can now research new advancements in technology. Not much can be made, right now, but the system is there. Technologies are researched by shoving items into the destructive analyzer. Circuit Imprinter, Destructive Analyzer, and Protolathe are controlled from the R&D console. +
- Autolathe, Protolathe, Destructive Analyzer, and Circuit Imprinter can now be built, taken apart, and upgraded. The basic frame for all of the above requires 5 metal. +
+ - Rastaf0 updated:
+
-
+
- Added radio channels and headsets for miners (:h or :d ("diggers" lol)) and for cargo techs (:h or :q ) +
- Added a personal headsets to HoP and QM. +
- Aliens now attack bots instead of opening control window. +
- All bots can be damaged and repaired. +
- All bots are effected to EMP now. +
- Atmos now starts with nitrous oxide in storage tank. +
+ - Veyveyr updated:
+
-
+
- New look for the pipe dispenser. +
- Errorage updated:
+
-
+
- Mining station will now charge properly. +
- Duffle bags (Money bags) can now be emptied. +
+ - Errorage updated:
+
-
+
- New Job! - Shaft Miners have finally been added and are available to play. +
- Mining outpost - A new mining outpost has been built, the mining dock on SS13 has been updated. +
+ - ConstantA updated:
+
-
+
- Slight speed up for combat mechs.. +
- Added H.O.N.K construction +
- Fixed bug with switching intent while in mecha. +
+ - Added Durand combat exosuit. +
- Players can modify operation permissions of newly constructed civilian mechs. Click on mech with ID card or PDA with ID inside. +
- Added robotics access to default mecha maintenance permissions (all mechs) and operation permissions (civilian models only). +
- Fixed double adminlog message of explosion proc. +
- Fixed accidental mecha wreckage deletion. +
- Tweaked mecha internal fire processing. +
- Added some mecha-related sounds. +
- Moved GaussRand to helpers.dm and added GaussRandRound helper proc. +
- Other small changes. +
- Headsets upgraded. Shortcuts for channels are: :command :security scie:nce :engineering :medical. Also there is :binary :whisper :traitor and old good :h for your department. +
- "One Click Queue" added: When you quickly click on two things in a row, it will automatically queue the second click and execute it after the default 'action delay' of 1 second after the first click. Previously you had to spam-click until 1 second had passed. THIS AFFECTS EVERYTHING. NEEDS TESTING. - Skie +
- EMP effects added for further revisions. - Darem +
- Goon stuff removed, AI/Bots leave behind hidden fingerprints, firedoors fixed, powersinks eat more, small map changes. - Mport +
- Big map changes in engineering/robotics/science wing. - errorage +
- Welder Fixed. Now burns your eyes again. - errorage +
- 9x9 singularity sprite added. - Skie/Mport +
- Ghetto surgery added. - Neophyte +
- Nasty vent pump lag fixed. - Neophyte +
- Mech gameplay and building updates. - ConstantA +
- The amount of power the station uses should be lower. +
- The singularity now changes size based upon how much energy it has +
- New Machine: Particle Accelerator. +
- It might need a better name/sprite but when put together properly and turned on it will shoot Accelerated Particles. +
- The particles irradiate mobs who get in the way and move through solid objects for a short time. +
- The Particle Accelerator parts are set up by using a Wrench followed by a Cable Coil, then finished with a screwdriver. +
- When you shoot the Singularity Generator with Accelerated Particles it will spawn a Singularity. +
- New layout for Engineering, might be changed up slightly in the next few days. +
- Jesus christ it's a new map what the fuck +
- Just kidding, it's only minor changes to medbay/mechbay/cybernetics/R&D/toxins/robotics/chapel/theatre +
- Okay so there's too many changes to list completely, but basically: toxins/R&D/virology/xenobiology are south through medbay; robotics/cybernetics/mechbay are where toxins used to be, the theatre and chapel are above medbay. +
- Theatre is a new place for the Clown and Mime to play, there are some costumes available, a stage and backstage, and seating for the audience. +
- R&D and Toxins have been combined together. R&D is still work in progress. You need to head south through medbay to get there. +
- Medbay has been re-arranged slightly. Honestly, it's nothing, I bet you won't even notice anything different. There's also a new surgery suite, complete with pre-op and post-op rooms. +
- Virology's been rearranged, but it is mostly in the same place still. +
- Xenobiology is work in progress. [There's some fun stuff still being coded] +
- The Chapel is now to the north. You'll probably be thinking something like "Goddamn, this place is fucking huge", but it's actually smaller than the previous chapel. +
- Robotics and related stuff is also work in progress - however, everything needed for making borgs is there. Note: de-braining will now be done by surgeons in medbay, rather than roboticists in robotics, in case you're wondering where your optable went. +
- I added color-coded pipes in the areas I was working on. Red pipes run from air siphons and feed into the waste loop; blue pipes run from air vents and pump whatever atmos is set to pump. Yeah, there's TWO pipe networks on the station, who knew? Well, some of you probably did, but I didn't! +
- Please bring all complaints/ideas/suggestions/bugfixes to: This awesome thread on our forums +
- This update brought to you by: veyveyr and Rookie, with help from friends! [Now you know who to strangle, please be gentle q_q] +
- This really needs to be updated more often. +
- Various map updates have been applied with many more to come. Expect overhauls! +
- Mining system nearing completion. +
- Massive overhaul to the electricity systems, the way singularity makes power, and various related functions. +
- Mime spawns with White Gloves instead of Latex Gloves (apparently there's a difference!) +
- A new event has been- CLANG! What the fuck was that? +
- Ion storm laws should be much more interesting. +
- Security reports should no longer list traitor heads/AIs as possible revs/cultists, nor should nuke operatives ever get named for anything. +
- Pens are much more versatile and user friendly. +
- Mech building is rapidly on its way! Ripleys can be built, consult your quartermasters. +
- Traitors now have several new things they can steal. +
- Some surgeries coded to accompany the new operating room and surgery tools. +
- Research and Design is continuing development and should be rolled out shortly. +
- Various sprites added, tweaked, scrapped and fixed. +
- This really needs to be updated more often. +
- Various map updates have been applied with many more to come. Expect overhauls! +
- Mining system nearing completion. +
- Massive overhaul to the electricity systems, the way singularity makes power, and various related functions. +
- Mime spawns with White Gloves instead of Latex Gloves (apparently there's a difference!) +
- A new event has been- CLANG! What the fuck was that? +
- Ion storm laws should be much more interesting. +
- Security reports should no longer list traitor heads/AIs as possible revs/cultists, nor should nuke operatives ever get named for anything. +
- Pens are much more versatile and user friendly. +
- Mech building is rapidly on its way! Ripleys can be built, consult your quartermasters. +
- Traitors now have several new things they can steal. +
- Some surgeries coded to accompany the new operating room and surgery tools. +
- Research and Design is continuing development and should be rolled out shortly. +
- Various sprites added, tweaked, scrapped and fixed. +
- Pipes can now be removed and re-attached by wrenching them. +
- Mining system continues to develop. Still unaccessible to players. +
- Various map changes. Some minor lag causing things were fixed. +
- Admins have a new tool: They can now give any spell to anyone. Hurray! +
- Imadolazine now works. Maybe? +
- Singularity now releases itself if fed too much and will potentially explode. +
- Magboots now successfully prevent you from getting pulled into the singularity. +
- Strike teams immune to facehuggers. Why? I dunno. +
- Many reagent containers are adjustable so you can pour the exact amount you need. +
- No more emitters working in space, Collectors and collector controllers now ID lockable. +
- Christmas Contest plaque finally added. It's near the armor/warden's office. +
- Rocks fall, everyone dies. +
- All cyborgs and robots can now be named. Just use a pen on the cyborg's frame before the brain is inserted. +
- Knock spell now unbolts doors as well as opens them. +
- New cultist runs and other changes. +
- Added surgery tools for eventual surgery system. +
- Autolathe and Circuit Printer animations redone. Yay pretty icons. +
- AI law changes/uploads are now tracked (admin viewable). +
- Revheads now get a PDA uplink instead of a headset one. +
- Added a penlight. +
- Science Research and Development tech tree uploaded. Not really accessible by anyone yet, though. +
- Changlings Overhauled. Now function kinda like alium (using an internal chemical reserve instead of plasma) with each ability requiring a certain amount of chemicals to activate. Both venoms removed. Several "Dart" abiliites added. They allow the changling to deafen, blind, mute, paralyze, or even transform (dead) targets. +
- Carp meat now contaminated with Carpotoxin. Anti-toxin negates the poison, however. +
- New Reagent: Zombie Powder: Puts subjects into a deathlike state (they remain aware, though). Each unit of Zombie Powder requires 5 units of Carpotoxin, Sleeping Toxin, and Copper. +
- Various alium fixes. +
- Matches now available from smokes machine. +
- Megabomb bug fixed. Bombs with timers/signalers won't detonate after the timer/ signaler is removed. +
- New Disease: Rhumba Beat. Functions like GBS with a few exceptions. Not only available by admindickery. +
- More mining fixes/changes. +
- Ghost can now teleport to AI sat, Thunderdome, and Derelict. +
- New gimmick clothes +
- Constructing Glass Airlocks now use one sheet of R.Glass. +
- Windows mow always appear above grills and pipes always above lattices. +
- Added FireFighter mecha and various mecha fixes. +
- Deconstructed walls now leave proper floor tiles (that can be pried up like normal) and remember what kind of floor they were before the wall was made. +
- Carded AIs no longer take damage while in unpowered areas. +
- Chaplains can now name their religion at round start. +
- New Recipies: Clown Burger (1 Clown wig, 5 flour), Mime Burger (1 beret, 5 flour), Cuban Carp (1 carp fillet, 1 chili, 5 flour). +
- Napalm nerfed a bit. Produces ~25% less plasma but it's all concentrated in a single tile (will still spread, though). +
- Reagent bottles can, once again, be put into grenades. +
- Various minor map changes. +
- Holograms (AI controled psudo-mobs) added. Currently only admin spawn. +
- Pre-spawned pills no longer have randomized image. +
- Bridge reorganized. +
- Automated turrets now less dumb. Additionally, turrets won't target people laying down. +
- Cultists now automatically start known words for add cultist ritual. Also, converted cultists start knowning a word. +
- Supply ship no longer can transport monkeys. Also, monkeys are no longer orderable from QM. +
- Meat Crate added to QM. +
- Corn can now be blended in a blender to produce corn oil which is used to create glycern. +
- Request Consoles added across the station. Can be used to request things from departments (and slightly easier to notice then the radio). +
- Centcom reoragnized a fair bit. Not that players care but admins might enjoy it. +
- There is now a toggable verb that changes whether you'll turn into an alium or not. +
- Hair sprited modified. +
- Napalm and Incendiary Grenades both work now. Have fun setting things on fire. +
- Binary Translater traitor item added. It allows traitors to hear the AI (it functions like a headset). +
- New Disease: Pierrot's Throat. Enjoy, HONK! +
- Robotic Transformation (from Robrugers) and Xenomorph Transformation (from xenoburgers) now curable. +
- Mining added. Only accessible by admins (and those sent by admins). Very much WIP. +
- Alium Overhaul. Divided into multiple castes with distinct abilities. +
- New AI Modules: The goody two-shoes P.A.L.A.D.I.N. module and it's evil twin T.Y.R.A.N.T. Only the former actually spawns on the station. +
- Lizards added. They run away and shit. +
- PDA overhaul. Doesn't change anything for humans, just makes coders happy. +
- Firesuits redone to look less like pajamas and instead like firesuits. Fire lockers also added. +
- New Mecha: H.O.N.K. +
- Deployable barriers added. Can be locked and unlocked. +
- Mecha bay (with recharging stations) added. +
- Bunny Ears, Security Backpacks, Medical Backpacks, Clown Backpacks, and skirt added. +
- Various wizard changes. New Wizard Spell: Mind Swap. Swap your mind with the targets. Be careful, however: You may lose one of your spells. Wizards are no longer part of the crew and get a random name like the AI does. Wizards can change their known spells with their spellbook but only while on the wizard shuttle. +
- Circuit Imprinter: Using disks from the various deparments, new circuit boards and AI modules can be produced. +
- Heat Exchanging pipes added and various pipe/atmos changes. +
- Ghost/Observer teleport now works 100% of the time. +
- You need an agressive grip to table now, as well as being within one tile of the table (to nerf teletabling). +
- Teleport only runs once at the beginning of the round, hopefully reducing the lag in wizard rounds. +
- Wizards can't telepot back to their shuttle to afk now. +
- Someone added it a while ago and forgot to update the changelog - syndies in nuke need to move their shuttle to the station's zlevel first. +
- Bunch of other stuff. +
- Bug fixes, not going into detail. Lots and lots of bug fixes, mostly regarding the new map +
- CMO has a more obvious lab coat, that looks nicer than the original +
- CMO also has a stamp now +
- QM has a denied stamp +
- Cyborgs got tweaked. Laws only update when checked. Also have wires that can be toyed + with for various effects, including AI sync, and law control +
- Second construction site similar to the original +
- Prison station has been tweaked, now includes a lounge, and toilets +
- Detective's revolver starts with a reasonable number of bullets +
- Prison teleporter to the courtroom now exists +
- AI related stuff: More cameras, oh, and bug fixes! +
- Emergency storage moved +
- Random AI law changes. New law templates, and variables. Old variables were tweaked and some of the crappy templates were removed +
- Ghosts can teleport to the derelict now +
- Respriting of a bunch of stuff as well as graphical fixes +
- Kitchen is attached to the bar again +
- General map tweaks and fixes +
- Wardens fixed for rev rounds +
- 5-unit pills now work +
- APCs added and moved +
- Cola machine added. Contains various flavours of soda. Also added new snacks to the now named snack machine. Water cooler added, just apply an empty glass to it +
- Salt & Pepper have been added, as part of the food overhaul +
- More bug fixes. There was a lot +
- Cruazy Guest's map is now live. +
- Entire station has been rearranged. +
- Prison Station added, with Prison Shuttle to transport to and from. +
- New Job: Warden. Distributes security items. +
- The new map is still in testing, so please report any bugs or suggestions you have to the forums. +
- AI Liquid Dispensers, Codename SLIPPER, have been added to the AI core. They dispense cleaning foam twenty times each with a cooldown of ten seconds between uses. Mounted flashes have also been included. +
- Clown stamp added to clown's backpack. +
- Major food/drink code overhaul. Food items heal for more but not instantly. Poison, Drug, and "Heat" effects from food items are also non-instant. +
- Preperation for one-way containers and condiments. +
- New Reagents: Nutriment, Ketchup, Soysauce, Salt, Pepper, Capsaicin Oil, Frost Oil, Amatoxin, Psilocybin, Sprinkles +
- New Food Item: Chaos Donut: 1 Hot Sauce + 1 Cold Sauce + 1 Flour + 1 Egg. Has a variable effect. NOT DEADLY (usually). +
- New Drug: Ethylredoxrazine: Carbon + Oxygen + Anti-Toxin. Binds strongly with Ethanol. +
- Tape Recorders added! Now you can actually PROVE someone said something! +
- Amospherics Overhaul Started: It actually works now. You can also build pipes and create function air and disposal systems! +
- Walls are now smooth. +
- Alcohol no longer gets you as wasted or for as long. +
- QM job split into QM and Cargo Technicians. QM has his own office. +
- Doors can no longer be disassembled unless powered down and unbolted. +
- New Job: Chief Medical Officer. Counts as a head of staff and is in charge of medbay. Has his/her own office and coat. +
- Wizarditis Bottle no longer in virus crate. +
- The ban appeals URL can now be set in config.txt +
- Secret mode default probabilities in config.txt made sane +
- Admin send-to-thunderdome command fixed to no longer send people to the other team's spawn. +
- Having another disease no longer makes you immune to facehuggers. +
- Magboots are now available from EVA. +
- Changeling death timer shortened. Destroying the changeling's body no longer stops the death timer. +
- Cult mode fixes. +
- Fixed cyborgs pressing Cancel when choosing AIs. +
- The play MIDIs setting now carries over when ghosting. +
- Admins can now see if a cyborg is emagged via the player panel. +
- PAPERWORK UPDATE v1: Supply crates contain manifest slips, in a later update these will be returnable for supply points. +
- The Supply Ordering Console (Request computer in the QM lobby) can now print requisition forms for ordering crates. In conjunction with the rubber stamps, these can be used to demonstrate proper authorisation for supply orders. +
- Rubber stamps now spawn for each head of staff. +
- The use of DNA Injectors and fueltank detonations are now admin-logged. +
- Removed old debug code from gib() +
- Finished work on the "cult" gamemode. I'll still add features to it later, but it is safe to be put on secret rotation now. +
- Added an energy cutlass and made a pirate version of the space suit in preparation for a later nuke update. +
- Changeling now ends 15 minutes after changeling death, unless he's ressurected. +
- Further fixing of wizarditis teleporting into space. +
- Fixed the wise beard sprite. +
- Fixed missing sprite for monkeyburgers. +
- Fixed Beepsky automatically adding 2 treason points to EVERYONE. + +
- Sleepers and disposals now require two seconds to climb inside + +
- Hydroponics crate ordered in QMs doesnt spawn too many items +
- Replacement lights crate can be ordered in QM. +
- Added space cleaner and hand labeler to Virology. +
- Welder fuel tanks now explode when you try to refuel a lit welder. +
- Made clown's mask work as a gas mask. +
- 9 new cocktails: Irish Coffee, B-52, Margarita, Long Island Iced Tea, Whiskey Soda, Black Russian, Manhattan, Vodka and Tonic, Gin Fizz. Refer to the wiki for the recipes. +
- Kitchen update:
+
-
+
- -New Microwave Recipies: Carrot Cake (3 Flour, 3 egg, 1 milk, 1 Carrot), Soylen Viridians (3 flour, 1 soybeans), Eggplant Parmigania (2 cheese, 1 eggplant), and Jelly Donuts (1 flour, 1 egg, 1 Berry Jam), Regular Cake (3 flour, 3 egg, 1 milk), Cheese Cake (3 flour, 3 egg, 1 milk), Meat Pies (1 meat of any kind, 2 flour), Wing Fang Chu (1 soysauce, 1 xeno meat), and Human and Monkey Kabob (2 human or monkey meat, metal rods). +
- - Ingredients from Processor: Soysauce, Coldsauce, Soylent Green, Berry Jam. +
- - Sink added to kitchen to clean all the inevitable blood stains and as preperation for future cooking changes. +
- - The food processor can't be abused to make tons of food now. +
+ - Multiple tweaks to virology and diseases:
+
-
+
- - Added wizarditis disease. +
- - Spaceacillin no longer heals all viruses. +
- - Some diseases must be cured with two or more chemicals simultaneously. +
- - New Virology design including an airlock and quarantine chambers. +
- - Made vaccine bottles contain 3 portions of vaccine. +
- - Lots of minor bug fixes. +
+
+
+
+
+ - Added virology profession with a cosy lab in northwestern part of medbay. +
- Virology related things, like taking blood samples, making vaccines, splashing contagious blood all over the station and so on. +
- Added one pathetic disease. +
- Virus crates are now available from the quartermasters for 20 points. +
- The DNA console bug (issue #40) was fixed, but I still made the DNA pod to lock itself while mutating someone. +
- Added icons for unpowered CheMaster and Pandemic computers +
- Added some sign decals. The icons were already there, but unused for reasons unknown. +
- Some map-related changes. +
- Crawling through vents (alien) now takes time. The farther destination vent is, the more time it takes. +
- Cryo cell healing ability depends on wound severity. Grave wounds will heal slower. Use proper chemicals to speed up the process. +
- Added sink to the medbay. +
- Bugfixes:
+
-
+
- - Some reagents were not metabolized, remaining in mob indefinitely (this includes Space Cola, Cryoxadone and cocktails Kahlua, Irish Cream and The Manly Dorf). +
- - Fixed placement bug with container contents window. Also, utility belt window now doesn't obscure view. +
+ - Scrubbers in the area can be controlled by air alarms. Air alarm interface must be unlocked with an ID card (minimum access level - atmospheric technician), usable only by humans and AI. Panic syphon drains the air from affected room (simple syphoning does too, but much slower). +
- Sleeper consoles inject soporific and track the amounts of rejuvination chemicals and sleep toxins in occupants bloodstream. +
- Flashlights can be used to check if mob is dead, blind or has certain superpower. Aim for the eyes. +
- Radiation collectors and collector controls can be moved. Secured\unsecured with a wrench. +
- Air sensors report nitrogen and carbon dioxide in air composition(if set to). +
- Air Control console in Toxins. +
- Additional DNA console in genetics +
- Enough equipment to build another singularity engine can be found in engineering secure storage +
- Air scrubber, vent and air alarm added to library +
- Air alarm added to brig +
- Air scrubbers in Toxins turned on, set to filter toxins +
- Empty tanks, portable air pumps and similar can be filled with air in Aft Primary Hallway, just connect them to the port. Target pressure is set by Mixed Air Supply console in Atmospherics (defaults to 4000kPa). +
- Fixed the Librarian's suit - its worn iconstate wasn't set. +
- Fixed some typos. +
- Monkey crates are now available from the quartermasters for 20 points. +
- Corpse props removed from zlevel 8 as they were causing issues with admin tools and the communications intercept. +
- Cleaned up the default config.txt +
- Added a readme.txt with installation instructions. +
- Changed the ban appeals link to point to our forums for now - this'll be a config file setting soon. +
- Fixes to various nonworking cocktails. +
- More map and runtime error fixes. +
- Nuke operative headsets should be on an unreachable frequency like department headsets. +
- Another AI Malfunction change: Now once the AI thinks enough APCs have been hacked, it must press a button to start the timer, which alerts the station to its treachery. +
- Blob reskinned to magma and increased in power. +
- The HoS now has an armored greatcoat instead of a regular armor vest. +
- Admin logs now show who killswitched a cyborg. +
- The roboticist terminal now lets you see which AI a cyborg is linked to. +
- Malf AIs are no longer treated as inactive for the purpose of law updates and cyborg sync while hacking APCs. +
- Traitor AIs are now affected by Reset/Purge/Asimov modules, except law 0. +
- AI core construction sprites updated. +
- Securitrons removed from the Thunderdome. +
- An APC now supplies power to the bomb testing area, and has external cabling to supply it in turn. +
- A new variant freeform module has been added to the AI Upload room. +
- The changeling's neurotoxic dart has been made more powerful - this will likely be an optional upgrade from a set of choices, akin to wizard spells. +
- Some gimmick clothes moved to a different object path. +
- The chameleon jumpsuit should now be more useful - it includes job-specific jumpsuits as well as flat colours. +
- Bartender update! Bartender now has a Booze-O-Mat vending machine dispensing spirits and glasses, which he can use to mix cocktails. Recipes for cocktails are available on the wiki. +
- The barman also now has a shotgun hidden under a table in the bar. He spawns with beanbag shells and blanks. Lethal ammo is obtainable from hacked autolathes. +
- Dead AIs can once more be intelicarded, however in order to be restored to functionality they must be repaired using a machine in the RD office. +
- Silicon-based lifeforms have metal gibs and motor oil instead of blood. +
- Aliens now have a death message. +
- Intelicarded AIs can now have their ability to interact with things within their view range reactivated by the person carrying the card. +
- New AI cores can be constructed from
victimsvolunteers.
+ - Verbs tweaked. +
- Intelicarded AIs can be deleted. +
- RD office redesigned, and the RD now spawns there. +
- The AI can now choose to destroy the station on winning a Malf round. +
- General bugfixes to AIs, constructed AIs and decoy AIs. +
- Hats no longer prevent choking. +
- Some extra gimmick costumes are now adminspawnable. +
- AI health is now displayed on their status tab. +
- AI upload module now requires you to select which AI to upload laws to in case of multiple AIs. +
- Cyborgs now choose an AI to sync laws with upon creation. +
- Law office redesigned. +
- Roboticists no longer have Engineering access. +
- More fixes to areas which had infinite power due to having no assosciated APC. +
- Meatbread slices are no longer infinite. +
- Malf rounds no longer end if a non-malfunctioning AI is killed. +
- Cigarettes now have directional sprites. +
- AI Core circuitboard spawns in the RD office. +
- AI Satellite now has cameras and properly-wired SMES batteries. +
- Decoy AIs can no longer be moved. +
- Several runtime errors have been fixed. +
- Nuke rounds will now end properly on a station or neutral victory. +
- Riot shields have been nerfed and are now only available in the armory and in riot crates. +
- Foam dart crossbows, cap guns and caps can now be won as arcade prizes. +
- AI Malfunction has been redesigned - the AI must now hack APCs in order to win. More APCs hacked makes the timer tick faster. +
- Hydroponics now has a MULEbot station. +
- Changeling mode has been added to the game and is now in testing. +
- Electrified airlocks should now only zap you once if you bump into them while running. +
- Chemistry and Toxins access has been removed from Botanists. +
- General bugfixes and map tweaks. +
- Riot shields! One in every security closet, and a few in armory. Also orderable from QM. +
- New experimental UI for humans by Skie. Voice out if it has problems or you don't like it. + ---> YOU CAN CHOOSE UI FROM PREFERENCES <--- +
- Hydroponics: Now you can inject chemicals into plants with a syringe. Every reagent works differently. +
- Hydroponics: Added a small hoe for uprooting weeds safely. Botanists now have sissy aprons. +
- New random station/command names and verbs. +
- Dead AIs can no longer be intellicarded and the steal AI objective is now working. +
- Aliens now bleed when you hit them, as well as monkeys. +
- Hurt people and bodies leave blood behind if dragged around when they are lying. Sprites to be updated soon... +
- Fixed several run-time errors in the code. Also food doesn't deal damage anylonger in some cases. +
- Blobs and alien weeds slowed down some. Plant-b-gone buffed some. +
- Fixed monkeys and aliens not being able to deal damage to humans with items. +
- Monkeys now slip on wet floor. +
- The Lawyer now starts in his snazzy new office. +
- Law Office accesslevel added. Currently, the Lawyer and the HoP begin with this. +
- Robotics access can now be added or removed from the HoP's computer. +
- Robotics, the captain's quarters, the cargo lobby and the staff heads office now have APCs and can lose power like the rest of the station. +
- Toxins mixing room is now a separate area for power and fire alarm purposes, as it already had its own APC. +
- Added the Lawyer job. +
- Doors can now be constructed and deconstructed. This is being playtested, expect the specifics to change. +
- Fixed certain jobs which were supposed to have stuff spawning in their backpack that just wasn't getting spawned. +
- Bunch of new announcer sounds added +
- Minor lag fix implementation in the pipe system +
- You can now hear ghosts... sometimes +
- Seed bags and nutrients can now be pocketed +
- New kitchen stuff: New recipes (Meatbread, Cheese, Omelette Du Fromage, Muffins), new chef's knife and trays (Spawn in the meat locker) and milk (spawns in the fridge). Recipes are as follows: + -Cheese: milk on food processor + -Cheese wedge: Slice the cheese wheel with the chef's knife + -Omelette Du Fromage: 2 eggs 2 cheese wedges + -Muffin: 2 eggs 1 flour 1 carton of milk + -Meatbread: 3 meats (whatever meats) 3 flour 3 cheese. Can be sliced. + Cheese_amount is actually displayed on the microwave. +
- Profession-special radio channels now have color. +
- AI card not retardedly lethal anymore, for anyone that didn't notice +
- HYDROPONICS OVERHAUL, credit goes to Skie and Numbers. Wood doesn't have the entity so the tower caps cannot be harvested. For now. +
- Bar is now barman-only, access-wise. No more shall the entire station trump inside the bar and choke the monkey. +
- Prepping ground for Barman update (SPRITE ME SOME GODDAMN BOTTLES) +
- Ghosts can no longer release the singularity. +
- Sprites added in preparation for a Hydroponics update +
- A decoy AI now spawns in the AI core during Malfunction rounds to reduce metagaming. +
- libmysql.dll added to distribution. +
- Aircode options restored to default configuration. +
- AIs properly enter powerloss mode if the APC in their area loses equipment power. +
- Hydroponics crates added to Hydroponics, containing Weed-B-Gone +
- Airlock electrification now actually works properly. +
- Karma database error message updated. +
- Cyborgs choosing the standard module no longer become invisible except for a pair of glowing red eyes. +
- Aliens now have a hivemind channel, accessed like departmental radio channels or robot talk with ':a'. +
- Full donut boxes no longer eat whatever item is used on them and disappear. +
- PDA user interface has been given a graphical overhaul. Please report any problems with it on the issue tracker. +
- Personal lockers are once again available in the lockerroom +
- BUGFIX: Xenoburger iconstate was accidentally removed in an earlier revision. This has been fixed. +
- Some of the default messages have been changed. +
- Additional sprites added for plants and weeds in preparation for an expansion of Hydroponics. +
- A schema script is now available for setting up the SQL database. +
- The Robotics Crate no longer exists. Quartermasters can now order a MULEbot crate for 20 points, or a Robotics Assembly crate for 10 points. The latter provides 4 flashes, 3 proximity sensors, two 10k charge power cells and an electrical toolbox, and requires a roboticist or a head of staff to open. +
- Traitor AIs no longer lose their Law 0 in the event of power loss. +
- Administrators can now toggle the availiabilty of their right-click verbs to prevent accidental usage while playing. +
- Tool Storage vending machine is now a proper object. (code cleanup) +
- Buckets are now available from autolathes. +
- Four generic remote signaller PDA cartridges are now stocked in the Tool Storage vending machine. +
- AI status display density adjusted. +
- Open Source Release Thanks to Mport for releasable singularity code. +
- Cyborgs redone Thanks again to Mport for this, cyborgs are totally different now. +
- Engine Monitor PDA app is now Power Monitor PDA app, and actually works. +
- AI State Laws verb now allows the AI to choose which laws to state, in case of traitor AIs or laws ordering it not to state them. Hopefully this will cut down on 'OMG THE AI IS COPYING AND PASTING' metagaming. +
- Power Monitor circuitboard isn't mislabeled as Mass Driver Control any more. +
- Traitor and Rev-head clowns lose the clumsiness gene - this should make trying to flash people in Rev mode less of an exercise in frustration. +
- A sink has been added to the Fitness room - this lets you wash dirty and bloodstained clothing and equipment. +
- Blast doors and firedoors no longer open by just bumping into them. +
- The bar and kitchen now open onto the same seating area. The old cafeteria area is now used as a lockerroom to replace the old one which was displaced by Hydroponics. +
- The bar now has a space piano with which you can entertain and annoy the crew. +
- LIBRARY A library has been added to the station in the escape arm in order to educate the crew. The new Librarian job is available to manage it. Crewmembers can request and read books, or write and bind their own books for upload to a persistent database. +
- The supply of flashbangs available from Security has been reduced to cut down on people constantly flashbanging the escape shuttle. +
- InteliCards are available in various locations to allow the retrieval of valuable AI personality data in the event of catastrophic station damage. +
- Hydroponics/Botany Added Credit goes to Skie and the folks over at the independent opensource SS13 branch, this is their code. It's lacking a lot, but it's a great start! +
- Way more tweaks than I can remember. Shouldn't wait so long between changelog updates. +
- Singularity Engine Added Oh God we're all going to die (All credit on this one goes to Mport2004) +
- 'Purge' AI module added - purges ALL laws (except for law 0). Will probably change this to a Syndicate only item +
- Cyborgs now spawn with a power cell. Should prevent stupid cyborg deaths (and also pave the way for starting as a cyborg once more bugs are fixed) +
- Examining a player will now tell you if their client has disconnected. +
- Examining a brain will now tell you if it's owner is still connected to the game. +
- Alien Queens can make facehuggers. Facehuggers can make larva. Larva can grow into xenos! Xenos can become queens! The circle of life~ +
- Some powernet bug fixes: Bad list and division by zero. +
- Tweaked crate costs for Quartermaster. +
- Increased metal available in Robotics. +
- Added department-specific headsets. Engineering, Medical, Command, and Security all receive special headsets capable of broadcasting on a standard frequency PLUS a secure frequency only available to headsets of the same type. Precede say messages with ":h" to use. +
- Prayer command added. +
- State Laws command for AI added. +
- Disabled Lockdown command for AI. Too server heavy. +
- Crew manifest and various station databases should properly update when late arrivals join the game, now. +
- Quartermasters will receive 10 points every five minutes. This will probably be nerfed heavily, but we'll give it a shot anyhow. +
- Fixed a bug with doors/airlocks. (Thanks Mport2004) +
-
+ New graphics:
+
-
+
- + Side Facing Sprites: Player sprites will now face in all directions when moving. Holy shit! + +
+
+ -
+ New features:
+
-
+
- + Disposal System: The station now has a fully functional disposal system for throwing away nuclear authentication disks and old, dirty clowns. + +
- + Breakable Windows: Windows are breakable by projectiles and thrown items (including people), shards hurt your feet. + +
- + Status Display: Station escape shuttle timers now function as status displays modifiable from the bridge. + +
- + Space Heater: Space heaters for heating up cold spaces, in space. +
+ -
+ New items:
+
-
+
- + Welding Mask: Helps engineers shield their eyes when welding. + +
- + Utility Belt: Function as toolboxes equippable in the belt slot. + +
- + Mouse Trap: Hurt your feet, especially if you aren't wearing shoes! + +
- + Power Sink: Traitor item that rapidly drains power. + +
+ -
+ New graphics:
+
-
+
- + North Facing Sprites: Player sprites will now face north when moving north. + +
- + Hidden Pipes: Pipes are now hidden underneath floor tiles. + +
+ -
+ New robot: Medibot
+
-
+
- + Automatically attempts to keep crewmembers alive by injecting them with stuff. + +
+ -
+ New robot: Mulebot
+
-
+
- + Allows quartermasters to automatically ship crates to different parts of the station. + +
+ -
+ Changes:
+
-
+
- + Atmos system GREATLY OPTIMIZED! + +
- + Brand new station layout! + +
- + Robust chemical interaction system! + +
- + HOLY FUCK PLAYING THIS GAME ISN'T LIKE TRODDING THROUGH MOLASSES ANYMORE + +
- + Feature: If two players collide with "Help" intent, they swap positions. + +
+ - + OH NO STRANGLING GOT NERFED: Insta-strangling (hopefully) removed. Victim no longer instantly loses consciousness. + +
-
+ Cloning Machine: The Geneticist spilled coffee on the Genetics Machine's revival module and it was too costly to replace!
+
-
+
- + Clones may or may not have horrible genetic defects. + +
+ - + New feature: Obesity from overeating in a short period of time. + +
- + New feature: Station destruction cinematic if the crew loses in AI Malfunction or Nuclear Emergency. + +
-
+ New Position: Tourist
+
-
+
- + Centcom has entered the lucrative business of space tourism! Enjoy an event-filled vacation on the station, and try not to get killed. + +
- + Guest accounts are now restricted to selecting Tourist in Character Setup. + +
+ - + AI: Added 30 second cooldown to prevent spamming lockdowns. + +
- + Feature: Character preview in Character Setup! + +
- + New item: Drinking glasses that you can fill with water. + +
- + Feature: Sounds now pan in stereo depending on your position from the source. + +
- + Traitor tweak: Agent cards can now be forged into a fake ID. + +
- + Supply Dock 2.0: The Supply Dock has been redesigned and now features conveyer belts! Amazing! + +
- + New uniforms: The Research Director, Chief Engineer, and the research jobs have new uniforms. The Head of Security has a cool new hat which happens to be his most prized possession. + +
- + Merged research: The first act of the Research Director is to merge Toxins and Chemistry into a single Chemical Lab. Hooray! + +
- + Robot tweak: You can now observe robots using the observe command. + +
- + Stamps: The heads now have stamps to stamp papers with, for whatever reason. + +
- + Supply Shuttle 1.0: Now you can order new supplies using Cargo Bay north of the autolathe. + +
- + New containers: The game now features a variety of crates to hold all sorts of imaginary space supplies. + +
-
+ New position: Quartermaster
+
-
+
- + A master of supplies. Manages the cargo bay by taking shipments and distributing them to the crew. + +
+ -
+ New position: Research Director
+
-
+
- + The head of the SS13 research department. He directs research and makes sure that the research crew are working. + +
+ -
+ New position: Chief Engineer
+
-
+
- + Boss of all the engineers. Makes sure the engine is loaded and that the station has the necessary amount of power to run. + +
+ -
+ New robot: Securibot
+
-
+
- + Automatically stuns and handcuffs criminals listed in the security records. It's also really goddamn slow. + +
+ - + New jumpsuits: Engineers and Atmos Techs have new jumpsuits to distinguish between them easier. + +
- + Monkey AI 2.0: Monkeys will now get angry, going after random human targets with the ability to wield weapons, throw random objects, open doors, and break through glass/grilles. They're basically terminators. + +
-
+ New gamemode: Monkey Survival
+
-
+
- + Survive a horde of angry monkeys busting through the station's airvents and rampaging through the station for 25 minutes. + +
+ -
+ New robots: Cleanbot and Floorbot
+
-
+
- + Cleanbots automatically clean up messes and Floorbots repair floors. + +
+ -
+ New spell: Mindblast
+
-
+
- + Causes brain damage, progressively causing other players to become even more retarded. + +
+ -
+ Alien Races
+
-
+
- + Wizards may randomly spawn as illithids, who gain Mind Blast for free, and nuke agents may randomly spawn as lizardmen. + +
+ - + Station shields: The station now has a toggleable forcefield that can only be destroyed by meteors or bombs. Takes a lot of station power to use. + +
- + Traitor scaling: Number of traitors/wizards/agents now scales to number of players. + +
-
+ New food item: Donk pockets
+
-
+
- + Delicious and microwavable, gives a bigger health boost for traitors. + +
+ - + Cigarettes: Now you can fulfill your horrible nicotine cravings. The detective starts with a zippo lighter and pack of cigarettes. Other packs can be be obtained via vending machines. + +
- + Warning signs: The station is now filled with various warning signs and such. + +
- + Updated graphics: Many, many objects have had their graphics updated including pipes, windows, tables, and closets. HUD graphics have been updated to be easier to understand. + +
- + Lighting fixes: New turf is now correctly lit instead of being completely dark. + +
- + Meteor fixes: The code and graphics for meteors has been fixed so the meteor gametype is more playable, sort of. + +
- + Escape shuttle fix: The shuttle can now be called in Revolution and Malfunction, but the shuttle will be recalled before it arrives. This way players can no longer call the shuttle to figure out the game mode during secret. + +
- + Changelog updated: New changelog entry for Thanksgiving thanks to Haruhi who will probably update the changelog from now on after almost a month of neglect. + +
- + Bug fix: Made most pop-up windows respect the close button. + +
- + Randomized naming: Names for Central Command and Syndicate are now randomized. + +
- + Bug fix: PDAs had their code cleaned up. Notice any problems? Report them. + +
- + New syndicate item: Detomatix Cartridge, allows remote detonation of PDAs (rather weak explosion)! + +
- + Feature: Remotely detonating PDAs has a chance of failure depending on the PDA target, a critical failure will result in the detonation of your own PDA. + +
- + Gibbing update: Gibbing stuff has been rewritten, robots now gib nicer. + +
- + LIGHTING!!!: The station now has dynamic lighting and associated items. + +
- + Poo v1.0~: This has caused many ragequits. + +
- + Flushable toilets: You can now use toilets to place your vile, disgusting and irreprehensible excretions (you disgusting children). Just be careful what you flush! + +
- + Feature: Emergency oxygen bottles can be clipped to your belt now. + +
- + Clothing update: Bedsheets are now wearable. + +
- + Updated HUD: A few minor tweaks to the inventory panel. Things might not be exactly where you're used to them being. + +
-
+ New position: Chef
+
-
+
- + Maintains the Cafeteria, has access to Kitchen and Freezer, Food creation will be in shortly. + +
+ - + Food update: Food items now heal Brute/Burn damage. The amount recovered varies between items. + +
- + AI laws update: Nanotrasen has updated its AI laws to better reflect how they wish AIs to + operate their stations. + +
- + Traitor item change: E-mag renamed to Cryptographic Sequencer. + +
- I'm really sorry everyone I just HAD to add a gib all verb. +
- Decided to add the creation of bombs to bombers list +
- Made the new bombing list EVEN BETTER!!! +
- Fixed a bug with admin jumping AND the traitor death message +
- Oops, fixed a bug that returned the right click pm thing thinking the admin was + muted. +
- Made a new improved way of tracking who bombs shit. +
- More formatting shit. +
- Fixed up some mute code and made it so that if a player is muted they cannot PM + us. +
- Adminhelps now logged in the admin file not ooc +
- Changed the way admin reviving is dealt with. (It was coded kind of weirdly + before) +
- Added a few areas to the observe teleport. Fixed some adminjump things. Modified + the paths of some areas. +
- You can now ban people who have logged out and admins can now jump to people + using the player panel. +
- Added in jump to key coded in a much better way than showtime originally did it. +
- Fixed magical wind when laying pipes. They start out empty!! +
- Made blink safer. Fixed the crew-quarters to ai sattelite teleport problem. +
- Forgot the message again. Added an emp spell. thanks copy&paste. +
- OH MY GOD I HAVE RUINED ASAY +
- Added electronic items to the pipe dispenser +
- fixed a formatting error with the changelog (I didn't break it, it was showtime) +
- Fixed a formatting error +
- Cleaned up sandbox object spawn code +
- New and improved admin log so we can keep an eye on these fuckers +
- Fixed adminjump because I realise most people use it for the right click option +
- Mushed together jump to mob and jump to key +
- Fixed a compilation error and made my test room more secure! +
- Multitools can now be used to measure the power in cables. +
- Fixed a bug where the canister message would repeat and spam the user when + attackby analyzer. Fixed an admin formatting error. +
- Replaced all range checks with a in_range proc. pretty good chance I broke + something or everything. +
- Mutations use bitfields +
- Fixed a bug with my traitor panel. +
- Fixed the turrets, ruined Pantaloons map (test map). Did some things with + turrets and added a few areas. +
- Some stuff in here you know the usual shit. Bugfixes, formatting etc. +
- Stunbaton nerf. +
- Tempban longer than 1 year -> permaban. +
- Turfs > spawnable. +
- Shaking someone now slowly removes paralysis, stuns and the 'weakened' stuff. +
- CTF flags now check if someone has them equipped every 20 seconds, if they are + not then they delete themselves and respawn. +
- Fixed the r-wall-welder-message-thing. +
- Change to the CTF code, flag captures can now only happen if your team has their + flag in the starting position. +
- Pruning my test room. +
- Instead of the red and green team its now the American and Irish teams! +
- BACKUP BACKUP TELL ME WHAT YOU GONNA DO NOW Changed the monkey name code. Re-did + my antimatter engine code so it actually puts out power now +
- Fixed a bug that gave everyone modify ticker variables you silly sausage. +
- Sorted the AIs track list. +
- Constructable filter inlets and filter controls. +
- Added in admin messages for when someone is banned. +
- Bannana and honk honk. +
- Pipe construction now works completely. //Nannek +
- Many many other things that never gets recorded in the changelog!! +
- The Michael Jackson Memorial Changelog Update +
- Pipe filters adjusted for more ideal environmentals //Pantaloons +
- Added in job tracking //Showtime +
- Crew Manifest and Security Records now automagically update when someone joins //Nannek +
- Fixed a bug where sometimes you get a screwdriver stuck in your hand //Pantaloons +
- Flamethrowers can now be disassembled //Pantaloons +
- OBJECTION! Added suits and briefcases //stuntwaffle +
- Added automatic brig lockers //Nannek +
- Added brig door control authorization and redid brig layout //Nannek +
- Emergency toolboxes now have radios and flashlights, and mechanical toolboxes now have crowbars //Pantaloons +
- New whisper system //lallander +
- Some more gay fixes //everybody +
- Some really cool fixes //everybody +
- Really boring code cleanup //Pantaloons +
- ~~In Loving Memory of MJ~~ Sham on! +
- Looking back through the SVN commit log, I spy... +
- Keelin doing some more performance enhancements +
- Fixed one person being all 3 revs at once (hopefully) +
- Some gay fixes +
- New admin system installed +
- Fixed a bug where mass drivers could be used to crash the server +
- Various pipe changes and fixes +
- Death commando deathmatch mode added. +
- Ghosts can no longer wander from space into the dread blackness that lies beyond. +
- Those other losers probably did a bunch of other stuff since May 6th but they don't comment their revisions so fuck 'em. +
- Crematorium +
- Goon? button makes all your dreams come true. +
- Restructured medbay +
- Does anyone update this anymore? +
- New atmos computer promises to make atmos easier +
- Autolathe +
- Couple of map changes +
- Some computer code reorganised. +
- I'm pretty sure theres a couple things +
- Weld an open closet (only the normal kind), gayes. +
- Chaplin has a higher chance of hearing the dead. +
- New traitor objective +
- Power traitor objective removed +
- New job system implemented for latecomers. +
- Head of Research quits forever and ever, is replaced by Head of Security (who gets his own office) +
- Admins are now notified when the traitor is dead. +
- Unprison verb (again, for admins). +
- Medical redone, doctors do your jobs! (Tell me what you think of this + compared to the old one) +
- Clickable tracking for the AI +
- Only the heads can launch the shuttle early now. Or an emag. +
- Sounds. Turn on your speakers & sound downloads. +
- Scan something with blood on it detective. +
- A large icon for the headset, no reason it should be so small. +
- Emergency closets now spawn an 'emergency gas mask' which are just recolored gas masks, no other difference other than making it obvious where the gas mask came from. +
- Constructable rocket launchers: 10 rods, 10 metal, 5 thermite and heated plasma from the prototype. +
- Emergency closets have randomized contents now. +
- Fixed a bug where someone who was jobbaned from being Captain could still be picked randomly +
- Fixed a bug where monkeys couldn't be stunned. +
- Change mode votes before game starts delays the game. +
- The brig is now pimped out with special new gadgets. +
- Upgraded the admin traitor menu. +
- GALOSHES! +
- A certain item will now protect you from stun batons, tasers and stungloves when worn. +
- Say / radio / death talk systems recoded, hopefully improving it. +
- Announcements of late joiners are now done by the AI if it's alive :-) +
- Random station names. +
- Changes to the message stylesheet. +
- Admin messages in OOC will now be colored red. +
- Added a command to list your medals. +
- ETA no longer shows when it doesn't matter. +
- Nerfed the ability to spam shuttle restabalization. +
- Fixed the 'Ow My Balls!' medal to only apply from brute damage rather than both brute and burn damage. +
- Job banning. +
- Genetic Researcher renamed to Geneticist. +
- Toxins Researcher renamed to Scientist. +
- Help reformatted. +
- Fixed a bug where combining bruise packs or ointments resulted in an incorrectly combined amount. +
- Renamed memory and add memory commands to Notes and Add Note. +
- Medals! MEDALS! +
- Trimmed the excessively long changelog. +
- Janitor job complete! Report any bugs to adminhelp +
- Wizard now needs his staff for spells +
- Be careful with APCs now okay?! +
- Fixed Memory and made it more efficient in the code +
- Crowbars now open apcs, not screwdrivers. They do something else entirely +
- Hackable APCs +
- When APCs are emagged they now stay unlocked +
- Re-did a shit tonne of admin stuff +
- New admin system is pretty much finished +
- FINALLY backpacks can now be looked in while on the ground. +
- Ghosts no longer able to open secret doors +
- Suicide vests now work as armor +
- Blood no longer comes out of the guy if you pull him due to lag +
- Admin panel has been touched up to include html tables +
- Mines now added, only spawnable right now however +
- Fixed the syndicate nuclear victory bug +
- Wizard now spawns with wizard outfit which he must wear to cast spells +
- Blood bug fixes +
- Fixed a retarded bug that meant I didn't have the power to kick admins +
- THUNDERDOME! +
- Several new facial hair options and a bitchin' mohawk +
- Blood by Culka +
- Nuke disk now spawns in ALL game modes so that during secret rounds the syndicate now have the element of surprise! +
- Implemented unstable's "observer" mode +
- Halerina's wizard mode +
- Non-interesting stuff +
- Began addition to the new admin system - right now only available to coders for testing +
- Admins can now click on the multikeying offenders name to pm them, instead of hunting for them in the pm list +
- Halerina's chemistry system +
- You can now deathgasp without being dead, hopefully so people can fake their own deaths. +
- Redid Medlab +
- New chemist job +
- New DNA system. 200th Revision special. +
- Various bugfixes +
- Maze +
- Added a new game mode into rotation. +
- Added an AI satellite +
- Lockdowns can be disabled with the communications console +
- Prison shuttle can be called on the comm console, but only if its enabled by admins first +
- When you slip into space you'll have a 50% chance of going to z=4 instead of z=3 +
- Fixed Cakehat +
- Dead people can now see all turfs, mobs and objs not in their line of sight. +
- Modified the map slightly +
- Stungloves can now be "made" +
- Flashes can now have their bulbs burning out. +
- Batons can now be turned on and off for different effects. They also now have 10 uses before they need to be recharged. +
- Fixed all the autoclose bugs +
- Due to it being myself and Keelin's 100th revision we have added a super-secret special item. Don't ask because we won't tell! Figure it out! +
- Modified doors in engineering so that they do not autoclose - Autoclose now handled by a variable +
- Fixed toxin researcher spawn bug +
- Changed the "You hear a faint voice" message. +
- Gave the host new commands to disable admin jumping, admin reviving and admin item spawning +
- Fixed some airlock autoclose bugs +
- Changed some doors to not autoclose. +
- Nerfed the toolbox down. +
- Doors now close after 15 seconds +
- Fixed some p cool bugs +
- Cakehat +
- Added another suit +
- Walls now take 5 seconds to build +
- Added sam0rz, thesoldierlljk and kelson's revolution gamemode. Thanks guys! +
- Fixed a couple of bugs +
- Improved bar ;) +
- Beer acts like pills and syringes +
- Added 'Make AI' Option for Admins +
- Added dissolving pills in beer (cyanide and sleeping pills) +
- Modified engine AGAIN, but personally I love it now +
- Moved bar due to popular demand +
- Captains room is now a security checkpoint +
- Assistants now have access to maint tunnels again +
- Courtroom +
- Engine has been redone slightly to make it easier to load +
- Nerfed beer a lot more +
- Added a bartender job + Bar +
- Captains panic room +
- Voice changer traitor item +
- Bartender suit +
- Made taking a table apart take longer +
- Balanced beer a bit more. +
- Assistants can no longer open external air locks and maint tunnels, sorry guys. Get a job you bums. +
- Engineers CAN access external air locks and maint tunnels. +
- Fixed traitor AI bug +
- Added traitor menu for admins - The ability to turn people into "traitors" as well as keep track of their objectives. +
- Implemented Keelins revive system - Primary Admins can now revive people. +
- Moved and redid security to prevent clusterfucks and everyone just crowding around security. +
- Redid the brig to make it bigger and so that people can break others more easily out since it isn't right in security. +
- Moved and redid captains quarters/heads quarters. Captains made much smaller and heads is now more of a meeting room. +
- Added Stungloves and an axe - right now only admin spawnable. +
- Implemented Persh's adminjump back in - admins can now jump to set locations. +
- Added a feature that if someone logs off their character moves around and says things - Change what they say from the config/names/loggedsay.txt file. +
- Added in adminwho verb - tells the user if there are any admins on and who they are. +
- Freedom implant has been changed so that it will have a random emote associated with it to activate it rather than always chuckle. +
- There is now a pinpointer tool for use in Nuclear Emergency. It works similar to the existing locator, in that it will detect the presence of nuclear disks and in what direction it is. +
- The nuke being detonated in Nuclear Emergency should now properly end the game. +
- Spacesuits now cause you to move slower when not in space. +
- Syndicate in Nuclear Emergency now have syndicate-themed spacesuits. +
- Blob mode should properly end now. +
- Syndicate Uplink has been changed up, allowing traitor more freedom in his ability to be... traitorus. +
- Syndicate Uplink can now spawn a ammo-357, syndicate card, energy sword, or timer bomb. +
- Fixed an issue where Syndicate Uplink looked different than a normal radio. +
- You can choose to be a nudist now. +
- Facial hair! +
- Added constructable flamethrowers. +
- Redid internal naming scheme for human/uniform sprites. +
- Helmet visors are now translucent. +
- Held item graphics corrected for basically everything, internally only uses one dmi file instead of two. +
- Config settings reorganized for.. organization. +
- Seperated male and female names. +
- Females have pink underwear. +
- Guests can no longer save/load profiles, as this just created useless profiles that weren't used again. +
- fixed a gulag stacking machine exploit that would let you farm points with minimal or no ores mined. +
- Backup objectives shouldn't disappear anymore +
- Cleaned up cryopod objective handling
- Changed explosion sound code to be more noticeable and terrifying throughout the station during siginificant explosive events. +
- Unintentional spins and flips no longer cause confusion.
- Removed the old autolathe UI -
- TGUI autolathe UI -
- Multiple users can browse autolathe UI without seeing the same tabs. -
- You can now eject materials from an autolathe -
- You can now queue items in an autolathe -
- You can now toggle continuous fabrication mode on an autolathe queue, or an item in the autolathe queue meaning it will build repeatedly until the autolathe runs out of materials. -
- Trigger build wire on autolathes -
- Autolathe queue -
- Autolathe ejection direction. +
- Cyborg mesons work similarly to human mesons by showing dark areas +
- Fixed a minor typo in Show/Hide GhostLaws.
- Changed the view width to 17x15 -
- Mirage borders sometimes not working properly -
- Proper zooming out procs. +
- Toxins will no longer bomb the MetaStation Exploration Shuttle at roundstart.
- fixes icon issue with "The Mad's labcoat" +
- A small commemoration to our former LRP server, golden, is now on the captain's laser gun.
- Made auto viewport fit default +
- Fixes fairygrass shuttle flight runtime
- Reply pop-up in stealth mode will no longer reveal your orinigal ckey. +
- Brig timer presets and max durations can be modified in the config +
- The economy flag hasn't done anything for over a year, and has been removed.
- Syndicate encryption key is restricted on incursion gamemode -
- Syndicate mega bundle is no longer restricted on incursion gamemode. +
- body only records are now clearer +
- body only records persist after cloning
- Small tweaks to brig phys locker and loadout. +
- Ash heretics immune to being set on fire
- Airlocks to bridge and other high security areas such as the heads' offices, EVA, teleporter and gateway now start reinforced with plasteel. +
- IPC blood trails are black now
- Moved the engineering shower heads outside of the blast doors +
- Boxstation's turbine and toxins burn chamber airlocks will now pressurise and depressurise correctly, no longer softlocking you.
- Contaminated objects will now glow bright green until cleaned, remember to quarantine rouge free golems. -
- Buffed rad goggles in general, the text lasts longer, is brighter, and will show more then twice as far away -
- Fixed the text from radiation goggles not showing above mobs +
- small misstype from tesla code
- Felinids can laugh +
- Syndicate listening outpost ruin part.
- Limbsnakes - new changeling abilty +
- Adds Paper Cup recipe to the Misc tab
- No more instagib glass tables. +
- More list related WireMod components. +
- The index component now has more features. +
- The component printer now has a list component category
- Paramedics now have EVA access +
- Syndicate implants are now hidden from health scans +
- Added inhand icons for the energy saw
- Circuits can no longer be exploited to make super bombs. +
- Kills the "Synth" species
- Adds blood filter to lavaland syndicate base +
- curators can now print paintings +
- persistent paintings +
- AIs can now pick paintings as their screens +
- tgui canvases
- Kilo is back in rotation -
- Added Gamepad bindings +
- Cyborg B.o.r.i.s. installation now checks for if the chest has a cell, just like how it does with MMIs.
- new phasic scanner sprite. +
- Emitters that don't use power won't warn about powernets.
- Adds a 5-minute cooldown to non antagonist related ghost roles if the client has more than 2 deaths or has committed suicide. -
- Replaces spaces in hilbert's hotel with tabs +
- The Decal Painter is now available at protolathes and autolathes for you to paint decals.
- Bee downstreams can now decide to automatically block you from joining if you're banned from bee. +
- Cleans up species outfit code.
- borg cutters work now and cant weld. +
- Wizarditis now functions correctly at high stages. +
- Resetting the thunderdome no longer breaks it. +
- The viral extrapolator can no longer be used at a distance.
- Syndicate medical defib padels can now be equipped -
- Tweaked lootbox TC allocation algorithm and added in funny roll 1 message -
- Runtime on TGUI failing to load. -
- fusion is no longer caused by hotspot react() -
- fire probably became a tiny tiny bit faster +
- When offering a renaming potion to someone it now no longer says that you are giving the potion to yourself but it now properly gives the name of the person you are handing it to.
- Added several new donk pocket types, and boxes, including sprites for each of course. Spicy-Pocket,Teriyaki-Pocket, Pizza-Pocket,Honk-Pocket,Gondola-Pocket and Berry-Pocket. This includes re-organizing them from the OTHER section in snacks_pastry.dm to a donk pocket section. Thanks to Farquaar for the box icons and some of the code! As well as latots for the donk pocket icons. -
- Added a Donk Pocket Variety crate, for 2000 credits, which includes 3 randomly selected donk pocket box types, excluding Gondola-Pocket. -
- Added a recipe for each new Donk Pocket type. -
- Added the new Donk Pocket types to the maint loot table. -
- Donk Pocket loot spawner object, credit to TheVekter for that, which was then added into the kitchens of all the main maps. -
- All Donk Pockets now follow the same naming scheme of X-Pocket. -
- Added craftable Donk Pocket boxes. +
- New sprites and inhands for radiation and combat medkits, tweaked sprites for the biohazard toxin medkit +
- Makes regular prescription glasses printable at a Medical Protolathe +
- Adds craftable prescription versions of medical, security and diagnostic HUDglasses, science goggles and meson scanners +
- Makes the Blood Cult Zealot's Blindfold correct nearsightedness when in use +
- Resprites the original prescription medical HUDglasses and adds equivalent sprites for the rest
- Resonators now detonate all their sonic blasts on use. -
- Plasma cutters consume more plasma now. +
- The chameleon projector now projects objects with overlays, such as computers and holosigns, correctly.
- Added plasma cutter module for mining cyborgs +
- Added some useful items to the debug outfit
- the cost and resistances of ling armor; it is now a loud anti projectile defense. +
- fixed layer manifold runtime
- Coder Socks +
- slime pylons no longer kill toxinlovers/slimepeople
- Now you can set transit fly direction for custom shuttle +
- fixed incursion implant not exploding (thanks pricklytomato!)
- Makes locker doors animated +
- Removed the extra light switch from Box Station's research lab +
- Re-added the access requirement to Pubby's RD office
- Ambience sometimes just not playing fixed -
- Putting items in plants by just clicking the plant +
- Added a few new buildmode modes. Outfit, to quickly apply or remove outfits. Delete, to quickly delete any atoms. Slightly overhauled the copy proc used here and in supply pods, now compatible with most mobs.
- Megafauna once again gibs immortal miners +
- super soldiers get hair
- Added an emag act to the mech-mounted disabler, emag to make it lethal -
- Moved mech weapons from mech fabricator to sec protolathe +
- Fixed pAI loudness booster to work when not in holoform +
- Fixed garbage collection for songs, making the game slightly faster +
- You may now change the sound of certain instruments with a selection of appropriate variations, similarly to the piano synth +
- Fixed accordion not working +
- Adds a hidden fun instrument
- firelocks open 60% faster. -
- halved the time it takes to open a firelock by crowbar. -
- reduced the time it takes for a firelock to close automatically -
- You can now pry open the firelocks with your bare hand. +
- Adds cherry bulbs and fairygrass as new mutations of cherries and grass +
- Adds pink, yellow, green, blue and purple bioluminescence traits to cherry bulbs, holymelons, omega weed, fairygrass and moonflowers +
- Adds colored fairygrass tiles based on their bioluminescence trait +
- New grass and fairygrass sprites
- Plating no longer disappears when you build walls with spells! +
- Adds three new pAI holochassis: carp, bee and phantom! +
- Adds inhands and head-worn sprites for all other pAI chassis that were missing them
- sentient gorillas can now break stuff whilst on harm intent, but cant pick stuff up and such -
- hyperperspiration thresholds lowered, new threshold added. -
- ducatopod now synthesizes lube +
- fixes disease names
- Custom ship navigation computer now get offsets and view range depends on ship size. +
- fixed necroseed runtime +
- symptoms on death is now triggered by disease itself using signals +
- action speed modifier refactored into modifier system, similar to movespeed.
- stam imunity to flesh path ghouls -
- stun+stam imunity to mute ghouls +
- Clipboards and notice boards are now updated to TGUI, with clipboards having much better functionality.
- Medical cyborgs have the new blood filter. +
- Shuttle seat is now craftable using two sheets of iron
- misc_food no longer shows up twice. -
- SM sliver appears on the SM again. -
- Lipid extractor has slightly different recipe. -
- Spawned lipid extractor will now correctly deconstruct. +
- Cleaned up IPC code in general. +
- VV health adjustment works on synthetics +
- IPCs now actually have blood, oil, and it leaves decals when they are hurt +
- IPCs are now actually immune to toxin damage. +
- IPCs wont process reagents they weren't supposed to process. +
- Mild refactor to species metabolisms.
- fixed tags for Chaplain's adept hood +
- Adds printed toolbox right handed in-hand sprites
- Added pod walls and windows in the mining shuttles +
- Dogs now have all-new AI! Go throw a grenade at Ian and see what happens! +
- Added AI datum support for complex JPS pathing +
- Implements JPS Pathfinding +
- janky monkey ais +
- Monkeys are once again capable of using guns, take back your freedom! +
- Monkey ai is now actually able to make use of guns instead of just player controlled monkeys. +
- Monkey ai will prioritize guns once they learn of what guns can do. +
- Monkey ai now understands the ancient art of throwing. +
- Monkey ai will use random objects on each other in their surroundings and in their hands. +
- Monkey ai will occasionally "gift" people things. +
- Monkey ai consumes food once in a while according to their desire.
- Eldritch toys because you want to get beaten up by security +
- IPCs use charge at the same rate they used to +
- Ethereals can't queue up multiple chargings +
- Ethereals don't need to wait if they can't charge +
- APCs can be drained to a quarter charge
- Added a single storage slot to potted plants +
- Exosuit fabricators no longer automatically link to the default silo network on build.
- Adds defib, RPED and freezer board to syndicate lavaland base +
- fixed ruin turfs get vented sometimes
- Captain cloak has a new sprite! -
- QM cloak has a new sprite! +
- Baystation instruments are here! +
- Existing instruments have been rolled into the new unified instruments system. +
- A sound subsystem has been added, SSsounds. Use it for persistent channel management.
- Mansus grasp is now green +
- random diseases now have better random names
- Held mobs no longer lose their sprites if they were resting. +
- nuclear particles no longer deal direct toxin damage, but do more regular irradiating
- The Syndicate have purchased new encryption equipment, Central Command can no longer intercept their Communications. +
- Added ratvarsmall and narsiesmaller span classes.
- Showers to Boxstation +
- A few unused globals were cleaned up.
- You can fireman carry from neck or kill grabs again. -
- You can't piggyback to get out of neck or kill grabs. +
- Electrical species use power stored in their stomachs rather than normal nutrition +
- Ethereals recharge continuously and lose nutrition in the same ways as other species +
- EMPing electrical species will drain their charge +
- IPC powercords and batteries work in ethereals +
- Replaced old ethereal charge system +
- Removed the ability to insert brains without surgery +
- IPCs use a battery icon instead of hunger +
- Fixed ethereals not gaining charge from shocks +
- Fixed some problems with the biometallic replication symptom +
- Lots of other small things
- RSF not working properly +
- Temperature pump atmos device from tg +
- Pressure valve from atmos device tg +
- Temperature gate atmos device from tg +
- Passive gate pressure limit upped to 100 atmospheres
- changed the color of the blood bro hud icon +
- Adds 18 new hairstyles/beards requested by the community.
- Removed hangover landmarks +
- Hangover now dynamically places its spawns around the station +
- Fixed random_safe_station_turf sometimes returning null even if it had viable turf +
- Added security gas masks to SecDrobe -
- HOS gun is full-auto again. +
- Fixed camera name and network in Incenerator on Meta and Box
- servent is now servant. +
- Traitor panel will now show if the person in question is banned from a specific antagonist.
- smartfridges will automatically load items off conveyor belts, or items thrown at them. +
- fixed zero padding mistake
- Custom shuttle delete starting port after takeoff +
- The exploration detonator now correctly checks if you're on the station Z level for its safety. You can also no longer detonate explosives across Z levels. +
- Artifacts from supercruise often didn't work, they should be much more interesting now.
- IPCs no longer take brute and burn after death. +
- fixed hud runtime
- DRAGnet teleport no longer has random variance. -
- You now must be both in an aggro grab and grab intent to fireman carry or piggyback. +
- Radios now have code support for anonymization +
- The intercoms in chapel confessionals will now hide your name
- Adds Airlock Charge to traitor uplinks +
- Fixed a few typos related to exploration, wall building, wraith spectacles and Battle Royale
- Removed broken absorb changeling objective +
- fixes Nightmare's lighteater so they can destroy light sources again.
- Mech occupants can now cycle airlocks +
- Adds the 'NOSOCKS' trait. +
- Species with NOSOCKS can't wear socks. +
- Squids now have the 'NOSOCKS' trait.
- Standardised the contraband locker on all stations. +
- There is now a brain trauma that allows ghosts to issue a movement command once every 12 seconds. +
- Deadchat_control is now a smite option.
- Razor from service cyborg -
- Tray from service cyborg -
- service beaker aparatus replaced with a grasper aparatus, that can also carry food items, cigs, etc -
- Enzime bottle from service cyborg -
- cyborg shaker can synthesize its own enzime -
- cookie synthesizer from service cyborg -
- emagged RSF can dispense plasma cigs -
- Jungle Fever: Added advanced huds to all monkeys and gorillas. -
- Jungle Fever: 4% chance to turn into a gorilla instead of regular momke -
- Jungle Fever Transformation always fullheals monkeys. +
- Removed deathrattle station trait
- Fusion no longer dies to 2.7K. Instead, the fusion just stops, waiting eagerly for a fate other than 2.7K. +
- Sprite sheets! A new system to allow for better species in the future.
- Paramedics now have medical doctor's role-specific traitor items +
- Fixes an issue that would sometimes lead to increased view range while not ghosted +
- View range is now actually fixed, sorry for the trouble.
- readds metabolic boost viro symptom +
- Added exploration envirosuit+helmet. +
- Plasmamen on the exploration crew now spawn in said clothes.
- The NT Salvage Ship has been adapted for fastmos. +
- Newly created chat tabs will now show important messages. If you're using custom-created chat tabs, you'll need to delete and recreate them to be able to see them. This fixes being unable to see if somebody is overdosing when doing chemical scans with the health analyzer.
- magic immunity to chaplain armor +
- Shuttles will no longer refuse to lift off due to counting all other shuttle's weight as their own.
- Crew monitors and pinpointers now work with multi-z maps +
- Station trait command report is now generated independly, that means it will be printed even if intercept isn't enabled. +
- fixed lavaland turret control runtime
- tiny renaming of a runtime error datum +
- You can no longer drag blobbernauts.
- Felinds are supposed to like getting thrown on tables +
- fixed runtime related to missing client in mentorhelp
- Added the corporate security uniform to the secdrobe, you can finally have your black security clothes. -
- Added a captains jacket to the captains locker. +
- Resolves a bad index runtime caused by the stat panel's verb caching
- Atmosbot +
- Fixed artifact supercruise message. +
- Alkali Perspiration now correctly updates its severity. +
- The debug uplinks now actually use the debug toggle.
- Most armoured suits and helmets' thick reinforced materials now prevent syringes, parapens and hypos. -
- Shotguns have new, bigger sprites for inhands and back slot. -
- Riot shotguns have a slightly slower fire rate, and combat shotguns are now faster. -
- Shotgun lethal ammo is slightly weaker, moreso against armoured targets. +
- Space hotel now has a secondary solar control console that can reach the north-east solar array. +
- Space hotel has had some missing and miscolored cables tidied up.
- Deputy access upgrades in warden's and HoS's locker. +
- Changed flavor text to text in Notes for VIPs from the VIP extraction exploration mission.
- Custom shuttle get name that you give it on construction. +
- Fixed DeltaStation holodeck.
- fixes circuit input size so you can put longer circuits again +
- throwing creatures doesn't make blood trails anymore
- New supermatter sprites! +
- Report round id as int on ?status
- The lavaland outpost construction project has been postponed due to misuse of funding by the previous research director. +
- Roundstart tips are up-to-date.
- cluwne rune changes -
- new cluwne rune sprite +
- The "Say" window no longer has input lag when opening it with the hotkey. +
- The "Say" window now has input lag when closing it with enter.
- 4 random runtimes, including gibs not always spawning on human death +
- The projector can not be researched.
- Hyposprays can now have their dosages changed and can also be emptied -
- Adds hypospray noise from TGMC +
- Fixed join via pod trait sending people to hyperspace
- advanced injectors no longer get an extra 'expended' added for each mutation -
- only filled activators will give chromosomes -
- chromosomes will always go into the dna console if possible -
- telekinesis works on dna consoles -
- fixed some genetics typos +
- 514.1568 is now required for playing and compiling
- syringe stuff +
- The metastation external airlock in holodeck maintenance now sets up correctly roundstart
- Filter Blood Surgery -
- Adds item Blood filter -
- Added Blood filter to maps in surgery area and Med surgery duffle bag and sec surgery duffle bag. Removed from sec deptuty bag from original pr. -
- Added Blood filter to tool debug item -
- Can be created in prolathe. Removed from autolathe inline with no surgical tools in autolathes -
- The blood filter can now be put in medical belts, medical aid kits and backpacks -
- The surgery is automatically repeatable similar to tend wounds +
- increased book title limit from 20 chars to 50
- Moth plushie, found in arcade machines as a reward. Commiting suicide with it is ill advised. +
- Mines explode once instead of too much +
- Adds a ClothesMate Refill canister to cargo for 800 credits.
- You can now paste longer songs again. +
- Warping grey runes no longer create invisible slimes.
- New incursion icon -
- Added a new hud icon for incursion +
- Tooltips in tgui are now very fast, even with a lot of them on one interface.
- Players who don't want to be a heretic will no longer lose antag rep if selected as a heretic due to low pop -
- Abusable circuit components have been given a limit to how many can be out in a circuit. -
- removed FASTDMM_PROP from advanced airlock controllers. +
- The DB subsystem will now always disconnect properly.
- Grinding machine -
- Message when trying to rotate anchored plumbing machines -
- Plumbing pipes nolonger appear disconnected -
- Reactions that leave no chemicals don't break the reaction chamber now +
- Battle Royale requires +ADMIN instead of +FUN after the round ends.
- supermatter has a power-ceiling of 1 million +
- Humans now display a chat bubble when typing, as an effort to move us closer to Baystation +
- Typing Indicators are now on the right instead of the left, to not be covered by medhuds. +
- Say hotkey is probably more responsive
- Refactors ambient sounds completely to be less bad code wise and better IC and immersion wise +
- Resolves a crash exploit related to z-levels and supercruise. +
- Thrown humans can now be caught.
- piercing syringes now inject past thick clothing when not shot from a syringe gun as well -
- syringe guns no longer instantly inject their reagents, instead injecting them over time -
- syringes can be embedded on harm intent, also injecting reagents over time, but at a slower rate -
- explosive chem mixes no longer purge chems if an explosion is not triggered +
- improves fail2topic regex
- nerfed insta teleport from pandora. +
- New sprites for geraniums, lilies and rainbow flowers +
- Forget-me-nots as a new flower type +
- Craftable flower crowns from rainbow flowers, sunflowers, poppies and lilies +
- Two new botany cargo bounties for forget-me-nots and rainbow flower crowns +
- Fixes rainbow flower reagent code
- Adds 3 new chameleon items to the traitor uplink: Chameleon Bangproof Headset, Chameleon Flashproof Glasses and Chameleon Combat Gloves. -
- Chameleon plasmaman envirohelmet is no longer permanently flashproof. +
- All golems excluding bone golems are transsting immune. +
- Levelling up projectile spells (Fireball, spellcards, tesla spell, magic missile) makes the projectiles more powerful. +
- Upgrading repulse makes the effect stronger (larger throw distance, longer paralyze) +
- Altered the charlie station ruin outpost to add an ORM, KA, Autolathe and Ore Silo. Removed the exosuit fab having access to station mats. Added a bunch of materials around and a shuttle creator. +
- Traitor capsule shuttle gets a plasma refinery and an emergency pickaxe. +
- Trait induced blindness will no longer cause your screen to be blurry forever if you get blurred.
- Added hotkey to toggle walking/running +
- Ability to rebind locking movement hotkey +
- Dynamic is now continuous. +
- Soundtrack music shows in credits
- Crew manifest available for cyborgs under "Robot Commands" +
- Fixed a security issue with the advanced proccall
- stim_ball reaction now properly consumes plasma +
- Custom shuttles and rooms can be made on asteriods. +
- Fixes another case of meteors moving invalidly. +
- Refactors the tesla to be less intensive on the server. (Slightly weakening its destructive capability) +
- The MC panel now shows tick uage and the tick limit.
- hopefully fixes heretics :agony: +
- Janitorial toolset implant +
- Botanical toolset implant
- Bee infestation honey threshold is actually 12 now +
- BYOND infinite loop detection is now documented.
- Circuit boards are colored. -
- Every machine broken by previous pr should be working now. +
- removed static usage of typecache in get_area()
- Hierophant relay no longer transmits the radio channels of people on Reebe, but will still recieve them. -
- Clockies can now be deconverted properly. -
- More than 1 of each weapon can now be summoned. -
- Clockwork marauders can now speak rat'varian -
- Clockwork marauders can now take damage from bullets -
- Spells will now consume vitality when they are meant to -
- Clowns no longer harm themselves with toy dualsabers +
- Fixes meteors causing bugs in SSorbits.
- ss13_feedback can now be disabled with the LIMITED_FEEDBACK flag. +
- Mechs can now properly recalibrate their controls.
- mutation toxin is restricted again +
- You should NOT be granting this lightly.
- Cloning works again. +
- ERT Commanders get an Omni Door remote. +
- added microwaves, donk pockets, and oxygen tank dispensers to exploration shuttles +
- the BSA is indestructible.
- Makes mining station's outer airlocks not vent out the entire station if you go through them too fast +
- Aquarium and aquarium accessories. Also fish. Check out cargo to start. +
- Aquarium fish now reproduce.
- All Command roles now require 20h playtime in the relevant department, except HOP requires 10h Service. Warden and QM require 10h each. +
- Sleep and Drowsyness Immunity To Meth +
- Decreased Speed Buff from Meth +
- Increased Stamina Damage Reduction
- fixed non-functional passkeys for circuits +
- Added structure (plant) 'Strange plant' to code/modules/mining/lavaland/ash_flora.dm +
- Added boolean flag destroy_on_harvest (FALSE) to plants in ash_flora. If it is on, plants will not regrow. +
- Strange seeds removed from biogenerator +
- xpod[1-4] added to icons/obj/lavaland/ash_flora.dmi (2,3,4 are placeholders for better art variety)
- people scream when taking damage +
- You can now throw stuff at movables with no density, such as mobs on the floor, mice, APCs etc etc +
- Refactored thrownthing datum
- Re-add qwerty lighting in specific areas -
- You can now specify area bulb brightness -
- Added a paywall for felinid species -
- Added input capping and sanitization -
- Added some new input wrappers -
- Added race paywall to config -
- Felinids are no longer paywalled. +
- Updated some logging, added some logging. +
- Admins can now force people to stub their toes. +
- Fixes the FLW link in some logging.
- Adds 8 new icons for circuit boards, based on department colors -
- Reorganizes computer_circuits.dm and machine_circuitboard.dm +
- Replaces get_hearers_in_view with range for musical instruments. +
- Musical instrument range reduced from 15 to 11 +
- Flashbangs now blind with an intensity of 2 meaning wearing glasses alone will still blind you. (You will not get stunned while wearing glasses). +
- Flashbangs effect is directly proportional to the distance away. +
- Fixes docking with lavaland.
- Adjusted Foreigner to be a Negative trait +
- Telekinesis can no longer throw objects with people in them, or buckled to them.
- Fixes a clockcult map bug -
- Starting game... will now be announced closer to when the game is starting. +
- Custom emotes work again.
- Gangs is now disabled in the config +
- cyborg *spinning someone now knocks down instead of paralyzing
- Added heretics to the config +
- Adds Corporate Sofas, an alternative, sleeker style of sofa.
- Fully automatic firing for guns, except this time it isn't horribly coded and broken. +
- Silicons can once again interact with intercoms +
- Button.Input no longer breaks tgui interfaces. Fixes advanced injector creation interface, as well as NTOS file manager, chat, ID card modification and Revelation.
- the eighties floor not spawning. +
- decreased the font size cap from 32 to 24 to prevent chat bugs.
- Changelings and cult will no longer be assigned invalid targets -
- Clockcult gamemode -
- Clockwork slab -
- Brass armory -
- brass spear -
- brass battlehammer -
- brass sword -
- The Eminence simplemob -
- Cogscarab drone subtype -
- TGUI clockwork menu -
- Clockwork traps -
- Clockwork scriptures, structures and slab powers -
- replica fabricator -
- integration cog -
- Rat'var the clockwork justicar -
- New Reebe -
- Clockcult has been completely rewritten from scratch, Reebe has been completely redesigned and it no longer crashes upon using camera consoles, winning, doing anything etc. -
- Adds clockcult to the config +
- Ghosts no longer get spammed with It's Loose notifications when there's no singulo or tesla.
- 28 random maint rooms by GizkaFreechman, edited by myself -
- Random maint traps -
- cluwne rune, which can be used by cultists in a manner similar to an invocation rune, if the Honkmother has blessed one of the invokers with her presence -
- new random maint job, the VIP. he's rich, apparently important, and actually probably quite useless. -
- sprites for new job and cluwne rune by thatguythere03 -
- edited most random maint maps to make maint easier to get through (changing table placements and such) -
- faithless no longer has a 12% chance to stun for 6 seconds on hit +
- Fixed the syndicate lavaland base to have the proper frequencies to be compatible with Supercruise.
- Multilingual now costs 1 point instead of 2 +
- Added new space ambient music +
- fixed ambient music and buzz
- multi-directional sprites to the arcade and 80s floor. +
- Moths can no longer consume the following items: Indestructible items, Items with Melee armor, Space Suits, Hardsuits. +
- The exploration nuke no longer plays alarm.ogg
- Disabled the Gateway roundstart +
- Geysers no longer generate in ruins. In fact, nothing should generate in ruins, as ruins now generate before other things. +
- Due to changes in the way the map is setup, floors that are parts of ruins on lavaland loaded at roundstart will now deconstruct into lava instead of basalt floors. +
- When a template is loaded with a passthrough turf, non-passthrough area on it, onto a genturf, the genturf is now forced to generate with the old area. This allows ruins to have objects in a powered area on a passthrough turf on lavaland. +
- Passthrough turfs can now hint towards if the turf below should be closed/open (wall/floor). This can be useful in ruins, as it can influence map generation without overriding the exact turf placed underneath. +
- Sprites for passthrough turfs with closed/open preferrence (visible in editor only)
- Claiming a ticket now works directly through a reply. +
- Improves the supercruise collision detection by optimising it and making it so passing something triggers a collision event. +
- SSorbits now supports multiple orbital maps.
- Deepfried pets no longer reappear after being bitten(why would you ever do that). +
- Abandoned crate tamper-proofing now detects EMPs.
- Multilingual +
- Bitwise operations and Trigonometry related circuit components, unlocked in a new techweb node. +
- Rounding circuit component. +
- Arithmetic circuit now has a modulus option. +
- New abstract circuit to base components that initialize with an arbitrary amount of inputs.
- You can now pick new pai holoforms again. +
- chaplain's soulstone can no longer shard bodies with souls
- Eldritch Water metabs properly. +
- fixed mech radios
- lizards no longer get cockwork tails -
- macrophage works again -
- pink macrophages work again -
- biometallic replication and organic flux induction should scale with pituitary disruption again -
- antivirus no longer works on humans. (why do biotypes suck ass) +
- Communications consoles also work on the centcom z level +
- Added the AI lab room as a possible ruin room.
- DRAGnets will now teleport targets at beacons designated for Dragnet portals. -
- Dragnet beacons printable at secfab. -
- Dragnet beacons in armory on every map. +
- The AI will have a random lawset at the start of each shift from the following list: Asimov, asimov++, crewsimov, corporate, maintain.
- New immersion smite. -
- Bullteriers! -
- Breadcats! Ask your local chef for one! -
- You can now scoop and hold pets. -
- Warden has a new pet - Walter! +
- ashwalkers malf AI module has been moved to the syndicate lavaland base vault. +
- Heavily beefed up the security of the Syndie vault, added two more turrets and 3 layer walls.
- Renamed bubblegum and blood-drunk gps signals. +
- Mapmerge2 has been updated along with an experimental .dmm merge driver being included for conflict resolution.
- ID modification is now logged. +
- Radios and intercoms can no longer be toggled from a distance by non-silicons using hotkeys +
- Monkeys can now interact with wall-mounted intercoms +
- Radio and intercom UIs now update when toggled via hotkey +
- Bounty console now uses a tgui interface +
- There is a new "Bounty Hunter" program available for modular computers and tablets +
- SDQL2 now supports all subsystems. +
- Alarm Monitoring program changed to avoid always-on unclearable fire alarms +
- Hacking a firing pin out of a gun is no longer done via a crafting menu - you can now do it by simply holding the gun in your hand and clicking it with a welder/screwdriver/wirecutters +
- You are no longer prevented from selecting more neutral/negative quirks once you have reached the limit of 6 positive ones. +
- Fixed a scenario that allowed infinite resource generation via ore machines. +
- TGUI interfaces updating from ui_act will not update again due to ui_update
- Removed broodmothers from gold slime pool -
- Increased ATMOSfan max signs to 6 -
- Shoulder holsters are now an accessory, not a belt. +
- The panic bunker allows for a minimum time to be set, blocking players who lack the required amount of living played time from accessing the game.
- Should have the sprites now -
- added the damn sprites +
- Removes the bolt of death and bolt of adminheal from xenobiology space carps (Chaos + Regular) +
- Bag of holding's can no longer teleport their contents through walls when dumped. +
- Fixes gamemode presetup being called late. +
- Fixes cult having a random chance to fail to setup between 24-28 players. +
- Cryo syringes no long have the no react flag. +
- Reagents inside cryo syringes will be at 20 kelvin. +
- Heavy weapons require two hands to hold. +
- Light/medium weapons will be less accurate when fired with 1 hand. +
- Refactors meteors, they are now orbital map components and will fly towards the station, colliding with orbital bodies and flying shuttles.
- Recharging station crate purchasing from cargo consoles +
- Ore Silo connections can no longer cross z-level boundaries, and will break if the object changes z-lvels.
- Replaces the firelocks with windoors in the public garden on MetaStation +
- all syndicate boxes now look like syndicate boxes +
- replaced some of the more egregious spawn()s with timers +
- removed the separated chemicals trait from botany
- lizards can now scream +
- having x-ray makes you ignore flash protection and tint +
- flashbangs can flash people with x-ray through walls +
- syndicate autosurgeons get a special variant of eyes that allow flash protection
- nerfed toe stubbing -
- explosions have been fucked with a bit +
- placing fireman carried people onto things
- All projectiles now move 1.25 times as fast. +
- Nuclear countdown music
- Updated HoS cloak sprite +
- IPC hands are now properly visible over jumpsuits on side states
- Adds silver sulfadizine to synthflesh recipe. +
- Birdboat now has a chance to be controllable by dead chat, think twitch plays pokemon but goose and deadchat. +
- Deadchat controlled singularity variant.
- Felinids are now immune to carpotoxin and can have little a fish -
- Felinids like meat and dairy, and dislike vegetables and sugar. +
- Add Requests Manager to view all prayers/centcom and syndicate requests/and nuke code requests within a round.
- Acid properly degrades armor -
- You can empty storage containers/boxes directly into disposals again -
- The mutations overlay will update correctly now +
- TGUI interfaces have been manually tweaked across the board to update more consistently +
- Some potential exploits related to TGUI input validation/sanitisation have been fixed +
- Nanite cloud control now shows rules even when you don't have a disk with valid rules inserted +
- Extra settings for numbers in nanites now treat 0 as a valid number. +
- Cargo express console now doesn't add a second order to the cargo console cart. As a side-effect, it also doesn't print a requisition form. +
- The holodeck computer will no longer break when reenabling safety +
- Chemistry heater no longer stays on when removing beaker with alt-click +
- Added signals for machine_open and machine_close +
- References to IRC now better describe TGS' and Discord's existence. +
- Players will now be better informed that messages are sent through TGS to IRC/Discord/etc when attempting to adminhelp with no available admins/use adminwho verb. +
- Initial ahelps are now multiline too.
- The old science research station ghost roles now have a proper title +
- Coffee the Crab is now present in BoxStation Science +
- Birdboat the Goose is now present in DeltaStation, MetaStation, CorgStation, and PubbyStation maints +
- Lia the Carp is now present in the CorgStation HoS office +
- Cayenne the Carp is now present in the traitor deployable capsule shuttle +
- Tom the Turkey is the mascot of the Exploration Crew, and appears on the three exploration shuttles. +
- Debtors and Assistants can now purchase a Bottle of Mystery Pills for 3TC.
- Mutation tox now has a minute window where you can purge the chem to avoid being changed (It functions EXACTLY like old slime mutation toxin) -
- Slime Mutation Toxin is replaced by Mutation Toxin since they now function 100% the same. Think of this as just a name change! +
- fixes my own mistake on instruments
- Spraycans with less than 2 but more than 0 charges left can no longer be used on objects +
- You can now upload to AIs on different station floors. +
- Fixes meta comms, will proper fix it tomorrow. +
- Runechat not displaying messages if you can't hear it rather tahn if they can't hear it. +
- Changes exploration mainframes to proper exploration communication setups on pubby and metastation.
- PanDEMIC 2200 UI now includes severity for the overall disease and each symptom. +
- Randomly generated names can no longer have skywalker as a last name
- You can't order stuff from the express supply console as a ghost anymore +
- Tweaked Mining Webbing to also allow storage of exploration gear due to also being available to explorers +
- More exploration gear fits into webbing
- vehicles no longer block bullets for you -
- mobs which pass tables can move past vehicles +
- added nitrile gloves to the Paramedic's default, roundstart loadout.
- A clearly illegal slaughterhouse to the west of the research division on boxstation has been permanently removed. -
- An actual medbay with treatment separation and more than one surgery room has been installed in the place of the removed slaughterhouse. +
- You can now print multiple Wanted or Missing posters. +
- Clockwork cultists and Cogscarabs will no longer be stuck in an infinite teleport loop.
- You can fold origami properly now. +
- IPCs are no longer deaf when EMP'd, and are now forced to speak spanish for 2 minutes.
- Security webbing has +1 slot compared to sec belts again, and sec belts allow you to use all slots again. +
- fixes mobs not beeing able to hear instruments in lockers +
- Fixes reality destabilization auto-restabilization.
- You now actually target the chest roundstart +
- bone axe now properly switches in hand sprites +
- wagging your tail is a visible emote again +
- Equipment no longer disappears when you try to install it in the wrong type of mecha.
- Fixes a cargo bug where items wouldn't be sold if placed in an anchored container +
- budget cards are indestructible.
- biometallic replication has slightly better stats, buffs preexisting robot limbs -
- TRD now works on mechanical limbs as intended -
- fixed exolocomotive xenomitosis capitalization and healing threshold -
- exolocomotive xenomitosis now works on monky -
- pink zombies and macrophages, so exolocomotive xenomitosis can be more aesthetic -
- organs take three times as long to decay +
- Exploration Crew has their HUD icon now. +
- Exploration Crew job can be given from the HoP console. +
- Job selection in the HoP Console is now tidily sorted by department. +
- When you grant a custom job "Acting Captain", now it gives you a better blank HUD icon. (Captain HUD without star) +
- RD now has exploration access +
- Battle Royale loot has had some loot buffs, most notably the spawn rate of loot drops has doubled and the landing time of packages has been decreased.
- Cult stun now works on mindshield instead of hearing protection +
- Cogged APCs will now report 100% charge on power monitors. +
- Fixes corgstation disposals and bar disconnect from powergrid. +
- Fixes QM headset having exploration access. +
- Fixes custom shuttles being unable to dock. +
- Entering the portal in the center of the shadow labrynth will return you to a random anomalous artifact.
- The ashwalker's bonfire does not require oxygen to burn anymore. +
- The obviously fake nuke disk is now an arcade prize. +
- The round report in #ooc on Discord now includes a summary for Dynamic Mode. +
- Dynamic round report in #ooc no longer has extraneous html bold tags +
- The departmental budget's pre-initialize name has been changed.
- Omnitool. -
- Debug outfit has been updated and adjusted. -
- Admin RCD is superfast now and has upgrades. +
- Central Command has identified and fixed issues with pod launching interfaces. +
- Broken computers no longer glow in the dark +
- Seed Extractor and Plant DNA Manipulator now use tgui +
- Plant DNA Manipulator has a checkbox that skips confirmation prompt for rapid botanying
- reworked phobias +
- The spriteless jumpsuit in sec maints in deltastation is now a real one
- Shotguns now blow people away at point blank. +
- Fixes finger gun allowing free movement in space +
- Adds in AI buttons to move their camera to above and below connected z-levels. +
- Sounds now play across multi-z station levels. +
- Explosions now explode across multi-z station levels. +
- Fixes blood brothers admin add +
- Adds in randomly generated ruins +
- Adds in dynamic z-levels. +
- Adds in ruin beacons on the shuttle supercruise map. +
- Adds z-clear +
- Ruin mapsize validation unit test +
- Fixes fastdmm2 not compiling on beestation code due to the updates. +
- Budget cards no longer get free money. +
- Bounties reward 3x as much, but the reward is distributed among station budgets. +
- Paychecks have been slightly reduced. +
- Station budgets now start with more money to compensate early game when no objectives or bounties have been completed. +
- Research disks can be found on ruin stations. These can be used to unlock special research. +
- Bags of holding are now a separate research node unlocked by finding disks on derelict stations. +
- Wormhole projectors are now a separate research node unlocked by finding disks on derelict stations. +
- Quantum spin inverters are now a separate research node unlocked by finding disks on derelict stations. +
- Advanced combat cyber implants are now a separate research node unlocked by finding disks on derelict stations. (Hydraulic armblades) +
- Combat cybernetic implants implants are now a separate research node unlocked by finding disks on derelict stations. (Xray, thermal vision, anti stun implants, thrust implants) +
- Clusterbangs are now a found research disk. +
- Phazons are now a found research disk. +
- Exotic ammo is now a found research disk. +
- Beam rifles are now a found research disk. +
- Temp gun and X-ray gun is now a found research disk. +
- Nuclear energy gun is now a found research disk. +
- Completion station missions reward money to budget cards. +
- Adds in a new mining scanner effect. +
- Refactors vendors to be modular +
- Adds discovery research +
- Adds discovery scanner +
- Felinids get stunned when falling z-levels for the same length of time that normal humans get knocked down. +
- You will no longer fall down if the turf below you is space. +
- You can now ascend and descend connected z-levels by clicking on the space tile. +
- Off-station traitor roles have a prefered chance (30%) to have their team members as targets (Shaft miners and exploartion crew.). Additionally, on station traitor roles have a reduced chance to have their target as an off station roles. +
- Turrets can now shoot above themselves, preventing the nukie shuttle from being boardable from above. +
- Bolt of teleportation will teleport people to open turfs unless none are available. +
- Immovable rod no longer loops. +
- Box station no longer has the crab.
- Bartender quits buying new monkeys for every shift. Pun Pun is back! +
- Bans now properly create their relevant notes. +
- You should probably manually unexpire any note with an expiration date of 0.
- Adds sterilizer spray to robodrobe -
- Adds morgue to robotics on DeltaStation and PubbyStation +
- Ability to see a tag with the armor values of a piece of clothing when you inspect it
- Changed the corporate lawset +
- replaces the glass in the labor camp with reinforced plasma glass. -
- fixed the paper wizard den so everything doesnt instantly die from low pressure anymore. +
- Solar control screen no longer floats off the console when facing east. Solar control screen is now also emissive, like other computers.
- fixed ethereal charging +
- Removed an admin privilege elevation exploit and other potential avenues for abuse
* Service: " + if(job == "Quartermaster") + jobs_all += "
* Cargo: " + if(job == "Chief Engineer") + jobs_all += "
* Engineering: " + if(job == "Research Director") + jobs_all += "
* R&D: " + if(job == "Chief Medical Officer") + jobs_all += "
* Medical: " + if(job == "Head of Security") + jobs_all += "
* Security: " + if(job == "Custom") + jobs_all += "
" + // these will make some separation for the department. jobs_all += "[replacetext(job, " ", " ")] " //make sure there isn't a line break in the middle of a job diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 7dad9e8daafe6..8bcc79616e3f7 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -8,11 +8,14 @@ circuit = /obj/item/circuitboard/computer/cloning req_access = list(ACCESS_GENETICS) //for modifying records var/obj/machinery/dna_scannernew/scanner //Linked scanner. For scanning. + var/clonepod_type = /obj/machinery/clonepod var/list/pods //Linked cloning pods var/temp = "Inactive" var/scantemp_ckey - var/scantemp = "Ready to Scan" + var/scantemp_name + var/scantemp = "Inactive" var/menu = 1 //Which menu screen to display + var/use_records = TRUE //set this to false if you don't want the console to use records var/list/records = list() var/datum/data/record/active_record var/obj/item/disk/data/diskette //Incompatible format to genetics machine @@ -62,8 +65,8 @@ else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5) . = pod -/proc/grow_clone_from_record(obj/machinery/clonepod/pod, datum/data/record/R, empty) - return pod.growclone(R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mindref"], R.fields["last_death"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"], empty) +/proc/grow_clone_from_record(obj/machinery/clonepod/pod, datum/data/record/R) + return pod.growclone(R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mindref"], R.fields["last_death"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"], R.fields["body_only"]) /obj/machinery/computer/cloning/process() if(!(scanner && LAZYLEN(pods) && autoprocess)) @@ -71,6 +74,7 @@ if(scanner.occupant && scanner.scan_level > 2) scan_occupant(scanner.occupant) + ui_update() for(var/datum/data/record/R in records) var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mindref"]) @@ -83,14 +87,32 @@ var/result = grow_clone_from_record(pod, R) if(result & CLONING_SUCCESS) - temp = "[R.fields["name"]] => Cloning cycle in progress..." + temp = "[R.fields["name"]] => Cloning cycle in progress..." log_cloning("Cloning of [key_name(R.fields["mindref"])] automatically started via autoprocess - [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].") + SStgui.update_uis(src) if(result & CLONING_DELETE_RECORD) records -= R + ui_update() +/obj/machinery/computer/cloning/proc/connect_scanner(obj/machinery/dna_scannernew/new_scanner) + if(scanner) + UnregisterSignal(scanner, COMSIG_MACHINE_OPEN) + UnregisterSignal(scanner, COMSIG_MACHINE_CLOSE) + + if(new_scanner) + RegisterSignal(new_scanner, COMSIG_MACHINE_OPEN, .proc/scanner_ui_update) + RegisterSignal(new_scanner, COMSIG_MACHINE_CLOSE, .proc/scanner_ui_update) + + scanner = new_scanner + +/obj/machinery/computer/cloning/proc/scanner_ui_update() + SIGNAL_HANDLER + ui_update() + /obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner) - scanner = findscanner() + if(QDELETED(scanner)) + connect_scanner(findscanner()) if(findfirstcloner && !LAZYLEN(pods)) findcloner() if(!autoprocess) @@ -119,7 +141,7 @@ for(var/direction in GLOB.cardinals) - podf = locate(/obj/machinery/clonepod, get_step(src, direction)) + podf = locate(clonepod_type, get_step(src, direction)) if (!isnull(podf) && podf.is_operational()) AttachCloner(podf) @@ -140,7 +162,6 @@ diskette = W to_chat(user, "You insert [W].") playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) - updateUsrDialog() else if(W.tool_behaviour == TOOL_MULTITOOL) if(!multitool_check_buffer(user, W)) return @@ -163,366 +184,342 @@ else return ..() -/obj/machinery/computer/cloning/ui_interact(mob/user) +/obj/machinery/computer/cloning/AltClick(mob/user) . = ..() - - updatemodules(TRUE) - - var/dat = "" - dat += "Refresh" - - if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL) - if(!autoprocess) - dat += "Autoprocess" + EjectDisk(user) + +/obj/machinery/computer/cloning/proc/EjectDisk(mob/user) + if(diskette) + scantemp = "Disk Ejected" + diskette.forceMove(drop_location()) + usr.put_in_active_hand(diskette) + diskette = null + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) + . = TRUE + +/obj/machinery/computer/cloning/proc/Save(mob/user, target) + var/datum/data/record/GRAB = null + for(var/datum/data/record/record in records) + if(record.fields["id"] == target) + GRAB = record + break else - dat += "Stop autoprocess" - else - dat += "Autoprocess" - dat += "
Cloning Pod Status
" - dat += "[temp]
"
- switch(menu)
- if(1)
- // Modules
- if (isnull(scanner) || !LAZYLEN(pods))
- dat += "Modules
" - //dat += "Reload Modules" - if (isnull(scanner)) - dat += "ERROR: No Scanner detected!" - if (!LAZYLEN(pods)) - dat += "ERROR: No Pod detected
" - - // Scanner - if (!isnull(scanner)) - var/mob/living/scanner_occupant = get_mob_or_brainmob(scanner.occupant) - - dat += "
Scanner Functions
" - - dat += ""
- if(!scanner_occupant)
- dat += "Scanner Unoccupied"
- else if(loading)
- dat += "[scanner_occupant] => Scanning..."
- else
- if(scanner_occupant.ckey != scantemp_ckey)
- scantemp = "Ready to Scan"
- scantemp_ckey = scanner_occupant.ckey
- dat += "[scanner_occupant] => [scantemp]"
- dat += "
"
-
- if(scanner_occupant)
- dat += "Start Scan"
- dat += "Body-Only Scan"
- dat += "[scanner.locked ? "Unlock Scanner" : "Lock Scanner"]" - else - dat += "Start Scan" - - // Database - dat += "
Database Functions
" - if (records.len && records.len > 0) - dat += "View Records ([records.len])" - else - dat += "View Records (0)
" - if (diskette) - dat += "Eject Disk
" + continue + if(!GRAB || !GRAB.fields) + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + scantemp = "Failed saving to disk: Data Corruption" + return FALSE + if(!diskette || diskette.read_only) + scantemp = !diskette ? "Failed saving to disk: No disk." : "Failed saving to disk: Disk refuses override attempt." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + return + diskette.fields = GRAB.fields.Copy() + diskette.name = "data disk - '[src.diskette.fields["name"]]'" + scantemp = "Saved to disk successfully." + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + return TRUE + +/obj/machinery/computer/cloning/proc/DeleteRecord(mob/user, target) + var/datum/data/record/GRAB = null + for(var/datum/data/record/record in records) + if(record.fields["id"] == target) + GRAB = record + break + else + continue + if(!GRAB) + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + scantemp = "Cannot delete: Data Corrupted." + return FALSE + var/obj/item/card/id/C = usr.get_idcard(hand_first = TRUE) + if(istype(C) || istype(C, /obj/item/pda) || istype(C, /obj/item/modular_computer/tablet)) + if(check_access(C)) + scantemp = "[GRAB.fields["name"]] => Record deleted." + records.Remove(GRAB) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + var/obj/item/circuitboard/computer/cloning/board = circuit + board.records = records + return TRUE + scantemp = "Cannot delete: Access Denied." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + +/obj/machinery/computer/cloning/proc/Load(mob/user) + if(!diskette || !istype(diskette.fields) || !diskette.fields["name"] || !diskette.fields) + scantemp = "Failed loading: Load error." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + return + for(var/datum/data/record/R in records) + if(R.fields["key"] == diskette.fields["key"]) + scantemp = "Failed loading: Data already exists!" + return FALSE + var/datum/data/record/R = new(src) + for(var/key in diskette.fields) + R.fields[key] = diskette.fields[key] + records += R + scantemp = "Loaded into internal storage successfully." + var/obj/item/circuitboard/computer/cloning/board = circuit + board.records = records + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + return TRUE + +/obj/machinery/computer/cloning/proc/Clone(mob/user, target) + var/datum/data/record/C = find_record("id", target, records) + //Look for that player! They better be dead! + if(C) + var/obj/machinery/clonepod/pod = GetAvailablePod() + //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. + if(!LAZYLEN(pods)) + temp = "Error: No Clonepods detected." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + else if(!pod) + temp = "Error: No Clonepods available." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + else if(!CONFIG_GET(flag/revival_cloning)) + temp = "Error: Unable to initiate cloning cycle." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + else if(pod.occupant) + temp = "Warning: Cloning cycle already in progress." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + else if(pod.growclone(C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mindref"], C.fields["last_death"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"], C.fields["bank_account"], C.fields["traumas"], C.fields["body_only"])) + temp = "Notice: [C.fields["name"]] => Cloning cycle in progress..." + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + if(!C.fields["body_only"]) + records.Remove(C) + . = TRUE + else + temp = "Error: [C.fields["name"]] => Initialisation failure." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + else + temp = "Failed to clone: Data corrupted." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) +/obj/machinery/computer/cloning/proc/Toggle_lock(mob/user) + if(!scanner.is_operational()) + return + if(!scanner.locked && !scanner.occupant) //I figured out that if you're fast enough, you can lock an open pod + return + scanner.locked = !scanner.locked + playsound(src, scanner.locked ? 'sound/machines/terminal_prompt_deny.ogg' : 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + . = TRUE - if(2) - dat += "
Current records
" - dat += "<< Back" +/obj/machinery/computer/cloning/proc/Scan(mob/user, body_only = FALSE) + if(!scanner.is_operational() || !scanner.occupant) + return + scantemp = "[scantemp_name] => Scanning..." + loading = TRUE + playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) + say("Initiating scan...") + var/prev_locked = scanner.locked + scanner.locked = TRUE + addtimer(CALLBACK(src, .proc/finish_scan, scanner.occupant, user, prev_locked, body_only), 2 SECONDS) + . = TRUE + +/obj/machinery/computer/cloning/proc/Toggle_autoprocess(mob/user) + if(!scanner || !HasEfficientPod() || scanner.scan_level < AUTOCLONING_MINIMAL_LEVEL) + return FALSE + autoprocess = !autoprocess + if(autoprocess) + START_PROCESSING(SSmachines, src) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + else + STOP_PROCESSING(SSmachines, src) + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + . = TRUE + +/obj/machinery/computer/cloning/ui_data(mob/user) + var/list/data = list() + data["useRecords"] = use_records + var/list/records_to_send = list() + if(use_records) + if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL) + data["hasAutoprocess"] = TRUE + if(length(records)) for(var/datum/data/record/R in records) - dat += "
[R.fields["name"]]
Scan ID [R.fields["id"]] View Record" - if(3) - dat += "Selected Record
" - dat += "<< Back" - - if (!active_record) - dat += "Record not found." - else - var/body_only = active_record.fields["body_only"] - dat += "
[active_record.fields["name"]][body_only ? " - BODY-ONLY" : ""]
" - dat += "Scan ID [active_record.fields["id"]] \ - [!body_only ? "Clone" : "" ]\ - Empty Clone" - - var/obj/item/implant/health/H = locate(active_record.fields["imp"]) - - if ((H) && (istype(H))) - dat += "Health Implant Data:
[H.sensehealth()]
" + var/list/record_entry = list() + record_entry["name"] = "[R.fields["name"]]" + record_entry["id"] = "[R.fields["id"]]" + var/obj/item/implant/health/H = locate(R.fields["imp"]) + if(H && istype(H)) + record_entry["damages"] = H.sensehealth(TRUE) else - dat += "Unable to locate Health Implant.
" - - dat += "Unique Identifier:
[active_record.fields["UI"]]
" - dat += "Structural Enzymes:
" - for(var/key in active_record.fields["SE"]) - if(key != RACEMUT) - var/val = active_record.fields["SE"][key] - var/alias = GLOB.all_mutations[key].alias - dat +="[alias]: [val]
" - - dat += "
" - - if(diskette?.fields) - dat += "
"
- dat += "
Load From Disk" - else - dat += "Cannot Load From Disk: Access Denied" - if(diskette.fields["SE"]) - if(!include_se) - dat += "
Currently Excluding SE" - else - dat += "
Currently Including SE" - if(diskette.fields["UI"]) - if(!include_ui) - dat += "
Currently Excluding UI" - else - dat += "
Currently Including UI" - if(diskette.fields["UE"]) - if(!include_ue) - dat += "
Currently Excluding UE" - else - dat += "
Currently Including UE" - - - dat += "
Save to Disk" - dat += "
"
-
- dat += "Delete Record"
-
- if(4)
- if (!active_record)
- menu = 2
- ui_interact(user)
- return
- dat += "Please confirm.Inserted Disk
" - dat += "Contents: " - var/list/L = list() - if(diskette.fields["UI"]) - L += "Unique Identifier" - if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["blood_type"]) - L += "Unique Enzymes" - if(diskette.fields["SE"]) - L += "Structural Enzymes" - dat += english_list(L, "Empty", " + ", " + ") - var/can_load = FALSE - var/obj/item/card/id/C = user.get_idcard(TRUE) - if(C) - if(check_access(C)) - can_load = TRUE - if(can_load) - dat += "Load From Disk" - else - dat += "Cannot Load From Disk: Access Denied" - if(diskette.fields["SE"]) - if(!include_se) - dat += "
Currently Excluding SE" - else - dat += "
Currently Including SE" - if(diskette.fields["UI"]) - if(!include_ui) - dat += "
Currently Excluding UI" - else - dat += "
Currently Including UI" - if(diskette.fields["UE"]) - if(!include_ue) - dat += "
Currently Excluding UE" - else - dat += "
Currently Including UE" - - - dat += "
Save to Disk" - dat += "
" - dat += "Cancel" - - var/datum/browser/popup = new(user, "cloning", "Cloning System Control") - popup.set_content(dat) - popup.open() - -/obj/machinery/computer/cloning/Topic(href, href_list) + record_entry["damages"] = FALSE + record_entry["UI"] = "[R.fields["UI"]]" + record_entry["UE"] = "[R.fields["UE"]]" + record_entry["blood_type"] = "[R.fields["blood_type"]]" + record_entry["body_only"] = "[R.fields["body_only"]]" + records_to_send += list(record_entry) + data["records"] = records_to_send + else + data["records"] = list() + if(diskette && diskette.fields) + var/list/disk_data = list() + disk_data["name"] = "[diskette.fields["name"]]" + disk_data["id"] = "[diskette.fields["id"]]" + disk_data["UI"] = "[diskette.fields["UI"]]" + disk_data["UE"] = "[diskette.fields["UE"]]" + disk_data["blood_type"] = "[diskette.fields["blood_type"]]" + data["diskData"] = disk_data + else + data["diskData"] = list() + else + data["hasAutoprocess"] = FALSE + data["autoprocess"] = autoprocess + var/list/lack_machine = list() + if(isnull(src.scanner)) + lack_machine += "ERROR: No Scanner Detected!" + if(!LAZYLEN(pods)) + lack_machine += "ERROR: No Pod Detected!" + data["lacksMachine"] = lack_machine + data["temp"] = temp + var/build_temp = null + var/mob/living/scanner_occupant = get_mob_or_brainmob(scanner?.occupant) + if(scanner_occupant?.ckey != scantemp_ckey || scanner_occupant?.name != scantemp_name) + if(use_records) + build_temp = "Ready to Scan" + scantemp_ckey = scanner_occupant?.ckey + scantemp_name = scanner_occupant?.name + else + build_temp = "Ready to Clone" + scantemp = "[scanner_occupant] => [build_temp]" + data["scanTemp"] = scantemp + data["scannerLocked"] = scanner?.locked + data["hasOccupant"] = scanner?.occupant + data["recordsLength"] = "View Records ([length(records)])" + return data + +/obj/machinery/computer/cloning/ui_act(action, params) if(..()) return - if(loading) + // Return TRUE on almost every operation, since operations write to temp and scantemp to display failure messages + + switch(action) + if("toggle_autoprocess") + . = Toggle_autoprocess(usr) + if("scan") + Scan(usr, FALSE) + . = TRUE + if("scan_body_only") + Scan(usr, TRUE) + . = TRUE + if("toggle_lock") + . = Toggle_lock(usr) + if("clone") + Clone(usr, params["target"]) + . = TRUE + if("delrecord") + DeleteRecord(usr, params["target"]) + . = TRUE + if("save") + Save(usr, params["target"]) + . = TRUE + if("load") + Load(usr) + . = TRUE + if("eject") + . = EjectDisk(usr) + +/obj/machinery/computer/cloning/ui_interact(mob/user, datum/tgui/ui) + updatemodules(TRUE) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "CloningConsole", "Cloning System Control") + ui.open() + ui.set_autoupdate(TRUE) + +/obj/machinery/computer/cloning/proc/finish_scan(mob/living/L, mob/user, prev_locked, body_only) + if(!scanner || !L) return + src.add_fingerprint(usr) + if(use_records) + scan_occupant(L, user, body_only) + else + clone_occupant(L, user) - if(href_list["task"]) - switch(href_list["task"]) - if("autoprocess") - if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL) - autoprocess = TRUE - START_PROCESSING(SSmachines, src) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - if("stopautoprocess") - autoprocess = FALSE - STOP_PROCESSING(SSmachines, src) - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - if("include_se") - include_se = TRUE - if("exclude_se") - include_se = FALSE - if("include_ui") - include_ui = TRUE - if("exclude_ui") - include_ui = FALSE - if("include_ue") - include_ue = TRUE - if("exclude_ue") - include_ue = FALSE - - else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational()) - scantemp = "" - var/body_only = href_list["body_only"] - loading = TRUE - updateUsrDialog() - playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) - say("Initiating scan...") - - spawn(20) - scan_occupant(scanner.occupant, usr, body_only) - - loading = FALSE - updateUsrDialog() - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + loading = FALSE + scanner.locked = prev_locked + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + SStgui.update_uis(src) // Immediate since it's not spammable +//Used by consoles without records +/obj/machinery/computer/cloning/proc/clone_occupant(occupant, mob/user) + var/mob/living/mob_occupant = get_mob_or_brainmob(occupant) + var/datum/dna/dna + if(ishuman(mob_occupant)) + var/mob/living/carbon/C = mob_occupant + dna = C.has_dna() + if(isbrain(mob_occupant)) + var/mob/living/brain/B = mob_occupant + dna = B.stored_dna + if(!can_scan(dna, mob_occupant, TRUE)) + return + var/clone_species + if(dna.species) + clone_species = dna.species + else + var/datum/species/rando_race = pick(GLOB.roundstart_races) + clone_species = rando_race.type + var/obj/machinery/clonepod/pod = GetAvailablePod() + //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. + if(!LAZYLEN(pods)) + temp = "No Clonepods detected." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + else if(!pod) + temp = "No Clonepods available." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + else if(pod.occupant) + temp = "Cloning cycle already in progress." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + else + pod.growclone(mob_occupant.real_name, dna.uni_identity, dna.mutation_index, null, null, clone_species, dna.blood_type, mob_occupant.faction) + temp = "[mob_occupant.real_name] => Cloning data sent to pod." + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + log_cloning("[user ? key_name(user) : "Unknown"] cloned [key_name(mob_occupant)] with [src] at [AREACOORD(src)].") - //No locking an open scanner. - else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational()) - if ((!scanner.locked) && (scanner.occupant)) - scanner.locked = TRUE +/obj/machinery/computer/cloning/proc/can_scan(datum/dna/dna, mob/living/mob_occupant, experimental = FALSE, datum/bank_account/account, body_only) + if(!istype(dna)) + scantemp = "Unable to locate valid genetic data." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + return FALSE + if(NO_DNA_COPY in dna.species.species_traits) + scantemp = "The DNA of this lifeform could not be read due to an unknown error!" + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + return FALSE + if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2)) + scantemp = "Subject's body is too damaged to scan properly." + playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) + return FALSE + if(HAS_TRAIT(mob_occupant, TRAIT_BADDNA)) + scantemp = "Subject's DNA is damaged beyond any hope of recovery." + playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) + return FALSE + if(!experimental) + if(!body_only && (mob_occupant.suiciding || mob_occupant.hellbound)) + scantemp = "Subject's brain is not responding to scanning stimuli." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - else - scanner.locked = FALSE - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - - else if(href_list["view_rec"]) - playsound(src, "terminal_type", 25, 0) - active_record = find_record("id", href_list["view_rec"], records) - if(active_record) - menu = 3 - else - temp = "Record missing." - - else if (href_list["del_rec"]) - if ((!active_record) || (menu < 3)) - return - if (menu == 3) //If we are viewing a record, confirm deletion - var/has_access = FALSE - if(ishuman(usr)) - var/mob/living/carbon/human/user = usr - var/obj/item/card/id/C = user.get_idcard(TRUE) - if(C) - if(check_access(C)) - has_access = TRUE - if(active_record.fields["body_only"]) //Body-only scans are not as important and can be deleted freely - has_access = TRUE - if(has_access) - temp = "Delete record?" - menu = 4 - playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) - else - temp = "Access Denied" - menu = 2 - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - - - else if (menu == 4) - log_cloning("[key_name(usr)] deleted [key_name(active_record.fields["mindref"])]'s cloning records from [src] at [AREACOORD(src)].") - temp = "[active_record.fields["name"]] => Record deleted." - records.Remove(active_record) - active_record = null - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - menu = 2 - - else if (href_list["disk"]) //Load or eject. - switch(href_list["disk"]) - if("load") - - - if (!diskette || !istype(diskette.fields)) - temp = "Load error." - updateUsrDialog() - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - return - if (!active_record) - temp = "Record error." - menu = 1 - updateUsrDialog() - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - return - - if(include_ue) - overwrite_field_if_available(active_record, diskette, "UE") - overwrite_field_if_available(active_record, diskette, "name") - overwrite_field_if_available(active_record, diskette, "blood_type") - if(include_ui) - overwrite_field_if_available(active_record, diskette, "UI") - if(include_se) - overwrite_field_if_available(active_record, diskette, "SE") - - log_cloning("[key_name(usr)] uploaded [key_name(active_record.fields["mindref"])]'s cloning records to [src] at [AREACOORD(src)] via [diskette].") - temp = "Load successful." - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - - if("eject") - if(diskette) - diskette.forceMove(drop_location()) - diskette = null - playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) - if("save") - if(!diskette || diskette.read_only || !active_record || !active_record.fields) - temp = "Save error." - updateUsrDialog() - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - return - - log_cloning("[key_name(usr)] added [key_name(active_record.fields["mindref"])]'s cloning records to [diskette] via [src] at [AREACOORD(src)].") - diskette.fields = active_record.fields.Copy() - diskette.name = "data disk - '[diskette.fields["name"]]'" - temp = "Save successful." - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - - else if (href_list["refresh"]) - updateUsrDialog() - playsound(src, "terminal_type", 25, 0) - - else if (href_list["clone"]) - var/datum/data/record/C = find_record("id", href_list["clone"], records) - var/empty = href_list["empty"] - //Look for that player! They better be dead! - if(C) - if(C.fields["body_only"] && !empty) - temp = "Cannot initiate regular cloning with body-only scans." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - var/obj/machinery/clonepod/pod = GetAvailablePod() - var/success = FALSE - //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. - if(!LAZYLEN(pods)) - temp = "No Clonepods detected." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - else if(!pod) - temp = "No Clonepods available." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - else if(!CONFIG_GET(flag/revival_cloning) && !empty) - temp = "Unable to initiate cloning cycle." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - else if(pod.occupant) - temp = "Cloning cycle already in progress." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - else - var/result = grow_clone_from_record(pod, C, empty) - if(result & CLONING_SUCCESS) - temp = "[C.fields["name"]] => Cloning cycle in progress..." - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - if(active_record == C) - active_record = null - menu = 1 - success = TRUE - if(!empty) - log_cloning("[key_name(usr)] initiated cloning of [key_name(C.fields["mindref"])] via [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].") - else - log_cloning("[key_name(usr)] initiated EMPTY cloning of [key_name(C.fields["mindref"])] via [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].") - if(result & CLONING_DELETE_RECORD) - if(active_record == C) - active_record = null - menu = 1 - records -= C - - if(!success) - temp = "[C.fields["name"]] => Initialisation failure." + return FALSE + if(!body_only && isnull(mob_occupant.mind)) + scantemp = "Mental interface failure." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + return FALSE + if(!body_only && SSeconomy.full_ancap) + if(!account) + scantemp = "Subject is either missing an ID card with a bank account on it, or does not have an account to begin with. Please ensure the ID card is on the body before attempting to scan." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - - else - temp = "Data corruption." + return FALSE + else + if(mob_occupant.suiciding) + scantemp = "Subject's brain is not responding to scanning stimuli." playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + return FALSE + if(!mob_occupant.mind) + scantemp = "Mental interface failure." + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + return FALSE + return TRUE - else if (href_list["menu"]) - menu = text2num(href_list["menu"]) - playsound(src, "terminal_type", 25, 0) - - add_fingerprint(usr) - updateUsrDialog() - return - -/obj/machinery/computer/cloning/proc/scan_occupant(occupant, mob/M, body_only) +/obj/machinery/computer/cloning/proc/scan_occupant(occupant, mob/user, body_only) var/mob/living/mob_occupant = get_mob_or_brainmob(occupant) var/datum/dna/dna var/datum/bank_account/has_bank_account @@ -539,36 +536,9 @@ if(isbrain(mob_occupant)) dna = B.stored_dna - - if(!istype(dna)) - scantemp = "Unable to locate valid genetic data." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - return - if(NO_DNA_COPY in dna.species.species_traits) - scantemp = "The DNA of this lifeform could not be read due to an unknown error!" - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - return - if(!body_only && (mob_occupant.suiciding || mob_occupant.hellbound)) - scantemp = "Subject's brain is not responding to scanning stimuli." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) + if(!can_scan(dna, mob_occupant, FALSE, has_bank_account, body_only)) return - if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2)) - scantemp = "Subject's body is too damaged to scan properly." - playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) - return - if(HAS_TRAIT(mob_occupant, TRAIT_BADDNA)) - scantemp = "Subject's DNA is damaged beyond any hope of recovery." - playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) - return - if (!body_only && isnull(mob_occupant.mind)) - scantemp = "Mental interface failure." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - return - if(!body_only && SSeconomy.full_ancap) - if(!has_bank_account) - scantemp = "Subject is either missing an ID card with a bank account on it, or does not have an account to begin with. Please ensure the ID card is on the body before attempting to scan." - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) - return + var/datum/data/record/R = new() if(dna.species) // We store the instance rather than the path, because some @@ -601,7 +571,7 @@ R.fields["bank_account"] = has_bank_account R.fields["mindref"] = "[REF(mob_occupant.mind)]" - R.fields["last_death"] = mob_occupant.stat == DEAD ? mob_occupant.mind.last_death : -1 + R.fields["last_death"] = (mob_occupant.stat == DEAD && mob_occupant.mind) ? mob_occupant.mind.last_death : -1 R.fields["body_only"] = body_only if(!body_only) @@ -626,5 +596,15 @@ else scantemp = "Subject successfully scanned." records += R - log_cloning("[M ? key_name(M) : "Autoprocess"] added the [body_only ? "body-only " : ""]record of [key_name(mob_occupant)] to [src] at [AREACOORD(src)].") + log_cloning("[user ? key_name(user) : "Autoprocess"] added the [body_only ? "body-only " : ""]record of [key_name(mob_occupant)] to [src] at [AREACOORD(src)].") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50) + +//Prototype cloning console, much more rudimental and lacks modern functions such as saving records, autocloning, or safety checks. +/obj/machinery/computer/cloning/prototype + name = "prototype cloning console" + desc = "Used to operate an experimental cloner." + icon_screen = "dna" + icon_keyboard = "med_key" + circuit = /obj/item/circuitboard/computer/cloning/prototype + clonepod_type = /obj/machinery/clonepod/experimental + use_records = FALSE //Wait, so you tell me it lacks records but you never set it as false? diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index b1809cd7f2cfd..58fe97af97d70 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -49,7 +49,7 @@ return if(!usr.canUseTopic(src, !issilicon(usr))) return - if(!is_station_level(z) && !is_reserved_level(z)) //Can only use in transit and on SS13 + if(!is_station_level(z) && !is_reserved_level(z) && !is_centcom_level(z)) //Can only use in transit, on Central Command and on SS13 to_chat(usr, "Unable to establish a connection: \black You're too far away from the station!") return usr.set_machine(src) @@ -134,12 +134,12 @@ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "") - if(!input || !(usr in view(1,src)) || !checkCCcooldown()) + if(!input || get_dist(usr, src) > 1 || !checkCCcooldown()) return CM.lastTimeUsed = world.time playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - send2otherserver("[station_name()]", input,"Comms_Console") - minor_announce(input, title = "Outgoing message to allied station") + SStopic.crosscomms_send("comms_console", input, station_name()) + minor_announce(input, title = "Outgoing message to allied station", html_encode = FALSE) usr.log_talk(input, LOG_SAY, tag="message to the other server") message_admins("[ADMIN_LOOKUPFLW(usr)] has sent a message to the other server.") deadchat_broadcast("[usr.real_name] has sent an outgoing message to the other station(s).", usr) @@ -167,11 +167,10 @@ if(points_to_check >= S.credit_cost) SSshuttle.shuttle_purchased = TRUE SSshuttle.unload_preview() - SSshuttle.load_template(S) SSshuttle.existing_shuttle = SSshuttle.emergency SSshuttle.action_load(S) D.adjust_money(-S.credit_cost) - minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits.[S.extra_desc ? " [S.extra_desc]" : ""]" , "Shuttle Purchase") + minor_announce("[S.name] has been purchased for [S.credit_cost] credits! Purchase authorized by [auth_id] [S.extra_desc ? " [S.extra_desc]" : ""]" , "Shuttle Purchase") message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].") log_game("[key_name(usr)] has purchased [S.name].") SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]") @@ -281,7 +280,7 @@ to_chat(usr, "Arrays recycling. Please stand by.") return var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to CentCom.", "") - if(!input || !(usr in view(1,src)) || !checkCCcooldown()) + if(!input || get_dist(usr, src) > 1 || !checkCCcooldown()) return playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) CentCom_announce(input, usr) @@ -298,7 +297,7 @@ playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "") - if(!input || !(usr in view(1,src)) || !checkCCcooldown()) + if(!input || get_dist(usr, src) > 1 || !checkCCcooldown()) return playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) Syndicate_announce(input, usr) @@ -319,12 +318,12 @@ to_chat(usr, "Arrays recycling. Please stand by.") return var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") - if(!input || !(usr in view(1,src)) || !checkCCcooldown()) + if(!input || get_dist(usr, src) > 1 || !checkCCcooldown()) return Nuke_request(input, usr) to_chat(usr, "Request sent.") usr.log_message("has requested the nuclear codes from CentCom", LOG_SAY) - priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/ai/commandreport.ogg') + priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self-Destruct Codes Requested", SSstation.announcer.get_rand_report_sound()) CM.lastTimeUsed = world.time @@ -554,18 +553,31 @@ if(STATE_PURCHASE) var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) + var/obj/item/circuitboard/computer/communications/CM = circuit dat += "Budget: [D.account_balance] Credits.
" dat += "
" - dat += "Caution: Purchasing dangerous shuttles may lead to mutiny and/or death.
" - dat += "
" + if((obj_flags & EMAGGED) || CM.insecure) + dat += "WARNING: Safety features disabled. Non-certified shuttles included. Order at your own peril.
" + else + dat += "Safety protocols in effect: These shuttles all fulfill NT safety standards.
" //not that they're very high but these won't kill everyone aboard for(var/shuttle_id in SSmapping.shuttle_templates) var/datum/map_template/shuttle/S = SSmapping.shuttle_templates[shuttle_id] - if(S.can_be_bought && S.credit_cost < INFINITY) + if(S.can_be_bought && S.credit_cost < INFINITY &! S.illegal_shuttle) dat += "[S.name] | [S.credit_cost] Credits
" dat += "[S.description]
" if(S.prerequisites) dat += "Prerequisites: [S.prerequisites]
" dat += "(Purchase)
" + if((obj_flags & EMAGGED) || CM.insecure) + dat += "NON-CERTIFIED SHUTTLES APPENDED BELOW.
" + for(var/shuttle_id in SSmapping.shuttle_templates) + var/datum/map_template/shuttle/S = SSmapping.shuttle_templates[shuttle_id] + if(S.illegal_shuttle && S.credit_cost < INFINITY) + dat += "[S.name] | [S.credit_cost] Credits
" + dat += "[S.description]
" + if(S.prerequisites) + dat += "Prerequisites: [S.prerequisites]
" + dat += "(Purchase)
" dat += "
\[ [(state != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" @@ -702,7 +714,7 @@ if(CHAT_FILTER_CHECK(input)) to_chat(user, "You cannot send an announcement that contains prohibited words.") return - SScommunications.make_announcement(user, is_silicon, input) + SScommunications.make_announcement(user, is_silicon, input, auth_id) deadchat_broadcast("[user.real_name] made a priority announcement from [get_area_name(usr, TRUE)].", user) /obj/machinery/computer/communications/proc/post_status(command, data1, data2) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index a3f66689d862e..85c18e52da68e 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -15,7 +15,7 @@ /obj/machinery/computer/crew/syndie icon_keyboard = "syndie_key" -/obj/machinery/computer/crew/interact(mob/user) +/obj/machinery/computer/crew/ui_interact(mob/user) GLOB.crewmonitor.show(user,src) GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) @@ -48,6 +48,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) jobs["Research Director"] = 30 jobs["Scientist"] = 31 jobs["Roboticist"] = 32 + jobs["Exploration Crew"] = 33 jobs["Chief Engineer"] = 40 jobs["Station Engineer"] = 41 jobs["Atmospheric Technician"] = 42 @@ -91,19 +92,20 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) if (!ui) ui = new(user, src, "CrewConsole") ui.open() + ui.set_autoupdate(TRUE) /datum/crewmonitor/proc/show(mob/M, source) - ui_sources[M] = source + ui_sources[WEAKREF(M)] = source ui_interact(M) /datum/crewmonitor/ui_host(mob/user) - return ui_sources[user] + return ui_sources[WEAKREF(user)] /datum/crewmonitor/ui_data(mob/user) - var/z = user.z + var/z = user.get_virtual_z_level() if(!z) var/turf/T = get_turf(user) - z = T.z + z = T.get_virtual_z_level() var/list/zdata = update_data(z) . = list() .["sensors"] = zdata @@ -135,15 +137,19 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) nanite_sensors = TRUE // Check if their z-level is correct and if they are wearing a uniform. // Accept H.z==0 as well in case the mob is inside an object. - if ((H.z == 0 || H.z == z || (is_station_level(H.z) && is_station_level(z))) && (istype(H.w_uniform, /obj/item/clothing/under) || nanite_sensors)) + if ((H.z == 0 || H.get_virtual_z_level() == z || (is_station_level(H.z) && is_station_level(z))) && (istype(H.w_uniform, /obj/item/clothing/under) || nanite_sensors)) U = H.w_uniform + //Radio transmitters are jammed + if(nanite_sensors ? H.is_jammed() : U.is_jammed()) + continue + // Are the suit sensors on? if (nanite_sensors || ((U.has_sensor > 0) && U.sensor_mode)) pos = H.z == 0 || (nanite_sensors || U.sensor_mode == SENSOR_COORDS) ? get_turf(H) : null // Special case: If the mob is inside an object confirm the z-level on turf level. - if (H.z == 0 && (!pos || (pos.z != z) && !(is_station_level(pos.z) && is_station_level(z)))) + if (H.z == 0 && (!pos || (pos.get_virtual_z_level() != z) && !(is_station_level(pos.z) && is_station_level(z)))) continue I = H.wear_id ? H.wear_id.GetID() : null diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 4cb6145b59a83..c697fb3fd6432 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -10,13 +10,19 @@ #define RADIATION_DURATION_MAX 30 #define RADIATION_ACCURACY_MULTIPLIER 3 //larger is less accurate +/// Special status indicating a scanner occupant is transforming eg. from monkey to human +#define STATUS_TRANSFORMING 4 #define RADIATION_IRRADIATION_MULTIPLIER 1 //multiplier for how much radiation a test subject receives -#define SCANNER_ACTION_SE 1 -#define SCANNER_ACTION_UI 2 -#define SCANNER_ACTION_UE 3 -#define SCANNER_ACTION_MIXED 4 +#define SEARCH_OCCUPANT 1 +/// Flag for the mutation ref search system. Search will include console storage +#define SEARCH_STORED 2 +/// Flag for the mutation ref search system. Search will include diskette storage +#define SEARCH_DISKETTE 4 +/// Flag for the mutation ref search system. Search will include advanced injector mutations +#define SEARCH_ADV_INJ 8 + /obj/machinery/computer/scan_consolenew name = "\improper DNA scanner access console" @@ -38,7 +44,7 @@ var/radstrength = 1 var/max_chromosomes = 5 ///Amount of mutations we can store - var/list/buffer[NUMBER_OF_BUFFERS] + var/list/genetic_makeup_buffer[NUMBER_OF_BUFFERS] ///mutations we have stored var/list/stored_mutations = list() ///chromosomes we have stored @@ -58,10 +64,65 @@ var/current_screen = "mainmenu" var/current_mutation //what block are we inspecting? only used when screen = "info" var/current_storage //what storage block are we looking at? - var/obj/machinery/dna_scannernew/connected = null + var/obj/machinery/dna_scannernew/connected_scanner = null var/obj/item/disk/data/diskette = null var/list/delayed_action = null + /// Index of the enzyme being modified during delayed enzyme pulse operations + var/rad_pulse_index = 0 + /// World time when the enzyme pulse should complete + var/rad_pulse_timer = 0 + + /// Used for setting tgui data - Whether the connected DNA Scanner is usable + var/can_use_scanner = FALSE + /// Used for setting tgui data - Whether the current DNA Scanner occupant is viable for genetic modification + var/is_viable_occupant = FALSE + /// Used for setting tgui data - Whether Scramble DNA is ready + var/is_scramble_ready = FALSE + /// Used for setting tgui data - Whether JOKER algorithm is ready + var/is_joker_ready = FALSE + /// Used for setting tgui data - Whether injectors are ready to be printed + var/is_injector_ready = FALSE + /// Used for setting tgui data - Wheher an enzyme pulse operation is ongoing + var/is_pulsing_rads = FALSE + /// Used for setting tgui data - Time until scramble is ready + var/time_to_scramble = 0 + /// Used for setting tgui data - Time until joker is ready + var/time_to_joker = 0 + /// Used for setting tgui data - Time until injectors are ready + var/time_to_injector = 0 + /// Used for setting tgui data - Time until the enzyme pulse is complete + var/time_to_pulse = 0 + + /// Current DNA Scanner occupant + var/mob/living/carbon/scanner_occupant = null + + /// Used for setting tgui data - List of occupant mutations + var/list/tgui_occupant_mutations = list() + /// Used for setting tgui data - List of DNA Console stored mutations + var/list/tgui_console_mutations = list() + /// Used for setting tgui data - List of diskette stored mutations + var/list/tgui_diskette_mutations = list() + /// Used for setting tgui data - List of DNA Console chromosomes + var/list/tgui_console_chromosomes = list() + /// Used for setting tgui data - List of occupant mutations + var/list/tgui_genetic_makeup = list() + /// Used for setting tgui data - List of occupant mutations + var/list/tgui_advinjector_mutations = list() + + + /// State of tgui view, i.e. which tab is currently active, or which genome we're currently looking at. + var/list/list/tgui_view_state = list() + +/obj/machinery/computer/scan_consolenew/process() + . = ..() + + // This is for pulsing the UI element with radiation as part of genetic makeup + // If rad_pulse_index > 0 then it means we're attempting a rad pulse + if((rad_pulse_index > 0) && (rad_pulse_timer <= world.time)) + rad_pulse() + return + /obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) @@ -96,18 +157,108 @@ else return ..() +/obj/machinery/computer/scan_consolenew/AltClick(mob/user) + // Make sure the user can interact with the machine. + if(!user.canUseTopic(src, !issilicon(user))) + return + + eject_disk(user) + +/obj/machinery/computer/scan_consolenew/proc/connect_to_scanner() + var/obj/machinery/dna_scannernew/test_scanner = null + var/obj/machinery/dna_scannernew/broken_scanner = null + + // Look in each cardinal direction and try and find a DNA Scanner + // If you find a DNA Scanner, check to see if it broken or working + // If it's working, set the current scanner and return early + // If it's not working, remember it anyway as a broken scanner + for(var/direction in GLOB.cardinals) + test_scanner = locate(/obj/machinery/dna_scannernew, get_step(src, direction)) + if(!isnull(test_scanner)) + if(test_scanner.is_operational()) + connect_scanner(test_scanner) + return + else + broken_scanner = test_scanner + + // Ultimately, if we have a broken scanner, we'll attempt to connect to it as + // a fallback case, but the code above will prefer a working scanner + if(!isnull(broken_scanner)) + connect_scanner(broken_scanner) + +/obj/machinery/computer/scan_consolenew/proc/connect_scanner(obj/machinery/dna_scannernew/scanner) + if(connected_scanner) + UnregisterSignal(connected_scanner, COMSIG_MACHINE_OPEN) + UnregisterSignal(connected_scanner, COMSIG_MACHINE_CLOSE) + + if(scanner) + RegisterSignal(scanner, COMSIG_MACHINE_OPEN, .proc/on_scanner_open) + RegisterSignal(scanner, COMSIG_MACHINE_CLOSE, .proc/on_scanner_close) + + connected_scanner = scanner + /obj/machinery/computer/scan_consolenew/Initialize() . = ..() - for(var/direction in GLOB.cardinals) - connected = locate(/obj/machinery/dna_scannernew, get_step(src, direction)) - if(!isnull(connected)) - break + + // Connect with a nearby DNA Scanner on init + connect_to_scanner() + + // Set the default tgui state + set_default_state() injectorready = world.time + INJECTOR_TIMEOUT scrambleready = world.time + SCRAMBLE_TIMEOUT jokerready = world.time + JOKER_TIMEOUT stored_research = SSresearch.science_tech +/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, datum/tgui/ui) + // Most of ui_interact is spent setting variables for passing to the tgui + // interface. + // We can also do some general state processing here too as it's a good + // indication that a player is using the console. + + var/scanner_op = scanner_operational() + var/can_modify_occ = can_modify_occupant() + + // Check for connected AND operational scanner. + if(scanner_op) + can_use_scanner = TRUE + else + can_use_scanner = FALSE + connect_scanner(null) + is_viable_occupant = FALSE + + // Check for a viable occupant in the scanner. + if(can_modify_occ) + is_viable_occupant = TRUE + else + is_viable_occupant = FALSE + + + // Populates various buffers for passing to tgui + build_mutation_list(can_modify_occ) + build_genetic_makeup_list() + + // Populate variables for passing to tgui interface + is_scramble_ready = (scrambleready < world.time) + time_to_scramble = round((scrambleready - world.time)/10) + + is_joker_ready = (jokerready < world.time) + time_to_joker = round((jokerready - world.time)/10) + + is_injector_ready = (injectorready < world.time) + time_to_injector = round((injectorready - world.time)/10) + + is_pulsing_rads = ((rad_pulse_index > 0) && (rad_pulse_timer > world.time)) + time_to_pulse = round((rad_pulse_timer - world.time)/10) + + // Attempt to update tgui ui, open and update if needed. + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "DnaConsole") + ui.open() + ui.set_autoupdate(TRUE) + /obj/machinery/computer/scan_consolenew/examine(mob/user) . = ..() if(jokerready < world.time) @@ -115,839 +266,1658 @@ else . += "JOKER algorithm available in about [round(0.00166666667 * (jokerready - world.time))] minutes." -/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, last_change) - . = ..() - if(!user) - return - var/datum/browser/popup = new(user, "scannernew", "DNA Modifier Console", 800, 630) // Set up the popup browser window - if(user.client) - var/datum/asset/simple/assets = get_asset_datum(/datum/asset/simple/genetics) - assets.send(user.client) - popup.add_stylesheet("scannernew", 'html/browser/scannernew.css') - - var/mob/living/carbon/viable_occupant - var/list/occupant_status = list("
Subject Status:
")
- var/scanner_status
- var/list/temp_html = list()
- if(connected && connected.is_operational())
- if(connected.occupant) //set occupant_status message
- viable_occupant = connected.occupant
- if(viable_occupant.has_dna() && !HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) && !HAS_TRAIT(viable_occupant, TRAIT_BADDNA) || (connected.scan_level == 3)) //occupant is viable for dna modification
- occupant_status += "[viable_occupant.name] => "
- switch(viable_occupant.stat)
- if(CONSCIOUS)
- occupant_status += "Conscious"
- if(UNCONSCIOUS)
- occupant_status += "Unconscious"
- else
- occupant_status += "DEAD"
- occupant_status += "
Health:
[viable_occupant.health] %
Radiation Level:
[viable_occupant.radiation/(RAD_MOB_SAFE/100)] %
Unique Enzymes :
[viable_occupant.dna.unique_enzymes]
Last Operation:
[last_change ? last_change : "----"]
")
- status += ""
- status += occupant_status
-
-
- status += ""
- var/stddev = radstrength*RADIATION_STRENGTH_MULTIPLIER
- status += ""
- status += ""
- if(connected)
- stddev = RADIATION_ACCURACY_MULTIPLIER/(radduration + (connected.precision_coeff ** 2))
- max_storage = 4 + (2*connected.precision_coeff)
- max_chromosomes = 4 + connected.precision_coeff
- max_injector_instability = 20 + (20*connected.scan_level)
- else
- stddev = RADIATION_ACCURACY_MULTIPLIER/radduration
- var/chance_to_hit
- switch(stddev) //hardcoded values from a z-table for a normal distribution
- if(0 to 0.25)
- chance_to_hit = ">95 %"
- if(0.25 to 0.5)
- chance_to_hit = "68-95 %"
- if(0.5 to 0.75)
- chance_to_hit = "55-68 %"
- else
- chance_to_hit = "<38 %"
- status += ""
- status += ""
- status += "
" // Close statusDisplay div
- var/list/buttons = list("Scan")
- if(connected)
- buttons += "[connected.state_open ? "Close" : "Open"] Scanner"
- if (connected.state_open)
- buttons += "[connected.locked ? "Unlock" : "Lock"] Scanner"
- else
- buttons += "[connected.locked ? "Unlock" : "Lock"] Scanner"
- else
- buttons += "Open Scanner Lock Scanner"
- if(viable_occupant && (scrambleready < world.time))
- buttons += "Scramble DNA"
- else
- buttons += "Scramble DNA"
- if(diskette)
- buttons += "Disk"
+ data["subjectStatus"] = scanner_occupant.stat
+ data["subjectHealth"] = scanner_occupant.health
+ data["subjectRads"] = scanner_occupant.radiation/(RAD_MOB_SAFE/100)
+ data["subjectEnzymes"] = scanner_occupant.dna.unique_enzymes
+ data["isMonkey"] = ismonkey(scanner_occupant)
+ data["subjectUNI"] = scanner_occupant.dna.uni_identity
+ data["storage"]["occupant"] = tgui_occupant_mutations
+ //data["subjectMutations"] = tgui_occupant_mutations
else
- buttons += "Disk"
- if(current_screen == "mutations")
- buttons += "Mutations"
+ data["subjectName"] = null
+ data["subjectStatus"] = null
+ data["subjectHealth"] = null
+ data["subjectRads"] = null
+ data["subjectEnzymes"] = null
+ //data["subjectMutations"] = null
+ data["storage"]["occupant"] = null
+
+ data["hasDelayedAction"] = (delayed_action != null)
+ data["isScrambleReady"] = is_scramble_ready
+ data["isJokerReady"] = is_joker_ready
+ data["isInjectorReady"] = is_injector_ready
+ data["scrambleSeconds"] = time_to_scramble
+ data["jokerSeconds"] = time_to_joker
+ data["injectorSeconds"] = time_to_injector
+ data["isPulsingRads"] = is_pulsing_rads
+ data["radPulseSeconds"] = time_to_pulse
+
+ if(diskette != null)
+ data["hasDisk"] = TRUE
+ data["diskCapacity"] = diskette.max_mutations - LAZYLEN(diskette.mutations)
+ data["diskReadOnly"] = diskette.read_only
+ //data["diskMutations"] = tgui_diskette_mutations
+ data["storage"]["disk"] = tgui_diskette_mutations
+ data["diskHasMakeup"] = (LAZYLEN(diskette.genetic_makeup_buffer) > 0)
+ data["diskMakeupBuffer"] = diskette.genetic_makeup_buffer.Copy()
else
- buttons += "Mutations"
- if((current_screen == "mainmenu") || !current_screen)
- buttons += "Genetic Sequencer"
- else
- buttons += "Genetic Sequencer"
- if(current_screen == "ui")
- buttons += "Unique Identifiers"
- else
- buttons += "Unique Identifiers"
- if(current_screen == "advinjector")
- buttons += "Adv. Injectors"
- else
- buttons += "Adv. Injectors"
+ data["hasDisk"] = FALSE
+ data["diskCapacity"] = 0
+ data["diskReadOnly"] = TRUE
+ //data["diskMutations"] = null
+ data["storage"]["disk"] = null
+ data["diskHasMakeup"] = FALSE
+ data["diskMakeupBuffer"] = null
+
+ data["mutationCapacity"] = max_storage - LAZYLEN(stored_mutations)
+ //data["mutationStorage"] = tgui_console_mutations
+ data["storage"]["console"] = tgui_console_mutations
+ data["chromoCapacity"] = max_chromosomes - LAZYLEN(stored_chromosomes)
+ data["chromoStorage"] = tgui_console_chromosomes
+ data["makeupCapacity"] = NUMBER_OF_BUFFERS
+ data["makeupStorage"] = tgui_genetic_makeup
+
+ //data["advInjectors"] = tgui_advinjector_mutations
+ data["storage"]["injector"] = tgui_advinjector_mutations
+ data["maxAdvInjectors"] = max_injector_selections
+
+ return data
+
+/obj/machinery/computer/scan_consolenew/ui_act(action, list/params)
+ if(..())
+ return TRUE
- switch(current_screen)
- if("working")
- temp_html += status
- temp_html += "Scanner:
[scanner_status]
Radiation Emitter Status
Output Level:
[radstrength]
\> Mutation:
(-[stddev] to +[stddev] = 68 %) (-[2*stddev] to +[2*stddev] = 95 %)
Pulse Duration:
[radduration]
\> Accuracy:
[chance_to_hit]
System Busy
" - temp_html += "Working ... Please wait ([DisplayTimeText(radduration*10)])" - if("ui") - temp_html += status - temp_html += buttons - temp_html += "Unique Identifiers
" - temp_html += "-- Output Level ++" - temp_html += "-- Pulse Duration ++" - temp_html += "
Irradiate Subject
" - temp_html += "Unique Identifier:
"
- var/max_line_len = 7*DNA_BLOCK_SIZE
- if(viable_occupant)
- temp_html += "
1
"
- var/char = ""
- var/ui_text = viable_occupant.dna.uni_identity
- var/len_byte = length(ui_text)
- var/char_it = 0
- for(var/byte_it = 1, byte_it <= len_byte, byte_it += length(char))
- char_it++
- char = ui_text[byte_it]
- temp_html += "[char]"
- if((char_it % max_line_len) == 0)
- temp_html += ""
- if((char_it % DNA_BLOCK_SIZE) == 0 && byte_it < len_byte)
- temp_html += "
[(char_it / DNA_BLOCK_SIZE) + 1]
"
- else
- temp_html += "---------"
- temp_html += "Buffer Menu
" - - if(istype(buffer)) - for(var/i=1, i<=buffer.len, i++) - temp_html += "Slot [i]: " - var/list/buffer_slot = buffer[i] - if( !buffer_slot || !buffer_slot.len || !buffer_slot["name"] || !((buffer_slot["UI"] && buffer_slot["UE"]) || buffer_slot["SE"]) ) - temp_html += "
\tNo Data" - if(viable_occupant) - temp_html += "
Save to Buffer" - else - temp_html += "
Save to Buffer" - temp_html += "Clear Buffer" - if(diskette) - temp_html += "Load from Disk" - else - temp_html += "Load from Disk" - temp_html += "Save to Disk" - else - var/ui = buffer_slot["UI"] - var/ue = buffer_slot["UE"] - var/name = buffer_slot["name"] - var/label = buffer_slot["label"] - var/blood_type = buffer_slot["blood_type"] - temp_html += "
\tLabel: [label ? label : name]" - temp_html += "
\tSubject: [name]" - if(ue && name && blood_type) - temp_html += "
\tBlood Type: [blood_type]" - temp_html += "
\tUE: [ue] " - if(viable_occupant) - temp_html += "Occupant" - else - temp_html += "Occupant" - temp_html += "Occupant:Delayed" - if(injectorready < world.time) - temp_html += "Injector" - else - temp_html += "Injector" - else - temp_html += "
\tBlood Type: No Data" - temp_html += "
\tUE: No Data" - if(ui) - temp_html += "
\tUI: [ui] " - if(viable_occupant) - temp_html += "Occupant" - else - temp_html += "Occupant" - temp_html += "Occupant:Delayed" - if(injectorready < world.time) - temp_html += "Injector" - else - temp_html += "Injector" - else - temp_html += "
\tUI: No Data" - if(ue && name && blood_type && ui) - temp_html += "
\tUI+UE: [ui]/[ue] " - if(viable_occupant) - temp_html += "Occupant" - else - temp_html += "Occupant" - temp_html += "Occupant:Delayed" - if(injectorready < world.time) - temp_html += "UI+UE Injector" - else - temp_html += "UI+UE Injector" - if(viable_occupant) - temp_html += "
Save to Buffer" - else - temp_html += "
Save to Buffer" - temp_html += "Clear Buffer" - if(diskette) - temp_html += "Load from Disk" - else - temp_html += "Load from Disk" - if(diskette && !diskette.read_only) - temp_html += "Save to Disk" - else - temp_html += "Save to Disk" - if("disk") - temp_html += status - temp_html += buttons - if(diskette) - temp_html += "
[diskette.name]
" - temp_html += "Eject Disk
" - if(LAZYLEN(diskette.mutations)) - temp_html += "
| [A.name] | " - temp_html += "Delete | " - if(LAZYLEN(stored_mutations) < max_storage) - temp_html += "Import | " - else - temp_html += "Import | " - temp_html += "
Load diskette to start ----------" - if("info") - if(LAZYLEN(stored_mutations)) - if(LAZYLEN(stored_mutations) >= current_storage) - var/datum/mutation/human/HM = stored_mutations[current_storage] - if(HM) - temp_html += display_sequence(HM.type, current_storage) - else - current_screen = "mainmenu" - if("mutations") - temp_html += status - temp_html += buttons - temp_html += "
Mutation Storage:
"
- temp_html += "| [HM.name] | " - if(diskette) - temp_html += "Export | " - else - temp_html += "Export | " - temp_html += "Delete | " - if(combine == HM.type) - temp_html += "Combine | Combine | " - temp_html += "
" - temp_html += "
Chromosome Storage:
"
- temp_html += "| [CM.name] |
Advanced Injectors:
" - temp_html += "" - for(var/A in injector_selection) - temp_html += "
[A]"
- var/list/true_selection = injector_selection[A]
- temp_html += "
" - for(var/B in true_selection) - var/datum/mutation/human/HM = B - var/mutcolor - switch(HM.quality) - if(POSITIVE) - mutcolor = "good" - if(MINOR_NEGATIVE) - mutcolor = "average" - if(NEGATIVE) - mutcolor = "bad" - temp_html += "
" - if(viable_occupant) - if(viable_occupant) - for(var/A in get_mutation_list()) - temp_html += display_inactive_sequence(A) - temp_html += "
" - else - temp_html += "----" - if(viable_occupant && (current_mutation in get_mutation_list(viable_occupant))) - temp_html += display_sequence(current_mutation) - temp_html += "
" - else - temp_html += "----------" + add_fingerprint(usr) + usr.set_machine(src) - popup.set_content(temp_html.Join()) - popup.open() + switch(action) + // Connect this DNA Console to a nearby DNA Scanner + // Usually only activate as an option if there is no connected scanner + if("connect_scanner") + connect_to_scanner() + return -/obj/machinery/computer/scan_consolenew/proc/display_inactive_sequence(mutation) - var/temp_html = "" - var/class = "unselected" - var/mob/living/carbon/viable_occupant = get_viable_occupant() - if(!viable_occupant) - return + // Toggle the door open/closed status on attached DNA Scanner + if("toggle_door") + // GUARD CHECK - Scanner still connected and operational? + if(!scanner_operational()) + return - var/location = viable_occupant.dna.mutation_index.Find(mutation) //We do this because we dont want people using sysexp or similair tools to just read the mutations. - - if(!location) //Do this only when needed, dont make a list with mutations for every iteration if you dont need to - var/list/mutations = get_mutation_list(TRUE) - if(mutation in mutations) - location = mutations.Find(mutation) - if(mutation == current_mutation) - class = "selected" - if(location > DNA_MUTATION_BLOCKS) - temp_html += "![Extra Mutation]([SSassets.transport.get_asset_url("dna_extra.png")])
"
- else if(mutation in stored_research.discovered_mutations)
- temp_html += "![Discovered Mutation]([SSassets.transport.get_asset_url("dna_discovered.png")])
"
- else
- temp_html += "![Undiscovered]([SSassets.transport.get_asset_url("dna_undiscovered.png")])
"
- return temp_html
+ connected_scanner.toggle_open(usr)
+ return
-/obj/machinery/computer/scan_consolenew/proc/display_sequence(mutation, storage_slot) //Storage slot is for when viewing from the stored mutations
- var/temp_html = ""
- if(!mutation)
- temp_html += "ERR-"
- return
- var/mut_name = "Unknown gene"
- var/mut_desc = "No information available."
- var/alias
- var/discovered = FALSE
- var/active = FALSE
- var/scrambled = FALSE
- var/instability
- var/mob/living/carbon/viable_occupant = get_viable_occupant()
- var/datum/mutation/human/HM = get_valid_mutation(mutation)
-
- if(viable_occupant)
- var/datum/mutation/human/M = viable_occupant.dna.get_mutation(mutation)
- if(M)
- scrambled = M.scrambled
- active = TRUE
- var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(mutation)
- alias = A.alias
- if(active && !scrambled)
- discover(mutation)
- if(stored_research && (mutation in stored_research.discovered_mutations))
- mut_name = A.name
- mut_desc = A.desc
- discovered = TRUE
- instability = A.instability
- var/extra
- if(viable_occupant && !(storage_slot || viable_occupant.dna.mutation_in_sequence(mutation)))
- extra = TRUE
- if(discovered && !scrambled)
- var/mutcolor
- switch(A.quality)
- if(POSITIVE)
- mutcolor = "good"
- if(MINOR_NEGATIVE)
- mutcolor = "average"
- if(NEGATIVE)
- mutcolor = "bad"
- if(HM)
- instability *= GET_MUTATION_STABILIZER(HM)
- temp_html += "
" - for(var/B in true_selection) - var/datum/mutation/human/HM = B - var/mutcolor - switch(HM.quality) - if(POSITIVE) - mutcolor = "good" - if(MINOR_NEGATIVE) - mutcolor = "average" - if(NEGATIVE) - mutcolor = "bad" - temp_html += "
[HM.name] "
- temp_html += "Remove
"
- if(injectorready < world.time)
- temp_html += " Print Advanced Injector"
- else
- temp_html += "
"
+ . = TRUE
- else
- temp_html += status
- temp_html += buttons
- temp_html += "Print Advanced Injector"
- temp_html += "Remove Injector
"
- temp_html += "Genetic Sequence:
" - if(viable_occupant) - if(viable_occupant) - for(var/A in get_mutation_list()) - temp_html += display_inactive_sequence(A) - temp_html += "
" - else - temp_html += "----" - if(viable_occupant && (current_mutation in get_mutation_list(viable_occupant))) - temp_html += display_sequence(current_mutation) - temp_html += "
" - else - temp_html += "----------" + add_fingerprint(usr) + usr.set_machine(src) - popup.set_content(temp_html.Join()) - popup.open() + switch(action) + // Connect this DNA Console to a nearby DNA Scanner + // Usually only activate as an option if there is no connected scanner + if("connect_scanner") + connect_to_scanner() + return -/obj/machinery/computer/scan_consolenew/proc/display_inactive_sequence(mutation) - var/temp_html = "" - var/class = "unselected" - var/mob/living/carbon/viable_occupant = get_viable_occupant() - if(!viable_occupant) - return + // Toggle the door open/closed status on attached DNA Scanner + if("toggle_door") + // GUARD CHECK - Scanner still connected and operational? + if(!scanner_operational()) + return - var/location = viable_occupant.dna.mutation_index.Find(mutation) //We do this because we dont want people using sysexp or similair tools to just read the mutations. - - if(!location) //Do this only when needed, dont make a list with mutations for every iteration if you dont need to - var/list/mutations = get_mutation_list(TRUE) - if(mutation in mutations) - location = mutations.Find(mutation) - if(mutation == current_mutation) - class = "selected" - if(location > DNA_MUTATION_BLOCKS) - temp_html += "
"
- else if(mutation in stored_research.discovered_mutations)
- temp_html += ""
- else
- temp_html += ""
- return temp_html
+ connected_scanner.toggle_open(usr)
+ return
-/obj/machinery/computer/scan_consolenew/proc/display_sequence(mutation, storage_slot) //Storage slot is for when viewing from the stored mutations
- var/temp_html = ""
- if(!mutation)
- temp_html += "ERR-"
- return
- var/mut_name = "Unknown gene"
- var/mut_desc = "No information available."
- var/alias
- var/discovered = FALSE
- var/active = FALSE
- var/scrambled = FALSE
- var/instability
- var/mob/living/carbon/viable_occupant = get_viable_occupant()
- var/datum/mutation/human/HM = get_valid_mutation(mutation)
-
- if(viable_occupant)
- var/datum/mutation/human/M = viable_occupant.dna.get_mutation(mutation)
- if(M)
- scrambled = M.scrambled
- active = TRUE
- var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(mutation)
- alias = A.alias
- if(active && !scrambled)
- discover(mutation)
- if(stored_research && (mutation in stored_research.discovered_mutations))
- mut_name = A.name
- mut_desc = A.desc
- discovered = TRUE
- instability = A.instability
- var/extra
- if(viable_occupant && !(storage_slot || viable_occupant.dna.mutation_in_sequence(mutation)))
- extra = TRUE
- if(discovered && !scrambled)
- var/mutcolor
- switch(A.quality)
- if(POSITIVE)
- mutcolor = "good"
- if(MINOR_NEGATIVE)
- mutcolor = "average"
- if(NEGATIVE)
- mutcolor = "bad"
- if(HM)
- instability *= GET_MUTATION_STABILIZER(HM)
- temp_html += "[mut_name] ([alias])
" - temp_html += "
" - temp_html += "
Instability : [round(instability)]
" - else - temp_html += "
Medical Robots:" var/bdat = null for(var/mob/living/simple_animal/bot/medbot/M in GLOB.alive_mob_list) - if(M.z != src.z) + if(M.get_virtual_z_level() != src.get_virtual_z_level()) continue //only find medibots on the same z-level as the computer var/turf/bl = get_turf(M) if(bl) //if it can't find a turf for the medibot, then it probably shouldn't be showing up @@ -271,7 +271,7 @@
Notes: [Dis.desc]
-
Severity: [Dis.severity]"} +
Danger: [Dis.danger]"} else if(href_list["del_all"]) src.temp = "Are you sure you wish to delete all records?
\n\tYes
\n\tNo
" @@ -590,4 +590,5 @@ icon_screen = "medlaptop" icon_keyboard = "laptop_key" clockwork = TRUE //it'd look weird + broken_overlay_emissive = TRUE pass_flags = PASSTABLE diff --git a/code/game/machinery/computer/prisoner/_prisoner.dm b/code/game/machinery/computer/prisoner/_prisoner.dm index 743950c4a5bfb..ccc27734a3bb8 100644 --- a/code/game/machinery/computer/prisoner/_prisoner.dm +++ b/code/game/machinery/computer/prisoner/_prisoner.dm @@ -16,7 +16,6 @@ /obj/machinery/computer/prisoner/AltClick(mob/user) id_eject(user) - return ..() /obj/machinery/computer/prisoner/proc/id_insert(mob/user, obj/item/card/id/prisoner/P) if(istype(P)) diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index 7129e3d762dbf..bd9636e182923 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -30,6 +30,7 @@ if(!ui) ui = new(user, src, "GulagTeleporterConsole") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_data(mob/user) var/list/data = list() @@ -53,14 +54,14 @@ if(teleporter) data["teleporter"] = teleporter - data["teleporter_location"] = "([teleporter.x], [teleporter.y], [teleporter.z])" + data["teleporter_location"] = "([teleporter.x], [teleporter.y], [teleporter.get_virtual_z_level()])" data["teleporter_lock"] = teleporter.locked data["teleporter_state_open"] = teleporter.state_open else data["teleporter"] = null if(beacon) data["beacon"] = beacon - data["beacon_location"] = "([beacon.x], [beacon.y], [beacon.z])" + data["beacon_location"] = "([beacon.x], [beacon.y], [beacon.get_virtual_z_level()])" else data["beacon"] = null if(contained_id) @@ -74,10 +75,10 @@ return data /obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_act(action, list/params) - if(isliving(usr)) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) if(..()) return + if(isliving(usr)) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) if(!allowed(usr)) to_chat(usr, "Access denied.") return @@ -147,13 +148,11 @@ log_game("[key_name(user)] teleported [key_name(prisoner)] to the Labor Camp [COORD(beacon)] for [id_goal_not_set ? "default goal of ":""][contained_id.goal] points.") teleporter.handle_prisoner(contained_id, temporary_record) playsound(src, 'sound/weapons/emitter.ogg', 50, TRUE) - prisoner.forceMove(get_turf(beacon)) - prisoner.Paralyze(40) // small travel dizziness - to_chat(prisoner, "The teleportation makes you a little dizzy.") - new /obj/effect/particle_effect/sparks(get_turf(prisoner)) - playsound(src, "sparks", 50, TRUE) - if(teleporter.locked) - teleporter.locked = FALSE - teleporter.toggle_open() - contained_id = null - temporary_record = null + if(do_teleport(prisoner, get_turf(beacon))) + prisoner.Paralyze(40) // small travel dizziness + to_chat(prisoner, "The teleportation makes you a little dizzy.") + if(teleporter.locked) + teleporter.locked = FALSE + teleporter.toggle_open() + contained_id = null + temporary_record = null diff --git a/code/game/machinery/computer/prisoner/management.dm b/code/game/machinery/computer/prisoner/management.dm index 4346ae84f6117..fb9f9694b6505 100644 --- a/code/game/machinery/computer/prisoner/management.dm +++ b/code/game/machinery/computer/prisoner/management.dm @@ -35,7 +35,7 @@ var/turf/Tr = null for(var/obj/item/implant/chem/C in GLOB.tracked_chem_implants) Tr = get_turf(C) - if((Tr) && (Tr.z != src.z)) + if((Tr) && (Tr.get_virtual_z_level() != src.get_virtual_z_level())) continue//Out of range if(!C.imp_in) continue @@ -50,7 +50,7 @@ if(!isliving(T.imp_in)) continue Tr = get_turf(T) - if((Tr) && (Tr.z != src.z)) + if((Tr) && (Tr.get_virtual_z_level() != src.get_virtual_z_level())) continue//Out of range var/loc_display = "Unknown" diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 584bf92a62d94..a1326924b71f7 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -32,6 +32,7 @@ if(!ui) ui = new(user, src, "RoboticsControlConsole") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/computer/robotics/ui_data(mob/user) var/list/data = list() @@ -48,7 +49,7 @@ for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs) if(!can_control(user, R)) continue - if(z != (get_turf(R)).z) + if(get_virtual_z_level() != (get_turf(R)).get_virtual_z_level()) continue var/list/cyborg_data = list( name = R.name, @@ -66,7 +67,7 @@ for(var/mob/living/simple_animal/drone/D in GLOB.drones_list) if(D.hacked) continue - if(z != (get_turf(D)).z) + if(get_virtual_z_level() != (get_turf(D)).get_virtual_z_level()) continue var/list/drone_data = list( name = D.name, @@ -89,6 +90,8 @@ var/turf/T = get_turf(R) message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(R, R.client)] at [ADMIN_VERBOSEJMP(T)]!") log_game("\[key_name(usr)] detonated [key_name(R)]!") + log_combat(usr, R, "detonated cyborg") + if(R.connected_ai) to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") R.self_destruct() @@ -100,6 +103,7 @@ if(can_control(usr, R) && !..()) message_admins("[ADMIN_LOOKUPFLW(usr)] [!R.lockcharge ? "locked down" : "released"] [ADMIN_LOOKUPFLW(R)]!") log_game("[key_name(usr)] [!R.lockcharge ? "locked down" : "released"] [key_name(R)]!") + log_combat(usr, R, "[!R.lockcharge ? "locked down" : "released"] cyborg") R.SetLockdown(!R.lockcharge) to_chat(R, "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") if(R.connected_ai) @@ -126,5 +130,5 @@ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, TRUE, D) s.start() - D.visible_message("\the [D] self destructs!") + D.visible_message("\the [D] self-destructs!") D.gib() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 61aaf71181552..cbd3a10f619e6 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -3,7 +3,7 @@ desc = "Used to view and edit personnel's security records." icon_screen = "security" icon_keyboard = "security_key" - req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS) + req_one_access = list(ACCESS_SEC_RECORDS) circuit = /obj/item/circuitboard/computer/secure_data var/obj/item/card/id/scan = null var/authenticated = null @@ -22,6 +22,181 @@ var/order = 1 // -1 = Descending - 1 = Ascending light_color = LIGHT_COLOR_RED +/obj/machinery/computer/secure_data/Initialize(mapload, obj/item/circuitboard/C) + . = ..() + AddComponent(/datum/component/usb_port, list( + /obj/item/circuit_component/arrest_console_data, + /obj/item/circuit_component/arrest_console_arrest, + )) + +/obj/item/circuit_component/arrest_console_data + display_name = "Security Records Data" + display_desc = "Outputs the security records data, where it can then be filtered with a Select Query component" + circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL + + /// The records retrieved + var/datum/port/output/records + + /// Sends a signal on failure + var/datum/port/output/on_fail + + var/obj/machinery/computer/secure_data/attached_console + +/obj/item/circuit_component/arrest_console_data/Initialize() + . = ..() + records = add_output_port("Security Records", PORT_TYPE_TABLE) + on_fail = add_output_port("Failed", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/arrest_console_data/Destroy() + records = null + on_fail = null + return ..() + + +/obj/item/circuit_component/arrest_console_data/register_usb_parent(atom/movable/parent) + . = ..() + if(istype(parent, /obj/machinery/computer/secure_data)) + attached_console = parent + +/obj/item/circuit_component/arrest_console_data/unregister_usb_parent(atom/movable/parent) + attached_console = null + return ..() + +/obj/item/circuit_component/arrest_console_data/get_ui_notices() + . = ..() + . += create_table_notices(list( + "name", + "id", + "rank", + "arrest_status", + "gender", + "age", + "species", + "fingerprint", + )) + + +/obj/item/circuit_component/arrest_console_data/input_received(datum/port/input/port) + . = ..() + if(.) + return + + if(!attached_console || !attached_console.authenticated) + on_fail.set_output(COMPONENT_SIGNAL) + return + + if(isnull(GLOB.data_core.general)) + on_fail.set_output(COMPONENT_SIGNAL) + return + + var/list/new_table = list() + for(var/datum/data/record/player_record as anything in GLOB.data_core.general) + var/list/entry = list() + var/datum/data/record/player_security_record = find_record("id", player_record.fields["id"], GLOB.data_core.security) + if(player_security_record) + entry["arrest_status"] = player_security_record.fields["criminal"] + entry["security_record"] = player_security_record + entry["name"] = player_record.fields["name"] + entry["id"] = player_record.fields["id"] + entry["rank"] = player_record.fields["rank"] + entry["gender"] = player_record.fields["gender"] + entry["age"] = player_record.fields["age"] + entry["species"] = player_record.fields["species"] + entry["fingerprint"] = player_record.fields["fingerprint"] + + new_table += list(entry) + + records.set_output(new_table) + +/obj/item/circuit_component/arrest_console_arrest + display_name = "Security Records Set Status" + display_desc = "Receives a table to use to set people's arrest status. Table should be from the security records data component. If New Status port isn't set, the status will be decided by the options." + circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL + + /// The targets to set the status of. + var/datum/port/input/targets + + /// Sets the new status of the targets. If set to null, the status is taken from the options. + var/datum/port/input/new_status + + /// Returns the new status set once the setting is complete. Good for locating errors. + var/datum/port/output/new_status_set + + /// Sends a signal on failure + var/datum/port/output/on_fail + + var/obj/machinery/computer/secure_data/attached_console + +/obj/item/circuit_component/arrest_console_arrest/register_usb_parent(atom/movable/parent) + . = ..() + if(istype(parent, /obj/machinery/computer/secure_data)) + attached_console = parent + +/obj/item/circuit_component/arrest_console_arrest/unregister_usb_parent(atom/movable/parent) + attached_console = null + return ..() + +/obj/item/circuit_component/arrest_console_arrest/populate_options() + var/static/list/component_options = list( + COMP_STATE_ARREST, + COMP_STATE_PRISONER, + COMP_STATE_PAROL, + COMP_STATE_DISCHARGED, + COMP_STATE_NONE, + ) + options = component_options + +/obj/item/circuit_component/arrest_console_arrest/Initialize() + . = ..() + targets = add_input_port("Targets", PORT_TYPE_TABLE) + new_status = add_input_port("New Status", PORT_TYPE_STRING) + new_status_set = add_output_port("Set Status", PORT_TYPE_STRING) + on_fail = add_output_port("Failed", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/arrest_console_arrest/Destroy() + targets = null + new_status = null + new_status_set = null + on_fail = null + return ..() + +/obj/item/circuit_component/arrest_console_arrest/input_received(datum/port/input/port) + . = ..() + if(.) + return + + if(!attached_console || !attached_console.authenticated) + on_fail.set_output(COMPONENT_SIGNAL) + return + + var/status_to_set = new_status.input_value + if(!status_to_set || !(status_to_set in options)) + status_to_set = current_option + + new_status_set.set_output(status_to_set) + var/list/target_table = targets.input_value + if(!target_table) + on_fail.set_output(COMPONENT_SIGNAL) + return + + var/successful_set = 0 + var/list/names_of_entries = list() + for(var/list/target in target_table) + var/datum/data/record/sec_record = target["security_record"] + if(!sec_record) + continue + + successful_set++ + sec_record.fields["criminal"] = status_to_set + names_of_entries += target["name"] + + if(successful_set > 0) + investigate_log("[names_of_entries.Join(", ")] have been set to [status_to_set] by [parent.get_creator()].", INVESTIGATE_RECORDS) + if(successful_set > COMP_SECURITY_ARREST_AMOUNT_TO_FLAG) + message_admins("[successful_set] security entries have been set to [status_to_set] by [parent.get_creator_admin()]. [ADMIN_COORDJMP(src)]") + for(var/mob/living/carbon/human/human as anything in GLOB.carbon_list) + human.sec_hud_set_security_status() + /obj/machinery/computer/secure_data/examine(mob/user) . = ..() if(scan) @@ -37,6 +212,7 @@ icon_screen = "seclaptop" icon_keyboard = "laptop_key" clockwork = TRUE //it'd look weird + broken_overlay_emissive = TRUE pass_flags = PASSTABLE /obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params) @@ -146,10 +322,14 @@ crimstat = E.fields["criminal"] var/background switch(crimstat) - if("*Arrest*") + if("Arrest") background = "'background-color:#990000;'" if("Incarcerated") - background = "'background-color:#CD6500;'" + background = "'background-color:#EB4823;'" + if("Search") + background = "'background-color:#9B13EB;'" + if("Monitor") + background = "'background-color:#990000;'" if("Paroled") background = "'background-color:#CD6500;'" if("Discharged") @@ -230,33 +410,13 @@ else dat += "All Paid Off "
dat += {"
- \[X\]
+ \[X\]
"}
dat += ""
- dat += "
Minor Crimes: Add New" - - - dat +={"
-
"
-
+ dat += "
Crimes: Add New" - dat += "
Major Crimes: Add New" dat +={"
"
@@ -417,23 +580,7 @@ What a mess.*/
if((istype(active2, /datum/data/record) && GLOB.data_core.security.Find(active2)))
P.info += text("
\nSecurity Data
\nCriminal Status: []", active2.fields["criminal"]) - P.info += "
\n
\nMinor Crimes:
\n" - P.info +={"
-
"
-
- P.info += "
\nMajor Crimes:
\n" + P.info += "
\n
\nCrimes:
\n" P.info +={"
"
-
P.info += text("
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", active2.fields["notes"]) var/counter = 1 while(active2.fields[text("com_[]", counter)]) @@ -466,31 +612,25 @@ What a mess.*/ var/wanted_name = stripped_input(usr, "Please enter an alias for the criminal:", "Print Wanted Poster", active1.fields["name"]) if(wanted_name) var/default_description = "A poster declaring [wanted_name] to be a dangerous individual, wanted by Nanotrasen. Report any sightings to security immediately." - var/list/major_crimes = active2.fields["ma_crim"] - var/list/minor_crimes = active2.fields["mi_crim"] - if(major_crimes.len + minor_crimes.len) - default_description += "\n[wanted_name] is wanted for the following crimes:\n" - if(minor_crimes.len) - default_description += "\nMinor Crimes:" - for(var/datum/data/crime/c in active2.fields["mi_crim"]) - default_description += "\n[c.crimeName]\n" - default_description += "[c.crimeDetails]\n" - if(major_crimes.len) - default_description += "\nMajor Crimes:" - for(var/datum/data/crime/c in active2.fields["ma_crim"]) + var/list/crimes = active2.fields["crim"] + if(crimes.len) + default_description += "\nCrimes:" + for(var/datum/data/crime/c in active2.fields["crim"]) default_description += "\n[c.crimeName]\n" default_description += "[c.crimeDetails]\n" var/headerText = stripped_input(usr, "Please enter Poster Heading (Max 7 Chars):", "Print Wanted Poster", "WANTED", 8) - + var/posternum = CLAMP((input("Number of posters to print (Max 5):","Number:",1) as num|null), 1, 5) var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Wanted Poster", default_description, null) if(info) - playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) printing = 1 - sleep(30) - if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. - var/obj/item/photo/photo = active1.fields["photo_front"] - new /obj/item/poster/wanted(loc, photo.picture.picture_image, wanted_name, info, headerText) + for(var/i in 1 to posternum) + playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) + + sleep(30) + if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. + var/obj/item/photo/photo = active1.fields["photo_front"] + new /obj/item/poster/wanted(loc, photo.picture.picture_image, wanted_name, info, headerText) printing = 0 if("Print Missing") if(!( printing )) @@ -499,15 +639,16 @@ What a mess.*/ var/default_description = "A poster declaring [missing_name] to be a missing individual, missed by Nanotrasen. Report any sightings to security immediately." var/headerText = stripped_input(usr, "Please enter Poster Heading (Max 7 Chars):", "Print Missing Persons Poster", "MISSING", 8) - + var/posternum = CLAMP((input("Number of posters to print (Max 5):","Number:",1) as num|null), 1, 5) var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Missing Persons Poster", default_description, null) if(info) - playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) printing = 1 - sleep(30) - if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. - var/obj/item/photo/photo = active1.fields["photo_front"] - new /obj/item/poster/wanted/missing(loc, photo.picture.picture_image, missing_name, info, headerText) + for(var/i in 1 to posternum) + playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) + sleep(30) + if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. + var/obj/item/photo/photo = active1.fields["photo_front"] + new /obj/item/poster/wanted/missing(loc, photo.picture.picture_image, missing_name, info, headerText) printing = 0 //RECORD DELETE @@ -559,8 +700,7 @@ What a mess.*/ R.fields["id"] = active1.fields["id"] R.name = text("Security Record #[]", R.fields["id"]) R.fields["criminal"] = "None" - R.fields["mi_crim"] = list() - R.fields["ma_crim"] = list() + R.fields["crim"] = list() R.fields["notes"] = "No notes." GLOB.data_core.security += R active2 = R @@ -589,8 +729,7 @@ What a mess.*/ R.fields["id"] = active1.fields["id"] R.name = text("Security Record #[]", R.fields["id"]) R.fields["criminal"] = "None" - R.fields["mi_crim"] = list() - R.fields["ma_crim"] = list() + R.fields["crim"] = list() R.fields["notes"] = "No notes." GLOB.data_core.security += R active2 = R @@ -706,36 +845,29 @@ What a mess.*/ if(istype(active1.fields["photo_side"], /obj/item/photo)) var/obj/item/photo/P = active1.fields["photo_side"] print_photo(P.picture.picture_image, active1.fields["name"]) - if("mi_crim_add") + if("crim_add") if(istype(active1, /datum/data/record)) - var/t1 = stripped_input(usr, "Please input minor crime names:", "Secure. records", "", null) - var/t2 = stripped_input(usr, "Please input minor crime details:", "Secure. records", "", null) + var/t1 = stripped_input(usr, "Please input crime name:", "Secure. records", "", null) + var/t2 = stripped_input(usr, "Please input crime details:", "Secure. records", "", null) if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) return var/crime = GLOB.data_core.createCrimeEntry(t1, t2, authenticated, station_time_timestamp()) - GLOB.data_core.addMinorCrime(active1.fields["id"], crime) - investigate_log("New Minor Crime: [t1]: [t2] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) - if("mi_crim_delete") + GLOB.data_core.addCrime(active1.fields["id"], crime) + investigate_log("New Crime: [t1]: [t2] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) + if("crim_delete") if(istype(active1, /datum/data/record)) if(href_list["cdataid"]) if(!canUseSecurityRecordsConsole(usr, "delete", null, a2)) return - GLOB.data_core.removeMinorCrime(active1.fields["id"], href_list["cdataid"]) - if("ma_crim_add") - if(istype(active1, /datum/data/record)) - var/t1 = stripped_input(usr, "Please input major crime names:", "Secure. records", "", null) - var/t2 = stripped_input(usr, "Please input major crime details:", "Secure. records", "", null) - if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) - return - var/crime = GLOB.data_core.createCrimeEntry(t1, t2, authenticated, station_time_timestamp()) - GLOB.data_core.addMajorCrime(active1.fields["id"], crime) - investigate_log("New Major Crime: [t1]: [t2] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) - if("ma_crim_delete") + GLOB.data_core.removeCrime(active1.fields["id"], href_list["cdataid"]) + if("add_details") if(istype(active1, /datum/data/record)) if(href_list["cdataid"]) - if(!canUseSecurityRecordsConsole(usr, "delete", null, a2)) + var/t1 = stripped_input(usr, "Please input crime details:", "Secure. records", "", null) + if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) return - GLOB.data_core.removeMajorCrime(active1.fields["id"], href_list["cdataid"]) + GLOB.data_core.addCrimeDetails(active1.fields["id"], href_list["cdataid"], t1) + investigate_log("New Crime details: [t1] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) if("citation_add") if(istype(active1, /datum/data/record)) var/maxFine = CONFIG_GET(number/maxfine) @@ -786,7 +918,9 @@ What a mess.*/ temp = "
" - else - temp_html += "
[alias]
" - temp_html += "
"
- temp_html += "
" - else - temp_html = "
"
- return temp_html
+ connected_scanner.locked = !connected_scanner.locked
+ return
-/obj/machinery/computer/scan_consolenew/Topic(href, href_list)
- if(..())
- return
- if(current_screen == "working")
- return
+ // Scramble scanner occupant's DNA
+ if("scramble_dna")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ // GUARD CHECK - Is scramble DNA actually ready?
+ if(!can_modify_occupant() || !(scrambleready < world.time))
+ return
- add_fingerprint(usr)
- usr.set_machine(src)
+ scanner_occupant.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA))
+ scanner_occupant.dna.generate_dna_blocks()
+ scrambleready = world.time + SCRAMBLE_TIMEOUT
+ to_chat(usr,"DNA scrambled.")
+ scanner_occupant.radiation += RADIATION_STRENGTH_MULTIPLIER*50/(connected_scanner.damage_coeff ** 2)
+ return
- var/mob/living/carbon/viable_occupant = get_viable_occupant()
-
- //Basic Tasks///////////////////////////////////////////
- var/num = round(text2num(href_list["num"]))
- var/last_change
- switch(href_list["task"])
- if("togglelock")
- if(connected)
- connected.locked = !connected.locked
- if("toggleopen")
- if(connected)
- connected.toggle_open(usr)
- if("setduration")
- if(!num)
- num = round(input(usr, "Choose pulse duration:", "Input an Integer", null) as num|null)
- if(num)
- radduration = WRAP(num, 1, RADIATION_DURATION_MAX+1)
- if("setstrength")
- if(!num)
- num = round(input(usr, "Choose pulse strength:", "Input an Integer", null) as num|null)
- if(num)
- radstrength = WRAP(num, 1, RADIATION_STRENGTH_MAX+1)
- if("screen")
- current_screen = href_list["text"]
- if("scramble")
- if(viable_occupant && (scrambleready < world.time))
- if(prob(1) && prob(1))
- to_chat(usr,"Error: Musa acuminata transformation detected!") //Actually we only share 1% of our functional protein-coding DNA with bananas, but this is mildly amusing so whatever
- if(viable_occupant.client && viable_occupant.ckey)
- message_admins("[key_name(viable_occupant)] has been turned into a banana by [key_name(usr)]")
- log_game("[key_name(viable_occupant)] has been turned into a banana by [key_name(usr)]")
- if(connected)
- connected.locked = FALSE
- connected.open_machine()
- var/occupant_loc = viable_occupant.loc
- viable_occupant.Destroy()
- new /obj/item/reagent_containers/food/snacks/grown/banana(occupant_loc)
- return
+ // Check whether a specific mutation is eligible for discovery within the
+ // scanner occupant
+ // This is additionally done when a mutation's tab is selected in the tgui
+ // interface. This is because some mutations, such as Monkified on monkeys,
+ // are infact completed by default but not yet discovered. Likewise, all
+ // mutations can have their sequence completed while Monkified is still an
+ // active mutation and thus won't immediately be discovered but could be
+ // discovered when Monkified is removed
+ // ---------------------------------------------------------------------- //
+ // params["alias"] - Alias of a mutation. The alias is the "hidden" name of
+ // the mutation, for example "Mutation 5" or "Mutation 33"
+ if("check_discovery")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ if(!can_modify_occupant())
+ return
+
+ // GUARD CHECK - Have we somehow cheekily swapped occupants? This is
+ // unexpected.
+ if(!(scanner_occupant == connected_scanner.occupant))
+ return
+
+ check_discovery(params["alias"])
+ return
+
+ // Check all mutations of the occupant and check if any are discovered.
+ // This is called when the Genetic Sequencer is selected. It'll do things
+ // like immediately discover Monkified without needing to click through
+ // the mutation tabs and handle cases where mutations are solved but not
+ // discovered due to the Monkified mutation being active then removed.
+ if("all_check_discovery")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ if(!can_modify_occupant())
+ return
- viable_occupant.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA))
- viable_occupant.dna.generate_dna_blocks()
- scrambleready = world.time + SCRAMBLE_TIMEOUT
- to_chat(usr,"DNA scrambled.")
- viable_occupant.radiation += RADIATION_STRENGTH_MULTIPLIER*50/(connected.damage_coeff ** 2)
-
- if("setbufferlabel")
- var/text = stripped_input(usr, "Input a new label:", "Input a Text")
- if(num && text)
- num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
- var/list/buffer_slot = buffer[num]
- if(istype(buffer_slot))
- buffer_slot["label"] = text
- if("setbuffer")
- if(num && viable_occupant)
- num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
- buffer[num] = list(
- "label"="Buffer[num]:[viable_occupant.real_name]",
- "UI"=viable_occupant.dna.uni_identity,
- "UE"=viable_occupant.dna.unique_enzymes,
- "name"=viable_occupant.real_name,
- "blood_type"=viable_occupant.dna.blood_type
- )
- if("clearbuffer")
- if(num)
- num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
- var/list/buffer_slot = buffer[num]
- if(istype(buffer_slot))
- buffer_slot.Cut()
- if("transferbuffer")
- if(num && viable_occupant)
- switch(href_list["text"]) //Numbers are this high because other way upgrading laser is just not worth the hassle, and i cant think of anything better to inmrove
- if("ui")
- apply_buffer(SCANNER_ACTION_UI,num)
- if("ue")
- apply_buffer(SCANNER_ACTION_UE,num)
- if("mixed")
- apply_buffer(SCANNER_ACTION_MIXED,num)
- if("injector")
- if(num && injectorready < world.time)
- num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
- var/list/buffer_slot = buffer[num]
- if(istype(buffer_slot))
- var/obj/item/dnainjector/timed/I
- switch(href_list["text"])
- if("ui")
- if(buffer_slot["UI"])
- I = new /obj/item/dnainjector/timed(loc)
- I.fields = list("UI"=buffer_slot["UI"])
- if(connected)
- I.damage_coeff = connected.damage_coeff
- if("ue")
- if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"])
- I = new /obj/item/dnainjector/timed(loc)
- I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"])
- if(connected)
- I.damage_coeff = connected.damage_coeff
- if("mixed")
- if(buffer_slot["UI"] && buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"])
- I = new /obj/item/dnainjector/timed(loc)
- I.fields = list("UI"=buffer_slot["UI"],"name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"])
- if(connected)
- I.damage_coeff = connected.damage_coeff
- if(I)
- injectorready = world.time + INJECTOR_TIMEOUT
- if("loaddisk")
- if(num && diskette && diskette.fields)
- num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
- buffer[num] = diskette.fields.Copy()
- if("savedisk")
- if(num && diskette && !diskette.read_only)
- num = CLAMP(num, 1, NUMBER_OF_BUFFERS)
- var/list/buffer_slot = buffer[num]
- if(istype(buffer_slot))
- diskette.name = "data disk \[[buffer_slot["label"]]\]"
- diskette.fields = buffer_slot.Copy()
- if("ejectdisk")
- if(diskette)
- diskette.forceMove(drop_location())
- diskette = null
- if("setdelayed")
- if(num)
- delayed_action = list("action"=text2num(href_list["delayaction"]),"buffer"=num)
- if("pulseui")
- if(num && viable_occupant && connected)
- radduration = WRAP(radduration, 1, RADIATION_DURATION_MAX+1)
- radstrength = WRAP(radstrength, 1, RADIATION_STRENGTH_MAX+1)
-
- var/locked_state = connected.locked
- connected.locked = TRUE
-
- current_screen = "working"
- ui_interact(usr)
-
- sleep(radduration*10)
- current_screen = "ui"
-
- if(viable_occupant && connected && connected.occupant==viable_occupant)
- viable_occupant.radiation += (RADIATION_IRRADIATION_MULTIPLIER*radduration*radstrength)/(connected.damage_coeff ** 2) //Read comment in "transferbuffer" section above for explanation
- switch(href_list["task"]) //Same thing as there but values are even lower, on best part they are about 0.0*, effectively no damage
- if("pulseui")
- var/len = length_char(viable_occupant.dna.uni_identity)
- num = WRAP(num, 1, len+1)
- num = randomize_radiation_accuracy(num, radduration + (connected.precision_coeff ** 2), len) //Each manipulator level above 1 makes randomization as accurate as selected time + manipulator lvl^2
- //Value is this high for the same reason as with laser - not worth the hassle of upgrading if the bonus is low
- var/block = round((num-1)/DNA_BLOCK_SIZE)+1
- var/subblock = num - block*DNA_BLOCK_SIZE
- last_change = "UI #[block]-[subblock]; "
-
- var/hex = copytext_char(viable_occupant.dna.uni_identity, num, num+1)
- last_change += "[hex]"
- hex = scramble(hex, radstrength, radduration)
- last_change += "->[hex]"
-
- viable_occupant.dna.uni_identity = copytext_char(viable_occupant.dna.uni_identity, 1, num) + hex + copytext_char(viable_occupant.dna.uni_identity, num + 1)
- viable_occupant.updateappearance(mutations_overlay_update=1)
+ // GUARD CHECK - Have we somehow cheekily swapped occupants? This is
+ // unexpected.
+ if(!(scanner_occupant == connected_scanner.occupant))
+ return
+
+ // Go over all standard mutations and check if they've been discovered.
+ for(var/mutation_type in scanner_occupant.dna.mutation_index)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation_type)
+ check_discovery(HM.alias)
+
+ return
+
+ // Set a gene in a mutation's genetic sequence. Will also check for mutations
+ // discovery as part of the process.
+ // ---------------------------------------------------------------------- //
+ // params["alias"] - Alias of a mutation. The alias is the "hidden" name of
+ // the mutation, for example "Mutation 5" or "Mutation 33"
+ // params["gene"] - The letter of the new gene
+ // params["pos"] - The BYOND index of the letter in the gene sequence to be
+ // changed. Expects a text string from TGUI and will convert to a number
+ if("pulse_gene")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ if(!can_modify_occupant())
+ return
+
+ // GUARD CHECK - Have we somehow cheekily swapped occupants? This is
+ // unexpected.
+ if(!(scanner_occupant == connected_scanner.occupant))
+ return
+
+ // GUARD CHECK - Is the occupant currently undergoing some form of
+ // transformation? If so, we don't want to be pulsing genes.
+ if(scanner_occupant.transformation_timer)
+ to_chat(usr,"Gene pulse failed: The scanner occupant undergoing a transformation.")
+ return
+
+ // Resolve mutation's BYOND path from the alias
+ var/alias = params["alias"]
+ var/path = GET_MUTATION_TYPE_FROM_ALIAS(alias)
+
+ // Make sure the occupant still has this mutation
+ if(!(path in scanner_occupant.dna.mutation_index))
+ return
+
+ // Resolve BYOND path to genome sequence of scanner occupant
+ var/sequence = GET_GENE_STRING(path, scanner_occupant.dna)
+
+ var/newgene = params["gene"]
+ var/genepos = text2num(params["pos"])
+
+ // If the new gene is J, this means we're dealing with a JOKER
+ // GUARD CHECK - Is JOKER actually ready?
+ if((newgene == "J") && (jokerready < world.time))
+ var/truegenes = GET_SEQUENCE(path)
+ newgene = truegenes[genepos]
+ jokerready = world.time + JOKER_TIMEOUT - (JOKER_UPGRADE * (connected_scanner.precision_coeff-1))
+
+ // If the gene is an X, we want to update the default genes with the new
+ // X to allow highlighting logic to work on the tgui interface.
+ if(newgene == "X")
+ var/defaultseq = scanner_occupant.dna.default_mutation_genes[path]
+ defaultseq = copytext_char(defaultseq, 1, genepos) + newgene + copytext_char(defaultseq, genepos + 1)
+ scanner_occupant.dna.default_mutation_genes[path] = defaultseq
+
+ // Copy genome to scanner occupant and do some basic mutation checks as
+ // we've increased the occupant rads
+ sequence = copytext_char(sequence, 1, genepos) + newgene + copytext_char(sequence, genepos + 1)
+ scanner_occupant.dna.mutation_index[path] = sequence
+ scanner_occupant.radiation += RADIATION_STRENGTH_MULTIPLIER/connected_scanner.damage_coeff
+ scanner_occupant.domutcheck()
+
+ // GUARD CHECK - Modifying genetics can lead to edge cases where the
+ // scanner occupant is qdel'd and replaced with a different entity.
+ // Examples of this include adding/removing the Monkified mutation which
+ // qdels the previous entity and creates a brand new one in its place.
+ // We should redo all of our occupant modification checks again, although
+ // it is less than ideal.
+ if(!can_modify_occupant())
+ return
+
+ // Check if we cracked a mutation
+ check_discovery(alias)
+
+ return
+
+ // Apply a chromosome to a specific mutation.
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to apply the chromo to
+ // params["chromo"] - Name of the chromosome to apply to the mutation
+ if("apply_chromo")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ if(!can_modify_occupant())
+ return
+
+ // GUARD CHECK - Have we somehow cheekily swapped occupants? This is
+ // unexpected.
+ if(!(scanner_occupant == connected_scanner.occupant))
+ return
+
+ var/bref = params["mutref"]
+
+ // GUARD CHECK - Only search occupant for this specific ref, since your
+ // can only apply chromosomes to mutations occupants.
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT)
+
+ // GUARD CHECK - This should not be possible. Unexpected result
+ if(!HM)
+ return
+
+ // Look through our stored chromos and compare names to find a
+ // stored chromo we can apply.
+ for(var/obj/item/chromosome/CM in stored_chromosomes)
+ if(CM.can_apply(HM) && (CM.name == params["chromo"]))
+ stored_chromosomes -= CM
+ CM.apply(HM)
+
+ return
+
+ // Print any type of standard injector, limited right now to activators that
+ // activate a dormant mutation and mutators that forcibly create a new
+ // MUT_EXTRA mutation
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to create an injector of
+ // params["is_activator"] - Is this an "Activator" style injector, also
+ // referred to as a "Research" type. Expects a string with 0 or 1, which
+ // then gets converted to a number.
+ // params["source"] - The source the request came from.
+ // Expected results:
+ // "occupant" - From genetic sequencer
+ // "console" - From DNA Console storage
+ // "disk" - From inserted diskette
+ if("print_injector")
+ // Because printing mutators and activators share a bunch of code,
+ // it makes sense to keep them both together and set unique vars
+ // later in the code
+
+ // As a side note, because mutations can contain unique metadata,
+ // this system uses BYOND Atom Refs to safely and accurately
+ // identify mutations from big ol' lists
+
+ // GUARD CHECK - Is the injector actually ready?
+ if(world.time < injectorready)
+ return
+
+ var/search_flags = 0
+
+ switch(params["source"])
+ if("occupant")
+ // GUARD CHECK - Make sure we can modify the occupant before we
+ // attempt to search them for any given mutation refs. This could
+ // lead to no search flags being passed to get_mut_by_ref and this
+ // is intended functionality to prevent any cheese or abuse
+ if(can_modify_occupant())
+ search_flags |= SEARCH_OCCUPANT
+ if("console")
+ search_flags |= SEARCH_STORED
+ if("disk")
+ search_flags |= SEARCH_DISKETTE
+
+ var/bref = params["mutref"]
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags)
+
+ // GUARD CHECK - This should not be possible. Unexpected result
+ if(!HM)
+ return
+
+ // Create a new DNA Injector and add the appropriate mutations to it
+ var/obj/item/dnainjector/activator/I = new /obj/item/dnainjector/activator(loc)
+ I.add_mutations += new HM.type(copymut = HM)
+
+ var/is_activator = text2num(params["is_activator"])
+
+ // Activators are also called "research" injectors and are used to create
+ // chromosomes by recycling at the DNA Console
+ if(is_activator)
+ I.name = "[HM.name] activator"
+ I.research = TRUE
+ // If there's an operational connected scanner, we can use its upgrades
+ // to improve our injector's radiation generation
+ if(scanner_operational())
+ I.damage_coeff = connected_scanner.damage_coeff*4
+ injectorready = world.time + INJECTOR_TIMEOUT * (1 - 0.1 * connected_scanner.precision_coeff)
else
- current_screen = "mainmenu"
-
- if(connected)
- connected.locked = locked_state
- if("inspect")
- if(viable_occupant)
- var/list/mutations = get_mutation_list(TRUE)
- if(current_mutation == mutations[num])
- current_mutation = null
+ injectorready = world.time + INJECTOR_TIMEOUT
+ else
+ I.name = "[HM.name] mutator"
+ I.doitanyway = TRUE
+ // If there's an operational connected scanner, we can use its upgrades
+ // to improve our injector's radiation generation
+ if(scanner_operational())
+ I.damage_coeff = connected_scanner.damage_coeff
+ injectorready = world.time + INJECTOR_TIMEOUT * 5 * (1 - 0.1 * connected_scanner.precision_coeff)
else
- current_mutation = mutations[num]
-
- if("inspectstorage")
- current_storage = num
- current_screen = "info"
- if("savemut")
- if(viable_occupant)
- var/success
- if(LAZYLEN(stored_mutations) < max_storage)
- var/mutation = text2path(href_list["path"])
- if(ispath(mutation, /datum/mutation/human)) //sanity checks
- var/datum/mutation/human/HM = viable_occupant.dna.get_mutation(mutation)
- if(HM)
- var/datum/mutation/human/A = new HM.type()
- A.copy_mutation(HM)
- success = TRUE
- stored_mutations += A
- to_chat(usr,"Mutation succesfully stored.")
- if(!success) //we can exactly return here
- to_chat(usr,"Mutation storage is full.")
- if("deletemut")
- var/datum/mutation/human/HM = stored_mutations[num]
+ injectorready = world.time + INJECTOR_TIMEOUT * 5
+
+ return
+
+ // Save a mutation to the console's storage buffer.
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to store
+ // params["source"] - The source the request came from.
+ // Expected results:
+ // "occupant" - From genetic sequencer
+ // "disk" - From inserted diskette
+ if("save_console")
+ var/search_flags = 0
+
+ switch(params["source"])
+ if("occupant")
+ // GUARD CHECK - Make sure we can modify the occupant before we
+ // attempt to search them for any given mutation refs. This could
+ // lead to no search flags being passed to get_mut_by_ref and this
+ // is intended functionality to prevent any cheese or abuse
+ if(can_modify_occupant())
+ search_flags |= SEARCH_OCCUPANT
+ if("disk")
+ search_flags |= SEARCH_DISKETTE
+
+ // GUARD CHECK - Is mutation storage full?
+ if(LAZYLEN(stored_mutations) >= max_storage)
+ to_chat(usr,"Mutation storage is full.")
+ return
+
+ var/bref = params["mutref"]
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags)
+
+ // GUARD CHECK - This should not be possible. Unexpected result
+ if(!HM)
+ return
+
+ var/datum/mutation/human/A = new HM.type()
+ A.copy_mutation(HM)
+ stored_mutations += A
+ to_chat(usr,"Mutation successfully stored.")
+ return
+
+ // Save a mutation to the diskette's storage buffer.
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to store
+ // params["source"] - The source the request came from
+ // Expected results:
+ // "occupant" - From genetic sequencer
+ // "console" - From DNA Console storage
+ if("save_disk")
+ // GUARD CHECK - This code shouldn't even be callable without a diskette
+ // inserted. Unexpected result
+ if(!diskette)
+ return
+
+ // GUARD CHECK - Make sure the disk is not full
+ if(LAZYLEN(diskette.mutations) >= diskette.max_mutations)
+ to_chat(usr,"Disk storage is full.")
+ return
+
+ // GUARD CHECK - Make sure the disk isn't set to read only, as we're
+ // attempting to write to it
+ if(diskette.read_only)
+ to_chat(usr,"Disk is set to read only mode.")
+ return
+
+ var/search_flags = 0
+
+ switch(params["source"])
+ if("occupant")
+ // GUARD CHECK - Make sure we can modify the occupant before we
+ // attempt to search them for any given mutation refs. This could
+ // lead to no search flags being passed to get_mut_by_ref and this
+ // is intended functionality to prevent any cheese or abuse
+ if(can_modify_occupant())
+ search_flags |= SEARCH_OCCUPANT
+ if("console")
+ search_flags |= SEARCH_STORED
+
+ var/bref = params["mutref"]
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags)
+
+ // GUARD CHECK - This should not be possible. Unexpected result
+ if(!HM)
+ return
+
+ var/datum/mutation/human/A = new HM.type()
+ A.copy_mutation(HM)
+ diskette.mutations += A
+ to_chat(usr,"Mutation successfully stored to disk.")
+ return
+
+ // Completely removes a MUT_EXTRA mutation or mutation with corrupt gene
+ // sequence from the scanner occupant
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to nullify
+ if("nullify")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ if(!can_modify_occupant())
+ return
+
+ var/bref = params["mutref"]
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT)
+
+ // GUARD CHECK - This should not be possible. Unexpected result
+ if(!HM)
+ return
+
+ // GUARD CHECK - Nullify should only be used on scrambled or "extra"
+ // mutations.
+ if(!HM.scrambled && !(HM.class == MUT_EXTRA))
+ return
+
+ scanner_occupant.dna.remove_mutation(HM.type)
+ return
+
+ // Deletes saved mutation from console buffer.
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to delete
+ if("delete_console_mut")
+ var/bref = params["mutref"]
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_STORED)
+
if(HM)
stored_mutations.Remove(HM)
qdel(HM)
- current_screen = "mutations"
- if("activator")
- if(injectorready < world.time)
- var/mutation = text2path(href_list["path"])
- if(ispath(mutation, /datum/mutation/human))
- var/datum/mutation/human/HM = get_valid_mutation(mutation)
- if(HM)
- var/obj/item/dnainjector/activator/I = new /obj/item/dnainjector/activator(loc)
- I.add_mutations += new HM.type (copymut = HM)
- I.name = "[HM.name] activator"
- I.research = TRUE
- if(connected)
- I.damage_coeff = connected.damage_coeff*4
- injectorready = world.time + INJECTOR_TIMEOUT * (1 - 0.1 * connected.precision_coeff) //precision_coeff being the manipulator rating
- else
- injectorready = world.time + INJECTOR_TIMEOUT
- if("mutator")
- if(injectorready < world.time)
- var/mutation = text2path(href_list["path"])
- if(ispath(mutation, /datum/mutation/human))
- var/datum/mutation/human/HM = get_valid_mutation(mutation)
- if(HM)
- var/obj/item/dnainjector/activator/I = new /obj/item/dnainjector/activator(loc)
- I.add_mutations += new HM.type (copymut = HM)
- I.doitanyway = TRUE
- I.name = "[HM.name] injector"
- if(connected)
- I.damage_coeff = connected.damage_coeff
- injectorready = world.time + INJECTOR_TIMEOUT * 5 * (1 - 0.1 * connected.precision_coeff)
- else
- injectorready = world.time + INJECTOR_TIMEOUT * 5
-
- if("advinjector")
- var/selection = href_list["injector"]
- if(injectorready < world.time)
- if(injector_selection.Find(selection))
- var/list/true_selection = injector_selection[selection]
- if(LAZYLEN(injector_selection))
- var/obj/item/dnainjector/activator/I = new /obj/item/dnainjector/activator(loc)
- for(var/A in true_selection)
- var/datum/mutation/human/HM = A
- I.add_mutations += new HM.type (copymut = HM)
- I.doitanyway = TRUE
- I.name = "Advanced [selection] injector"
- if(connected)
- I.damage_coeff = connected.damage_coeff
- injectorready = world.time + INJECTOR_TIMEOUT * 8 * (1 - 0.1 * connected.precision_coeff)
- else
- injectorready = world.time + INJECTOR_TIMEOUT * 8
- if("nullify")
- if(viable_occupant)
- var/datum/mutation/human/A = viable_occupant.dna.get_mutation(current_mutation)
- if(A && (!viable_occupant.dna.mutation_in_sequence(current_mutation) || A.scrambled))
- viable_occupant.dna.remove_mutation(current_mutation)
- current_screen = "mainmenu"
- current_mutation = null
- if("pulsegene")
- if(current_screen != "info")
- var/path = GET_MUTATION_TYPE_FROM_ALIAS(href_list["alias"])
- if(viable_occupant && num && (path in viable_occupant.dna.mutation_index))
- var/list/genes = list("A","T","G","C","X")
- if(jokerready < world.time)
- genes += "JOKER"
- var/sequence = GET_GENE_STRING(path, viable_occupant.dna)
- var/original = sequence[num]
- var/new_gene = input("From [original] to-", "New block", original) as null|anything in genes
- if(!new_gene)
- new_gene = original
- if(viable_occupant == get_viable_occupant()) //No cheesing
- if((new_gene == "JOKER") && (jokerready < world.time))
- var/true_genes = GET_SEQUENCE(current_mutation)
- new_gene = true_genes[num]
- jokerready = world.time + JOKER_TIMEOUT - (JOKER_UPGRADE * (connected.precision_coeff-1))
- sequence = copytext_char(sequence, 1, num) + new_gene + copytext_char(sequence, num + 1)
- viable_occupant.dna.mutation_index[path] = sequence
- viable_occupant.radiation += RADIATION_STRENGTH_MULTIPLIER/connected.damage_coeff
- viable_occupant.domutcheck()
- if("exportdiskmut")
- if(diskette && !diskette.read_only)
- var/path = text2path(href_list["path"])
- if(ispath(path, /datum/mutation/human))
- var/datum/mutation/human/A = get_valid_mutation(path)
- if(A && diskette && (LAZYLEN(diskette.mutations) < diskette.max_mutations))
- var/datum/mutation/human/HM = new A.type()
- diskette.mutations += HM
- HM.copy_mutation(A)
- to_chat(usr, "Successfully wrote [A.name] to [diskette.name].")
- if("deletediskmut")
- if(diskette && !diskette.read_only)
- if(num && (LAZYLEN(diskette.mutations) >= num))
- var/datum/mutation/human/A = diskette.mutations[num]
- diskette.mutations.Remove(A)
- qdel(A)
- if("importdiskmut")
- if(diskette && (LAZYLEN(diskette.mutations) >= num))
- if(LAZYLEN(stored_mutations) < max_storage)
- var/datum/mutation/human/A = diskette.mutations[num]
- var/datum/mutation/human/HM = new A.type()
- HM.copy_mutation(A)
- stored_mutations += HM
- to_chat(usr,"Successfully wrote [A.name] to storage.")
- if("combine")
- if(num && (LAZYLEN(stored_mutations) >= num))
- if(LAZYLEN(stored_mutations) < max_storage)
- var/datum/mutation/human/A = stored_mutations[num]
- var/path = A.type
- if(combine)
- var/result_path = get_mixed_mutation(combine, path)
- if(result_path)
- stored_mutations += new result_path()
- to_chat(usr, "Success! New mutation has been added to storage.")
- discover(result_path)
- combine = null
- else
- to_chat(usr, "Failed. No mutation could be created.")
- combine = null
- else
- combine = path
- to_chat(usr,"Selected [A.name] for combining.")
- else
- to_chat(usr, "Not enough space to store potential mutation.")
- if("ejectchromosome")
- var/obj/item/chromosome/CM = stored_chromosomes[num]
- CM.forceMove(drop_location())
- adjust_item_drop_location(CM)
- stored_chromosomes -= CM
- if("applychromosome")
- if(viable_occupant && (LAZYLEN(viable_occupant.dna.mutations) <= num))
- var/datum/mutation/human/HM = viable_occupant.dna.mutations[num]
- var/list/chromosomes = list()
- for(var/obj/item/chromosome/CM in stored_chromosomes)
- if(CM.can_apply(HM))
- chromosomes += CM
- if(chromosomes.len)
- var/obj/item/chromosome/CM = input("Select a chromosome to apply", "Apply Chromosome") as null|anything in sortNames(chromosomes)
- if(CM)
- to_chat(usr, "You apply [CM] to [HM.name].")
- stored_chromosomes -= CM
- CM.apply(HM)
- if("expand_advinjector")
- var/mutation = text2path(href_list["path"])
- var/datum/mutation/human/HM = get_valid_mutation(mutation)
- if(HM && LAZYLEN(injector_selection))
- var/which_injector = input(usr, "Select Adv. Injector", "Advanced Injectors") as null|anything in injector_selection
- if(injector_selection.Find(which_injector))
- var/list/true_selection = injector_selection[which_injector]
- var/total_instability
- for(var/B in true_selection)
- var/datum/mutation/human/mootacion = B
- total_instability += mootacion.instability
- total_instability += HM.instability
- if((total_instability > max_injector_instability) || (true_selection.len + 1) > max_injector_mutations)
- to_chat(usr, "Adding more mutations would make the advanced injector too unstable!")
- else
- true_selection += HM //reminder that this works. because I keep forgetting this works
- if("remove_from_advinjector")
- var/mutation = text2path(href_list["path"])
- var/selection = href_list["injector"]
- if(injector_selection.Find(selection))
- var/list/true_selection = injector_selection[selection]
- for(var/B in true_selection)
- var/datum/mutation/human/HM = B
- if(HM.type == mutation)
- true_selection -= HM
- break
-
- if("remove_advinjector")
- var/selection = href_list["injector"]
- for(selection in injector_selection)
- if(selection == selection)
- injector_selection.Remove(selection)
-
- if("add_advinjector")
- if(LAZYLEN(injector_selection) < max_injector_selections)
- var/new_selection = stripped_input(usr, "Enter Adv. Injector name", "Advanced Injectors")
- if(new_selection && !(new_selection in injector_selection))
- injector_selection[new_selection] = list()
-
-
-
- ui_interact(usr,last_change)
-
-/obj/machinery/computer/scan_consolenew/proc/scramble(input,rs,rd) //hexadecimal genetics. dont confuse with scramble button
+ return
+
+ // Deletes saved mutation from disk buffer.
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to delete
+ if("delete_disk_mut")
+ // GUARD CHECK - This code shouldn't even be callable without a diskette
+ // inserted. Unexpected result
+ if(!diskette)
+ return
+
+ // GUARD CHECK - Make sure the disk isn't set to read only, as we're
+ // attempting to write to it (via deletion)
+ if(diskette.read_only)
+ to_chat(usr,"Disk is set to read only mode.")
+ return
+
+ var/bref = params["mutref"]
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_DISKETTE)
+
+ if(HM)
+ diskette.mutations.Remove(HM)
+ qdel(HM)
+
+ return
+
+ // Ejects a stored chromosome from the DNA Console
+ // ---------------------------------------------------------------------- //
+ // params["chromo"] - Text string of the chromosome name
+ if("eject_chromo")
+ var/chromname = params["chromo"]
+
+ for(var/obj/item/chromosome/CM in stored_chromosomes)
+ if(chromname == CM.name)
+ CM.forceMove(drop_location())
+ adjust_item_drop_location(CM)
+ stored_chromosomes -= CM
+ return
+
+ return
+
+ // Combines two mutations from the console to try and create a new mutation
+ // ---------------------------------------------------------------------- //
+ // params["firstref"] - ATOM Ref of first mutation for combination
+ // params["secondref"] - ATOM Ref of second mutation for combination
+ // mutation
+ if("combine_console")
+ // GUaRD CHECK - Make sure mutation storage isn't full. If it is, we won't
+ // be able to store the new combo mutation
+ if(LAZYLEN(stored_mutations) >= max_storage)
+ to_chat(usr,"Mutation storage is full.")
+ return
+
+ // GUARD CHECK - We're running a research-type operation. If, for some
+ // reason, somehow the DNA Console has been disconnected from the research
+ // network - Or was never in it to begin with - don't proceed
+ if(!stored_research)
+ return
+
+ var/first_bref = params["firstref"]
+ var/second_bref = params["secondref"]
+
+ // GUARD CHECK - Find the source and destination mutations on the console
+ // and make sure they actually exist.
+ var/datum/mutation/human/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE)
+ if(!source_mut)
+ return
+
+ var/datum/mutation/human/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE)
+ if(!dest_mut)
+ return
+
+ // Attempt to mix the two mutations to get a new type
+ var/result_path = get_mixed_mutation(source_mut.type, dest_mut.type)
+
+ if(!result_path)
+ return
+
+ // If we got a new type, add it to our storage
+ stored_mutations += new result_path()
+ to_chat(usr, "Success! New mutation has been added to console storage.")
+
+ // If it's already discovered, end here. Otherwise, add it to the list of
+ // discovered mutations.
+ // We've already checked for stored_research earlier
+ if(result_path in stored_research.discovered_mutations)
+ return
+
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(result_path)
+ stored_research.discovered_mutations += result_path
+ say("Successfully mutated [HM.name].")
+ return
+
+ // Combines two mutations from the disk to try and create a new mutation
+ // ---------------------------------------------------------------------- //
+ // params["firstref"] - ATOM Ref of first mutation for combination
+ // params["secondref"] - ATOM Ref of second mutation for combination
+ // mutation
+ if("combine_disk")
+ // GUARD CHECK - This code shouldn't even be callable without a diskette
+ // inserted. Unexpected result
+ if(!diskette)
+ return
+
+ // GUARD CHECK - Make sure the disk is not full.
+ if(LAZYLEN(diskette.mutations) >= diskette.max_mutations)
+ to_chat(usr,"Disk storage is full.")
+ return
+
+ // GUARD CHECK - Make sure the disk isn't set to read only, as we're
+ // attempting to write to it
+ if(diskette.read_only)
+ to_chat(usr,"Disk is set to read only mode.")
+ return
+
+ // GUARD CHECK - We're running a research-type operation. If, for some
+ // reason, somehow the DNA Console has been disconnected from the research
+ // network - Or was never in it to begin with - don't proceed
+ if(!stored_research)
+ return
+
+ var/first_bref = params["firstref"]
+ var/second_bref = params["secondref"]
+
+ // GUARD CHECK - Find the source and destination mutations on the console
+ // and make sure they actually exist.
+ var/datum/mutation/human/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE)
+ if(!source_mut)
+ return
+
+ var/datum/mutation/human/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE)
+ if(!dest_mut)
+ return
+
+ // Attempt to mix the two mutations to get a new type
+ var/result_path = get_mixed_mutation(source_mut.type, dest_mut.type)
+
+ if(!result_path)
+ return
+
+ // If we got a new type, add it to our storage
+ diskette.mutations += new result_path()
+ to_chat(usr, "Success! New mutation has been added to the disk.")
+
+ // If it's already discovered, end here. Otherwise, add it to the list of
+ // discovered mutations
+ // We've already checked for stored_research earlier
+ if(result_path in stored_research.discovered_mutations)
+ return
+
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(result_path)
+ stored_research.discovered_mutations += result_path
+ say("Successfully mutated [HM.name].")
+ return
+
+ // Sets the Genetic Makeup pulse strength.
+ // ---------------------------------------------------------------------- //
+ // params["val"] - New strength value as text string, converted to number
+ // later on in code
+ if("set_pulse_strength")
+ var/value = round(text2num(params["val"]))
+ radstrength = WRAP(value, 1, RADIATION_STRENGTH_MAX+1)
+ return
+
+ // Sets the Genetic Makeup pulse duration
+ // ---------------------------------------------------------------------- //
+ // params["val"] - New strength value as text string, converted to number
+ // later on in code
+ if("set_pulse_duration")
+ var/value = round(text2num(params["val"]))
+ radduration = WRAP(value, 1, RADIATION_DURATION_MAX+1)
+ return
+
+ // Saves Genetic Makeup information to disk
+ // ---------------------------------------------------------------------- //
+ // params["index"] - The BYOND index of the console genetic makeup buffer to
+ // copy to disk
+ if("save_makeup_disk")
+ // GUARD CHECK - This code shouldn't even be callable without a diskette
+ // inserted. Unexpected result
+ if(!diskette)
+ return
+
+ // GUARD CHECK - Make sure the disk isn't set to read only, as we're
+ // attempting to write to it
+ if(diskette.read_only)
+ to_chat(usr,"Disk is set to read only mode.")
+ return
+
+ // Convert the index to a number and clamp within the array range
+ var/buffer_index = text2num(params["index"])
+ buffer_index = clamp(buffer_index, 1, NUMBER_OF_BUFFERS)
+
+ var/list/buffer_slot = genetic_makeup_buffer[buffer_index]
+
+ // GUARD CHECK - This should not be possible to activate on a buffer slot
+ // that doesn't have any genetic data. Unexpected result
+ if(!istype(buffer_slot))
+ return
+
+ diskette.genetic_makeup_buffer = buffer_slot.Copy()
+ return
+
+ // Loads Genetic Makeup from disk to a console buffer
+ // ---------------------------------------------------------------------- //
+ // params["index"] - The BYOND index of the console genetic makeup buffer to
+ // copy to. Expected as text string, converted to number later
+ if("load_makeup_disk")
+ // GUARD CHECK - This code shouldn't even be callable without a diskette
+ // inserted. Unexpected result
+ if(!diskette)
+ return
+
+ // GUARD CHECK - This should not be possible to activate on a diskette
+ // that doesn't have any genetic data. Unexpected result
+ if(LAZYLEN(diskette.genetic_makeup_buffer) == 0)
+ return
+
+ // Convert the index to a number and clamp within the array range, then
+ // copy the data from the disk to that buffer
+ var/buffer_index = text2num(params["index"])
+ buffer_index = clamp(buffer_index, 1, NUMBER_OF_BUFFERS)
+ genetic_makeup_buffer[buffer_index] = diskette.genetic_makeup_buffer.Copy()
+ return
+
+ // Deletes genetic makeup buffer from the inserted diskette
+ if("del_makeup_disk")
+ // GUARD CHECK - This code shouldn't even be callable without a diskette
+ // inserted. Unexpected result
+ if(!diskette)
+ return
+
+ // GUARD CHECK - Make sure the disk isn't set to read only, as we're
+ // attempting to write (via deletion) to it
+ if(diskette.read_only)
+ to_chat(usr,"Disk is set to read only mode.")
+ return
+
+ diskette.genetic_makeup_buffer.Cut()
+ return
+
+ // Saves the scanner occupant's genetic makeup to a given console buffer
+ // ---------------------------------------------------------------------- //
+ // params["index"] - The BYOND index of the console genetic makeup buffer to
+ // save the new genetic data to. Expected as text string, converted to
+ // number later
+ if("save_makeup_console")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ if(!can_modify_occupant())
+ return
+
+ // Convert the index to a number and clamp within the array range, then
+ // copy the data from the disk to that buffer
+ var/buffer_index = text2num(params["index"])
+ buffer_index = clamp(buffer_index, 1, NUMBER_OF_BUFFERS)
+
+ // Set the new information
+ genetic_makeup_buffer[buffer_index] = list(
+ "label"="Slot [buffer_index]:[scanner_occupant.real_name]",
+ "UI"=scanner_occupant.dna.uni_identity,
+ "UE"=scanner_occupant.dna.unique_enzymes,
+ "name"=scanner_occupant.real_name,
+ "blood_type"=scanner_occupant.dna.blood_type)
+
+ return
+
+ // Deleted genetic makeup data from a console buffer slot
+ // ---------------------------------------------------------------------- //
+ // params["index"] - The BYOND index of the console genetic makeup buffer to
+ // delete the genetic data from. Expected as text string, converted to
+ // number later
+ if("del_makeup_console")
+ // Convert the index to a number and clamp within the array range, then
+ // copy the data from the disk to that buffer
+ var/buffer_index = text2num(params["index"])
+ buffer_index = clamp(buffer_index, 1, NUMBER_OF_BUFFERS)
+ var/list/buffer_slot = genetic_makeup_buffer[buffer_index]
+
+ // GUARD CHECK - This shouldn't be possible to execute this on a null
+ // buffer. Unexpected resut
+ if(!istype(buffer_slot))
+ return
+
+ genetic_makeup_buffer[buffer_index] = null
+ return
+
+ // Eject stored diskette from console
+ if("eject_disk")
+ eject_disk(usr)
+ return
+
+ // Create a Genetic Makeup injector. These injectors are timed and thus are
+ // only temporary
+ // ---------------------------------------------------------------------- //
+ // params["index"] - The BYOND index of the console genetic makeup buffer to
+ // create the makeup injector from. Expected as text string, converted to
+ // number later
+ // params["type"] - Type of injector to create
+ // Expected results:
+ // "ue" - Unique Enzyme, changes name and blood type
+ // "ui" - Unique Identity, changes looks
+ // "mixed" - Combination of both ue and ui
+ if("makeup_injector")
+ // Convert the index to a number and clamp within the array range, then
+ // copy the data from the disk to that buffer
+ var/buffer_index = text2num(params["index"])
+ buffer_index = clamp(buffer_index, 1, NUMBER_OF_BUFFERS)
+ var/list/buffer_slot = genetic_makeup_buffer[buffer_index]
+
+ // GUARD CHECK - This shouldn't be possible to execute this on a null
+ // buffer. Unexpected resut
+ if(!istype(buffer_slot))
+ return
+
+ var/type = params["type"]
+ var/obj/item/dnainjector/timed/I
+
+ switch(type)
+ if("ui")
+ // GUARD CHECK - There's currently no way to save partial genetic data.
+ // However, if this is the case, we can't make a complete injector and
+ // this catches that edge case
+ if(!buffer_slot["UI"])
+ to_chat(usr,"Genetic data corrupted, unable to create injector.")
+ return
+
+ I = new /obj/item/dnainjector/timed(loc)
+ I.fields = list("UI"=buffer_slot["UI"])
+
+ // If there is a connected scanner, we can use its upgrades to reduce
+ // the radiation generated by this injector
+ if(scanner_operational())
+ I.damage_coeff = connected_scanner.damage_coeff
+ if("ue")
+ // GUARD CHECK - There's currently no way to save partial genetic data.
+ // However, if this is the case, we can't make a complete injector and
+ // this catches that edge case
+ if(!buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"])
+ to_chat(usr,"Genetic data corrupted, unable to create injector.")
+ return
+
+ I = new /obj/item/dnainjector/timed(loc)
+ I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"])
+
+ // If there is a connected scanner, we can use its upgrades to reduce
+ // the radiation generated by this injector
+ if(scanner_operational())
+ I.damage_coeff = connected_scanner.damage_coeff
+ if("mixed")
+ // GUARD CHECK - There's currently no way to save partial genetic data.
+ // However, if this is the case, we can't make a complete injector and
+ // this catches that edge case
+ if(!buffer_slot["UI"] || !buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"])
+ to_chat(usr,"Genetic data corrupted, unable to create injector.")
+ return
+
+ I = new /obj/item/dnainjector/timed(loc)
+ I.fields = list("UI"=buffer_slot["UI"],"name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"])
+
+ // If there is a connected scanner, we can use its upgrades to reduce
+ // the radiation generated by this injector
+ if(scanner_operational())
+ I.damage_coeff = connected_scanner.damage_coeff
+
+ // If we successfully created an injector, don't forget to set the new
+ // ready timer.
+ if(I)
+ injectorready = world.time + INJECTOR_TIMEOUT
+
+ return
+
+ // Applies a genetic makeup buffer to the scanner occupant
+ // ---------------------------------------------------------------------- //
+ // params["index"] - The BYOND index of the console genetic makeup buffer to
+ // apply to the scanner occupant. Expected as text string, converted to
+ // number later
+ // params["type"] - Type of genetic makeup copy to implement
+ // Expected results:
+ // "ue" - Unique Enzyme, changes name and blood type
+ // "ui" - Unique Identity, changes looks
+ // "mixed" - Combination of both ue and ui
+ if("makeup_apply")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ if(!can_modify_occupant())
+ return
+
+ // Convert the index to a number and clamp within the array range, then
+ // copy the data from the disk to that buffer
+ var/buffer_index = text2num(params["index"])
+ buffer_index = clamp(buffer_index, 1, NUMBER_OF_BUFFERS)
+ var/list/buffer_slot = genetic_makeup_buffer[buffer_index]
+
+ // GUARD CHECK - This shouldn't be possible to execute this on a null
+ // buffer. Unexpected resut
+ if(!istype(buffer_slot))
+ return
+
+ var/type = params["type"]
+
+ apply_genetic_makeup(type, buffer_slot)
+ return
+
+ // Applies a genetic makeup buffer to the next scanner occupant. This sets
+ // some code that will run when the connected DNA Scanner door is next
+ // closed
+ // This allows people to self-modify their genetic makeup, as tgui
+ // interfaces can not be accessed while inside the DNA Scanner and genetic
+ // makeup injectors are only temporary
+ // ---------------------------------------------------------------------- //
+ // params["index"] - The BYOND index of the console genetic makeup buffer to
+ // apply to the scanner occupant. Expected as text string, converted to
+ // number later
+ // params["type"] - Type of genetic makeup copy to implement
+ // Expected results:
+ // "ue" - Unique Enzyme, changes name and blood type
+ // "ui" - Unique Identity, changes looks
+ // "mixed" - Combination of both ue and ui
+ if("makeup_delay")
+ // Convert the index to a number and clamp within the array range, then
+ // copy the data from the disk to that buffer
+ var/buffer_index = text2num(params["index"])
+ buffer_index = clamp(buffer_index, 1, NUMBER_OF_BUFFERS)
+ var/list/buffer_slot = genetic_makeup_buffer[buffer_index]
+
+ // GUARD CHECK - This shouldn't be possible to execute this on a null
+ // buffer. Unexpected resut
+ if(!istype(buffer_slot))
+ return
+
+ var/type = params["type"]
+
+ // Set the delayed action. The next time the scanner door is closed,
+ // unless this is cancelled in the UI, the action will happen
+ delayed_action = list("type" = type, "buffer_slot" = buffer_slot)
+ return
+
+ // Attempts to modify the indexed element of the Unique Identity string
+ // This is a time delayed action that is handled in process()
+ // ---------------------------------------------------------------------- //
+ // params["index"] - The BYOND index of the Unique Identity string to
+ // attempt to modify
+ if("makeup_pulse")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ if(!can_modify_occupant())
+ return
+
+ // Set the appropriate timer and index to pulse. This is then managed
+ // later on in process()
+ var/len = length_char(scanner_occupant.dna.uni_identity)
+ rad_pulse_timer = world.time + (radduration*10)
+ rad_pulse_index = WRAP(text2num(params["index"]), 1, len+1)
+ START_PROCESSING(SSobj, src)
+ return
+
+ // Cancels the delayed action - In this context it is not the radiation
+ // pulse from "makeup_pulse", which can not be cancelled. It is instead
+ // the delayed genetic transfer from "makeup_delay"
+ if("cancel_delay")
+ delayed_action = null
+ return
+
+ // Creates a new advanced injector storage buffer in the console
+ // ---------------------------------------------------------------------- //
+ // params["name"] - The name to apply to the new injector
+ if("new_adv_inj")
+ // GUARD CHECK - Make sure we can make a new injector. This code should
+ // not be called if we're already maxed out and this is an Unexpected
+ // result
+ if(!(LAZYLEN(injector_selection) < max_injector_selections))
+ return
+
+ // GUARD CHECK - Sanitise and trim the proposed name. This prevents HTML
+ // injection and equivalent as tgui input is not stripped
+ var/inj_name = params["name"]
+ inj_name = trim(sanitize(inj_name))
+
+ // GUARD CHECK - If the name is null or blank, or the name is already in
+ // the list of advanced injectors, we want to reject it as we can't have
+ // duplicate named advanced injectors
+ if(!inj_name || (inj_name in injector_selection))
+ return
+
+ injector_selection[inj_name] = list()
+ return
+
+ // Deleted an advanced injector storage buffer from the console
+ // ---------------------------------------------------------------------- //
+ // params["name"] - The name of the injector to delete
+ if("del_adv_inj")
+ var/inj_name = params["name"]
+
+ // GUARD CHECK - If the name is null or blank, reject.
+ // GUARD CHECK - If the name isn't in the list of advanced injectors, we
+ // want to reject this as it shouldn't be possible ever do this.
+ // Unexpected result
+ if(!inj_name || !(inj_name in injector_selection))
+ return
+
+ injector_selection.Remove(inj_name)
+ return
+
+ // Creates an injector from an advanced injector buffer
+ // ---------------------------------------------------------------------- //
+ // params["name"] - The name of the injector to print
+ if("print_adv_inj")
+ // As a side note, because mutations can contain unique metadata,
+ // this system uses BYOND Atom Refs to safely and accurately
+ // identify mutations from big ol' lists.
+
+ // GUARD CHECK - Is the injector actually ready?
+ if(world.time < injectorready)
+ return
+
+ var/inj_name = params["name"]
+
+ // GUARD CHECK - If the name is null or blank, reject.
+ // GUARD CHECK - If the name isn't in the list of advanced injectors, we
+ // want to reject this as it shouldn't be possible ever do this.
+ // Unexpected result
+ if(!inj_name || !(inj_name in injector_selection))
+ return
+
+ var/list/injector = injector_selection[inj_name]
+ var/obj/item/dnainjector/activator/I = new /obj/item/dnainjector/activator(loc)
+
+ // Run through each mutation in our Advanced Injector and add them to a
+ // new injector
+ for(var/A in injector)
+ var/datum/mutation/human/HM = A
+ I.add_mutations += new HM.type(copymut=HM)
+
+ // Force apply any mutations, this is functionality similar to mutators
+ I.doitanyway = TRUE
+ I.name = "Advanced [inj_name] injector"
+
+ // If there's an operational connected scanner, we can use its upgrades
+ // to improve our injector's radiation generation
+ if(scanner_operational())
+ I.damage_coeff = connected_scanner.damage_coeff
+ injectorready = world.time + INJECTOR_TIMEOUT * 8 * (1 - 0.1 * connected_scanner.precision_coeff)
+ else
+ injectorready = world.time + INJECTOR_TIMEOUT * 8
+
+ return
+
+ // Adds a mutation to an advanced injector
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to add to the injector
+ // params["advinj"] - Name of the advanced injector to add the mutation to
+ if("add_advinj_mut")
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ // This is needed because this operation can only be completed from the
+ // genetic sequencer.
+ if(!can_modify_occupant())
+ return
+
+ var/adv_inj = params["advinj"]
+
+ // GUARD CHECK - Make sure our advanced injector actually exists. This
+ // should not be possible. Unexpected result
+ if(!(adv_inj in injector_selection))
+ return
+
+ // GUARD CHECK - Make sure we limit the number of mutations appropriately
+ if(LAZYLEN(injector_selection[adv_inj]) >= max_injector_mutations)
+ to_chat(usr,"Advanced injector mutation storage is full.")
+ return
+
+ var/mut_source = params["source"]
+ var/search_flag = 0
+
+ switch(mut_source)
+ if("disk")
+ search_flag = SEARCH_DISKETTE
+ if("occupant")
+ search_flag = SEARCH_OCCUPANT
+ if("console")
+ search_flag = SEARCH_STORED
+
+ if(!search_flag)
+ return
+
+ var/bref = params["mutref"]
+ // We've already made sure we can modify the occupant, so this is safe to
+ // call
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flag)
+
+ // GUARD CHECK - This should not be possible. Unexpected result
+ if(!HM)
+ return
+
+ // We want to make sure we stick within the instability limit.
+ // We start with the instability of the mutation we're intending to add.
+ var/instability_total = HM.instability
+
+ // We then add the instabilities of all other mutations in the injector,
+ // remembering to apply the Stabilizer chromosome modifiers
+ for(var/datum/mutation/human/I in injector_selection[adv_inj])
+ instability_total += I.instability * GET_MUTATION_STABILIZER(I)
+
+ // If this would take us over the max instability, we inform the user.
+ if(instability_total > max_injector_instability)
+ to_chat(usr,"Extra mutation would make the advanced injector too instable.")
+ return
+
+ // If we've got here, all our checks are passed and we can successfully
+ // add the mutation to the advanced injector.
+ var/datum/mutation/human/A = new HM.type()
+ A.copy_mutation(HM)
+ injector_selection[adv_inj] += A
+ to_chat(usr,"Mutation successfully added to advanced injector.")
+ return
+
+ // Deletes a mutation from an advanced injector
+ // ---------------------------------------------------------------------- //
+ // params["mutref"] - ATOM Ref of specific mutation to del from the injector
+ if("delete_injector_mut")
+ var/bref = params["mutref"]
+
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_ADV_INJ)
+
+ // GUARD CHECK - This should not be possible. Unexpected result
+ if(!HM)
+ return
+
+ // Check Advanced Injectors to find and remove the mutation
+ for(var/I in injector_selection)
+ var/list/injstuff = injector_selection["[I]"]
+ if(injstuff.Remove(HM))
+ qdel(HM)
+ return
+
+ return
+
+ // Sets a new tgui view state
+ // ---------------------------------------------------------------------- //
+ // params["id"] - Key for the state to set
+ // params[...] - Every other element is used to set state variables
+ if("set_view")
+ for (var/key in params)
+ if(key == "src")
+ continue
+ tgui_view_state[key] = params[key]
+ return TRUE
+ return FALSE
+
+/**
+ * Applies the enzyme buffer to the current scanner occupant
+ *
+ * Applies the type of a specific genetic makeup buffer to the current scanner
+ * occupant
+ *
+ * Arguments:
+ * * type - "ui"/"ue"/"mixed" - Which part of the enzyme buffer to apply
+ * * buffer_slot - Index of the enzyme buffer to apply
+ */
+/obj/machinery/computer/scan_consolenew/proc/apply_genetic_makeup(type, buffer_slot)
+ // Note - This proc is only called from code that has already performed the
+ // necessary occupant guard checks. If you call this code yourself, please
+ // apply can_modify_occupant() or equivalent checks first.
+
+ // Pre-calc the rad increase since we'll be using it in all the possible
+ // operations
+ var/rad_increase = rand(100/(connected_scanner.damage_coeff ** 2),250/(connected_scanner.damage_coeff ** 2))
+
+ switch(type)
+ if("ui")
+ // GUARD CHECK - There's currently no way to save partial genetic data.
+ // However, if this is the case, we can't make a complete injector and
+ // this catches that edge case
+ if(!buffer_slot["UI"])
+ to_chat(usr,"Genetic data corrupted, unable to apply genetic data.")
+ return FALSE
+ scanner_occupant.dna.uni_identity = buffer_slot["UI"]
+ scanner_occupant.updateappearance(mutations_overlay_update=1)
+ scanner_occupant.radiation += rad_increase
+ scanner_occupant.domutcheck()
+ return TRUE
+ if("ue")
+ // GUARD CHECK - There's currently no way to save partial genetic data.
+ // However, if this is the case, we can't make a complete injector and
+ // this catches that edge case
+ if(!buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"])
+ to_chat(usr,"Genetic data corrupted, unable to apply genetic data.")
+ return FALSE
+ scanner_occupant.real_name = buffer_slot["name"]
+ scanner_occupant.name = buffer_slot["name"]
+ scanner_occupant.dna.unique_enzymes = buffer_slot["UE"]
+ scanner_occupant.dna.blood_type = buffer_slot["blood_type"]
+ scanner_occupant.radiation += rad_increase
+ scanner_occupant.domutcheck()
+ return TRUE
+ if("mixed")
+ // GUARD CHECK - There's currently no way to save partial genetic data.
+ // However, if this is the case, we can't make a complete injector and
+ // this catches that edge case
+ if(!buffer_slot["UI"] || !buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"])
+ to_chat(usr,"Genetic data corrupted, unable to apply genetic data.")
+ return FALSE
+ scanner_occupant.dna.uni_identity = buffer_slot["UI"]
+ scanner_occupant.updateappearance(mutations_overlay_update=1)
+ scanner_occupant.real_name = buffer_slot["name"]
+ scanner_occupant.name = buffer_slot["name"]
+ scanner_occupant.dna.unique_enzymes = buffer_slot["UE"]
+ scanner_occupant.dna.blood_type = buffer_slot["blood_type"]
+ scanner_occupant.radiation += rad_increase
+ scanner_occupant.domutcheck()
+ return TRUE
+
+ return FALSE
+
+/**
+ * Checks if there is a connected DNA Scanner that is operational
+ */
+/obj/machinery/computer/scan_consolenew/proc/scanner_operational()
+ if(!connected_scanner)
+ return FALSE
+
+ return (connected_scanner && connected_scanner.is_operational())
+
+/**
+ * Checks if there is a valid DNA Scanner occupant for genetic modification
+ *
+ * Checks if there is a valid subject in the DNA Scanner that can be genetically
+ * modified. Will set the scanner occupant var as part of this check.
+ * Requires that the scanner can be operated and will return early if it can't
+ */
+/obj/machinery/computer/scan_consolenew/proc/can_modify_occupant()
+ // GUARD CHECK - We always want to perform the scanner operational check as
+ // part of checking if we can modify the occupant.
+ // We can never modify the occupant of a broken scanner.
+ if(!scanner_operational())
+ return FALSE
+
+ if(!connected_scanner.occupant)
+ return FALSE
+
+ scanner_occupant = connected_scanner.occupant
+
+ // Check validity of occupent for DNA Modification
+ // DNA Modification:
+ // requires DNA
+ // this DNA can not be bad
+ // is done via radiation bursts, so radiation immune carbons are not viable
+ // And the DNA Scanner itself must have a valid scan level
+ if(scanner_occupant.has_dna() && !HAS_TRAIT(scanner_occupant, TRAIT_RADIMMUNE) && !HAS_TRAIT(scanner_occupant, TRAIT_BADDNA) || (connected_scanner.scan_level == 3))
+ return TRUE
+
+ return FALSE
+
+/**
+ * Called by connected DNA Scanners when their doors close.
+ *
+ * Sets the new scanner occupant and completes delayed enzyme transfer if one
+ * is queued.
+ */
+/obj/machinery/computer/scan_consolenew/proc/on_scanner_close()
+ SIGNAL_HANDLER
+ // Set the appropriate occupant now the scanner is closed
+ if(connected_scanner.occupant)
+ scanner_occupant = connected_scanner.occupant
+ else
+ scanner_occupant = null
+
+ // If we have a delayed action - In this case the only delayed action is
+ // applying a genetic makeup buffer the next time the DNA Scanner is closed -
+ // we want to perform it.
+ // GUARD CHECK - Make sure we can modify the occupant, apply_genetic_makeup()
+ // assumes we've already done this.
+ if(delayed_action && can_modify_occupant())
+ var/type = delayed_action["type"]
+ var/buffer_slot = delayed_action["buffer_slot"]
+ if(apply_genetic_makeup(type, buffer_slot))
+ to_chat(connected_scanner.occupant, "[src] activates!")
+ delayed_action = null
+
+/**
+ * Called by connected DNA Scanners when their doors open.
+ *
+ * Clears enzyme pulse operations, stops processing and nulls the current
+ * scanner occupant var.
+ */
+/obj/machinery/computer/scan_consolenew/proc/on_scanner_open()
+ SIGNAL_HANDLER
+ // If we had a radiation pulse action ongoing, we want to stop this.
+ // Imagine it being like a microwave stopping when you open the door.
+ rad_pulse_index = 0
+ rad_pulse_timer = 0
+ STOP_PROCESSING(SSobj, src)
+ scanner_occupant = null
+
+/**
+ * Builds the genetic makeup list which will be sent to tgui interface.
+ */
+/obj/machinery/computer/scan_consolenew/proc/build_genetic_makeup_list()
+ // No code will ever null this list, we can safely Cut it.
+ tgui_genetic_makeup.Cut()
+
+ for(var/i=1, i <= NUMBER_OF_BUFFERS, i++)
+ if(genetic_makeup_buffer[i])
+ tgui_genetic_makeup["[i]"] = genetic_makeup_buffer[i].Copy()
+ else
+ tgui_genetic_makeup["[i]"] = null
+
+/**
+ * Builds the genetic makeup list which will be sent to tgui interface.
+ *
+ * Will iterate over the connected scanner occupant, DNA Console, inserted
+ * diskette and chromosomes and any advanced injectors, building the main data
+ * structures which get passed to the tgui interface.
+ */
+/obj/machinery/computer/scan_consolenew/proc/build_mutation_list(can_modify_occ)
+ // No code will ever null these lists. We can safely Cut them.
+ tgui_occupant_mutations.Cut()
+ tgui_diskette_mutations.Cut()
+ tgui_console_mutations.Cut()
+ tgui_console_chromosomes.Cut()
+ tgui_advinjector_mutations.Cut()
+
+ // ------------------------------------------------------------------------ //
+ // GUARD CHECK - Can we genetically modify the occupant? This check will have
+ // previously included checks to make sure the DNA Scanner is still
+ // operational
+ if(can_modify_occ)
+ // ---------------------------------------------------------------------- //
+ // Start cataloguing all mutations that the occupant has by default
+ for(var/mutation_type in scanner_occupant.dna.mutation_index)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation_type)
+
+ var/list/mutation_data = list()
+ var/text_sequence = scanner_occupant.dna.mutation_index[mutation_type]
+ var/default_sequence = scanner_occupant.dna.default_mutation_genes[mutation_type]
+ var/discovered = (stored_research && (mutation_type in stored_research.discovered_mutations))
+
+ mutation_data["Alias"] = HM.alias
+ mutation_data["Sequence"] = text_sequence
+ mutation_data["DefaultSeq"] = default_sequence
+ mutation_data["Discovered"] = discovered
+ mutation_data["Source"] = "occupant"
+
+ // We only want to pass this information along to the tgui interface if
+ // the mutation has been discovered. Prevents people being able to cheese
+ // or "hack" their way to figuring out what undiscovered mutations are
+ if(discovered)
+ mutation_data["Name"] = HM.name
+ mutation_data["Description"] = HM.desc
+ mutation_data["Instability"] = HM.instability * GET_MUTATION_STABILIZER(HM)
+ mutation_data["Quality"] = HM.quality
+
+ // Assume the mutation is normal unless assigned otherwise.
+ var/mut_class = MUT_NORMAL
+
+ // Check if the mutation is currently activated. If it is, we can add even
+ // MORE information to send to tgui.
+ var/datum/mutation/human/A = scanner_occupant.dna.get_mutation(mutation_type)
+ if(A)
+ mutation_data["Active"] = TRUE
+ mutation_data["Scrambled"] = A.scrambled
+ mutation_data["Class"] = A.class
+ mut_class = A.class
+ mutation_data["CanChromo"] = A.can_chromosome
+ mutation_data["ByondRef"] = REF(A)
+ mutation_data["Type"] = A.type
+ if(A.can_chromosome)
+ mutation_data["ValidChromos"] = jointext(A.valid_chrom_list, ", ")
+ mutation_data["AppliedChromo"] = A.chromosome_name
+ mutation_data["ValidStoredChromos"] = build_chrom_list(A)
+ else
+ mutation_data["Active"] = FALSE
+ mutation_data["Scrambled"] = FALSE
+ mutation_data["Class"] = MUT_NORMAL
+
+ // Technically NONE of these mutations should be MUT_EXTRA but this will
+ // catch any weird edge cases
+ // Assign icons by priority - MUT_EXTRA will ALSO be discovered, so it
+ // has a higher priority for icon/image assignment
+ if (mut_class == MUT_EXTRA)
+ mutation_data["Image"] = "dna_extra.gif"
+ else if(discovered)
+ mutation_data["Image"] = "dna_discovered.gif"
+ else
+ mutation_data["Image"] = "dna_undiscovered.gif"
+
+ tgui_occupant_mutations += list(mutation_data)
+
+ // ---------------------------------------------------------------------- //
+ // Now get additional/"extra" mutations that they shouldn't have by default
+ for(var/datum/mutation/human/HM in scanner_occupant.dna.mutations)
+ // If it's in the mutation index array, we've already catalogued this
+ // mutation and can safely skip over it. It really shouldn't be, but this
+ // will catch any weird edge cases
+ if(HM.type in scanner_occupant.dna.mutation_index)
+ continue
+
+ var/list/mutation_data = list()
+ var/text_sequence = GET_SEQUENCE(HM.type)
+
+ // These will all be active mutations. They're added by injector and their
+ // sequencing code can't be changed. They can only be nullified, which
+ // completely removes them.
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type)
+
+ mutation_data["Alias"] = A.alias
+ mutation_data["Sequence"] = text_sequence
+ mutation_data["Discovered"] = TRUE
+ mutation_data["Quality"] = HM.quality
+ mutation_data["Source"] = "occupant"
+
+ mutation_data["Name"] = HM.name
+ mutation_data["Description"] = HM.desc
+ mutation_data["Instability"] = HM.instability * GET_MUTATION_STABILIZER(HM)
+
+ mutation_data["Active"] = TRUE
+ mutation_data["Scrambled"] = HM.scrambled
+ mutation_data["Class"] = HM.class
+ mutation_data["CanChromo"] = HM.can_chromosome
+ mutation_data["ByondRef"] = REF(HM)
+ mutation_data["Type"] = HM.type
+
+ if(HM.can_chromosome)
+ mutation_data["ValidChromos"] = jointext(HM.valid_chrom_list, ", ")
+ mutation_data["AppliedChromo"] = HM.chromosome_name
+ mutation_data["ValidStoredChromos"] = build_chrom_list(HM)
+
+ // Nothing in this list should be undiscovered. Technically nothing
+ // should be anything but EXTRA. But we're just handling some edge cases.
+ if (HM.class == MUT_EXTRA)
+ mutation_data["Image"] = "dna_extra.gif"
+ else
+ mutation_data["Image"] = "dna_discovered.gif"
+
+ tgui_occupant_mutations += list(mutation_data)
+
+ // ------------------------------------------------------------------------ //
+ // Build the list of mutations stored within the DNA Console
+ for(var/datum/mutation/human/HM in stored_mutations)
+ var/list/mutation_data = list()
+
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type)
+
+ mutation_data["Alias"] = A.alias
+ mutation_data["Name"] = HM.name
+ mutation_data["Source"] = "console"
+ mutation_data["Active"] = TRUE
+ mutation_data["Description"] = HM.desc
+ mutation_data["Instability"] = HM.instability * GET_MUTATION_STABILIZER(HM)
+ mutation_data["ByondRef"] = REF(HM)
+ mutation_data["Type"] = HM.type
+
+ mutation_data["CanChromo"] = HM.can_chromosome
+ if(HM.can_chromosome)
+ mutation_data["ValidChromos"] = jointext(HM.valid_chrom_list, ", ")
+ mutation_data["AppliedChromo"] = HM.chromosome_name
+ mutation_data["ValidStoredChromos"] = build_chrom_list(HM)
+
+ tgui_console_mutations += list(mutation_data)
+
+ // ------------------------------------------------------------------------ //
+ // Build the list of chromosomes stored within the DNA Console
+ var/chrom_index = 1
+ for(var/obj/item/chromosome/CM in stored_chromosomes)
+ var/list/chromo_data = list()
+
+ chromo_data["Name"] = CM.name
+ chromo_data["Description"] = CM.desc
+ chromo_data["Index"] = chrom_index
+
+ tgui_console_chromosomes += list(chromo_data)
+ ++chrom_index
+
+ // ------------------------------------------------------------------------ //
+ // Build the list of mutations stored on any inserted diskettes
+ if(diskette)
+ for(var/datum/mutation/human/HM in diskette.mutations)
+ var/list/mutation_data = list()
+
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type)
+
+ mutation_data["Alias"] = A.alias
+ mutation_data["Name"] = HM.name
+ mutation_data["Active"] = TRUE
+ //mutation_data["Sequence"] = GET_SEQUENCE(HM.type)
+ mutation_data["Source"] = "disk"
+ mutation_data["Description"] = HM.desc
+ mutation_data["Instability"] = HM.instability * GET_MUTATION_STABILIZER(HM)
+ mutation_data["ByondRef"] = REF(HM)
+ mutation_data["Type"] = HM.type
+
+ mutation_data["CanChromo"] = HM.can_chromosome
+ if(HM.can_chromosome)
+ mutation_data["ValidChromos"] = jointext(HM.valid_chrom_list, ", ")
+ mutation_data["AppliedChromo"] = HM.chromosome_name
+ mutation_data["ValidStoredChromos"] = build_chrom_list(HM)
+
+ tgui_diskette_mutations += list(mutation_data)
+
+ // ------------------------------------------------------------------------ //
+ // Build the list of mutations stored within any Advanced Injectors
+ if(LAZYLEN(injector_selection))
+ for(var/I in injector_selection)
+ var/list/mutations = list()
+ for(var/datum/mutation/human/HM in injector_selection[I])
+ var/list/mutation_data = list()
+
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type)
+
+ mutation_data["Alias"] = A.alias
+ mutation_data["Name"] = HM.name
+ mutation_data["Active"] = TRUE
+ //mutation_data["Sequence"] = GET_SEQUENCE(HM.type)
+ mutation_data["Source"] = "injector"
+ mutation_data["Description"] = HM.desc
+ mutation_data["Instability"] = HM.instability * GET_MUTATION_STABILIZER(HM)
+ mutation_data["ByondRef"] = REF(HM)
+ mutation_data["Type"] = HM.type
+
+ if(HM.can_chromosome)
+ mutation_data["AppliedChromo"] = HM.chromosome_name
+
+ mutations += list(mutation_data)
+ tgui_advinjector_mutations += list(list(
+ "name" = "[I]",
+ "mutations" = mutations,
+ ))
+
+/**
+ * Takes any given chromosome and calculates chromosome compatibility
+ *
+ * Will iterate over the stored chromosomes in the DNA Console and will check
+ * whether it can be applied to the supplied mutation. Then returns a list of
+ * names of chromosomes that were compatible.
+ *
+ * Arguments:
+ * * mutation - The mutation to check chromosome compatibility with
+ */
+/obj/machinery/computer/scan_consolenew/proc/build_chrom_list(mutation)
+ var/list/chromosomes = list()
+
+ for(var/obj/item/chromosome/CM in stored_chromosomes)
+ if(CM.can_apply(mutation))
+ chromosomes += CM.name
+
+ return chromosomes
+
+
+/**
+ * Checks whether a mutation alias has been discovered
+ *
+ * Checks whether a given mutation's genetic sequence has been completed and
+ * discovers it if appropriate
+ *
+ * Arguments:
+ * * alias - Alias of the mutation to check (ie "Mutation 51" or "Mutation 12")
+ */
+/obj/machinery/computer/scan_consolenew/proc/check_discovery(alias)
+ // Note - All code paths that call this have already done checks on the
+ // current occupant to prevent cheese and other abuses. If you call this
+ // proc please also do the following checks first:
+ // if(!can_modify_occupant())
+ // return
+ // if(!(scanner_occupant == connected_scanner.occupant))
+ // return
+
+ // Turn the alias ("Mutation 1", "Mutation 35") into a mutation path
+ var/path = GET_MUTATION_TYPE_FROM_ALIAS(alias)
+
+ // Check to see if this mutation is in the active mutation list. If it isn't,
+ // then the mutation isn't eligible for discovery. If it is but is scrambled,
+ // then the mutation isn't eligible for discovery. Finally, check if the
+ // mutation is in discovered mutations - If it isn't, add it to discover.
+ var/datum/mutation/human/M = scanner_occupant.dna.get_mutation(path)
+ if(!M)
+ return FALSE
+ if(M.scrambled)
+ return FALSE
+ if(stored_research && !(path in stored_research.discovered_mutations))
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(path)
+ stored_research.discovered_mutations += path
+ say("Successfully discovered [HM.name].")
+ return TRUE
+
+ return FALSE
+
+/**
+ * Find a mutation from various storage locations via ATOM ref
+ *
+ * Takes an ATOM Ref and searches the appropriate mutation buffers and storage
+ * vars to try and find the associated mutation.
+ *
+ * Arguments:
+ * * ref - ATOM ref of the mutation to locate
+ * * target_flags - Flags for storage mediums to search, see #defines
+ */
+/obj/machinery/computer/scan_consolenew/proc/get_mut_by_ref(ref, target_flags)
+ var/mutation
+
+ // Assume the occupant is valid and the check has been carried out before
+ // calling this proc with the relevant flags.
+ if(target_flags & SEARCH_OCCUPANT)
+ mutation = (locate(ref) in scanner_occupant.dna.mutations)
+ if(mutation)
+ return mutation
+
+ if(target_flags & SEARCH_STORED)
+ mutation = (locate(ref) in stored_mutations)
+ if(mutation)
+ return mutation
+
+ if(diskette && (target_flags & SEARCH_DISKETTE))
+ mutation = (locate(ref) in diskette.mutations)
+ if(mutation)
+ return mutation
+
+ if(injector_selection && (target_flags & SEARCH_ADV_INJ))
+ for(var/I in injector_selection)
+ mutation = (locate(ref) in injector_selection["[I]"])
+ if(mutation)
+ return mutation
+
+ return null
+
+/**
+ * Creates a randomised accuracy value for the enzyme pulse functionality.
+ *
+ * Donor code from previous DNA Console iteration.
+ *
+ * Arguments:
+ * * position - Index of the intended enzyme element to pulse
+ * * radduration - Duration of intended radiation pulse
+ * * number_of_blocks - Number of individual data blocks in the pulsed enzyme
+ */
+/obj/machinery/computer/scan_consolenew/proc/randomize_radiation_accuracy(position, radduration, number_of_blocks)
+ var/val = round(gaussian(0, RADIATION_ACCURACY_MULTIPLIER/radduration) + position, 1)
+ return WRAP(val, 1, number_of_blocks+1)
+
+/**
+ * Scrambles an enzyme element value for the enzyme pulse functionality.
+ *
+ * Donor code from previous DNA Console iteration.
+ *
+ * Arguments:
+ * * input - Enzyme identity element to scramble, expected hex value
+ * * rs - Strength of radiation pulse, increases the range of possible outcomes
+ */
+/obj/machinery/computer/scan_consolenew/proc/scramble(input,rs)
var/length = length(input)
var/ran = gaussian(0, rs*RADIATION_STRENGTH_MULTIPLIER)
if(ran == 0)
@@ -958,98 +1928,71 @@
ran = -round(-ran) //positive, so ceiling it
return num2hex(WRAP(hex2num(input)+ran, 0, 16**length), length)
-/obj/machinery/computer/scan_consolenew/proc/randomize_radiation_accuracy(position, radduration, number_of_blocks)
- var/val = round(gaussian(0, RADIATION_ACCURACY_MULTIPLIER/radduration) + position, 1)
- return WRAP(val, 1, number_of_blocks+1)
+/**
+ * Performs the enzyme radiation pulse.
+ *
+ * Donor code from previous DNA Console iteration. Called from process() when
+ * there is a radiation pulse in progress. Ends processing.
+ */
+/obj/machinery/computer/scan_consolenew/proc/rad_pulse()
+ // GUARD CHECK - Can we genetically modify the occupant? Includes scanner
+ // operational guard checks.
+ // If we can't, abort the procedure.
+ if(!can_modify_occupant())
+ rad_pulse_index = 0
+ STOP_PROCESSING(SSobj, src)
+ return
-/obj/machinery/computer/scan_consolenew/proc/get_viable_occupant()
- var/mob/living/carbon/viable_occupant = null
- if(connected)
- viable_occupant = connected.occupant
- if(!istype(viable_occupant) || !viable_occupant.dna || HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) || HAS_TRAIT(viable_occupant, TRAIT_BADDNA))
- viable_occupant = null
- return viable_occupant
-
-/obj/machinery/computer/scan_consolenew/proc/apply_buffer(action,buffer_num)
- buffer_num = CLAMP(buffer_num, 1, NUMBER_OF_BUFFERS)
- var/list/buffer_slot = buffer[buffer_num]
- var/mob/living/carbon/viable_occupant = get_viable_occupant()
- if(istype(buffer_slot))
- viable_occupant.radiation += rand(100/(connected.damage_coeff ** 2),250/(connected.damage_coeff ** 2))
- //15 and 40 are just magic numbers that were here before so i didnt touch them, they are initial boundaries of damage
- //Each laser level reduces damage by lvl^2, so no effect on 1 lvl, 4 times less damage on 2 and 9 times less damage on 3
- //Numbers are this high because other way upgrading laser is just not worth the hassle, and i cant think of anything better to inmrove
- switch(action)
- if(SCANNER_ACTION_UI)
- if(buffer_slot["UI"])
- viable_occupant.dna.uni_identity = buffer_slot["UI"]
- viable_occupant.updateappearance(mutations_overlay_update=1)
- if(SCANNER_ACTION_UE)
- if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"])
- viable_occupant.real_name = buffer_slot["name"]
- viable_occupant.name = buffer_slot["name"]
- viable_occupant.dna.unique_enzymes = buffer_slot["UE"]
- viable_occupant.dna.blood_type = buffer_slot["blood_type"]
- if(SCANNER_ACTION_MIXED)
- if(buffer_slot["UI"])
- viable_occupant.dna.uni_identity = buffer_slot["UI"]
- viable_occupant.updateappearance(mutations_overlay_update=1)
- if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"])
- viable_occupant.real_name = buffer_slot["name"]
- viable_occupant.name = buffer_slot["name"]
- viable_occupant.dna.unique_enzymes = buffer_slot["UE"]
- viable_occupant.dna.blood_type = buffer_slot["blood_type"]
+ var/len = length_char(scanner_occupant.dna.uni_identity)
+ var/num = randomize_radiation_accuracy(rad_pulse_index, radduration + (connected_scanner.precision_coeff ** 2), len) //Each manipulator level above 1 makes randomization as accurate as selected time + manipulator lvl^2 //Value is this high for the same reason as with laser - not worth the hassle of upgrading if the bonus is low
+ var/hex = copytext_char(scanner_occupant.dna.uni_identity, num, num+1)
+ hex = scramble(hex, radstrength, radduration)
+
+ scanner_occupant.dna.uni_identity = copytext_char(scanner_occupant.dna.uni_identity, 1, num) + hex + copytext_char(scanner_occupant.dna.uni_identity, num + 1)
+ scanner_occupant.updateappearance(mutations_overlay_update=1)
+
+ rad_pulse_index = 0
+ STOP_PROCESSING(SSobj, src)
+ return
+
+/**
+ * Sets the default state for the tgui interface.
+ */
+/obj/machinery/computer/scan_consolenew/proc/set_default_state()
+ tgui_view_state["consoleMode"] = "storage"
+ tgui_view_state["storageMode"] = "console"
+ tgui_view_state["storageConsSubMode"] = "mutations"
+ tgui_view_state["storageDiskSubMode"] = "mutations"
+
+/**
+ * Ejects the DNA Disk from the console.
+ *
+ * Will insert into the user's hand if possible, otherwise will drop it at the
+ * console's location.
+ *
+ * Arguments:
+ * * user - The mob that is attempting to eject the diskette.
+ */
+/obj/machinery/computer/scan_consolenew/proc/eject_disk(mob/user)
+ // Check for diskette.
+ if(!diskette)
+ return
-/obj/machinery/computer/scan_consolenew/proc/on_scanner_close()
- if(delayed_action && get_viable_occupant())
- to_chat(connected.occupant, "[src] activates!")
- apply_buffer(delayed_action["action"],delayed_action["buffer"])
- delayed_action = null //or make it stick + reset button ?
-
-/obj/machinery/computer/scan_consolenew/proc/get_valid_mutation(mutation)
- var/mob/living/carbon/C = get_viable_occupant()
- if(C)
- var/datum/mutation/human/HM = C.dna.get_mutation(mutation)
- if(HM)
- return HM
- for(var/datum/mutation/human/A in stored_mutations)
- if(A.type == mutation)
- return A
-
-
-/obj/machinery/computer/scan_consolenew/proc/get_mutation_list(include_storage) //Returns a list of the mutation index types and any extra mutations
- var/mob/living/carbon/viable_occupant = get_viable_occupant()
- var/list/paths = list()
- if(viable_occupant)
- for(var/A in viable_occupant.dna.mutation_index)
- paths += A
- for(var/datum/mutation/human/A in viable_occupant.dna.mutations)
- if(A.class == MUT_EXTRA)
- paths += A.type
- if(include_storage)
- for(var/datum/mutation/human/A in stored_mutations)
- paths += A.type
- return paths
-
-/obj/machinery/computer/scan_consolenew/proc/get_valid_gene_string(mutation)
- var/mob/living/carbon/C = get_viable_occupant()
- if(C && (mutation in C.dna.mutation_index))
- return GET_GENE_STRING(mutation, C.dna)
- else if(C && (LAZYLEN(C.dna.mutations)))
- for(var/datum/mutation/human/A in C.dna.mutations)
- if(A.type == mutation)
- return GET_SEQUENCE(mutation)
- for(var/datum/mutation/human/A in stored_mutations)
- if(A.type == mutation)
- return GET_SEQUENCE(mutation)
-
-/obj/machinery/computer/scan_consolenew/proc/discover(mutation)
- if(stored_research && !(mutation in stored_research.discovered_mutations))
- stored_research.discovered_mutations += mutation
- return TRUE
+ to_chat(user, "You eject [diskette] from [src].")
+
+ // Reset the state to console storage.
+ tgui_view_state["storageMode"] = "console"
+
+ // If the disk shouldn't pop into the user's hand for any reason, drop it on the console instead.
+ if(!istype(user) || !Adjacent(user) || !user.put_in_active_hand(diskette))
+ diskette.forceMove(drop_location())
+ diskette = null
/////////////////////////// DNA MACHINES
#undef INJECTOR_TIMEOUT
#undef NUMBER_OF_BUFFERS
+#undef SCRAMBLE_TIMEOUT
+#undef JOKER_TIMEOUT
+#undef JOKER_UPGRADE
#undef RADIATION_STRENGTH_MAX
#undef RADIATION_STRENGTH_MULTIPLIER
@@ -1059,11 +2002,9 @@
#undef RADIATION_IRRADIATION_MULTIPLIER
-#undef SCANNER_ACTION_SE
-#undef SCANNER_ACTION_UI
-#undef SCANNER_ACTION_UE
-#undef SCANNER_ACTION_MIXED
+#undef STATUS_TRANSFORMING
-//#undef BAD_MUTATION_DIFFICULTY
-//#undef GOOD_MUTATION_DIFFICULTY
-//#undef OP_MUTATION_DIFFICULTY
+#undef SEARCH_OCCUPANT
+#undef SEARCH_STORED
+#undef SEARCH_DISKETTE
+#undef SEARCH_ADV_INJ
diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm
index 35be677783902..74967e981d232 100644
--- a/code/game/machinery/computer/launchpad_control.dm
+++ b/code/game/machinery/computer/launchpad_control.dm
@@ -27,13 +27,26 @@
if(M.buffer && istype(M.buffer, /obj/machinery/launchpad))
if(LAZYLEN(launchpads) < maximum_pads)
launchpads |= M.buffer
+ RegisterSignal(M.buffer, COMSIG_PARENT_QDELETING, .proc/launchpad_deleted)
M.buffer = null
+ ui_update()
to_chat(user, "You upload the data from the [W.name]'s buffer.")
else
to_chat(user, "[src] cannot handle any more connections!")
else
return ..()
+/obj/machinery/computer/launchpad/proc/launchpad_deleted(datum/source)
+ SIGNAL_HANDLER
+ var/source_id = launchpads.Find(source)
+ if(source_id && selected_id)
+ if(selected_id > source_id)
+ selected_id--
+ else if(selected_id == source_id)
+ selected_id = null
+ launchpads -= source
+ ui_update()
+
/obj/machinery/computer/launchpad/proc/pad_exists(number)
var/obj/machinery/launchpad/pad = launchpads[number]
if(QDELETED(pad))
@@ -115,11 +128,11 @@
)
. = TRUE
if("rename")
- . = TRUE
var/new_name = params["name"]
if(!new_name)
return
current_pad.display_name = new_name
+ . = TRUE
if("remove")
if(usr && alert(usr, "Are you sure?", "Unlink Launchpad", "I'm Sure", "Abort") != "Abort")
launchpads -= current_pad
@@ -132,4 +145,3 @@
if("pull")
teleport(usr, current_pad, FALSE)
. = TRUE
- . = TRUE
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index 0b2b873f100e6..b868fd6d9d546 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -21,7 +21,8 @@
current = null
return
var/turf/currentloc = get_turf(current)
- if(currentloc && user.z != currentloc.z)
+ var/turf/user_turf = get_turf(user)
+ if(currentloc && user.get_virtual_z_level() != currentloc.get_virtual_z_level() && (!is_station_level(currentloc.z) || !is_station_level(user_turf.z)))
to_chat(user, "Upload failed! Unable to establish a connection to [current.name]. You're too far away!")
current = null
return
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 646d662003535..c5d71a1ff3f85 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -169,7 +169,7 @@
dat += "" - temp_html += "
[mut_desc]
"
- if(active && !storage_slot)
- if(HM?.can_chromosome && (HM in viable_occupant.dna.mutations))
- var/i = viable_occupant.dna.mutations.Find(HM)
- var/chromosome_name = "----"
- if(HM.chromosome_name)
- chromosome_name = HM.chromosome_name
- temp_html += "Chromosome status: [chromosome_name]
"
- temp_html += "Sequence:
"
- if(!scrambled)
- for(var/block in 1 to A.blocks)
- var/whole_sequence = get_valid_gene_string(mutation)
- var/sequence = copytext_char(whole_sequence, 1+(block-1)*(DNA_SEQUENCE_LENGTH*2),(DNA_SEQUENCE_LENGTH*2*block+1))
- temp_html += "| " - temp_html += " |
| | "
- temp_html += "
| " - temp_html += " |
" - else - temp_html = "
Sequence unreadable due to unpredictable mutation.
"
- if((active || storage_slot) && (injectorready < world.time) && !scrambled)
- temp_html += "Print Activator"
- temp_html += "Print Mutator"
- else
- temp_html += "Print Activator"
- temp_html += "Print Mutator"
- if((active || storage_slot) && !scrambled)
- temp_html += "Adv. Injector"
- else
- temp_html += "Adv. Injector"
- temp_html += ""
- if(storage_slot)
- temp_html += "Delete"
- if((LAZYLEN(stored_mutations) < max_storage) && diskette && !diskette.read_only)
- temp_html += "Export"
- else
- temp_html += "Export"
- temp_html += "Back"
- else if(active && !scrambled)
- temp_html += "Store"
+ // Toggle the door bolts on the attached DNA Scanner
+ if("toggle_lock")
+ // GUARD CHECK - Scanner still connected and operational?
+ if(!scanner_operational())
+ return
- if(extra || scrambled)
- temp_html += "Nullify"
- else
- temp_html += "Nullify"
- temp_html += "
Medical Robots:" var/bdat = null for(var/mob/living/simple_animal/bot/medbot/M in GLOB.alive_mob_list) - if(M.z != src.z) + if(M.get_virtual_z_level() != src.get_virtual_z_level()) continue //only find medibots on the same z-level as the computer var/turf/bl = get_turf(M) if(bl) //if it can't find a turf for the medibot, then it probably shouldn't be showing up @@ -271,7 +271,7 @@
Notes: [Dis.desc]
-
Severity: [Dis.severity]"} +
Danger: [Dis.danger]"} else if(href_list["del_all"]) src.temp = "Are you sure you wish to delete all records?
\n\tYes
\n\tNo
" @@ -590,4 +590,5 @@ icon_screen = "medlaptop" icon_keyboard = "laptop_key" clockwork = TRUE //it'd look weird + broken_overlay_emissive = TRUE pass_flags = PASSTABLE diff --git a/code/game/machinery/computer/prisoner/_prisoner.dm b/code/game/machinery/computer/prisoner/_prisoner.dm index 743950c4a5bfb..ccc27734a3bb8 100644 --- a/code/game/machinery/computer/prisoner/_prisoner.dm +++ b/code/game/machinery/computer/prisoner/_prisoner.dm @@ -16,7 +16,6 @@ /obj/machinery/computer/prisoner/AltClick(mob/user) id_eject(user) - return ..() /obj/machinery/computer/prisoner/proc/id_insert(mob/user, obj/item/card/id/prisoner/P) if(istype(P)) diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index 7129e3d762dbf..bd9636e182923 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -30,6 +30,7 @@ if(!ui) ui = new(user, src, "GulagTeleporterConsole") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_data(mob/user) var/list/data = list() @@ -53,14 +54,14 @@ if(teleporter) data["teleporter"] = teleporter - data["teleporter_location"] = "([teleporter.x], [teleporter.y], [teleporter.z])" + data["teleporter_location"] = "([teleporter.x], [teleporter.y], [teleporter.get_virtual_z_level()])" data["teleporter_lock"] = teleporter.locked data["teleporter_state_open"] = teleporter.state_open else data["teleporter"] = null if(beacon) data["beacon"] = beacon - data["beacon_location"] = "([beacon.x], [beacon.y], [beacon.z])" + data["beacon_location"] = "([beacon.x], [beacon.y], [beacon.get_virtual_z_level()])" else data["beacon"] = null if(contained_id) @@ -74,10 +75,10 @@ return data /obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_act(action, list/params) - if(isliving(usr)) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) if(..()) return + if(isliving(usr)) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) if(!allowed(usr)) to_chat(usr, "Access denied.") return @@ -147,13 +148,11 @@ log_game("[key_name(user)] teleported [key_name(prisoner)] to the Labor Camp [COORD(beacon)] for [id_goal_not_set ? "default goal of ":""][contained_id.goal] points.") teleporter.handle_prisoner(contained_id, temporary_record) playsound(src, 'sound/weapons/emitter.ogg', 50, TRUE) - prisoner.forceMove(get_turf(beacon)) - prisoner.Paralyze(40) // small travel dizziness - to_chat(prisoner, "The teleportation makes you a little dizzy.") - new /obj/effect/particle_effect/sparks(get_turf(prisoner)) - playsound(src, "sparks", 50, TRUE) - if(teleporter.locked) - teleporter.locked = FALSE - teleporter.toggle_open() - contained_id = null - temporary_record = null + if(do_teleport(prisoner, get_turf(beacon))) + prisoner.Paralyze(40) // small travel dizziness + to_chat(prisoner, "The teleportation makes you a little dizzy.") + if(teleporter.locked) + teleporter.locked = FALSE + teleporter.toggle_open() + contained_id = null + temporary_record = null diff --git a/code/game/machinery/computer/prisoner/management.dm b/code/game/machinery/computer/prisoner/management.dm index 4346ae84f6117..fb9f9694b6505 100644 --- a/code/game/machinery/computer/prisoner/management.dm +++ b/code/game/machinery/computer/prisoner/management.dm @@ -35,7 +35,7 @@ var/turf/Tr = null for(var/obj/item/implant/chem/C in GLOB.tracked_chem_implants) Tr = get_turf(C) - if((Tr) && (Tr.z != src.z)) + if((Tr) && (Tr.get_virtual_z_level() != src.get_virtual_z_level())) continue//Out of range if(!C.imp_in) continue @@ -50,7 +50,7 @@ if(!isliving(T.imp_in)) continue Tr = get_turf(T) - if((Tr) && (Tr.z != src.z)) + if((Tr) && (Tr.get_virtual_z_level() != src.get_virtual_z_level())) continue//Out of range var/loc_display = "Unknown" diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 584bf92a62d94..a1326924b71f7 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -32,6 +32,7 @@ if(!ui) ui = new(user, src, "RoboticsControlConsole") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/computer/robotics/ui_data(mob/user) var/list/data = list() @@ -48,7 +49,7 @@ for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs) if(!can_control(user, R)) continue - if(z != (get_turf(R)).z) + if(get_virtual_z_level() != (get_turf(R)).get_virtual_z_level()) continue var/list/cyborg_data = list( name = R.name, @@ -66,7 +67,7 @@ for(var/mob/living/simple_animal/drone/D in GLOB.drones_list) if(D.hacked) continue - if(z != (get_turf(D)).z) + if(get_virtual_z_level() != (get_turf(D)).get_virtual_z_level()) continue var/list/drone_data = list( name = D.name, @@ -89,6 +90,8 @@ var/turf/T = get_turf(R) message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(R, R.client)] at [ADMIN_VERBOSEJMP(T)]!") log_game("\[key_name(usr)] detonated [key_name(R)]!") + log_combat(usr, R, "detonated cyborg") + if(R.connected_ai) to_chat(R.connected_ai, "
ALERT - Cyborg detonation detected: [R.name]
") R.self_destruct() @@ -100,6 +103,7 @@ if(can_control(usr, R) && !..()) message_admins("[ADMIN_LOOKUPFLW(usr)] [!R.lockcharge ? "locked down" : "released"] [ADMIN_LOOKUPFLW(R)]!") log_game("[key_name(usr)] [!R.lockcharge ? "locked down" : "released"] [key_name(R)]!") + log_combat(usr, R, "[!R.lockcharge ? "locked down" : "released"] cyborg") R.SetLockdown(!R.lockcharge) to_chat(R, "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") if(R.connected_ai) @@ -126,5 +130,5 @@ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, TRUE, D) s.start() - D.visible_message("\the [D] self destructs!") + D.visible_message("\the [D] self-destructs!") D.gib() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 61aaf71181552..cbd3a10f619e6 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -3,7 +3,7 @@ desc = "Used to view and edit personnel's security records." icon_screen = "security" icon_keyboard = "security_key" - req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS) + req_one_access = list(ACCESS_SEC_RECORDS) circuit = /obj/item/circuitboard/computer/secure_data var/obj/item/card/id/scan = null var/authenticated = null @@ -22,6 +22,181 @@ var/order = 1 // -1 = Descending - 1 = Ascending light_color = LIGHT_COLOR_RED +/obj/machinery/computer/secure_data/Initialize(mapload, obj/item/circuitboard/C) + . = ..() + AddComponent(/datum/component/usb_port, list( + /obj/item/circuit_component/arrest_console_data, + /obj/item/circuit_component/arrest_console_arrest, + )) + +/obj/item/circuit_component/arrest_console_data + display_name = "Security Records Data" + display_desc = "Outputs the security records data, where it can then be filtered with a Select Query component" + circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL + + /// The records retrieved + var/datum/port/output/records + + /// Sends a signal on failure + var/datum/port/output/on_fail + + var/obj/machinery/computer/secure_data/attached_console + +/obj/item/circuit_component/arrest_console_data/Initialize() + . = ..() + records = add_output_port("Security Records", PORT_TYPE_TABLE) + on_fail = add_output_port("Failed", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/arrest_console_data/Destroy() + records = null + on_fail = null + return ..() + + +/obj/item/circuit_component/arrest_console_data/register_usb_parent(atom/movable/parent) + . = ..() + if(istype(parent, /obj/machinery/computer/secure_data)) + attached_console = parent + +/obj/item/circuit_component/arrest_console_data/unregister_usb_parent(atom/movable/parent) + attached_console = null + return ..() + +/obj/item/circuit_component/arrest_console_data/get_ui_notices() + . = ..() + . += create_table_notices(list( + "name", + "id", + "rank", + "arrest_status", + "gender", + "age", + "species", + "fingerprint", + )) + + +/obj/item/circuit_component/arrest_console_data/input_received(datum/port/input/port) + . = ..() + if(.) + return + + if(!attached_console || !attached_console.authenticated) + on_fail.set_output(COMPONENT_SIGNAL) + return + + if(isnull(GLOB.data_core.general)) + on_fail.set_output(COMPONENT_SIGNAL) + return + + var/list/new_table = list() + for(var/datum/data/record/player_record as anything in GLOB.data_core.general) + var/list/entry = list() + var/datum/data/record/player_security_record = find_record("id", player_record.fields["id"], GLOB.data_core.security) + if(player_security_record) + entry["arrest_status"] = player_security_record.fields["criminal"] + entry["security_record"] = player_security_record + entry["name"] = player_record.fields["name"] + entry["id"] = player_record.fields["id"] + entry["rank"] = player_record.fields["rank"] + entry["gender"] = player_record.fields["gender"] + entry["age"] = player_record.fields["age"] + entry["species"] = player_record.fields["species"] + entry["fingerprint"] = player_record.fields["fingerprint"] + + new_table += list(entry) + + records.set_output(new_table) + +/obj/item/circuit_component/arrest_console_arrest + display_name = "Security Records Set Status" + display_desc = "Receives a table to use to set people's arrest status. Table should be from the security records data component. If New Status port isn't set, the status will be decided by the options." + circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL + + /// The targets to set the status of. + var/datum/port/input/targets + + /// Sets the new status of the targets. If set to null, the status is taken from the options. + var/datum/port/input/new_status + + /// Returns the new status set once the setting is complete. Good for locating errors. + var/datum/port/output/new_status_set + + /// Sends a signal on failure + var/datum/port/output/on_fail + + var/obj/machinery/computer/secure_data/attached_console + +/obj/item/circuit_component/arrest_console_arrest/register_usb_parent(atom/movable/parent) + . = ..() + if(istype(parent, /obj/machinery/computer/secure_data)) + attached_console = parent + +/obj/item/circuit_component/arrest_console_arrest/unregister_usb_parent(atom/movable/parent) + attached_console = null + return ..() + +/obj/item/circuit_component/arrest_console_arrest/populate_options() + var/static/list/component_options = list( + COMP_STATE_ARREST, + COMP_STATE_PRISONER, + COMP_STATE_PAROL, + COMP_STATE_DISCHARGED, + COMP_STATE_NONE, + ) + options = component_options + +/obj/item/circuit_component/arrest_console_arrest/Initialize() + . = ..() + targets = add_input_port("Targets", PORT_TYPE_TABLE) + new_status = add_input_port("New Status", PORT_TYPE_STRING) + new_status_set = add_output_port("Set Status", PORT_TYPE_STRING) + on_fail = add_output_port("Failed", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/arrest_console_arrest/Destroy() + targets = null + new_status = null + new_status_set = null + on_fail = null + return ..() + +/obj/item/circuit_component/arrest_console_arrest/input_received(datum/port/input/port) + . = ..() + if(.) + return + + if(!attached_console || !attached_console.authenticated) + on_fail.set_output(COMPONENT_SIGNAL) + return + + var/status_to_set = new_status.input_value + if(!status_to_set || !(status_to_set in options)) + status_to_set = current_option + + new_status_set.set_output(status_to_set) + var/list/target_table = targets.input_value + if(!target_table) + on_fail.set_output(COMPONENT_SIGNAL) + return + + var/successful_set = 0 + var/list/names_of_entries = list() + for(var/list/target in target_table) + var/datum/data/record/sec_record = target["security_record"] + if(!sec_record) + continue + + successful_set++ + sec_record.fields["criminal"] = status_to_set + names_of_entries += target["name"] + + if(successful_set > 0) + investigate_log("[names_of_entries.Join(", ")] have been set to [status_to_set] by [parent.get_creator()].", INVESTIGATE_RECORDS) + if(successful_set > COMP_SECURITY_ARREST_AMOUNT_TO_FLAG) + message_admins("[successful_set] security entries have been set to [status_to_set] by [parent.get_creator_admin()]. [ADMIN_COORDJMP(src)]") + for(var/mob/living/carbon/human/human as anything in GLOB.carbon_list) + human.sec_hud_set_security_status() + /obj/machinery/computer/secure_data/examine(mob/user) . = ..() if(scan) @@ -37,6 +212,7 @@ icon_screen = "seclaptop" icon_keyboard = "laptop_key" clockwork = TRUE //it'd look weird + broken_overlay_emissive = TRUE pass_flags = PASSTABLE /obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params) @@ -146,10 +322,14 @@ crimstat = E.fields["criminal"] var/background switch(crimstat) - if("*Arrest*") + if("Arrest") background = "'background-color:#990000;'" if("Incarcerated") - background = "'background-color:#CD6500;'" + background = "'background-color:#EB4823;'" + if("Search") + background = "'background-color:#9B13EB;'" + if("Monitor") + background = "'background-color:#990000;'" if("Paroled") background = "'background-color:#CD6500;'" if("Discharged") @@ -230,33 +410,13 @@ else dat += "
Minor Crimes: Add New" - - - dat +={"
| Crime | -Details | -Author | -Time Added | -Del | -
|---|---|---|---|---|
| [c.crimeName] | " - dat += "[c.crimeDetails] | " - dat += "[c.author] | " - dat += "[c.time] | " - dat += "\[X\] | " - dat += "
Crimes: Add New" - dat += "
Major Crimes: Add New" dat +={"
| Time Added | Del | ||||||
|---|---|---|---|---|---|---|---|
| [c.crimeName] | " - dat += "[c.crimeDetails] | " + if(!c.crimeDetails) + dat += "\[+\] | " + else + dat += "[c.crimeDetails] | " dat += "[c.author] | " dat += "[c.time] | " - dat += "\[X\] | " + dat += "\[X\] | " dat += "
\n
\nCriminal Status: []", active2.fields["criminal"]) - P.info += "
\n
\nMinor Crimes:
\n" - P.info +={"
| Crime | -Details | -Author | -Time Added | -
|---|---|---|---|
| [c.crimeName] | " - P.info += "[c.crimeDetails] | " - P.info += "[c.author] | " - P.info += "[c.time] | " - P.info += "
\nMajor Crimes:
\n" + P.info += "
\n
\nCrimes:
\n" P.info +={"
| Crime | @@ -441,7 +588,7 @@ What a mess.*/Author | Time Added |
|---|---|---|
| [c.crimeName] | " P.info += "[c.crimeDetails] | " P.info += "[c.author] | " @@ -449,7 +596,6 @@ What a mess.*/ P.info += "
\nImportant Notes:
\n\t[]
\n
\n
", active2.fields["notes"]) var/counter = 1 while(active2.fields[text("com_[]", counter)]) @@ -466,31 +612,25 @@ What a mess.*/ var/wanted_name = stripped_input(usr, "Please enter an alias for the criminal:", "Print Wanted Poster", active1.fields["name"]) if(wanted_name) var/default_description = "A poster declaring [wanted_name] to be a dangerous individual, wanted by Nanotrasen. Report any sightings to security immediately." - var/list/major_crimes = active2.fields["ma_crim"] - var/list/minor_crimes = active2.fields["mi_crim"] - if(major_crimes.len + minor_crimes.len) - default_description += "\n[wanted_name] is wanted for the following crimes:\n" - if(minor_crimes.len) - default_description += "\nMinor Crimes:" - for(var/datum/data/crime/c in active2.fields["mi_crim"]) - default_description += "\n[c.crimeName]\n" - default_description += "[c.crimeDetails]\n" - if(major_crimes.len) - default_description += "\nMajor Crimes:" - for(var/datum/data/crime/c in active2.fields["ma_crim"]) + var/list/crimes = active2.fields["crim"] + if(crimes.len) + default_description += "\nCrimes:" + for(var/datum/data/crime/c in active2.fields["crim"]) default_description += "\n[c.crimeName]\n" default_description += "[c.crimeDetails]\n" var/headerText = stripped_input(usr, "Please enter Poster Heading (Max 7 Chars):", "Print Wanted Poster", "WANTED", 8) - + var/posternum = CLAMP((input("Number of posters to print (Max 5):","Number:",1) as num|null), 1, 5) var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Wanted Poster", default_description, null) if(info) - playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) printing = 1 - sleep(30) - if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. - var/obj/item/photo/photo = active1.fields["photo_front"] - new /obj/item/poster/wanted(loc, photo.picture.picture_image, wanted_name, info, headerText) + for(var/i in 1 to posternum) + playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) + + sleep(30) + if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. + var/obj/item/photo/photo = active1.fields["photo_front"] + new /obj/item/poster/wanted(loc, photo.picture.picture_image, wanted_name, info, headerText) printing = 0 if("Print Missing") if(!( printing )) @@ -499,15 +639,16 @@ What a mess.*/ var/default_description = "A poster declaring [missing_name] to be a missing individual, missed by Nanotrasen. Report any sightings to security immediately." var/headerText = stripped_input(usr, "Please enter Poster Heading (Max 7 Chars):", "Print Missing Persons Poster", "MISSING", 8) - + var/posternum = CLAMP((input("Number of posters to print (Max 5):","Number:",1) as num|null), 1, 5) var/info = stripped_multiline_input(usr, "Please input a description for the poster:", "Print Missing Persons Poster", default_description, null) if(info) - playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) printing = 1 - sleep(30) - if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. - var/obj/item/photo/photo = active1.fields["photo_front"] - new /obj/item/poster/wanted/missing(loc, photo.picture.picture_image, missing_name, info, headerText) + for(var/i in 1 to posternum) + playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) + sleep(30) + if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. + var/obj/item/photo/photo = active1.fields["photo_front"] + new /obj/item/poster/wanted/missing(loc, photo.picture.picture_image, missing_name, info, headerText) printing = 0 //RECORD DELETE @@ -559,8 +700,7 @@ What a mess.*/ R.fields["id"] = active1.fields["id"] R.name = text("Security Record #[]", R.fields["id"]) R.fields["criminal"] = "None" - R.fields["mi_crim"] = list() - R.fields["ma_crim"] = list() + R.fields["crim"] = list() R.fields["notes"] = "No notes." GLOB.data_core.security += R active2 = R @@ -589,8 +729,7 @@ What a mess.*/ R.fields["id"] = active1.fields["id"] R.name = text("Security Record #[]", R.fields["id"]) R.fields["criminal"] = "None" - R.fields["mi_crim"] = list() - R.fields["ma_crim"] = list() + R.fields["crim"] = list() R.fields["notes"] = "No notes." GLOB.data_core.security += R active2 = R @@ -706,36 +845,29 @@ What a mess.*/ if(istype(active1.fields["photo_side"], /obj/item/photo)) var/obj/item/photo/P = active1.fields["photo_side"] print_photo(P.picture.picture_image, active1.fields["name"]) - if("mi_crim_add") + if("crim_add") if(istype(active1, /datum/data/record)) - var/t1 = stripped_input(usr, "Please input minor crime names:", "Secure. records", "", null) - var/t2 = stripped_input(usr, "Please input minor crime details:", "Secure. records", "", null) + var/t1 = stripped_input(usr, "Please input crime name:", "Secure. records", "", null) + var/t2 = stripped_input(usr, "Please input crime details:", "Secure. records", "", null) if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) return var/crime = GLOB.data_core.createCrimeEntry(t1, t2, authenticated, station_time_timestamp()) - GLOB.data_core.addMinorCrime(active1.fields["id"], crime) - investigate_log("New Minor Crime: [t1]: [t2] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) - if("mi_crim_delete") + GLOB.data_core.addCrime(active1.fields["id"], crime) + investigate_log("New Crime: [t1]: [t2] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) + if("crim_delete") if(istype(active1, /datum/data/record)) if(href_list["cdataid"]) if(!canUseSecurityRecordsConsole(usr, "delete", null, a2)) return - GLOB.data_core.removeMinorCrime(active1.fields["id"], href_list["cdataid"]) - if("ma_crim_add") - if(istype(active1, /datum/data/record)) - var/t1 = stripped_input(usr, "Please input major crime names:", "Secure. records", "", null) - var/t2 = stripped_input(usr, "Please input major crime details:", "Secure. records", "", null) - if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) - return - var/crime = GLOB.data_core.createCrimeEntry(t1, t2, authenticated, station_time_timestamp()) - GLOB.data_core.addMajorCrime(active1.fields["id"], crime) - investigate_log("New Major Crime: [t1]: [t2] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) - if("ma_crim_delete") + GLOB.data_core.removeCrime(active1.fields["id"], href_list["cdataid"]) + if("add_details") if(istype(active1, /datum/data/record)) if(href_list["cdataid"]) - if(!canUseSecurityRecordsConsole(usr, "delete", null, a2)) + var/t1 = stripped_input(usr, "Please input crime details:", "Secure. records", "", null) + if(!canUseSecurityRecordsConsole(usr, t1, null, a2)) return - GLOB.data_core.removeMajorCrime(active1.fields["id"], href_list["cdataid"]) + GLOB.data_core.addCrimeDetails(active1.fields["id"], href_list["cdataid"], t1) + investigate_log("New Crime details: [t1] | Added to [active1.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) if("citation_add") if(istype(active1, /datum/data/record)) var/maxFine = CONFIG_GET(number/maxfine) @@ -786,7 +918,9 @@ What a mess.*/ temp = "
Criminal Status:
" temp += "- "
temp += "
**REPORT TO THE BRIG**" if("Incarcerated") background = "background-color:#CD6500;" + if("Search") + background = "'background-color:#9B13EB;'" + if("Monitor") + background = "'background-color:#990000;'" if("Paroled") background = "background-color:#CD6500;" if("Discharged") @@ -67,7 +71,7 @@ dat += "" dat += "" - dat += "
Minor Crimes:" + dat += "
Crimes:" dat +={"
| Crime | @@ -75,23 +79,7 @@Author | Time Added | |
|---|---|---|---|
| [c.crimeName] | -[c.crimeDetails] | -[c.author] | -[c.time] | -
Major Crimes:" - dat +={"
| Crime | -Details | -Author | -Time Added | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| [c.crimeName] | [c.crimeDetails] | [c.author] | @@ -113,8 +101,11 @@ var/mob/M = usr switch(href_list["choice"]) if("Login") + if(iscyborg(M)) //cyborgs cannot be set to arrest + return var/obj/item/card/id/scan = M.get_idcard(TRUE) - authenticated = scan.registered_name + if(scan) + authenticated = scan.registered_name if(authenticated) for(var/datum/data/record/R in GLOB.data_core.security) if(R.fields["name"] == authenticated) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 5de5c8df558e3..3fafde5cc6275 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -16,6 +16,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) icon_state = "cellconsole_1" // circuit = /obj/item/circuitboard/cryopodcontrol density = FALSE + layer = ABOVE_WINDOW_LAYER interaction_flags_machine = INTERACT_MACHINE_OFFLINE req_one_access = list(ACCESS_HEADS, ACCESS_ARMORY) //Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with. var/mode = null @@ -150,7 +151,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) var/time_till_despawn = 5 * 600 // This is reduced to 30 seconds if a player manually enters cryo var/despawn_world_time = null // Used to keep track of the safe period. - var/obj/machinery/computer/cryopod/control_computer + var/datum/weakref/control_computer_weakref var/last_no_computer_message = 0 // These items are preserved when the process() despawn proc occurs. @@ -189,23 +190,28 @@ GLOBAL_LIST_EMPTY(cryopod_computers) update_icon() find_control_computer() -/obj/machinery/cryopod/proc/find_control_computer(urgent = 0) - for(var/M in GLOB.cryopod_computers) - var/obj/machinery/computer/cryopod/C = M - if(get_area(C) == get_area(src)) - control_computer = C +// This is not a good situation +/obj/machinery/cryopod/Destroy() + control_computer_weakref = null + return ..() + +/obj/machinery/cryopod/proc/find_control_computer(urgent = FALSE) + for(var/cryo_console as anything in GLOB.cryopod_computers) + var/obj/machinery/computer/cryopod/console = cryo_console + if(get_area(console) == get_area(src)) + control_computer_weakref = WEAKREF(console) break // Don't send messages unless we *need* the computer, and less than five minutes have passed since last time we messaged - if(!control_computer && urgent && last_no_computer_message + 5*60*10 < world.time) + if(!control_computer_weakref && urgent && last_no_computer_message + 5*60*10 < world.time) log_admin("Cryopod in [get_area(src)] could not find control computer!") message_admins("Cryopod in [get_area(src)] could not find control computer!") last_no_computer_message = world.time - return control_computer != null + return control_computer_weakref != null /obj/machinery/cryopod/close_machine(mob/user) - if(!control_computer) + if(!control_computer_weakref) find_control_computer(TRUE) if((isnull(user) || istype(user)) && state_open && !panel_open) ..(user) @@ -246,7 +252,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) return if(!mob_occupant.client && mob_occupant.stat < 2) //Occupant is living and has no client. - if(!control_computer) + if(!control_computer_weakref) find_control_computer(urgent = TRUE)//better hope you found it this time despawn_occupant() @@ -254,45 +260,42 @@ GLOBAL_LIST_EMPTY(cryopod_computers) /obj/machinery/cryopod/proc/handle_objectives() var/mob/living/mob_occupant = occupant //Update any existing objectives involving this mob. - for(var/datum/objective/O in GLOB.objectives) + for(var/datum/objective/O as() in GLOB.objectives) + if(O.target != mob_occupant.mind) + continue // We don't want revs to get objectives that aren't for heads of staff. Letting // them win or lose based on cryo is silly so we remove the objective. - if(istype(O,/datum/objective/mutiny) && O.target == mob_occupant.mind) + if(istype(O,/datum/objective/mutiny)) O.team.objectives -= O - qdel(O) - for(var/datum/mind/M in O.team.members) + for(var/datum/mind/M as() in O.team.members) to_chat(M.current, "|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - [left_part] - | -- [list_queue()] - | -
[initial(part.name)] description:
- [initial(part.desc)]- Return - "} - break - - if(href_list["remove_mat"] && href_list["material"]) - var/datum/material/Mat = locate(href_list["material"]) - eject_sheets(Mat, text2num(href_list["remove_mat"])) - - updateUsrDialog() - return - -/obj/machinery/mecha_part_fabricator/proc/do_process_queue() - if(processing_queue || being_built) - return FALSE - processing_queue = 1 - process_queue() - processing_queue = 0 - -/obj/machinery/mecha_part_fabricator/proc/eject_sheets(eject_sheet, eject_amt) - var/datum/component/material_container/mat_container = rmat.mat_container - if (!mat_container) - say("No access to material storage, please contact the quartermaster.") - return 0 - if (rmat.on_hold()) - say("Mineral access is on hold, please contact the quartermaster.") - return 0 - var/count = mat_container.retrieve_sheets(text2num(eject_amt), eject_sheet, drop_location()) - var/list/matlist = list() - matlist[eject_sheet] = text2num(eject_amt) - rmat.silo_log(src, "ejected", -count, "sheets", matlist) - return count - -/obj/machinery/mecha_part_fabricator/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted) - var/datum/material/M = id_inserted - add_overlay("fab-load-[M.name]") - addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[M.name]"), 10) - updateUsrDialog() - -/obj/machinery/mecha_part_fabricator/attackby(obj/item/W, mob/user, params) - if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W)) - return TRUE - - if(default_deconstruction_crowbar(W)) - return TRUE - - return ..() - - -/obj/machinery/mecha_part_fabricator/proc/is_insertion_ready(mob/user) - if(panel_open) - to_chat(user, "You can't load [src] while it's opened!") - return FALSE - if(being_built) - to_chat(user, "\The [src] is currently processing! Please wait until completion.") - return FALSE - - return TRUE - -/obj/machinery/mecha_part_fabricator/maint - link_on_init = FALSE diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 0744b0c2681f7..3b03dd07f5134 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -10,7 +10,6 @@ layer = BELOW_MOB_LAYER//icon draw layer infra_luminosity = 15 //byond implementation is bugged. force = 5 - flags_1 = HEAR_1 var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming. var/can_move = 0 //time of next allowed movement var/mob/living/carbon/occupant = null @@ -22,7 +21,7 @@ var/overload_step_energy_drain_min = 100 max_integrity = 300 //max_integrity is base health var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act. - armor = list("melee" = 20, "bullet" = 10, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) + armor = list("melee" = 20, "bullet" = 10, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100, "stamina" = 0) var/list/facing_modifiers = list(MECHA_FRONT_ARMOUR = 1.5, MECHA_SIDE_ARMOUR = 1, MECHA_BACK_ARMOUR = 0.5) var/equipment_disabled = 0 //disabled due to EMP var/obj/item/stock_parts/cell/cell ///Keeps track of the mech's cell @@ -79,7 +78,7 @@ var/destruction_sleep_duration = 20 //Time that mech pilot is put to sleep for if mech is destroyed var/enclosed = TRUE //Set to false for open-cockpit mechs var/silicon_icon_state = null //if the mech has a different icon when piloted by an AI or MMI - var/is_currently_ejecting = FALSE //Mech cannot use equiptment when true, set to true if pilot is trying to exit mech + var/is_currently_ejecting = FALSE //Mech cannot use equipment when true, set to true if pilot is trying to exit mech //Action datums var/datum/action/innate/mecha/mech_eject/eject_action = new @@ -145,6 +144,7 @@ diag_hud_set_mechhealth() diag_hud_set_mechcell() diag_hud_set_mechstat() + become_hearing_sensitive(trait_source = ROUNDSTART_TRAIT) /obj/mecha/update_icon() if (silicon_pilot && silicon_icon_state) @@ -188,11 +188,7 @@ scanmod = null capacitor = null internal_tank = null - if(loc) - loc.assume_air(cabin_air) - air_update_turf() - else - qdel(cabin_air) + assume_air(cabin_air) cabin_air = null qdel(spark_system) spark_system = null @@ -268,8 +264,8 @@ cabin_air = new cabin_air.set_temperature(T20C) cabin_air.set_volume(200) - cabin_air.set_moles(/datum/gas/oxygen, O2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature())) - cabin_air.set_moles(/datum/gas/nitrogen, N2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature())) + cabin_air.set_moles(GAS_O2, O2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature())) + cabin_air.set_moles(GAS_N2, N2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature())) return cabin_air /obj/mecha/proc/add_radio() @@ -346,13 +342,7 @@ if(internal_damage & MECHA_INT_TANK_BREACH) //remove some air from internal tank if(internal_tank) - var/datum/gas_mixture/int_tank_air = internal_tank.return_air() - var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(0.1) - if(loc) - loc.assume_air(leaked_gas) - air_update_turf() - else - qdel(leaked_gas) + assume_air_ratio(internal_tank.return_air(), 0.1) if(internal_damage & MECHA_INT_SHORT_CIRCUIT) if(get_charge()) @@ -375,8 +365,7 @@ if(pressure_delta > 0) //cabin pressure lower than release pressure if(tank_air.return_temperature() > 0) transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = tank_air.remove(transfer_moles) - cabin_air.merge(removed) + tank_air.transfer_to(cabin_air,transfer_moles) else if(pressure_delta < 0) //cabin pressure higher than release pressure var/datum/gas_mixture/t_air = return_air() pressure_delta = cabin_pressure - release_pressure @@ -384,11 +373,7 @@ pressure_delta = min(cabin_pressure - t_air.return_pressure(), pressure_delta) if(pressure_delta > 0) //if location pressure is lower than cabin pressure transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = cabin_air.remove(transfer_moles) - if(t_air) - t_air.merge(removed) - else //just delete the cabin gas, we're in space or some shit - qdel(removed) + cabin_air.transfer_to(t_air, transfer_moles) if(occupant) if(cell) @@ -397,22 +382,22 @@ if(0.75 to INFINITY) occupant.clear_alert("charge") if(0.5 to 0.75) - occupant.throw_alert("charge", /obj/screen/alert/lowcell, 1) + occupant.throw_alert("charge", /atom/movable/screen/alert/lowcell, 1) if(0.25 to 0.5) - occupant.throw_alert("charge", /obj/screen/alert/lowcell, 2) + occupant.throw_alert("charge", /atom/movable/screen/alert/lowcell, 2) if(0.01 to 0.25) - occupant.throw_alert("charge", /obj/screen/alert/lowcell, 3) + occupant.throw_alert("charge", /atom/movable/screen/alert/lowcell, 3) else - occupant.throw_alert("charge", /obj/screen/alert/emptycell) + occupant.throw_alert("charge", /atom/movable/screen/alert/emptycell) var/integrity = obj_integrity/max_integrity*100 switch(integrity) if(30 to 45) - occupant.throw_alert("mech damage", /obj/screen/alert/low_mech_integrity, 1) + occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 1) if(15 to 35) - occupant.throw_alert("mech damage", /obj/screen/alert/low_mech_integrity, 2) + occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 2) if(-INFINITY to 15) - occupant.throw_alert("mech damage", /obj/screen/alert/low_mech_integrity, 3) + occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 3) else occupant.clear_alert("mech damage") var/atom/checking = occupant.loc @@ -454,18 +439,29 @@ /obj/mecha/proc/drop_item()//Derpfix, but may be useful in future for engineering exosuits. return -/obj/mecha/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/obj/mecha/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) . = ..() if(speaker == occupant) - if(radio?.broadcasting) - radio.talk_into(speaker, text, , spans, message_language) //flick speech bubble var/list/speech_bubble_recipients = list() - for(var/mob/M in get_hearers_in_view(7,src)) + for(var/mob/M as() in hearers(7,src)) if(M.client) speech_bubble_recipients.Add(M.client) INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, image('icons/mob/talk.dmi', src, "machine[say_test(raw_message)]",MOB_LAYER+1), speech_bubble_recipients, 30) +/obj/mecha/emag_act(mob/user) + . = ..() + if(obj_flags & EMAGGED) + to_chat(user, "The mech suit's internal controls are damaged beyond repair!") + return + obj_flags |= EMAGGED + playsound(src, "sparks", 100, 1) + to_chat(user, "You short out the mech suit's internal controls.") + dna_lock = null + equipment_disabled = TRUE + log_message("System emagged detected", LOG_MECHA, color="red") + addtimer(CALLBACK(src, /obj/mecha/proc/restore_equipment), 15 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + //////////////////////////// ///// Action processing //// //////////////////////////// @@ -481,7 +477,7 @@ if(is_currently_ejecting) return if(phasing) - occupant_message("Unable to interact with objects while phasing") + occupant_message("Unable to interact with objects while phasing.") return if(user.incapacitated()) return @@ -543,16 +539,19 @@ /obj/mecha/Process_Spacemove(var/movement_dir = 0) . = ..() if(.) - return TRUE + return - var/atom/movable/backup = get_spacemove_backup() - if(backup) - if(istype(backup) && movement_dir && !backup.anchored) - if(backup.newtonian_move(turn(movement_dir, 180))) + var/atom/backup = get_spacemove_backup() + if(backup && movement_dir) + if(isturf(backup)) //get_spacemove_backup() already checks if a returned turf is solid, so we can just go + return TRUE + if(istype(backup, /atom/movable)) + var/atom/movable/movable_backup = backup + if((!movable_backup.anchored) && (movable_backup.newtonian_move(turn(movement_dir, 180)))) step_silent = TRUE if(occupant) - to_chat(occupant, "You push off of [backup] to propel yourself.") - return TRUE + to_chat(occupant, "You push off of [movable_backup] to propel yourself.") + return TRUE if(can_move <= world.time && active_thrusters && movement_dir && active_thrusters.thrust(movement_dir)) step_silent = TRUE @@ -576,7 +575,7 @@ return 0 if(construction_state) if(world.time - last_message > 20) - occupant_message("Maintenance protocols in effect.") + occupant_message("Maintenance protocols are in effect.") last_message = world.time return return domove(direction) @@ -648,8 +647,15 @@ can_move = 0 if(phase_state) flick(phase_state, src) - forceMove(get_step(src,dir)) - use_power(phasing_energy_drain) + var/turf/target = get_step(src, dir) + if(target.flags_1 & NOJAUNT_1) + occupant_message("Phasing anomaly detected, emergency deactivation initiated.") + sleep(step_in*3) + can_move = 1 + phasing = FALSE + return + if(do_teleport(src, get_step(src, dir), no_effects = TRUE)) + use_power(phasing_energy_drain) sleep(step_in*3) can_move = 1 else @@ -679,7 +685,7 @@ /////////////////////////////////// /obj/mecha/proc/check_for_internal_damage(list/possible_int_damage,ignore_threshold=null) - if(!islist(possible_int_damage) || isemptylist(possible_int_damage)) + if(!islist(possible_int_damage) || !length(possible_int_damage)) return if(prob(20)) if(ignore_threshold || obj_integrity*100/max_integrity < internal_damage_threshold) @@ -709,7 +715,7 @@ if(MECHA_INT_TEMP_CONTROL) occupant_message("Life support system reactivated.") if(MECHA_INT_FIRE) - occupant_message("Internal fire extinquished.") + occupant_message("Internal fire extinguished.") if(MECHA_INT_TANK_BREACH) occupant_message("Damaged internal tank has been sealed.") internal_damage &= ~int_dam_flag @@ -739,7 +745,7 @@ var/can_control_mech = 0 for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in trackers) can_control_mech = 1 - to_chat(user, "[icon2html(src, user)] Status of [name]:\n[A.get_mecha_info()]") + to_chat(user, "[icon2html(src, user)] Status of [name]:\n[A.get_mecha_info()].") break if(!can_control_mech) to_chat(user, "You cannot control exosuits without AI control beacons installed.") @@ -858,6 +864,11 @@ return cabin_air.remove(amount) return ..() +/obj/mecha/remove_air_ratio(ratio) + if(use_internal_tank) + return cabin_air.remove_ratio(ratio) + return ..() + /obj/mecha/return_air() if(use_internal_tank) return cabin_air @@ -933,7 +944,7 @@ return /obj/mecha/proc/moved_inside(mob/living/carbon/human/H) - if(H && H.client && (H in range(1))) + if(H?.client && get_dist(H, src) <= 1) occupant = H H.forceMove(src) H.update_mouse_pointer() @@ -1007,15 +1018,16 @@ /obj/mecha/container_resist(mob/living/user) is_currently_ejecting = TRUE - to_chat(occupant, "You begin the ejection procedure. Equipment is disabled during this process. Hold still to finish ejecting.") + to_chat(occupant, "You begin the ejection procedure. Equipment is disabled during this process. Hold still to finish ejecting.") if(do_after(occupant,exit_delay, target = src)) - to_chat(occupant, "You exit the mech.") + to_chat(occupant, "You exit the mech.") go_out() else - to_chat(occupant, "You stop exiting the mech. Weapons are enabled again.") + to_chat(occupant, "You stop exiting the mech. Weapons are enabled again.") is_currently_ejecting = FALSE /obj/mecha/Exited(atom/movable/M, atom/newloc) + . = ..() if(occupant && occupant == M) // The occupant exited the mech without calling go_out() go_out(TRUE, newloc) @@ -1152,3 +1164,12 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013??? /obj/mecha/rust_heretic_act() take_damage(500, BRUTE) + +/obj/mecha/lighteater_act(obj/item/light_eater/light_eater) + if(!lights_power) + return + lights = FALSE + lights_power = 0 + set_light(0) + visible_message(src, "The lights on [src] short out!") + playsound(src, 'sound/items/welder.ogg', 50, 1) diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm index 6ca058734fe58..e555421c49f5f 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -55,7 +55,7 @@ return chassis.use_internal_tank = !chassis.use_internal_tank button_icon_state = "mech_internals_[chassis.use_internal_tank ? "on" : "off"]" - chassis.occupant_message("Now taking air from [chassis.use_internal_tank?"internal airtank":"environment"].") + chassis.balloon_alert(owner, "Taking air from [chassis.use_internal_tank ? "internal airtank" : "environment"]") chassis.log_message("Now taking air from [chassis.use_internal_tank?"internal airtank":"environment"].", LOG_MECHA) UpdateButtonIcon() @@ -73,11 +73,11 @@ available_equipment += M if(available_equipment.len == 0) - chassis.occupant_message("No equipment available.") + chassis.balloon_alert(owner, "No equipment available") return if(!chassis.selected) chassis.selected = available_equipment[1] - chassis.occupant_message("You select [chassis.selected]") + chassis.balloon_alert(owner, "[chassis.selected] selected") send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list()) button_icon_state = "mech_cycle_equip_on" UpdateButtonIcon() @@ -88,11 +88,11 @@ if(A == chassis.selected) if(available_equipment.len == number) chassis.selected = null - chassis.occupant_message("You switch to no equipment") + chassis.balloon_alert(owner, "Switched to no equipment") button_icon_state = "mech_cycle_equip_off" else chassis.selected = available_equipment[number+1] - chassis.occupant_message("You switch to [chassis.selected]") + chassis.balloon_alert(owner, "Switched to [chassis.selected]") button_icon_state = "mech_cycle_equip_on" send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list()) UpdateButtonIcon() @@ -113,7 +113,7 @@ else chassis.set_light(-chassis.lights_power) button_icon_state = "mech_lights_off" - chassis.occupant_message("Toggled lights [chassis.lights?"on":"off"].") + chassis.balloon_alert(owner, "Toggled lights [chassis.lights?"on":"off"]") chassis.log_message("Toggled lights [chassis.lights?"on":"off"].", LOG_MECHA) UpdateButtonIcon() @@ -176,12 +176,12 @@ chassis.leg_overload_mode = 1 chassis.step_in = min(1, round(chassis.step_in/2)) chassis.step_energy_drain = max(chassis.overload_step_energy_drain_min,chassis.step_energy_drain*chassis.leg_overload_coeff) - chassis.occupant_message("You enable leg actuators overload.") + chassis.balloon_alert(owner,"Leg actuators overloaded") else chassis.leg_overload_mode = 0 chassis.step_in = initial(chassis.step_in) chassis.step_energy_drain = chassis.normal_step_energy_drain - chassis.occupant_message("You disable leg actuators overload.") + chassis.balloon_alert(owner, "Leg actuators reset") UpdateButtonIcon() /datum/action/innate/mecha/mech_smoke @@ -209,7 +209,7 @@ chassis.zoom_mode = !chassis.zoom_mode button_icon_state = "mech_zoom_[chassis.zoom_mode ? "on" : "off"]" chassis.log_message("Toggled zoom mode.", LOG_MECHA) - chassis.occupant_message("Zoom mode [chassis.zoom_mode?"en":"dis"]abled.") + chassis.balloon_alert(owner, "Zoom mode [chassis.zoom_mode?"enabled":"disabled"]") if(chassis.zoom_mode) owner.client.view_size.setTo(4.5) SEND_SOUND(owner, sound('sound/mecha/imag_enh.ogg',volume=50)) @@ -228,13 +228,13 @@ switch(chassis.damtype) if("tox") new_damtype = "brute" - chassis.occupant_message("Your exosuit's hands form into fists.") + chassis.balloon_alert(owner, "Your punches will now deal brute damage") if("brute") new_damtype = "fire" - chassis.occupant_message("A torch tip extends from your exosuit's hand, glowing red.") + chassis.balloon_alert(owner, "Your punches will now deal burn damage") if("fire") new_damtype = "tox" - chassis.occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.") + chassis.balloon_alert(owner,"Your punches will now deal toxin damage") chassis.damtype = new_damtype button_icon_state = "mech_damtype_[new_damtype]" playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1) @@ -249,5 +249,5 @@ return chassis.phasing = !chassis.phasing button_icon_state = "mech_phasing_[chassis.phasing ? "on" : "off"]" - chassis.occupant_message("En":"#f00\">Dis"]abled phasing.") + chassis.balloon_alert(owner, "[chassis.phasing ? "Enabled" : "Disabled"] phasing") UpdateButtonIcon() diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index ede5bed380f7a..591e5b0837c1e 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -421,7 +421,7 @@ outer_plating_amount=1 /datum/component/construction/mecha/gygax/action(datum/source, atom/used_atom, mob/user) - return check_step(used_atom,user) + return INVOKE_ASYNC(src, .proc/check_step, used_atom,user) /datum/component/construction/mecha/gygax/custom_action(obj/item/I, mob/living/user, diff) if(!..()) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 91f042be872e9..fd27d2c81891f 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -16,6 +16,7 @@ ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "ExosuitControlConsole") + ui.set_autoupdate(TRUE) // Live tracking of exosuit information ui.open() /obj/machinery/computer/mecha/ui_data(mob/user) @@ -124,6 +125,8 @@ return ..() /obj/item/mecha_parts/mecha_tracking/try_attach_part(mob/user, obj/mecha/M) + if(!do_mob(user, M, 15)) + return if(!..()) return M.trackers += src diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index 175ca511fab5c..bbc0a124f1002 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -1,12 +1,10 @@ /obj/mecha/proc/get_armour_facing(relative_dir) - switch(relative_dir) - if(0) // BACKSTAB! + switch(abs(relative_dir)) + if(180) // BACKSTAB! return facing_modifiers[MECHA_BACK_ARMOUR] - if(45, 90, 270, 315) - return facing_modifiers[MECHA_SIDE_ARMOUR] - if(225, 180, 135) + if(0, 45) return facing_modifiers[MECHA_FRONT_ARMOUR] - return 1 //always return non-0 + return facing_modifiers[MECHA_SIDE_ARMOUR] //always return non-0 /obj/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -21,7 +19,7 @@ check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT)) if(. >= 5 || prob(33)) occupant_message("Taking damage!") - log_message("Took [damage_amount] points of damage. Damage type: [damage_type]", LOG_MECHA) + log_message("Took [damage_amount] points of damage. Damage type: [damage_type].", LOG_MECHA) /obj/mecha/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) . = ..() @@ -43,7 +41,7 @@ break if(attack_dir) - var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(src)) + var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(dir)) booster_damage_modifier /= facing_modifier booster_deflection_modifier *= facing_modifier if(prob(deflect_chance * booster_deflection_modifier)) @@ -131,10 +129,22 @@ severity++ for(var/X in equipment) var/obj/item/mecha_parts/mecha_equipment/ME = X - ME.ex_act(severity,target) + switch(severity) + if(EXPLODE_DEVASTATE) + SSexplosions.high_mov_atom += ME + if(EXPLODE_HEAVY) + SSexplosions.med_mov_atom += ME + if(EXPLODE_LIGHT) + SSexplosions.low_mov_atom += ME for(var/Y in trackers) var/obj/item/mecha_parts/mecha_tracking/MT = Y - MT.ex_act(severity, target) + switch(severity) + if(EXPLODE_DEVASTATE) + SSexplosions.high_mov_atom += MT + if(EXPLODE_HEAVY) + SSexplosions.med_mov_atom += MT + if(EXPLODE_LIGHT) + SSexplosions.low_mov_atom += MT if(occupant) occupant.ex_act(severity,target) @@ -200,7 +210,7 @@ to_chat(user, "You install the power cell.") playsound(src, 'sound/items/screwdriver2.ogg', 50, FALSE) cell = C - log_message("Powercell installed", LOG_MECHA) + log_message("Power cell installed", LOG_MECHA) else to_chat(user, "There's already a power cell installed.") return @@ -372,4 +382,4 @@ WR.crowbar_salvage += internal_tank internal_tank.forceMove(WR) cell = null - . = ..() \ No newline at end of file + . = ..() diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 463a0f48a2498..a3374b60ccc36 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -65,12 +65,12 @@ tank_temperature = internal_tank ? int_tank_air.return_temperature() : "Unknown" cabin_pressure = round(return_pressure(),0.01) . = {"[report_internal_damage()] - [integrity<30?"DAMAGE LEVEL CRITICAL
":null] + [integrity<30?"DAMAGE LEVEL CRITICAL!
":null] Integrity: [integrity]%
- Powercell charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
+ Power cell charge: [isnull(cell_charge)?"No power cell installed.":"[cell.percent()]%"]
Air source: [internal_tank?"[use_internal_tank?"Internal Airtank":"Environment"]":"Environment"]
- Airtank pressure: [internal_tank?"[tank_pressure]kPa":"N/A"]
- Airtank temperature: [internal_tank?"[tank_temperature]°K|[tank_temperature - T0C]°C":"N/A"]
+ Air tank pressure: [internal_tank?"[tank_pressure]kPa":"N/A"]
+ Air tank temperature: [internal_tank?"[tank_temperature]°K|[tank_temperature - T0C]°C":"N/A"]
Cabin pressure: [internal_tank?"[cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa":"N/A"]
Cabin temperature: [internal_tank?"[return_temperature()]°K|[return_temperature() - T0C]°C":"N/A"]
[dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":""]
"} @@ -79,22 +79,22 @@ ///Returns HTML for mech actions. Ideally, this proc would be empty for the base mecha. Segmented for easy refactoring. /obj/mecha/proc/get_actions() . = "" - . += "[defense_action.owner ? "Defense Mode: [defense_mode ? "Enabled" : "Disabled"]
" : ""]" - . += "[overload_action.owner ? "Leg Actuators Overload: [leg_overload_mode ? "Enabled" : "Disabled"]
" : ""]" - . += "[smoke_action.owner ? "Smoke: [smoke]
" : ""]" - . += "[zoom_action.owner ? "Zoom: [zoom_mode ? "Enabled" : "Disabled"]
" : ""]" - . += "[switch_damtype_action.owner ? "Damtype: [damtype]
" : ""]" - . += "[phasing_action.owner ? "Phase Modulator: [phasing ? "Enabled" : "Disabled"]
" : ""]" + . += "[defense_action.owner ? "Defense Mode: [defense_mode ? "Enabled" : "Disabled"].
" : ""]" + . += "[overload_action.owner ? "Leg Actuators Overload: [leg_overload_mode ? "Enabled" : "Disabled"].
" : ""]" + . += "[smoke_action.owner ? "Smoke: [smoke].
" : ""]" + . += "[zoom_action.owner ? "Zoom: [zoom_mode ? "Enabled" : "Disabled"].
" : ""]" + . += "[switch_damtype_action.owner ? "Damtype: [damtype].
" : ""]" + . += "[phasing_action.owner ? "Phase Modulator: [phasing ? "Enabled" : "Disabled"].
" : ""]" ///HTML for internal damage. /obj/mecha/proc/report_internal_damage() . = "" - var/static/list/dam_reports = list( - "[MECHA_INT_FIRE]" = "INTERNAL FIRE", - "[MECHA_INT_TEMP_CONTROL]" = "LIFE SUPPORT SYSTEM MALFUNCTION", - "[MECHA_INT_TANK_BREACH]" = "GAS TANK BREACH", - "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE - Recalibrate", - "[MECHA_INT_SHORT_CIRCUIT]" = "SHORT CIRCUIT" + var/list/dam_reports = list( + "[MECHA_INT_FIRE]" = "INTERNAL FIRE.", + "[MECHA_INT_TEMP_CONTROL]" = "LIFE SUPPORT SYSTEM MALFUNCTION.", + "[MECHA_INT_TANK_BREACH]" = "GAS TANK BREACH.", + "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE. - Recalibrate", + "[MECHA_INT_SHORT_CIRCUIT]" = "SHORT CIRCUIT." ) for(var/tflag in dam_reports) var/intdamflag = text2num(tflag) @@ -102,7 +102,7 @@ . += dam_reports[tflag] . += "
" if(return_pressure() > WARNING_HIGH_PRESSURE) - . += "DANGEROUSLY HIGH CABIN PRESSURE
" + . += "DANGEROUSLY HIGH CABIN PRESSURE.
" /obj/mecha/proc/get_equipment_list() //outputs mecha equipment list in html if(!equipment.len) @@ -171,7 +171,7 @@ -
Following keycodes are present in this system:
"} +Keycodes present in this system:
"} for(var/a in operation_req_access) . += "[get_access_desc(a)] - Delete" . += "
Following keycodes were detected on portable device:
" @@ -322,8 +322,8 @@ if(!equip || !equip.selectable) return selected = equip - occupant_message("You switch to [equip]") - visible_message("[src] raises [equip]") + occupant_message("You switch to [equip].") + visible_message("[src] raises [equip].") send_byjax(usr, "exosuit.browser", "eq_list", get_equipment_list()) return @@ -391,11 +391,14 @@ //Turns on the DNA lock if(href_list["dna_lock"]) + if(obj_flags & EMAGGED) + occupant_message("The control console lights up red, failing to bind to your DNA.") + return if(!iscarbon(occupant) || !occupant.dna) - occupant_message("You feel a prick as the needle takes your DNA sample.") + occupant_message("The controls console flashes brightly, binding to your DNA.") return dna_lock = occupant.dna.unique_enzymes - occupant_message("You feel a prick as the needle takes your DNA sample.") + occupant_message("The controls console flashes brightly, binding to your DNA.") return //Resets the DNA lock @@ -405,7 +408,7 @@ //Repairs internal damage if(href_list["repair_int_control_lost"]) - occupant_message("Recalibrating coordination system...") + occupant_message("Recalibrating coordination system.") log_message("Recalibration of coordination system started.", LOG_MECHA) addtimer(CALLBACK(src, .proc/stationary_repair, loc), 100, TIMER_UNIQUE) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 41728ab0b47ee..24898513583ec 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -10,7 +10,7 @@ max_integrity = 200 lights_power = 7 deflect_chance = 15 - armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 20, "fire" = 100, "acid" = 100) + armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 20, "fire" = 100, "acid" = 100, "stamina" = 0) max_equip = 6 wreckage = /obj/structure/mecha_wreckage/ripley internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING) @@ -79,7 +79,7 @@ fast_pressure_step_in = 2 //step_in while in low pressure conditions slow_pressure_step_in = 4 //step_in while in normal pressure conditions step_in = 4 - armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) + armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100, "stamina" = 0) wreckage = /obj/structure/mecha_wreckage/ripley/mkii enclosed = TRUE enter_delay = 40 @@ -87,7 +87,7 @@ opacity = TRUE /obj/mecha/working/ripley/firefighter - desc = "Autonomous Power Loader Unit MK-III. This model is refitted with a pressurized cabin and additional thermal protection." + desc = "Autonomous Power Loader Unit MK-III. This model is refitted with a pressurized cabin and additional hazard protection." name = "\improper APLU MK-III \"Firefighter\"" icon_state = "firefighter" max_temperature = 65000 @@ -96,8 +96,9 @@ slow_pressure_step_in = 4 //step_in while in normal pressure conditions step_in = 4 resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF + rad_flags = RAD_PROTECT_CONTENTS lights_power = 7 - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 60, "bio" = 0, "rad" = 70, "fire" = 100, "acid" = 100) + armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 60, "bio" = 0, "rad" = 70, "fire" = 100, "acid" = 100, "stamina" = 0) max_equip = 5 // More armor, less tools wreckage = /obj/structure/mecha_wreckage/ripley/firefighter enclosed = TRUE diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 1237d6b2a9070..81b0e89e14a9a 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -20,13 +20,25 @@ if(user_unbuckle_mob(buckled_mobs[1],user)) return 1 +/atom/movable/attackby(obj/item/W, mob/user, params) + if(!can_buckle || !istype(W, /obj/item/riding_offhand) || !user.Adjacent(src)) + return ..() + + var/obj/item/riding_offhand/riding_item = W + var/mob/living/carried_mob = riding_item.rider + if(carried_mob == user) //Piggyback user. + return + user.unbuckle_mob(carried_mob) + carried_mob.forceMove(get_turf(src)) + return mouse_buckle_handling(carried_mob, user) + /atom/movable/MouseDrop_T(mob/living/M, mob/living/user) . = ..() return mouse_buckle_handling(M, user) - + /atom/movable/proc/mouse_buckle_handling(mob/living/M, mob/living/user) if(can_buckle && istype(M) && istype(user)) - if(user_buckle_mob(M, user)) + if(user_buckle_mob(M, user, check_loc = FALSE)) return TRUE /atom/movable/proc/has_buckled_mobs() @@ -40,14 +52,9 @@ if(!buckled_mobs) buckled_mobs = list() - if(!istype(M)) + if(!is_buckle_possible(M, force, check_loc)) return FALSE - if(check_loc && M.loc != loc) - return FALSE - - if((!can_buckle && !force) || M.buckled || (buckled_mobs.len >= max_buckled_mobs) || (buckle_requires_restraints && !M.restrained()) || M == src) - return FALSE M.buckling = src if(!M.can_buckle() && !force) if(M == usr) @@ -72,7 +79,7 @@ M.setDir(dir) buckled_mobs |= M M.update_mobility() - M.throw_alert("buckled", /obj/screen/alert/restrained/buckled) + M.throw_alert("buckled", /atom/movable/screen/alert/restrained/buckled) post_buckle_mob(M) SEND_SIGNAL(src, COMSIG_MOVABLE_BUCKLE, M, force) @@ -110,12 +117,94 @@ //same but for unbuckle /atom/movable/proc/post_unbuckle_mob(mob/living/M) +/** + * Simple helper proc that runs a suite of checks to test whether it is possible or not to buckle the target mob to src. + * + * Returns FALSE if any conditions that should prevent buckling are satisfied. Returns TRUE otherwise. + * Arguments: + * * target - Target mob to check against buckling to src. + * * force - Whether or not the buckle should be forced. If TRUE, ignores src's can_buckle var. + * * check_loc - Whether to do a proximity check or not. The proximity check looks for target.loc == src.loc. + */ +/atom/movable/proc/is_buckle_possible(mob/living/target, force = FALSE, check_loc = TRUE) + // Make sure target is mob/living + if(!istype(target)) + return FALSE + + // No bucking you to yourself. + if(target == src) + return FALSE + + // Check if this atom can have things buckled to it. + if(!can_buckle && !force) + return FALSE + + // If we're checking the loc, make sure the target is on the thing we're bucking them to. + if(check_loc && target.loc != loc) + return FALSE + + // Make sure the target isn't already buckled to something. + if(target.buckled) + return FALSE + + // Make sure this atom can still have more things buckled to it. + if(LAZYLEN(buckled_mobs) >= max_buckled_mobs) + return FALSE + + // If the buckle requires restraints, make sure the target is actually restrained while ignoring grab restraint. + if(buckle_requires_restraints && !target.restrained(TRUE)) + return FALSE + + return TRUE + +/** + * Simple helper proc that runs a suite of checks to test whether it is possible or not for user to buckle target mob to src. + * + * Returns FALSE if any conditions that should prevent buckling are satisfied. Returns TRUE otherwise. + * Arguments: + * * target - Target mob to check against buckling to src. + * * user - The mob who is attempting to buckle the target to src. + * * check_loc - Whether to do a proximity check or not when calling is_buckle_possible(). + */ +/atom/movable/proc/is_user_buckle_possible(mob/living/target, mob/user, check_loc = TRUE) + // Standard adjacency and other checks. + if(!Adjacent(user) || !Adjacent(target) || !isturf(user.loc) || user.incapacitated() || target.anchored) + return FALSE + + // In buckling even possible in the first place? + if(!is_buckle_possible(target, FALSE, check_loc)) + return FALSE + + // If the person attempting to buckle is stood on this atom's turf and they're not buckling themselves, + // buckling shouldn't be possible as they're blocking it. + if((target != user) && (get_turf(user) == get_turf(src))) + to_chat(target, "You are unable to buckle [target] to [src] while it is blocked!") + return FALSE + + return TRUE + //Wrapper procs that handle sanity and user feedback /atom/movable/proc/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) - if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated() || M.anchored) + // Is buckling even possible? Do a full suite of checks. + if(!is_user_buckle_possible(M, user, check_loc)) return FALSE add_fingerprint(user) + + // If the mob we're attempting to buckle is not stood on this atom's turf and it isn't the user buckling themselves, + // we'll try it with a 2 second do_after delay. + if(M != user && (get_turf(M) != get_turf(src))) + M.visible_message("[user] starts buckling [M] to [src]!",\ + "[user] starts buckling you to [src]!",\ + "You hear metal clanking.") + if(!do_after(user, 2 SECONDS, TRUE, M)) + return FALSE + + // Sanity check before we attempt to buckle. Is everything still in a kosher state for buckling after the 3 seconds have elapsed? + // Covers situations where, for example, the chair was moved or there's some other issue. + if(!is_user_buckle_possible(M, user, check_loc)) + return FALSE + . = buckle_mob(M, check_loc = check_loc) if(.) if(M == user) @@ -124,10 +213,9 @@ "You buckle yourself to [src].",\ "You hear metal clanking.") else - M.visible_message(\ - "[user] buckles [M] to [src]!",\ + M.visible_message("[user] buckles [M] to [src]!",\ "[user] buckles you to [src]!",\ - "You hear metal clanking.") + "You hear metal clanking.") /atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user) var/mob/living/M = unbuckle_mob(buckled_mob) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index b068255f7a0dc..c310aa00c5423 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -1,5 +1,8 @@ //Anomalies, used for events. Note that these DO NOT work by themselves; their procs are called by the event datum. +/// Chance of taking a step per second +#define ANOMALY_MOVECHANCE 45 + /obj/effect/anomaly name = "anomaly" desc = "A mysterious anomaly, seen commonly only in the region of space that the station orbits..." @@ -7,8 +10,8 @@ density = FALSE anchored = TRUE light_range = 3 - var/movechance = 70 - var/obj/item/assembly/signaler/anomaly/aSignal + + var/obj/item/assembly/signaler/anomaly/aSignal = /obj/item/assembly/signaler/anomaly var/area/impact_area var/lifespan = 990 @@ -41,8 +44,8 @@ countdown.color = countdown_colour countdown.start() -/obj/effect/anomaly/process() - anomalyEffect() +/obj/effect/anomaly/process(delta_time) + anomalyEffect(delta_time) if(death_time < world.time) if(loc) detonate() @@ -51,11 +54,11 @@ /obj/effect/anomaly/Destroy() GLOB.poi_list.Remove(src) STOP_PROCESSING(SSobj, src) - qdel(countdown) + QDEL_NULL(countdown) return ..() -/obj/effect/anomaly/proc/anomalyEffect() - if(prob(movechance)) +/obj/effect/anomaly/proc/anomalyEffect(delta_time) + if(DT_PROB(ANOMALY_MOVECHANCE, delta_time)) step(src,pick(GLOB.alldirs)) /obj/effect/anomaly/proc/detonate() @@ -92,14 +95,14 @@ for(var/obj/O in orange(4, src)) if(!O.anchored) step_towards(O,src) - for(var/mob/living/M in range(0, src)) + for(var/mob/living/M in get_turf(src)) gravShock(M) - for(var/mob/living/M in orange(4, src)) + for(var/mob/living/M in orange(4, get_turf(src))) if(!M.mob_negates_gravity()) step_towards(M,src) - for(var/obj/O in range(0,src)) + for(var/obj/O in get_turf(src)) if(!O.anchored) - var/mob/living/target = locate() in view(4,src) + var/mob/living/target = locate() in hearers(4,src) if(target && !target.stat) O.throw_at(target, 5, 10) @@ -146,7 +149,7 @@ /obj/effect/anomaly/flux/anomalyEffect() ..() canshock = 1 - for(var/mob/living/M in range(0, src)) + for(var/mob/living/M in get_turf(src)) mobShock(M) /obj/effect/anomaly/flux/Crossed(mob/living/M) @@ -192,7 +195,7 @@ /obj/effect/anomaly/bluespace/anomalyEffect() ..() - for(var/mob/living/M in range(1,src)) + for(var/mob/living/M in hearers(1,src)) do_teleport(M, locate(M.x, M.y, M.z), 4, channel = TELEPORT_CHANNEL_BLUESPACE) /obj/effect/anomaly/bluespace/Bumped(atom/movable/AM) @@ -218,10 +221,10 @@ var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO playsound(TO, 'sound/effects/phasein.ogg', 100, 1) - priority_announce("Massive bluespace translocation detected.", "Anomaly Alert") + priority_announce("Massive bluespace translocation detected.", "Anomaly Alert", SSstation.announcer.get_rand_alert_sound()) var/list/flashers = list() - for(var/mob/living/carbon/C in viewers(TO, null)) + for(var/mob/living/carbon/C in viewers(TO)) if(C.flash_act()) flashers += C @@ -258,15 +261,18 @@ /obj/effect/anomaly/pyro name = "pyroclastic anomaly" icon_state = "mustard" - var/ticks = 4 + var/ticks = 0 + /// How many seconds between each gas release + var/releasedelay = 10 + aSignal = /obj/item/assembly/signaler/anomaly/pyro -/obj/effect/anomaly/pyro/anomalyEffect() +/obj/effect/anomaly/pyro/anomalyEffect(delta_time) ..() - ticks++ - if(ticks < 5) + ticks += delta_time + if(ticks < releasedelay) return else - ticks = 0 + ticks -= releasedelay var/turf/open/T = get_turf(src) if(istype(T)) T.atmos_spawn_air("o2=5;plasma=5;TEMP=1000") @@ -285,11 +291,8 @@ S.rabid = TRUE S.amount_grown = SLIME_EVOLUTION_THRESHOLD S.Evolve() - - var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a pyroclastic anomaly slime?", ROLE_PAI, null, null, 100, S, POLL_IGNORE_PYROSLIME) - if(LAZYLEN(candidates)) - var/mob/dead/observer/chosen = pick(candidates) - S.key = chosen.key + S.flavor_text = FLAVOR_TEXT_EVIL + S.set_playable() ///////////////////// @@ -307,15 +310,13 @@ grav(rand(0,3), rand(2,3), 50, 25) //Throwing stuff around! - for(var/obj/O in range(2,src)) - if(O == src) - return //DON'T DELETE YOURSELF GOD DAMN + for(var/obj/O in orange(2,src)) if(!O.anchored) - var/mob/living/target = locate() in view(4,src) + var/mob/living/target = locate() in hearers(4,src) if(target && !target.stat) O.throw_at(target, 7, 5) else - O.ex_act(EXPLODE_HEAVY) + SSexplosions.med_mov_atom += O /obj/effect/anomaly/bhole/proc/grav(r, ex_act_force, pull_chance, turf_removal_chance) for(var/t = -r, t < r, t++) @@ -334,7 +335,13 @@ if(prob(pull_chance)) for(var/obj/O in T.contents) if(O.anchored) - O.ex_act(ex_act_force) + switch(ex_act_force) + if(EXPLODE_DEVASTATE) + SSexplosions.high_mov_atom += O + if(EXPLODE_HEAVY) + SSexplosions.med_mov_atom += O + if(EXPLODE_LIGHT) + SSexplosions.low_mov_atom += O else step_towards(O,src) for(var/mob/living/M in T.contents) @@ -342,4 +349,10 @@ //Damaging the turf if( T && prob(turf_removal_chance) ) - T.ex_act(ex_act_force) + switch(ex_act_force) + if(EXPLODE_DEVASTATE) + SSexplosions.highturf += T + if(EXPLODE_HEAVY) + SSexplosions.medturf += T + if(EXPLODE_LIGHT) + SSexplosions.lowturf += T diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm index 8328786d42da9..2bb45924dfdd0 100644 --- a/code/game/objects/effects/blessing.dm +++ b/code/game/objects/effects/blessing.dm @@ -18,10 +18,12 @@ add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessedAware, "blessing", I) RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, .proc/block_cult_teleport) -/obj/effect/blessing/Destroy() +/obj/effect/blessing/Destroy() UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT) return ..() - + /obj/effect/blessing/proc/block_cult_teleport(datum/source, channel, turf/origin, turf/destination) + SIGNAL_HANDLER + if(channel == TELEPORT_CHANNEL_CULT) return COMPONENT_BLOCK_TELEPORT diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 0337b076ff7ec..c3b6169be5b15 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -34,4 +34,4 @@ for(var/obj/effect/bump_teleporter/BT in AllTeleporters) if(BT.id == src.id_target) - AM.forceMove(BT.loc) //Teleport to location with correct id. + do_teleport(AM, BT.loc, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 3729a8e5d6227..76705ee6a836a 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -49,6 +49,7 @@ var/original_name desc = "A large piece of space-resistant printed paper." icon = 'icons/obj/contraband.dmi' + layer = ABOVE_WINDOW_LAYER anchored = TRUE var/ruined = FALSE var/random_basetype @@ -437,7 +438,7 @@ icon_state = "poster1_legit" /obj/structure/sign/poster/official/nanotrasen_logo - name = "Nanotrasen Logo" + name = "\improper Nanotrasen logo" desc = "A poster depicting the Nanotrasen logo." icon_state = "poster2_legit" @@ -628,7 +629,7 @@ /obj/structure/sign/poster/official/moth5 name = "Safety Moth - Piping" - desc = "This informational poster uses Safety Moth(TM) to tell atmospheric technicians correct types of piping to be used. Proper pipe placement prevents poor preformance! It's signed by 'AspEv'." + desc = "This informational poster uses Safety Moth(TM) to tell atmospheric technicians correct types of piping to be used. Proper pipe placement prevents poor performance! It's signed by 'AspEv'." icon_state = "poster40_legit" /obj/structure/sign/poster/official/moth6 diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index 72af19ccf1982..a78f612ab3848 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -53,7 +53,7 @@ displayed_text = new_val if(displayed_text) - maptext = "[displayed_text]" + maptext = MAPTEXT("[displayed_text]") else maptext = null @@ -160,20 +160,6 @@ var/time_left = max(0, (H.finish_time - world.time) / 10) return round(time_left) -/obj/effect/countdown/dominator - name = "dominator countdown" - text_size = 1 - color = "#ff00ff" // Overwritten when the dominator starts - -/obj/effect/countdown/dominator/get_value() - var/obj/machinery/dominator/D = attached_to - if(!istype(D)) - return - else if(D.gang && D.gang.domination_time != NOT_DOMINATING) - return D.gang.domination_time_remaining() - else - return "OFFLINE" - /obj/effect/countdown/arena invisibility = 0 name = "arena countdown" diff --git a/code/game/objects/effects/decals/cleanable/food.dm b/code/game/objects/effects/decals/cleanable/food.dm index d45de2bf4b945..89e9251ebb213 100644 --- a/code/game/objects/effects/decals/cleanable/food.dm +++ b/code/game/objects/effects/decals/cleanable/food.dm @@ -32,10 +32,8 @@ /obj/effect/decal/cleanable/food/salt/Crossed(mob/living/L) if(is_species(L, /datum/species/snail) || is_species(L, /datum/species/squid)) - while(L.loc == src.loc) - L.adjustFireLoss(2, TRUE) - to_chat(L, "The salt! It burns!") - sleep(20) + L.adjustFireLoss(10, TRUE) + to_chat(L, "The salt! It burns!") /obj/effect/decal/cleanable/food/flour name = "flour" diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 2e720d9fe331d..bc819abad28be 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -25,8 +25,8 @@ add_blood_DNA(list("Non-human DNA" = random_blood_type())) // Needs to happen before ..() . = ..() icon_state = "[icon_state]-old" //change from the normal blood icon selected from random_icon_states in the parent's Initialize to the old dried up blood. - if(prob(40)) - var/datum/disease/advance/R = new /datum/disease/advance/random(rand(1, 4), rand(4, 9)) + if(prob(75)) + var/datum/disease/advance/R = new /datum/disease/advance/random(rand(3, 6), 9, 4) disease += R /obj/effect/decal/cleanable/blood/old/extrapolator_act(mob/user, var/obj/item/extrapolator/E, scan = TRUE) @@ -65,6 +65,7 @@ layer = LOW_OBJ_LAYER random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") mergeable_decal = FALSE + turf_loc_check = FALSE var/already_rotting = FALSE @@ -82,6 +83,9 @@ desc += " They smell terrible." AddComponent(/datum/component/rot/gibs) +/obj/effect/decal/cleanable/blood/gibs/replace_decal(obj/effect/decal/cleanable/C) + return FALSE //Never fail to place us + /obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target) return @@ -138,8 +142,8 @@ setDir(pick(1,2,4,8)) icon_state += "-old" add_blood_DNA(list("Non-human DNA" = random_blood_type())) - if(prob(50)) - var/datum/disease/advance/R = new /datum/disease/advance/random(rand(1, 6), rand(5, 9)) + if(prob(80)) + var/datum/disease/advance/R = new /datum/disease/advance/random(rand(3, 6), 9, 4) disease += R /obj/effect/decal/cleanable/blood/gibs/old/extrapolator_act(mob/user, var/obj/item/extrapolator/E, scan = TRUE) diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index f3b30e45fe80d..45cd43bd1a7f6 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -149,8 +149,8 @@ /obj/effect/decal/cleanable/vomit/old/Initialize(mapload, list/datum/disease/diseases) . = ..() icon_state += "-old" - if(prob(90))//vomit is much more likely to be diseased than blood is - var/datum/disease/advance/R = new /datum/disease/advance/random(rand(2, 6), 6+(rand(1, 3))) + if(prob(95))//vomit is much more likely to be diseased than blood is + var/datum/disease/advance/R = new /datum/disease/advance/random(rand(3, 6), 9, 4, infected = src) disease += R /obj/effect/decal/cleanable/vomit/old/extrapolator_act(mob/user, var/obj/item/extrapolator/E, scan = TRUE) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index b75f275d1e77f..5e7e025fbcbd9 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -37,31 +37,3 @@ /obj/effect/decal/cleanable/crayon/NeverShouldHaveComeHere(turf/T) return isgroundlessturf(T) - - -/obj/effect/decal/cleanable/crayon/gang - icon = 'icons/effects/crayondecal.dmi' - layer = ABOVE_NORMAL_TURF_LAYER //Harder to hide - plane = GAME_PLANE - do_icon_rotate = FALSE //These are designed to always face south, so no rotation please. - var/datum/team/gang/gang - -/obj/effect/decal/cleanable/crayon/gang/Initialize(mapload, datum/team/gang/G, e_name = "gang tag", rotation = 0, mob/user) - if(!G) - qdel(src) - return - gang = G - var/newcolor = G.color - var/area/territory = get_area(src) - icon_state = G.name - G.new_territories |= list(territory.type = territory.name) - //If this isn't tagged by a specific gangster there's no bonus income. - ..(mapload, newcolor, icon_state, e_name, rotation) - -/obj/effect/decal/cleanable/crayon/gang/Destroy() - if(gang) - var/area/territory = get_area(src) - gang.territories -= territory.type - gang.new_territories -= territory.type - gang.lost_territories |= list(territory.type = territory.name) - return ..() diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 803b7250801fa..6f33cf98fa8a4 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -45,4 +45,4 @@ var/turf/T = loc if(!istype(T)) //you know this will happen somehow CRASH("Turf decal initialized in an object/nullspace") - T.AddComponent(/datum/component/decal, icon, icon_state, dir, CLEAN_NEVER, color, null, null, alpha) + T.AddElement(/datum/element/decal, icon, icon_state, dir, FALSE, color, TURF_LAYER + (layer - TURF_DECAL_LOWEST_LAYER), null, alpha, FALSE) diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm index 6f7c73eb29d55..0045be65804e7 100644 --- a/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -1,3 +1,6 @@ +/obj/effect/turf_decal/stripes + layer = TURF_DECAL_STRIPE_LAYER + /obj/effect/turf_decal/stripes/line icon_state = "warningline" diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index e119295988408..c28548940d9c1 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -39,8 +39,8 @@ if(hotspot && istype(T) && T.air) qdel(hotspot) var/datum/gas_mixture/G = T.air - var/plas_amt = min(30,G.get_moles(/datum/gas/plasma)) //Absorb some plasma - G.adjust_moles(/datum/gas/plasma, -plas_amt) + var/plas_amt = min(30,G.get_moles(GAS_PLASMA)) //Absorb some plasma + G.adjust_moles(GAS_PLASMA, -plas_amt) absorbed_plasma += plas_amt if(G.return_temperature() > T20C) G.set_temperature(max(G.return_temperature()/2,T20C)) @@ -146,7 +146,7 @@ if(lifetime % reagent_divisor) reagents.reaction(O, VAPOR, fraction) var/hit = 0 - for(var/mob/living/L in range(0,src)) + for(var/mob/living/L in get_turf(src)) hit += foam_mob(L) if(hit) lifetime++ //this is so the decrease from mobs hit and the natural decrease don't cumulate. @@ -318,7 +318,7 @@ for(var/obj/effect/hotspot/H in O) qdel(H) for(var/I in G.get_gases()) - if(I == /datum/gas/oxygen || I == /datum/gas/nitrogen) + if(I == GAS_O2 || I == GAS_N2) continue G.set_moles(I, 0) O.air_update_turf() diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 4bc0d0ec3c2f0..b789f44a06598 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -50,7 +50,7 @@ if(lifetime < 1) kill_smoke() return 0 - for(var/mob/living/L in range(0,src)) + for(var/mob/living/L in get_turf(src)) smoke_mob(L) return 1 @@ -160,29 +160,29 @@ var/weldvents = TRUE var/distcheck = TRUE -/datum/effect_system/smoke_spread/freezing/proc/Chilled(atom/A) - if(isopenturf(A)) - var/turf/open/T = A - if(T.air) - var/datum/gas_mixture/G = T.air - if(!distcheck || get_dist(T, location) < blast) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air - G.set_temperature(temperature) - T.air_update_turf() - for(var/obj/effect/hotspot/H in T) - qdel(H) - if(G.get_moles(/datum/gas/plasma)) - G.adjust_moles(/datum/gas/nitrogen, G.get_moles(/datum/gas/plasma)) - G.set_moles(/datum/gas/plasma, 0) - if (weldvents) - for(var/obj/machinery/atmospherics/components/unary/U in T) - if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber. - U.welded = TRUE - U.update_icon() - U.visible_message("[U] was frozen shut!") - for(var/mob/living/L in T) - L.ExtinguishMob() - for(var/obj/item/Item in T) - Item.extinguish() +/datum/effect_system/smoke_spread/freezing/proc/Chilled(turf/open/T) + if(!istype(T)) + return + if(T.air) + var/datum/gas_mixture/G = T.air + if(!distcheck || get_dist(T, location) < blast) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air + G.set_temperature(temperature) + T.air_update_turf() + for(var/obj/effect/hotspot/H in T) + qdel(H) + if(G.get_moles(GAS_PLASMA)) + G.adjust_moles(GAS_N2, G.get_moles(GAS_PLASMA)) + G.set_moles(GAS_PLASMA, 0) + if (weldvents) + for(var/obj/machinery/atmospherics/components/unary/U in T) + if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber. + U.welded = TRUE + U.update_icon() + U.visible_message("[U] was frozen shut!") + for(var/mob/living/L in T) + L.ExtinguishMob() + for(var/obj/item/Item in T) + Item.extinguish() /datum/effect_system/smoke_spread/freezing/set_up(radius = 5, loca, blast_radius = 0) ..() @@ -190,7 +190,7 @@ /datum/effect_system/smoke_spread/freezing/start() if(blast) - for(var/turf/T in RANGE_TURFS(blast, location)) + for(var/turf/open/T in RANGE_TURFS(blast, location)) Chilled(T) ..() @@ -250,6 +250,9 @@ var/fraction = 1/initial(lifetime) reagents.copy_to(C, fraction*reagents.total_volume) reagents.reaction(M, INGEST, fraction) + if(isapid(C)) + C.SetSleeping(50) // Bees sleep when smoked + M.log_message("breathed in some smoke with reagents [english_list(reagents.reagent_list)]", LOG_ATTACK, null, FALSE) // Do not log globally b/c spam return 1 @@ -287,7 +290,7 @@ var/where = "[AREACOORD(location)]" if(carry.my_atom.fingerprintslast) - var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast) + var/mob/M = get_mob_by_ckey(carry.my_atom.fingerprintslast) var/more = "" if(M) more = "[ADMIN_LOOKUPFLW(M)] " diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm index e02dc0e81eed3..2c0e7815958a1 100644 --- a/code/game/objects/effects/effects.dm +++ b/code/game/objects/effects/effects.dm @@ -7,6 +7,7 @@ move_resist = INFINITY obj_flags = 0 vis_flags = VIS_INHERIT_PLANE + var/forensic_protected = FALSE /obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) return diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index 384cf73c89e6c..1b13589572de4 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -8,8 +8,10 @@ CanAtmosPass = ATMOS_PASS_DENSITY var/timeleft = 300 //Set to 0 for permanent forcefields (ugh) -/obj/effect/forcefield/Initialize() +/obj/effect/forcefield/Initialize(mapload, ntimeleft) . = ..() + if(isnum_safe(ntimeleft)) + timeleft = ntimeleft if(timeleft) QDEL_IN(src, timeleft) diff --git a/code/game/objects/effects/info.dm b/code/game/objects/effects/info.dm new file mode 100644 index 0000000000000..23f341c8a3c78 --- /dev/null +++ b/code/game/objects/effects/info.dm @@ -0,0 +1,26 @@ +/// An info button that, when clicked, puts some text in the user's chat +/obj/effect/abstract/info + name = "info" + icon = 'icons/effects/effects.dmi' + icon_state = "info" + + /// What should the info button display when clicked? + var/info_text + +/obj/effect/abstract/info/Initialize(mapload, info_text) + . = ..() + + if (!isnull(info_text)) + src.info_text = info_text + +/obj/effect/abstract/info/Click() + . = ..() + to_chat(usr, info_text) + +/obj/effect/abstract/info/MouseEntered() + . = ..() + icon_state = "info_hovered" + +/obj/effect/abstract/info/MouseExited() + . = ..() + icon_state = initial(icon_state) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 343c3d1b384a1..ddd6415810c39 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -41,20 +41,18 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) if(delete_after_roundstart) qdel(src) -/obj/effect/landmark/start/New() +/obj/effect/landmark/start/Initialize() + . = ..() GLOB.start_landmarks_list += src if(jobspawn_override) - if(!GLOB.jobspawn_overrides[name]) - GLOB.jobspawn_overrides[name] = list() - GLOB.jobspawn_overrides[name] += src - ..() + LAZYADDASSOC(GLOB.jobspawn_overrides, name, src) if(name != "start") tag = "start*[name]" /obj/effect/landmark/start/Destroy() GLOB.start_landmarks_list -= src if(jobspawn_override) - GLOB.jobspawn_overrides[name] -= src + LAZYREMOVEASSOC(GLOB.jobspawn_overrides, name, src) return ..() // START LANDMARKS FOLLOW. Don't change the names unless @@ -103,6 +101,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) name = "Shaft Miner" icon_state = "Shaft Miner" +/obj/effect/landmark/start/exploration + name = "Exploration Crew" + icon_state = "Exploration Crew" + /obj/effect/landmark/start/security_officer name = "Security Officer" icon_state = "Security Officer" @@ -214,8 +216,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) /obj/effect/landmark/start/randommaint name = "maintjobstart" - icon_state = "x3" - var/job = "Gimmick" //put the title of the job here. + icon_state = "x3" + var/job = "Gimmick" //put the title of the job here. /obj/effect/landmark/start/randommaint/New() //automatically opens up a job slot when the job's spawner loads in ..() @@ -234,7 +236,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) /obj/effect/landmark/start/randommaint/hobo name = "Debtor" job = "Debtor" - + /obj/effect/landmark/start/randommaint/shrink name = "Psychiatrist" job = "Psychiatrist" @@ -341,7 +343,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) GLOB.xeno_spawn += loc return INITIALIZE_HINT_QDEL -//objects with the stationloving component (nuke disk) respawn here. +//objects with the stationloving component (nuke disk) respawn here. //also blobs that have their spawn forcemoved (running out of time when picking their spawn spot), santa and respawning devils /obj/effect/landmark/blobstart name = "blobstart" diff --git a/code/game/objects/effects/mainttraps.dm b/code/game/objects/effects/mainttraps.dm index 483e67d0e617e..ed9b0aec06011 100644 --- a/code/game/objects/effects/mainttraps.dm +++ b/code/game/objects/effects/mainttraps.dm @@ -9,7 +9,7 @@ icon_state = "gavelblock" invisibility = INVISIBILITY_MAXIMUM //sorry ghosts and curators, my tricks will remain hidden var/reusable = FALSE //can it trigger more than once - var/inuse = FALSE //used to make sure it dont get used when it shouldnt + var/inuse = FALSE //used to make sure it dont get used when it shouldn't /obj/effect/trap/proc/TrapEffect(AM) return TRUE @@ -20,7 +20,6 @@ var/grounded = FALSE //does it ignore fliers var/pick_style = PICK_STYLE_ORDERED var/requirehuman = TRUE - var/list/possibletraps = list() /obj/effect/trap/trigger/Crossed(AM as mob|obj) if(isturf(loc)) @@ -44,14 +43,14 @@ /obj/effect/trap/trigger/TrapEffect(AM) if(inuse) return FALSE - else + else inuse = TRUE + var/list/possibletraps = list() + for(var/obj/effect/trap/nexus/payload in view(10, src)) + possibletraps += payload if(!LAZYLEN(possibletraps)) - for(var/obj/effect/trap/nexus/payload in view(10, src)) - possibletraps += payload - if(!LAZYLEN(possibletraps)) - qdel(src) - return FALSE + qdel(src) + return FALSE switch(pick_style) if(PICK_STYLE_RANDOM) var/obj/effect/trap/nexus/chosen = pick(possibletraps) @@ -98,7 +97,7 @@ pick_style = PICK_STYLE_RANDOM /obj/effect/trap/nexus //this trap is triggered by pressurepads. doesnt do anything alone - icon_state = "madeyoulook" + icon_state = "madeyoulook" /obj/effect/trap/nexus/doorbolt //a nasty little trap to put in a room with a simplemob name = "door bolter" @@ -108,7 +107,7 @@ /obj/effect/trap/nexus/doorbolt/TrapEffect(AM) if(inuse) return FALSE - else + else inuse = TRUE var/list/airlocks = list() for(var/obj/machinery/door/airlock/airlock in view(10, src)) @@ -138,6 +137,8 @@ FC.force_target(C) FC.dontkill = TRUE FC.delete_after_target_killed = TRUE //it only affects the one to walk on the rune. when he dies, the rune is no longer usable + message_admins("A hugbox floor cluwne has been spawned at [COORD(T)][ADMIN_JMP(T)] following [ADMIN_LOOKUPFLW(C)]") + log_game("A hugbox floor cluwne has been spawned at [COORD(T)]") playsound(C,'sound/misc/honk_echo_distant.ogg', 30, 1) return TRUE return FALSE @@ -175,25 +176,19 @@ var/list/mobss = list() var/list/validturfs = list() var/turf/T = get_turf(src) - for(var/atom/I in view(7, src)) - if(isopenturf(I)) - turfs += I - continue - if(isliving(I)) - var/mob/living/L = I - if(L.mind) - mobss += L - continue - for(var/turf/turf in turfs) + for(var/turf/open/O in view(7, src)) + if(!isspaceturf(O)) + turfs += O + for(var/mob/living/L in view(7, src)) + if(L.mind) + mobss += L + for(var/turf/turf as() in turfs) var/visible = FALSE - if(isspaceturf(turf)) - continue - for(var/mob/living/L in mobss) + for(var/mob/living/L as() in mobss) if(can_see(L, turf)) visible = TRUE - if(visible) - continue - validturfs += T + if(!visible) + validturfs += T if(validturfs.len) T = pick(validturfs) if(mobs) @@ -201,7 +196,7 @@ spawninstance.target = AM if(istype(spawninstance, /mob/living/simple_animal/hostile/retaliate)) var/mob/living/simple_animal/hostile/retaliate/R = spawninstance - R.enemies += AM + R.enemies += AM mobs-- crossattempts = rand(1, 5) if(!mobs) @@ -213,7 +208,7 @@ spawned = /mob/living/simple_animal/hostile/cat_butcherer/hugbox /obj/effect/trap/nexus/trickyspawner/faithless - spawned = /mob/living/simple_animal/hostile/faithless + spawned = /mob/living/simple_animal/hostile/faithless /obj/effect/trap/nexus/trickyspawner/shitsec spawned = /mob/living/simple_animal/hostile/nanotrasen/hugbox @@ -231,7 +226,7 @@ spawned = /mob/living/simple_animal/hostile/alien/hugbox /obj/effect/trap/nexus/trickyspawner/honkling - mobs = 5 //honklings are annoying, but nearly harmless. + mobs = 5 //honklings are annoying, but nearly harmless. spawned = /mob/living/simple_animal/hostile/retaliate/clown/honkling /obj/effect/trap/nexus/trickyspawner/clownmutant @@ -248,19 +243,26 @@ /mob/living/simple_animal/hostile/nanotrasen/hugbox loot = list(/obj/effect/gibspawner/human)//no gamer gear, sorry! + mobchatspan = "headofsecurity" + del_on_death = TRUE /mob/living/simple_animal/hostile/zombie/hugbox melee_damage = 12 //zombies have a base of 21, a bit much stat_attack = CONSCIOUS + mobchatspan = "chaplain" + discovery_points = 1000 /mob/living/simple_animal/hostile/alien/hugbox health = 60 //they go down easy, to lull the player into a sense of false security - maxHealth = 60 + maxHealth = 60 + mobchatspan = "researchdirector" + discovery_points = 1000 /mob/living/simple_animal/hostile/cat_butcherer/hugbox //a cat butcher without a melee speed buff or a syringe gun. he's not too hard to take down, but can still go on catification rampages ranged = FALSE rapid_melee = 1 loot = list(/obj/effect/mob_spawn/human/corpse/cat_butcher, /obj/item/circular_saw) + mobchatspan = "medicaldoctor" //this abomination goes in here because it doesnt really belong with normal cult runes /obj/effect/rune/cluwne @@ -269,7 +271,7 @@ cultist_name = "Invocation rune" cultist_desc = "tears apart dimensional barriers, allowing a powerful elder being to exert its will upon the world. Requires at least nine invokers" //only shown to cultists, it does not actually require nine invokers if not used by cultists invocation = "HONK!!" - req_cultists = 9//if a cultist invokes this, it acts like an invocation rune by asking them to check this. + req_cultists = 9//if a cultist invokes this, it acts like an invocation rune by asking them to check this. icon = 'icons/effects/96x96.dmi' icon_state = "Cluwne" color = RUNE_COLOR_SUMMON @@ -281,7 +283,7 @@ if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user)) SEND_SOUND(user,'sound/items/sheath.ogg') if(do_after(user, 15, target = src)) - to_chat(user, "It's not within your power to erase the [lowertext(cultist_name)].") + to_chat(user, "It's not within your power to erase the [lowertext(cultist_name)].") else if(istype(I, /obj/item/nullrod)) user.say("BEGONE FOUL MAGIKS!!", forced = "nullrod") to_chat(user, "You try to disrupt the magic of [src] with the [I], and nothing happens to the crude crayon markings. You feel foolish.") @@ -290,9 +292,8 @@ var/cluwne = FALSE if(rune_in_use) return - for(var/mob/living/simple_animal/hostile/floor_cluwne/clown in range(5, src)) + if(locate(/mob/living/simple_animal/hostile/floor_cluwne) in range(5, src)) cluwne = TRUE - break if(!cluwne && !iscultist(user)) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -330,9 +331,8 @@ return if(istype(M, /mob/living/simple_animal/cluwne) || istype(M, /mob/living/simple_animal/hostile/retaliate/clown)) var/cluwne = FALSE - for(var/mob/living/simple_animal/hostile/floor_cluwne/clown in range(5, src)) + if(locate(/mob/living/simple_animal/hostile/floor_cluwne) in range(5, src)) cluwne = TRUE - break if(!cluwne) to_chat(M, "We need a connection! One of the honkmother's manifested forms!") else @@ -342,11 +342,8 @@ /obj/effect/rune/cluwne/can_invoke(user) //this is actually used to get "sacrifices", which can include the user var/list/invokers = list() //people eligible to invoke the rune - var/list/things_in_range = range(1, src) - for(var/mob/living/carbon/human/L in things_in_range) - if(!L.mind) - continue - if(L.stat) + for(var/mob/living/carbon/human/L in range(1, src)) + if(!L.mind || L.stat) continue invokers += L return invokers @@ -354,14 +351,16 @@ /obj/effect/rune/cluwne/invoke(var/list/invokers) ..() rune_in_use = TRUE - for(var/mob/living/simple_animal/hostile/floor_cluwne/FC in range(5, src)) //we unleash the floor cluwne + for(var/mob/living/simple_animal/hostile/floor_cluwne/FC in range(5, src)) //we unleash the floor cluwne FC.dontkill = FALSE FC.delete_after_target_killed = FALSE FC.interest = 300 color = RUNE_COLOR_SUMMON - for(var/mob/living/carbon/C in view(10, src)) + for(var/mob/living/carbon/C in hearers(10, src)) C.Stun(350, ignore_canstun = TRUE) - priority_announce("Figments of an elder god have been detected in your sector. Exercise extreme caution, and abide by the 'buddy system' at all times.","Central Command Higher Dimensional Affairs", 'sound/ai/spanomalies.ogg') + priority_announce("Figments of an elder god have been detected in your sector. Exercise extreme caution, and abide by the 'buddy system' at all times.","Central Command Higher Dimensional Affairs", ANNOUNCER_SPANOMALIES) + message_admins("A dangerous cluwne rune was invoked at [AREACOORD(src)][ADMIN_COORDJMP(src)]") + log_game("A dangerous cluwne rune was invoked at [AREACOORD(src)][ADMIN_COORDJMP(src)]") stoplag(315) for(var/mob/living/carbon/human/H in invokers) if(H.stat == DEAD) @@ -373,17 +372,26 @@ cluwne.stage = 4 if(prob(75)) cluwne.delete_after_target_killed = TRUE - to_chat(H, "YOU'RE MINE!") + to_chat(H, "YOU'RE MINE!") + message_admins("A floor cluwne has been spawned by rune at [AREACOORD(src)][ADMIN_COORDJMP(src)] following [ADMIN_LOOKUPFLW(H)]. It [cluwne.delete_after_target_killed ? "will" : "will not"] kill additional people") + log_game("A floor cluwne has been spawned by rune at [AREACOORD(src)] following [ADMIN_LOOKUP(H)]. It [cluwne.delete_after_target_killed ? "will" : "will not"] kill additional people") + H.log_message("was targetted by cluwne from rune", LOG_ATTACK) + else if(prob(20)) var/mob/living/simple_animal/hostile/floor_cluwne/cluwne = new(src.loc) cluwne.force_target(H) if(prob(75)) cluwne.delete_after_target_killed = TRUE - to_chat(H, "Do you want to play a game?") + to_chat(H, "Do you want to play a game?") + message_admins("A floor cluwne has been spawned by rune at [AREACOORD(src)][ADMIN_COORDJMP(src)] following [ADMIN_LOOKUPFLW(H)]. It [cluwne.delete_after_target_killed ? "will" : "will not"] kill additional people") + log_game("A floor cluwne has been spawned by rune at [AREACOORD(src)] following [ADMIN_LOOKUP(H)]. It [cluwne.delete_after_target_killed ? "will" : "will not"] kill additional people") + H.log_message("was targetted by cluwne from rune", LOG_ATTACK) else if(prob(60)) H.cluwneify() - to_chat(H, "Join us!") + H.log_message("was cluwned by rune", LOG_ATTACK) + + to_chat(H, "Join us!") else - to_chat(H, "You bore me.") + to_chat(H, "You bore me.") sound_to_playing_players('sound/misc/honk_echo_distant.ogg') - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 713e25c4e339d..eee617229726a 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -32,7 +32,7 @@ /obj/item/deployablemine/honk name = "deployable honkblaster 1000" - desc = "An advanced pranking landmine for clowns, honk! Delivers an extra loud HONK to the head when triggered. It can be planted to arm it, or have its sound customised with a sound synthesiser." + desc = "An advanced pranking landmine for clowns, honk! Delivers an extra loud HONK to the head when triggered. It can be planted to arm it, or have its sound customised with a sound synthesiser." mine_type = /obj/effect/mine/sound /obj/item/deployablemine/traitor @@ -92,7 +92,7 @@ anchored = TRUE icon = 'icons/obj/items_and_weapons.dmi' icon_state = "uglymine" - var/triggered = 0 + var/triggered = FALSE var/smartmine = 0 var/disarm_time = 200 var/disarm_product = /obj/item/deployablemine // ie what drops when the mine is disarmed @@ -108,20 +108,20 @@ /obj/effect/mine/proc/mineEffect(mob/victim) to_chat(victim, "*click*") -/obj/effect/mine/Crossed(AM as mob|obj) - if(isturf(loc)) - if(ismob(AM)) - var/mob/MM = AM - if(!(MM.movement_type & FLYING)) - checksmartmine(AM) - else - triggermine(AM) +/obj/effect/mine/Crossed(atom/movable/AM as mob|obj) + if(!isturf(loc) || AM.throwing || (AM.movement_type & (FLYING | FLOATING)) || !AM.has_gravity()) + return + . = ..() + if(ismob(AM)) + checksmartmine(AM) + else + triggermine(AM) /obj/effect/mine/proc/checksmartmine(mob/target) if(target) if(!(target && HAS_TRAIT(target, TRAIT_MINDSHIELD))) triggermine(target) - if(smartmine == 0 || istype(target.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) //tinfoil hat prevents detection of implants + if(smartmine == 0 || istype(target.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat)) //tinfoil hat prevents detection of implants triggermine(target) /obj/effect/mine/proc/triggermine(mob/victim) @@ -131,10 +131,14 @@ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, 1, src) s.start() - mineEffect(victim) triggered = 1 + mineEffect(victim) + SEND_SIGNAL(src, COMSIG_MINE_TRIGGERED, victim) qdel(src) +/obj/effect/mine/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir) + . = ..() + triggermine() /obj/effect/mine/explosive name = "explosive mine" @@ -196,11 +200,24 @@ disarm_product = /obj/item/deployablemine/heavy + /obj/effect/mine/stun/mineEffect(mob/living/victim) if(isliving(victim)) victim.adjustStaminaLoss(stun_time) victim.adjustBruteLoss(damage) +/obj/effect/mine/shrapnel + name = "shrapnel mine" + var/shrapnel_type = /obj/item/projectile/bullet/shrapnel + var/shrapnel_magnitude = 3 + +/obj/effect/mine/shrapnel/mineEffect(mob/victim) + AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_magnitude) + +/obj/effect/mine/shrapnel/sting + name = "stinger mine" + shrapnel_type = /obj/item/projectile/bullet/pellet/stingball + /obj/effect/mine/kickmine name = "kick mine" @@ -245,7 +262,7 @@ if(istype(J, /obj/item/soundsynth)) to_chat(user, "You change the sound settings of the [src].") sound = J.selected_sound - + /obj/effect/mine/sound/bwoink name = "bwoink mine" @@ -277,38 +294,41 @@ desc = "You feel angry just looking at it." duration = 1200 //2min color = "#FF0000" + var/mob/living/doomslayer + var/obj/item/chainsaw/doomslayer/chainsaw /obj/effect/mine/pickup/bloodbath/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return to_chat(victim, "RIP AND TEAR") - var/old_color = victim.client.color - var/static/list/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0) - var/static/list/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0) spawn(0) new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0) - var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc) + chainsaw = new(victim.loc) victim.log_message("entered a blood frenzy", LOG_ATTACK) ADD_TRAIT(chainsaw, TRAIT_NODROP, CHAINSAW_FRENZY_TRAIT) victim.drop_all_held_items() victim.put_in_hands(chainsaw, forced = TRUE) chainsaw.attack_self(victim) - chainsaw.wield(victim) victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25) to_chat(victim, "KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!") - victim.client.color = pure_red - animate(victim.client,color = red_splash, time = 10, easing = SINE_EASING|EASE_OUT) - sleep(10) - animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT) - sleep(duration) - to_chat(victim, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.") - qdel(chainsaw) - victim.log_message("exited a blood frenzy", LOG_ATTACK) - qdel(src) + var/datum/client_colour/colour = victim.add_client_colour(/datum/client_colour/bloodlust) + QDEL_IN(colour, 11) + doomslayer = victim + RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/end_blood_frenzy) + QDEL_IN(WEAKREF(src), duration) + +/obj/effect/mine/pickup/bloodbath/proc/end_blood_frenzy() + SIGNAL_HANDLER + + if(doomslayer) + to_chat(doomslayer, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.") + doomslayer.log_message("exited a blood frenzy", LOG_ATTACK) + if(chainsaw) + qdel(chainsaw) /obj/effect/mine/pickup/healing name = "Blue Orb" diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index b7ded01d5a21a..3bd43e44fb37d 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -40,10 +40,6 @@ density = TRUE layer = FLY_LAYER -/obj/effect/supplypod_selector - icon_state = "supplypod_selector" - layer = FLY_LAYER - //Makes a tile fully lit no matter what /obj/effect/fullbright icon = 'icons/effects/alphacolors.dmi' diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 1caad4b499d42..892bb73706dbe 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -52,6 +52,19 @@ vis_flags = NONE var/unused = 0 //When detected to be unused it gets set to world.time, after a while it gets removed var/cache_expiration = 2 MINUTES // overlays which go unused for 2 minutes get cleaned up + vis_flags = VIS_INHERIT_ID + +/obj/effect/overlay/airlock_part + anchored = TRUE + plane = FLOAT_PLANE + layer = FLOAT_LAYER - 1 + vis_flags = VIS_INHERIT_ID + var/side_id + var/open_px = 0 + var/open_py = 0 + var/move_start_time = 0 // for opening; closing uses reversed. + var/move_end_time = 3.5 + var/aperture_angle = 0 /obj/effect/overlay/timer name = "timer overlay" diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm index 607921d5625d6..5675e592bec6c 100644 --- a/code/game/objects/effects/proximity.dm +++ b/code/game/objects/effects/proximity.dm @@ -36,6 +36,8 @@ return ..() /datum/proximity_monitor/proc/HandleMove() + SIGNAL_HANDLER + var/atom/_host = host var/atom/new_host_loc = _host.loc if(last_host_loc != new_host_loc) @@ -107,6 +109,8 @@ return INITIALIZE_HINT_QDEL /obj/effect/abstract/proximity_checker/Destroy() + if(monitor.checkers) + monitor.checkers -= src monitor = null return ..() diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index c520c27d0e97b..fb92e31f1e9ac 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -1,6 +1,6 @@ #define CELSIUS_TO_KELVIN(T_K) ((T_K) + T0C) -#define OPTIMAL_TEMP_K_PLA_BURN_SCALE(PRESSURE_P,PRESSURE_O,TEMP_O) (((PRESSURE_P) * GLOB.meta_gas_info[/datum/gas/plasma][META_GAS_SPECIFIC_HEAT]) / (((PRESSURE_P) * GLOB.meta_gas_info[/datum/gas/plasma][META_GAS_SPECIFIC_HEAT] + (PRESSURE_O) * GLOB.meta_gas_info[/datum/gas/oxygen][META_GAS_SPECIFIC_HEAT]) / PLASMA_UPPER_TEMPERATURE - (PRESSURE_O) * GLOB.meta_gas_info[/datum/gas/oxygen][META_GAS_SPECIFIC_HEAT] / CELSIUS_TO_KELVIN(TEMP_O))) +#define OPTIMAL_TEMP_K_PLA_BURN_SCALE(PRESSURE_P,PRESSURE_O,TEMP_O) (((PRESSURE_P) * GLOB.gas_data.specific_heats[GAS_PLASMA]) / (((PRESSURE_P) * GLOB.gas_data.specific_heats[GAS_PLASMA] + (PRESSURE_O) * GLOB.gas_data.specific_heats[GAS_O2]) / PLASMA_UPPER_TEMPERATURE - (PRESSURE_O) * GLOB.gas_data.specific_heats[GAS_O2] / CELSIUS_TO_KELVIN(TEMP_O))) #define OPTIMAL_TEMP_K_PLA_BURN_RATIO(PRESSURE_P,PRESSURE_O,TEMP_O) (CELSIUS_TO_KELVIN(TEMP_O) * PLASMA_OXYGEN_FULLBURN * (PRESSURE_P) / (PRESSURE_O)) /obj/effect/spawner/newbomb @@ -19,10 +19,10 @@ var/obj/item/tank/internals/plasma/PT = new(V) var/obj/item/tank/internals/oxygen/OT = new(V) - PT.air_contents.set_moles(/datum/gas/plasma, pressure_p*PT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_p))) + PT.air_contents.set_moles(GAS_PLASMA, pressure_p*PT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_p))) PT.air_contents.set_temperature(CELSIUS_TO_KELVIN(temp_p)) - OT.air_contents.set_moles(/datum/gas/oxygen, pressure_o*OT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_o))) + OT.air_contents.set_moles(GAS_O2, pressure_o*OT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_o))) OT.air_contents.set_temperature(CELSIUS_TO_KELVIN(temp_o)) V.tank_one = PT diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 35a1bb0c7b513..b6809d945f7e0 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -19,7 +19,7 @@ stack_trace("Gib list dir length mismatch!") return - var/obj/effect/decal/cleanable/blood/gibs/gib = null + var/obj/effect/decal/cleanable/blood/gib = null if(sound_to_play && isnum_safe(sound_vol)) playsound(src, sound_to_play, sound_vol, TRUE) @@ -31,7 +31,7 @@ var/list/dna_to_add //find the dna to pass to the spawned gibs. do note this can be null if the mob doesn't have blood. add_blood_DNA() has built in null handling. - if(source_mob) + if(source_mob && ismob(source_mob)) //probably a good idea to check if IT IS a mob. dna_to_add = source_mob.get_blood_dna_list() //ez pz else if(gib_mob_type) var/mob/living/temp_mob = new gib_mob_type(src) //generate a fake mob so that we pull the right type of DNA for the gibs. @@ -52,7 +52,15 @@ var/list/directions = gibdirections[i] if(isturf(loc)) if(directions.len) - gib.streak(directions) + if(istype(gib, /obj/effect/decal/cleanable/blood/gibs)) + var/obj/effect/decal/cleanable/blood/gibs/G = gib + G.streak(directions) + else if(istype(gib, /obj/effect/decal/cleanable/xenoblood/xgibs)) + var/obj/effect/decal/cleanable/xenoblood/xgibs/G = gib + G.streak(directions) + else if(istype(gib, /obj/effect/decal/cleanable/robot_debris)) + var/obj/effect/decal/cleanable/xenoblood/xgibs/G = gib + G.streak(directions) return INITIALIZE_HINT_QDEL @@ -67,6 +75,9 @@ gibdirections = list(list(WEST, NORTHWEST, SOUTHWEST, NORTH),list(EAST, NORTHEAST, SOUTHEAST, SOUTH), list()) return ..() +/obj/effect/gibspawner/generic/bloodtomato + gibtypes = list(/obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood/gibs) + /obj/effect/gibspawner/generic/animal gib_mob_type = /mob/living/simple_animal/pet diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 0b7dbbf50dee1..92a004f583dce 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -49,7 +49,7 @@ lootdoubles = FALSE loot = list( - /obj/item/gun/ballistic/automatic/pistol = 8, + /obj/item/gun/ballistic/automatic/pistol/locker = 8, /obj/item/gun/ballistic/shotgun/automatic/combat = 3, /obj/item/gun/ballistic/revolver/mateba, /obj/item/gun/ballistic/automatic/pistol/deagle, @@ -115,6 +115,13 @@ /obj/effect/spawner/lootdrop/maintenance/Initialize(mapload) loot = GLOB.maintenance_loot + + if(HAS_TRAIT(SSstation, STATION_TRAIT_FILLED_MAINT)) + lootcount = FLOOR(lootcount * 1.5, 1) + + else if(HAS_TRAIT(SSstation, STATION_TRAIT_EMPTY_MAINT)) + lootcount = FLOOR(lootcount * 0.5, 1) + . = ..() /obj/effect/spawner/lootdrop/maintenance/two @@ -192,7 +199,7 @@ /obj/item/organ/tongue/snail = 1, /obj/item/organ/appendix = 5, /obj/effect/gibspawner/human = 1, - /obj/item/organ/wings = 1, + /obj/item/organ/wings = 1, /obj/item/organ/wings/moth = 1, /obj/item/organ/wings/bee = 1, /obj/item/organ/wings/dragon/fake = 1) @@ -216,10 +223,38 @@ /obj/item/organ/vocal_cords/adamantine = 1, /obj/effect/gibspawner/xeno = 1, /obj/effect/mob_spawn/human/corpse/assistant = 1, - /obj/effect/mob_spawn/teratomamonkey = 5, + /obj/effect/mob_spawn/teratomamonkey = 1, /obj/item/organ/wings/moth/robust = 1, /obj/item/organ/wings/dragon = 1) +/obj/effect/spawner/lootdrop/teratoma/robot + name = "robotic teratoma spawner" + loot = list( + /obj/item/organ/ears/robot = 5, + /obj/item/organ/eyes/robotic = 5, + /obj/item/organ/eyes/robotic/flashlight = 1, + /obj/item/organ/eyes/night_vision = 1, + /obj/item/organ/liver/cybernetic = 4, + /obj/item/organ/liver/cybernetic/upgraded/ipc = 3, + /obj/item/organ/lungs/cybernetic = 4, + /obj/item/organ/lungs/cybernetic/upgraded= 2, + /obj/item/organ/stomach/battery/ipc = 4, + /obj/item/organ/heart/clockwork = 6, + /obj/item/organ/stomach/clockwork = 6, + /obj/item/organ/liver/clockwork = 6, + /obj/item/organ/lungs/clockwork = 6, + /obj/item/organ/tail/clockwork = 6, + /obj/item/organ/adamantine_resonator = 1, + /obj/item/organ/eyes/robotic/thermals = 2, + /obj/item/organ/heart/gland/viral = 1, + /obj/item/organ/eyes/robotic/shield = 2, + /obj/item/organ/eyes/robotic/glow = 2, + /obj/item/organ/heart/cybernetic = 2, + /obj/item/organ/wings/cybernetic = 2, + /obj/item/organ/tongue/robot/clockwork/better = 2, + /obj/effect/gibspawner/robot = 4, + /obj/item/drone_shell = 1) + /obj/effect/spawner/lootdrop/teratoma/major/clown name = "funny teratoma spawner" loot = list( @@ -232,13 +267,23 @@ /obj/item/bikehorn = 5, /obj/item/reagent_containers/food/snacks/pie/cream = 3) - /obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner name = "2% chance xeno egg spawner" loot = list( /obj/effect/decal/remains/xeno = 49, /obj/effect/spawner/xeno_egg_delivery = 1) +/obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner/Initialize() + if(prob(40) && SSevents.holidays && SSevents.holidays[APRIL_FOOLS]) + loot = list(/obj/effect/spawner/xeno_egg_delivery_troll = 1) + . = ..() + +/obj/effect/spawner/lootdrop/ten_percent_girlfriend_spawner + name = "10% chance girlfriend spawner" + loot = list( + /mob/living/simple_animal/pet/dog/corgi = 9, + /mob/living/simple_animal/pet/dog/corgi/Lisa = 1) + /obj/effect/spawner/lootdrop/sanitarium name = "patient spawner" loot = list( @@ -255,7 +300,7 @@ /mob/living/simple_animal/hostile/retaliate/spaceman = 2, /obj/effect/mob_spawn/human/corpse/assistant/brainrot_infection = 1, /mob/living/simple_animal/hostile/retaliate/frog = 2) - + /obj/effect/spawner/lootdrop/costume name = "random costume spawner" @@ -456,3 +501,18 @@ /obj/effect/trap/nexus/trickyspawner/clownmutant = 2, /obj/effect/trap/nexus/trickyspawner/honkling = 3, /obj/effect/trap/nexus/cluwnecurse = 1) + +/obj/effect/spawner/lootdrop/megafaunaore + name = "megafauna ore drop" + lootcount = 100 + lootdoubles = TRUE + loot = list( + /obj/item/stack/ore/iron = 5, + /obj/item/stack/ore/glass/basalt = 5, + /obj/item/stack/ore/plasma = 3, + /obj/item/stack/ore/silver = 3, + /obj/item/stack/ore/gold = 3, + /obj/item/stack/ore/copper = 3, + /obj/item/stack/ore/titanium = 2, + /obj/item/stack/ore/uranium = 2, + /obj/item/stack/ore/diamond = 2) diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm index 9be52dab5295a..c619504937c0d 100644 --- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -15,5 +15,23 @@ message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].") log_game("An alien egg has been delivered to [AREACOORD(T)]") var/message = "Attention [station_name()], we have entrusted you with a research specimen in [get_area_name(T, TRUE)]. Remember to follow all safety precautions when dealing with the specimen." - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /proc/print_command_report, message), announcement_time)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/_addtimer, CALLBACK(GLOBAL_PROC, /proc/print_command_report, message), announcement_time)) + return INITIALIZE_HINT_QDEL + +/obj/effect/spawner/xeno_egg_delivery_troll //We're doing big amount of trolling + name = "\"xeno egg\" delivery" + icon = 'icons/mob/mask.dmi' + icon_state = "clown" + var/announcement_time = 1000 + +/obj/effect/spawner/xeno_egg_delivery_troll/Initialize(mapload) + ..() + var/turf/T = get_turf(src) + new /obj/structure/alien/egg/troll(T) + playsound(T, 'sound/items/bikehorn.ogg', 60, 0, 0) + + message_admins("\"A joke\" has been delivered to [ADMIN_VERBOSEJMP(T)].") + log_game("\"A joke\" has been delivered to [AREACOORD(T)]") + var/message = "Attention [station_name()], we have entrusted you with a research specimen in [get_area_name(T, TRUE)]. Remember to follow all safety precautions when dealing with the specimen." + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/_addtimer, CALLBACK(GLOBAL_PROC, /proc/print_command_report, message), announcement_time)) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index fbbfcab41c32c..53209907c7c16 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -65,10 +65,10 @@ START_PROCESSING(SSobj, src) . = ..() -/obj/structure/spider/eggcluster/process() - amount_grown += rand(0,2) +/obj/structure/spider/eggcluster/process(delta_time) + amount_grown += rand(0,1) * delta_time if(amount_grown >= 100) - var/num = rand(3,12) + var/num = round(rand(1.5, 6) * delta_time) for(var/i=0, i" - else - t1 += "Restriction Type: All accesses required
" - - t1 += "Remove All
" - - var/accesses = "" - accesses += "
Access
"
- accesses += "| [get_region_accesses_name(i)]: | " - accesses += "
| "
- for(var/A in get_region_accesses(i))
- if(A in conf_access)
- accesses += "[replacetext(get_access_desc(A), " ", " ")] "
- else
- accesses += "[replacetext(get_access_desc(A), " ", " ")] "
- accesses += " " - accesses += " | "
- accesses += "
According to \the [src], you are now in \"[html_encode(A.name)]\".
" . += "" @@ -140,12 +140,9 @@ legend = FALSE -/obj/item/areaeditor/proc/get_area() - var/turf/T = get_turf(usr) - var/area/A = T.loc - return A - -/obj/item/areaeditor/proc/get_area_type(area/A = get_area()) +/obj/item/areaeditor/proc/get_area_type(area/A) + if (!A) + A = get_area(usr) if(A.outdoors) return AREA_SPACE var/list/SPECIALS = list( @@ -183,7 +180,7 @@ return "" /obj/item/areaeditor/proc/edit_area() - var/area/A = get_area() + var/area/A = get_area(usr) var/prevname = "[A.name]" var/str = stripped_input(usr,"New area name:", "Area Creation", "", MAX_NAME_LEN) if(!str || !length(str) || str==prevname) //cancel diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index f3dc980355d3c..3d9d39c4c20e2 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -63,6 +63,8 @@ return ..() /obj/item/bodybag/bluespace/proc/CanReachReact(atom/movable/source, list/next) + SIGNAL_HANDLER + return COMPONENT_BLOCK_REACH /obj/item/bodybag/bluespace/deploy_bodybag(mob/user, atom/location) diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm new file mode 100644 index 0000000000000..f8913c878b9ce --- /dev/null +++ b/code/game/objects/items/broom.dm @@ -0,0 +1,85 @@ +/obj/item/pushbroom + name = "broom" + desc = "This is my BROOMSTICK! It can be used manually or braced with two hands to sweep items as you move. It has a telescopic handle for compact storage." + icon = 'icons/obj/janitor.dmi' + icon_state = "broom0" + lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' + force = 8 + throwforce = 10 + throw_speed = 3 + throw_range = 7 + w_class = WEIGHT_CLASS_NORMAL + attack_verb = list("swept", "brushed off", "bludgeoned", "whacked") + resistance_flags = FLAMMABLE + +/obj/item/pushbroom/Initialize() + . = ..() + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + +/obj/item/pushbroom/ComponentInitialize() + . = ..() + AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12, icon_wielded="broom1") + +/obj/item/pushbroom/update_icon_state() + icon_state = "broom0" + ..() + +/// triggered on wield of two handed item +/obj/item/pushbroom/proc/on_wield(obj/item/source, mob/user) + SIGNAL_HANDLER + + to_chat(user, "You brace the [src] against the ground in a firm sweeping stance.") + RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/sweep) + +/// triggered on unwield of two handed item +/obj/item/pushbroom/proc/on_unwield(obj/item/source, mob/user) + SIGNAL_HANDLER + + UnregisterSignal(user, COMSIG_MOVABLE_MOVED) + +/obj/item/pushbroom/afterattack(atom/A, mob/user, proximity) + . = ..() + if(!proximity) + return + if(ISWIELDED(src)) + sweep(user, A, FALSE) + else + to_chat(user, "You need to wield \the [src] in both hands to sweep!") + +/obj/item/pushbroom/proc/sweep(mob/user, atom/A, moving = TRUE) + SIGNAL_HANDLER + + var/turf/target + if (!moving) + if (isturf(A)) + target = A + else + target = get_turf(A) + else + target = get_turf(user) + if (locate(/obj/structure/table) in target.contents) + return + var/i = 0 + var/turf/target_turf = get_step(target, user.dir) + var/obj/machinery/disposal/bin/target_bin = locate(/obj/machinery/disposal/bin) in target_turf.contents + for(var/obj/item/garbage in target.contents) + if(!garbage.anchored) + if (target_bin) + garbage.forceMove(target_bin) + else + garbage.Move(target_turf, user.dir) + i++ + if(i > 19) + break + if(i > 0) + if (target_bin) + target_bin.update_icon() + to_chat(user, "You sweep the pile of garbage into [target_bin].") + playsound(loc, 'sound/weapons/thudswoosh.ogg', 30, TRUE, -1) + +/obj/item/pushbroom/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) //bless you whoever fixes this copypasta + J.put_in_cart(src, user) + J.mybroom=src + J.update_icon() diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 5a2b457ff21f1..5dd0b75e16ea0 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -9,7 +9,8 @@ w_class = WEIGHT_CLASS_TINY light_color = LIGHT_COLOR_FIRE heat = 1000 - var/wax = 1000 + /// How many seconds it burns for + var/wax = 2000 var/lit = FALSE var/infinite = FALSE var/start_lit = FALSE @@ -20,7 +21,7 @@ light() /obj/item/candle/update_icon() - icon_state = "candle[(wax > 400) ? ((wax > 750) ? 1 : 2) : 3][lit ? "_lit" : ""]" + icon_state = "candle[(wax > 800) ? ((wax > 1500) ? 1 : 2) : 3][lit ? "_lit" : ""]" /obj/item/candle/attackby(obj/item/W, mob/user, params) var/msg = W.ignition_effect(src, user) @@ -58,12 +59,12 @@ put_out_candle() return ..() -/obj/item/candle/process() +/obj/item/candle/process(delta_time) if(!lit) return PROCESS_KILL if(!infinite) - wax-- - if(!wax) + wax -= delta_time + if(wax <= 0) new /obj/item/trash/candle(loc) qdel(src) update_icon() diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 7de1e0b876f49..44dad907fd9be 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -185,3 +185,63 @@ /obj/item/cardboard_cutout/adaptive //Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed deceptive = TRUE + +// --- CHESS PIECES --- + +// WHITE + +/obj/item/cardboard_cutout/adaptive/chess + desc = "A large cardboard cutout resembling a chess piece." + +/obj/item/cardboard_cutout/adaptive/chess/king + name = "White King" + icon_state = "cutout_ian"; + +/obj/item/cardboard_cutout/adaptive/chess/queen + name = "White Queen" + icon_state = "cutout_clown"; + +/obj/item/cardboard_cutout/adaptive/chess/rook + name = "White Rook" + icon_state = "cutout_deathsquad"; + +/obj/item/cardboard_cutout/adaptive/chess/knight + name = "White Knight" + icon_state = "cutout_lusty"; + +/obj/item/cardboard_cutout/adaptive/chess/bishop + name = "White Bishop" + icon_state = "cutout_ntsec"; + +/obj/item/cardboard_cutout/adaptive/chess/pawn + name = "White Pawn" + icon_state = "cutout_greytide"; + +// BLACK + +/obj/item/cardboard_cutout/adaptive/chess/black + color = "#9999BB"; + +/obj/item/cardboard_cutout/adaptive/chess/black/king + name = "Black King" + icon_state = "cutout_wizard"; + +/obj/item/cardboard_cutout/adaptive/chess/black/queen + name = "Black Queen" + icon_state = "cutout_traitor"; + +/obj/item/cardboard_cutout/adaptive/chess/black/rook + name = "Black Rook" + icon_state = "cutout_cultist"; + +/obj/item/cardboard_cutout/adaptive/chess/black/knight + name = "Black Knight" + icon_state = "cutout_fukken_xeno"; + +/obj/item/cardboard_cutout/adaptive/chess/black/bishop + name = "Black Bishop" + icon_state = "cutout_fluke"; + +/obj/item/cardboard_cutout/adaptive/chess/black/pawn + name = "Black Pawn" + icon_state = "cutout_shadowling"; \ No newline at end of file diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 98d30612f75b5..0204aa4bb614d 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -111,7 +111,7 @@ lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' slot_flags = ITEM_SLOT_ID - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100, "stamina" = 0) resistance_flags = FIRE_PROOF | ACID_PROOF var/mining_points = 0 //For redeeming at mining equipment vendors var/list/access = list() @@ -466,6 +466,19 @@ update_label("John Doe", "Clowny") assignment = "Syndicate Officer" access = list(ACCESS_SYNDICATE) +/obj/item/card/id/syndicate/debug + name = "\improper Debug ID" + desc = "A shimmering ID card with the ability to open anything." + icon_state = "centcom" + registered_name = "Central Command" + assignment = "Admiral" + anyone = TRUE + +/obj/item/card/id/syndicate/debug/Initialize() + access = get_every_access() + registered_account = SSeconomy.get_dep_account(ACCOUNT_CAR) + . = ..() + /obj/item/card/id/captains_spare name = "captain's spare ID" desc = "The spare ID of the High Lord himself." @@ -548,6 +561,15 @@ update_label("John Doe", "Clowny") access = get_all_accesses() . = ..() +/obj/item/card/id/ert/kudzu + registered_name = "Weed Whacker" + assignment = "Weed Whacker" + icon_state = "ert" + +/obj/item/card/id/ert/kudzu/Initialize() + access = get_all_accesses() + . = ..() + /obj/item/card/id/prisoner name = "prisoner ID card" desc = "You are a number, you are not a free man." @@ -643,11 +665,12 @@ update_label("John Doe", "Clowny") ///Department Budget Cards/// /obj/item/card/id/departmental_budget - name = "departmental card (FUCK)" + name = "departmental card (budget)" desc = "Provides access to the departmental budget." icon_state = "budget" var/department_ID = ACCOUNT_CIV var/department_name = ACCOUNT_CIV_NAME + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF /obj/item/card/id/departmental_budget/Initialize() . = ..() @@ -746,6 +769,9 @@ update_label("John Doe", "Clowny") /obj/item/card/id/job/miner icon_state = "miner" +/obj/item/card/id/job/exploration + icon_state = "exploration" + /obj/item/card/id/job/cargo icon_state = "cargo" @@ -757,3 +783,26 @@ update_label("John Doe", "Clowny") /obj/item/card/id/job/lawyer icon_state = "lawyer" + +/obj/item/card/id/pass + name = "promotion pass" + desc = "A card that, when swiped on your ID card, will grant you all the access. Should not substitute your actual ID card." + icon_state = "data_1" + registered_name = "Unregistered ID" + assignment = "Access Pass" + +/obj/item/card/id/pass/afterattack(atom/target, mob/user, proximity) + . = ..() + if (!proximity) + return . + var/obj/item/card/id/idcard = target + if(istype(idcard)) + for(var/give_access in access) + idcard.access |= give_access + if(assignment!=initial(assignment)) + idcard.assignment = assignment + if(name!=initial(name)) + idcard.name = name + to_chat(user, "You upgrade your [idcard] with the [name].") + log_id("[key_name(user)] added access to '[idcard]' using [src] at [AREACOORD(user)].") + qdel(src) diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm new file mode 100644 index 0000000000000..f060eb90e16c2 --- /dev/null +++ b/code/game/objects/items/chainsaw.dm @@ -0,0 +1,140 @@ + +// CHAINSAW +/obj/item/chainsaw + name = "chainsaw" + desc = "A versatile power tool. Useful for limbing trees and delimbing humans." + icon_state = "chainsaw_off" + lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' + flags_1 = CONDUCT_1 + force = 13 + block_power = 20 + block_upgrade_walk = 2 + block_flags = BLOCKING_ACTIVE | BLOCKING_NASTY + attack_weight = 2 + var/force_on = 24 + w_class = WEIGHT_CLASS_HUGE + throwforce = 13 + throw_speed = 2 + throw_range = 4 + materials = list(/datum/material/iron=13000) + attack_verb = list("sawed", "tore", "cut", "chopped", "diced") + hitsound = "swing_hit" + sharpness = IS_SHARP + actions_types = list(/datum/action/item_action/startchainsaw) + var/on = FALSE + tool_behaviour = TOOL_SAW + toolspeed = 0.5 + +/obj/item/chainsaw/Initialize() + . = ..() + +/obj/item/chainsaw/ComponentInitialize() + . = ..() + AddComponent(/datum/component/butchering, 30, 100, 0, 'sound/weapons/chainsawhit.ogg', TRUE) + AddComponent(/datum/component/two_handed, require_twohands=TRUE, block_power_unwielded=block_power, block_power_wielded=block_power) + +/obj/item/chainsaw/suicide_act(mob/living/carbon/user) + if(on) + user.visible_message("[user] begins to tear [user.p_their()] head off with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(src, 'sound/weapons/chainsawhit.ogg', 100, TRUE) + var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD) + if(myhead) + myhead.dismember() + else + user.visible_message("[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(src, 'sound/weapons/genhit1.ogg', 100, TRUE) + return(BRUTELOSS) + +/obj/item/chainsaw/attack_self(mob/user) + on = !on + to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]") + force = on ? force_on : initial(force) + throwforce = on ? force_on : initial(force) + icon_state = "chainsaw_[on ? "on" : "off"]" + var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering) + butchering.butchering_enabled = on + + if(on) + hitsound = 'sound/weapons/chainsawhit.ogg' + else + hitsound = "swing_hit" + + if(src == user.get_active_held_item()) //update inhands + user.update_inv_hands() + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + +// DOOMGUY CHAINSAW +/obj/item/chainsaw/doomslayer + name = "THE GREAT COMMUNICATOR" + desc = "VRRRRRRR!!!" + armour_penetration = 100 + force_on = 30 + +/obj/item/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(attack_type == PROJECTILE_ATTACK) + owner.visible_message("Ranged attacks just make [owner] angrier!") + playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE) + return 1 + return 0 + +// ENERGY CHAINSAW +/obj/item/chainsaw/energy + name = "energy chainsaw" + desc = "Become Leatherspace." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "echainsaw_off" + lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' + force_on = 40 + w_class = WEIGHT_CLASS_HUGE + attack_verb = list("sawed", "shred", "rended", "gutted", "eviscerated") + actions_types = list(/datum/action/item_action/startchainsaw) + block_power = 50 + armour_penetration = 50 + light_color = "#ff0000" + var/onsound + var/offsound + onsound = 'sound/weapons/echainsawon.ogg' + offsound = 'sound/weapons/echainsawoff.ogg' + on = FALSE + var/brightness_on = 3 + +/obj/item/chainsaw/energy/attack_self(mob/user) + on = !on + to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr intimidatingly." : "the plasma microblades stop moving."]") + force = on ? force_on : initial(force) + playsound(user, on ? onsound : offsound , 50, 1) + set_light(on ? brightness_on : 0) + throwforce = on ? force_on : initial(force) + icon_state = "echainsaw_[on ? "on" : "off"]" + + if(hitsound == "swing_hit") + hitsound = pick('sound/weapons/echainsawhit1.ogg','sound/weapons/echainsawhit2.ogg') + else + hitsound = "swing_hit" + + if(src == user.get_active_held_item()) + user.update_inv_hands() + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + +// DOOMGUY ENERGY CHAINSAW +/obj/item/chainsaw/energy/doom + name = "super energy chainsaw" + desc = "The chainsaw you want when you need to kill every damn thing in the room." + force_on = 60 + w_class = WEIGHT_CLASS_NORMAL + block_power = 75 + block_level = 1 + attack_weight = 3 //fear him + armour_penetration = 75 + var/knockdown = 1 + brightness_on = 6 + +/obj/item/chainsaw/energy/doom/attack(mob/living/target) + ..() + target.Knockdown(4) \ No newline at end of file diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 337092108e52f..ecbb9cafa15d7 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -100,7 +100,7 @@ /obj/item/station_charter/flag - name = "nanotrasen banner" + name = "\improper Nanotrasen banner" icon = 'icons/obj/banner.dmi' name_type = "planet" icon_state = "banner" diff --git a/code/game/objects/items/chromosome.dm b/code/game/objects/items/chromosome.dm index 1340e7f35b44c..8330a8e202349 100644 --- a/code/game/objects/items/chromosome.dm +++ b/code/game/objects/items/chromosome.dm @@ -53,32 +53,32 @@ /obj/item/chromosome/stabilizer name = "stabilizer chromosome" - desc = "A chromosome that adjusts to the body to reduce genetic damage by 20%." + desc = "A chromosome that reduces mutation instability by 20%." icon_state = "stabilizer" stabilizer_coeff = 0.8 weight = 1 /obj/item/chromosome/synchronizer name = "synchronizer chromosome" - desc = "A chromosome that gives the mind more controle over the mutation, reducing knockback and downsides by 50%." + desc = "A chromosome that reduces mutation knockback and downsides by 50%." icon_state = "synchronizer" synchronizer_coeff = 0.5 /obj/item/chromosome/power name = "power chromosome" - desc = "A power chromosome for boosting certain mutation's power by 50%." + desc = "A chromosome that increases mutation power by 50%." icon_state = "power" power_coeff = 1.5 /obj/item/chromosome/energy name = "energetic chromosome" - desc = "A chromosome that reduces cooldown on action based mutations by 50%." + desc = "A chromosome that reduces action based mutation cooldowns by by 50%." icon_state = "energy" energy_coeff = 0.5 /obj/item/chromosome/reinforcer name = "reinforcement chromosome" - desc = "Renders the mutation immune to mutadone." + desc = "A chromosome that renders mutations immune to mutadone." icon_state = "reinforcer" weight = 3 diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index 04caab6593d6a..154215e098086 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/code/game/objects/items/chrono_eraser.dm @@ -38,7 +38,7 @@ user.put_in_hands(PA) /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user) - if(slot == SLOT_BACK) + if(slot == ITEM_SLOT_BACK) return 1 /obj/item/gun/energy/chrono_gun @@ -133,6 +133,10 @@ if(istype(C)) gun = C.gun +/obj/item/projectile/energy/chrono_beam/Destroy() + gun = null + return ..() + /obj/item/projectile/energy/chrono_beam/on_hit(atom/target) if(target && gun && isliving(target)) var/obj/structure/chrono_field/F = new(target.loc, target, gun) @@ -151,7 +155,9 @@ gun = loc . = ..() - +/obj/item/ammo_casing/energy/chrono_beam/Destroy() + gun = null + return ..() @@ -167,7 +173,7 @@ interaction_flags_atom = NONE var/mob/living/captured = null var/obj/item/gun/energy/chrono_gun/gun = null - var/tickstokill = 15 + var/timetokill = 30 var/mutable_appearance/mob_underlay var/preloaded = 0 var/RPpos = null @@ -198,7 +204,7 @@ return ..() /obj/structure/chrono_field/update_icon() - var/ttk_frame = 1 - (tickstokill / initial(tickstokill)) + var/ttk_frame = 1 - (timetokill / initial(timetokill)) ttk_frame = CLAMP(CEILING(ttk_frame * CHRONO_FRAME_COUNT, 1), 1, CHRONO_FRAME_COUNT) if(ttk_frame != RPpos) RPpos = ttk_frame @@ -206,15 +212,15 @@ underlays = list() //hack: BYOND refuses to update the underlay to match the icon_state otherwise underlays += mob_underlay -/obj/structure/chrono_field/process() +/obj/structure/chrono_field/process(delta_time) if(captured) - if(tickstokill > initial(tickstokill)) + if(timetokill > initial(timetokill)) for(var/atom/movable/AM in contents) AM.forceMove(drop_location()) qdel(src) - else if(tickstokill <= 0) + else if(timetokill <= 0) to_chat(captured, "As the last essence of your being is erased from time, you are taken back to your most enjoyable memory. You feel happy...") - var/mob/dead/observer/ghost = captured.ghostize(1) + var/mob/dead/observer/ghost = captured.ghostize(TRUE,SENTIENCE_ERASE) if(captured.mind) if(ghost) ghost.mind = null @@ -229,12 +235,12 @@ update_icon() if(gun) if(gun.field_check(src)) - tickstokill-- + timetokill -= delta_time else gun = null return .() else - tickstokill++ + timetokill += delta_time else qdel(src) @@ -248,12 +254,18 @@ return BULLET_ACT_HIT /obj/structure/chrono_field/assume_air() - return 0 + return null + +/obj/effect/chrono_field/assume_air_moles() + return null + +/obj/effect/chrono_field/assume_air_ratio() + return null /obj/structure/chrono_field/return_air() //we always have nominal air and temperature var/datum/gas_mixture/GM = new - GM.set_moles(/datum/gas/oxygen, MOLES_O2STANDARD) - GM.set_moles(/datum/gas/nitrogen, MOLES_N2STANDARD) + GM.set_moles(GAS_O2, MOLES_O2STANDARD) + GM.set_moles(GAS_N2, MOLES_N2STANDARD) GM.set_temperature(T20C) return GM diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 62b63fdaa4fca..1e29de9537a4f 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -22,14 +22,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "match_unlit" var/lit = FALSE var/burnt = FALSE - var/smoketime = 5 // 10 seconds + /// How long the match lasts in seconds + var/smoketime = 10 w_class = WEIGHT_CLASS_TINY heat = 1000 grind_results = list(/datum/reagent/phosphorus = 2) -/obj/item/match/process() - smoketime-- - if(smoketime < 1) +/obj/item/match/process(delta_time) + smoketime -= delta_time + if(smoketime <= 0) matchburnout() else open_flame(heat) @@ -90,7 +91,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ..() /obj/item/proc/help_light_cig(mob/living/M) - var/mask_item = M.get_item_by_slot(SLOT_WEAR_MASK) + var/mask_item = M.get_item_by_slot(ITEM_SLOT_MASK) if(istype(mask_item, /obj/item/clothing/mask/cigarette)) return mask_item @@ -100,7 +101,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/match/firebrand name = "firebrand" desc = "An unlit firebrand. It makes you wonder why it's not just called a stick." - smoketime = 20 //40 seconds + smoketime = 40 grind_results = list(/datum/reagent/carbon = 2) /obj/item/match/firebrand/Initialize() @@ -120,7 +121,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM body_parts_covered = null grind_results = list() heat = 1000 - var/dragtime = 100 + var/dragtime = 10 var/nextdragtime = 0 var/lit = FALSE var/starts_lit = FALSE @@ -128,7 +129,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/icon_off = "cigoff" var/type_butt = /obj/item/cigbutt var/lastHolder = null - var/smoketime = 180 // 1 is 2 seconds, so a single cigarette will last 6 minutes. + /// How long the cigarette lasts in seconds + var/smoketime = 360 var/chem_volume = 30 var/smoke_all = FALSE /// Should we smoke all of the chems in the cig before it runs out. Splits each puff to take a portion of the overall chems so by the end you'll always have consumed all of the chems inside. var/list/list_reagents = list(/datum/reagent/drug/nicotine = 15) @@ -144,7 +146,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM reagents.add_reagent_list(list_reagents) if(starts_lit) light() - AddComponent(/datum/component/knockoff,90,list(BODY_ZONE_PRECISE_MOUTH),list(SLOT_WEAR_MASK))//90% to knock off when wearing a mask + AddComponent(/datum/component/knockoff,90,list(BODY_ZONE_PRECISE_MOUTH),list(ITEM_SLOT_MASK))//90% to knock off when wearing a mask /obj/item/clothing/mask/cigarette/Destroy() STOP_PROCESSING(SSobj, src) @@ -247,7 +249,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM * of chems to give them each time so they'll have smoked it all by the end */ if (smoke_all) - to_smoke = reagents.total_volume/((smoketime * 2) / (dragtime / 10)) + to_smoke = reagents.total_volume / (smoketime / dragtime) reagents.reaction(C, INGEST, fraction) if(!reagents.trans_to(C, to_smoke)) @@ -255,13 +257,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM return reagents.remove_any(to_smoke) -/obj/item/clothing/mask/cigarette/process() +/obj/item/clothing/mask/cigarette/process(delta_time) var/turf/location = get_turf(src) var/mob/living/M = loc if(isliving(loc)) M.IgniteMob() - smoketime-- - if(smoketime < 1) + smoketime -= delta_time + if(smoketime <= 0) new type_butt(location) if(ismob(loc)) to_chat(M, "Your [name] goes out.") @@ -270,7 +272,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return open_flame() if((reagents && reagents.total_volume) && (nextdragtime <= world.time)) - nextdragtime = world.time + dragtime + nextdragtime = world.time + dragtime SECONDS handle_reagents() /obj/item/clothing/mask/cigarette/attack_self(mob/user) @@ -326,14 +328,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/carp desc = "A Carp Classic brand cigarette." - + /obj/item/clothing/mask/cigarette/plasma - list_reagents = list(/datum/reagent/toxin/plasma = 5) + list_reagents = list(/datum/reagent/toxin/plasma = 5) /obj/item/clothing/mask/cigarette/syndicate desc = "An unknown brand cigarette." chem_volume = 60 - smoketime = 60 + smoketime = 2 * 60 smoke_all = TRUE list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/medicine/omnizine = 15) @@ -356,7 +358,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM type_butt = /obj/item/cigbutt/roach throw_speed = 0.5 item_state = "spliffoff" - smoketime = 120 // four minutes + smoketime = 4 * 60 chem_volume = 50 list_reagents = null @@ -401,7 +403,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM type_butt = /obj/item/cigbutt/cigarbutt throw_speed = 0.5 item_state = "cigaroff" - smoketime = 300 // 11 minutes + smoketime = 11 * 60 chem_volume = 40 list_reagents = list(/datum/reagent/drug/nicotine = 25) @@ -411,7 +413,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "cigar2off" icon_on = "cigar2on" icon_off = "cigar2off" - smoketime = 600 // 20 minutes + smoketime = 20 * 60 chem_volume = 80 list_reagents =list(/datum/reagent/drug/nicotine = 40) @@ -421,7 +423,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "cigar2off" icon_on = "cigar2on" icon_off = "cigar2off" - smoketime = 900 // 30 minutes + smoketime = 30 * 60 chem_volume = 50 list_reagents =list(/datum/reagent/drug/nicotine = 15) @@ -462,10 +464,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/clothing/mask/cigarette/pipe/process() +/obj/item/clothing/mask/cigarette/pipe/process(delta_time) var/turf/location = get_turf(src) - smoketime-- - if(smoketime < 1) + smoketime -= delta_time + if(smoketime <= 0) new /obj/effect/decal/cleanable/ash(location) if(ismob(loc)) var/mob/living/M = loc @@ -489,8 +491,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!packeditem) if(G.dry == 1) to_chat(user, "You stuff [O] into [src].") - smoketime = 400 - packeditem = 1 + smoketime = 13 * 60 + packeditem = TRUE name = "[O.name]-packed [initial(name)]" if(O.reagents) O.reagents.trans_to(src, O.reagents.total_volume, transfered_by = user) @@ -775,8 +777,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM w_class = WEIGHT_CLASS_TINY var/chem_volume = 100 var/vapetime = 0 //this so it won't puff out clouds every tick - var/screw = 0 // kinky - var/super = 0 //for the fattest vapes dude. + /// How often we take a drag in seconds + var/vapedelay = 8 + var/screw = FALSE // kinky + var/super = FALSE //for the fattest vapes dude. /obj/item/clothing/mask/vape/suicide_act(mob/user) user.visible_message("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!")//it doesn't give you cancer, it is cancer @@ -852,7 +856,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM reagents.clear_reagents() /obj/item/clothing/mask/vape/equipped(mob/user, slot) - if(slot == SLOT_WEAR_MASK) + if(slot == ITEM_SLOT_MASK) if(!screw) to_chat(user, "You start puffing on the vape.") DISABLE_BITFIELD(reagents.flags, NO_REACT) @@ -861,8 +865,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_chat(user, "You need to close the cap first!") /obj/item/clothing/mask/vape/dropped(mob/user) - var/mob/living/carbon/C = user - if(C.get_item_by_slot(SLOT_WEAR_MASK) == src) + if(user.get_item_by_slot(ITEM_SLOT_MASK) == src) ENABLE_BITFIELD(reagents.flags, NO_REACT) STOP_PROCESSING(SSobj, src) @@ -888,13 +891,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM return reagents.remove_any(REAGENTS_METABOLISM) -/obj/item/clothing/mask/vape/process() +/obj/item/clothing/mask/vape/process(delta_time) var/mob/living/M = loc if(isliving(loc)) M.IgniteMob() - vapetime++ + vapetime += delta_time if(!reagents.total_volume) if(ismob(loc)) @@ -904,17 +907,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM return //open flame removed because vapes are a closed system, they wont light anything on fire - if(super && vapetime > 3)//Time to start puffing those fat vapes, yo. + if(super && vapetime >= vapedelay)//Time to start puffing those fat vapes, yo. var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new s.set_up(reagents, 1, 24, loc) s.start() - vapetime = 0 + vapetime -= vapedelay - if((obj_flags & EMAGGED) && vapetime > 3) + if((obj_flags & EMAGGED) && vapetime >= vapedelay) var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new s.set_up(reagents, 4, 24, loc) s.start() - vapetime = 0 + vapetime -= vapedelay if(prob(5))//small chance for the vape to break and deal damage if it's emagged playsound(get_turf(src), 'sound/effects/pop_expl.ogg', 50, 0) M.apply_damage(20, BURN, BODY_ZONE_HEAD) diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index e4c7c58a64ca6..a7282e9e2928e 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -2,32 +2,32 @@ /obj/item/circuitboard/computer/aiupload - name = "AI Upload (Computer Board)" + name = "AI upload (Computer Board)" icon_state = "command" build_path = /obj/machinery/computer/upload/ai /obj/item/circuitboard/computer/borgupload - name = "Cyborg Upload (Computer Board)" + name = "cyborg upload (Computer Board)" icon_state = "command" build_path = /obj/machinery/computer/upload/borg /obj/item/circuitboard/computer/bsa_control - name = "Bluespace Artillery Controls (Computer Board)" + name = "bluespace artillery controls (Computer Board)" icon_state = "command" build_path = /obj/machinery/computer/bsa_control /obj/item/circuitboard/computer/card - name = "ID Console (Computer Board)" + name = "ID console (Computer Board)" icon_state = "command" build_path = /obj/machinery/computer/card /obj/item/circuitboard/computer/card/centcom - name = "CentCom ID Console (Computer Board)" + name = "CentCom ID console (Computer Board)" icon_state = "command" build_path = /obj/machinery/computer/card/centcom /obj/item/circuitboard/computer/card/minor - name = "Department Management Console (Computer Board)" + name = "department management console (Computer Board)" icon_state = "command" build_path = /obj/machinery/computer/card/minor var/target_dept = 1 @@ -45,10 +45,24 @@ . += "Currently set to \"[dept_list[target_dept]]\"." /obj/item/circuitboard/computer/communications - name = "Communications (Computer Board)" + name = "communications console (Computer Board)" icon_state = "command" + desc = "Can be modified using a screwdriver." build_path = /obj/machinery/computer/communications var/lastTimeUsed = 0 + var/insecure = FALSE // Forbids shuttles that are set as illegal. + +/obj/item/circuitboard/computer/communications/attackby(obj/item/I, mob/user, params) + if(I.tool_behaviour == TOOL_SCREWDRIVER) + insecure = !insecure + if(insecure) + desc = "Tampering has removed some safety features from this circuit board. A screwdriver can undo this." + to_chat(user, "You disable the shuttle safety features of the board.") + else + desc = "Can be modified using a screwdriver." + to_chat(user, "You re-enable the shuttle safety features of the board.") + else + return ..() //obj/item/circuitboard/computer/shield // name = "Shield Control (Computer Board)" @@ -59,117 +73,117 @@ /obj/item/circuitboard/computer/apc_control - name = "\improper Power Flow Control Console (Computer Board)" + name = "power flow control console (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/apc_control /obj/item/circuitboard/computer/atmos_alert - name = "Atmospheric Alert (Computer Board)" + name = "atmospheric alert console (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/atmos_alert /obj/item/circuitboard/computer/atmos_control - name = "Atmospheric Monitor (Computer Board)" + name = "atmospheric monitor console (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/atmos_control /obj/item/circuitboard/computer/atmos_control/tank - name = "Tank Control (Computer Board)" + name = "tank control console (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank /obj/item/circuitboard/computer/atmos_control/tank/oxygen_tank - name = "Oxygen Supply Control (Computer Board)" + name = "oxygen supply control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/oxygen_tank /obj/item/circuitboard/computer/atmos_control/tank/toxin_tank - name = "Plasma Supply Control (Computer Board)" + name = "plasma supply control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/toxin_tank /obj/item/circuitboard/computer/atmos_control/tank/air_tank - name = "Mixed Air Supply Control (Computer Board)" + name = "mixed air supply control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/air_tank /obj/item/circuitboard/computer/atmos_control/tank/mix_tank - name = "Gas Mix Supply Control (Computer Board)" + name = "gas mix supply control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/mix_tank /obj/item/circuitboard/computer/atmos_control/tank/nitrous_tank - name = "Nitrous Oxide Supply Control (Computer Board)" + name = "nitrous oxide supply control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/nitrous_tank /obj/item/circuitboard/computer/atmos_control/tank/nitrogen_tank - name = "Nitrogen Supply Control (Computer Board)" + name = "nitrogen supply control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/nitrogen_tank /obj/item/circuitboard/computer/atmos_control/tank/carbon_tank - name = "Carbon Dioxide Supply Control (Computer Board)" + name = "carbon dioxide supply control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/carbon_tank /obj/item/circuitboard/computer/atmos_control/tank/incinerator - name = "Incinerator Air Control (Computer Board)" + name = "incinerator air control (Computer Board)" build_path = /obj/machinery/computer/atmos_control/tank/incinerator /obj/item/circuitboard/computer/auxillary_base - name = "Auxillary Base Management Console (Computer Board)" + name = "auxillary base management console (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/auxillary_base /obj/item/circuitboard/computer/base_construction - name = "circuit board (Aux Mining Base Construction Console)" + name = "aux mining base construction console (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/camera_advanced/base_construction /obj/item/circuitboard/computer/comm_monitor - name = "Telecommunications Monitor (Computer Board)" + name = "telecommunications monitor (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/telecomms/monitor /obj/item/circuitboard/computer/comm_server - name = "Telecommunications Server Monitor (Computer Board)" + name = "telecommunications server monitor (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/telecomms/server /obj/item/circuitboard/computer/message_monitor - name = "Message Monitor (Computer Board)" + name = "message monitor (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/message_monitor /obj/item/circuitboard/computer/powermonitor - name = "Power Monitor (Computer Board)" //name fixed 250810 + name = "power monitor (Computer Board)" //name fixed 250810 icon_state = "engineering" build_path = /obj/machinery/computer/monitor /obj/item/circuitboard/computer/powermonitor/secret - name = "Outdated Power Monitor (Computer Board)" //Variant used on ruins to prevent them from showing up on PDA's. + name = "outdated power monitor (Computer Board)" //Variant used on ruins to prevent them from showing up on PDA's. build_path = /obj/machinery/computer/monitor/secret /obj/item/circuitboard/computer/sat_control - name = "Satellite Network Control (Computer Board)" + name = "satellite network control (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/sat_control /obj/item/circuitboard/computer/solar_control - name = "Solar Control (Computer Board)" //name fixed 250810 + name = "solar control (Computer Board)" //name fixed 250810 icon_state = "engineering" build_path = /obj/machinery/power/solar_control /obj/item/circuitboard/computer/stationalert - name = "Station Alerts (Computer Board)" + name = "station alerts console (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/station_alert /obj/item/circuitboard/computer/teleporter - name = "Teleporter (Computer Board)" + name = "teleporter console (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/teleporter /obj/item/circuitboard/computer/turbine_computer - name = "Turbine Computer (Computer Board)" + name = "turbine computer (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/turbine_computer /obj/item/circuitboard/computer/turbine_control - name = "Turbine control (Computer Board)" + name = "turbine control (Computer Board)" icon_state = "engineering" build_path = /obj/machinery/computer/turbine_computer @@ -178,7 +192,7 @@ /obj/item/circuitboard/computer/advanced_camera - name = "Advanced Camera Console (Computer Board)" + name = "advanced camera console (Computer Board)" icon_state = "generic" build_path = /obj/machinery/computer/camera_advanced/syndie @@ -188,7 +202,7 @@ build_path = /obj/machinery/computer/arcade/amputation /obj/item/circuitboard/computer/arcade/battle - name = "Arcade Battle (Computer Board)" + name = "arcade battle (Computer Board)" icon_state = "generic" build_path = /obj/machinery/computer/arcade/battle @@ -198,12 +212,12 @@ build_path = /obj/machinery/computer/arcade/orion_trail /obj/item/circuitboard/computer/holodeck// Not going to let people get this, but it's just here for future - name = "Holodeck Control (Computer Board)" + name = "holodeck control (Computer Board)" icon_state = "generic" build_path = /obj/machinery/computer/holodeck /obj/item/circuitboard/computer/libraryconsole - name = "Library Visitor Console (Computer Board)" + name = "library visitor console (Computer Board)" icon_state = "generic" build_path = /obj/machinery/computer/libraryconsole @@ -221,9 +235,9 @@ return ..() /obj/item/circuitboard/computer/monastery_shuttle - name = "Monastery Shuttle (Computer Board)" + name = "monastery shuttle console (Computer Board)" icon_state = "generic" - build_path = /obj/machinery/computer/shuttle/monastery_shuttle + build_path = /obj/machinery/computer/shuttle_flight/monastery_shuttle /obj/item/circuitboard/computer/olddoor name = "DoorMex (Computer Board)" @@ -231,12 +245,12 @@ build_path = /obj/machinery/computer/pod/old /obj/item/circuitboard/computer/pod - name = "Massdriver control (Computer Board)" + name = "mass driver launch control (Computer Board)" icon_state = "generic" build_path = /obj/machinery/computer/pod /obj/item/circuitboard/computer/slot_machine - name = "Slot Machine (Computer Board)" + name = "slot machine (Computer Board)" icon_state = "generic" build_path = /obj/machinery/computer/slot_machine @@ -246,9 +260,9 @@ build_path = /obj/machinery/computer/pod/old/swf /obj/item/circuitboard/computer/syndicate_shuttle - name = "Syndicate Shuttle (Computer Board)" + name = "syndicate shuttle console (Computer Board)" icon_state = "generic" - build_path = /obj/machinery/computer/shuttle/syndicate + build_path = /obj/machinery/computer/shuttle_flight/syndicate var/challenge = FALSE var/moved = FALSE @@ -266,48 +280,43 @@ build_path = /obj/machinery/computer/pod/old/syndicate /obj/item/circuitboard/computer/white_ship - name = "White Ship (Computer Board)" + name = "white ship control (Computer Board)" icon_state = "generic" - build_path = /obj/machinery/computer/shuttle/white_ship + build_path = /obj/machinery/computer/shuttle_flight/white_ship /obj/item/circuitboard/computer/white_ship/pod - name = "Salvage Pod (Computer Board)" - build_path = /obj/machinery/computer/shuttle/white_ship/pod + name = "salvage pod control (Computer Board)" + build_path = /obj/machinery/computer/shuttle_flight/white_ship/pod /obj/item/circuitboard/computer/white_ship/pod/recall - name = "Salvage Pod Recall (Computer Board)" - build_path = /obj/machinery/computer/shuttle/white_ship/pod/recall + name = "salvage pod recall control (Computer Board)" + build_path = /obj/machinery/computer/shuttle_flight/white_ship/pod/recall /obj/item/circuitboard/computer/shuttle/flight_control - name = "Shuttle Flight Control (Computer Board)" + name = "shuttle flight control (Computer Board)" icon_state = "generic" - build_path = /obj/machinery/computer/custom_shuttle - -/obj/item/circuitboard/computer/shuttle/docker - name = "Shuttle Navigation Computer (Computer Board)" - icon_state = "generic" - build_path = /obj/machinery/computer/camera_advanced/shuttle_docker/custom - + build_path = /obj/machinery/computer/shuttle_flight/custom_shuttle //Medical /obj/item/circuitboard/computer/cloning - name = "Cloning (Computer Board)" + name = "cloning console (Computer Board)" icon_state = "medical" build_path = /obj/machinery/computer/cloning + var/list/records = list() /obj/item/circuitboard/computer/crew - name = "Crew Monitoring Console (Computer Board)" + name = "crew monitoring console (Computer Board)" icon_state = "medical" build_path = /obj/machinery/computer/crew /obj/item/circuitboard/computer/med_data - name = "Medical Records Console (Computer Board)" + name = "medical records console (Computer Board)" icon_state = "medical" build_path = /obj/machinery/computer/med_data /obj/item/circuitboard/computer/operating - name = "Operating Computer (Computer Board)" + name = "operating computer (Computer Board)" icon_state = "medical" build_path = /obj/machinery/computer/operating @@ -316,13 +325,13 @@ icon_state = "medical" build_path = /obj/machinery/computer/pandemic -/obj/item/circuitboard/computer/prototype_cloning - name = "Prototype Cloning (Computer Board)" +/obj/item/circuitboard/computer/cloning/prototype + name = "prototype cloning console (Computer Board)" icon_state = "medical" - build_path = /obj/machinery/computer/prototype_cloning + build_path = /obj/machinery/computer/cloning/prototype /obj/item/circuitboard/computer/scan_consolenew - name = "DNA Machine (Computer Board)" + name = "DNA machine (Computer Board)" icon_state = "medical" build_path = /obj/machinery/computer/scan_consolenew @@ -331,42 +340,42 @@ /obj/item/circuitboard/computer/aifixer - name = "AI Integrity Restorer (Computer Board)" + name = "AI integrity restorer console (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/aifixer /obj/item/circuitboard/computer/launchpad_console - name = "Launchpad Control Console (Computer Board)" + name = "launchpad control console (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/launchpad /obj/item/circuitboard/computer/mech_bay_power_console - name = "Mech Bay Power Control Console (Computer Board)" + name = "mech bay power control console (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/mech_bay_power_console /obj/item/circuitboard/computer/mecha_control - name = "Exosuit Control Console (Computer Board)" + name = "exosuit control console (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/mecha /obj/item/circuitboard/computer/nanite_chamber_control - name = "Nanite Chamber Control (Computer Board)" + name = "nanite chamber control (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/nanite_chamber_control /obj/item/circuitboard/computer/nanite_cloud_controller - name = "Nanite Cloud Control (Computer Board)" + name = "nanite cloud control (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/nanite_cloud_controller /obj/item/circuitboard/computer/rdconsole - name = "R&D Console (Computer Board)" + name = "R&D console (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/rdconsole/core /obj/item/circuitboard/computer/rdconsole/production - name = "R&D Console Production Only (Computer Board)" + name = "R&D console - production only (Computer Board)" build_path = /obj/machinery/computer/rdconsole/production /obj/item/circuitboard/computer/rdconsole/attackby(obj/item/I, mob/user, params) @@ -383,22 +392,22 @@ return ..() /obj/item/circuitboard/computer/rdservercontrol - name = "R&D Server Control (Computer Board)" + name = "R&D server control (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/rdservercontrol /obj/item/circuitboard/computer/research - name = "Research Monitor (Computer Board)" + name = "research monitor (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/security/research /obj/item/circuitboard/computer/robotics - name = "Robotics Control (Computer Board)" + name = "robotics control (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/robotics /obj/item/circuitboard/computer/xenobiology - name = "circuit board (Xenobiology Console)" + name = "xenobiology console (Computer Board)" icon_state = "science" build_path = /obj/machinery/computer/camera_advanced/xenobio @@ -407,36 +416,36 @@ /obj/item/circuitboard/computer/labor_shuttle - name = "Labor Shuttle (Computer Board)" + name = "labor shuttle console (Computer Board)" icon_state = "security" - build_path = /obj/machinery/computer/shuttle/labor + build_path = /obj/machinery/computer/shuttle_flight/labor /obj/item/circuitboard/computer/labor_shuttle/one_way - name = "Prisoner Shuttle Console (Computer Board)" - build_path = /obj/machinery/computer/shuttle/labor/one_way + name = "prisoner shuttle console (Computer Board)" + build_path = /obj/machinery/computer/shuttle_flight/labor/one_way /obj/item/circuitboard/computer/gulag_teleporter_console - name = "Labor Camp teleporter console (Computer Board)" + name = "labor camp teleporter console (Computer Board)" icon_state = "security" build_path = /obj/machinery/computer/prisoner/gulag_teleporter_computer /obj/item/circuitboard/computer/prisoner - name = "Prisoner Management Console (Computer Board)" + name = "prisoner management console (Computer Board)" icon_state = "security" build_path = /obj/machinery/computer/prisoner /obj/item/circuitboard/computer/secure_data - name = "Security Records Console (Computer Board)" + name = "security records console (Computer Board)" icon_state = "security" build_path = /obj/machinery/computer/secure_data /obj/item/circuitboard/computer/security - name = "Security Cameras (Computer Board)" + name = "security camera console (Computer Board)" icon_state = "security" build_path = /obj/machinery/computer/security /obj/item/circuitboard/computer/warrant - name = "Security Warrant Viewer (Computer Board)" + name = "security warrant console (Computer Board)" icon_state = "security" build_path = /obj/machinery/computer/warrant @@ -445,14 +454,18 @@ //Supply +/obj/item/circuitboard/computer/objective + name = "Nanotrasen objective console (Computer Board)" + icon_state = "supply" + build_path = /obj/machinery/computer/objective /obj/item/circuitboard/computer/bounty - name = "Nanotrasen Bounty Console (Computer Board)" + name = "Nanotrasen bounty console (Computer Board)" icon_state = "supply" build_path = /obj/machinery/computer/bounty /obj/item/circuitboard/computer/cargo - name = "Supply Console (Computer Board)" + name = "supply console (Computer Board)" icon_state = "supply" build_path = /obj/machinery/computer/cargo var/contraband = FALSE @@ -471,7 +484,7 @@ to_chat(user, "You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.") /obj/item/circuitboard/computer/cargo/express - name = "Express Supply Console (Computer Board)" + name = "express supply console (Computer Board)" icon_state = "supply" build_path = /obj/machinery/computer/cargo/express @@ -487,29 +500,33 @@ obj_flags |= EMAGGED /obj/item/circuitboard/computer/cargo/request - name = "Supply Request Console (Computer Board)" + name = "supply request console (Computer Board)" icon_state = "supply" build_path = /obj/machinery/computer/cargo/request /obj/item/circuitboard/computer/ferry - name = "Transport Ferry (Computer Board)" + name = "transport ferry control (Computer Board)" icon_state = "supply" - build_path = /obj/machinery/computer/shuttle/ferry + build_path = /obj/machinery/computer/shuttle_flight/ferry /obj/item/circuitboard/computer/ferry/request - name = "Transport Ferry Console (Computer Board)" - build_path = /obj/machinery/computer/shuttle/ferry/request + name = "transport ferry console (Computer Board)" + build_path = /obj/machinery/computer/shuttle_flight/ferry/request /obj/item/circuitboard/computer/mining - name = "Outpost Status Display (Computer Board)" + name = "outpost status display (Computer Board)" icon_state = "supply" build_path = /obj/machinery/computer/security/mining /obj/item/circuitboard/computer/mining_shuttle - name = "Mining Shuttle (Computer Board)" + name = "mining shuttle console (Computer Board)" icon_state = "supply" - build_path = /obj/machinery/computer/shuttle/mining + build_path = /obj/machinery/computer/shuttle_flight/mining /obj/item/circuitboard/computer/science_shuttle - name = "Science Shuttle (Computer Board)" - build_path = /obj/machinery/computer/shuttle/science + name = "science shuttle console (Computer Board)" + build_path = /obj/machinery/computer/shuttle_flight/science + +/obj/item/circuitboard/computer/exploration_shuttle + name = "exploration shuttle console (Computer Board)" + build_path = /obj/machinery/computer/shuttle_flight/custom_shuttle/exploration diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 9cef0bf3ed95f..7f4049fbad308 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -2,7 +2,7 @@ /obj/item/circuitboard/machine/bsa/back - name = "Bluespace Artillery Generator (Machine Board)" + name = "bluespace artillery generator (Machine Board)" icon_state = "command" build_path = /obj/machinery/bsa/back //No freebies! req_components = list( @@ -10,7 +10,7 @@ /obj/item/stack/cable_coil = 2) /obj/item/circuitboard/machine/bsa/middle - name = "Bluespace Artillery Fusor (Machine Board)" + name = "bluespace artillery fusor (Machine Board)" icon_state = "command" build_path = /obj/machinery/bsa/middle req_components = list( @@ -18,7 +18,7 @@ /obj/item/stack/cable_coil = 2) /obj/item/circuitboard/machine/bsa/front - name = "Bluespace Artillery Bore (Machine Board)" + name = "bluespace artillery bore (Machine Board)" icon_state = "command" build_path = /obj/machinery/bsa/front req_components = list( @@ -26,7 +26,7 @@ /obj/item/stack/cable_coil = 2) /obj/item/circuitboard/machine/dna_vault - name = "DNA Vault (Machine Board)" + name = "DNA vault (Machine Board)" icon_state = "command" build_path = /obj/machinery/dna_vault //No freebies! req_components = list( @@ -39,7 +39,7 @@ /obj/item/circuitboard/machine/announcement_system - name = "Announcement System (Machine Board)" + name = "announcement system (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/announcement_system req_components = list( @@ -47,23 +47,23 @@ /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/autolathe - name = "Autolathe (Machine Board)" + name = "autolathe (Machine Board)" icon_state = "engineering" - build_path = /obj/machinery/autolathe + build_path = /obj/machinery/modular_fabricator/autolathe req_components = list( /obj/item/stock_parts/matter_bin = 3, /obj/item/stock_parts/manipulator = 1, /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/grounding_rod - name = "Grounding Rod (Machine Board)" + name = "grounding rod (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/power/grounding_rod req_components = list(/obj/item/stock_parts/capacitor = 1) needs_anchored = FALSE /obj/item/circuitboard/machine/telecomms/broadcaster - name = "Subspace Broadcaster (Machine Board)" + name = "subspace broadcaster (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/telecomms/broadcaster req_components = list( @@ -74,7 +74,7 @@ /obj/item/stock_parts/micro_laser = 2) /obj/item/circuitboard/machine/telecomms/bus - name = "Bus Mainframe (Machine Board)" + name = "bus mainframe (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/telecomms/bus req_components = list( @@ -83,7 +83,7 @@ /obj/item/stock_parts/subspace/filter = 1) /obj/item/circuitboard/machine/telecomms/hub - name = "Hub Mainframe (Machine Board)" + name = "hub mainframe (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/telecomms/hub req_components = list( @@ -92,7 +92,7 @@ /obj/item/stock_parts/subspace/filter = 2) /obj/item/circuitboard/machine/telecomms/processor - name = "Processor Unit (Machine Board)" + name = "processor unit (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/telecomms/processor req_components = list( @@ -104,7 +104,7 @@ /obj/item/stock_parts/subspace/amplifier = 1) /obj/item/circuitboard/machine/telecomms/receiver - name = "Subspace Receiver (Machine Board)" + name = "subspace receiver (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/telecomms/receiver req_components = list( @@ -114,7 +114,7 @@ /obj/item/stock_parts/micro_laser = 1) /obj/item/circuitboard/machine/telecomms/relay - name = "Relay Mainframe (Machine Board)" + name = "relay mainframe (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/telecomms/relay req_components = list( @@ -123,7 +123,7 @@ /obj/item/stock_parts/subspace/filter = 2) /obj/item/circuitboard/machine/telecomms/server - name = "Telecommunication Server (Machine Board)" + name = "telecommunication server (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/telecomms/server req_components = list( @@ -132,7 +132,7 @@ /obj/item/stock_parts/subspace/filter = 1) /obj/item/circuitboard/machine/telecomms/message_server - name = "Messaging Server (Machine Board)" + name = "messaging server (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/telecomms/message_server req_components = list( @@ -141,7 +141,7 @@ /obj/item/stock_parts/subspace/filter = 3) /obj/item/circuitboard/machine/tesla_coil - name = "Tesla Controller (Machine Board)" + name = "tesla controller (Machine Board)" icon_state = "engineering" desc = "You can use a screwdriver to switch between Research and Power Generation." build_path = /obj/machinery/power/tesla_coil @@ -175,11 +175,11 @@ return ..() /obj/item/circuitboard/machine/tesla_coil/power - name = "Tesla Coil (Machine Board)" + name = "tesla coil (Machine Board)" build_path = PATH_POWERCOIL /obj/item/circuitboard/machine/tesla_coil/research - name = "Tesla Corona Researcher (Machine Board)" + name = "tesla corona researcher (Machine Board)" build_path = PATH_RPCOIL #undef PATH_POWERCOIL @@ -187,20 +187,20 @@ /obj/item/circuitboard/machine/cell_charger - name = "Cell Charger (Machine Board)" + name = "cell charger (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/cell_charger req_components = list(/obj/item/stock_parts/capacitor = 1) needs_anchored = FALSE /obj/item/circuitboard/machine/circulator - name = "Circulator/Heat Exchanger (Machine Board)" + name = "circulator/heat exchanger (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/atmospherics/components/binary/circulator req_components = list() /obj/item/circuitboard/machine/emitter - name = "Emitter (Machine Board)" + name = "emitter (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/power/emitter req_components = list( @@ -209,13 +209,13 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/generator - name = "Thermo-Electric Generator (Machine Board)" + name = "thermo-electric generator (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/power/generator req_components = list() /obj/item/circuitboard/machine/ntnet_relay - name = "NTNet Relay (Machine Board)" + name = "NTNet relay (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/ntnet_relay req_components = list( @@ -223,7 +223,7 @@ /obj/item/stock_parts/subspace/filter = 1) /obj/item/circuitboard/machine/pacman - name = "PACMAN-type Generator (Machine Board)" + name = "PACMAN-type generator (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/power/port_gen/pacman req_components = list( @@ -234,15 +234,15 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/pacman/super - name = "SUPERPACMAN-type Generator (Machine Board)" + name = "SUPERPACMAN-type generator (Machine Board)" build_path = /obj/machinery/power/port_gen/pacman/super /obj/item/circuitboard/machine/pacman/mrs - name = "MRSPACMAN-type Generator (Machine Board)" + name = "MRSPACMAN-type generator (Machine Board)" build_path = /obj/machinery/power/port_gen/pacman/mrs /obj/item/circuitboard/machine/power_compressor - name = "Power Compressor (Machine Board)" + name = "power compressor (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/power/compressor req_components = list( @@ -250,7 +250,7 @@ /obj/item/stock_parts/manipulator = 6) /obj/item/circuitboard/machine/power_turbine - name = "Power Turbine (Machine Board)" + name = "power turbine (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/power/turbine req_components = list( @@ -258,12 +258,12 @@ /obj/item/stock_parts/capacitor = 6) /obj/item/circuitboard/machine/protolathe/department/engineering - name = "Departmental Protolathe (Machine Board) - Engineering" + name = "departmental protolathe - engineering (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/rnd/production/protolathe/department/engineering /obj/item/circuitboard/machine/rad_collector - name = "Radiation Collector (Machine Board)" + name = "radiation collector (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/power/rad_collector req_components = list( @@ -284,7 +284,7 @@ /obj/item/stack/sheet/mineral/uranium = 10) // We have no Pu-238, and this is the closest thing to it. /obj/item/circuitboard/machine/rtg/advanced - name = "Advanced RTG (Machine Board)" + name = "advanced RTG (Machine Board)" build_path = /obj/machinery/power/rtg/advanced req_components = list( /obj/item/stack/cable_coil = 5, @@ -294,33 +294,33 @@ /obj/item/stack/sheet/mineral/plasma = 5) /obj/item/circuitboard/machine/shuttle/engine - name = "Thruster (Machine Board)" + name = "thruster (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/shuttle/engine req_components = list() /obj/item/circuitboard/machine/shuttle/engine/plasma - name = "Plasma Thruster (Machine Board)" + name = "plasma thruster (Machine Board)" build_path = /obj/machinery/shuttle/engine/plasma req_components = list(/obj/item/stock_parts/capacitor = 2, /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/micro_laser = 1) /obj/item/circuitboard/machine/shuttle/engine/void - name = "Void Thruster (Machine Board)" + name = "void thruster (Machine Board)" build_path = /obj/machinery/shuttle/engine/void req_components = list(/obj/item/stock_parts/capacitor/quadratic = 2, /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/micro_laser/quadultra = 1) /obj/item/circuitboard/machine/shuttle/heater - name = "Electronic Engine Heater (Machine Board)" + name = "electronic engine heater (Machine Board)" build_path = /obj/machinery/atmospherics/components/unary/shuttle/heater req_components = list(/obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/matter_bin = 1) /obj/item/circuitboard/machine/scanner_gate - name = "Scanner Gate (Machine Board)" + name = "scanner gate (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/scanner_gate req_components = list( @@ -337,12 +337,12 @@ def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high/empty) /obj/item/circuitboard/machine/techfab/department/engineering - name = "\improper Departmental Techfab (Machine Board) - Engineering" + name = "departmental techfab - engineering (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/rnd/production/techfab/department/engineering /obj/item/circuitboard/machine/teleporter_hub - name = "Teleporter Hub (Machine Board)" + name = "teleporter hub (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/teleport/hub req_components = list( @@ -351,7 +351,7 @@ def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial) /obj/item/circuitboard/machine/teleporter_station - name = "Teleporter Station (Machine Board)" + name = "teleporter station (Machine Board)" icon_state = "engineering" build_path = /obj/machinery/teleport/station req_components = list( @@ -361,9 +361,9 @@ def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial) /obj/item/circuitboard/machine/thermomachine - name = "Thermomachine (Machine Board)" + name = "thermomachine (Machine Board)" icon_state = "engineering" - desc = "You can use a screwdriver to switch between heater and freezer." + build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer var/pipe_layer = PIPING_LAYER_DEFAULT req_components = list( /obj/item/stock_parts/matter_bin = 2, @@ -371,64 +371,21 @@ /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/glass = 1) -#define PATH_FREEZER /obj/machinery/atmospherics/components/unary/thermomachine/freezer -#define PATH_HEATER /obj/machinery/atmospherics/components/unary/thermomachine/heater - -/obj/item/circuitboard/machine/thermomachine/Initialize() +/obj/item/circuitboard/machine/thermomachine/multitool_act(mob/living/user, obj/item/multitool/I) . = ..() - if(!build_path) - if(prob(50)) - name = "Freezer (Machine Board)" - build_path = PATH_FREEZER - else - name = "Heater (Machine Board)" - build_path = PATH_HEATER - -/obj/item/circuitboard/machine/thermomachine/attackby(obj/item/I, mob/user, params) - if(I.tool_behaviour == TOOL_SCREWDRIVER) - var/obj/item/circuitboard/new_type - var/new_setting - switch(build_path) - if(PATH_FREEZER) - new_type = /obj/item/circuitboard/machine/thermomachine/heater - new_setting = "Heater" - if(PATH_HEATER) - new_type = /obj/item/circuitboard/machine/thermomachine/freezer - new_setting = "Freezer" - name = initial(new_type.name) - build_path = initial(new_type.build_path) - I.play_tool_sound(src) - to_chat(user, "You change the circuitboard setting to \"[new_setting]\".") - return - - if(I.tool_behaviour == TOOL_MULTITOOL) + if(istype(I)) pipe_layer = (pipe_layer >= PIPING_LAYER_MAX) ? PIPING_LAYER_MIN : (pipe_layer + 1) to_chat(user, "You change the circuitboard to layer [pipe_layer].") - return - - . = ..() /obj/item/circuitboard/machine/thermomachine/examine() . = ..() . += "It is set to layer [pipe_layer]." -/obj/item/circuitboard/machine/thermomachine/heater - name = "Heater (Machine Board)" - build_path = PATH_HEATER - -/obj/item/circuitboard/machine/thermomachine/freezer - name = "Freezer (Machine Board)" - build_path = PATH_FREEZER - -#undef PATH_FREEZER -#undef PATH_HEATER - - //Generic /obj/item/circuitboard/machine/circuit_imprinter - name = "Circuit Imprinter (Machine Board)" + name = "circuit imprinter (Machine Board)" icon_state = "generic" build_path = /obj/machinery/rnd/production/circuit_imprinter req_components = list( @@ -437,18 +394,18 @@ /obj/item/reagent_containers/glass/beaker = 2) /obj/item/circuitboard/machine/circuit_imprinter/department - name = "Departmental Circuit Imprinter (Machine Board)" + name = "departmental circuit imprinter (Machine Board)" build_path = /obj/machinery/rnd/production/circuit_imprinter/department /obj/item/circuitboard/machine/holopad - name = "AI Holopad (Machine Board)" + name = "AI holopad (Machine Board)" icon_state = "generic" build_path = /obj/machinery/holopad req_components = list(/obj/item/stock_parts/capacitor = 1) needs_anchored = FALSE //wew lad /obj/item/circuitboard/machine/launchpad - name = "Bluespace Launchpad (Machine Board)" + name = "bluespace launchpad (Machine Board)" icon_state = "generic" build_path = /obj/machinery/launchpad req_components = list( @@ -457,13 +414,13 @@ def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial) /obj/item/circuitboard/machine/paystand - name = "Pay Stand (Machine Board)" + name = "pay stand (Machine Board)" icon_state = "generic" build_path = /obj/machinery/paystand req_components = list() /obj/item/circuitboard/machine/protolathe - name = "Protolathe (Machine Board)" + name = "protolathe (Machine Board)" icon_state = "generic" build_path = /obj/machinery/rnd/production/protolathe req_components = list( @@ -472,11 +429,11 @@ /obj/item/reagent_containers/glass/beaker = 2) /obj/item/circuitboard/machine/protolathe/department - name = "Departmental Protolathe (Machine Board)" + name = "departmental protolathe (Machine Board)" build_path = /obj/machinery/rnd/production/protolathe/department /obj/item/circuitboard/machine/reagentgrinder - name = "Machine Design (All-In-One Grinder)" + name = "all-in-one grinder (Machine Board)" icon_state = "generic" build_path = /obj/machinery/reagentgrinder/constructed req_components = list( @@ -484,7 +441,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/smartfridge - name = "Smartfridge (Machine Board)" + name = "smartfridge (Machine Board)" icon_state = "generic" build_path = /obj/machinery/smartfridge req_components = list(/obj/item/stock_parts/matter_bin = 1) @@ -518,7 +475,7 @@ /obj/item/circuitboard/machine/space_heater - name = "Space Heater (Machine Board)" + name = "space heater (Machine Board)" icon_state = "generic" build_path = /obj/machinery/space_heater req_components = list( @@ -528,7 +485,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/techfab - name = "\improper Techfab (Machine Board)" + name = "techfab (Machine Board)" icon_state = "generic" build_path = /obj/machinery/rnd/production/techfab req_components = list( @@ -537,11 +494,11 @@ /obj/item/reagent_containers/glass/beaker = 2) /obj/item/circuitboard/machine/techfab/department - name = "\improper Departmental Techfab (Machine Board)" + name = "departmental techfab (Machine Board)" build_path = /obj/machinery/rnd/production/techfab/department /obj/item/circuitboard/machine/vendor - name = "Custom Vendor (Machine Board)" + name = "custom vendor (Machine Board)" icon_state = "generic" desc = "You can turn the \"brand selection\" dial using a screwdriver." custom_premium_price = 30 @@ -557,6 +514,7 @@ /obj/machinery/vending/games = "\improper Good Clean Fun", /obj/machinery/vending/autodrobe = "AutoDrobe", /obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe", + /obj/machinery/vending/wardrobe/det_wardrobe = "DetDrobe", /obj/machinery/vending/wardrobe/medi_wardrobe = "MediDrobe", /obj/machinery/vending/wardrobe/engi_wardrobe = "EngiDrobe", /obj/machinery/vending/wardrobe/atmos_wardrobe = "AtmosDrobe", @@ -617,7 +575,7 @@ /obj/item/circuitboard/machine/vending/donksofttoyvendor - name = "Donksoft Toy Vendor (Machine Board)" + name = "Donksoft toy vendor (Machine Board)" icon_state = "generic" build_path = /obj/machinery/vending/donksofttoyvendor req_components = list( @@ -625,7 +583,7 @@ /obj/item/vending_refill/donksoft = 1) /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor - name = "Syndicate Donksoft Toy Vendor (Machine Board)" + name = "Syndicate Donksoft toy vendor (Machine Board)" icon_state = "generic" build_path = /obj/machinery/vending/toyliberationstation req_components = list( @@ -636,19 +594,8 @@ //Medical -/obj/item/circuitboard/machine/autodoc - name = "Autodoc (Machine Board)" - icon_state = "medical" - build_path = /obj/machinery/autodoc - req_components = list(/obj/item/scalpel/advanced = 1, - /obj/item/retractor/advanced = 1, - /obj/item/surgicaldrill/advanced = 1, - /obj/item/stock_parts/manipulator = 1, - /obj/item/stock_parts/micro_laser = 3, - /obj/item/stock_parts/matter_bin = 1) - /obj/item/circuitboard/machine/chem_dispenser - name = "Chem Dispenser (Machine Board)" + name = "chem dispenser (Machine Board)" icon_state = "medical" build_path = /obj/machinery/chem_dispenser req_components = list( @@ -661,7 +608,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/chem_dispenser/botany //probably should be generic but who cares - name = "Minor Botanical Chem Dispenser (Machine Board)" + name = "minor botanical chem dispenser (Machine Board)" build_path = /obj/machinery/chem_dispenser/mutagensaltpetersmall req_components = list( /obj/item/stock_parts/matter_bin = 2, @@ -672,8 +619,41 @@ def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high) needs_anchored = FALSE +/obj/item/circuitboard/machine/chem_dispenser/fullupgrade + build_path = /obj/machinery/chem_dispenser/fullupgrade + req_components = list( + /obj/item/stock_parts/matter_bin/bluespace = 2, + /obj/item/stock_parts/capacitor/quadratic = 2, + /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stack/sheet/glass = 1, + /obj/item/stock_parts/cell/bluespace = 1, + ) + +/obj/item/circuitboard/machine/chem_dispenser/mutagensaltpeter + build_path = /obj/machinery/chem_dispenser/mutagensaltpeter + req_components = list( + /obj/item/stock_parts/matter_bin/bluespace = 2, + /obj/item/stock_parts/capacitor/quadratic = 2, + /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stack/sheet/glass = 1, + /obj/item/stock_parts/cell/bluespace = 1, + ) + +/obj/item/circuitboard/machine/chem_dispenser/abductor + name = "Reagent Synthesizer (Abductor Machine Board)" + icon_state = "abductor_mod" + build_path = /obj/machinery/chem_dispenser/abductor + req_components = list( + /obj/item/stock_parts/matter_bin/bluespace = 2, + /obj/item/stock_parts/capacitor/quadratic = 2, + /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stack/sheet/glass = 1, + /obj/item/stock_parts/cell/bluespace = 1, + ) + needs_anchored = FALSE + /obj/item/circuitboard/machine/chem_heater - name = "Chemical Heater (Machine Board)" + name = "chemical heater (Machine Board)" icon_state = "medical" build_path = /obj/machinery/chem_heater req_components = list( @@ -707,7 +687,7 @@ return ..() /obj/item/circuitboard/machine/clonepod - name = "Clone Pod (Machine Board)" + name = "clone pod (Machine Board)" icon_state = "medical" build_path = /obj/machinery/clonepod req_components = list( @@ -718,11 +698,11 @@ /obj/item/reagent_containers/glass/beaker = 2) /obj/item/circuitboard/machine/clonepod/experimental - name = "Experimental Clone Pod (Machine Board)" + name = "experimental clone pod (Machine Board)" build_path = /obj/machinery/clonepod/experimental /obj/item/circuitboard/machine/clonescanner - name = "Cloning Scanner (Machine Board)" + name = "cloning scanner (Machine Board)" icon_state = "medical" build_path = /obj/machinery/dna_scannernew req_components = list( @@ -733,7 +713,7 @@ /obj/item/stack/cable_coil = 2) /obj/item/circuitboard/machine/cryo_tube - name = "Cryotube (Machine Board)" + name = "cryotube (Machine Board)" icon_state = "medical" build_path = /obj/machinery/atmospherics/components/unary/cryo_cell req_components = list( @@ -742,7 +722,7 @@ /obj/item/stack/sheet/glass = 4) /obj/item/circuitboard/machine/fat_sucker - name = "Lipid Extractor (Machine Board)" + name = "lipid extractor (Machine Board)" icon_state = "medical" build_path = /obj/machinery/fat_sucker req_components = list(/obj/item/stock_parts/micro_laser = 2, @@ -751,13 +731,13 @@ /obj/item/scalpel = 1) /obj/item/circuitboard/machine/harvester - name = "Harvester (Machine Board)" + name = "harvester (Machine Board)" icon_state = "medical" build_path = /obj/machinery/harvester req_components = list(/obj/item/stock_parts/micro_laser = 4) /obj/item/circuitboard/machine/limbgrower - name = "Limb Grower (Machine Board)" + name = "limb grower (Machine Board)" icon_state = "medical" build_path = /obj/machinery/limbgrower req_components = list( @@ -766,12 +746,12 @@ /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/protolathe/department/medical - name = "Departmental Protolathe (Machine Board) - Medical" + name = "departmental protolathe - medical (Machine Board)" icon_state = "medical" build_path = /obj/machinery/rnd/production/protolathe/department/medical /obj/item/circuitboard/machine/sleeper - name = "Sleeper (Machine Board)" + name = "sleeper (Machine Board)" icon_state = "medical" build_path = /obj/machinery/sleeper req_components = list( @@ -780,8 +760,18 @@ /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/glass = 2) +/obj/item/circuitboard/machine/sleeper/fullupgrade + name = "Sleeper (Machine Board)" + icon_state = "medical" + build_path = /obj/machinery/sleeper/syndie/fullupgrade + req_components = list( + /obj/item/stock_parts/matter_bin/bluespace = 1, + /obj/item/stock_parts/manipulator/femto = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/stack/sheet/glass = 2) + /obj/item/circuitboard/machine/smoke_machine - name = "Smoke Machine (Machine Board)" + name = "smoke machine (Machine Board)" icon_state = "medical" build_path = /obj/machinery/smoke_machine req_components = list( @@ -793,7 +783,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/stasis - name = "Lifeform Stasis Unit (Machine Board)" + name = "lifeform stasis unit (Machine Board)" icon_state = "medical" build_path = /obj/machinery/stasis req_components = list( @@ -802,32 +792,20 @@ /obj/item/stock_parts/capacitor = 1) /obj/item/circuitboard/machine/techfab/department/medical - name = "\improper Departmental Techfab (Machine Board) - Medical" + name = "departmental techfab - medical (Machine Board) " icon_state = "medical" build_path = /obj/machinery/rnd/production/techfab/department/medical //Science -/obj/item/circuitboard/machine/bluespace_miner - name = "Bluespace Miner (Machine Board)" - icon_state = "science" - build_path = /obj/machinery/mineral/bluespace_miner - req_components = list( - /obj/item/stock_parts/matter_bin = 3, - /obj/item/stock_parts/micro_laser = 1, - /obj/item/stock_parts/manipulator = 3, - /obj/item/stock_parts/scanning_module = 1, - /obj/item/stack/ore/bluespace_crystal = 3) - needs_anchored = FALSE - /obj/item/circuitboard/machine/circuit_imprinter/department/science - name = "Departmental Circuit Imprinter - Science (Machine Board)" + name = "departmental circuit imprinter - science (Machine Board)" icon_state = "science" build_path = /obj/machinery/rnd/production/circuit_imprinter/department/science /obj/item/circuitboard/machine/cyborgrecharger - name = "Cyborg Recharger (Machine Board)" + name = "cyborg recharger (Machine Board)" icon_state = "science" build_path = /obj/machinery/recharge_station req_components = list( @@ -837,7 +815,7 @@ def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high) /obj/item/circuitboard/machine/destructive_analyzer - name = "Destructive Analyzer (Machine Board)" + name = "destructive analyzer (Machine Board)" icon_state = "science" build_path = /obj/machinery/rnd/destructive_analyzer req_components = list( @@ -855,7 +833,7 @@ /obj/item/stock_parts/micro_laser = 2) /obj/item/circuitboard/machine/mech_recharger - name = "Mechbay Recharger (Machine Board)" + name = "mechbay recharger (Machine Board)" icon_state = "science" build_path = /obj/machinery/mech_bay_recharge_port req_components = list( @@ -863,9 +841,9 @@ /obj/item/stock_parts/capacitor = 5) /obj/item/circuitboard/machine/mechfab - name = "Exosuit Fabricator (Machine Board)" + name = "exosuit fabricator (Machine Board)" icon_state = "science" - build_path = /obj/machinery/mecha_part_fabricator + build_path = /obj/machinery/modular_fabricator/exosuit_fab req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -873,7 +851,7 @@ /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/monkey_recycler - name = "Monkey Recycler (Machine Board)" + name = "monkey recycler (Machine Board)" icon_state = "science" build_path = /obj/machinery/monkey_recycler req_components = list( @@ -882,7 +860,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/nanite_chamber - name = "Nanite Chamber (Machine Board)" + name = "nanite chamber (Machine Board)" icon_state = "science" build_path = /obj/machinery/nanite_chamber req_components = list( @@ -891,7 +869,7 @@ /obj/item/stock_parts/manipulator = 1) /obj/item/circuitboard/machine/nanite_program_hub - name = "Nanite Program Hub (Machine Board)" + name = "nanite program hub (Machine Board)" icon_state = "science" build_path = /obj/machinery/nanite_program_hub req_components = list( @@ -899,7 +877,7 @@ /obj/item/stock_parts/manipulator = 1) /obj/item/circuitboard/machine/nanite_programmer - name = "Nanite Programmer (Machine Board)" + name = "nanite programmer (Machine Board)" icon_state = "science" build_path = /obj/machinery/nanite_programmer req_components = list( @@ -908,17 +886,17 @@ /obj/item/stock_parts/scanning_module = 1) /obj/item/circuitboard/machine/processor/slime - name = "Slime Processor (Machine Board)" + name = "slime processor (Machine Board)" icon_state = "science" build_path = /obj/machinery/processor/slime /obj/item/circuitboard/machine/protolathe/department/science - name = "Departmental Protolathe (Machine Board) - Science" + name = "departmental protolathe - science (Machine Board)" icon_state = "science" build_path = /obj/machinery/rnd/production/protolathe/department/science /obj/item/circuitboard/machine/public_nanite_chamber - name = "Public Nanite Chamber (Machine Board)" + name = "public nanite chamber (Machine Board)" icon_state = "science" build_path = /obj/machinery/public_nanite_chamber var/cloud_id = 1 @@ -938,7 +916,7 @@ /obj/item/circuitboard/machine/quantumpad - name = "Quantum Pad (Machine Board)" + name = "quantum pad (Machine Board)" icon_state = "science" build_path = /obj/machinery/quantumpad req_components = list( @@ -949,7 +927,7 @@ def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial) /obj/item/circuitboard/machine/rdserver - name = "R&D Server (Machine Board)" + name = "R&D server (Machine Board)" icon_state = "science" build_path = /obj/machinery/rnd/server req_components = list( @@ -957,7 +935,7 @@ /obj/item/stock_parts/scanning_module = 1) /obj/item/circuitboard/machine/techfab/department/science - name = "\improper Departmental Techfab (Machine Board) - Science" + name = "departmental techfab - science (Machine Board)" icon_state = "science" build_path = /obj/machinery/rnd/production/techfab/department/science @@ -966,19 +944,19 @@ /obj/item/circuitboard/machine/protolathe/department/security - name = "Departmental Protolathe (Machine Board) - Security" + name = "departmental protolathe - security (Machine Board)" icon_state = "security" build_path = /obj/machinery/rnd/production/protolathe/department/security /obj/item/circuitboard/machine/recharger - name = "Weapon Recharger (Machine Board)" + name = "weapon recharger (Machine Board)" icon_state = "security" build_path = /obj/machinery/recharger req_components = list(/obj/item/stock_parts/capacitor = 1) needs_anchored = FALSE /obj/item/circuitboard/machine/techfab/department/security - name = "\improper Departmental Techfab (Machine Board) - Security" + name = "departmental techfab - security (Machine Board)" icon_state = "security" build_path = /obj/machinery/rnd/production/techfab/department/security @@ -987,7 +965,7 @@ /obj/item/circuitboard/machine/biogenerator - name = "Biogenerator (Machine Board)" + name = "biogenerator (Machine Board)" icon_state = "service" build_path = /obj/machinery/biogenerator req_components = list( @@ -997,29 +975,49 @@ /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/chem_dispenser/drinks - name = "Soda Dispenser (Machine Board)" + name = "soda dispenser (Machine Board)" icon_state = "service" build_path = /obj/machinery/chem_dispenser/drinks +/obj/item/circuitboard/machine/chem_dispenser/drinks/fullupgrade + build_path = /obj/machinery/chem_dispenser/drinks/fullupgrade + req_components = list( + /obj/item/stock_parts/matter_bin/bluespace = 2, + /obj/item/stock_parts/capacitor/quadratic = 2, + /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stack/sheet/glass = 1, + /obj/item/stock_parts/cell/bluespace = 1, + ) + /obj/item/circuitboard/machine/chem_dispenser/drinks/beer - name = "Booze Dispenser (Machine Board)" + name = "booze dispenser (Machine Board)" icon_state = "service" build_path = /obj/machinery/chem_dispenser/drinks/beer +/obj/item/circuitboard/machine/chem_dispenser/drinks/beer/fullupgrade + build_path = /obj/machinery/chem_dispenser/drinks/beer/fullupgrade + req_components = list( + /obj/item/stock_parts/matter_bin/bluespace = 2, + /obj/item/stock_parts/capacitor/quadratic = 2, + /obj/item/stock_parts/manipulator/femto = 2, + /obj/item/stack/sheet/glass = 1, + /obj/item/stock_parts/cell/bluespace = 1, + ) + /obj/item/circuitboard/machine/chem_master/condi name = "CondiMaster 3000 (Machine Board)" icon_state = "service" build_path = /obj/machinery/chem_master/condimaster /obj/item/circuitboard/machine/deep_fryer - name = "circuit board (Deep Fryer)" + name = "deep fryer (Machine Board)" icon_state = "service" build_path = /obj/machinery/deepfryer req_components = list(/obj/item/stock_parts/micro_laser = 1) needs_anchored = FALSE /obj/item/circuitboard/machine/dish_drive - name = "Dish Drive (Machine Board)" + name = "dish drive (Machine Board)" icon_state = "service" build_path = /obj/machinery/dish_drive req_components = list( @@ -1032,8 +1030,8 @@ /obj/item/circuitboard/machine/dish_drive/examine(mob/user) . = ..() - . += {"Its suction function is [suction ? "enabled" : "disabled"]. Use it in-hand to switch.\n - Its disposal auto-transmit function is [transmit ? "enabled" : "disabled"]. Alt-click it to switch."} + . += "Its suction function is [suction ? "enabled" : "disabled"]. Use it in-hand to switch.\n"+\ + "Its disposal auto-transmit function is [transmit ? "enabled" : "disabled"]. Alt-click it to switch." /obj/item/circuitboard/machine/dish_drive/attack_self(mob/living/user) suction = !suction @@ -1047,7 +1045,7 @@ /obj/item/circuitboard/machine/gibber - name = "Gibber (Machine Board)" + name = "gibber (Machine Board)" icon_state = "service" build_path = /obj/machinery/gibber req_components = list( @@ -1056,7 +1054,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/hydroponics - name = "Hydroponics Tray (Machine Board)" + name = "hydroponics tray (Machine Board)" icon_state = "service" build_path = /obj/machinery/hydroponics/constructable req_components = list( @@ -1066,7 +1064,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/microwave - name = "Microwave (Machine Board)" + name = "microwave (Machine Board)" icon_state = "service" build_path = /obj/machinery/microwave req_components = list( @@ -1077,7 +1075,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/plantgenes - name = "Plant DNA Manipulator (Machine Board)" + name = "plant DNA manipulator (Machine Board)" icon_state = "service" build_path = /obj/machinery/plantgenes req_components = list( @@ -1087,7 +1085,7 @@ /obj/item/stock_parts/scanning_module = 1) /obj/item/circuitboard/machine/processor - name = "Food Processor (Machine Board)" + name = "food processor (Machine Board)" icon_state = "service" build_path = /obj/machinery/processor req_components = list( @@ -1109,12 +1107,12 @@ return ..() /obj/item/circuitboard/machine/protolathe/department/service - name = "Departmental Protolathe - Service (Machine Board)" + name = "departmental protolathe - service (Machine Board)" icon_state = "service" build_path = /obj/machinery/rnd/production/protolathe/department/service /obj/item/circuitboard/machine/recycler - name = "Recycler (Machine Board)" + name = "recycler (Machine Board)" icon_state = "service" build_path = /obj/machinery/recycler req_components = list( @@ -1123,7 +1121,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/seed_extractor - name = "Seed Extractor (Machine Board)" + name = "seed extractor (Machine Board)" icon_state = "service" build_path = /obj/machinery/seed_extractor req_components = list( @@ -1132,7 +1130,7 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/techfab/department/service - name = "\improper Departmental Techfab - Service (Machine Board)" + name = "departmental techfab - service (Machine Board)" icon_state = "service" build_path = /obj/machinery/rnd/production/techfab/department/service @@ -1141,24 +1139,33 @@ /obj/item/circuitboard/machine/techfab/department/cargo - name = "\improper Departmental Techfab (Machine Board) - Cargo" + name = "departmental techfab - cargo (Machine Board)" icon_state = "supply" build_path = /obj/machinery/rnd/production/techfab/department/cargo /obj/item/circuitboard/machine/mining_equipment_vendor - name = "Mining Equipment Vendor (Machine Board)" + name = "mining equipment vendor (Machine Board)" + icon_state = "supply" + build_path = /obj/machinery/vendor/mining + req_components = list( + /obj/item/stack/sheet/glass = 1, + /obj/item/stock_parts/matter_bin = 3) + +/obj/item/circuitboard/machine/exploration_equipment_vendor + name = "exploration equipment vendor (Machine Board)" icon_state = "supply" - build_path = /obj/machinery/mineral/equipment_vendor + build_path = /obj/machinery/vendor/exploration req_components = list( /obj/item/stack/sheet/glass = 1, /obj/item/stock_parts/matter_bin = 3) + /obj/item/circuitboard/machine/mining_equipment_vendor/golem - name = "Golem Ship Equipment Vendor (Machine Board)" - build_path = /obj/machinery/mineral/equipment_vendor/golem + name = "golem ship equipment vendor (Machine Board)" + build_path = /obj/machinery/vendor/mining/golem /obj/item/circuitboard/machine/pump - name = "Portable Liquid Pump (Machine Board)" + name = "portable liquid pump (Machine Board)" icon_state = "supply" build_path = /obj/machinery/power/liquid_pump needs_anchored = FALSE @@ -1167,7 +1174,7 @@ /obj/item/stock_parts/matter_bin = 2) /obj/item/circuitboard/machine/ore_redemption - name = "Ore Redemption (Machine Board)" + name = "ore redemption (Machine Board)" icon_state = "supply" build_path = /obj/machinery/mineral/ore_redemption req_components = list( @@ -1179,18 +1186,18 @@ needs_anchored = FALSE /obj/item/circuitboard/machine/ore_silo - name = "Ore Silo (Machine Board)" + name = "ore silo (Machine Board)" icon_state = "supply" build_path = /obj/machinery/ore_silo req_components = list() /obj/item/circuitboard/machine/protolathe/department/cargo - name = "Departmental Protolathe (Machine Board) - Cargo" + name = "departmental protolathe - cargo (Machine Board)" icon_state = "supply" build_path = /obj/machinery/rnd/production/protolathe/department/cargo /obj/item/circuitboard/machine/stacking_machine - name = "Stacking Machine (Machine Board)" + name = "stacking machine (Machine Board)" icon_state = "supply" build_path = /obj/machinery/mineral/stacking_machine req_components = list( @@ -1198,7 +1205,7 @@ /obj/item/stock_parts/matter_bin = 2) /obj/item/circuitboard/machine/stacking_unit_console - name = "Stacking Machine Console (Machine Board)" + name = "stacking machine console (Machine Board)" icon_state = "supply" build_path = /obj/machinery/mineral/stacking_unit_console req_components = list( @@ -1225,14 +1232,14 @@ /obj/item/stock_parts/micro_laser = /obj/item/stock_parts/micro_laser/quadultra) /obj/item/circuitboard/machine/chem_dispenser/abductor - name = "Reagent Synthesizer (Abductor Machine Board)" + name = "reagent synthesizer (Abductor Machine Board)" icon_state = "abductor_mod" build_path = /obj/machinery/chem_dispenser/abductor def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high) needs_anchored = FALSE /obj/item/circuitboard/machine/plantgenes/vault - name = "alien board (Plant DNA Manipulator)" + name = "Plant DNA manipulator (Abductor Machine Board)" icon_state = "abductor_mod" // It wasn't made by actual abductors race, so no abductor tech here. def_components = list( diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index d9357ef07d2c3..7982ea193f448 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -123,7 +123,7 @@ user.visible_message("[user] begins to clean \the [target.name] with [src]...", "You begin to clean \the [target.name] with [src]...") if(do_after(user, src.cleanspeed, target = target)) to_chat(user, "You clean \the [target.name].") - if(istype(target, /obj/item/clothing) && HAS_TRAIT(target, TRAIT_SPRAYPAINTED)) + if(isclothing(target) && HAS_TRAIT(target, TRAIT_SPRAYPAINTED)) var/obj/item/clothing/C = target var/mob/living/carbon/human/H = user C.flash_protect -= 1 @@ -201,8 +201,7 @@ ..() /obj/item/bikehorn/golden/proc/flip_mobs(mob/living/carbon/M, mob/user) - var/turf/T = get_turf(src) - for(M in ohearers(7, T)) + for(M in ohearers(7, get_turf(src))) if(ishuman(M) && M.can_hear()) var/mob/living/carbon/human/H = M if(istype(H.ears, /obj/item/clothing/ears/earmuffs)) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index be39bb697344f..129cd18cc3f49 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -28,7 +28,7 @@ mode = WAND_EMERGENCY if(WAND_EMERGENCY) mode = WAND_OPEN - to_chat(user, "Now in mode: [mode].") + balloon_alert(user, "Mode set to [mode]") // Airlock remote works by sending NTNet packets to whatever it's pointed at. /obj/item/door_remote/afterattack(atom/A, mob/user) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index cf1551d1cd8a7..3b3c3c8a4be3d 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -137,24 +137,10 @@ if(location == BODY_ZONE_PRECISE_MOUTH) if(user.a_intent == INTENT_HELP) if(H.gender == MALE) - if(H == user && !mirror) - to_chat(user, "You need a mirror to properly style your own facial hair!") - return - if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return - var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in GLOB.facial_hair_styles_list - if(!get_location_accessible(H, location)) - to_chat(user, "The mask is in the way!") - return - user.visible_message("[user] tries to change [H]'s facial hair style using [src].", "You try to change [H]'s facial hair style using [src].") - if(new_style && do_after(user, 60, target = H)) - user.visible_message("[user] successfully changes [H]'s facial hair style using [src].", "You successfully change [H]'s facial hair style using [src].") - H.facial_hair_style = new_style - H.update_hair() - return + INVOKE_ASYNC(src, .proc/new_facial_hairstyle, H, user, mirror) + return else return - else if(!(FACEHAIR in H.dna.species.species_traits)) to_chat(user, "There is no facial hair to shave!") @@ -183,22 +169,8 @@ else if(location == BODY_ZONE_HEAD) if(user.a_intent == INTENT_HELP) - if (H == user && !mirror) - to_chat(user, "You need a mirror to properly style your own hair!") - return - if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return - var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in GLOB.hair_styles_list - if(!get_location_accessible(H, location)) - to_chat(user, "The headgear is in the way!") - return - user.visible_message("[user] tries to change [H]'s hairstyle using [src].", "You try to change [H]'s hairstyle using [src].") - if(new_style && do_after(user, 60, target = H)) - user.visible_message("[user] successfully changes [H]'s hairstyle using [src].", "You successfully change [H]'s hairstyle using [src].") - H.hair_style = new_style - H.update_hair() - return - + INVOKE_ASYNC(src, .proc/new_hairstyle, H, user) + return else if(!(HAIR in H.dna.species.species_traits)) to_chat(user, "There is no hair to shave!") @@ -231,6 +203,40 @@ else ..() +/obj/item/razor/proc/new_hairstyle(mob/living/carbon/human/H, mob/user, mirror) + var/location = user.zone_selected + if (H == user && !mirror) + to_chat(user, "You need a mirror to properly style your own hair!") + return + if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in GLOB.hair_styles_list + if(!get_location_accessible(H, location)) + to_chat(user, "The headgear is in the way!") + return + user.visible_message("[user] tries to change [H]'s hairstyle using [src].", "You try to change [H]'s hairstyle using [src].") + if(new_style && do_after(user, 60, target = H)) + user.visible_message("[user] successfully changes [H]'s hairstyle using [src].", "You successfully change [H]'s hairstyle using [src].") + H.hair_style = new_style + H.update_hair() + +/obj/item/razor/proc/new_facial_hairstyle(mob/living/carbon/human/H, mob/user, var/mirror) + var/location = user.zone_selected + if(H == user && !mirror) + to_chat(user, "You need a mirror to properly style your own facial hair!") + return + if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in GLOB.facial_hair_styles_list + if(!get_location_accessible(H, location)) + to_chat(user, "The mask is in the way!") + return + user.visible_message("[user] tries to change [H]'s facial hair style using [src].", "You try to change [H]'s facial hair style using [src].") + if(new_style && do_after(user, 60, target = H)) + user.visible_message("[user] successfully changes [H]'s facial hair style using [src].", "You successfully change [H]'s facial hair style using [src].") + H.facial_hair_style = new_style + H.update_hair() + /obj/item/razor/straightrazor name = "straight razor" icon_state = "straightrazor" @@ -298,4 +304,4 @@ ADD_TRAIT(user, TRAIT_SELF_AWARE, "mirror_trait") to_chat(user, "You look into the mirror") sleep(150) - REMOVE_TRAIT(user, TRAIT_SELF_AWARE, "mirror_trait") \ No newline at end of file + REMOVE_TRAIT(user, TRAIT_SELF_AWARE, "mirror_trait") diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index b38aa06f8ee19..8ff5a36c9dbfe 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -17,19 +17,19 @@ if(alert(user, "Are you sure you want to crash this market with no survivors?", "Protocol CRAB-17", "Yes", "No") == "Yes") if(dumped || QDELETED(src)) //Prevents fuckers from cheesing alert return FALSE - var/turf/targetturf = get_safe_random_station_turf() + var/turf/targetturf = get_safe_random_station_turfs() if (!targetturf) return FALSE new /obj/effect/dumpeetTarget(targetturf, user) dumped = TRUE /obj/structure/checkoutmachine - name = "Nanotrasen Space-Coin Market" + name = "\improper Nanotrasen Space-Coin Market" desc = "This is good for spacecoin because" icon = 'icons/obj/money_machine.dmi' icon_state = "bogdanoff" layer = TABLE_LAYER //So that the crate inside doesn't appear underneath - armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80) + armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80, "stamina" = 0) density = TRUE pixel_z = -8 layer = LARGE_MOB_LAYER @@ -80,7 +80,7 @@ add_overlay("hatch") add_overlay("legs_retracted") addtimer(CALLBACK(src, .proc/startUp), 50) - QDEL_IN(src, 8 MINUTES) //Self destruct after 8 min + QDEL_IN(WEAKREF(src), 8 MINUTES) //Self destruct after 8 min /obj/structure/checkoutmachine/proc/startUp() //very VERY snowflake code that adds a neat animation when the pod lands. @@ -149,7 +149,7 @@ /obj/structure/checkoutmachine/Destroy() stop_dumping() STOP_PROCESSING(SSfastprocess, src) - priority_announce("The credit deposit machine at [get_area(src).name] has been destroyed. Station funds have stopped draining!", sender_override = "CRAB-17 Protocol") + priority_announce("The credit deposit machine at [get_area(src)] has been destroyed. Station funds have stopped draining!", sound = SSstation.announcer.get_rand_alert_sound(), sender_override = "CRAB-17 Protocol", ) explosion(src, 0,0,1, flame_range = 2) return ..() @@ -171,7 +171,7 @@ var/datum/bank_account/account = bogdanoff.get_bank_account() if (account) // get_bank_account() may return FALSE account.transfer_money(B, amount) - B.bank_card_talk("You have lost [percentage_lost * 100]% of your funds! A spacecoin credit deposit machine is located at: [get_area(src).name].") + B.bank_card_talk("You have lost [percentage_lost * 100]% of your funds! A spacecoin credit deposit machine is located at: [get_area(src)].") addtimer(CALLBACK(src, .proc/dump), 150) //Drain every 15 seconds /obj/structure/checkoutmachine/process() @@ -189,7 +189,7 @@ icon = 'icons/obj/money_machine_64.dmi' pixel_z = 300 desc = "Get out of the way!" - layer = FLY_LAYER//that wasnt flying, that was falling with style! + layer = FLY_LAYER//that wasn't flying, that was falling with style! icon_state = "missile_blur" /obj/effect/dumpeetTarget @@ -216,7 +216,7 @@ /obj/effect/dumpeetTarget/proc/startLaunch() DF = new /obj/effect/dumpeetFall(drop_location()) dump = new /obj/structure/checkoutmachine(null, bogdanoff) - priority_announce("The spacecoin bubble has popped! Get to the credit deposit machine at [get_area(src).name] and cash out before you lose all of your funds!", sender_override = "CRAB-17 Protocol") + priority_announce("The spacecoin bubble has popped! Get to the credit deposit machine at [get_area(src)] and cash out before you lose all of your funds!", sound = SSstation.announcer.get_rand_alert_sound(), sender_override = "CRAB-17 Protocol") animate(DF, pixel_z = -8, time = 5, , easing = LINEAR_EASING) playsound(src, 'sound/weapons/mortar_whistle.ogg', 70, 1, 6) addtimer(CALLBACK(src, .proc/endLaunch), 5, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index ca05bcf7a655e..8441e642b6038 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -157,6 +157,7 @@ is_capped = !is_capped to_chat(user, "The cap on [src] is now [is_capped ? "on" : "off"].") update_icon() + ui_update() /obj/item/toy/crayon/proc/staticDrawables() @@ -250,7 +251,9 @@ . = TRUE paint_mode = PAINT_NORMAL drawtype = "a" - update_icon() + + if(.) + update_icon() /obj/item/toy/crayon/proc/crayon_text_strip(text) var/static/regex/crayon_r = new /regex(@"[^\w!?,.=%#&+\/\-]") @@ -272,14 +275,8 @@ var/mob/living/carbon/human/H = user if (HAS_TRAIT(H, TRAIT_TAGGER)) cost *= 0.5 - /* hippie start -- moved to the end of the proc, after the crayon is actually used. - var/charges_used = use_charges(user, cost) - if(!charges_used) - return - . = charges_used - hippie end */ - if(istype(target, /obj/effect/decal/cleanable)) + if(istype(target, /obj/effect/decal)) target = target.loc if(!isValidSurface(target)) @@ -321,8 +318,7 @@ else if(drawing in graffiti|oriented) temp = "graffiti" var/gang_check = hippie_gang_check(user,target) // hippie start -- gang check and temp setting - if(!gang_check) return - else if(gang_check == "gang graffiti") temp = gang_check // hippie end + if(!gang_check) return // hippie end var/graf_rot if(drawing in oriented) @@ -344,9 +340,6 @@ clickx = CLAMP(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2) clicky = CLAMP(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2) - if(!instant) - to_chat(user, "You start drawing a [temp] on the [target.name]...") // hippie -- removed a weird tab that had no reason to be here - if(pre_noise) audible_message("You hear spraying.") playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) @@ -354,9 +347,13 @@ var/wait_time = 50 if(paint_mode == PAINT_LARGE_HORIZONTAL) wait_time *= 3 - if(gang) instant = FALSE // hippie -- gang spraying must not be instant, balance reasons + if(gang) + wait_time = 1 SECONDS + if (territory_claimed(get_area(target), user)) + wait_time = 20 SECONDS if(!instant) - if(!do_after(user, 50, target = target)) + to_chat(user, "You start drawing a [temp] on the [target.name]...") // hippie -- removed a weird tab that had no reason to be here + if(!do_after(user, wait_time, target = target)) return if(length(text_buffer)) @@ -546,6 +543,19 @@ return return ..() +/obj/item/storage/crayons/attack_self(mob/user) + . = ..() + if(contents.len > 0) + to_chat(user, "You can't fold down [src] with crayons inside!") + return + if(flags_1 & HOLOGRAM_1) + return + + var/obj/item/stack/sheet/cardboard/cardboard = new /obj/item/stack/sheet/cardboard(user.drop_location()) + to_chat(user, "You fold the [src] into cardboard.") + user.put_in_active_hand(cardboard) + qdel(src) + //Spraycan stuff /obj/item/toy/crayon/spraycan @@ -626,8 +636,11 @@ return if(is_capped) - to_chat(user, "Take the cap off first!") - return + if(istype(target, /obj/machinery/modular_fabricator/autolathe)) + return ..() + else + to_chat(user, "Take the cap off first!") + return if(check_empty(user)) return @@ -643,7 +656,7 @@ if(C.client) C.blur_eyes(3) C.blind_eyes(1) - if(C.get_eye_protection() <= 0) // no eye protection? ARGH IT BURNS. + if(!C.is_eyes_covered()) // no eye protection? ARGH IT BURNS. C.confused = max(C.confused, 3) C.Paralyze(60) if(ishuman(C) && actually_paints) @@ -658,10 +671,10 @@ return - if(isobj(target)) + if(isobj(target) && !(target.flags_1 & UNPAINTABLE_1)) if(actually_paints) if(color_hex2num(paint_color) < 350 && !istype(target, /obj/structure/window)) //Colors too dark are rejected - if(istype(target, /obj/item/clothing)) + if(isclothing(target)) var/obj/item/clothing/C = target if(((C.flags_cover & HEADCOVERSEYES) || (C.flags_cover & MASKCOVERSEYES) || (C.flags_cover & GLASSESCOVERSEYES)) && !HAS_TRAIT(C, TRAIT_SPRAYPAINTED)) C.flash_protect += 1 @@ -786,34 +799,35 @@ to_chat(user, "This spraycan's color isn't your gang's one! You cannot use it.") return FALSE gang_mode = TRUE - instant = FALSE . = "graffiti" // discontinue if we're not in gang modethe area isn't valid for tagging because gang "honour" - if(gang_mode && (!can_claim_for_gang(user, target))) + if(gang_mode && (!can_claim_for_gang(user, target, TRUE))) return FALSE return TRUE /obj/item/toy/crayon/proc/gang_final(mob/user, atom/target, list/affected_turfs) // hooked into afterattack // Double check it wasn't tagged in the meanwhile - if(!can_claim_for_gang(user, target)) + if(!can_claim_for_gang(user, target, FALSE)) return TRUE tag_for_gang(user, target) affected_turfs += target -/obj/item/toy/crayon/proc/can_claim_for_gang(mob/user, atom/target) +/obj/item/toy/crayon/proc/can_claim_for_gang(mob/user, atom/target, alert) // Check area validity. // Reject space, player-created areas, and non-station z-levels. var/area/A = get_area(target) - if(!A || (!is_station_level(A.z)) || !A.valid_territory) + if(!A || (!is_station_level(A.z)) || !(A.area_flags & VALID_TERRITORY)) to_chat(user, "[A] is unsuitable for tagging.") return FALSE var/spraying_over = FALSE - for(var/G in target) - var/obj/effect/decal/cleanable/crayon/gang/gangtag = G + for(var/obj/effect/decal/gang/gangtag in target) if(istype(gangtag)) var/datum/antagonist/gang/GA = user.mind.has_antag_datum(/datum/antagonist/gang) if(gangtag.gang != GA.gang) + if (alert) + to_chat(user, "[gangtag.gang] has been alerted of this takeover!") + gangtag.gang.message_gangtools("[get_area(target)] is under attack by an enemy gang!") spraying_over = TRUE break @@ -839,16 +853,19 @@ //Delete any old markings on this tile, including other gang tags for(var/obj/effect/decal/cleanable/crayon/old_marking in target) qdel(old_marking) + for(var/obj/effect/decal/gang/old_gang in target) + qdel(old_gang) var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) var/area/territory = get_area(target) - new /obj/effect/decal/cleanable/crayon/gang(target,G.gang,"graffiti",0,user) + new /obj/effect/decal/gang(target,G.gang,"graffiti",0,user) to_chat(user, "You tagged [territory] for your gang!") /obj/item/toy/crayon/spraycan/gang //desc = "A modified container containing suspicious paint." charges = 20 gang = TRUE + instant = FALSE pre_noise = FALSE post_noise = TRUE diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm index 0223904b4fc30..0acb225772b64 100644 --- a/code/game/objects/items/credit_holochip.dm +++ b/code/game/objects/items/credit_holochip.dm @@ -15,8 +15,8 @@ /obj/item/holochip/examine(mob/user) . = ..() - . += {"It's loaded with [credits] credit[( credits > 1 ) ? "s" : ""]\n - Alt-Click to split."} + . += "It's loaded with [credits] credit[( credits > 1 ) ? "s" : ""]\n"+\ + "Alt-Click to split." /obj/item/holochip/get_item_credit_value() return credits diff --git a/code/game/objects/items/cursed_necklace.dm b/code/game/objects/items/cursed_necklace.dm index 18c00bee3f4d4..2745644f91497 100644 --- a/code/game/objects/items/cursed_necklace.dm +++ b/code/game/objects/items/cursed_necklace.dm @@ -14,10 +14,10 @@ /obj/item/clothing/neck/necklace/dope/cursed/equipped(mob/user, slot) . = ..() - if(slot == SLOT_NECK && linked_ckey && user.ckey != linked_ckey) + if(slot == ITEM_SLOT_NECK && linked_ckey && user.ckey != linked_ckey) if(user.ckey && user.ckey == linked_ckey) hostage_ckey = user.ckey - user.ghostize(0) + user.ghostize(FALSE,SENTIENCE_ERASE) user.ckey = linked_ckey current_body = user @@ -25,6 +25,6 @@ . = ..() if(hostage_ckey) if(user.ckey) - user.ghostize(0) + user.ghostize(FALSE,SENTIENCE_ERASE) user.ckey = hostage_ckey current_body = null \ No newline at end of file diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 7af94fb155d67..4cf1f5aa6b4d6 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -14,12 +14,13 @@ throwforce = 6 w_class = WEIGHT_CLASS_BULKY actions_types = list(/datum/action/item_action/toggle_paddles) - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 0) + var/obj/item/shockpaddles/paddle_type = /obj/item/shockpaddles var/on = FALSE //if the paddles are equipped (1) or on the defib (0) var/safety = TRUE //if you can zap people with the defibs on harm mode var/powered = FALSE //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise - var/obj/item/twohanded/shockpaddles/paddles + var/obj/item/shockpaddles/paddles var/obj/item/stock_parts/cell/high/cell var/combat = FALSE //if true, revive through hardsuits, allow for combat shocking, and tint paddles syndicate colors var/grab_ghost = TRUE // Do we pull the ghost back into their body? @@ -51,12 +52,9 @@ if(paddles?.loc == src) paddles.extinguish() -/obj/item/defibrillator/update_icon() - update_power() - update_overlays() - update_charge() +/obj/item/defibrillator/update_overlays() + . = ..() -/obj/item/defibrillator/proc/update_power() if(!QDELETED(cell)) if(QDELETED(paddles) || cell.charge < paddles.revivecost) powered = FALSE @@ -65,23 +63,17 @@ else powered = FALSE -/obj/item/defibrillator/proc/update_overlays() - cut_overlays() if(!on) - add_overlay("[initial(icon_state)]-paddles") + . += "[initial(icon_state)]-paddles" if(powered) - add_overlay("[initial(icon_state)]-powered") + . += "[initial(icon_state)]-powered" + var/ratio = cell.charge / cell.maxcharge + ratio = CEILING(ratio*4, 1) * 25 + . += "[initial(icon_state)]-charge[ratio]" if(!cell) - add_overlay("[initial(icon_state)]-nocell") + . += "[initial(icon_state)]-nocell" if(!safety) - add_overlay("[initial(icon_state)]-emagged") - -/obj/item/defibrillator/proc/update_charge() - if(powered) //so it doesn't show charge if it's unpowered - if(!QDELETED(cell)) - var/ratio = cell.charge / cell.maxcharge - ratio = CEILING(ratio*4, 1) * 25 - add_overlay("[initial(icon_state)]-charge[ratio]") + . += "[initial(icon_state)]-emagged" /obj/item/defibrillator/CheckParts(list/parts_list) ..() @@ -95,13 +87,13 @@ /obj/item/defibrillator/attack_hand(mob/user) if(loc == user) if(slot_flags == ITEM_SLOT_BACK) - if(user.get_item_by_slot(SLOT_BACK) == src) + if(user.get_item_by_slot(ITEM_SLOT_BACK) == src) ui_action_click() else to_chat(user, "Put the defibrillator on your back first!") else if(slot_flags == ITEM_SLOT_BELT) - if(user.get_item_by_slot(SLOT_BELT) == src) + if(user.get_item_by_slot(ITEM_SLOT_BELT) == src) ui_action_click() else to_chat(user, "Strap the defibrillator's belt on first!") @@ -114,13 +106,12 @@ . = ..() if(ismob(loc)) var/mob/M = loc - if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand)) - var/obj/screen/inventory/hand/H = over_object + if(!M.incapacitated() && istype(over_object, /atom/movable/screen/inventory/hand)) + var/atom/movable/screen/inventory/hand/H = over_object M.putItemFromInventoryInHandIfPossible(src, H.held_index) /obj/item/defibrillator/attackby(obj/item/W, mob/user, params) if(W == paddles) - paddles.unwield() toggle_paddles() else if(istype(W, /obj/item/stock_parts/cell)) var/obj/item/stock_parts/cell/C = W @@ -185,7 +176,6 @@ return else //Remove from their hands and back onto the defib unit - paddles.unwield() remove_paddles(user) update_icon() @@ -194,11 +184,11 @@ A.UpdateButtonIcon() /obj/item/defibrillator/proc/make_paddles() - return new /obj/item/twohanded/shockpaddles(src) + return new paddle_type(src) /obj/item/defibrillator/equipped(mob/user, slot) ..() - if((slot_flags == ITEM_SLOT_BACK && slot != SLOT_BACK) || (slot_flags == ITEM_SLOT_BELT && slot != SLOT_BELT)) + if((slot_flags == ITEM_SLOT_BACK && slot != ITEM_SLOT_BACK) || (slot_flags == ITEM_SLOT_BELT && slot != ITEM_SLOT_BELT)) remove_paddles(user) update_icon() @@ -272,6 +262,7 @@ combat = TRUE safety = FALSE cooldown_duration = 2.5 SECONDS + paddle_type = /obj/item/shockpaddles/syndicate /obj/item/defibrillator/compact/combat/loaded/Initialize() . = ..() @@ -281,14 +272,18 @@ /obj/item/defibrillator/compact/combat/loaded/attackby(obj/item/W, mob/user, params) if(W == paddles) - paddles.unwield() toggle_paddles() update_icon() return //paddles -/obj/item/twohanded/shockpaddles +///What caused the paddles to snap back? +#define SNAP_DROP 0 +#define SNAP_OVEREXTEND 1 +#define SNAP_INTERACT 2 + +/obj/item/shockpaddles name = "defibrillator paddles" desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks." icon = 'icons/obj/defib.dmi' @@ -313,38 +308,50 @@ var/mob/listeningTo -/obj/item/twohanded/shockpaddles/equipped(mob/user, slot) + var/base_icon_state = "defibpaddles" + +/obj/item/shockpaddles/ComponentInitialize() . = ..() - if(!req_defib || listeningTo == user) + AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12) + +/obj/item/shockpaddles/Destroy() + defib = null + listeningTo = null + return ..() + +/obj/item/shockpaddles/equipped(mob/user, slot) + . = ..() + if(!req_defib) return - if(listeningTo) + if(listeningTo && listeningTo != user) UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/check_range) listeningTo = user - -/obj/item/twohanded/shockpaddles/Moved() - . = ..() check_range() +/obj/item/shockpaddles/Moved() + . = ..() + if(!istype(loc, /mob/living)) + check_range() -/obj/item/twohanded/shockpaddles/fire_act(exposed_temperature, exposed_volume) +/obj/item/shockpaddles/fire_act(exposed_temperature, exposed_volume) . = ..() if((req_defib && defib) && loc != defib) defib.fire_act(exposed_temperature, exposed_volume) -/obj/item/twohanded/shockpaddles/proc/check_range() - if(!req_defib) +/obj/item/shockpaddles/proc/check_range() + SIGNAL_HANDLER + + if(!req_defib || !defib) return if(!in_range(src,defib)) var/mob/living/L = loc if(istype(L)) - to_chat(L, "[defib]'s paddles overextend and come out of your hands!") - L.temporarilyRemoveItemFromInventory(src,TRUE) + snap_back(cause=SNAP_OVEREXTEND) else - visible_message("[src] snap back into [defib].") snap_back() -/obj/item/twohanded/shockpaddles/proc/recharge(var/time) +/obj/item/shockpaddles/proc/recharge(var/time) if(req_defib || !time) return cooldown = TRUE @@ -356,15 +363,19 @@ cooldown = FALSE update_icon() -/obj/item/twohanded/shockpaddles/New(mainunit) - ..() - if(check_defib_exists(mainunit, src) && req_defib) - defib = mainunit - forceMove(defib) - busy = FALSE - update_icon() +/obj/item/shockpaddles/Initialize() + . = ..() + ADD_TRAIT(src, TRAIT_NO_STORAGE_INSERT, GENERIC_ITEM_TRAIT) //stops shockpaddles from being inserted in BoH + if(!req_defib) + return //If it doesn't need a defib, just say it exists + if (!loc || !istype(loc, /obj/item/defibrillator)) //To avoid weird issues from admin spawns + return INITIALIZE_HINT_QDEL + defib = loc + busy = FALSE + update_icon() -/obj/item/twohanded/shockpaddles/update_icon() +/obj/item/shockpaddles/update_icon() + var/wielded = ISWIELDED(src) icon_state = "defibpaddles[wielded]" item_state = "defibpaddles[wielded]" if(cooldown) @@ -373,51 +384,56 @@ var/mob/living/carbon/C = loc C.update_inv_hands() -/obj/item/twohanded/shockpaddles/suicide_act(mob/user) +/obj/item/shockpaddles/suicide_act(mob/user) user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") if(req_defib) defib.deductcharge(revivecost) playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1) return (OXYLOSS) -/obj/item/twohanded/shockpaddles/dropped(mob/user) +/obj/item/shockpaddles/dropped(mob/user) if(!req_defib) return ..() if(listeningTo) UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) if(user) - var/obj/item/twohanded/offhand/O = user.get_inactive_held_item() - if(istype(O)) - O.unwield() - to_chat(user, "The paddles snap back into the main unit.") - snap_back() - return unwield(user) - -/obj/item/twohanded/shockpaddles/proc/snap_back() + UnregisterSignal(user, COMSIG_MOVABLE_MOVED) + if(!ismob(loc)) + snap_back() + return + +/obj/item/shockpaddles/proc/snap_back(cause=SNAP_DROP, silent=FALSE) if(!defib) return - defib.on = FALSE - forceMove(defib) - defib.update_icon() -/obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, mob/living/carbon/M, obj/O) - if(!req_defib) - return TRUE //If it doesn't need a defib, just say it exists - if (!mainunit || !istype(mainunit, /obj/item/defibrillator)) //To avoid weird issues from admin spawns - qdel(O) - return FALSE + if(ismob(loc)) + var/mob/M = loc + M.transferItemToLoc(src, defib) + if(!silent) + switch(cause) + if(SNAP_DROP) + to_chat(M, "The paddles snap back into the main unit.") + if(SNAP_OVEREXTEND) + to_chat(M, "[defib]'s paddles overextend and come out of your hands!") + if(SNAP_INTERACT) + to_chat(M, "You put back [src] into [defib]") else - return TRUE + if(!silent) + visible_message("[src] snaps back into [defib].") + forceMove(defib) -/obj/item/twohanded/shockpaddles/attack(mob/M, mob/user) + defib.on = FALSE + listeningTo = null + defib.update_icon() +/obj/item/shockpaddles/attack(mob/M, mob/user) if(busy) return if(req_defib && !defib.powered) user.visible_message("[defib] beeps: Unit is unpowered.") playsound(src, 'sound/machines/defib_failed.ogg', 50, 0) return - if(!wielded) + if(!ISWIELDED(src)) if(iscyborg(user)) to_chat(user, "You must activate the paddles in your active module before you can use them on someone!") else @@ -459,7 +475,7 @@ do_help(H, user) -/obj/item/twohanded/shockpaddles/proc/can_defib(mob/living/carbon/H) +/obj/item/shockpaddles/proc/can_defib(mob/living/carbon/H) var/obj/item/organ/heart = H.getorgan(/obj/item/organ/heart) if(H.suiciding || H.hellbound || HAS_TRAIT(H, TRAIT_HUSK)) return @@ -474,14 +490,14 @@ return return TRUE -/obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H) +/obj/item/shockpaddles/proc/shock_touching(dmg, mob/H) if(isliving(H.pulledby)) //CLEAR! var/mob/living/M = H.pulledby if(M.electrocute_act(30, H)) M.visible_message("[M] is electrocuted by [M.p_their()] contact with [H]!") M.emote("scream") -/obj/item/twohanded/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user) +/obj/item/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user) if(req_defib && defib.safety) return if(!req_defib && !combat) @@ -507,7 +523,7 @@ else recharge(60) -/obj/item/twohanded/shockpaddles/proc/do_harm(mob/living/carbon/H, mob/living/user) +/obj/item/shockpaddles/proc/do_harm(mob/living/carbon/H, mob/living/user) if(req_defib && defib.safety) return if(!req_defib && !combat) @@ -562,7 +578,7 @@ busy = FALSE update_icon() -/obj/item/twohanded/shockpaddles/proc/do_help(mob/living/carbon/H, mob/living/user) +/obj/item/shockpaddles/proc/do_help(mob/living/carbon/H, mob/living/user) user.visible_message("[user] begins to place [src] on [H]'s chest.", "You begin to place [src] on [H]'s chest...") busy = TRUE update_icon() @@ -665,14 +681,14 @@ busy = FALSE update_icon() -/obj/item/twohanded/shockpaddles/cyborg +/obj/item/shockpaddles/cyborg name = "cyborg defibrillator paddles" icon = 'icons/obj/defib.dmi' icon_state = "defibpaddles0" item_state = "defibpaddles0" req_defib = FALSE -/obj/item/twohanded/shockpaddles/cyborg/attack(mob/M, mob/user) +/obj/item/shockpaddles/cyborg/attack(mob/M, mob/user) if(iscyborg(user)) var/mob/living/silicon/robot/R = user if(R.emagged) @@ -684,7 +700,7 @@ . = ..() -/obj/item/twohanded/shockpaddles/syndicate +/obj/item/shockpaddles/syndicate name = "syndicate defibrillator paddles" desc = "A pair of paddles used to revive deceased operatives. They possess both the ability to penetrate armor and to deliver powerful or disabling shocks offensively." combat = TRUE @@ -692,7 +708,11 @@ icon_state = "defibpaddles0" item_state = "defibpaddles0" -/obj/item/twohanded/shockpaddles/syndicate/cyborg +/obj/item/shockpaddles/syndicate/cyborg req_defib = FALSE +#undef SNAP_DROP +#undef SNAP_OVEREXTEND +#undef SNAP_INTERACT + #undef HALFWAYCRITDEATH diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index f7d5b5e82f99b..1abb372c34ab6 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_EMPTY(PDAs) w_class = WEIGHT_CLASS_TINY slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT actions_types = list(/datum/action/item_action/toggle_light) - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100, "stamina" = 0) resistance_flags = FIRE_PROOF | ACID_PROOF @@ -49,6 +49,7 @@ GLOBAL_LIST_EMPTY(PDAs) //Secondary variables var/scanmode = PDA_SCANNER_NONE var/fon = FALSE //Is the flashlight function on? + var/shorted = FALSE //Is the flashlight shorted out? var/f_lum = 2.3 //Luminosity for the flashlight function var/silent = FALSE //To beep or not to beep, that is the question var/toff = FALSE //If TRUE, messenger disabled @@ -76,7 +77,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/datum/picture/picture //Scanned photo - var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/clothing/mask/cigarette, /obj/item/electronic_assembly/small) + var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/clothing/mask/cigarette) var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above. var/overlays_x_offset = 0 //x offset to use for certain overlays @@ -279,8 +280,6 @@ GLOBAL_LIST_EMPTY(PDAs) if (cartridge) if(cartridge.bot_access_flags) dat += "" + dat += "[GLOB.gas_data.names[id]]: [round(gas_level*100, 0.01)]%
" dat += "Temperature: [round(environment.return_temperature()-T0C)]°C
" dat += "
" @@ -404,7 +403,8 @@ GLOBAL_LIST_EMPTY(PDAs) //BASIC FUNCTIONS=================================== if("Refresh")//Refresh, goes to the end of the proc. - + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if ("Toggle_Font") //CODE REVISION 2 font_index = (font_index + 1) % 4 @@ -418,13 +418,16 @@ GLOBAL_LIST_EMPTY(PDAs) font_mode = FONT_ORBITRON if (MODE_VT) font_mode = FONT_VT + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if ("Change_Color") var/new_color = input("Please enter a color name or hex value (Default is \'#808000\').",background_color)as color background_color = new_color if ("Toggle_Underline") underline_flag = !underline_flag - + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("Return")//Return if(mode<=9) mode = 0 @@ -432,6 +435,8 @@ GLOBAL_LIST_EMPTY(PDAs) mode = round(mode/10) if(mode==4 || mode == 5)//Fix for cartridges. Redirects to hub. mode = 0 + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if ("Authenticate")//Checks for ID id_check(U) if("UpdateInfo") @@ -439,34 +444,57 @@ GLOBAL_LIST_EMPTY(PDAs) if(istype(id, /obj/item/card/id/syndicate)) owner = id.registered_name update_label() + if(!silent) + playsound(src, 'sound/machines/terminal_processing.ogg', 15, TRUE) + addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/machines/terminal_success.ogg', 15, TRUE), 1.3 SECONDS) if("Eject")//Ejects the cart, only done from hub. eject_cart(U) + if(!silent) + playsound(src, 'sound/machines/terminal_eject.ogg', 50, TRUE) //MENU FUNCTIONS=================================== if("0")//Hub mode = 0 + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("1")//Notes mode = 1 + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("2")//Messenger mode = 2 + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("21")//Read messeges mode = 21 + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("3")//Atmos scan mode = 3 + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("4")//Redirects to hub mode = 0 + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) + + //MAIN FUNCTIONS=================================== if("Light") toggle_light(U) + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("Medical Scan") if(scanmode == PDA_SCANNER_MEDICAL) scanmode = PDA_SCANNER_NONE else if((!isnull(cartridge)) && (cartridge.access & CART_MEDICAL)) scanmode = PDA_SCANNER_MEDICAL + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("Reagent Scan") if(scanmode == PDA_SCANNER_REAGENT) scanmode = PDA_SCANNER_NONE @@ -477,6 +505,8 @@ GLOBAL_LIST_EMPTY(PDAs) scanmode = PDA_SCANNER_NONE else if((!isnull(cartridge)) && (cartridge.access & CART_ENGINE)) scanmode = PDA_SCANNER_HALOGEN + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("Honk") if ( !(last_noise && world.time < last_noise + 20) ) playsound(src, 'sound/items/bikehorn.ogg', 50, 1) @@ -490,6 +520,8 @@ GLOBAL_LIST_EMPTY(PDAs) scanmode = PDA_SCANNER_NONE else if((!isnull(cartridge)) && (cartridge.access & CART_ATMOS)) scanmode = PDA_SCANNER_GAS + if(!silent) + playsound(src, 'sound/machines/terminal_select.ogg', 15, TRUE) if("Drone Phone") var/alert_s = input(U,"Alert severity level","Ping Drones",null) as null|anything in list("Low","Medium","High","Critical") var/area/A = get_area(U) @@ -497,6 +529,8 @@ GLOBAL_LIST_EMPTY(PDAs) var/msg = "NON-DRONE PING: [U.name]: [alert_s] priority alert in [A.name]!" _alert_drones(msg, TRUE, U) to_chat(U, msg) + if(!silent) + playsound(src, 'sound/machines/terminal_success.ogg', 15, TRUE) //NOTEKEEPER FUNCTIONS=================================== @@ -538,7 +572,8 @@ GLOBAL_LIST_EMPTY(PDAs) sort_by_job = !sort_by_job if("MessageAll") - send_to_all(U) + if(cartridge?.spam_enabled) + send_to_all(U) if("cart") if(cartridge) @@ -602,6 +637,7 @@ GLOBAL_LIST_EMPTY(PDAs) to_chat(usr, "You remove the ID from the [name].") id = null update_icon() + playsound(src, 'sound/machines/terminal_eject.ogg', 50, TRUE) if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.wear_id == src) @@ -677,6 +713,8 @@ GLOBAL_LIST_EMPTY(PDAs) // If it didn't reach, note that fact if (!signal.data["done"]) to_chat(user, "ERROR: Server isn't responding.") + if(!silent) + playsound(src, 'sound/machines/terminal_error.ogg', 15, TRUE) return var/target_text = signal.format_target() @@ -694,6 +732,11 @@ GLOBAL_LIST_EMPTY(PDAs) // Log in the talk log user.log_talk(message, LOG_PDA, tag="PDA: [initial(name)] to [target_text]") to_chat(user, "PDA message sent to [target_text]: \"[message]\"") + if(!silent) + if(HAS_TRAIT(SSstation, STATION_TRAIT_PDA_GLITCHED)) + playsound(src, pick('sound/machines/twobeep_voice1.ogg', 'sound/machines/twobeep_voice2.ogg'), 50, TRUE) + else + playsound(src, 'sound/machines/terminal_success.ogg', 15, TRUE) // Reset the photo picture = null last_text = world.time @@ -704,7 +747,10 @@ GLOBAL_LIST_EMPTY(PDAs) tnote += "← From [signal.data["name"]] ([signal.data["job"]]):
[signal.format_message()]
" if (!silent) - playsound(src, 'sound/machines/twobeep_high.ogg', 50, 1) + if(HAS_TRAIT(SSstation, STATION_TRAIT_PDA_GLITCHED)) + playsound(src, pick('sound/machines/twobeep_voice1.ogg', 'sound/machines/twobeep_voice2.ogg'), 50, TRUE) + else + playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE) audible_message("[icon2html(src, hearers(src))] *[ttone]*", null, 3) //Search for holder of the PDA. var/mob/living/L = null @@ -744,8 +790,6 @@ GLOBAL_LIST_EMPTY(PDAs) send_message(U,list(P)) /obj/item/pda/AltClick(mob/user) - ..() - if(id) remove_id(user) else @@ -795,18 +839,17 @@ GLOBAL_LIST_EMPTY(PDAs) eject_cart(usr) /obj/item/pda/proc/toggle_light(mob/user) - if(issilicon(user) || !user.canUseTopic(src, BE_CLOSE)) - return - if(fon) - fon = FALSE - set_light(0) - else if(f_lum) - fon = TRUE - set_light(f_lum) - update_icon() - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() + if(issilicon(user) || !user.canUseTopic(src, BE_CLOSE)) + return + if(shorted) + to_chat(user, "[src]'s light is not turning on!") + return + fon = !fon + set_light(fon ? f_lum : 0) + update_icon() + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() /obj/item/pda/proc/remove_pen(mob/user) @@ -818,6 +861,7 @@ GLOBAL_LIST_EMPTY(PDAs) to_chat(user, "You remove [inserted_item] from [src].") inserted_item = null update_icon() + playsound(src, 'sound/machines/pda_button2.ogg', 50, TRUE) else to_chat(user, "This PDA does not have a pen in it!") @@ -856,6 +900,35 @@ GLOBAL_LIST_EMPTY(PDAs) if(old_id) user.put_in_hands(old_id) update_icon() + playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE) + return TRUE + +/obj/item/pda/pre_attack(obj/target, mob/living/user, params) + if(!ismachinery(target)) + return ..() + var/obj/machinery/target_machine = target + if(!target_machine.panel_open && !istype(target, /obj/machinery/computer)) + return ..() + if(!istype(cartridge, /obj/item/cartridge/virus/clown)) + return ..() + var/obj/item/cartridge/virus/installed_cartridge = cartridge + + if(installed_cartridge.charges <=0) + balloon_alert(user, "Out of charges") + return ..() + + if(target.GetComponent(/datum/component/sound_player)) + balloon_alert(user, "This is already hacked") + return + + balloon_alert(user, "Virus uploaded") + var/list/sig_list = list() + if(istype(target, /obj/machinery/door/airlock)) + sig_list += list(COMSIG_AIRLOCK_OPEN, COMSIG_AIRLOCK_CLOSE) + else + sig_list += list(COMSIG_ATOM_ATTACK_HAND) + installed_cartridge.charges-- + target.AddComponent(/datum/component/sound_player, amount = (rand(30,50)), signal_or_sig_list = sig_list) return TRUE // access to status display signals @@ -869,17 +942,25 @@ GLOBAL_LIST_EMPTY(PDAs) to_chat(user, "You insert [cartridge] into [src].") updateSelfDialog() update_icon() + if(HAS_TRAIT(SSstation, STATION_TRAIT_PDA_GLITCHED)) + playsound(src, pick('sound/machines/twobeep_voice1.ogg', 'sound/machines/twobeep_voice2.ogg'), 50, TRUE) + else + playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE) else if(istype(C, /obj/item/card/id)) var/obj/item/card/id/idcard = C if(!idcard.registered_name) to_chat(user, "\The [src] rejects the ID!") + if(!silent) + playsound(src, 'sound/machines/terminal_error.ogg', 50, TRUE) return if(!owner) owner = idcard.registered_name ownjob = idcard.assignment update_label() to_chat(user, "Card scanned.") + if(!silent) + playsound(src, 'sound/machines/terminal_success.ogg', 50, TRUE) else if(!id_check(user, idcard)) return @@ -904,6 +985,7 @@ GLOBAL_LIST_EMPTY(PDAs) to_chat(user, "You slide \the [C] into \the [src].") inserted_item = C update_icon() + playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE) else if(istype(C, /obj/item/photo)) var/obj/item/photo/P = C picture = P.picture @@ -935,16 +1017,19 @@ GLOBAL_LIST_EMPTY(PDAs) return switch(scanmode) if(PDA_SCANNER_REAGENT) - if(!isnull(A.reagents)) - if(A.reagents.reagent_list.len > 0) - var/reagents_length = A.reagents.reagent_list.len - to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.") - for (var/re in A.reagents.reagent_list) - to_chat(user, "\t [re]") + if(!istype(A, /obj/item/reagent_containers/pill/floorpill)) + if(!isnull(A.reagents)) + if(A.reagents.reagent_list.len > 0) + var/reagents_length = A.reagents.reagent_list.len + to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.") + for (var/re in A.reagents.reagent_list) + to_chat(user, "\t [re]") + else + to_chat(user, "No active chemical agents found in [A].") else - to_chat(user, "No active chemical agents found in [A].") + to_chat(user, "No significant chemical agents found in [A].") else - to_chat(user, "No significant chemical agents found in [A].") + to_chat(user, "You can't scan [A].") if(PDA_SCANNER_GAS) A.analyzer_act(user, src) @@ -971,7 +1056,7 @@ GLOBAL_LIST_EMPTY(PDAs) if (ismob(loc)) var/mob/M = loc - M.show_message("Your [src] explodes!", 1) + M.show_message("Your [src] explodes!", MSG_VISUAL, "You hear a loud *pop*!", MSG_AUDIBLE) else visible_message("[src] explodes!", "You hear a loud *pop*!") @@ -1069,13 +1154,16 @@ GLOBAL_LIST_EMPTY(PDAs) // Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP /obj/item/pda/emp_act(severity) . = ..() - if (!(. & EMP_PROTECT_CONTENTS)) + if(!(. & EMP_PROTECT_CONTENTS)) for(var/atom/A in src) A.emp_act(severity) - if (!(. & EMP_PROTECT_SELF)) + if(!(. & EMP_PROTECT_SELF)) emped += 1 - spawn(200 * severity) - emped -= 1 + var/emptime = 200 * severity + addtimer(CALLBACK(src, .proc/decrease_emp_level), emptime) + +/obj/item/pda/proc/decrease_emp_level() + emped -= 1 /proc/get_viewable_pdas(sort_by_job = FALSE) . = list() diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index 911b19ca3b73f..85add56b0218e 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -18,6 +18,7 @@ var/obj/item/cartridge/virus/clown/cart = cartridge if(istype(cart) && cart.charges < 5) cart.charges++ + playsound(src,'sound/machines/ping.ogg', 30, TRUE) //Mime PDA sends "silent" messages. /obj/item/pda/mime @@ -153,6 +154,10 @@ name = "shaft miner PDA" icon_state = "pda-miner" +/obj/item/pda/exploration + name = "exploration PDA" + icon_state = "pda-exploration" + /obj/item/pda/syndicate default_cartridge = /obj/item/cartridge/virus/syndicate icon_state = "pda-syndi" @@ -228,6 +233,7 @@ desc = "A shitty knockoff of a portable microcomputer by Thinktronic Systems, LTD. Complete with a cracked operating system." note = "Error: Unlicensed OS. Please contact your supervisor." icon_state = "pda-knockoff" + inserted_item = /obj/item/pen/charcoal /obj/item/pda/celebrity name = "fancy PDA" diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 5f815eb551e40..2de3276a7cf62 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -6,14 +6,13 @@ #define CART_MANIFEST (1<<4) #define CART_CLOWN (1<<5) #define CART_MIME (1<<6) -#define CART_JANITOR (1<<7) -#define CART_REAGENT_SCANNER (1<<8) -#define CART_NEWSCASTER (1<<9) -#define CART_REMOTE_DOOR (1<<10) -#define CART_STATUS_DISPLAY (1<<11) -#define CART_QUARTERMASTER (1<<12) -#define CART_HYDROPONICS (1<<13) -#define CART_DRONEPHONE (1<<14) +#define CART_REAGENT_SCANNER (1<<7) +#define CART_NEWSCASTER (1<<8) +#define CART_REMOTE_DOOR (1<<9) +#define CART_STATUS_DISPLAY (1<<10) +#define CART_QUARTERMASTER (1<<11) +#define CART_HYDROPONICS (1<<12) +#define CART_DRONEPHONE (1<<13) /obj/item/cartridge @@ -96,7 +95,7 @@ name = "\improper CustodiPRO cartridge" desc = "The ultimate in clean-room design." icon_state = "cart-j" - access = CART_JANITOR | CART_DRONEPHONE + access = CART_DRONEPHONE bot_access_flags = CLEAN_BOT /obj/item/cartridge/lawyer @@ -147,7 +146,7 @@ /obj/item/cartridge/hop name = "\improper HumanResources9001 cartridge" icon_state = "cart-h" - access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_JANITOR | CART_SECURITY | CART_NEWSCASTER | CART_QUARTERMASTER | CART_DRONEPHONE + access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_SECURITY | CART_NEWSCASTER | CART_QUARTERMASTER | CART_DRONEPHONE bot_access_flags = MULE_BOT | CLEAN_BOT /obj/item/cartridge/hos @@ -264,7 +263,7 @@ Code: for(var/obj/machinery/computer/monitor/pMon in GLOB.machines) if(pMon.stat & (NOPOWER | BROKEN)) //check to make sure the computer is functional continue - if(pda_turf.z != pMon.z) //and that we're on the same zlevel as the computer (lore: limited signal strength) + if(pda_turf.get_virtual_z_level() != pMon.get_virtual_z_level()) //and that we're on the same zlevel as the computer (lore: limited signal strength) continue if(pMon.is_secret_monitor) //make sure it isn't a secret one (ie located on a ruin), allowing people to metagame that the location exists continue @@ -312,7 +311,10 @@ Code: //would be to use [A.area.name] for(var/obj/machinery/power/apc/A in L) menu += copytext_char(add_trailing(A.area.name, 30, " "), 1, 30) - menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_leading(DisplayPower(A.lastused_total), 6, " ")] [A.cell ? "[add_leading(round(A.cell.percent()), 3, " ")]% [chg[A.charging+1]]" : " N/C"]
" + if(A.integration_cog) + menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_leading(DisplayPower(A.lastused_total), 6, " ")] 100% F
" + else + menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_leading(DisplayPower(A.lastused_total), 6, " ")] [A.cell ? "[add_leading("[round(A.cell.percent())]", 3, " ")]% [chg[A.charging+1]]" : " N/C"]
" menu += "" @@ -386,24 +388,7 @@ Code: if(active3 in GLOB.data_core.security) menu += "Criminal Status: [active3.fields["criminal"]]
" - menu += text("
\nMinor Crimes:") - - menu +={"
| Crime | -Details | -Author | -Time Added | -
|---|---|---|---|
| [c.crimeName] | " - menu += "[c.crimeDetails] | " - menu += "[c.author] | " - menu += "[c.time] | " - menu += "
\nMajor Crimes:") + menu += text("
\nCrimes:") menu +={"
| Author | Time Added | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| [c.crimeName] | " menu += "[c.crimeDetails] | " menu += "[c.author] | " @@ -476,68 +461,6 @@ Code: menu += "No ore silo detected!" menu = jointext(menu, "") - if (49) //janitorial locator - menu = "||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| [entry] | [functions] | |||||||||||||||||||||||||||||||||||||||||||||
| [entry] | [functions] | |||||||||||||||||||||||||||||||||||||||||||||
| Upper | Game 1 | Game 2 | Game 3 |
|---|---|---|---|
| Aces | \[___\] | \[___\] | \[___\] | Twos | \[___\] | \[___\] | \[___\] | Threes | \[___\] | \[___\] | \[___\] | Fours | \[___\] | \[___\] | \[___\] | Fives | \[___\] | \[___\] | \[___\] | Sixes | \[___\] | \[___\] | \[___\] | Total | \[___\] | \[___\] | \[___\] | Upper Total | \[___\] | \[___\] | \[___\] | Bonus | \[___\] | \[___\] | \[___\] | 1 Pair | \[___\] | \[___\] | \[___\] | 2 Pairs | \[___\] | \[___\] | \[___\] | 3 of a Kind | \[___\] | \[___\] | \[___\] | 4 of a Kind | \[___\] | \[___\] | \[___\] | Full House | \[___\] | \[___\] | \[___\] | Sm. Straight | \[___\] | \[___\] | \[___\] | Lg. Straight | \[___\] | \[___\] | \[___\] | Yatzy | \[___\] | \[___\] | \[___\] | Chance | \[___\] | \[___\] | \[___\] | Lower Total | \[___\] | \[___\] | \[___\] | Grand Total | \[___\] | \[___\] | \[___\] |
Playback
" - if(!playing) - dat += "Play Stop" - dat += "Repeat Song: " - dat += repeat > 0 ? "--" : "--" - dat += " [repeat] times " - dat += repeat < max_repeats ? "++" : "++" - dat += "
" - else - dat += "Play Stop
" - dat += "Repeats left: [repeat]
" - if(!edit) - dat += "
Show Editor
" - else - dat += "
Editing
" - dat += "Hide Editor" - dat += " Start a New Song" - dat += " Import a Song" - var/bpm = round(600 / tempo) - dat += "Tempo: - [bpm] BPM +
" - var/linecount = 0 - for(var/line in lines) - linecount += 1 - dat += "Line [linecount]: Edit X [line]
" - dat += "Add Line
" - if(help) - dat += "Hide Help
" - dat += {" - Lines are a series of chords, separated by commas (,), each with notes separated by hyphens (-).
- Every note in a chord will play together, with chord timed by the tempo.
-
- Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.
- By default, every note is natural and in octave 3. Defining otherwise is remembered for each note.
- Example: C,D,E,F,G,A,B will play a C major scale.
- After a note has an accidental placed, it will be remembered: C,C4,C,C3 is C3,C4,C4,C3
- Chords can be played simply by seperating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B
- A pause may be denoted by an empty chord: C,E,,C,G
- To make a chord be a different time, end it with /x, where the chord length will be length
- defined by tempo / x: C,G/2,E/4
- Combined, an example is: E-E4/4,F#/2,G#/8,B/8,E3-E4/4 -
- Lines may be up to [MUSIC_MAXLINECHARS] characters.
- A song may only contain up to [MUSIC_MAXLINES] lines.
- "} - else - dat += "Show Help
" - - var/datum/browser/popup = new(user, "instrument", instrumentObj.name, 700, 500) - popup.set_content(dat) - popup.open() - -/datum/song/proc/ParseSong(text) - set waitfor = FALSE - //split into lines - lines = splittext(text, "\n") - if(lines.len) - var/bpm_string = "BPM: " - if(findtext(lines[1], bpm_string, 1, length(bpm_string) + 1)) - tempo = sanitize_tempo(600 / text2num(copytext(lines[1], length(bpm_string) + 1))) - lines.Cut(1, 2) - else - tempo = sanitize_tempo(5) // default 120 BPM - if(lines.len > MUSIC_MAXLINES) - to_chat(usr, "Too many lines!") - lines.Cut(MUSIC_MAXLINES + 1) - var/linenum = 1 - for(var/l in lines) - if(length_char(l) > MUSIC_MAXLINECHARS) - to_chat(usr, "Line [linenum] too long!") - lines.Remove(l) - else - linenum++ - updateDialog(usr) // make sure updates when complete - -/datum/song/Topic(href, href_list) - if(!usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK)) - usr << browse(null, "window=instrument") - usr.unset_machine() - return - - instrumentObj.add_fingerprint(usr) - - if(href_list["newsong"]) - lines = new() - tempo = sanitize_tempo(5) // default 120 BPM - name = "" - - else if(href_list["import"]) - var/t = "" - do - t = stripped_multiline_input(usr, "Please paste the entire song, formatted:", text("[]", name), t, MUSIC_MAXLINES*MUSIC_MAXLINECHARS) - if(!usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK)) - return - - if(length(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS) - var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no") - if(!usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK)) - return - if(cont == "no") - break - while(length(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS) - ParseSong(t) - - else if(href_list["help"]) - help = text2num(href_list["help"]) - 1 - - else if(href_list["edit"]) - edit = text2num(href_list["edit"]) - 1 - - if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops. - if(playing) - return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing. - repeat += round(text2num(href_list["repeat"])) - if(repeat < 0) - repeat = 0 - if(repeat > max_repeats) - repeat = max_repeats - - else if(href_list["tempo"]) - tempo = sanitize_tempo(tempo + text2num(href_list["tempo"])) - - else if(href_list["play"]) - playing = TRUE - spawn() - playsong(usr) - - else if(href_list["newline"]) - var/newline = stripped_input(usr, "Enter your line: ", instrumentObj.name, max_length=MUSIC_MAXLINECHARS) - if(!newline || !usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK)) - return - if(lines.len > MUSIC_MAXLINES) - return - if(length_char(newline) > MUSIC_MAXLINECHARS) - newline = copytext_char(newline, 1, MUSIC_MAXLINECHARS) - lines.Add(newline) - - else if(href_list["deleteline"]) - var/num = round(text2num(href_list["deleteline"])) - if(num > lines.len || num < 1) - return - lines.Cut(num, num+1) - - else if(href_list["modifyline"]) - var/num = round(text2num(href_list["modifyline"]),1) - var/content = stripped_input(usr, "Enter your line: ", instrumentObj.name, lines[num], max_length=MUSIC_MAXLINECHARS) - if(!content || !usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK)) - return - if(num > lines.len || num < 1) - return - lines[num] = content - - else if(href_list["stop"]) - playing = FALSE - hearing_mobs = null - - updateDialog(usr) - return - -/datum/song/proc/sanitize_tempo(new_tempo) - new_tempo = abs(new_tempo) - return max(round(new_tempo, world.tick_lag), world.tick_lag) - -// subclass for handheld instruments, like violin -/datum/song/handheld - -/datum/song/handheld/updateDialog(mob/user) - instrumentObj.interact(user) - -/datum/song/handheld/shouldStopPlaying() - if(instrumentObj) - return !isliving(instrumentObj.loc) - else - return TRUE - - -////////////////////////////////////////////////////////////////////////// - - -/obj/structure/piano - name = "space minimoog" - icon = 'icons/obj/musician.dmi' - icon_state = "minimoog" - anchored = TRUE - density = TRUE - var/datum/song/song - -/obj/structure/piano/unanchored - anchored = FALSE - -/obj/structure/piano/Initialize() - . = ..() - song = new("piano", src) - - if(prob(50) && icon_state == initial(icon_state)) - name = "space minimoog" - desc = "This is a minimoog, like a space piano, but more spacey!" - icon_state = "minimoog" - else - name = "space piano" - desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't." - icon_state = "piano" - -/obj/structure/piano/Destroy() - qdel(song) - song = null - return ..() - -/obj/structure/piano/Initialize(mapload) - . = ..() - if(mapload) - song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded - -/obj/structure/piano/attack_hand(mob/user) - . = ..() - if(.) - return - interact(user) - -/obj/structure/piano/attack_paw(mob/user) - return attack_hand(user) - -/obj/structure/piano/interact(mob/user) - ui_interact(user) - -/obj/structure/piano/ui_interact(mob/user) - if(!user || !anchored) - return - - if(!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") - return 1 - user.set_machine(src) - song.interact(user) - -/obj/structure/piano/wrench_act(mob/living/user, obj/item/I) - default_unfasten_wrench(user, I, 40) - return TRUE diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 7e8bf6819a0d4..e64dc19f77d69 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -1,11 +1,15 @@ +#define MAX_NOTICES 5 + /obj/structure/noticeboard name = "notice board" desc = "A board for pinning important notices upon." icon = 'icons/obj/stationobjs.dmi' icon_state = "nboard00" + layer = ABOVE_WINDOW_LAYER density = FALSE anchored = TRUE max_integrity = 150 + // Current number of a pinned notices var/notices = 0 /obj/structure/noticeboard/Initialize(mapload) @@ -15,7 +19,7 @@ return for(var/obj/item/I in loc) - if(notices > 4) + if(notices >= MAX_NOTICES) break if(istype(I, /obj/item/paper)) I.forceMove(src) @@ -28,7 +32,7 @@ if(!allowed(user)) to_chat(user, "You are not authorized to add notices") return - if(notices < 5) + if(notices < MAX_NOTICES) if(!user.transferItemToLoc(O, src)) return notices++ @@ -39,54 +43,71 @@ else return ..() -/obj/structure/noticeboard/interact(mob/user) - ui_interact(user) - -/obj/structure/noticeboard/ui_interact(mob/user) +/obj/structure/noticeboard/ui_state(mob/user) + return GLOB.physical_state + +/obj/structure/noticeboard/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "NoticeBoard", name) + ui.open() + +/obj/structure/noticeboard/ui_data(mob/user) + var/list/data = list() + data["allowed"] = allowed(user) + data["items"] = list() + for(var/obj/item/content in contents) + var/list/content_data = list( + name = content.name, + ref = REF(content) + ) + data["items"] += list(content_data) + return data + +/obj/structure/noticeboard/ui_act(action, params) . = ..() - var/auth = allowed(user) - var/dat = "[name]
" - for(var/obj/item/P in src) - if(istype(P, /obj/item/paper)) - dat += "[P.name] [auth ? "Write Remove" : ""]
" - else - dat += "[P.name] [auth ? "Remove" : ""]
" - user << browse("
First Seen: [M.client.player_join_date]
Byond account registered on: [M.client.account_join_date]" + + if(M.client?.tgui_panel) + body += M.client.tgui_panel.show_notices() //The datum holds a reference to the client already, no need to pass it. + else //This should never happen in practice. + body += "
Telemetry Status: USER CHAT NOT LOADED, CALL A CODER MAYBE?" + body += "
CentCom Galactic Ban DB: " if(CONFIG_GET(string/centcom_ban_db)) body += "Search" @@ -254,7 +259,7 @@ dat+="
The newscaster recognises you as:
[src.admin_signature]" if(1) dat+= "Station Feed Channels
" - if( isemptylist(GLOB.news_network.network_channels) ) + if( !length(GLOB.news_network.network_channels) ) dat+="No active channels found..." else for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels) @@ -307,7 +312,7 @@ dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.
" else - if( isemptylist(src.admincaster_feed_channel.messages) ) + if( !length(src.admincaster_feed_channel.messages) ) dat+="No feed messages found in channel...
" else var/i = 0 @@ -329,7 +334,7 @@ dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
" dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it." dat+="
Select Feed channel to get Stories from:
" - if(isemptylist(GLOB.news_network.network_channels)) + if(!length(GLOB.news_network.network_channels)) dat+="No feed channels found active...
" else for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels) @@ -340,7 +345,7 @@ dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed" dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
" - if(isemptylist(GLOB.news_network.network_channels)) + if(!length(GLOB.news_network.network_channels)) dat+="No feed channels found active...
" else for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels) @@ -351,7 +356,7 @@ dat+="[src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.returnAuthor(-1)] \]
" dat+="[(src.admincaster_feed_channel.authorCensor) ? ("Undo Author censorship") : ("Censor channel Author")]
" - if( isemptylist(src.admincaster_feed_channel.messages) ) + if( !length(src.admincaster_feed_channel.messages) ) dat+="No feed messages found in channel...
" else for(var/datum/newscaster/feed_message/MESSAGE in src.admincaster_feed_channel.messages) @@ -368,7 +373,7 @@ dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.
" else - if( isemptylist(src.admincaster_feed_channel.messages) ) + if( !length(src.admincaster_feed_channel.messages) ) dat+="No feed messages found in channel...
" else for(var/datum/newscaster/feed_message/MESSAGE in src.admincaster_feed_channel.messages) @@ -438,8 +443,7 @@ "} if(GLOB.master_mode == "secret") dat += "(Force Secret Mode)
" - - if(GLOB.master_mode == "dynamic") + if(SSticker.is_mode("dynamic")) if(SSticker.current_state <= GAME_STATE_PREGAME) dat += "(Force Roundstart Rulesets)
" if (GLOB.dynamic_forced_roundstart_ruleset.len > 0) @@ -543,27 +547,12 @@ No stacking: - Option is [GLOB.dynamic_no_stacking ? "ON" : "OFF"].
Unless the threat goes above [GLOB.dynamic_stacking_limit], only one "round-ender" ruleset will be drafted.
- Classic secret mode: - Option is [GLOB.dynamic_classic_secret ? "ON" : "OFF"]. -
Only one roundstart ruleset will be drafted. Only traitors and minor roles will latespawn.
-
-
Forced threat level: Current value : [GLOB.dynamic_forced_threat_level].
The value threat is set to if it is higher than -1.
- High population limit: Current value : [GLOB.dynamic_high_pop_limit]. -
The threshold at which "high population override" will be in effect.
Stacking threeshold: Current value : [GLOB.dynamic_stacking_limit].
The threshold at which "round-ender" rulesets will stack. A value higher than 100 ensure this never happens.
-
Advanced parameters
- Curve centre: -> [GLOB.dynamic_curve_centre] <-- Curve width: -> [GLOB.dynamic_curve_width] <-
- Latejoin injection delay:
- Minimum: -> [GLOB.dynamic_latejoin_delay_min / 60 / 10] <- Minutes
- Maximum: -> [GLOB.dynamic_latejoin_delay_max / 60 / 10] <- Minutes
- Midround injection delay:
- Minimum: -> [GLOB.dynamic_midround_delay_min / 60 / 10] <- Minutes
- Maximum: -> [GLOB.dynamic_midround_delay_max / 60 / 10] <- Minutes
"} user << browse(dat, "window=dyn_mode_options;size=900x650") @@ -704,7 +693,7 @@ log_admin("[key_name(usr)] delayed the round start.") else to_chat(world, "The game will start in [DisplayTimeText(newtime)].") - SEND_SOUND(world, sound('sound/ai/attention.ogg')) + SEND_SOUND(world, sound('sound/ai/default/attention.ogg')) log_admin("[key_name(usr)] set the pre-game delay to [DisplayTimeText(newtime)].") SSblackbox.record_feedback("tally", "admin_verb", 1, "Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -716,6 +705,9 @@ SSticker.admin_delay_notice = input(usr, "Enter a reason for delaying the round end", "Round Delay Reason") as null|text if(isnull(SSticker.admin_delay_notice)) return + for(var/client/admin in GLOB.admins) + if(check_rights(R_FUN) && !GLOB.battle_royale && admin.tgui_panel && SSticker.current_state == GAME_STATE_FINISHED) + admin.tgui_panel.give_br_popup() else if(alert(usr, "Really cancel current round end delay? The reason for the current delay is: \"[SSticker.admin_delay_notice]\"", "Undelay round end", "Yes", "No") != "Yes") return @@ -783,7 +775,7 @@ var/obj/structure/closet/supplypod/centcompod/pod = new() var/atom/A = new chosen(pod) A.flags_1 |= ADMIN_SPAWNED_1 - new /obj/effect/DPtarget(T, pod) + new /obj/effect/pod_landingzone(T, pod) log_admin("[key_name(usr)] pod-spawned [chosen] at [AREACOORD(usr)]") SSblackbox.record_feedback("tally", "admin_verb", 1, "Podspawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -855,20 +847,26 @@ for(var/i in GLOB.silicon_mobs) var/mob/living/silicon/S = i ai_number++ + var/message = "" if(isAI(S)) - to_chat(usr, "AI [key_name(S, usr)]'s laws:") + message += "AI [key_name(S, usr)]'s laws:" else if(iscyborg(S)) var/mob/living/silicon/robot/R = S - to_chat(usr, "CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [key_name(R.connected_ai)])":"(Independent)"]: laws:") + message += "CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [key_name(R.connected_ai)])":"(Independent)"]: laws:" else if (ispAI(S)) - to_chat(usr, "pAI [key_name(S, usr)]'s laws:") + message += "pAI [key_name(S, usr)]'s laws:" else - to_chat(usr, "SOMETHING SILICON [key_name(S, usr)]'s laws:") + message += "SOMETHING SILICON [key_name(S, usr)]'s laws:" + + message += "
" if (S.laws == null) - to_chat(usr, "[key_name(S, usr)]'s laws are null?? Contact a coder.") + message += "[key_name(S, usr)]'s laws are null?? Contact a coder." else - S.laws.show_laws(usr) + message += jointext(S.laws.get_law_list(include_zeroth = TRUE), "
") + + to_chat(usr, message) + if(!ai_number) to_chat(usr, "No AIs located" ) @@ -979,7 +977,7 @@ if (!frommob || !tomob) //make sure the mobs don't go away while we waited for a response return 1 - tomob.ghostize(0) + tomob.ghostize(FALSE) message_admins("[key_name_admin(usr)] has put [frommob.key] in control of [tomob.name].") log_admin("[key_name(usr)] stuffed [frommob.key] into [tomob.name].") diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index c6a4850f4677f..0fbc143c21639 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -1,5 +1,5 @@ /atom/proc/investigate_log(message, subject) - if(!message || !subject) + if(!message || !subject || SSticker.current_state == GAME_STATE_FINISHED) return var/F = file("[GLOB.log_directory]/[subject].html") WRITE_FILE(F, "[time_stamp()] [REF(src)] ([x],[y],[z]) || [src] [message]
") @@ -10,7 +10,7 @@ if(!holder) return - var/list/investigates = list(INVESTIGATE_RESEARCH, INVESTIGATE_EXONET, INVESTIGATE_PORTAL, INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY, INVESTIGATE_HALLUCINATIONS, INVESTIGATE_RADIATION, INVESTIGATE_NANITES, INVESTIGATE_PRESENTS, INVESTIGATE_CIRCUIT) + var/list/investigates = list(INVESTIGATE_RESEARCH, INVESTIGATE_EXONET, INVESTIGATE_PORTAL, INVESTIGATE_ENGINES, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY, INVESTIGATE_HALLUCINATIONS, INVESTIGATE_RADIATION, INVESTIGATE_NANITES, INVESTIGATE_PRESENTS) var/list/logs_present = list("notes, memos, watchlist") var/list/logs_missing = list("---") diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 3e31b85456999..e4d0de3140455 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -10,6 +10,7 @@ GLOBAL_PROTECT(protected_ranks) var/exclude_rights = 0 var/include_rights = 0 var/can_edit_rights = 0 + var/badge_icon /datum/admin_rank/New(init_name, init_rights, init_exclude_rights, init_edit_rights) if(IsAdminAdvancedProcCall()) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 11d86ba64f833..9ff7bee9da21d 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -18,7 +18,8 @@ GLOBAL_PROTECT(admin_verbs_default) /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/stop_sounds, - /client/proc/mark_datum_mapview + /client/proc/mark_datum_mapview, + /client/proc/requests ) GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin()) GLOBAL_PROTECT(admin_verbs_admin) @@ -27,9 +28,10 @@ GLOBAL_PROTECT(admin_verbs_admin) /client/proc/invisimin, /*allows our mob to go invisible/visible*/ // /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/ - /datum/verbs/menu/Admin/verb/playerpanel, + /client/proc/playerpanel, /client/proc/game_panel, /*game panel, allows to change game-mode etc*/ /client/proc/check_ai_laws, /*shows AI and borg laws*/ + /client/proc/ghost_pool_protection, /*opens a menu for toggling ghost roles*/ /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ /datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/ /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ @@ -77,7 +79,8 @@ GLOBAL_PROTECT(admin_verbs_admin) /datum/admins/proc/open_borgopanel, /client/proc/fix_say, /client/proc/stabilize_atmos, - /client/proc/openTicketManager + /client/proc/openTicketManager, + /client/proc/battle_royale ) GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel, /client/proc/ban_panel, /client/proc/stickybanpanel)) GLOBAL_PROTECT(admin_verbs_ban) @@ -149,6 +152,7 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/enable_debug_verbs, /client/proc/callproc, /client/proc/callproc_datum, + /client/proc/forcemapconfig, /client/proc/SDQL2_query, /client/proc/test_movable_UI, /client/proc/test_snap_UI, @@ -166,6 +170,7 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/map_template_load, /client/proc/map_template_upload, /client/proc/jump_to_ruin, + /client/proc/generate_ruin, /client/proc/clear_dynamic_transit, /client/proc/fucky_wucky, /client/proc/toggle_medal_disable, @@ -174,8 +179,18 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/cmd_display_init_log, /client/proc/cmd_display_overlay_log, /client/proc/reload_configuration, + /client/proc/give_all_spells, /datum/admins/proc/create_or_modify_area, - /client/proc/toggle_cdn + /datum/admins/proc/fixcorruption, + #ifdef TESTING + /client/proc/export_dynamic_json, + /client/proc/run_dynamic_simulations, + #endif + #ifdef SENDMAPS_PROFILE + /client/proc/display_sendmaps, + #endif + /client/proc/toggle_cdn, + /client/proc/check_timer_sources ) GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release)) @@ -257,36 +272,38 @@ GLOBAL_PROTECT(admin_verbs_hideable) control_freak = CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS var/rights = holder.rank.rights - verbs += GLOB.admin_verbs_default + add_verb(GLOB.admin_verbs_default) if(rights & R_BUILD) - verbs += /client/proc/togglebuildmodeself + add_verb(/client/proc/togglebuildmodeself) if(rights & R_ADMIN) - verbs += GLOB.admin_verbs_admin + add_verb(GLOB.admin_verbs_admin) if(rights & R_BAN) - verbs += GLOB.admin_verbs_ban + add_verb(GLOB.admin_verbs_ban) if(rights & R_FUN) - verbs += GLOB.admin_verbs_fun + add_verb(GLOB.admin_verbs_fun) if(rights & R_SERVER) - verbs += GLOB.admin_verbs_server + add_verb(GLOB.admin_verbs_server) if(rights & R_DEBUG) - verbs += GLOB.admin_verbs_debug + add_verb(GLOB.admin_verbs_debug) if(rights & R_POSSESS) - verbs += GLOB.admin_verbs_possess + add_verb(GLOB.admin_verbs_possess) if(rights & R_PERMISSIONS) - verbs += GLOB.admin_verbs_permissions + add_verb(GLOB.admin_verbs_permissions) if(rights & R_STEALTH) - verbs += /client/proc/stealth + add_verb(/client/proc/stealth) if(rights & R_ADMIN) - verbs += GLOB.admin_verbs_poll + add_verb(GLOB.admin_verbs_poll) if(rights & R_SOUND) - verbs += GLOB.admin_verbs_sounds + add_verb(GLOB.admin_verbs_sounds) if(CONFIG_GET(string/invoke_youtubedl)) - verbs += /client/proc/play_web_sound + add_verb(/client/proc/play_web_sound) if(rights & R_SPAWN) - verbs += GLOB.admin_verbs_spawn + add_verb(GLOB.admin_verbs_spawn) + reset_badges() /client/proc/remove_admin_verbs() - verbs.Remove( + var/list/verb_list = list() + verb_list.Add( GLOB.admin_verbs_default, /client/proc/togglebuildmodeself, GLOB.admin_verbs_admin, @@ -307,13 +324,15 @@ GLOBAL_PROTECT(admin_verbs_hideable) /client/proc/readmin, /client/proc/fix_say ) + remove_verb(verb_list) + reset_badges() /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs set name = "Adminverbs - Hide Most" set category = "Admin" - verbs.Remove(/client/proc/hide_most_verbs, GLOB.admin_verbs_hideable) - verbs += /client/proc/show_verbs + remove_verb(list(/client/proc/hide_most_verbs) + GLOB.admin_verbs_hideable) + add_verb(/client/proc/show_verbs) to_chat(src, "Most of your adminverbs have been hidden.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Hide Most Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -324,7 +343,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) set category = "Admin" remove_admin_verbs() - verbs += /client/proc/show_verbs + add_verb(/client/proc/show_verbs) to_chat(src, "Almost all of your adminverbs have been hidden.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Hide All Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -334,7 +353,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) set name = "Adminverbs - Show" set category = "Admin" - verbs -= /client/proc/show_verbs + remove_verb(/client/proc/show_verbs) add_admin_verbs() to_chat(src, "All of your adminverbs are now visible.") @@ -368,7 +387,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) log_admin("[key_name(usr)] admin ghosted.") message_admins("[key_name_admin(usr)] admin ghosted.") var/mob/body = mob - body.ghostize(1) + body.ghostize(TRUE) if(body && !body.key) body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin Ghost") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -476,6 +495,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(holder) if(holder.fakekey) holder.fakekey = null + reset_badges() if(isobserver(mob)) mob.invisibility = initial(mob.invisibility) mob.alpha = initial(mob.alpha) @@ -486,6 +506,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(!new_key) return holder.fakekey = new_key + reset_badges() createStealthKey() if(isobserver(mob)) mob.invisibility = INVISIBILITY_MAXIMUM //JUST IN CASE @@ -648,6 +669,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) log_admin("[key_name(usr)] made [O] at [AREACOORD(O)] say \"[message]\"") message_admins("[key_name_admin(usr)] made [O] at [AREACOORD(O)]. say \"[message]\"") SSblackbox.record_feedback("tally", "admin_verb", 1, "Object Say") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/proc/togglebuildmodeself() set name = "Toggle Build Mode Self" set category = "Adminbus" @@ -711,34 +733,34 @@ GLOBAL_PROTECT(admin_verbs_hideable) set category = "Debug" set desc = "(\"Amount of mobs to create\") Populate the world with test mobs." - if (amount > 0) + if(amount > 0) var/area/area var/list/candidates var/turf/open/floor/tile var/j,k - for (var/i = 1 to amount) + for(var/i = 1 to amount) j = 100 do area = pick(GLOB.the_station_areas) - if (area) + if(area) candidates = get_area_turfs(area) - if (candidates.len) + if(candidates.len) k = 100 do tile = pick(candidates) while ((!tile || !istype(tile)) && --k > 0) - if (tile) + if(tile) var/mob/living/carbon/human/hooman = new(tile) hooman.equipOutfit(pick(subtypesof(/datum/outfit))) testing("Spawned test mob at [COORD(tile)]") - while (!area && --j > 0) + while(!area && --j > 0) /client/proc/toggle_AI_interact() set name = "Toggle Admin AI Interact" @@ -779,7 +801,10 @@ GLOBAL_PROTECT(admin_verbs_hideable) can.valve_open = FALSE can.update_icon() +#ifdef SENDMAPS_PROFILE +/client/proc/display_sendmaps() + set name = "Send Maps Profile" + set category = "Debug" - - - + src << link("?debug=profile&type=sendmaps&window=test") +#endif diff --git a/code/modules/admin/adminmenu.dm b/code/modules/admin/adminmenu.dm index 64ce5987cfd5d..0378ac39f3c62 100644 --- a/code/modules/admin/adminmenu.dm +++ b/code/modules/admin/adminmenu.dm @@ -1,11 +1,7 @@ -/datum/verbs/menu/Admin/Generate_list(client/C) - if (C.holder) - . = ..() - -/datum/verbs/menu/Admin/verb/playerpanel() +/client/proc/playerpanel() set name = "Player Panel" set desc = "Player Panel" set category = "Admin" - if(usr.client.holder) - usr.client.holder.player_panel_new() + if(holder) + holder.player_panel_new() SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index 1672310567794..2c98483461b4f 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -47,7 +47,7 @@ GLOBAL_VAR(antag_prototypes) else var/obj_count = 1 for(var/datum/objective/objective in objectives) - result += "[obj_count]: [objective.explanation_text] Edit Delete [objective.completed ? "Mark as incomplete" : "Mark as complete"]
" + result += "[obj_count]: [objective.explanation_text] Edit Delete [objective.completed ? "Mark as incomplete" : "Mark as complete"]
" obj_count++ result += "Add objective
" result += "Announce objectives
" @@ -77,7 +77,7 @@ GLOBAL_VAR(antag_prototypes) return common_commands /datum/mind/proc/get_special_statuses() - var/list/result = list() + var/list/result = LAZYCOPY(special_statuses) if(!current) result += "No body!" if(current && HAS_TRAIT(current, TRAIT_MINDSHIELD)) @@ -128,7 +128,7 @@ GLOBAL_VAR(antag_prototypes) var/list/possible_admin_antags = list() for(var/datum/antagonist/prototype in GLOB.antag_prototypes[antag_category]) - var/datum/antagonist/A = has_antag_datum(prototype.type) + var/datum/antagonist/A = has_antag_datum(prototype.type, FALSE) if(A) //We got the antag if(!current_antag) @@ -166,7 +166,10 @@ GLOBAL_VAR(antag_prototypes) pref_source = prototype break if(pref_source.job_rank) - antag_header_parts += pref_source.enabled_in_preferences(src) ? "Enabled in Prefs" : "Disabled in Prefs" + if(!is_banned_from(src.key, pref_source.job_rank)) + antag_header_parts += pref_source.enabled_in_preferences(src) ? "Enabled in Prefs" : "Disabled in Prefs" + else + antag_header_parts += "\[BANNED\]" //Traitor : None | Traitor | IAA // Command1 | Command2 | Command3 @@ -214,4 +217,4 @@ GLOBAL_VAR(antag_prototypes) var/datum/browser/panel = new(usr, "traitorpanel", "", 600, 600) panel.set_content(out) panel.open() - return \ No newline at end of file + return diff --git a/code/modules/admin/battle_royale.dm b/code/modules/admin/battle_royale.dm new file mode 100644 index 0000000000000..5cc22e8c18369 --- /dev/null +++ b/code/modules/admin/battle_royale.dm @@ -0,0 +1,447 @@ +//Global lists so they can be editted by admins +GLOBAL_LIST_INIT(battle_royale_basic_loot, list( + /obj/item/soap, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife/combat, + /obj/item/kitchen/knife/poison, + /obj/item/throwing_star, + /obj/item/syndie_glue, + /obj/item/book_of_babel, + /obj/item/card/emag, + /obj/item/storage/box/emps, + /obj/item/storage/box/lethalshot, + /obj/item/storage/box/gorillacubes, + /obj/item/storage/box/teargas, + /obj/item/storage/box/security/radio, + /obj/item/storage/box/medsprays, + /obj/item/storage/toolbox/syndicate, + /obj/item/storage/box/syndie_kit/bee_grenades, + /obj/item/storage/box/syndie_kit/centcom_costume, + /obj/item/storage/box/syndie_kit/chameleon, + /obj/item/storage/box/syndie_kit/chemical, + /obj/item/storage/box/syndie_kit/emp, + /obj/item/storage/box/syndie_kit/imp_adrenal, + /obj/item/storage/box/syndie_kit/imp_freedom, + /obj/item/storage/box/syndie_kit/imp_radio, + /obj/item/storage/box/syndie_kit/imp_stealth, + /obj/item/storage/box/syndie_kit/imp_storage, + /obj/item/storage/box/syndie_kit/imp_uplink, + /obj/item/storage/box/syndie_kit/origami_bundle, + /obj/item/storage/box/syndie_kit/throwing_weapons, + /obj/item/storage/box/syndie_kit/bundle_A, + /obj/item/storage/box/syndie_kit/bundle_B, + /obj/item/gun/ballistic/automatic/pistol, + /obj/item/gun/energy/disabler, + /obj/item/construction/rcd, + /obj/item/clothing/glasses/chameleon/flashproof, + /obj/item/book/granter/spell/knock, + /obj/item/clothing/glasses/sunglasses/advanced, + /obj/item/clothing/glasses/thermal/eyepatch, + /obj/item/clothing/glasses/thermal/syndi, + /obj/item/clothing/suit/space, + /obj/item/clothing/suit/armor/riot, + /obj/item/clothing/suit/armor/vest, + /obj/item/clothing/suit/armor/vest/russian_coat, + /obj/item/clothing/suit/armor/hos/trenchcoat, + /obj/item/clothing/mask/chameleon, + /obj/item/clothing/head/centhat, + /obj/item/clothing/head/crown, + /obj/item/clothing/head/HoS/syndicate, + /obj/item/clothing/head/helmet, + /obj/item/clothing/head/helmet/clockcult, + /obj/item/clothing/head/helmet/space, + /obj/item/clothing/head/helmet/sec, + /obj/item/clothing/under/syndicate, + /obj/item/clothing/gloves/combat, + /obj/item/deployablemine/stun, + /obj/item/switchblade, + /obj/item/club/tailclub, + /obj/item/nullrod/tribal_knife, + /obj/item/nullrod/fedora, + /obj/item/nullrod/godhand, + /obj/item/melee/baton/loaded, + /obj/item/melee/chainofcommand/tailwhip/kitty, + /obj/item/melee/classic_baton, + /obj/item/melee/ghost_sword, + /obj/item/melee/powerfist, + /obj/item/storage/firstaid/advanced, + /obj/item/storage/firstaid/brute, + /obj/item/storage/firstaid/fire, + /obj/item/storage/firstaid/medical, + /obj/item/storage/firstaid/tactical, + /obj/item/gun/energy/ionrifle, + /obj/item/organ/regenerative_core/battle_royale + )) + +GLOBAL_LIST_INIT(battle_royale_good_loot, list( + /obj/item/hand_tele, + /obj/item/gun/ballistic/bow/clockbolt, + /obj/item/gun/ballistic/rifle/boltaction, + /obj/item/gun/ballistic/shotgun/doublebarrel, + /obj/item/gun/energy/laser/captain, + /obj/item/gun/ballistic/revolver/mateba, + /obj/item/gun/ballistic/automatic/c20r, + /obj/item/ammo_box/magazine/smgm45, + /obj/item/ammo_box/magazine/pistolm9mm, + /obj/item/katana, + /obj/item/melee/transforming/energy/sword, + /obj/item/dualsaber, + /obj/item/fireaxe, + /obj/item/stack/telecrystal/five, + /obj/item/stack/telecrystal/twenty, + /obj/item/clothing/suit/space/hardsuit/syndi + )) + +GLOBAL_LIST_INIT(battle_royale_insane_loot, list( + /obj/item/gun/ballistic/automatic/l6_saw/unrestricted, + /obj/item/energy_katana, + /obj/item/clothing/suit/space/hardsuit/shielded/syndi, + /obj/item/his_grace, + /obj/mecha/combat/marauder/mauler/loaded, + /obj/item/guardiancreator/tech, + /obj/item/mjollnir, + /obj/item/pneumatic_cannon/pie/selfcharge, + /obj/item/uplink/nuclear + )) + +GLOBAL_DATUM(battle_royale, /datum/battle_royale_controller) + +#define BATTLE_ROYALE_AVERBS list(\ + /client/proc/battle_royale_speed,\ + /client/proc/battle_royale_varedit,\ + /client/proc/battle_royale_spawn_loot,\ + /client/proc/battle_royale_spawn_loot_good\ +) + +/client/proc/battle_royale() + set name = "Battle Royale" + set category = "Adminbus" + if(!(check_rights(R_FUN) || (check_rights(R_ADMIN) && SSticker.current_state == GAME_STATE_FINISHED))) + to_chat(src, "You do not have permission to do that! (If you don't have +FUN, wait until the round is over then you can trigger it.)") + return + if(GLOB.battle_royale) + to_chat(src, "A game is already in progress!") + return + if(alert(src, "ARE YOU SURE YOU ARE SURE YOU WANT TO START BATTLE ROYALE?",,"Yes","No") != "Yes") + to_chat(src, "oh.. ok then.. I see how it is.. :(") + return + log_admin("[key_name(usr)] HAS TRIGGERED BATTLE ROYALE") + message_admins("[key_name(usr)] HAS TRIGGERED BATTLE ROYALE") + + for(var/client/admin in GLOB.admins) + if(check_rights(R_ADMIN) && !GLOB.battle_royale && admin.tgui_panel) + admin.tgui_panel.clear_br_popup() + + GLOB.battle_royale = new() + GLOB.battle_royale.start() + +/client/proc/battle_royale_speed() + set name = "Battle Royale - Change wall speed" + set category = "Event" + if(!check_rights(R_ADMIN)) + to_chat(src, "You do not have permission to do that!") + return + if(!GLOB.battle_royale) + to_chat(src, "No game is in progress.") + return + var/new_speed = input(src, "New wall delay (seconds)") as num + if(new_speed > 0) + GLOB.battle_royale.field_delay = new_speed + log_admin("[key_name(usr)] has changed the field delay to [new_speed] seconds") + message_admins("[key_name(usr)] has changed the field delay to [new_speed] seconds") + +/client/proc/battle_royale_varedit() + set name = "Battle Royale - Variable Edit" + set category = "Event" + if(!check_rights(R_FUN)) + to_chat(src, "You do not have permission to do that!") + return + if(!GLOB.battle_royale) + to_chat(src, "No game is in progress.") + return + debug_variables(GLOB.battle_royale) + +/client/proc/battle_royale_spawn_loot() + set name = "Battle Royale - Spawn Loot Drop (Minor)" + set category = "Event" + if(!check_rights(R_FUN)) + to_chat(src, "You do not have permission to do that!") + return + if(!GLOB.battle_royale) + to_chat(src, "No game is in progress.") + return + GLOB.battle_royale.generate_good_drop() + log_admin("[key_name(usr)] generated a battle royale drop.") + message_admins("[key_name(usr)] generated a battle royale drop.") + +/client/proc/battle_royale_spawn_loot_good() + set name = "Battle Royale - Spawn Loot Drop (Major)" + set category = "Event" + if(!check_rights(R_FUN)) + to_chat(src, "You do not have permission to do that!") + return + if(!GLOB.battle_royale) + to_chat(src, "No game is in progress.") + return + GLOB.battle_royale.generate_endgame_drop() + log_admin("[key_name(usr)] generated a good battle royale drop.") + message_admins("[key_name(usr)] generated a good battle royale drop.") + +/datum/battle_royale_controller + var/list/players + var/datum/proximity_monitor/advanced/battle_royale/field_wall + var/radius = 118 + var/process_num = 0 + var/list/death_wall + var/field_delay = 15 + var/debug_mode = FALSE + +/datum/battle_royale_controller/Destroy(force, ...) + QDEL_LIST(death_wall) + for(var/client/C in GLOB.admins) + C.remove_verb(BATTLE_ROYALE_AVERBS) + . = ..() + GLOB.enter_allowed = TRUE + world.update_status() + GLOB.battle_royale = null + +//Trigger random events and shit, update the world border +/datum/battle_royale_controller/process() + process_num++ + //Once every 25 seconds + if(prob(4)) + generate_basic_loot(5) + //Once every 50 seconds. + if(prob(2)) + generate_good_drop() + var/living_victims = 0 + var/mob/winner + for(var/mob/living/M as() in players) + if(QDELETED(M)) + players -= M + continue + if(M.stat == DEAD) //We aren't going to remove them from the list in case they somehow revive. + continue + var/turf/T = get_turf(M) + if(T.x > 128 + radius || T.x < 128 - radius || T.y > 128 + radius || T.y < 128 - radius) + to_chat(M, "You have left the zone!") + M.gib() + if(!SSmapping.level_trait(T.z, ZTRAIT_STATION) && !SSmapping.level_trait(T.z, ZTRAIT_RESERVED)) + to_chat(M, "You have left the z-level!") + M.gib() + living_victims++ + winner = M + CHECK_TICK + if(living_victims <= 1 && !debug_mode) + to_chat(world, "VICTORY ROYALE!!") + if(winner) + winner.client?.process_greentext() + to_chat(world, "[key_name(winner)] is the winner!") + new /obj/item/melee/supermatter_sword(get_turf(winner)) + qdel(src) + return + //Once every 15 seconsd + // 1,920 seconds (about 32 minutes per game) + if(process_num % (field_delay) == 0) + for(var/obj/effect/death_wall/wall as() in death_wall) + wall.decrease_size() + if(QDELETED(wall)) + death_wall -= wall + CHECK_TICK + radius-- + if(radius < 70 && prob(1)) + generate_endgame_drop() + +//================================== +// INITIALIZATION +//================================== + +/datum/battle_royale_controller/proc/start() + //Give Verbs to admins + for(var/client/C in GLOB.admins) + if(check_rights_for(C, R_ADMIN)) + C.add_verb(BATTLE_ROYALE_AVERBS) + toggle_ooc(FALSE) + to_chat(world, "Battle Royale will begin soon...") + //Stop new player joining + GLOB.enter_allowed = FALSE + world.update_status() + if(SSticker.current_state < GAME_STATE_PREGAME) + to_chat(world, "Battle Royale: Waiting for server to be ready...") + SSticker.start_immediately = FALSE + UNTIL(SSticker.current_state >= GAME_STATE_PREGAME) + to_chat(world, "Battle Royale: Done!") + //Delay pre-game if we are in it. + if(SSticker.current_state == GAME_STATE_PREGAME) + //Force people to be not ready and start the game + for(var/mob/dead/new_player/player in GLOB.player_list) + to_chat(player, "You have been forced as an observer. When the prompt to join battle royale comes up, press yes. This is normal and you are still in queue to play.") + player.ready = FALSE + player.make_me_an_observer(TRUE) + to_chat(world, "Battle Royale: Force-starting game.") + SSticker.start_immediately = TRUE + SEND_SOUND(world, sound('sound/misc/server-ready.ogg')) + sleep(50) + //Clear client mobs + to_chat(world, "Battle Royale: Clearing world mobs.") + for(var/mob/M as() in GLOB.player_list) + if(isliving(M)) + qdel(M) + CHECK_TICK + sleep(50) + to_chat(world, "Battle Royale: STARTING IN 30 SECONDS.") + to_chat(world, "If you are on the main menu, observe immediately to sign up. (You will be prompted in 30 seconds.)") + toggle_ooc(TRUE) + sleep(300) + toggle_ooc(FALSE) + to_chat(world, "Battle Royale: STARTING IN 5 SECONDS.") + to_chat(world, "Make sure to hit yes to the sign up message given to all observing players.") + sleep(50) + to_chat(world, "Battle Royale: Starting game.") + titanfall() + death_wall = list() + var/z_level = SSmapping.station_start + var/turf/center = SSmapping.get_station_center() + var/list/edge_turfs = list() + edge_turfs += block(locate(12, 12, z_level), locate(244, 12, z_level)) //BOTTOM + edge_turfs += block(locate(12, 244, z_level), locate(244, 244, z_level)) //TOP + edge_turfs |= block(locate(12, 12, z_level), locate(12, 244, z_level)) //LEFT + edge_turfs |= block(locate(244, 12, z_level), locate(244, 244, z_level)) //RIGHT + for(var/turf/T in edge_turfs) + var/obj/effect/death_wall/DW = new(T) + DW.set_center(center) + death_wall += DW + CHECK_TICK + START_PROCESSING(SSprocessing, src) + +/datum/battle_royale_controller/proc/titanfall() + var/list/participants = pollGhostCandidates("Would you like to partake in BATTLE ROYALE?") + var/turf/spawn_turf = get_safe_random_station_turfs() + var/obj/structure/closet/supplypod/centcompod/pod = new() + pod.setStyle() + players = list() + for(var/mob/M in participants) + var/key = M.key + //Create a mob and transfer their mind to it. + CHECK_TICK + var/mob/living/carbon/human/H = new(pod) + ADD_TRAIT(H, TRAIT_PACIFISM, BATTLE_ROYALE_TRAIT) + H.status_flags |= GODMODE + //Assistant gang + H.equipOutfit(/datum/outfit/job/assistant) + //Give them a spell + H.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock) + H.key = key + //Give weapons key + var/obj/item/implant/weapons_auth/W = new + W.implant(H) + players += H + to_chat(M, "You have been given knock and pacafism for 30 seconds.") + new /obj/effect/pod_landingzone(spawn_turf, pod) + SEND_SOUND(world, sound('sound/misc/airraid.ogg')) + to_chat(world, "A 30 second grace period has been established. Good luck.") + to_chat(world, "WARNING: YOU WILL BE GIBBED IF YOU LEAVE THE STATION Z-LEVEL!") + to_chat(world, "[players.len] people remain...") + //Start processing our world events + addtimer(CALLBACK(src, .proc/end_grace), 300) + generate_basic_loot(150) + +/datum/battle_royale_controller/proc/end_grace() + for(var/mob/M in GLOB.player_list) + M.RemoveSpell(/obj/effect/proc_holder/spell/aoe_turf/knock) + M.status_flags -= GODMODE + REMOVE_TRAIT(M, TRAIT_PACIFISM, BATTLE_ROYALE_TRAIT) + to_chat(M, "You are no longer a pacifist. Be the last [M.gender == MALE ? "man" : "woman"] standing.") + +//================================== +// EVENTS / DROPS +//================================== + +/datum/battle_royale_controller/proc/generate_basic_loot(amount=1) + for(var/i in 1 to amount) + send_item(pick(GLOB.battle_royale_basic_loot)) + stoplag() + +/datum/battle_royale_controller/proc/generate_good_drop() + var/list/good_drops = list() + for(var/i in 1 to rand(1,3)) + good_drops += pick(GLOB.battle_royale_good_loot) + send_item(good_drops, announce = "Incoming extended supply materials.", force_time = 150) + +/datum/battle_royale_controller/proc/generate_endgame_drop() + var/obj/item = pick(GLOB.battle_royale_insane_loot) + send_item(item, announce = "We found a weird looking package in the back of our warehouse. We have no idea what is in it, but it is marked as incredibily dangerous and could be a superweapon.", force_time = 600) + +/datum/battle_royale_controller/proc/send_item(item_path, style = STYLE_BOX, announce=FALSE, force_time = 0) + if(!item_path) + return + var/turf/target = get_safe_random_station_turfs() + var/obj/structure/closet/supplypod/battleroyale/pod = new() + if(islist(item_path)) + for(var/thing in item_path) + new thing(pod) + else + new item_path(pod) + if(force_time) + pod.delays[POD_FALLING]= force_time + new /obj/effect/pod_landingzone(target, pod) + if(announce) + priority_announce("[announce] \nExpected Drop Location: [get_area(target)]\n ETA: [force_time/10] Seconds.", "High Command Supply Control", SSstation.announcer.get_rand_alert_sound()) + +//================================== +// WORLD BORDER +//================================== + +/obj/effect/death_wall + var/current_radius = 118 + var/turf/center_turf + icon = 'icons/effects/fields.dmi' + icon_state = "projectile_dampen_generic" + +/obj/effect/death_wall/Crossed(atom/movable/AM, oldloc) + . = ..() + //lol u died + if(isliving(AM)) + var/mob/living/M = AM + M.gib() + to_chat(M, "You left the zone!") + +/obj/effect/death_wall/Moved(atom/OldLoc, Dir) + . = ..() + for(var/mob/living/M in get_turf(src)) + M.gib() + to_chat(M, "You left the zone!") + +/obj/effect/death_wall/proc/set_center(turf/center) + center_turf = center + +/obj/effect/death_wall/proc/decrease_size() + var/minx = CLAMP(center_turf.x - current_radius, 1, 255) + var/maxx = CLAMP(center_turf.x + current_radius, 1, 255) + var/miny = CLAMP(center_turf.y - current_radius, 1, 255) + var/maxy = CLAMP(center_turf.y + current_radius, 1, 255) + if(y == maxy || y == miny) + //We have nowhere to move to so are deleted + if(x == minx || x == minx + 1 || x == maxx || x == maxx - 1) + qdel(src) + return + //Where do we go to? + var/top = y == maxy + var/bottom = y == miny + var/left = x == minx + var/right = x == maxx + if(left) + forceMove(get_step(get_turf(src), EAST)) + else if(right) + forceMove(get_step(get_turf(src), WEST)) + else if(bottom) + forceMove(get_step(get_turf(src), NORTH)) + else if(top) + forceMove(get_step(get_turf(src), SOUTH)) + current_radius-- + +//===== +// Heal +// ===== +/obj/item/organ/regenerative_core/battle_royale + preserved = TRUE diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm index ea567b5296c19..99bca8f05c7fd 100644 --- a/code/modules/admin/callproc/callproc.dm +++ b/code/modules/admin/callproc/callproc.dm @@ -15,7 +15,7 @@ switch(alert("Proc owned by something?",,"Yes","No")) if("Yes") targetselected = TRUE - var/list/value = vv_get_value(default_class = VV_ATOM_REFERENCE, classes = list(VV_ATOM_REFERENCE, VV_DATUM_REFERENCE, VV_MOB_REFERENCE, VV_CLIENT, VV_MARKED_DATUM, VV_TEXT_LOCATE, VV_PROCCALL_RETVAL)) + var/list/value = vv_get_value(default_class = VV_ATOM_REFERENCE, classes = list(VV_ATOM_REFERENCE, VV_DATUM_REFERENCE, VV_MOB_REFERENCE, VV_MARKED_DATUM, VV_TEXT_LOCATE, VV_PROCCALL_RETVAL)) if (!value["class"] || !value["value"]) return target = value["value"] @@ -83,8 +83,6 @@ GLOBAL_VAR(LastAdminCalledTarget) GLOBAL_PROTECT(LastAdminCalledTarget) GLOBAL_VAR(LastAdminCalledProc) GLOBAL_PROTECT(LastAdminCalledProc) -GLOBAL_LIST_EMPTY(AdminProcCallSpamPrevention) -GLOBAL_PROTECT(AdminProcCallSpamPrevention) /proc/WrapAdminProcCall(datum/target, procname, list/arguments) if(target && procname == "Del") @@ -98,15 +96,11 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) var/ckey = usr ? usr.client.ckey : GLOB.AdminProcCaller if(!ckey) CRASH("WrapAdminProcCall with no ckey: [target] [procname] [english_list(arguments)]") + if(current_caller && current_caller != ckey) - if(!GLOB.AdminProcCallSpamPrevention[ckey]) - to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.") - GLOB.AdminProcCallSpamPrevention[ckey] = TRUE - UNTIL(!GLOB.AdminProcCaller) - to_chat(usr, "Running your proc") - GLOB.AdminProcCallSpamPrevention -= ckey - else - UNTIL(!GLOB.AdminProcCaller) + to_chat(usr, "Another set of admin called procs are still running. Try again later.") + return + GLOB.LastAdminCalledProc = procname if(target != GLOBAL_PROC) GLOB.LastAdminCalledTargetRef = REF(target) @@ -119,7 +113,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) //adv proc call this, ya nerds /world/proc/WrapAdminProcCall(datum/target, procname, list/arguments) if(target == GLOBAL_PROC) - return call(procname)(arglist(arguments)) + return call("/proc/[procname]")(arglist(arguments)) else if(target != world) return call(target, procname)(arglist(arguments)) else diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm index 73450f9883458..86f0a312dbe39 100644 --- a/code/modules/admin/chat_commands.dm +++ b/code/modules/admin/chat_commands.dm @@ -30,6 +30,7 @@ var/server = CONFIG_GET(string/server) return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.config.map_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]" +/** -- Not for use within BeeStation /datum/tgs_chat_command/ahelp name = "ahelp" help_text = "
[use_db ? "This will affect ALL admins with this rank." : "This will affect only the current admin [admin_key]"]", "admin_flags", D.rank.include_rights, 350, 590, allowed_edit_list = usr.client.holder.rank.can_edit_rights) if(isnull(new_flags)) return @@ -402,7 +418,7 @@ return var/m1 = "[key_name_admin(usr)] edited the permissions of [use_db ? " rank [D.rank.name] permanently" : "[admin_key] temporarily"]" var/m2 = "[key_name(usr)] edited the permissions of [use_db ? " rank [D.rank.name] permanently" : "[admin_key] temporarily"]" - if(use_db || legacy_only) + if(use_db && !legacy_only) var/rank_name = D.rank.name var/old_flags var/old_exclude_flags @@ -470,6 +486,10 @@ log_admin(m2) /datum/admins/proc/remove_rank(admin_rank) + if(!check_rights(R_PERMISSIONS)) + message_admins("[key_name_admin(usr)] attempted to remove an admin's rank without sufficient rights.") + log_admin("[key_name(usr)] attempted to remove an admin's rank without sufficient rights.") + return if(!admin_rank) return for(var/datum/admin_rank/R in GLOB.admin_ranks) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 5b05339de8586..beb2876c45173 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -15,7 +15,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) ui = new(user, src, "AdminSecretsPanel", "Secrets Panel") ui.open() -/datum/admin_secrets/ui_data(mob/user) +/datum/admin_secrets/ui_static_data(mob/user) /* Each command is a list that will be read like [Name, Action(see ui_act)] "omg but you could have done it like X" @@ -73,7 +73,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) list("Summon Events (Toggle)", "events"), list("There can only be one!", "onlyone"), list("There can only be one! (40-second delay)", "delayed_onlyone"), - list("Make all players retarded", "retardify"), + list("Make all players intellectually disabled", "dumbify"), list("Make all players Australian", "aussify"), list("Egalitarian Station Mode", "eagles"), list("Anarcho-Capitalist Station Mode", "ancap"), @@ -89,7 +89,8 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) list("Mass Purrbation", "masspurrbation"), list("Mass Remove Purrbation", "massremovepurrbation"), list("Fully Immerse Everyone", "massimmerse"), - list("Un-Fully Immerse Everyone", "unmassimmerse") + list("Un-Fully Immerse Everyone", "unmassimmerse"), + list("Make All Animals Playable", "animalsentience") ) if(check_rights(R_DEBUG,0)) @@ -144,7 +145,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) for(var/mob/living/mob in thunderdome) qdel(mob) //Clear mobs for(var/obj/obj in thunderdome) - if(!istype(obj, /obj/machinery/camera) && !istype(obj, /obj/effect/abstract/proximity_checker)) + if(!istype(obj, /obj/machinery/camera) && !istype(obj, /obj/effect/abstract/proximity_checker) && !istype(obj, /obj/effect/landmark/arena)) qdel(obj) //Clear objects var/area/template = GLOB.areas_by_type[/area/tdome/arena_source] @@ -174,7 +175,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) set_station_name(new_name) log_admin("[key_name(usr)] renamed the station to \"[new_name]\".") message_admins("[key_name_admin(usr)] renamed the station to: [new_name].") - priority_announce("[command_name()] has renamed the station to \"[new_name]\".") + priority_announce("[command_name()] has renamed the station to \"[new_name]\".", sound = SSstation.announcer.get_rand_alert_sound()) if("night_shift_set") if(!check_rights(R_ADMIN)) return @@ -200,7 +201,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) set_station_name(new_name) log_admin("[key_name(usr)] reset the station name.") message_admins("[key_name_admin(usr)] reset the station name.") - priority_announce("[command_name()] has renamed the station to \"[new_name]\".") + priority_announce("[command_name()] has renamed the station to \"[new_name]\".", sound = SSstation.announcer.get_rand_alert_sound()) if("list_bombers") if(!check_rights(R_ADMIN)) @@ -458,7 +459,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Chinese Cartoons")) message_admins("[key_name_admin(usr)] made everything kawaii.") for(var/mob/living/carbon/human/H in GLOB.carbon_list) - SEND_SOUND(H, sound('sound/ai/animes.ogg')) + SEND_SOUND(H, sound(SSstation.announcer.event_sounds[ANNOUNCER_ANIMES])) if(H.dna.species.id == "human") if(H.dna.features["tail_human"] == "None" || H.dna.features["ears"] == "None") @@ -477,7 +478,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) var/obj/item/clothing/under/costume/schoolgirl/I = new seifuku var/olduniform = H.w_uniform H.temporarilyRemoveItemFromInventory(H.w_uniform, TRUE, FALSE) - H.equip_to_slot_or_del(I, SLOT_W_UNIFORM) + H.equip_to_slot_or_del(I, ITEM_SLOT_ICLOTHING) qdel(olduniform) if(droptype == "Yes") ADD_TRAIT(I, TRAIT_NODROP, ADMIN_TRAIT) @@ -510,14 +511,14 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) var/datum/round_event/disease_outbreak/DO = E DO.virus_type = virus - if("retardify") + if("dumbify") if(!check_rights(R_FUN)) return SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Mass Braindamage")) for(var/mob/living/carbon/human/H in GLOB.player_list) to_chat(H, "You suddenly feel stupid.") H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80) - message_admins("[key_name_admin(usr)] made everybody retarded") + message_admins("[key_name_admin(usr)] gave everybody intellectual disability") if("aussify") //for rimjobtide if(!check_rights(R_FUN)) @@ -539,7 +540,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) if(is_station_level(W.z) && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison)) W.req_access = list() message_admins("[key_name_admin(usr)] activated Egalitarian Station mode") - priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg') + priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, SSstation.announcer.get_rand_report_sound()) if("ancap") if(!check_rights(R_FUN)) @@ -548,9 +549,9 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) SSeconomy.full_ancap = !SSeconomy.full_ancap message_admins("[key_name_admin(usr)] toggled Anarcho-capitalist mode") if(SSeconomy.full_ancap) - priority_announce("The NAP is now in full effect.", null, 'sound/ai/commandreport.ogg') + priority_announce("The NAP is now in full effect.", null, SSstation.announcer.get_rand_report_sound()) else - priority_announce("The NAP has been revoked.", null, 'sound/ai/commandreport.ogg') + priority_announce("The NAP has been revoked.", null, SSstation.announcer.get_rand_report_sound()) @@ -682,6 +683,14 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) message_admins("[key_name_admin(usr)] has Un-Fully Immersed \ everyone!") log_admin("[key_name(usr)] has Un-Fully Immersed everyone.") + if("animalsentience") + for(var/mob/living/simple_animal/L in GLOB.alive_mob_list) + var/turf/T = get_turf(L) + if(!T || !is_station_level(T.z)) + continue + if((L in GLOB.player_list) || L.mind || (L.flags_1 & HOLOGRAM_1)) + continue + L.set_playable() if("flipmovement") if(!check_rights(R_FUN)) @@ -824,7 +833,7 @@ GLOBAL_DATUM_INIT(admin_secrets, /datum/admin_secrets, new) if (playlightning) sound_to_playing_players('sound/magic/lightning_chargeup.ogg') sleep(80) - priority_announce(replacetext(announcement, "%STATION%", station_name())) + priority_announce(replacetext(announcement, "%STATION%", station_name()), sound = SSstation.announcer.get_rand_alert_sound()) if (playlightning) sleep(20) sound_to_playing_players('sound/magic/lightningbolt.ogg') diff --git a/code/modules/admin/sound_emitter.dm b/code/modules/admin/sound_emitter.dm index 64ce709dfab10..3944492d9bada 100644 --- a/code/modules/admin/sound_emitter.dm +++ b/code/modules/admin/sound_emitter.dm @@ -81,7 +81,7 @@ var/new_label = stripped_input(user, "Choose a new label.", "Sound Emitter") if(!new_label) return - maptext = new_label + maptext = MAPTEXT(new_label) to_chat(user, "Label set to [maptext].") if(href_list["edit_sound_file"]) var/new_file = input(user, "Choose a sound file.", "Sound Emitter") as null|sound @@ -135,7 +135,7 @@ hearing_mobs += M if(SOUND_EMITTER_ZLEVEL) for(var/mob/M in GLOB.player_list) - if(M.z == z) + if(M.get_virtual_z_level() == get_virtual_z_level()) hearing_mobs += M if(SOUND_EMITTER_GLOBAL) hearing_mobs = GLOB.player_list.Copy() diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index d23795425be0e..fbf7f7ddecb26 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -125,7 +125,10 @@ C.ban_cache[query_build_ban_cache.item[1]] = TRUE qdel(query_build_ban_cache) -/datum/admins/proc/ban_panel(player_key, player_ip, player_cid, role, duration = 1440, applies_to_admins, reason, edit_id, page, admin_key, global_ban) +/datum/admins/proc/ban_panel(player_key, player_ip, player_cid, role, duration = 1440, applies_to_admins, reason, edit_id, page, admin_key, global_ban = TRUE) + var/suppressor + if(check_rights(R_SUPPRESS)) + suppressor = TRUE var/panel_height = 620 if(edit_id) panel_height = 240 @@ -149,12 +152,17 @@ + [(suppressor && !edit_id) ? "" : ""]
@@ -186,39 +194,39 @@ Ban type
Severity
Location
@@ -317,16 +325,16 @@
"}
break_counter++
output += "
"
- var/list/long_job_lists = list("Civilian" = GLOB.civilian_positions,
+ var/list/long_job_lists = list(("Civilian" = GLOB.civilian_positions | "Gimmick"),
"Ghost and Other Roles" = list(ROLE_BRAINWASHED, ROLE_DEATHSQUAD, ROLE_DRONE, ROLE_LAVALAND, ROLE_MIND_TRANSFER, ROLE_POSIBRAIN, ROLE_SENTIENCE),
"Antagonist Positions" = list(ROLE_ABDUCTOR, ROLE_ALIEN, ROLE_BLOB,
- ROLE_BROTHER, ROLE_CHANGELING, ROLE_CULTIST,
+ ROLE_BROTHER, ROLE_CHANGELING, ROLE_CULTIST, ROLE_HERETIC,
ROLE_DEVIL, ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
ROLE_MONKEY, ROLE_NINJA, ROLE_OPERATIVE,
ROLE_SERVANT_OF_RATVAR,
ROLE_OVERTHROW, ROLE_REV, ROLE_REVENANT,
ROLE_REV_HEAD, ROLE_SYNDICATE,
- ROLE_TRAITOR, ROLE_WIZARD, ROLE_HIVE, ROLE_GANG)) //ROLE_REV_HEAD is excluded from this because rev jobbans are handled by ROLE_REV
+ ROLE_TRAITOR, ROLE_WIZARD, ROLE_HIVE, ROLE_GANG, ROLE_TERATOMA)) //ROLE_REV_HEAD is excluded from this because rev jobbans are handled by ROLE_REV
for(var/department in long_job_lists)
output += ""
@@ -793,6 +851,16 @@
if(!SSdbcore.Connect())
to_chat(usr, "Failed to establish database connection.")
return
+
+ if(cid_check && config.protected_cids.Find(player_cid))
+ if(alert(usr, "CID [player_cid] is listed as protected for the following reason: [config.protected_cids[player_cid]], Are you sure you want to restrict this CID? THIS WILL PROBABLY CATCH LEGITIMATE PLAYERS.", "Protected CID", "Yes", "No", "Cancel") != "Yes")
+ return
+ var/kn = key_name(usr)
+ //Log the shit out of this and scream bloody murder to anyone who will listen.
+ send2tgs("CID PROTECTION BYPASS", "[kn] Has overridden CID protection for a ban on CID [player_cid]!")
+ message_admins("[kn] Has overridden CID protection for a ban on CID [player_cid]!")
+ log_admin_private("[kn] Has overridden CID protection for a ban on CID [player_cid]!")
+
var/player_ckey = ckey(player_key)
var/bantime
if(player_ckey)
@@ -910,7 +978,7 @@
log_admin_private("[kn] has edited the [changes_keys_text] of a ban for [old_key ? "[old_key]" : "[old_ip]-[old_cid]"].") //if a ban doesn't have a key it must have an ip and/or a cid to have reached this point normally
message_admins("[kna] has edited the [changes_keys_text] of a ban for [old_key ? "[old_key]" : "[old_ip]-[old_cid]"].")
if(changes["Applies to admins"])
- send2irc("BAN ALERT","[kn] has edited a ban for [old_key ? "[old_key]" : "[old_ip]-[old_cid]"] to [applies_to_admins ? "" : "not"]affect admins")
+ send2tgs("BAN ALERT","[kn] has edited a ban for [old_key ? "[old_key]" : "[old_ip]-[old_cid]"] to [applies_to_admins ? "" : "not"]affect admins")
var/client/C = GLOB.directory[old_key]
if(C)
build_ban_cache(C)
diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm
index 309c38b3177fb..bffad896c0069 100644
--- a/code/modules/admin/sql_message_system.dm
+++ b/code/modules/admin/sql_message_system.dm
@@ -73,6 +73,8 @@
return
expiry = query_validate_expire_time.item[1]
qdel(query_validate_expire_time)
+ if(expiry == -1)
+ expiry = null //This is so garbage and hacky.
if(type == "note" && isnull(note_severity))
note_severity = input("Set the severity of the note.", "Severity", null, null) as null|anything in list("High", "Medium", "Minor", "None")
if(!note_severity)
@@ -503,7 +505,7 @@
alphatext = "filter: alpha(opacity=[alpha]); opacity: [alpha/100];"
var/list/data = list("
")
if(severity)
- data += " Client![]([SSassets.transport.get_asset_url("[severity]_button.png")]){kind=spacer}
"
+ data += "![]([SSassets.transport.get_asset_url("[lowertext(severity)]_button.png")]){kind=spacer}
"
data += "[timestamp] | [server_name] | [admin_key][secret ? " | - Secret" : ""]"
if(expire_timestamp)
data += " | Expires [expire_timestamp]"
@@ -661,7 +663,7 @@
qdel(query_message_read)
if("watchlist entry")
message_admins("Notice: [key_name_admin(target_ckey)] has been on the watchlist since [timestamp] and has just connected - Reason: [text]")
- send2irc_adminless_only("Watchlist", "[key_name(target_ckey)] is on the watchlist and has just connected - Reason: [text]")
+ send2tgs_adminless_only("Watchlist", "[key_name(target_ckey)] is on the watchlist and has just connected - Reason: [text]")
if("memo")
output += "Memo by [admin_key] on [timestamp]"
if(editor_key)
diff --git a/code/modules/admin/team_panel.dm b/code/modules/admin/team_panel.dm
index 139785f72e041..ce3aa031bfd34 100644
--- a/code/modules/admin/team_panel.dm
+++ b/code/modules/admin/team_panel.dm
@@ -147,11 +147,12 @@
//qdel maybe
/datum/team/proc/admin_add_member(mob/user)
- var/list/minds = list()
- for(var/mob/M in GLOB.mob_list)
- if(M.mind)
- minds |= M.mind
- var/datum/mind/value = input("Select new member:", "New team member", null) as null|anything in sortNames(minds)
+ var/list/candidates = list()
+ for(var/mob/M in GLOB.player_list)
+ if(M.mind?.special_role)
+ continue
+ candidates += M.mind
+ var/datum/mind/value = input("Select new member:", "New team member", null) as null|anything in sortNames(candidates)
if (!value)
return
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 3cac98d0ddb70..ce4d452ca7541 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -65,33 +65,37 @@
return
switch(href_list["makeAntag"])
if("traitors")
- if(src.makeTraitors())
- message_admins("[key_name_admin(usr)] created traitors.")
- log_admin("[key_name(usr)] created traitors.")
+ var/maxCount = input("Set number of Traitors","Set Traitor Count (max)",1) as num|null
+ if(src.makeTraitors(maxCount))
+ message_admins("[key_name_admin(usr)] created [maxCount] traitor(s).")
+ log_admin("[key_name(usr)] created [maxCount] traitor(s).")
else
- message_admins("[key_name_admin(usr)] tried to create traitors. Unfortunately, there were no candidates available.")
- log_admin("[key_name(usr)] failed to create traitors.")
+ message_admins("[key_name_admin(usr)] tried to create [maxCount] traitor(s). Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to create [maxCount] traitor(s).")
if("changelings")
- if(src.makeChangelings())
- message_admins("[key_name(usr)] created changelings.")
- log_admin("[key_name(usr)] created changelings.")
+ var/maxCount = input("Set number of Changelings","Set Changeling Count (max)",1) as num|null
+ if(src.makeChangelings(maxCount))
+ message_admins("[key_name(usr)] created [maxCount] changelings.")
+ log_admin("[key_name(usr)] created [maxCount] changelings.")
else
- message_admins("[key_name_admin(usr)] tried to create changelings. Unfortunately, there were no candidates available.")
- log_admin("[key_name(usr)] failed to create changelings.")
+ message_admins("[key_name_admin(usr)] tried to create [maxCount] changelings. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to create [maxCount] changelings.")
if("revs")
- if(src.makeRevs())
- message_admins("[key_name(usr)] started a revolution.")
- log_admin("[key_name(usr)] started a revolution.")
+ var/maxCount = input("Set number of Revolutionaries","Set Revolutionaries Count (max)",1) as num|null
+ if(src.makeRevs(maxCount))
+ message_admins("[key_name(usr)] started a revolution with [maxCount] freedom fighters.")
+ log_admin("[key_name(usr)] started a [maxCount] freedom fighters.")
else
- message_admins("[key_name_admin(usr)] tried to start a revolution. Unfortunately, there were no candidates available.")
- log_admin("[key_name(usr)] failed to start a revolution.")
+ message_admins("[key_name_admin(usr)] tried to start a revolution with [maxCount] freedom fighters. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to start a revolution with [maxCount] freedom fighters.")
if("cult")
- if(src.makeCult())
- message_admins("[key_name(usr)] started a cult.")
- log_admin("[key_name(usr)] started a cult.")
+ var/maxCount = input("Set number of Cultists","Set Cultist Count (max)",1) as num|null
+ if(src.makeCult(maxCount))
+ message_admins("[key_name(usr)] started a cult with [maxCount] cultists.")
+ log_admin("[key_name(usr)] started a cult with [maxCount] cultists.")
else
- message_admins("[key_name_admin(usr)] tried to start a cult. Unfortunately, there were no candidates available.")
- log_admin("[key_name(usr)] failed to start a cult.")
+ message_admins("[key_name_admin(usr)] tried to start a cult with [maxCount] cultists. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to start a cult with [maxCount] cultists.")
if("wizard")
message_admins("[key_name(usr)] is creating a wizard...")
if(src.makeWizard())
@@ -102,12 +106,13 @@
log_admin("[key_name(usr)] failed to create a wizard.")
if("nukeops")
message_admins("[key_name(usr)] is creating a nuke team...")
- if(src.makeNukeTeam())
- message_admins("[key_name(usr)] created a nuke team.")
- log_admin("[key_name(usr)] created a nuke team.")
+ var/maxCount = input("Set number of Nuke OPs","Set Nuke OP Count (max)",5) as num|null
+ if(src.makeNukeTeam(maxCount))
+ message_admins("[key_name(usr)] created a nuke team with [maxCount] operatives")
+ log_admin("[key_name(usr)] created a nuke team with [maxCount] operatives")
else
- message_admins("[key_name_admin(usr)] tried to create a nuke team. Unfortunately, there were not enough candidates available.")
- log_admin("[key_name(usr)] failed to create a nuke team.")
+ message_admins("[key_name_admin(usr)] tried to create a nuke team with [maxCount] operatives Unfortunately, there were not enough candidates available.")
+ log_admin("[key_name(usr)] failed to create a nuke team with [maxCount] operatives.")
if("ninja")
message_admins("[key_name(usr)] spawned a ninja.")
log_admin("[key_name(usr)] spawned a ninja.")
@@ -145,7 +150,7 @@
message_admins("[key_name(usr)] created an abductor team.")
log_admin("[key_name(usr)] created an abductor team.")
else
- message_admins("[key_name_admin(usr)] tried to create an abductor team. Unfortunatly there were not enough candidates available.")
+ message_admins("[key_name_admin(usr)] tried to create an abductor team. Unfortunately there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create an abductor team.")
if("revenant")
if(src.makeRevenant())
@@ -173,6 +178,7 @@
return
if("No")
event.announceChance = 0
+ event.on_admin_trigger()
event.processing = TRUE
message_admins("[key_name_admin(usr)] has triggered an event. ([E.name])")
log_admin("[key_name(usr)] has triggered an event. ([E.name])")
@@ -206,7 +212,7 @@
return
if(SSticker && SSticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
+ if(!SSticker.is_mode("dynamic"))
return alert(usr, "The game mode has to be dynamic mode.", null, null, null, null)
var/roundstart_rules = list()
for (var/rule in subtypesof(/datum/dynamic_ruleset/roundstart))
@@ -241,15 +247,16 @@
return
if(!SSticker || !SSticker.mode)
return alert(usr, "The game must start first.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
+ if(!SSticker.is_mode("dynamic"))
return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
var/latejoin_rules = list()
+ var/datum/game_mode/dynamic/mode = SSticker.mode
for (var/rule in subtypesof(/datum/dynamic_ruleset/latejoin))
var/datum/dynamic_ruleset/latejoin/newrule = new rule()
+ mode.configure_ruleset(newrule)
latejoin_rules[newrule.name] = newrule
var/added_rule = input(usr,"What ruleset do you want to force upon the next latejoiner? This will bypass threat level and population restrictions.", "Rigging Latejoin", null) as null|anything in latejoin_rules
if (added_rule)
- var/datum/game_mode/dynamic/mode = SSticker.mode
mode.forced_latejoin_rule = latejoin_rules[added_rule]
log_admin("[key_name(usr)] set [added_rule] to proc on the next latejoin.")
message_admins("[key_name(usr)] set [added_rule] to proc on the next latejoin.", 1)
@@ -270,15 +277,16 @@
return
if(!SSticker || !SSticker.mode)
return alert(usr, "The game must start first.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
+ if(!SSticker.is_mode("dynamic"))
return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
var/midround_rules = list()
+ var/datum/game_mode/dynamic/mode = SSticker.mode
for (var/rule in subtypesof(/datum/dynamic_ruleset/midround))
var/datum/dynamic_ruleset/midround/newrule = new rule()
+ mode.configure_ruleset(newrule)
midround_rules[newrule.name] = rule
var/added_rule = input(usr,"What ruleset do you want to force right now? This will bypass threat level and population restrictions.", "Execute Ruleset", null) as null|anything in midround_rules
if (added_rule)
- var/datum/game_mode/dynamic/mode = SSticker.mode
log_admin("[key_name(usr)] executed the [added_rule] ruleset.")
message_admins("[key_name(usr)] executed the [added_rule] ruleset.", 1)
mode.picking_specific_rule(midround_rules[added_rule],1)
@@ -289,122 +297,16 @@
if(SSticker && SSticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
- return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
-
- dynamic_mode_options(usr)
-
- else if(href_list["f_dynamic_roundstart_centre"])
- if(!check_rights(R_ADMIN))
- return
- if(SSticker && SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
- return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
-
- var/new_centre = input(usr,"Change the centre of the dynamic mode threat curve. A negative value will give a more peaceful round ; a positive value, a round with higher threat. Any number between -5 and +5 is allowed.", "Change curve centre", null) as num
- if (new_centre < -5 || new_centre > 5)
- return alert(usr, "Only values between -5 and +5 are allowed.", null, null, null, null)
-
- log_admin("[key_name(usr)] changed the distribution curve center to [new_centre].")
- message_admins("[key_name(usr)] changed the distribution curve center to [new_centre]", 1)
- GLOB.dynamic_curve_centre = new_centre
- dynamic_mode_options(usr)
-
- else if(href_list["f_dynamic_roundstart_width"])
- if(!check_rights(R_ADMIN))
- return
- if(SSticker && SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
- return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
-
- var/new_width = input(usr,"Change the width of the dynamic mode threat curve. A higher value will favour extreme rounds ; a lower value, a round closer to the average. Any Number between 0.5 and 4 are allowed.", "Change curve width", null) as num
- if (new_width < 0.5 || new_width > 4)
- return alert(usr, "Only values between 0.5 and +2.5 are allowed.", null, null, null, null)
-
- log_admin("[key_name(usr)] changed the distribution curve width to [new_width].")
- message_admins("[key_name(usr)] changed the distribution curve width to [new_width]", 1)
- GLOB.dynamic_curve_width = new_width
- dynamic_mode_options(usr)
-
- else if(href_list["f_dynamic_roundstart_latejoin_min"])
- if(!check_rights(R_ADMIN))
- return
- if(SSticker && SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
- return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
- var/new_min = input(usr,"Change the minimum delay of latejoin injection in minutes.", "Change latejoin injection delay minimum", null) as num
- if(new_min <= 0)
- return alert(usr, "The minimum can't be zero or lower.", null, null, null, null)
- if((new_min MINUTES) > GLOB.dynamic_latejoin_delay_max)
- return alert(usr, "The minimum must be lower than the maximum.", null, null, null, null)
-
- log_admin("[key_name(usr)] changed the latejoin injection minimum delay to [new_min] minutes.")
- message_admins("[key_name(usr)] changed the latejoin injection minimum delay to [new_min] minutes", 1)
- GLOB.dynamic_latejoin_delay_min = (new_min MINUTES)
- dynamic_mode_options(usr)
-
- else if(href_list["f_dynamic_roundstart_latejoin_max"])
- if(!check_rights(R_ADMIN))
- return
- if(SSticker && SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
- return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
- var/new_max = input(usr,"Change the maximum delay of latejoin injection in minutes.", "Change latejoin injection delay maximum", null) as num
- if(new_max <= 0)
- return alert(usr, "The maximum can't be zero or lower.", null, null, null, null)
- if((new_max MINUTES) < GLOB.dynamic_latejoin_delay_min)
- return alert(usr, "The maximum must be higher than the minimum.", null, null, null, null)
-
- log_admin("[key_name(usr)] changed the latejoin injection maximum delay to [new_max] minutes.")
- message_admins("[key_name(usr)] changed the latejoin injection maximum delay to [new_max] minutes", 1)
- GLOB.dynamic_latejoin_delay_max = (new_max MINUTES)
- dynamic_mode_options(usr)
-
- else if(href_list["f_dynamic_roundstart_midround_min"])
- if(!check_rights(R_ADMIN))
- return
- if(SSticker && SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
+ if(!SSticker.is_mode("dynamic"))
return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
- var/new_min = input(usr,"Change the minimum delay of midround injection in minutes.", "Change midround injection delay minimum", null) as num
- if(new_min <= 0)
- return alert(usr, "The minimum can't be zero or lower.", null, null, null, null)
- if((new_min MINUTES) > GLOB.dynamic_midround_delay_max)
- return alert(usr, "The minimum must be lower than the maximum.", null, null, null, null)
-
- log_admin("[key_name(usr)] changed the midround injection minimum delay to [new_min] minutes.")
- message_admins("[key_name(usr)] changed the midround injection minimum delay to [new_min] minutes", 1)
- GLOB.dynamic_midround_delay_min = (new_min MINUTES)
- dynamic_mode_options(usr)
- else if(href_list["f_dynamic_roundstart_midround_max"])
- if(!check_rights(R_ADMIN))
- return
- if(SSticker && SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
- return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
- var/new_max = input(usr,"Change the maximum delay of midround injection in minutes.", "Change midround injection delay maximum", null) as num
- if(new_max <= 0)
- return alert(usr, "The maximum can't be zero or lower.", null, null, null, null)
- if((new_max MINUTES) > GLOB.dynamic_midround_delay_max)
- return alert(usr, "The maximum must be higher than the minimum.", null, null, null, null)
-
- log_admin("[key_name(usr)] changed the midround injection maximum delay to [new_max] minutes.")
- message_admins("[key_name(usr)] changed the midround injection maximum delay to [new_max] minutes", 1)
- GLOB.dynamic_midround_delay_max = (new_max MINUTES)
dynamic_mode_options(usr)
else if(href_list["f_dynamic_force_extended"])
if(!check_rights(R_ADMIN))
return
- if(GLOB.master_mode != "dynamic")
+ if(!SSticker.is_mode("dynamic"))
return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
GLOB.dynamic_forced_extended = !GLOB.dynamic_forced_extended
@@ -416,7 +318,7 @@
if(!check_rights(R_ADMIN))
return
- if(GLOB.master_mode != "dynamic")
+ if(!SSticker.is_mode("dynamic"))
return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
GLOB.dynamic_no_stacking = !GLOB.dynamic_no_stacking
@@ -424,23 +326,11 @@
message_admins("[key_name(usr)] set 'no_stacking' to [GLOB.dynamic_no_stacking].")
dynamic_mode_options(usr)
- else if(href_list["f_dynamic_classic_secret"])
- if(!check_rights(R_ADMIN))
- return
-
- if(GLOB.master_mode != "dynamic")
- return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
-
- GLOB.dynamic_classic_secret = !GLOB.dynamic_classic_secret
- log_admin("[key_name(usr)] set 'classic_secret' to [GLOB.dynamic_classic_secret].")
- message_admins("[key_name(usr)] set 'classic_secret' to [GLOB.dynamic_classic_secret].")
- dynamic_mode_options(usr)
-
else if(href_list["f_dynamic_stacking_limit"])
if(!check_rights(R_ADMIN))
return
- if(GLOB.master_mode != "dynamic")
+ if(!SSticker.is_mode("dynamic"))
return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
GLOB.dynamic_stacking_limit = input(usr,"Change the threat limit at which round-endings rulesets will start to stack.", "Change stacking limit", null) as num
@@ -448,25 +338,6 @@
message_admins("[key_name(usr)] set 'stacking_limit' to [GLOB.dynamic_stacking_limit].")
dynamic_mode_options(usr)
- else if(href_list["f_dynamic_high_pop_limit"])
- if(!check_rights(R_ADMIN))
- return
-
- if(SSticker && SSticker.mode)
- return alert(usr, "The game has already started.", null, null, null, null)
-
- if(GLOB.master_mode != "dynamic")
- return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
-
- var/new_value = input(usr, "Enter the high-pop override threshold for dynamic mode.", "High pop override") as num
- if (new_value < 0)
- return alert(usr, "Only positive values allowed!", null, null, null, null)
- GLOB.dynamic_high_pop_limit = new_value
-
- log_admin("[key_name(usr)] set 'high_pop_limit' to [GLOB.dynamic_high_pop_limit].")
- message_admins("[key_name(usr)] set 'high_pop_limit' to [GLOB.dynamic_high_pop_limit].")
- dynamic_mode_options(usr)
-
else if(href_list["f_dynamic_forced_threat"])
if(!check_rights(R_ADMIN))
return
@@ -474,7 +345,7 @@
if(SSticker && SSticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "dynamic")
+ if(!SSticker.is_mode("dynamic"))
return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
var/new_value = input(usr, "Enter the forced threat level for dynamic mode.", "Forced threat level") as num
@@ -876,17 +747,20 @@
return
if (SSticker.HasRoundStarted())
- if (askuser(usr, "The game has already started. Would you like to save this as the default mode effective next round?", "Save mode", "Yes", "Cancel", Timeout = null) == 1)
- SSticker.save_mode(href_list["c_mode2"])
+ alert("The round has already started.")
+ HandleCMode()
+ return
+ if(SSticker.gamemode_hotswap_disabled)
+ alert("A gamemode has already loaded maps and cannot be changed!")
HandleCMode()
return
GLOB.master_mode = href_list["c_mode2"]
+ //Disable presetup so their gamemode gets loaded.
+ SSticker.pre_setup_completed = FALSE
log_admin("[key_name(usr)] set the mode as [GLOB.master_mode].")
message_admins("[key_name_admin(usr)] set the mode as [GLOB.master_mode].")
to_chat(world, "The mode is now: [GLOB.master_mode]")
Game() // updates the main game menu
- if (askuser(usr, "Would you like to save this as the default mode for the server?", "Save mode", "Yes", "No", Timeout = null) == 1)
- SSticker.save_mode(GLOB.master_mode)
HandleCMode()
else if(href_list["f_secret2"])
@@ -1103,8 +977,8 @@
if(ishuman(L))
var/mob/living/carbon/human/observer = L
- observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit/black(observer), SLOT_W_UNIFORM)
- observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), SLOT_SHOES)
+ observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit/black(observer), ITEM_SLOT_ICLOTHING)
+ observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), ITEM_SLOT_FEET)
L.Unconscious(100)
sleep(5)
L.forceMove(pick(GLOB.tdomeobserve))
@@ -1613,16 +1487,18 @@
R.activate_module(I)
if(pod)
- new /obj/effect/DPtarget(target, pod)
+ new /obj/effect/pod_landingzone(target, pod)
+
+ var/turf/T = get_turf(usr.loc) // get admin's LOC as a turf
if (number == 1)
- log_admin("[key_name(usr)] created a [english_list(paths)]")
+ log_admin("[key_name(usr)] created a [english_list(paths)] at [AREACOORD(T)]")
for(var/path in paths)
if(ispath(path, /mob))
message_admins("[key_name_admin(usr)] created a [english_list(paths)]")
break
else
- log_admin("[key_name(usr)] created [number]ea [english_list(paths)]")
+ log_admin("[key_name(usr)] created [number]ea [english_list(paths)] at [AREACOORD(T)]")
for(var/path in paths)
if(ispath(path, /mob))
message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]")
@@ -1981,7 +1857,7 @@
return
if(!CONFIG_GET(string/centcom_ban_db))
- to_chat(usr, "Centcom Galactic Ban DB is disabled!")
+ to_chat(usr, "CentCom Galactic Ban DB is disabled!")
return
var/ckey = href_list["centcomlookup"]
@@ -2024,7 +1900,7 @@
dat += sanitize(jobs.Join(", "))
dat += "
"
dat += "
"
-
+
var/datum/browser/popup = new(usr, "centcomlookup-[ckey]", "Central Command Galactic Ban Database", 700, 600)
popup.set_content(dat.Join())
popup.open(FALSE)
@@ -2193,7 +2069,7 @@
return
var/turf/T = get_turf(tear.old_loc)
message_admins("The items consumed by the BoH tear at [ADMIN_VERBOSEJMP(T)] were retrieved by [key_name_admin(usr)].")
- tear.investigate_log("Items consumed at [AREACOORD(T)] retrieved by [key_name(usr)].", INVESTIGATE_SINGULO)
+ tear.investigate_log("Items consumed at [AREACOORD(T)] retrieved by [key_name(usr)].", INVESTIGATE_ENGINES)
tear.retrieve_consumed_items()
else if(href_list["beakerpanel"])
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index c93ee5bd0e841..a1c27a7a7973c 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -276,7 +276,6 @@
"SDQL combined querys took [DisplayTimeText(end_time_total)] to complete.") + combined_refs
GLOBAL_LIST_INIT(sdql2_queries, GLOB.sdql2_queries || list())
-GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null, "VIEW VARIABLES (all)", null))
/datum/SDQL2_query
var/list/query_tree
@@ -305,10 +304,6 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
var/list/obj_count_eligible
var/obj_count_finished
- //Statclick
- var/obj/effect/statclick/SDQL2_delete/delete_click
- var/obj/effect/statclick/SDQL2_action/action_click
-
/datum/SDQL2_query/New(list/tree, SU = FALSE, admin_interact = TRUE, _options = SDQL2_OPTIONS_DEFAULT, finished_qdel = FALSE)
if(IsAdminAdvancedProcCall() || !LAZYLEN(tree))
qdel(src)
@@ -391,17 +386,29 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
return "##HALTING"
/datum/SDQL2_query/proc/generate_stat()
+ var/list/tab_data = list()
if(!allow_admin_interact)
return
- if(!delete_click)
- delete_click = new(null, "INITIALIZING", src)
- if(!action_click)
- action_click = new(null, "INITIALIZNG", src)
- stat("[id] ", delete_click.update("DELETE QUERY | STATE : [text_state()] | ALL/ELIG/FIN \
- [islist(obj_count_all)? length(obj_count_all) : (isnull(obj_count_all)? "0" : obj_count_all)]/\
- [islist(obj_count_eligible)? length(obj_count_eligible) : (isnull(obj_count_eligible)? "0" : obj_count_eligible)]/\
- [islist(obj_count_finished)? length(obj_count_finished) : (isnull(obj_count_finished)? "0" : obj_count_finished)] - [get_query_text()]"))
- stat(" ", action_click.update("[SDQL2_IS_RUNNING? "HALT" : "RUN"]"))
+ tab_data["Delete Query [id]"] = list(
+ text = "DELETE QUERY | STATE : [text_state()] | ALL/ELIG/FIN \
+ [islist(obj_count_all)? length(obj_count_all) : (isnull(obj_count_all)? "0" : obj_count_all)]/\
+ [islist(obj_count_eligible)? length(obj_count_eligible) : (isnull(obj_count_eligible)? "0" : obj_count_eligible)]/\
+ [islist(obj_count_finished)? length(obj_count_finished) : (isnull(obj_count_finished)? "0" : obj_count_finished)] - [get_query_text()]",
+ action = "sdql2delete",
+ params = list(
+ qid = id,
+ ),
+ type = STAT_BUTTON,
+ )
+ tab_data["Toggle Query [id]"] = list(
+ text = "[SDQL2_IS_RUNNING? "HALT" : "RUN"]",
+ action = "sdql2toggle",
+ params = list(
+ qid = id,
+ ),
+ type = STAT_BUTTON,
+ )
+ return tab_data
/datum/SDQL2_query/proc/delete_click()
admin_del(usr)
@@ -762,7 +769,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
new_args[++new_args.len] = SDQL_expression(source, arg)
if(object == GLOB) // Global proc.
procname = "/proc/[procname]"
- return superuser? (call(procname)(new_args)) : (WrapAdminProcCall(GLOBAL_PROC, procname, new_args))
+ return superuser? (call("/proc/[procname]")(new_args)) : (WrapAdminProcCall(GLOBAL_PROC, procname, new_args))
return superuser? (call(object, procname)(new_args)) : (WrapAdminProcCall(object, procname, new_args))
/datum/SDQL2_query/proc/SDQL_function_async(datum/object, procname, list/arguments, source)
@@ -968,13 +975,13 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
//Staying as a world proc as this is called too often for changes to offset the potential IsAdminAdvancedProcCall checking overhead.
/world/proc/SDQL_var(object, list/expression, start = 1, source, superuser, datum/SDQL2_query/query)
var/v
- var/static/list/exclude = list("usr", "src", "marked", "global")
+ var/static/list/exclude = list("usr", "src", "marked", "global", "MC", "FS", "CFG")
var/long = start < expression.len
var/datum/D
if(is_proper_datum(object))
D = object
- if (object == world && (!long || expression[start + 1] == ".") && !(expression[start] in exclude))
+ if (object == world && (!long || expression[start + 1] == ".") && !(expression[start] in exclude) && copytext(expression[start], 1, 3) != "SS")
to_chat(usr, "World variables are not allowed to be accessed. Use global.")
return null
@@ -1020,46 +1027,22 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
v = Failsafe
if("CFG")
v = config
- //Subsystem switches
- if("SSgarbage")
- v = SSgarbage
- if("SSmachines")
- v = SSmachines
- if("SSobj")
- v = SSobj
- if("SSresearch")
- v = SSresearch
- if("SSprojectiles")
- v = SSprojectiles
- if("SSfastprocess")
- v = SSfastprocess
- if("SSticker")
- v = SSticker
- if("SStimer")
- v = SStimer
- if("SSradiation")
- v = SSradiation
- if("SSnpcpool")
- v = SSnpcpool
- if("SSmobs")
- v = SSmobs
- if("SSmood")
- v = SSmood
- if("SSquirks")
- v = SSquirks
- if("SSwet_floors")
- v = SSwet_floors
- if("SSshuttle")
- v = SSshuttle
- if("SSmapping")
- v = SSmapping
- if("SSevents")
- v = SSevents
- if("SSeconomy")
- v = SSeconomy
- //End
else
- return null
+ if(copytext(expression[start], 1, 3) == "SS") //Subsystem
+ var/SSname = copytext(expression[start], 3)
+ var/SSlength = length(SSname)
+ var/datum/controller/subsystem/SS
+ var/SSmatch
+ for(var/_SS in Master.subsystems)
+ SS = _SS
+ if(copytext("[SS.type]", -SSlength) == SSname)
+ SSmatch = SS
+ break
+ if(!SSmatch)
+ return null
+ v = SSmatch
+ else
+ return null
else if(object == GLOB) // Shitty ass hack kill me.
v = expression[start]
if(long)
@@ -1187,16 +1170,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
/proc/is_proper_datum(thing)
return istype(thing, /datum) || istype(thing, /client)
-/obj/effect/statclick/SDQL2_delete/Click()
- var/datum/SDQL2_query/Q = target
- Q.delete_click()
-
-/obj/effect/statclick/SDQL2_action/Click()
- var/datum/SDQL2_query/Q = target
- Q.action_click()
-
-/obj/effect/statclick/SDQL2_VV_all
- name = "VIEW VARIABLES"
-
-/obj/effect/statclick/SDQL2_VV_all/Click()
- usr.client.debug_variables(GLOB.sdql2_queries)
+/proc/sdqlQueryByID(id)
+ for(var/datum/SDQL2_query/query as anything in GLOB.sdql2_queries)
+ if(query.id == id)
+ return query
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
index aee395d9aa2a2..254821ec0e66d 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
@@ -27,15 +27,15 @@
// assignment : ']' | '{' '}' | '(' expression ')' | call_function
//
-// bool_expression : expression comparitor expression [bool_operator bool_expression]
+// bool_expression : expression comparator expression [bool_operator bool_expression]
// expression : ( unary_expression | '(' expression ')' | value ) [binary_operator expression]
// expression_list : expression [',' expression_list]
// unary_expression : unary_operator ( unary_expression | value )
//
-// comparitor : '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
+// comparator : '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
// value : variable | string | number | 'null' | object_type | array | selectors_array
// unary_operator : '!' | '-' | '~'
-// binary_operator : comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
+// binary_operator : comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
// bool_operator : 'AND' | '&&' | 'OR' | '||'
//
// array : '[' expression_list ']'
@@ -56,7 +56,7 @@
var/list/boolean_operators = list("and", "or", "&&", "||")
var/list/unary_operators = list("!", "-", "~")
var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^", "%")
- var/list/comparitors = list("=", "==", "!=", "<>", "<", "<=", ">", ">=")
+ var/list/comparators = list("=", "==", "!=", "<>", "<", "<=", ">", ">=")
/datum/SDQL_parser/New(query_list)
query = query_list
@@ -109,7 +109,7 @@
parse_error("Invalid option assignment symbol: [token(i + 1)]")
var/val = tokenl(i + 2)
if(!(val in SDQL2_VALID_OPTION_VALUES))
- parse_error("Invalid optoin value: [val]")
+ parse_error("Invalid option value: [val]")
assignment_list[type] = val
return (i + 3)
@@ -396,21 +396,21 @@
var/path = text2path(token(i))
if (path == null)
- return parse_error("Nonexistant type path: [token(i)]")
+ return parse_error("Nonexistent type path: [token(i)]")
node += path
return i + 1
-//comparitor: '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
-/datum/SDQL_parser/proc/comparitor(i, list/node)
+//comparator: '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
+/datum/SDQL_parser/proc/comparator(i, list/node)
if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">="))
node += token(i)
else
- parse_error("Unknown comparitor [token(i)]")
+ parse_error("Unknown comparator [token(i)]")
return i + 1
@@ -422,7 +422,7 @@
node += token(i)
else
- parse_error("Unknown comparitor [token(i)]")
+ parse_error("Unknown comparator [token(i)]")
return i + 1
@@ -551,7 +551,7 @@
i = binary_operator(i, node)
i = expression(i, node)
- else if(token(i) in comparitors)
+ else if(token(i) in comparators)
i = binary_operator(i, node)
var/list/rhs = list()
@@ -587,10 +587,10 @@
return i
-//binary_operator: comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
+//binary_operator: comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
/datum/SDQL_parser/proc/binary_operator(i, list/node)
- if(token(i) in (binary_operators + comparitors))
+ if(token(i) in (binary_operators + comparators))
node += token(i)
else
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 857704c374dc8..d1dc12930a020 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -30,22 +30,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/list/closed_tickets = list()
var/list/resolved_tickets = list()
- var/obj/effect/statclick/ticket_list/browse_statclick = new(null, null, null)
- var/obj/effect/statclick/ticket_list/ustatclick = new(null, null, AHELP_UNCLAIMED)
- var/obj/effect/statclick/ticket_list/astatclick = new(null, null, AHELP_ACTIVE)
- var/obj/effect/statclick/ticket_list/cstatclick = new(null, null, AHELP_CLOSED)
- var/obj/effect/statclick/ticket_list/rstatclick = new(null, null, AHELP_RESOLVED)
-
/datum/admin_help_tickets/Destroy()
QDEL_LIST(unclaimed_tickets)
QDEL_LIST(active_tickets)
QDEL_LIST(closed_tickets)
QDEL_LIST(resolved_tickets)
- QDEL_NULL(browse_statclick)
- QDEL_NULL(ustatclick)
- QDEL_NULL(astatclick)
- QDEL_NULL(cstatclick)
- QDEL_NULL(rstatclick)
return ..()
/datum/admin_help_tickets/proc/TicketByID(id)
@@ -204,20 +193,47 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//Tickets statpanel
/datum/admin_help_tickets/proc/stat_entry()
+ var/list/tab_data = list()
+ tab_data["Tickets"] = list(
+ text = "Open Ticket Browser",
+ type = STAT_BUTTON,
+ action = "browsetickets",
+ )
+ tab_data["Active Tickets"] = list(
+ text = "[active_tickets.len]",
+ type = STAT_BUTTON,
+ action = "browsetickets",
+ )
var/num_disconnected = 0
- stat("", browse_statclick.update("Open Ticket Browser"))
- stat("Active Tickets:", astatclick.update("[active_tickets.len]"))
for(var/l in list(active_tickets, unclaimed_tickets))
for(var/I in l)
var/datum/admin_help/AH = I
if(AH.initiator)
- stat("#[AH.id]. [AH.initiator_key_name]:", AH.statclick.update())
+ tab_data["#[AH.id]. [AH.initiator_key_name]"] = list(
+ text = AH.name,
+ type = STAT_BUTTON,
+ action = "open_ticket",
+ params = list("id" = AH.id),
+ )
else
++num_disconnected
if(num_disconnected)
- stat("Disconnected:", astatclick.update("[num_disconnected]"))
- stat("Closed Tickets:", cstatclick.update("[closed_tickets.len]"))
- stat("Resolved Tickets:", rstatclick.update("[resolved_tickets.len]"))
+ tab_data["Disconnected"] = list(
+ text = "[num_disconnected]",
+ type = STAT_BUTTON,
+ action = "browsetickets",
+ )
+ tab_data["Closed Tickets"] = list(
+ text = "[closed_tickets.len]",
+ type = STAT_BUTTON,
+ action = "browsetickets",
+ )
+ tab_data["Resolved Tickets"] = list(
+ text = "[resolved_tickets.len]",
+ type = STAT_BUTTON,
+ action = "browsetickets",
+ )
+ return tab_data
//Reassociate still open ticket if one exists
/datum/admin_help_tickets/proc/ClientLogin(client/C)
@@ -241,20 +257,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(AH.initiator_ckey == ckey)
return AH
-//
-//TICKET LIST STATCLICK
-//
-
-/obj/effect/statclick/ticket_list
- var/current_state
-
-/obj/effect/statclick/ticket_list/New(loc, name, state)
- current_state = state
- ..()
-
-/obj/effect/statclick/ticket_list/Click()
- GLOB.ahelp_tickets.BrowseTickets(usr)
-
//
// Ticket interaction
//
@@ -265,6 +267,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/from_user = ""
var/to_user = ""
var/message = ""
+ var/from_user_safe
+ var/to_user_safe
/datum/ticket_interaction/New()
. = ..()
@@ -292,8 +296,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/list/_interactions //use AddInteraction() or, preferably, admin_ticket_log()
- var/obj/effect/statclick/ahelp/statclick
-
var/static/ticket_counter = 0
var/bwoink // is the ahelp player to admin (not bwoink) or admin to player (bwoink)
@@ -311,7 +313,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
id = ++ticket_counter
opened_at = world.time
- name = msg
+ name = copytext_char(msg, 1, 100)
initiator = C
initiator_ckey = initiator.ckey
@@ -324,23 +326,22 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
TimeoutVerb()
- statclick = new(null, src)
_interactions = list()
GLOB.ahelp_tickets.unclaimed_tickets += src
if(is_bwoink)
- AddInteraction("blue", name, usr.ckey, initiator_key_name)
+ AddInteraction("blue", name, usr.ckey, initiator_key_name, "Administrator", "You")
message_admins("Ticket [TicketHref("#[id]")] created")
Claim() //Auto claim bwoinks
else
MessageNoRecipient(msg)
- //send it to irc if nobody is on and tell us how many were on
- var/admin_number_present = send2irc_adminless_only(initiator_ckey, "Ticket #[id]: [name]")
+ //send it to tgs if nobody is on and tell us how many were on
+ var/admin_number_present = send2tgs_adminless_only(initiator_ckey, "Ticket #[id]: [msg]")
log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.")
if(admin_number_present <= 0)
- to_chat(C, "No active admins are online, your adminhelp was sent to the admin irc.")
+ to_chat(C, "No active admins are online, your adminhelp was sent through TGS to admins who are available. This may use IRC or Discord.")
heard_by_no_admins = TRUE
bwoink = is_bwoink
@@ -353,20 +354,22 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
GLOB.ahelp_tickets.resolved_tickets -= src
return ..()
-/datum/admin_help/proc/AddInteraction(msg_color, message, name_from, name_to)
+/datum/admin_help/proc/AddInteraction(msg_color, message, name_from, name_to, safe_from, safe_to)
if(heard_by_no_admins && usr && usr.ckey != initiator_ckey)
heard_by_no_admins = FALSE
- send2irc(initiator_ckey, "Ticket #[id]: Answered by [key_name(usr)]")
+ send2tgs(initiator_ckey, "Ticket #[id]: Answered by [key_name(usr)]")
var/datum/ticket_interaction/interaction_message = new /datum/ticket_interaction
interaction_message.message_color = msg_color
interaction_message.message = message
interaction_message.from_user = name_from
interaction_message.to_user = name_to
+ interaction_message.from_user_safe = safe_from
+ interaction_message.to_user_safe = safe_to
_interactions += interaction_message
SStgui.update_uis(src)
/datum/admin_help/proc/TimeoutVerb()
- initiator.verbs -= /client/verb/adminhelp
+ initiator.remove_verb(/client/verb/adminhelp)
initiator.adminhelptimerid = addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 1200, TIMER_STOPPABLE)
//private
@@ -510,7 +513,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//Message to be sent to all admins
var/admin_msg = "Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]"
- AddInteraction("red", msg, initiator_key_name, claimed_admin_key_name)
+ AddInteraction("red", msg, initiator_key_name, claimed_admin_key_name, "You", "Administrator")
log_admin_private("Ticket #[id]: [key_name(initiator)]: [msg]")
//send this msg to all admins
@@ -537,7 +540,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
to_chat(usr, "This user already has an active ticket, cannot reopen this one.")
return
- statclick = new(null, src)
GLOB.ahelp_tickets.active_tickets += src
GLOB.ahelp_tickets.closed_tickets -= src
GLOB.ahelp_tickets.resolved_tickets -= src
@@ -563,7 +565,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(state > AHELP_ACTIVE)
return
closed_at = world.time
- QDEL_NULL(statclick)
if(state == AHELP_ACTIVE)
GLOB.ahelp_tickets.active_tickets -= src
else
@@ -733,27 +734,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if("mhelp")
MHelpThis()
-//
-// TICKET STATCLICK
-//
-
-/obj/effect/statclick/ahelp
- var/datum/admin_help/ahelp_datum
-
-/obj/effect/statclick/ahelp/Initialize(mapload, datum/admin_help/AH)
- ahelp_datum = AH
- . = ..()
-
-/obj/effect/statclick/ahelp/update()
- return ..(ahelp_datum.name)
-
-/obj/effect/statclick/ahelp/Click()
- ahelp_datum.TicketPanel()
-
-/obj/effect/statclick/ahelp/Destroy()
- ahelp_datum = null
- return ..()
-
//
//CLIENT PROCS
//
@@ -761,16 +741,16 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/client/proc/giveadminhelpverb()
if(!src)
return
- src.verbs |= /client/verb/adminhelp
+ src.add_verb(/client/verb/adminhelp)
deltimer(adminhelptimerid)
adminhelptimerid = 0
// Used for methods where input via arg doesn't work
/client/proc/get_adminhelp()
- var/msg = capped_input(src, "Please describe your problem concisely and an admin will help as soon as they're able. Include the names of the people you are ahelping against if applicable.", "Adminhelp contents")
+ var/msg = capped_multiline_input(src, "Please describe your problem concisely and an admin will help as soon as they're able. Include the names of the people you are ahelping against if applicable.", "Adminhelp contents")
adminhelp(msg)
-/client/verb/adminhelp(msg as text)
+/client/verb/adminhelp(msg as message)
set category = "Admin"
set name = "Adminhelp"
@@ -811,7 +791,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//Use this proc when an admin takes action that may be related to an open ticket on what
//what can be a client, ckey, or mob
-/proc/admin_ticket_log(what, message, whofrom = "", whoto = "", color = "white")
+/proc/admin_ticket_log(what, message, whofrom = "", whoto = "", color = "white", isSenderAdmin = FALSE, safeSenderLogged = FALSE)
var/client/C
var/mob/Mob = what
if(istype(Mob))
@@ -819,12 +799,18 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
else
C = what
if(istype(C) && C.current_ticket)
- C.current_ticket.AddInteraction(color, message, whofrom, whoto)
+ if(safeSenderLogged)
+ C.current_ticket.AddInteraction(color, message, whofrom, whoto, isSenderAdmin ? "Administrator" : "You", isSenderAdmin ? "You" : "Administrator")
+ else
+ C.current_ticket.AddInteraction(color, message, whofrom, whoto)
return C.current_ticket
if(istext(what)) //ckey
var/datum/admin_help/AH = GLOB.ahelp_tickets.CKey2ActiveTicket(what)
if(AH)
- AH.AddInteraction(color, message, whofrom, whoto)
+ if(safeSenderLogged)
+ AH.AddInteraction(color, message, whofrom, whoto, isSenderAdmin ? "Administrator" : "You", isSenderAdmin ? "You" : "Administrator")
+ else
+ AH.AddInteraction(color, message, whofrom, whoto)
return AH
@@ -845,7 +831,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
else
.["present"] += X
-/proc/send2irc_adminless_only(source, msg, requiredflags = R_BAN)
+/proc/send2tgs_adminless_only(source, msg, requiredflags = R_BAN)
var/list/adm = get_admin_counts(requiredflags)
var/list/activemins = adm["present"]
. = activemins.len
@@ -859,32 +845,16 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
final = "[msg] - No admins online"
else
final = "[msg] - All admins stealthed\[[english_list(stealthmins)]\], AFK\[[english_list(afkmins)]\], or lacks +BAN\[[english_list(powerlessmins)]\]! Total: [allmins.len] "
- send2irc(source,final)
- send2otherserver(source,final)
+ send2tgs(source,final)
+ SStopic.crosscomms_send("ahelp", final, source)
-/proc/send2irc(msg,msg2)
+/proc/send2tgs(msg,msg2)
msg = replacetext(replacetext(msg, "\proper", ""), "\improper", "")
msg2 = replacetext(replacetext(msg2, "\proper", ""), "\improper", "")
world.TgsTargetedChatBroadcast("[msg] | [msg2]", TRUE)
-/proc/send2otherserver(source,msg,type = "Ahelp")
- var/comms_key = CONFIG_GET(string/comms_key)
- if(!comms_key)
- return
- var/list/message = list()
- message["message_sender"] = source
- message["message"] = msg
- message["source"] = "([CONFIG_GET(string/cross_comms_name)])"
- message["key"] = comms_key
- message += type
-
- var/list/servers = CONFIG_GET(keyed_list/cross_server)
- for(var/I in servers)
- world.Export("[servers[I]]?[list2params(message)]")
-
-
-/proc/ircadminwho()
+/proc/tgsadminwho()
var/list/message = list("Admins: ")
var/list/admin_keys = list()
for(var/adm in GLOB.admins)
@@ -899,7 +869,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
return jointext(message, "")
-/proc/keywords_lookup(msg,irc)
+/proc/keywords_lookup(msg,external)
//This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i")
@@ -911,8 +881,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/list/surnames = list()
var/list/forenames = list()
var/list/ckeys = list()
- var/founds = ""
+ var/list/founds = list()
for(var/mob/M in GLOB.mob_list)
+ if(istype(M, /mob/living/carbon/human/dummy))
+ continue
+
var/list/indexing = list(M.real_name, M.name)
if(M.mind)
indexing += M.mind.name
@@ -958,15 +931,16 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/is_antag = 0
if(found.mind?.special_role)
is_antag = 1
- founds += "Name: [found.name]([found.real_name]) Key: [found.key] Ckey: [found.ckey] [is_antag ? "(Antag)" : null] "
+ founds[++founds.len] = list("name" = found.name,
+ "real_name" = found.real_name,
+ "ckey" = found.ckey,
+ "key" = found.key,
+ "antag" = is_antag)
msg += "[original_word](?|F) "
continue
msg += "[original_word] "
- if(irc)
- if(founds == "")
- return "Search Failed"
- else
- return founds
+ if(external)
+ return founds
return msg
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 02c41581744c5..1709f27b47b9e 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -1,4 +1,4 @@
-#define IRCREPLYCOUNT 2
+#define EXTERNALREPLYCOUNT 2
//allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm
@@ -95,20 +95,20 @@
return
var/client/recipient
- var/irc = 0
+ var/external = 0
if(istext(whom))
if(whom[1] == "@")
whom = findStealthKey(whom)
if(whom == "IRCKEY")
- irc = 1
+ external = 1
else
recipient = GLOB.directory[whom]
else if(istype(whom, /client))
recipient = whom
- if(irc)
- if(!ircreplyamount) //to prevent people from spamming irc
+ if(external)
+ if(!externalreplyamount) //to prevent people from spamming irc/discord
return
if(!msg)
msg = stripped_multiline_input(src,"Message:", "Private message to Administrator")
@@ -116,7 +116,7 @@
if(!msg)
return
if(holder)
- to_chat(src, "Error: Use the admin IRC channel, nerd.", type = MESSAGE_TYPE_ADMINPM)
+ to_chat(src, "Error: Use the admin IRC/Discord channel, nerd.", type = MESSAGE_TYPE_ADMINPM)
return
@@ -153,7 +153,7 @@
return
//clean the message if it's not sent by a high-rank admin
- if(!check_rights(R_SERVER|R_DEBUG,0)||irc)//no sending html to the poor bots
+ if(!check_rights(R_SERVER|R_DEBUG,0)||external)//no sending html to the poor bots
msg = trim(sanitize(msg), MAX_MESSAGE_LEN)
if(!msg)
return
@@ -165,11 +165,11 @@
var/keywordparsedmsg = keywords_lookup(msg)
- if(irc)
+ if(external)
to_chat(src, "PM to-Admins: [rawmsg]", type = MESSAGE_TYPE_ADMINPM)
- var/datum/admin_help/AH = admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]")
- ircreplyamount--
- send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg)
+ var/datum/admin_help/AH = admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to External: [keywordparsedmsg]")
+ externalreplyamount--
+ send2tgs("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg)
else
if(recipient.holder)
if(holder) //both are admins
@@ -177,13 +177,13 @@
to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]", type = MESSAGE_TYPE_ADMINPM)
//omg this is dumb, just fill in both their tickets
- admin_ticket_log(src, keywordparsedmsg, key_name(src, recipient, 1), key_name(recipient, src, 1), color="teal")
+ admin_ticket_log(src, keywordparsedmsg, key_name(src, recipient, 1), key_name(recipient, src, 1), color="teal", isSenderAdmin = TRUE, safeSenderLogged = TRUE)
if(recipient != src) //reeee
- admin_ticket_log(recipient, keywordparsedmsg, key_name(src, recipient, 1), key_name(recipient, src, 1), color="teal")
+ admin_ticket_log(recipient, keywordparsedmsg, key_name(src, recipient, 1), key_name(recipient, src, 1), color="teal", isSenderAdmin = TRUE, safeSenderLogged = TRUE)
else //recipient is an admin but sender is not
var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]"
- admin_ticket_log(src, keywordparsedmsg, key_name(src, recipient, 1), null, "white")
+ admin_ticket_log(src, keywordparsedmsg, key_name(src, recipient, 1), null, "white", isSenderAdmin = TRUE, safeSenderLogged = TRUE)
to_chat(recipient, "[replymsg]", type = MESSAGE_TYPE_ADMINPM)
to_chat(src, "PM to-Admins: [msg]", type = MESSAGE_TYPE_ADMINPM)
@@ -201,7 +201,7 @@
to_chat(recipient, "Click on the administrator's name to reply.", type = MESSAGE_TYPE_ADMINPM)
to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]", type = MESSAGE_TYPE_ADMINPM)
- admin_ticket_log(recipient, keywordparsedmsg, key_name_admin(src), null, "purple")
+ admin_ticket_log(recipient, keywordparsedmsg, key_name_admin(src), null, "purple", safeSenderLogged = TRUE)
//always play non-admin recipients the adminhelp sound
SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
@@ -227,10 +227,10 @@
to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.", type = MESSAGE_TYPE_ADMINPM)
return
- if(irc)
- log_admin_private("PM: [key_name(src)]->IRC: [rawmsg]")
+ if(external)
+ log_admin_private("PM: [key_name(src)]->External: [rawmsg]")
for(var/client/X in GLOB.admins)
- to_chat(X, "PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]")
+ to_chat(X, "PM: [key_name(src, X, 0)]->External: [keywordparsedmsg]")
else
window_flash(recipient, ignorepref = TRUE)
log_admin_private("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]")
@@ -241,34 +241,34 @@
-#define IRC_AHELP_USAGE "Usage: ticket
bucket_list
+ [bucket_list_output]
+
+ second_queue
+ [second_queue]
+ "}, "window=check_timer_sources;size=700x700")
+
+/proc/generate_timer_source_output(list/datum/timedevent/events)
+ var/list/per_source = list()
+
+ // Collate all events and figure out what sources are creating the most
+ for (var/_event in events)
+ if (!_event)
+ continue
+ var/datum/timedevent/event = _event
+
+ do
+ if (event.source)
+ if (per_source[event.source] == null)
+ per_source[event.source] = 1
+ else
+ per_source[event.source] += 1
+ event = event.next
+ while (event && event != _event)
+
+ // Now, sort them in order
+ var/list/sorted = list()
+ for (var/source in per_source)
+ sorted += list(list("source" = source, "count" = per_source[source]))
+ sorted = sortTim(sorted, .proc/cmp_timer_data)
+
+ // Now that everything is sorted, compile them into an HTML output
+ var/output = ""
+
+ for (var/_timer_data in sorted)
+ var/list/timer_data = _timer_data
+ output += {"
"
+
+ return output
+
+/proc/cmp_timer_data(list/a, list/b)
+ return b["count"] - a["count"]
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index fd4374a7724d6..7c65da13d5acb 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -14,9 +14,7 @@
var/largest_click_time = 0
var/mob/largest_move_mob = null
var/mob/largest_click_mob = null
- for(var/mob/M in world)
- if(!M.client)
- continue
+ for(var/mob/M in GLOB.player_list)
if(M.next_move >= largest_move_time)
largest_move_mob = M
if(M.next_move > world.time)
@@ -32,6 +30,7 @@
log_admin("DEBUG: [key_name(M)] next_move = [M.next_move] lastDblClick = [M.next_click] world.time = [world.time]")
M.next_move = 1
M.next_click = 0
+
message_admins("[ADMIN_LOOKUPFLW(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [DisplayTimeText(largest_move_time)]!")
message_admins("[ADMIN_LOOKUPFLW(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [DisplayTimeText(largest_click_time)]!")
message_admins("world.time = [world.time]")
@@ -50,12 +49,16 @@
output += " ERROR
+ "}
+
+ output += "[timer_data["source"]]
+ [timer_data["count"]]
+
"
continue
for (var/filter in fqs.devices)
- var/list/f = fqs.devices[filter]
- if (!f)
+ var/list/filtered = fqs.devices[filter]
+ if (!filtered)
output += " [filter]: ERROR
"
continue
- output += " [filter]: [f.len]
"
- for (var/device in f)
+ output += " [filter]: [filtered.len]
"
+ for(var/datum/weakref/device_ref as anything in filtered)
+ var/atom/device = device_ref.resolve()
+ if(!device)
+ filtered -= device_ref
+ continue
if (istype(device, /atom))
var/atom/A = device
output += " [device] ([AREACOORD(A)])
"
diff --git a/code/modules/admin/verbs/ghost_pool_protection.dm b/code/modules/admin/verbs/ghost_pool_protection.dm
new file mode 100644
index 0000000000000..aa4724d1cfdf8
--- /dev/null
+++ b/code/modules/admin/verbs/ghost_pool_protection.dm
@@ -0,0 +1,93 @@
+//very similar to centcom_podlauncher in terms of how this is coded, so i kept a lot of comments from it
+
+/client/proc/ghost_pool_protection() //Creates a verb for admins to open up the ui
+ set name = "Ghost Pool Protection"
+ set desc = "Choose which ways people can get into the round, or just clear it out completely for admin events."
+ set category = "Adminbus"
+ var/datum/ghost_pool_menu/tgui = new(usr)//create the datum
+ tgui.ui_interact(usr)//datum has a tgui component, here we open the window
+
+/datum/ghost_pool_menu
+ var/client/holder //client of whoever is using this datum
+
+ //when submitted, what the pool flags will be set to
+ var/new_role_flags = ALL
+
+ //EVERY TYPE OF WAY SOMEONE IS GETTING BACK INTO THE ROUND!
+ //these are the same comments as the ones in admin.dm defines, please update those if you change them here
+ /*
+ var/events_or_midrounds = TRUE //ie fugitives, space dragon, etc. also includes dynamic midrounds as it's the same deal
+ var/spawners = TRUE //ie ashwalkers, free golems, beach bums
+ var/station_sentience = TRUE //ie posibrains, mind monkeys, sentience potion, etc.
+ var/minigames = TRUE //ie mafia, ctf
+ var/misc = TRUE //oddities like split personality and any animal ones like spiders, xenos
+ */
+
+/datum/ghost_pool_menu/New(user)//user can either be a client or a mob due to byondcode(tm)
+ if (istype(user, /client))
+ var/client/user_client = user
+ holder = user_client //if its a client, assign it to holder
+ else
+ var/mob/user_mob = user
+ holder = user_mob.client //if its a mob, assign the mob's client to holder
+ new_role_flags = GLOB.ghost_role_flags
+
+/datum/ghost_pool_menu/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/ghost_pool_menu/ui_close()
+ qdel(src)
+
+/datum/ghost_pool_menu/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "GhostPoolProtection")
+ ui.open()
+
+/datum/ghost_pool_menu/ui_data(mob/user)
+ var/list/data = list()
+ data["events_or_midrounds"] = (new_role_flags & GHOSTROLE_MIDROUND_EVENT)
+ data["spawners"] = (new_role_flags & GHOSTROLE_SPAWNER)
+ data["station_sentience"] = (new_role_flags & GHOSTROLE_STATION_SENTIENCE)
+ data["silicons"] = (new_role_flags & GHOSTROLE_SILICONS)
+ data["minigames"] = (new_role_flags & GHOSTROLE_MINIGAME)
+ return data
+
+/datum/ghost_pool_menu/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+ switch(action)
+ if("toggle_events_or_midrounds")
+ new_role_flags ^= GHOSTROLE_MIDROUND_EVENT
+ . = TRUE
+ if("toggle_spawners")
+ new_role_flags ^= GHOSTROLE_SPAWNER
+ . = TRUE
+ if("toggle_station_sentience")
+ new_role_flags ^= GHOSTROLE_STATION_SENTIENCE
+ . = TRUE
+ if("toggle_silicons")
+ new_role_flags ^= GHOSTROLE_SILICONS
+ . = TRUE
+ if("toggle_minigames")
+ new_role_flags ^= GHOSTROLE_MINIGAME
+ . = TRUE
+ if("all_roles")
+ new_role_flags = ALL
+ . = TRUE
+ if("no_roles")
+ new_role_flags = NONE
+ . = TRUE
+ if("apply_settings")
+ to_chat(usr, "Settings Applied!")
+ var/msg
+ switch(new_role_flags)
+ if(ALL)
+ msg = "enabled all of"
+ if(NONE)
+ msg = "disabled all of"
+ else
+ msg = "modified"
+ message_admins("[key_name_admin(holder)] has [msg] this round's allowed ghost roles.")
+ GLOB.ghost_role_flags = new_role_flags
diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm
index 954b5ccee6058..9ad07ac1b2573 100644
--- a/code/modules/admin/verbs/individual_logging.dm
+++ b/code/modules/admin/verbs/individual_logging.dm
@@ -5,7 +5,7 @@
var/ntype = text2num(type)
//Add client links
- var/dat = ""
+ var/list/dat = list()
if(M.client)
dat += "
[reversed[entry]]
"
- dat += "
"
+ var/list/all_the_entrys = log_source[log_type]
+ for(var/entry in all_the_entrys)
+ concatenated_logs += "[entry]
[all_the_entrys[entry]]"
+ if(length(concatenated_logs))
+ sortTim(concatenated_logs, cmp = /proc/cmp_text_dsc) //Sort by timestamp.
+ dat += ""
+ dat += concatenated_logs.Join("
")
+ dat += ""
- usr << browse(dat, "window=invidual_logging_[key_name(M)];size=600x480")
+ var/datum/browser/popup = new(usr, "invidual_logging_[key_name(M)]", "Individual Logs", 600, 600)
+ popup.set_content(dat.Join())
+ popup.open()
/proc/individual_logging_panel_link(mob/M, log_type, log_src, label, selected_src, selected_type)
var/slabel = label
if(selected_type == log_type && selected_src == log_src)
slabel = "\[[label]\]"
-
+ //This is necessary because num2text drops digits and rounds on big numbers. If more defines get added in the future it could break again.
+ log_type = num2text(log_type, MAX_BITFLAG_DIGITS)
return "[slabel]"
diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
index 0e687c8b045ea..82db4dc885ad7 100644
--- a/code/modules/admin/verbs/map_template_loadverb.dm
+++ b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -37,11 +37,14 @@
to_chat(src, "Filename must end in '.dmm': [map]")
return
var/datum/map_template/M
+ var/type
switch(alert(src, "What kind of map is this?", "Map type", "Normal", "Shuttle", "Cancel"))
if("Normal")
- M = new /datum/map_template(map, "[map]", TRUE)
+ type = "Normal"
+ M = new /datum/map_template(map, "[map] - Uploaded by [ckey] at [time2text(world.timeofday,"YYYY-MM-DD hh:mm:ss")]", TRUE)
if("Shuttle")
- M = new /datum/map_template/shuttle(map, "[map]", TRUE)
+ type = "Shuttle"
+ M = new /datum/map_template/shuttle(map, "[map] - Uploaded by [ckey] at [time2text(world.timeofday,"YYYY-MM-DD hh:mm:ss")]", TRUE, copytext("[map]",1, -4))
else
return
if(!M.cached_map)
@@ -61,7 +64,11 @@
else
alert(src, "The map failed validation and cannot be loaded.", "Map Errors", "Oh Darn")
return
-
- SSmapping.map_templates[M.name] = M
- message_admins("[key_name_admin(src)] has uploaded a map template '[map]' ([M.width]x[M.height])[report_link].")
+ switch(type)
+ if("Normal")
+ SSmapping.map_templates[M.name] = M
+ if("Shuttle")
+ var/datum/map_template/shuttle/S = M
+ SSmapping.shuttle_templates[S.shuttle_id] = S
+ message_admins("[key_name_admin(src)] has uploaded a [type] map template '[map]' ([M.width]x[M.height])[report_link].")
to_chat(src, "Map template '[map]' ready to place ([M.width]x[M.height])")
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index a5c164a736d56..ad172f4e76774 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -84,9 +84,8 @@ GLOBAL_PROTECT(admin_verbs_debug_mapping)
for(var/turf/T in C.can_see())
seen[T]++
for(var/turf/T in seen)
- T.maptext = "[seen[T]]"
+ T.maptext = MAPTEXT("[seen[T]]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Camera Range") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Camera Range")
#ifdef TESTING
GLOBAL_LIST_EMPTY(dirty_vars)
@@ -157,7 +156,7 @@ GLOBAL_LIST_EMPTY(dirty_vars)
if(intercom_range_display_status)
for(var/obj/item/radio/intercom/I in world)
- for(var/turf/T in orange(7,I))
+ for(var/turf/T as() in RANGE_TURFS(7,I))
var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T)
if (!(F in view(7,I.loc)))
qdel(F)
@@ -205,15 +204,15 @@ GLOBAL_LIST_EMPTY(dirty_vars)
set name = "Debug verbs - Enable"
if(!check_rights(R_DEBUG))
return
- verbs -= /client/proc/enable_debug_verbs
- verbs.Add(/client/proc/disable_debug_verbs, GLOB.admin_verbs_debug_mapping)
+ remove_verb(/client/proc/enable_debug_verbs)
+ add_verb(list(/client/proc/disable_debug_verbs) + GLOB.admin_verbs_debug_mapping)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Enable Debug Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/disable_debug_verbs()
set category = "Debug"
set name = "Debug verbs - Disable"
- verbs.Remove(/client/proc/disable_debug_verbs, GLOB.admin_verbs_debug_mapping)
- verbs += /client/proc/enable_debug_verbs
+ remove_verb(list(/client/proc/disable_debug_verbs) + GLOB.admin_verbs_debug_mapping)
+ add_verb(/client/proc/enable_debug_verbs)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Disable Debug Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/count_objects_on_z_level()
@@ -239,18 +238,19 @@ GLOBAL_LIST_EMPTY(dirty_vars)
var/list/atom/atom_list = list()
- for(var/atom/A in world)
- if(istype(A,type_path))
- var/atom/B = A
- while(!(isturf(B.loc)))
+ for(var/area/T as() in get_areas(/area, num_level))
+ for(var/atom/A in T)
+ if(istype(A, type_path))
+ var/atom/B = A
+ while(!(isturf(B.loc)))
if(B?.loc)
B = B.loc
else
break
- if(B)
- if(B.z == num_level)
+ if(B)
count++
atom_list += A
+ CHECK_TICK
to_chat(world, "There are [count] objects of type [type_path] on z-level [num_level]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Count Objects Zlevel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/maprotation.dm b/code/modules/admin/verbs/maprotation.dm
index 91e7045b9fa7d..19c509857930d 100644
--- a/code/modules/admin/verbs/maprotation.dm
+++ b/code/modules/admin/verbs/maprotation.dm
@@ -12,7 +12,7 @@
/client/proc/adminchangemap()
set category = "Server"
set name = "Change Map"
-
+
var/list/maprotatechoices = list()
for (var/map in config.maplist)
var/datum/map_config/VM = config.maplist[map]
@@ -43,3 +43,28 @@
log_admin("[key_name(usr)] is changing the map to [VM.map_name]")
if (SSmapping.changemap(VM) == 0)
message_admins("[key_name_admin(usr)] has changed the map to [VM.map_name]")
+
+/client/proc/forcemapconfig()
+ set category = "Debug"
+ set name = "Debug Force Map"
+
+ //Locked behind permissions since it needs serious protection.
+ if(!check_rights(R_DEBUG) || !check_rights(R_SERVER) || !check_rights(R_PERMISSIONS))
+ to_chat(src, "Insufficient rights (Requires debug, server and permissions).")
+ return
+
+ var/json_settings = input(usr, "Enter map json name:", "Map Json Name", "") as text|null
+
+ if(!json_settings)
+ return
+
+ var/datum/map_config/config = new
+ if(!config.LoadConfig("_maps/[json_settings].json", TRUE))
+ qdel(config)
+ to_chat(usr, "Map json failed to load!")
+ return
+ SSticker.maprotatechecked = 1
+ message_admins("[key_name_admin(usr)] is changing the map to [config.map_name]")
+ log_admin("[key_name(usr)] is changing the map to [config.map_name]")
+ if (SSmapping.changemap(config) == 0)
+ message_admins("[key_name_admin(usr)] has changed the map to [config.map_name]")
diff --git a/code/modules/admin/verbs/mentors_edit.dm b/code/modules/admin/verbs/mentors_edit.dm
index 316ab40d55c09..43da6121095b4 100644
--- a/code/modules/admin/verbs/mentors_edit.dm
+++ b/code/modules/admin/verbs/mentors_edit.dm
@@ -4,68 +4,70 @@ also probably less secure, but honestly dude
its mentors, not actual dangerous perms
******************************************/
/client/proc/edit_mentors()
- set category = "Admin"
- set name = "Mentor Panel"
- set desc = "Edit mentors"
+ set category = "Admin"
+ set name = "Mentor Panel"
+ set desc = "Edit mentors"
- if(!check_rights(R_PERMISSIONS))
- return
- if(!SSdbcore.IsConnected())
- to_chat(src, "Failed to establish database connection.")
- return
+ if(!check_rights(R_PERMISSIONS))
+ return
+ if(!SSdbcore.IsConnected())
+ to_chat(src, "Failed to establish database connection.")
+ return
- var/html = "Mentor Panel
\n"
- html += "Add a Mentor\n"
- html += "\n"
- html += "
"
- usr << browse("[html]","window=editmentors;size=1000x650")
- qdel(query_mentor_list)
+ usr << browse("[html]","window=editmentors;size=1000x650")
+ qdel(query_mentor_list)
/client/Topic(href, href_list)
- ..()
- if(href_list["mentor_edit"])
- if(!check_rights(R_PERMISSIONS))
- message_admins("[key_name_admin(usr)] attempted to edit mentor permissions without sufficient rights.")
- log_admin("[key_name(usr)] attempted to edit mentor permissions without sufficient rights.")
- return
- if(IsAdminAdvancedProcCall())
- to_chat(usr, "Mentor Edit blocked: Advanced ProcCall detected.")
- return
+ ..()
+ if(href_list["mentor_edit"])
+ if(!check_rights(R_PERMISSIONS))
+ message_admins("[key_name_admin(usr)] attempted to edit mentor permissions without sufficient rights.")
+ log_admin("[key_name(usr)] attempted to edit mentor permissions without sufficient rights.")
+ return
+ if(IsAdminAdvancedProcCall())
+ to_chat(usr, "Mentor Edit blocked: Advanced ProcCall detected.")
+ return
- if(href_list["mentor_edit"] == "add")
- var/newguy = input("Enter the key of the mentor you wish to add.", "")
- var/datum/DBQuery/query_add_mentor = SSdbcore.NewQuery(
- "INSERT INTO [format_table_name("mentor")] (ckey) VALUES (:newguy)",
- list("newguy" = newguy)
- )
- if(!query_add_mentor.warn_execute())
- qdel(query_add_mentor)
- return
- message_admins("[key_name(usr)] made [newguy] a mentor.")
- log_admin("[key_name(usr)] made [newguy] a mentor.")
- qdel(query_add_mentor)
- return
+ if(href_list["mentor_edit"] == "add")
+ var/newguy = input("Enter the key of the mentor you wish to add.", "")
+ var/datum/DBQuery/query_add_mentor = SSdbcore.NewQuery(
+ "INSERT INTO [format_table_name("mentor")] (ckey) VALUES (:newguy)",
+ list("newguy" = newguy)
+ )
+ if(!query_add_mentor.warn_execute())
+ qdel(query_add_mentor)
+ return
+ message_admins("[key_name(usr)] made [newguy] a mentor.")
+ log_admin("[key_name(usr)] made [newguy] a mentor.")
+ qdel(query_add_mentor)
+ load_mentors()
+ return
- if(href_list["mentor_edit"] == "remove")
- var/removed_mentor = href_list["mentor_ckey"]
- var/datum/DBQuery/query_remove_mentor = SSdbcore.NewQuery(
- "DELETE FROM [format_table_name("mentor")] WHERE ckey = :removed_mentor",
- list("removed_mentor" = removed_mentor)
- )
- if(!query_remove_mentor.warn_execute())
- qdel(query_remove_mentor)
- return
- message_admins("[key_name(usr)] de-mentored [href_list["mentor_ckey"]]")
- log_admin("[key_name(usr)] de-mentored [href_list["mentor_ckey"]]")
- qdel(query_remove_mentor)
+ if(href_list["mentor_edit"] == "remove")
+ var/removed_mentor = href_list["mentor_ckey"]
+ var/datum/DBQuery/query_remove_mentor = SSdbcore.NewQuery(
+ "DELETE FROM [format_table_name("mentor")] WHERE ckey = :removed_mentor",
+ list("removed_mentor" = removed_mentor)
+ )
+ if(!query_remove_mentor.warn_execute())
+ qdel(query_remove_mentor)
+ return
+ message_admins("[key_name(usr)] de-mentored [href_list["mentor_ckey"]]")
+ log_admin("[key_name(usr)] de-mentored [href_list["mentor_ckey"]]")
+ qdel(query_remove_mentor)
+ load_mentors()
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 2f68988ce015b..089a3f97095f2 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -43,7 +43,7 @@
return !is_banned_from(applicant.ckey, list(targetrole, ROLE_SYNDICATE))
-/datum/admins/proc/makeTraitors()
+/datum/admins/proc/makeTraitors(maxCount = 3)
var/datum/game_mode/traitor/temp = new
if(CONFIG_GET(flag/protect_roles_from_antagonist))
@@ -65,20 +65,20 @@
candidates += applicant
if(candidates.len)
- var/numTraitors = min(candidates.len, 3)
+ var/numTraitors = min(candidates.len, maxCount)
for(var/i = 0, iMentor Ckey Remove Mentor Panel
\n"
+ html += "Add a Mentor\n"
+ html += "\n"
+ html += "
"
+ html += "Mentor Ckey Remove [query_mentor_list.item[1]] X [query_mentor_list.item[1]] X
Playtime:"
- body += C.get_exp_report()
- body += "Toggle Exempt status"
- body += ""
- usr << browse(body.Join(), "window=playerplaytime[C.ckey];size=550x615")
+ new /datum/job_report_menu(client_to_check, usr)
/datum/admins/proc/toggle_exempt_status(client/C)
if(!check_rights(R_ADMIN))
@@ -1239,6 +1272,50 @@ Traitors and the like can also be revived with the previous role mostly intact.
message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")
+/// Allow admin to add or remove traits of datum
+/datum/admins/proc/modify_traits(datum/D)
+ if(!D)
+ return
+
+ var/add_or_remove = input("Remove/Add?", "Trait Remove/Add") as null|anything in list("Add","Remove")
+ if(!add_or_remove)
+ return
+ var/list/available_traits = list()
+
+ switch(add_or_remove)
+ if("Add")
+ for(var/key in GLOB.traits_by_type)
+ if(istype(D,key))
+ available_traits += GLOB.traits_by_type[key]
+ if("Remove")
+ if(!GLOB.trait_name_map)
+ GLOB.trait_name_map = generate_trait_name_map()
+ for(var/trait in D.status_traits)
+ var/name = GLOB.trait_name_map[trait] || trait
+ available_traits[name] = trait
+
+ var/chosen_trait = input("Select trait to modify", "Trait") as null|anything in available_traits
+ if(!chosen_trait)
+ return
+ chosen_trait = available_traits[chosen_trait]
+
+ var/source = "adminabuse"
+ switch(add_or_remove)
+ if("Add") //Not doing source choosing here intentionally to make this bit faster to use, you can always vv it.
+ ADD_TRAIT(D,chosen_trait,source)
+ if("Remove")
+ var/specific = input("All or specific source ?", "Trait Remove/Add") as null|anything in list("All","Specific")
+ if(!specific)
+ return
+ switch(specific)
+ if("All")
+ source = null
+ if("Specific")
+ source = input("Source to be removed","Trait Remove/Add") as null|anything in D.status_traits[chosen_trait]
+ if(!source)
+ return
+ REMOVE_TRAIT(D,chosen_trait,source)
+
/client/proc/spawnhuman()
set name = "Spawn human"
set desc = "Spawns a mindless human"
diff --git a/code/modules/admin/verbs/requests.dm b/code/modules/admin/verbs/requests.dm
new file mode 100644
index 0000000000000..80894c2398be7
--- /dev/null
+++ b/code/modules/admin/verbs/requests.dm
@@ -0,0 +1,7 @@
+/// Verb for opening the requests manager panel
+/client/proc/requests()
+ set name = "Requests Manager"
+ set desc = "Open the request manager panel to view all requests during this round"
+ set category = "Admin"
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Request Manager") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ GLOB.requests.ui_interact(usr)
\ No newline at end of file
diff --git a/code/modules/admin/verbs/shuttlepanel.dm b/code/modules/admin/verbs/shuttlepanel.dm
index f6ced5da13e74..0eb086c653c7f 100644
--- a/code/modules/admin/verbs/shuttlepanel.dm
+++ b/code/modules/admin/verbs/shuttlepanel.dm
@@ -48,6 +48,11 @@
if(options[selection])
request(options[selection])
+ //Remove shuttle object
+ if(SSorbits.assoc_shuttles.Find(options[selection]))
+ //Removing from the list is handled by deleting the shuttle
+ qdel(SSorbits.assoc_shuttles[options[selection]])
+
/obj/docking_port/mobile/emergency/admin_fly_shuttle(mob/user)
return // use the existing verbs for this
diff --git a/code/modules/admin/view_variables/filterrific.dm b/code/modules/admin/view_variables/filterrific.dm
new file mode 100644
index 0000000000000..9d6b4834e5332
--- /dev/null
+++ b/code/modules/admin/view_variables/filterrific.dm
@@ -0,0 +1,98 @@
+/datum/filter_editor
+ var/atom/target
+
+/datum/filter_editor/New(atom/target)
+ src.target = target
+
+/datum/filter_editor/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/filter_editor/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "Filteriffic")
+ ui.open()
+
+/datum/filter_editor/ui_static_data(mob/user)
+ var/list/data = list()
+ data["filter_info"] = GLOB.master_filter_info
+ return data
+
+/datum/filter_editor/ui_data()
+ var/list/data = list()
+ data["target_name"] = target.name
+ data["target_filter_data"] = target.filter_data
+ return data
+
+/datum/filter_editor/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("add_filter")
+ var/target_name = params["name"]
+ while(target.filter_data && target.filter_data[target_name])
+ target_name = "[target_name]-dupe"
+ target.add_filter(target_name, params["priority"], list("type" = params["type"]))
+ . = TRUE
+ if("remove_filter")
+ target.remove_filter(params["name"])
+ . = TRUE
+ if("rename_filter")
+ var/list/filter_data = target.filter_data[params["name"]]
+ target.remove_filter(params["name"])
+ target.add_filter(params["new_name"], filter_data["priority"], filter_data)
+ . = TRUE
+ if("edit_filter")
+ target.remove_filter(params["name"])
+ target.add_filter(params["name"], params["priority"], params["new_filter"])
+ . = TRUE
+ if("change_priority")
+ var/new_priority = params["new_priority"]
+ target.change_filter_priority(params["name"], new_priority)
+ . = TRUE
+ if("transition_filter_value")
+ target.transition_filter(params["name"], 4, params["new_data"])
+ . = TRUE
+ if("modify_filter_value")
+ var/list/old_filter_data = target.filter_data[params["name"]]
+ var/list/new_filter_data = old_filter_data.Copy()
+ for(var/entry in params["new_data"])
+ new_filter_data[entry] = params["new_data"][entry]
+ for(var/entry in new_filter_data)
+ if(entry == GLOB.master_filter_info[old_filter_data["type"]]["defaults"][entry])
+ new_filter_data.Remove(entry)
+ target.remove_filter(params["name"])
+ target.add_filter(params["name"], old_filter_data["priority"], new_filter_data)
+ . = TRUE
+ if("modify_color_value")
+ var/new_color = input(usr, "Pick new filter color", "Filteriffic Colors!") as color|null
+ if(new_color)
+ target.transition_filter(params["name"], 4, list("color" = new_color))
+ . = TRUE
+ if("modify_icon_value")
+ var/icon/new_icon = input("Pick icon:", "Icon") as null|icon
+ if(new_icon)
+ target.filter_data[params["name"]]["icon"] = new_icon
+ target.update_filters()
+ . = TRUE
+ if("mass_apply")
+ if(!check_rights_for(usr.client, R_FUN))
+ to_chat(usr, "Error
References of \ref[D] - [D]
\[Refresh\]
" + dat += "
Back references - these things hold references to this object.
" + dat += "| Ref | Type | Variable Name | Follow | " + for(var/ref in backrefs) + var/datum/backreference = ref + if(isnull(backreference)) + dat += "
|---|---|---|---|
| GC'd Reference | |||
| [REF(backreference)] | [backreference.type] | [backrefs[backreference]] | \[Follow\] |
| [REF(backreference)] | list | [backrefs[backreference]] | \[Follow\] |
| Weird reference type. Add more debugging checks. |
" + dat += "
Forward references - this object is referencing those things.
" + dat += "| Variable name | Ref | Type | Follow | " + for(var/ref in frontrefs) + var/datum/backreference = frontrefs[ref] + dat += "
|---|---|---|---|
| [ref] | [REF(backreference)] | [backreference.type] | \[Follow\] |
" + dat = dat.Join() + + var/datum/browser/popup = new(usr, "ref_view", "
References of \ref[D]
")
+ popup.set_content(dat)
+ popup.open(FALSE)
+
+
+/datum/admins/proc/view_del_failures()
+ set category = "Debug"
+ set name = "View Deletion Failures"
+
+ if(!check_rights(R_DEBUG))
+ return
+
+ var/list/dat = list("| GC'd Reference | Clear Nulls |
| \ref[thing] | [thing.type][thing.gc_destroyed ? " (destroyed)" : ""] [ADMIN_VV(thing)] |
" + dat = dat.Join() + + var/datum/browser/popup = new(usr, "del_failures", "
Deletion Failures
")
+ popup.set_content(dat)
+ popup.open(FALSE)
+
+
+/datum/proc/find_references()
+ testing("Beginning search for references to a [type].")
+ var/list/backrefs = get_back_references(src)
+ for(var/ref in backrefs)
+ if(isnull(ref))
+ log_world("## TESTING: Datum reference found, but gone now.")
+ continue
+ if(islist(ref))
+ log_world("## TESTING: Found [type] \ref[src] in list.")
+ continue
+ var/datum/datum_ref = ref
+ if(!istype(datum_ref))
+ log_world("## TESTING: Found [type] \ref[src] in unknown type reference: [datum_ref].")
+ return
+ log_world("## TESTING: Found [type] \ref[src] in [datum_ref.type][datum_ref.gc_destroyed ? " (destroyed)" : ""]")
+ message_admins("Found [type] \ref[src] [ADMIN_VV(src)] in [datum_ref.type][datum_ref.gc_destroyed ? " (destroyed)" : ""] [ADMIN_VV(datum_ref)]")
+ testing("Completed search for references to a [type].")
+
+#endif
+
+#ifdef LEGACY_REFERENCE_TRACKING
+
+/datum/verb/legacy_find_refs()
+ set category = "Debug"
+ set name = "Find References"
+ set src in world
+
+ find_references_legacy(FALSE)
+
+
+/datum/proc/find_references_legacy(skip_alert)
+ running_find_references = type
+ if(usr?.client)
+ if(usr.client.running_find_references)
+ testing("CANCELLED search for references to a [usr.client.running_find_references].")
+ usr.client.running_find_references = null
+ running_find_references = null
+ //restart the garbage collector
+ SSgarbage.can_fire = TRUE
+ SSgarbage.next_fire = world.time + world.tick_lag
+ return
+
+ if(!skip_alert && alert("Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", "Yes", "No") != "Yes")
+ running_find_references = null
+ return
+
+ //this keeps the garbage collector from failing to collect objects being searched for in here
+ SSgarbage.can_fire = FALSE
+
+ if(usr?.client)
+ usr.client.running_find_references = type
+
+ testing("Beginning search for references to a [type].")
+ last_find_references = world.time
+
+ DoSearchVar(GLOB) //globals
+ for(var/datum/thing in world) //atoms (don't beleive its lies)
+ DoSearchVar(thing, "World -> [thing]")
+
+ for(var/datum/thing) //datums
+ DoSearchVar(thing, "World -> [thing]")
+
+ for(var/client/thing) //clients
+ DoSearchVar(thing, "World -> [thing]")
+
+ testing("Completed search for references to a [type].")
+ if(usr?.client)
+ usr.client.running_find_references = null
+ running_find_references = null
+
+ //restart the garbage collector
+ SSgarbage.can_fire = TRUE
+ SSgarbage.next_fire = world.time + world.tick_lag
+
+
+/datum/verb/qdel_then_find_references()
+ set category = "Debug"
+ set name = "qdel() then Find References"
+ set src in world
+
+ qdel(src, TRUE) //force a qdel
+ if(!running_find_references)
+ find_references_legacy(TRUE)
+
+
+/datum/verb/qdel_then_if_fail_find_references()
+ set category = "Debug"
+ set name = "qdel() then Find References if GC failure"
+ set src in world
+
+ qdel_and_find_ref_if_fail(src, TRUE)
+
+
+/datum/proc/DoSearchVar(potential_container, container_name, recursive_limit = 64)
+ if(usr?.client && !usr.client.running_find_references)
+ return
+
+ if(!recursive_limit)
+ return
+
+ if(istype(potential_container, /datum))
+ var/datum/datum_container = potential_container
+ if(datum_container.last_find_references == last_find_references)
+ return
+
+ datum_container.last_find_references = last_find_references
+ var/list/vars_list = datum_container.vars
+
+ for(var/varname in vars_list)
+ if (varname == "vars")
+ continue
+ var/variable = vars_list[varname]
+
+ if(variable == src)
+ testing("Found [type] \ref[src] in [datum_container.type]'s [varname] var. [container_name]")
+
+ else if(islist(variable))
+ DoSearchVar(variable, "[container_name] -> list", recursive_limit - 1)
+
+ else if(islist(potential_container))
+ var/normal = IS_NORMAL_LIST(potential_container)
+ for(var/element_in_list in potential_container)
+ if(element_in_list == src)
+ testing("Found [type] \ref[src] in list [container_name].")
+
+ else if(element_in_list && !isnum(element_in_list) && normal && potential_container[element_in_list] == src)
+ testing("Found [type] \ref[src] in list [container_name]\[[element_in_list]\]")
+
+ else if(islist(element_in_list))
+ DoSearchVar(element_in_list, "[container_name] -> list", recursive_limit - 1)
+
+ #ifndef FIND_REF_NO_CHECK_TICK
+ CHECK_TICK
+ #endif
+
+
+/proc/qdel_and_find_ref_if_fail(datum/thing_to_del, force = FALSE)
+ SSgarbage.reference_find_on_fail[REF(thing_to_del)] = TRUE
+ qdel(thing_to_del, force)
+
+#endif
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
index 3fc8e6b11bdca..9a0956174b0a2 100644
--- a/code/modules/admin/view_variables/topic.dm
+++ b/code/modules/admin/view_variables/topic.dm
@@ -89,10 +89,10 @@
var/newamt
switch(Text)
if("brute")
- L.adjustBruteLoss(amount)
+ L.adjustBruteLoss(amount,TRUE,TRUE)
newamt = L.getBruteLoss()
if("fire")
- L.adjustFireLoss(amount)
+ L.adjustFireLoss(amount,TRUE,TRUE)
newamt = L.getFireLoss()
if("toxin")
L.adjustToxLoss(amount)
diff --git a/code/modules/admin/view_variables/topic_basic.dm b/code/modules/admin/view_variables/topic_basic.dm
index 2a0f3d7302f23..912b694061288 100644
--- a/code/modules/admin/view_variables/topic_basic.dm
+++ b/code/modules/admin/view_variables/topic_basic.dm
@@ -45,7 +45,48 @@
usr.client.admin_delete(target)
if (isturf(src)) // show the turf that took its place
usr.client.debug_variables(src)
+ return
+
+ #ifdef REFERENCE_TRACKING
+ if(href_list[VV_HK_VIEW_REFERENCES])
+ var/datum/D = locate(href_list[VV_HK_TARGET])
+ if(!D)
+ to_chat(usr, "Unable to locate item.")
+ return
+ usr.client.holder.view_refs(target)
+ return
+ #endif
+
if(href_list[VV_HK_MARK])
usr.client.mark_datum(target)
+ if(href_list[VV_HK_ADDCOMPONENT])
+ if(!check_rights(NONE))
+ return
+ var/list/names = list()
+ var/list/componentsubtypes = sortList(subtypesof(/datum/component), /proc/cmp_typepaths_asc)
+ names += "---Components---"
+ names += componentsubtypes
+ names += "---Elements---"
+ names += sortList(subtypesof(/datum/element), /proc/cmp_typepaths_asc)
+ var/result = input(usr, "Choose a component/element to add","better know what ur fuckin doin pal") as null|anything in names
+ if(!usr || !result || result == "---Components---" || result == "---Elements---")
+ return
+ if(QDELETED(src))
+ to_chat(usr, "That thing doesn't exist anymore!")
+ return
+ var/list/lst = get_callproc_args()
+ if(!lst)
+ return
+ var/datumname = "error"
+ lst.Insert(1, result)
+ if(result in componentsubtypes)
+ datumname = "component"
+ target._AddComponent(lst)
+ else
+ datumname = "element"
+ target._AddElement(lst)
+ log_admin("[key_name(usr)] has added [result] [datumname] to [key_name(src)].")
+ message_admins("[key_name_admin(usr)] has added [result] [datumname] to [key_name_admin(src)].")
if(href_list[VV_HK_CALLPROC])
usr.client.callproc_datum(target)
+
diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm
index b8b9faed1c519..a48d1ee429668 100644
--- a/code/modules/admin/view_variables/view_variables.dm
+++ b/code/modules/admin/view_variables/view_variables.dm
@@ -27,8 +27,9 @@
if(istype(D, /atom))
sprite = getFlatIcon(D)
- hash = md5(sprite)
- src << browse_rsc(sprite, "vv[hash].png")
+ hash = md5(icon2base64(sprite))
+ if(hash) //Fixes VV shitting it's pants if the icon isn't valid
+ src << browse_rsc(sprite, "vv[hash].png")
title = "[D] ([REF(D)]) = [type]"
var/formatted_type = replacetext("[type]", "/", "Abductsoft 3000
" +/obj/machinery/abductor/console/ui_status(mob/user) + if((!HAS_TRAIT(user, TRAIT_ABDUCTOR_TRAINING) && !HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_TRAINING)) && !isobserver(user)) + return UI_CLOSE + return ..() + +/obj/machinery/abductor/console/ui_state(mob/user) + return GLOB.physical_state + +/obj/machinery/abductor/console/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AbductorConsole", name) + ui.open() + ui.set_autoupdate(TRUE) + +/obj/machinery/abductor/console/ui_static_data(mob/user) + var/list/data = list() + data["categories"] = list() + for(var/category in possible_gear) + var/list/cat = list( + "name" = category, + "items" = (category == selected_cat ? list() : null)) + for(var/gear in possible_gear[category]) + var/datum/abductor_gear/AG = possible_gear[category][gear] + cat["items"] += list(list( + "name" = AG.name, + "cost" = AG.cost, + "desc" = AG.description, + )) + data["categories"] += list(cat) + return data + +/obj/machinery/abductor/console/ui_data(mob/user) + var/list/data = list() + data["compactMode"] = compact_mode + data["experiment"] = experiment ? TRUE : FALSE if(experiment) - var/points = experiment.points - var/credits = experiment.credits - dat += "Collected Samples : [points]" - dat += "Gear Credits: [credits]
" - dat += "Transfer data in exchange for supplies:
" - dat += "Advanced Baton (2 Credits)
" - dat += "Mental Interface Device (2 Credits)
" - dat += "Reagent Synthesizer (2 Credits)
" - dat += "Agent Helmet
" - dat += "Agent Vest
" - dat += "Radio Silencer
" - dat += "Science Tool
" - dat += "Superlingual Matrix
" - else - dat += "NO EXPERIMENT MACHINE DETECTED
" - + data["points"] = experiment.points + data["credits"] = experiment.credits + data["pad"] = pad ? TRUE : FALSE if(pad) - dat += "Emergency Teleporter System." - dat += "Consider using primary observation console first." - dat += "Activate Teleporter
" - if(gizmo?.marked) - dat += "Retrieve Mark
" - else - dat += "Retrieve Mark
" - else - dat += "NO TELEPAD DETECTED" - + data["gizmo"] = gizmo && gizmo.marked ? TRUE : FALSE + data["vest"] = vest ? TRUE : FALSE if(vest) - dat += "
Agent Vest Mode
" - var/mode = vest.mode - if(mode == VEST_STEALTH) - dat += "Combat" - dat += "Stealth" - else - dat += "Combat" - dat += "Stealth" - - dat+="
" - dat += "Select Agent Vest Disguise
" - dat += "[HAS_TRAIT_FROM(vest, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) ? "Unlock" : "Lock"] Vest
" - else - dat += "NO AGENT VEST DETECTED" - var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) - popup.set_content(dat) - popup.open() + data["vest_mode"] = vest.mode + data["vest_lock"] = HAS_TRAIT_FROM(vest, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) + return data -/obj/machinery/abductor/console/Topic(href, href_list) - if(..()) +/obj/machinery/abductor/console/ui_act(action, list/params) + . = ..() + if(.) return - usr.set_machine(src) - if(href_list["teleporter_send"]) - TeleporterSend() - else if(href_list["teleporter_retrieve"]) - TeleporterRetrieve() - else if(href_list["flip_vest"]) - FlipVest() - else if(href_list["toggle_vest"]) - if(vest) + switch(action) + if("buy") + var/item_name = params["name"] + var/list/buyable_items = list() + for(var/category in possible_gear) + buyable_items += possible_gear[category] + for(var/key in buyable_items) + var/datum/abductor_gear/AG = buyable_items[key] + if(AG.name == item_name) + Dispense(AG.build_path, AG.cost) + return TRUE + if("teleporter_send") + TeleporterSend() + return TRUE + if("teleporter_retrieve") + TeleporterRetrieve() + return TRUE + if("flip_vest") + FlipVest() + return TRUE + if("toggle_vest") + if(!vest) + return vest.toggle_nodrop() - else if(href_list["select_disguise"]) - SelectDisguise() - else if(href_list["dispense"]) - switch(href_list["dispense"]) - if("baton") - Dispense(/obj/item/abductor/baton,cost=2) - if("helmet") - Dispense(/obj/item/clothing/head/helmet/abductor) - if("silencer") - Dispense(/obj/item/abductor/silencer) - if("tool") - Dispense(/obj/item/abductor/gizmo) - if("vest") - Dispense(/obj/item/clothing/suit/armor/abductor/vest) - if("mind_device") - Dispense(/obj/item/abductor/mind_device,cost=2) - if("chem_dispenser") - Dispense(/obj/item/abductor_machine_beacon/chem_dispenser,cost=2) - if("tongue") - Dispense(/obj/item/organ/tongue/abductor) - updateUsrDialog() + return TRUE + if("select_disguise") + SelectDisguise() + return TRUE + if("select") + selected_cat = params["category"] + return TRUE + if("compact_toggle") + compact_mode = !compact_mode + return TRUE /obj/machinery/abductor/console/proc/TeleporterRetrieve() - if(pad && gizmo && gizmo.marked) + if(pad && gizmo?.marked) pad.Retrieve(gizmo.marked) /obj/machinery/abductor/console/proc/TeleporterSend() @@ -159,7 +182,6 @@ pad.teleport_target = location to_chat(user, "Location marked as test subject release point.") - /obj/machinery/abductor/console/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD @@ -184,7 +206,7 @@ c.console = src /obj/machinery/abductor/console/proc/AddSnapshot(mob/living/carbon/human/target) - if(istype(target.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) + if(istype(target.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat)) say("Subject wearing specialized protective headgear, unable to get a proper scan!") return var/datum/icon_snapshot/entry = new @@ -229,8 +251,6 @@ else return ..() - - /obj/machinery/abductor/console/proc/Dispense(item,cost=1) if(experiment && experiment.credits >= cost) experiment.credits -=cost diff --git a/code/modules/antagonists/abductor/machinery/dispenser.dm b/code/modules/antagonists/abductor/machinery/dispenser.dm index 17fa311c8f6d0..9aca27b60eb83 100644 --- a/code/modules/antagonists/abductor/machinery/dispenser.dm +++ b/code/modules/antagonists/abductor/machinery/dispenser.dm @@ -22,41 +22,44 @@ gland_colors[i] = random_color() amounts[i] = rand(1,5) -/obj/machinery/abductor/gland_dispenser/attack_hand(mob/user) +/obj/machinery/abductor/gland_dispenser/ui_status(mob/user) + if(!isabductor(user) && !isobserver(user)) + return UI_CLOSE + return ..() + +/obj/machinery/abductor/gland_dispenser/ui_state(mob/user) + return GLOB.physical_state + +/obj/machinery/abductor/gland_dispenser/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "GlandDispenser", name) + ui.open() + +/obj/machinery/abductor/gland_dispenser/ui_data(mob/user) + var/list/data = list() + data["glands"] = list() + for(var/gland_number=1,gland_number<=gland_colors.len,gland_number++) + var/list/gland_information = list( + "color" = gland_colors[gland_number], + "amount" = amounts[gland_number], + "id" = gland_number, + ) + data["glands"] += list(gland_information) + return data + +/obj/machinery/abductor/gland_dispenser/ui_act(action, list/params) . = ..() if(.) return - if(!isabductor(user)) - return - user.set_machine(src) - var/box_css = {" - "} - var/dat = "" - var/item_count = 0 - for(var/i=1,i<=gland_colors.len,i++) - item_count++ - var/g_color = gland_colors[i] - var/amount = amounts[i] - dat += "[amount]" - if(item_count == 4) // Four boxes per line - dat +="" - item_count = 0 - var/datum/browser/popup = new(user, "glands", "Gland Dispenser", 200, 200) - popup.add_head_content(box_css) - popup.set_content(dat) - popup.open() - return + + switch(action) + if("dispense") + var/gland_id = text2num(params["gland_id"]) + if(!gland_id) + return + Dispense(gland_id) + return TRUE /obj/machinery/abductor/gland_dispenser/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/organ/heart/gland)) @@ -65,20 +68,13 @@ for(var/i=1,i<=gland_colors.len,i++) if(gland_types[i] == W.type) amounts[i]++ + ui_update() else return ..() -/obj/machinery/abductor/gland_dispenser/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - - if(href_list["dispense"]) - Dispense(text2num(href_list["dispense"])) - updateUsrDialog() - /obj/machinery/abductor/gland_dispenser/proc/Dispense(count) if(amounts[count]>0) amounts[count]-- var/T = gland_types[count] new T(get_turf(src)) + ui_update() diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm index b972f6c942e25..c41c86c15bbf9 100644 --- a/code/modules/antagonists/abductor/machinery/experiment.dm +++ b/code/modules/antagonists/abductor/machinery/experiment.dm @@ -9,7 +9,8 @@ var/credits = 0 var/list/history var/list/abductee_minds - var/flash = " - || - " + /// Machine feedback message + var/flash = "Awaiting subject." var/obj/machinery/abductor/console/console var/message_cooldown = 0 var/breakout_time = 450 @@ -22,13 +23,6 @@ return close_machine(target) -/obj/machinery/abductor/experiment/attack_hand(mob/user) - . = ..() - if(.) - return - - experimentUI(user) - /obj/machinery/abductor/experiment/open_machine() if(!state_open && !panel_open) ..() @@ -40,7 +34,7 @@ if(state_open && !panel_open) ..(target) -/obj/machinery/abductor/experiment/relaymove(mob/user) +/obj/machinery/abductor/experiment/relaymove(mob/living/user, direction) if(user.stat != CONSCIOUS) return if(message_cooldown <= world.time) @@ -60,120 +54,84 @@ "You successfully break out of [src]!") open_machine() -/obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H) - var/icon/photo = null - var/g = (H.gender == FEMALE) ? "f" : "m" - if(H.dna.species.use_skintones) - photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]") - else - photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.dna.species.id]_[g]") - photo.Blend("#[H.dna.features["mcolor"]]", ICON_MULTIPLY) - - var/icon/eyes - if(EYECOLOR in H.dna.species.species_traits) - eyes = icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "eyes") - eyes.Blend("#[H.eye_color]", ICON_MULTIPLY) - - var/datum/sprite_accessory/S - S = GLOB.hair_styles_list[H.hair_style] - if(S && (HAIR in H.dna.species.species_traits)) - var/icon/hair = icon("icon" = S.icon, "icon_state" = "[S.icon_state]") - hair.Blend("#[H.hair_color]", ICON_MULTIPLY) - eyes.Blend(hair, ICON_OVERLAY) - - S = GLOB.facial_hair_styles_list[H.facial_hair_style] - if(S && (FACEHAIR in H.dna.species.species_traits)) - var/icon/facial = icon("icon" = S.icon, "icon_state" = "[S.icon_state]") - facial.Blend("#[H.facial_hair_color]", ICON_MULTIPLY) - eyes.Blend(facial, ICON_OVERLAY) - - if(eyes) - photo.Blend(eyes, ICON_OVERLAY) - - var/icon/splat = icon("icon" = 'icons/mob/dam_mob.dmi',"icon_state" = "chest30") - photo.Blend(splat,ICON_OVERLAY) - - return photo - -/obj/machinery/abductor/experiment/proc/experimentUI(mob/user) - var/dat - dat += "
Experiment
" +/obj/machinery/abductor/experiment/ui_status(mob/user) + if(user == occupant) + return UI_CLOSE + return ..() + +/obj/machinery/abductor/experiment/ui_state(mob/user) + return GLOB.physical_state + +/obj/machinery/abductor/experiment/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ProbingConsole", name) + ui.open() + ui.set_autoupdate(TRUE) + +/obj/machinery/abductor/experiment/ui_data(mob/user) + var/list/data = list() + data["open"] = state_open + data["feedback"] = flash + data["occupant"] = occupant ? TRUE : FALSE + data["occupant_name"] = null + data["occupant_status"] = null if(occupant) - var/obj/item/photo/P = new - P.picture = new - P.picture.picture_image = icon(dissection_icon(occupant), dir = SOUTH) - user << browse_rsc(P.picture.picture_image, "dissection_img") - dat += "| "
- dat += " | "
- dat += "Probe " - dat += "Dissect " - dat += "Analyze " - dat += " |
Machine Unoccupied
" - else - dat += "Subject Status :
" - dat += "[occupant.name] => " var/mob/living/mob_occupant = occupant - switch(mob_occupant.stat) - if(CONSCIOUS) - dat += "Conscious" - if(UNCONSCIOUS) - dat += "Unconscious" - else // DEAD - dat += "Deceased" - dat += "" - dat += "[flash]" - dat += "
" - dat += "Scan" - dat += "Close" : "open=1'>Open"]" - var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300) - popup.set_content(dat) - popup.open() - -/obj/machinery/abductor/experiment/Topic(href, href_list) - if(..() || usr == occupant) - return - usr.set_machine(src) - if(href_list["refresh"]) - updateUsrDialog() - return - if(href_list["open"]) - open_machine() - return - if(href_list["close"]) - close_machine() + data["occupant_name"] = mob_occupant.name + data["occupant_status"] = mob_occupant.stat + return data + +/obj/machinery/abductor/experiment/ui_act(action, list/params) + . = ..() + if(.) return - if(occupant) - var/mob/living/mob_occupant = occupant - if(mob_occupant.stat != DEAD) - if(href_list["experiment"]) - flash = Experiment(occupant,href_list["experiment"],usr) - updateUsrDialog() - add_fingerprint(usr) -/obj/machinery/abductor/experiment/proc/Experiment(mob/occupant,type,mob/user) + switch(action) + if("door") + if(state_open) + close_machine() + return TRUE + else + open_machine() + return TRUE + if("experiment") + if(!occupant) + return + var/mob/living/mob_occupant = occupant + if(mob_occupant.stat == DEAD) + return + flash = experiment(mob_occupant, params["experiment_type"], usr) + return TRUE + +/** + * experiment: Performs selected experiment on occupant mob, resulting in a point reward on success + * + * Arguments: + * * occupant The mob inside the machine + * * type The type of experiment to be performed + * * user The mob starting the experiment + */ +/obj/machinery/abductor/experiment/proc/experiment(mob/occupant, type, mob/user) LAZYINITLIST(history) var/mob/living/carbon/human/H = occupant var/datum/antagonist/abductor/user_abductor = user.mind.has_antag_datum(/datum/antagonist/abductor) if(!user_abductor) - return "Authorization failure. Contact mothership immidiately." + return "Authorization failure. Contact mothership immediately." var/point_reward = 0 + if(!H) + return "Invalid or missing specimen." if(H in history) - return "Specimen already in database." + return "Specimen already in database." if(H.stat == DEAD) say("Specimen deceased - please provide fresh sample.") - return "Specimen deceased." + return "Specimen deceased." var/obj/item/organ/heart/gland/GlandTest = locate() in H.internal_organs if(!GlandTest) say("Experimental dissection not detected!") - return "No glands detected!" + return "No glands detected!" if(H.mind != null && H.ckey != null) LAZYINITLIST(abductee_minds) LAZYADD(history, H) @@ -196,33 +154,37 @@ point_reward++ if(point_reward > 0) open_machine() - SendBack(H) + send_back(H) playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) points += point_reward credits += point_reward - return "Experiment successful! [point_reward] new data-points collected." + return "Experiment successful! [point_reward] new data-points collected." else playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) - return "Experiment failed! No replacement organ detected." + return "Experiment failed! No replacement organ detected." else say("Brain activity nonexistent - disposing sample...") open_machine() - SendBack(H) - return "Specimen braindead - disposed." - - -/obj/machinery/abductor/experiment/proc/SendBack(mob/living/carbon/human/H) + send_back(H) + return "Specimen braindead - disposed." + +/** + * send_back: Sends a mob back to a selected teleport location if safe + * + * Arguments: + * * H The human mob to be sent back + */ +/obj/machinery/abductor/experiment/proc/send_back(mob/living/carbon/human/H) H.Sleeping(160) H.uncuff() - if(console?.pad?.teleport_target) - H.forceMove(console.pad.teleport_target) + if(console && console.pad && console.pad.teleport_target) + do_teleport(H, console.pad.teleport_target, channel = TELEPORT_CHANNEL_FREE, no_effects = TRUE, teleport_mode = TELEPORT_MODE_ABDUCTORS) return //Area not chosen / It's not safe area - teleport to arrivals SSjob.SendToLateJoin(H, FALSE) return - -/obj/machinery/abductor/experiment/update_icon() +/obj/machinery/abductor/experiment/update_icon_state() if(state_open) icon_state = "experiment-open" else diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm index ab636f7d0e8ea..15df1f40553ba 100644 --- a/code/modules/antagonists/abductor/machinery/pad.dm +++ b/code/modules/antagonists/abductor/machinery/pad.dm @@ -7,14 +7,14 @@ /obj/machinery/abductor/pad/proc/Warp(mob/living/target) if(!target.buckled) - target.forceMove(get_turf(src)) + do_teleport(target, get_turf(src), no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, teleport_mode = TELEPORT_MODE_ABDUCTORS) /obj/machinery/abductor/pad/proc/Send() if(teleport_target == null) teleport_target = GLOB.teleportlocs[pick(GLOB.teleportlocs)] flick("alien-pad", src) for(var/mob/living/target in loc) - target.forceMove(teleport_target) + do_teleport(target, teleport_target, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, teleport_mode = TELEPORT_MODE_ABDUCTORS) new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir) to_chat(target, "The instability of the warp leaves you disoriented!") target.Stun(60) @@ -26,7 +26,7 @@ /obj/machinery/abductor/pad/proc/doMobToLoc(place, atom/movable/target) flick("alien-pad", src) - target.forceMove(place) + do_teleport(target, place, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, teleport_mode = TELEPORT_MODE_ABDUCTORS) new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir) /obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target) @@ -36,7 +36,7 @@ /obj/machinery/abductor/pad/proc/doPadToLoc(place) flick("alien-pad", src) for(var/mob/living/target in get_turf(src)) - target.forceMove(place) + do_teleport(target, place, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, teleport_mode = TELEPORT_MODE_ABDUCTORS) new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir) /obj/machinery/abductor/pad/proc/PadToLoc(place) diff --git a/code/modules/antagonists/ashwalker/ashwalker.dm b/code/modules/antagonists/ashwalker/ashwalker.dm index 200866bac9e46..2e4d8b42669a2 100644 --- a/code/modules/antagonists/ashwalker/ashwalker.dm +++ b/code/modules/antagonists/ashwalker/ashwalker.dm @@ -23,15 +23,21 @@ return ashie_team /datum/antagonist/ashwalker/on_body_transfer(mob/living/old_body, mob/living/new_body) + . = ..() UnregisterSignal(old_body, COMSIG_MOB_EXAMINATE) RegisterSignal(new_body, COMSIG_MOB_EXAMINATE, .proc/on_examinate) /datum/antagonist/ashwalker/on_gain() + . = ..() RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, .proc/on_examinate) + owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key) /datum/antagonist/ashwalker/on_removal() + . = ..() UnregisterSignal(owner.current, COMSIG_MOB_EXAMINATE) /datum/antagonist/ashwalker/proc/on_examinate(datum/source, atom/A) + SIGNAL_HANDLER + if(istype(A, /obj/structure/headpike)) SEND_SIGNAL(owner.current, COMSIG_ADD_MOOD_EVENT, "oogabooga", /datum/mood_event/sacrifice_good) diff --git a/code/modules/antagonists/blob/blob.dm b/code/modules/antagonists/blob/blob.dm index 1045258288ec7..9c58e95630bb8 100644 --- a/code/modules/antagonists/blob/blob.dm +++ b/code/modules/antagonists/blob/blob.dm @@ -22,6 +22,11 @@ /datum/antagonist/blob/greet() if(!isovermind(owner.current)) to_chat(owner,"You feel bloated.") + else + owner.current.client?.tgui_panel?.give_antagonist_popup("Blob", + "Place your core by using the place core button.\n\ + Expand and manage your resources carefully, the crew will know about your existence soon \ + and will work together to destroy you.") /datum/antagonist/blob/on_gain() create_objectives() diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index f0dc38b2c2a16..5913b0917fe9b 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -15,8 +15,14 @@ maxbodytemp = 360 unique_name = 1 a_intent = INTENT_HARM + see_in_dark = 8 + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + initial_language_holder = /datum/language_holder/empty var/mob/camera/blob/overmind = null var/obj/structure/blob/factory/factory = null + var/independent = FALSE + mobchatspan = "blob" + discovery_points = 1000 /mob/living/simple_animal/hostile/blob/update_icons() if(overmind) @@ -24,6 +30,13 @@ else remove_atom_colour(FIXED_COLOUR_PRIORITY) +/mob/living/simple_animal/hostile/blob/Initialize() + . = ..() + if(!independent) //no pulling people deep into the blob + remove_verb(/mob/living/verb/pulled) + else + pass_flags &= ~PASSBLOB + /mob/living/simple_animal/hostile/blob/Destroy() if(overmind) overmind.blob_mobs -= src @@ -56,8 +69,10 @@ return 1 return ..() -/mob/living/simple_animal/hostile/blob/proc/blob_chat(msg) - var/spanned_message = say_quote(msg) +/mob/living/simple_animal/hostile/blob/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) + if(!overmind) + return ..() + var/spanned_message = say_quote(message) var/rendered = "\[Blob Telepathy\] [real_name] [spanned_message]" for(var/M in GLOB.mob_list) if(isovermind(M) || istype(M, /mob/living/simple_animal/hostile/blob)) @@ -87,13 +102,14 @@ attacktext = "hits" attack_sound = 'sound/weapons/genhit1.ogg' movement_type = FLYING - del_on_death = 1 + del_on_death = TRUE deathmessage = "explodes into a cloud of gas!" + gold_core_spawnable = HOSTILE_SPAWN var/death_cloud_size = 1 //size of cloud produced from a dying spore var/mob/living/carbon/human/oldguy - var/is_zombie = 0 - gold_core_spawnable = HOSTILE_SPAWN + var/is_zombie = FALSE var/list/disease = list() + flavor_text = FLAVOR_TEXT_GOAL_ANTAG /mob/living/simple_animal/hostile/blob/blobspore/Initialize(mapload, var/obj/structure/blob/factory/linked_node) if(istype(linked_node)) @@ -115,7 +131,7 @@ /mob/living/simple_animal/hostile/blob/blobspore/Life() if(!is_zombie && isturf(src.loc)) - for(var/mob/living/carbon/human/H in view(src,1)) //Only for corpse right next to/on same tile + for(var/mob/living/carbon/human/H in hearers(1, src)) //Only for corpse right next to/on same tile if(H.stat == DEAD) Zombify(H) break @@ -144,6 +160,8 @@ oldguy = H update_icons() visible_message("The corpse of [H.name] suddenly rises!") + if(!key) + set_playable() /mob/living/simple_animal/hostile/blob/blobspore/death(gibbed) // On death, create a small smoke of harmful gas (s-Acid) @@ -222,17 +240,9 @@ force_threshold = 10 pressure_resistance = 50 mob_size = MOB_SIZE_LARGE - see_in_dark = 8 - lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE hud_type = /datum/hud/blobbernaut - var/independent = FALSE - -/mob/living/simple_animal/hostile/blob/blobbernaut/Initialize() - . = ..() - if(!independent) //no pulling people deep into the blob - verbs -= /mob/living/verb/pulled - else - pass_flags &= ~PASSBLOB + flavor_text = FLAVOR_TEXT_GOAL_ANTAG + move_resist = MOVE_FORCE_STRONG /mob/living/simple_animal/hostile/blob/blobbernaut/Life() if(..()) @@ -275,7 +285,7 @@ /mob/living/simple_animal/hostile/blob/blobbernaut/update_health_hud() if(hud_used) - hud_used.healths.maptext = "
[round((health / maxHealth) * 100, 0.5)]%
"
+ hud_used.healths.maptext = MAPTEXT("[round((health / maxHealth) * 100, 0.5)]%
")
/mob/living/simple_animal/hostile/blob/blobbernaut/AttackingTarget()
. = ..()
diff --git a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm
index 8b6f4bd687e88..34b82011cd1e7 100644
--- a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm
+++ b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm
@@ -8,7 +8,7 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/
var/shortdesc = null //just damage and on_mob effects, doesn't include special, blob-tile only effects
var/effectdesc = null //any long, blob-tile specific effects
var/analyzerdescdamage = "Unknown. Report this bug to a coder, or just adminhelp."
- var/analyzerdesceffect = "N/A"
+ var/analyzerdesceffect
var/blobbernaut_message = "slams" //blobbernaut attack verb
var/message = "The blob strikes you" //message sent to any mob hit by the blob
var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt
@@ -22,6 +22,10 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/
stack_trace("blobstrain created without overmind")
overmind = new_overmind
+/datum/blobstrain/Destroy()
+ overmind = null
+ return ..()
+
/datum/blobstrain/proc/on_gain()
overmind.color = complementary_color
for(var/BL in GLOB.blobs)
@@ -72,3 +76,6 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/
/datum/blobstrain/proc/emp_reaction(obj/structure/blob/B, severity, coefficient = 1) //when the blob is hit with an emp, do this
return
+
+/datum/blobstrain/proc/examine(mob/user)
+ return list("Progress to Critical Mass: [overmind.blobs_legit.len]/[overmind.blobwincount].")
diff --git a/code/modules/antagonists/blob/blobstrains/blazing_oil.dm b/code/modules/antagonists/blob/blobstrains/blazing_oil.dm
index 97b974e28fd54..6b308a57e2c30 100644
--- a/code/modules/antagonists/blob/blobstrains/blazing_oil.dm
+++ b/code/modules/antagonists/blob/blobstrains/blazing_oil.dm
@@ -18,9 +18,9 @@
/datum/blobstrain/reagent/blazing_oil/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag)
if(damage_type == BURN && damage_flag != "energy")
- for(var/turf/open/T in range(1, B))
+ for(var/turf/open/T in RANGE_TURFS(1, B))
var/obj/structure/blob/C = locate() in T
- if(!(C && C.overmind && C.overmind.blobstrain.type == B.overmind.blobstrain.type) && prob(80))
+ if(!(C?.overmind && C.overmind.blobstrain.type == B.overmind.blobstrain.type) && prob(80))
new /obj/effect/hotspot(T)
if(damage_flag == "fire")
return 0
diff --git a/code/modules/antagonists/blob/blobstrains/explosive_lattice.dm b/code/modules/antagonists/blob/blobstrains/explosive_lattice.dm
index f8fd2e2f0df58..39b25df18f19a 100644
--- a/code/modules/antagonists/blob/blobstrains/explosive_lattice.dm
+++ b/code/modules/antagonists/blob/blobstrains/explosive_lattice.dm
@@ -29,7 +29,7 @@
if(reac_volume >= 10) //if it's not a spore cloud, bad time incoming
var/obj/effect/temp_visual/explosion/fast/E = new /obj/effect/temp_visual/explosion/fast(get_turf(M))
E.alpha = 150
- for(var/mob/living/L in orange(get_turf(M), 1))
+ for(var/mob/living/L in ohearers(1, get_turf(M)))
if(ROLE_BLOB in L.faction) //no friendly fire
continue
var/aoe_volume = ..(L, TOUCH, initial_volume, 0, L.get_permeability_protection(), O)
diff --git a/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm b/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm
index e575432997944..7129ef6aff0c4 100644
--- a/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm
+++ b/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm
@@ -23,7 +23,7 @@
extinguisharea(B, 50)
/datum/blobstrain/reagent/pressurized_slime/proc/extinguisharea(obj/structure/blob/B, probchance)
- for(var/turf/open/T in range(1, B))
+ for(var/turf/open/T in RANGE_TURFS(1, B))
if(prob(probchance))
T.MakeSlippery(TURF_WET_LUBE, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS)
for(var/obj/O in T)
diff --git a/code/modules/antagonists/blob/blobstrains/reactive_spines.dm b/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
index fca56d140229a..8ec9ab6d26b6b 100644
--- a/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
+++ b/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
@@ -15,7 +15,7 @@
if(damage && damage_type == BRUTE && B.obj_integrity - damage > 0) //is there any damage, is it brute, and will we be alive
if(damage_flag == "melee")
B.visible_message("The blob retaliates, lashing out!")
- for(var/atom/A in range(1, B))
+ for(var/atom/A as() in range(1, B))
A.blob_act(B)
return ..()
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index 5be77807abd1e..d859f38517e90 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -39,6 +39,12 @@ GLOBAL_LIST_EMPTY(blob_nodes)
var/blobwincount = 400
var/victory_in_progress = FALSE
var/rerolling = FALSE
+ var/announcement_size = 75
+ var/announcement_time
+ var/has_announced = FALSE
+
+ /// The list of strains the blob can reroll for.
+ var/list/strain_choices
/mob/camera/blob/Initialize(mapload, starting_points = 60)
validate_location()
@@ -56,6 +62,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(blob_core)
blob_core.update_icon()
SSshuttle.registerHostileEnvironment(src)
+ announcement_time = world.time + 6000
. = ..()
START_PROCESSING(SSobj, src)
@@ -89,7 +96,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
/mob/camera/blob/proc/is_valid_turf(turf/T)
var/area/A = get_area(T)
- if((A && !A.blob_allowed) || !T || !is_station_level(T.z) || isspaceturf(T))
+ if((A && !(A.area_flags & BLOBS_ALLOWED)) || !T || !is_station_level(T.z) || isspaceturf(T))
return FALSE
return TRUE
@@ -106,7 +113,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
qdel(src)
else if(!victory_in_progress && (blobs_legit.len >= blobwincount))
victory_in_progress = TRUE
- priority_announce("Biohazard has reached critical mass. Station loss is imminent.", "Biohazard Alert")
+ priority_announce("Biohazard has reached critical mass. Station loss is imminent.", "Biohazard Alert", SSstation.announcer.get_rand_alert_sound())
set_security_level("delta")
max_blob_points = INFINITY
blob_points = INFINITY
@@ -118,6 +125,9 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(!victory_in_progress && max_count < blobs_legit.len)
max_count = blobs_legit.len
+ if(!has_announced && (world.time >= announcement_time || blobs_legit.len >= announcement_size))
+ priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", ANNOUNCER_OUTBREAK5)
+ has_announced = TRUE
/mob/camera/blob/proc/victory()
sound_to_playing_players('sound/machines/alarm.ogg')
sleep(100)
@@ -132,7 +142,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
var/area/Ablob = get_area(T)
- if(!Ablob.blob_allowed)
+ if(!(Ablob.area_flags & BLOBS_ALLOWED))
continue
if(!(ROLE_BLOB in L.faction))
@@ -145,7 +155,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
for(var/area/A in GLOB.sortedAreas)
if(!(A.type in GLOB.the_station_areas))
continue
- if(!A.blob_allowed)
+ if(!(A.area_flags & BLOBS_ALLOWED))
continue
A.color = blobstrain.color
A.name = "blob"
@@ -164,6 +174,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
SSticker.force_ending = 1
/mob/camera/blob/Destroy()
+ QDEL_NULL(blobstrain)
for(var/BL in GLOB.blobs)
var/obj/structure/blob/B = BL
if(B && B.overmind == src)
@@ -175,6 +186,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
BM.overmind = null
BM.update_icons()
GLOB.overminds -= src
+ QDEL_LIST_ASSOC_VAL(strain_choices)
SSshuttle.clearHostileEnvironment(src)
STOP_PROCESSING(SSobj, src)
@@ -192,17 +204,18 @@ GLOBAL_LIST_EMPTY(blob_nodes)
. = ..()
if(blobstrain)
. += "Its strain is [blobstrain.name]."
+ . += "It currently consists of [blobs_legit.len] nodes, out of the [blobwincount] nodes needed to achieve critical mass."
/mob/camera/blob/update_health_hud()
if(blob_core)
- hud_used.healths.maptext = "[round(blob_core.obj_integrity)]
"
+ hud_used.healths.maptext = MAPTEXT("[round(blob_core.obj_integrity)]
")
for(var/mob/living/simple_animal/hostile/blob/blobbernaut/B in blob_mobs)
if(B.hud_used?.blobpwrdisplay)
- B.hud_used.blobpwrdisplay.maptext = "[round(blob_core.obj_integrity)]
"
+ B.hud_used.blobpwrdisplay.maptext = MAPTEXT("[round(blob_core.obj_integrity)]
")
/mob/camera/blob/proc/add_points(points)
blob_points = CLAMP(blob_points + points, 0, max_blob_points)
- hud_used.blobpwrdisplay.maptext = "[round(blob_points)]
"
+ hud_used.blobpwrdisplay.maptext = MAPTEXT("[round(blob_points)]
")
/mob/camera/blob/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
if (!message)
@@ -242,19 +255,19 @@ GLOBAL_LIST_EMPTY(blob_nodes)
/mob/camera/blob/blob_act(obj/structure/blob/B)
return
-/mob/camera/blob/Stat()
- ..()
- if(statpanel("Status"))
- if(blob_core)
- stat(null, "Core Health: [blob_core.obj_integrity]")
- stat(null, "Power Stored: [blob_points]/[max_blob_points]")
- stat(null, "Blobs to Win: [blobs_legit.len]/[blobwincount]")
- if(free_strain_rerolls)
- stat(null, "You have [free_strain_rerolls] Free Strain Reroll\s Remaining")
- if(!placed)
- if(manualplace_min_time)
- stat(null, "Time Before Manual Placement: [max(round((manualplace_min_time - world.time)*0.1, 0.1), 0)]")
- stat(null, "Time Before Automatic Placement: [max(round((autoplace_max_time - world.time)*0.1, 0.1), 0)]")
+/mob/camera/blob/get_stat_tab_status()
+ var/list/tab_data = ..()
+ if(blob_core)
+ tab_data["Core Health"] = GENERATE_STAT_TEXT("[blob_core.obj_integrity]")
+ tab_data["Power Stored"] = GENERATE_STAT_TEXT("[blob_points]/[max_blob_points]")
+ tab_data["Blobs to Win"] = GENERATE_STAT_TEXT("[blobs_legit.len]/[blobwincount]")
+ if(free_strain_rerolls)
+ tab_data["Strain Reroll"] = GENERATE_STAT_TEXT("You have [free_strain_rerolls] Free Strain Reroll\s Remaining")
+ if(!placed)
+ if(manualplace_min_time)
+ tab_data["Time Before Manual Placement"] = GENERATE_STAT_TEXT("[max(round((manualplace_min_time - world.time)*0.1, 0.1), 0)]")
+ tab_data["Time Before Automatic Placement"] = GENERATE_STAT_TEXT("[max(round((autoplace_max_time - world.time)*0.1, 0.1), 0)]")
+ return tab_data
/mob/camera/blob/Move(NewLoc, Dir = 0)
if(placed)
diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm
index adef1ab86c56c..a501da43c6133 100644
--- a/code/modules/antagonists/blob/powers.dm
+++ b/code/modules/antagonists/blob/powers.dm
@@ -1,3 +1,6 @@
+#define BLOB_REROLL_CHOICES 6
+#define BLOB_REROLL_RADIUS 60
+
/mob/camera/blob/proc/can_buy(cost = 15)
if(blob_points < cost)
to_chat(src, "You cannot afford this, you need at least [cost] resources!")
@@ -18,7 +21,7 @@
if(M.client)
to_chat(src, "There is someone too close to place your blob core!")
return 0
- for(var/mob/living/M in view(13, src))
+ for(var/mob/living/M in hearers(13, src))
if(ROLE_BLOB in M.faction)
continue
if(M.client)
@@ -211,7 +214,7 @@
to_chat(src, "You have no core and are about to die! May you rest in peace.")
return
var/area/A = get_area(T)
- if(isspaceturf(T) || A && !A.blob_allowed)
+ if(isspaceturf(T) || A && !(A.area_flags & BLOBS_ALLOWED))
to_chat(src, "You cannot relocate your core here!")
return
if(!can_buy(80))
@@ -257,7 +260,7 @@
if(world.time < last_attack)
return
var/list/possibleblobs = list()
- for(var/obj/structure/blob/AB in range(T, 1))
+ for(var/obj/structure/blob/AB in range(1, T))
possibleblobs += AB
if(!possibleblobs.len)
to_chat(src, "There is no blob adjacent to the target tile!")
@@ -318,7 +321,7 @@
if(!surrounding_turfs.len)
return
for(var/mob/living/simple_animal/hostile/blob/blobspore/BS in blob_mobs)
- if(isturf(BS.loc) && get_dist(BS, T) <= 35)
+ if(!BS.key && isturf(BS.loc) && get_dist(BS, T) <= 35)
BS.LoseTarget()
BS.Goto(pick(surrounding_turfs), BS.move_to_delay)
@@ -340,25 +343,54 @@
set category = "Blob"
set name = "Reactive Strain Adaptation (40)"
set desc = "Replaces your strain with a random, different one."
- if(!rerolling && (free_strain_rerolls || can_buy(40)))
- rerolling = TRUE
- reroll_strain()
- rerolling = FALSE
- if(free_strain_rerolls)
- free_strain_rerolls--
- last_reroll_time = world.time
-
-/mob/camera/blob/proc/reroll_strain()
- var/list/choices = list()
- while (length(choices) < 4)
- var/datum/blobstrain/bs = pick((GLOB.valid_blobstrains))
- choices[initial(bs.name)] = bs
-
- var/choice = input(usr, "Please choose a new strain","Strain") as anything in sortList(choices, /proc/cmp_typepaths_asc)
- if (choice && choices[choice] && !QDELETED(src))
- var/datum/blobstrain/bs = choices[choice]
- set_strain(bs)
+ if (!free_strain_rerolls && blob_points < BLOB_REROLL_COST)
+ to_chat(src, "You need at least [BLOB_REROLL_COST] resources to reroll your strain again!")
+ return
+
+ open_reroll_menu()
+
+/// Open the menu to reroll strains
+/mob/camera/blob/proc/open_reroll_menu()
+ if (!strain_choices)
+ strain_choices = list()
+
+ var/list/new_strains = GLOB.valid_blobstrains.Copy()
+ for (var/_ in 1 to BLOB_REROLL_CHOICES)
+ var/datum/blobstrain/strain = pick_n_take(new_strains)
+
+ var/image/strain_icon = image('icons/mob/blob.dmi', "blob_core")
+ strain_icon.color = initial(strain.color)
+
+ var/info_text = "[initial(strain.name)]"
+ info_text += "[initial(strain.analyzerdescdamage)]" + if (!isnull(initial(strain.analyzerdesceffect))) + info_text += "
[initial(strain.analyzerdesceffect)]" + + var/datum/radial_menu_choice/choice = new + choice.image = strain_icon + choice.info = info_text + + strain_choices[initial(strain.name)] = choice + + var/strain_result = show_radial_menu(src, src, strain_choices, radius = BLOB_REROLL_RADIUS, tooltips = TRUE) + if (isnull(strain_result)) + return + + if (!free_strain_rerolls && !can_buy(BLOB_REROLL_COST)) + return + + for (var/_other_strain in GLOB.valid_blobstrains) + var/datum/blobstrain/other_strain = _other_strain + if (initial(other_strain.name) == strain_result) + set_strain(other_strain) + + if (free_strain_rerolls) + free_strain_rerolls -= 1 + + last_reroll_time = world.time + + return /mob/camera/blob/verb/blob_help() set category = "Blob" @@ -383,3 +415,6 @@ if(!placed && autoplace_max_time <= world.time) to_chat(src, "You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].") to_chat(src, "You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen.") + +#undef BLOB_REROLL_CHOICES +#undef BLOB_REROLL_RADIUS diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index 5f9ad75487457..3c2642fd9294e 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -11,7 +11,7 @@ CanAtmosPass = ATMOS_PASS_PROC var/point_return = 0 //How many points the blob gets back when it removes a blob of that type. If less than 0, blob cannot be removed. max_integrity = 30 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70, "stamina" = 0) var/health_regen = 2 //how much health this blob regens when pulsed var/pulse_timestamp = 0 //we got pulsed when? var/heal_timestamp = 0 //we got healed when? @@ -25,7 +25,7 @@ if(owner_overmind) overmind = owner_overmind var/area/Ablob = get_area(src) - if(Ablob.blob_allowed) //Is this area allowed for winning as blob? + if(Ablob.area_flags & BLOBS_ALLOWED) //Is this area allowed for winning as blob? overmind.blobs_legit += src GLOB.blobs += src //Keep track of the blob in the normal list either way setDir(pick(GLOB.cardinals)) @@ -64,7 +64,7 @@ result++ . -= result - 1 -/obj/structure/blob/BlockSuperconductivity() +/obj/structure/blob/BlockThermalConductivity() return atmosblock /obj/structure/blob/CanPass(atom/movable/mover, turf/target) @@ -241,17 +241,17 @@ RETURN_TYPE(/list) . = list() if(overmind) - . += {"Material: [overmind.blobstrain.name].\n - Material Effects: [overmind.blobstrain.analyzerdescdamage]\n - Material Properties: [overmind.blobstrain.analyzerdesceffect]"} + . += list("Material: [overmind.blobstrain.name].", + "Material Effects: [overmind.blobstrain.analyzerdescdamage]", + "Material Properties: [overmind.blobstrain.analyzerdesceffect || "N/A"]") else - . += "No Material Detected!
" + . += "No Material Detected!" /obj/structure/blob/proc/typereport(mob/user) RETURN_TYPE(/list) - return list({"Blob Type: [uppertext(initial(name))]\n - Health: [obj_integrity]/[max_integrity]\n - Effects: [scannerreport()]"}) + return list("Blob Type: [uppertext(initial(name))]", + "Health: [obj_integrity]/[max_integrity]", + "Effects: [scannerreport()]") /obj/structure/blob/attack_animal(mob/living/simple_animal/M) @@ -312,14 +312,14 @@ if(user.research_scanner || hud_to_check.hudusers[user]) . += "Your HUD displays an extensive report...
" if(overmind) - . += "Progress to Critical Mass: [overmind.blobs_legit.len]/[overmind.blobwincount]." + . += overmind.blobstrain.examine(user) else . += "Core neutralized. Critical mass no longer attainable." . += chemeffectreport(user) . += typereport(user) else - if(isobserver(user) && overmind) - . += "Progress to Critical Mass: [overmind.blobs_legit.len]/[overmind.blobwincount]." + if((user == overmind || isobserver(user)) && overmind) + . += overmind.blobstrain.examine(user) . += "It seems to be made of [get_chem_name()]." /obj/structure/blob/proc/scannerreport() diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm index c2ae02c5ce39a..b14f055f139ce 100644 --- a/code/modules/antagonists/blob/structures/core.dm +++ b/code/modules/antagonists/blob/structures/core.dm @@ -4,10 +4,11 @@ icon_state = "blank_blob" desc = "A huge, pulsating yellow mass." max_integrity = 400 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 90) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 90, "stamina" = 0) explosion_block = 6 point_return = -1 health_regen = 0 //we regen in Life() instead of when pulsed + resistance_flags = LAVA_PROOF /obj/structure/blob/core/Initialize(mapload, client/new_overmind = null, placed = 0) GLOB.blob_cores += src @@ -18,12 +19,8 @@ return INITIALIZE_HINT_QDEL if(overmind) update_icon() - addtimer(CALLBACK(src, .proc/generate_announcement), 1800) . = ..() -/obj/structure/blob/core/proc/generate_announcement() - priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg') - /obj/structure/blob/core/scannerreport() return "Directs the blob's expansion, gradually expands, and sustains nearby blob spores and blobbernauts." @@ -55,7 +52,7 @@ if(overmind) //we should have an overmind, but... overmind.update_health_hud() -/obj/structure/blob/core/process() +/obj/structure/blob/core/process(delta_time) if(QDELETED(src)) return if(!overmind) @@ -65,7 +62,7 @@ overmind.update_health_hud() Pulse_Area(overmind, 12, 4, 3) for(var/obj/structure/blob/normal/B in range(1, src)) - if(prob(5)) + if(DT_PROB(2.5, delta_time)) B.change_to(/obj/structure/blob/shield/core, overmind) ..() diff --git a/code/modules/antagonists/blob/structures/factory.dm b/code/modules/antagonists/blob/structures/factory.dm index c0c365edddc39..4ec65fe4fe9b7 100644 --- a/code/modules/antagonists/blob/structures/factory.dm +++ b/code/modules/antagonists/blob/structures/factory.dm @@ -6,6 +6,7 @@ max_integrity = 200 health_regen = 1 point_return = 25 + resistance_flags = LAVA_PROOF var/list/spores = list() var/mob/living/simple_animal/hostile/blob/blobbernaut/naut = null var/max_spores = 3 @@ -25,7 +26,7 @@ if(naut) naut.factory = null to_chat(naut, "Your factory was destroyed! You feel yourself dying!") - naut.throw_alert("nofactory", /obj/screen/alert/nofactory) + naut.throw_alert("nofactory", /atom/movable/screen/alert/nofactory) spores = null return ..() diff --git a/code/modules/antagonists/blob/structures/node.dm b/code/modules/antagonists/blob/structures/node.dm index c2febdbf6f2dc..f04b2d8f092e5 100644 --- a/code/modules/antagonists/blob/structures/node.dm +++ b/code/modules/antagonists/blob/structures/node.dm @@ -4,10 +4,10 @@ icon_state = "blank_blob" desc = "A large, pulsating yellow mass." max_integrity = 200 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 65, "acid" = 90) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 65, "acid" = 90, "stamina" = 0) health_regen = 3 point_return = 25 - + resistance_flags = LAVA_PROOF /obj/structure/blob/node/Initialize() GLOB.blob_nodes += src diff --git a/code/modules/antagonists/blob/structures/resource.dm b/code/modules/antagonists/blob/structures/resource.dm index 5024d0984c1e9..81eda7f4edde5 100644 --- a/code/modules/antagonists/blob/structures/resource.dm +++ b/code/modules/antagonists/blob/structures/resource.dm @@ -5,6 +5,7 @@ desc = "A thin spire of slightly swaying tendrils." max_integrity = 60 point_return = 15 + resistance_flags = LAVA_PROOF var/resource_delay = 0 /obj/structure/blob/resource/scannerreport() diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm index 4741e8749cdfa..cb773d5348007 100644 --- a/code/modules/antagonists/blob/structures/shield.dm +++ b/code/modules/antagonists/blob/structures/shield.dm @@ -9,7 +9,7 @@ explosion_block = 3 point_return = 4 atmosblock = TRUE - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90, "stamina" = 0) /obj/structure/blob/shield/scannerreport() if(atmosblock) @@ -38,22 +38,8 @@ desc = "A solid wall of slightly twitching tendrils with a reflective glow." damaged_desc = "A wall of twitching tendrils with a reflective glow." icon_state = "blob_glow" - flags_1 = CHECK_RICOCHET_1 + flags_ricochet = RICOCHET_SHINY point_return = 8 max_integrity = 100 brute_resist = 0.5 explosion_block = 2 - -/obj/structure/blob/shield/reflective/handle_ricochet(obj/item/projectile/P) - var/turf/p_turf = get_turf(P) - var/face_direction = get_dir(src, p_turf) - var/face_angle = dir2angle(face_direction) - var/incidence_s = GET_ANGLE_OF_INCIDENCE(face_angle, (P.Angle + 180)) - if(abs(incidence_s) > 90 && abs(incidence_s) < 270) - return FALSE - var/new_angle_s = SIMPLIFY_DEGREES(face_angle + incidence_s) - P.setAngle(new_angle_s) - if(!(P.reflectable & REFLECT_FAKEPROJECTILE)) - visible_message("[P] reflects off [src]!") - return TRUE - diff --git a/code/modules/antagonists/blood_contract/blood_contract.dm b/code/modules/antagonists/blood_contract/blood_contract.dm index 3feb71fe6c7ec..27810bb041082 100644 --- a/code/modules/antagonists/blood_contract/blood_contract.dm +++ b/code/modules/antagonists/blood_contract/blood_contract.dm @@ -19,6 +19,8 @@ /datum/antagonist/blood_contract/greet() . = ..() to_chat(owner, "You've been marked for death! Don't let the demons get you! KILL THEM ALL!") + owner.current.client?.tgui_panel?.give_antagonist_popup("Blood Contract", + "You have been marked for death, the demons thirst for your blood. KILL THEM ALL.") /datum/antagonist/blood_contract/proc/start_the_hunt() var/mob/living/carbon/human/H = owner.current diff --git a/code/modules/antagonists/brainwashing/brainwashing.dm b/code/modules/antagonists/brainwashing/brainwashing.dm index 40b8d05b07271..1ce2fd0fdbaa1 100644 --- a/code/modules/antagonists/brainwashing/brainwashing.dm +++ b/code/modules/antagonists/brainwashing/brainwashing.dm @@ -41,6 +41,9 @@ var/datum/objective/O = X to_chat(owner, "[i]. [O.explanation_text]") i++ + owner.current.client?.tgui_panel?.give_antagonist_popup("Brainwashed", + "You have been brainwashed!\n\ + Ensure you follow your directive, no matter the cost.") /datum/antagonist/brainwashed/farewell() to_chat(owner, "Your mind suddenly clears...") diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 77221096f25ad..efdea65970499 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -3,9 +3,9 @@ antagpanel_category = "Brother" job_rank = ROLE_BROTHER var/special_role = ROLE_BROTHER + hijack_speed = 0.5 var/datum/team/brother_team/team antag_moodlet = /datum/mood_event/focused - can_hijack = HIJACK_HIJACKER /datum/antagonist/brother/create_team(datum/team/brother_team/new_team) if(!new_team) @@ -34,7 +34,7 @@ return ..() /datum/antagonist/brother/antag_panel_data() - return "Conspirators : [get_brother_names()]]" + return "Conspirators : [get_brother_names()]" /datum/antagonist/brother/proc/get_brother_names() var/list/brothers = team.members - owner @@ -57,26 +57,34 @@ /datum/antagonist/brother/greet() var/brother_text = get_brother_names() to_chat(owner.current, "You are the [owner.special_role] of [brother_text].") - to_chat(owner.current, "The Syndicate only accepts those that have proven themselves. Prove yourself and prove your [team.member_name]s by completing your objectives together!") + to_chat(owner.current, "The Syndicate only accepts those that have proven themselves. Prove yourself and prove your [team.member_name]s by completing your objectives together! You and your team are outfitted with communication implants allowing for direct, encrypted communication.") owner.announce_objectives() give_meeting_area() + owner.current.client?.tgui_panel?.give_antagonist_popup("Blood Brother", + "The Syndicate only accepts those that have proven themselves. Prove yourself and prove your [team.member_name]s by completing your objectives together!") /datum/antagonist/brother/proc/finalize_brother() + var/obj/item/implant/bloodbrother/I = new /obj/item/implant/bloodbrother() + I.implant(owner.current, null, TRUE, TRUE) + I.implant_colour = team.team_id <= 9 ? COLOR_LIST_BLOOD_BROTHERS[team.team_id] : "#ff0000" + for(var/datum/mind/M in team.members) // Link the implants of all team members + var/obj/item/implant/bloodbrother/T = locate() in M.current.implants + I.link_implant(T) SSticker.mode.update_brother_icons_added(owner) - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) /datum/antagonist/brother/admin_add(datum/mind/new_owner,mob/admin) //show list of possible brothers var/list/candidates = list() - for(var/mob/living/L in GLOB.alive_mob_list) + for(var/mob/living/L in GLOB.player_list) if(!L.mind || L.mind == new_owner || !can_be_owned(L.mind)) continue - candidates[L.mind.name] = L.mind + candidates += L.mind var/choice = input(admin,"Choose the blood brother.", "Brother") as null|anything in sortNames(candidates) if(!choice) return - var/datum/mind/bro = candidates[choice] + var/datum/mind/bro = choice var/datum/team/brother_team/T = new T.add_member(new_owner) T.add_member(bro) @@ -91,9 +99,15 @@ /datum/team/brother_team name = "brotherhood" member_name = "blood brother" + var/team_id var/meeting_area var/static/meeting_areas = list("The Bar", "Dorms", "Escape Dock", "Arrivals", "Holodeck", "Primary Tool Storage", "Recreation Area", "Chapel", "Library") +/datum/team/brother_team/New(starting_members) + . = ..() + var/static/blood_teams + team_id = ++blood_teams + /datum/team/brother_team/is_solo() return FALSE diff --git a/code/modules/antagonists/changeling/cellular_emporium.dm b/code/modules/antagonists/changeling/cellular_emporium.dm index c6b8be0c2c5cb..1c31d342fcf6d 100644 --- a/code/modules/antagonists/changeling/cellular_emporium.dm +++ b/code/modules/antagonists/changeling/cellular_emporium.dm @@ -68,9 +68,11 @@ if("readapt") if(changeling.canrespec) changeling.readapt() + . = TRUE if("evolve") var/sting_name = params["name"] changeling.purchase_power(sting_name) + . = TRUE /datum/action/innate/cellular_emporium name = "Cellular Emporium" diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 521f70edcb1e3..644f0b6e2e27e 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -8,7 +8,7 @@ antagpanel_category = "Changeling" job_rank = ROLE_CHANGELING antag_moodlet = /datum/mood_event/focused - + hijack_speed = 0.5 var/you_are_greet = TRUE var/team_mode = FALSE //Should assign team objectives ? var/competitive_objectives = FALSE //Should we assign objectives in competition with other lings? @@ -192,6 +192,9 @@ if(!ishuman(owner.current)) to_chat(owner.current, "We can't remove our evolutions in this form!") return + if(isabsorbing) + to_chat(owner.current, "We cannot readapt right now!") + return if(canrespec) to_chat(owner.current, "We have removed our evolutions from this form, and are now ready to readapt.") reset_powers() @@ -275,6 +278,9 @@ prof.undershirt = H.undershirt prof.socks = H.socks + if(H.wear_id?.GetID()) + prof.id_icon = "hud[ckey(H.wear_id.GetJobName())]" + var/list/slots = list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") for(var/slot in slots) if(slot in H.vars) @@ -358,9 +364,11 @@ to_chat(owner.current, "You are [changelingID], a changeling! You have absorbed and taken the form of a human.") to_chat(owner.current, "Use say \"[MODE_TOKEN_CHANGELING] message\" to communicate with your fellow changelings.") to_chat(owner.current, "You must complete the following tasks:") - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ling_aler.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ling_aler.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Changeling", + "You have absorbed the form of [owner.current] and have infiltrated the station. Use your changeling powers to complete your objectives.") /datum/antagonist/changeling/farewell() to_chat(owner.current, "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!") @@ -499,6 +507,9 @@ var/undershirt var/socks + /// ID HUD icon associated with the profile + var/id_icon + /datum/changelingprofile/Destroy() qdel(dna) . = ..() @@ -517,7 +528,7 @@ newprofile.underwear = underwear newprofile.undershirt = undershirt newprofile.socks = socks - + newprofile.id_icon = id_icon /datum/antagonist/changeling/xenobio name = "Xenobio Changeling" diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index dc886cb531b0b..4cdf3e9c94aa8 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -67,6 +67,7 @@ the same goes for Remove(). if you override Remove(), call parent or else your p return 0 if(c.trueabsorbs < req_absorbs) to_chat(user, "We require at least [req_absorbs] sample\s of DNA gained through our Absorb ability.") + return 0 if(req_stat < user.stat) to_chat(user, "We are incapacitated.") return 0 diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm index da59421668048..71138e5a7da22 100644 --- a/code/modules/antagonists/changeling/powers/absorb.dm +++ b/code/modules/antagonists/changeling/powers/absorb.dm @@ -11,15 +11,16 @@ return var/mob/living/carbon/target = user.pulling var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + if(!target || !iscarbon(target)) + to_chat(user, "We must be grabbing a creature to absorb them!") + changeling.isabsorbing = FALSE + return if(changeling.isabsorbing) to_chat(user, "We are already absorbing!") return if(HAS_TRAIT(target, TRAIT_NODEATH)) to_chat(user, "We can't absorb this creature.") return - if(!user.pulling || !iscarbon(user.pulling)) - to_chat(user, "We must be grabbing a creature to absorb them!") - return if(user.grab_state <= GRAB_NECK) to_chat(user, "We must have a tighter grip to absorb this creature!") return @@ -123,9 +124,11 @@ if(target_ling)//If the target was a changeling, suck out their extra juice and objective points! to_chat(user, "[target] was one of us. We have absorbed their power.") target_ling.remove_changeling_powers() - changeling.geneticpoints += 2 + changeling.geneticpoints += round(target_ling.geneticpoints/2) target_ling.geneticpoints = 0 target_ling.canrespec = 0 + changeling.chem_storage += round(target_ling.chem_storage/2) + changeling.chem_charges += min(target_ling.chem_charges, changeling.chem_storage) target_ling.chem_charges = 0 target_ling.chem_storage = 0 changeling.absorbedcount += (target_ling.absorbedcount) diff --git a/code/modules/antagonists/changeling/powers/augmented_eyesight.dm b/code/modules/antagonists/changeling/powers/augmented_eyesight.dm index eba49a665698f..521bb440c32b3 100644 --- a/code/modules/antagonists/changeling/powers/augmented_eyesight.dm +++ b/code/modules/antagonists/changeling/powers/augmented_eyesight.dm @@ -3,13 +3,22 @@ /datum/action/changeling/augmented_eyesight name = "Augmented Eyesight" - desc = "Creates more light sensing rods in our eyes, allowing our vision to penetrate most blocking objects." - helptext = "Grants us x-ray vision. We will become a lot more vulnerable to flash-based devices while x-ray vision is active." + desc = "Creates more light sensing rods in our eyes, allowing our vision to penetrate most blocking objects. Protects our vision from flashes while inactive." + helptext = "Grants us x-ray vision or flash protection. We will become a lot more vulnerable to flash-based devices while x-ray vision is active." button_icon_state = "augmented_eyesight" chemical_cost = 0 dna_cost = 2 //Would be 1 without thermal vision active = FALSE +/datum/action/changeling/augmented_eyesight/on_purchase(mob/user) //The ability starts inactive, so we should be protected from flashes. + ..() + var/obj/item/organ/eyes/E = user.getorganslot(ORGAN_SLOT_EYES) + if (E) + E.flash_protect = 2 //Adjust the user's eyes' flash protection. + to_chat(user, "We adjust our eyes to protect them from bright lights.") + else + to_chat(user, "We can't adjust our eyes if we don't have any!") + /datum/action/changeling/augmented_eyesight/sting_action(mob/living/carbon/human/user) if(!istype(user)) return @@ -23,8 +32,8 @@ active = TRUE //Defined in code/modules/spells/spell.dm else E.sight_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS //Remove sight flags from the user's eyes + E.flash_protect = 2 //Adjust the user's eyes' flash protection to_chat(user, "We adjust our eyes to protect them from bright lights.") - E.flash_protect = 0 active = FALSE user.update_sight() else diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm index b5c4075830ab3..39378d9fbf4cd 100644 --- a/code/modules/antagonists/changeling/powers/biodegrade.dm +++ b/code/modules/antagonists/changeling/powers/biodegrade.dm @@ -4,8 +4,8 @@ helptext = "This is obvious to nearby people, and can destroy standard restraints and closets." button_icon_state = "biodegrade" chemical_cost = 30 //High cost to prevent spam - dna_cost = 2 - req_human = 1 + dna_cost = 1 + req_human = TRUE /datum/action/changeling/biodegrade/sting_action(mob/living/carbon/human/user) var/used = FALSE // only one form of shackles removed per use @@ -14,7 +14,7 @@ return 0 if(user.handcuffed) - var/obj/O = user.get_item_by_slot(SLOT_HANDCUFFED) + var/obj/O = user.get_item_by_slot(ITEM_SLOT_HANDCUFFED) if(!istype(O)) return 0 user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O]!", \ @@ -24,7 +24,7 @@ used = TRUE if(user.wear_suit && user.wear_suit.breakouttime && !used) - var/obj/item/clothing/suit/S = user.get_item_by_slot(SLOT_WEAR_SUIT) + var/obj/item/clothing/suit/S = user.get_item_by_slot(ITEM_SLOT_OCLOTHING) if(!istype(S)) return 0 user.visible_message("[user] vomits a glob of acid across the front of [user.p_their()] [S]!", \ diff --git a/code/modules/antagonists/changeling/powers/digitalcamo.dm b/code/modules/antagonists/changeling/powers/digitalcamo.dm index c1d59608beced..4387a7c90964b 100644 --- a/code/modules/antagonists/changeling/powers/digitalcamo.dm +++ b/code/modules/antagonists/changeling/powers/digitalcamo.dm @@ -8,17 +8,17 @@ //Prevents AIs tracking you but makes you easily detectable to the human-eye. /datum/action/changeling/digitalcamo/sting_action(mob/user) ..() - if(user.digitalcamo) + if(HAS_TRAIT(user,TRAIT_DIGICAMO)) to_chat(user, "We return to normal.") - user.digitalinvis = 0 - user.digitalcamo = 0 + REMOVE_TRAIT(user, TRAIT_DIGICAMO, CHANGELING_TRAIT) + REMOVE_TRAIT(user, TRAIT_DIGINVIS, CHANGELING_TRAIT) else - to_chat(user, "We distort our form to hide from the AI.") - user.digitalcamo = 1 - user.digitalinvis = 1 + to_chat(user, "We distort our form to hide from the AI.") + ADD_TRAIT(user, TRAIT_DIGICAMO, CHANGELING_TRAIT) + ADD_TRAIT(user, TRAIT_DIGINVIS, CHANGELING_TRAIT) return TRUE /datum/action/changeling/digitalcamo/Remove(mob/user) - user.digitalcamo = FALSE - user.digitalinvis = FALSE + REMOVE_TRAIT(user, TRAIT_DIGICAMO, CHANGELING_TRAIT) + REMOVE_TRAIT(user, TRAIT_DIGINVIS, CHANGELING_TRAIT) ..() diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm index 9b00f61e39f82..c9c52d8209789 100644 --- a/code/modules/antagonists/changeling/powers/fakedeath.dm +++ b/code/modules/antagonists/changeling/powers/fakedeath.dm @@ -23,9 +23,6 @@ to_chat(user, "We have revived ourselves.") else to_chat(user, "We begin our stasis, preparing energy to arise once more.") - if(user.stat != DEAD) - user.emote("deathgasp") - user.tod = station_time_timestamp() user.fakedeath("changeling") //play dead user.update_stat() user.update_mobility() diff --git a/code/modules/antagonists/changeling/powers/fleshmend.dm b/code/modules/antagonists/changeling/powers/fleshmend.dm index 6f3a3e2baad26..4bfb79ce67af0 100644 --- a/code/modules/antagonists/changeling/powers/fleshmend.dm +++ b/code/modules/antagonists/changeling/powers/fleshmend.dm @@ -1,34 +1,21 @@ /datum/action/changeling/fleshmend name = "Fleshmend" - desc = "We will passively heal our wounds. This is far more effective on bruises than on burns." - helptext = "If we are on fire, the healing effect will not function. Does not regrow limbs or restore lost blood. Functions while unconscious. Continued use slows chemical production" + desc = "Our flesh rapidly regenerates, healing our burns, bruises, and shortness of breath. Costs 25 chemicals." + helptext = "If we are on fire, the healing effect will not function. Does not regrow limbs or restore lost blood. Functions while unconscious." button_icon_state = "fleshmend" - chemical_cost = 0 + chemical_cost = 25 dna_cost = 2 req_stat = UNCONSCIOUS +//Starts healing you every second for 10 seconds. +//Can be used whilst unconscious. /datum/action/changeling/fleshmend/sting_action(mob/living/user) - var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) if(user.has_status_effect(STATUS_EFFECT_FLESHMEND)) - to_chat(user, "We stop fleshmending!") - user.remove_status_effect(STATUS_EFFECT_FLESHMEND) - changeling.chem_recharge_slowdown -= 0.5 + to_chat(user, "We are already fleshmending!") return ..() - to_chat(user, "We begin to heal passively.") + to_chat(user, "We begin to heal rapidly.") user.apply_status_effect(STATUS_EFFECT_FLESHMEND) - changeling.chem_recharge_slowdown += 0.5 return TRUE //Check buffs.dm for the fleshmend status effect code - -/datum/action/changeling/fleshmend/Remove(mob/user) - var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) - if(isliving(user)) - var/mob/living/L = user - if(L.has_status_effect(STATUS_EFFECT_FLESHMEND)) - to_chat(L, "We stop fleshmending!") - L.remove_status_effect(STATUS_EFFECT_FLESHMEND) - changeling.chem_recharge_slowdown -= 0.5 - return - ..() diff --git a/code/modules/antagonists/changeling/powers/gaseous_pores.dm b/code/modules/antagonists/changeling/powers/gaseous_pores.dm new file mode 100644 index 0000000000000..a4f28ef13154c --- /dev/null +++ b/code/modules/antagonists/changeling/powers/gaseous_pores.dm @@ -0,0 +1,39 @@ +/datum/action/changeling/gaseous_pores + name = "Gaseous Pores" + desc = "Our skins bursts, releasing somniferous gases to put opponents to sleep and cover our retreat." + helptext = "Our kind are immune to the gases internals are not necessary" + button_icon_state = "smoke" + chemical_cost = 35 + dna_cost = 2 + req_stat = UNCONSCIOUS + var/range = 4 + +/obj/effect/particle_effect/smoke/sleeping/changeling + color = "#9C3636" + lifetime = 10 + +/obj/effect/particle_effect/smoke/sleeping/changeling/smoke_mob(mob/living/carbon/M,datum/antagonist) + if(is_changeling(M)) + return FALSE + if(..()) + M.Sleeping(200) + INVOKE_ASYNC(M, /mob.proc/emote, "cough") + return TRUE + +/datum/effect_system/smoke_spread/sleeping/changeling + effect_type = /obj/effect/particle_effect/smoke/sleeping/changeling + +/datum/action/changeling/gaseous_pores/sting_action(mob/user) + ..() + user.visible_message("[user]'s skin begins to bubble!") + playsound(user, 'sound/machines/fryer/deep_fryer_1.ogg', 30, 1) + sleep(10) + var/turf/T = get_turf(user) + if(!T) + return FALSE + var/datum/effect_system/smoke_spread/sleeping/changeling/smoke = new(T) + smoke.set_up(range, T) + smoke.start() + user.visible_message("With a guttural screech, [user]'s skin bursts into gas!") + playsound(user, 'sound/voice/lizard/lizard_scream_1.ogg', 30, 1) + return TRUE diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm index 8f479667b92de..1b132ff00345b 100644 --- a/code/modules/antagonists/changeling/powers/headcrab.dm +++ b/code/modules/antagonists/changeling/powers/headcrab.dm @@ -1,7 +1,7 @@ /datum/action/changeling/headcrab name = "Last Resort" - desc = "We sacrifice our current body in a moment of need, placing us in control of a vessel that can plant our likeness in a new host. Costs 20 chemicals." - helptext = "We will be placed in control of a small, fragile creature. We may attack a corpse like this to plant an egg which will slowly mature into a new form for us." + desc = "We sacrifice our current body in a moment of need, placing us in control of a vessel that can plant our likeness in a new host. Cannot be used while being absorbed by another changeling. Costs 20 chemicals." + helptext = "We will be placed in control of a small, fragile creature. We may attack a corpse like this to plant an egg which will slowly mature into a new form for us. Cannot be used while being absorbed by another changeling." button_icon_state = "last_resort" chemical_cost = 20 dna_cost = 0 @@ -11,6 +11,14 @@ /datum/action/changeling/headcrab/sting_action(mob/user) set waitfor = FALSE + if(isliving(user)) + var/mob/living/L = user + var/mob/living/puller = L.pulledby + if(puller) + var/datum/antagonist/changeling/other_ling = is_changeling(puller) + if(other_ling?.isabsorbing) + to_chat(user, "Our last resort is being disrupted by another changeling!") + return if(alert("Are we sure we wish to kill ourself and create a headslug?",,"Yes", "No") == "No") return ..() @@ -20,20 +28,25 @@ for(var/obj/item/organ/I in organs) I.Remove(user, 1) - for(var/mob/living/carbon/human/H in range(2,user)) - var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) - to_chat(H, "You are blinded by a shower of blood!") - H.Stun(20) - H.blur_eyes(20) - eyes?.applyOrganDamage(5) - H.confused += 10 - for(var/mob/living/silicon/S in range(2,user)) - to_chat(S, "Your sensors are disabled by a shower of blood!") - S.Paralyze(60) + for(var/mob/living/A in view(2,user)) + if(ishuman(A)) + var/mob/living/carbon/human/H = A + var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) + to_chat(H, "You are blinded by a shower of blood!") + H.Stun(20) + H.blur_eyes(20) + eyes?.applyOrganDamage(5) + H.confused += 10 + else if(issilicon(A)) + var/mob/living/silicon/S = A + to_chat(S, "Your sensors are disabled by a shower of blood!") + S.Paralyze(60) var/turf = get_turf(user) + // Headcrab transformation is *very* unique; origin mob death happens *before* resulting mob's creation. Action removal should happen beforehand. + for(var/datum/action/cp in user.actions) + cp.Remove(user) user.gib() . = TRUE - sleep(8) // So it's not killed in explosion var/mob/living/simple_animal/hostile/headcrab/crab = new(turf) for(var/obj/item/organ/I in organs) I.forceMove(crab) diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 77eec38d832ed..c101da7e6e32e 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -105,10 +105,7 @@ return 1 /datum/action/changeling/suit/Remove(mob/user) - if(!ishuman(user)) - return - var/mob/living/carbon/human/H = user - check_suit(H) + check_suit(user) ..() /datum/action/changeling/suit/sting_action(mob/living/carbon/human/user) @@ -122,8 +119,8 @@ user.dropItemToGround(user.head) user.dropItemToGround(user.wear_suit) - user.equip_to_slot_if_possible(new suit_type(user), SLOT_WEAR_SUIT, 1, 1, 1) - user.equip_to_slot_if_possible(new helmet_type(user), SLOT_HEAD, 1, 1, 1) + user.equip_to_slot_if_possible(new suit_type(user), ITEM_SLOT_OCLOTHING, 1, 1, 1) + user.equip_to_slot_if_possible(new helmet_type(user), ITEM_SLOT_HEAD, 1, 1, 1) var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) changeling.chem_recharge_slowdown += recharge_slowdown @@ -403,11 +400,11 @@ \***************************************/ /datum/action/changeling/suit/organic_space_suit name = "Organic Space Suit" - desc = "We grow an organic suit to protect ourselves from space exposure. Costs 20 chemicals." - helptext = "We must constantly repair our form to make it space-proof, reducing chemical production while we are protected. Cannot be used in lesser form." + desc = "We grow an organic suit to protect ourselves from space exposure and is lightly armoured. Costs 20 chemicals." + helptext = "We must constantly repair our form to make it armored and space-proof, reducing chemical production while we are protected. Cannot be used in Lesser Form." button_icon_state = "organic_suit" chemical_cost = 20 - dna_cost = 2 + dna_cost = 1 req_human = 1 suit_type = /obj/item/clothing/suit/space/changeling @@ -420,11 +417,12 @@ /obj/item/clothing/suit/space/changeling name = "flesh mass" icon_state = "lingspacesuit" - desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel." + desc = "A huge, bulky mass of armored pressure and temperature-resistant organic tissue, evolved to facilitate space travel and protect from close range threats." item_flags = DROPDEL clothing_flags = STOPSPRESSUREDAMAGE //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen) - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) //No armor at all. + armor = list("melee" = 35, "bullet" = 25, "laser" = 25,"energy" = 30, "bomb" = 30, "bio" = 20, "rad" = 20, "fire" = 90, "acid" = 90, "stamina" = 10)//Bit less armoured than the Syndicate space suit + slowdown = 0.2 /obj/item/clothing/suit/space/changeling/Initialize() . = ..() @@ -433,18 +431,18 @@ loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around [loc.p_their()] body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") START_PROCESSING(SSobj, src) -/obj/item/clothing/suit/space/changeling/process() +/obj/item/clothing/suit/space/changeling/process(delta_time) if(ishuman(loc)) var/mob/living/carbon/human/H = loc - H.reagents.add_reagent(/datum/reagent/medicine/salbutamol, REAGENTS_METABOLISM) + H.reagents.add_reagent(/datum/reagent/medicine/salbutamol, REAGENTS_METABOLISM * (delta_time / SSMOBS_DT)) /obj/item/clothing/head/helmet/space/changeling name = "flesh mass" icon_state = "lingspacehelmet" - desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front." + desc = "A covering of armored pressure and temperature-resistant organic tissue with a glass-like chitin front." item_flags = DROPDEL clothing_flags = STOPSPRESSUREDAMAGE - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) + armor = list("melee" = 35, "bullet" = 25, "laser" = 25,"energy" = 30, "bomb" = 30, "bio" = 20, "rad" = 20, "fire" = 90, "acid" = 90, "stamina" = 10) flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH /obj/item/clothing/head/helmet/space/changeling/Initialize() @@ -476,7 +474,7 @@ icon_state = "lingarmor" item_flags = DROPDEL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 4, "rad" = 0, "fire" = 25, "acid" = 25) + armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25, "stamina" = 30) flags_inv = HIDEJUMPSUIT cold_protection = 0 heat_protection = 0 @@ -494,7 +492,7 @@ desc = "A tough, hard covering of black chitin with transparent chitin in front." icon_state = "lingarmorhelmet" item_flags = DROPDEL - armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 4, "rad" = 0, "fire" = 25, "acid" = 25) + armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25, "stamina" = 30) flags_inv = HIDEEARS|HIDEHAIR|HIDEEYES|HIDEFACIALHAIR|HIDEFACE /obj/item/clothing/head/helmet/changeling/Initialize() diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm index dd38a98e98f86..4b91eaff2cf3d 100644 --- a/code/modules/antagonists/changeling/powers/panacea.dm +++ b/code/modules/antagonists/changeling/powers/panacea.dm @@ -1,5 +1,5 @@ /datum/action/changeling/panacea - name = "Total purge" + name = "Total Purge" desc = "Expels impurities in our form, causing us to heal toxin damage, expel all chemicals, curing most diseases, brain damage, and traumas and resetting our genetic code completely. Costs 20 chemicals." helptext = "Obvious when used, as it sprays all reagents out in a violent manner. Can be used while unconscious." button_icon_state = "panacea" @@ -26,12 +26,17 @@ C.vomit(0, toxic = TRUE) O.forceMove(get_turf(user)) - var/obj/effect/sweatsplash/S = new(user.loc) - for(var/datum/reagent/R in user.reagents.reagent_list) //Not just toxins! - var/amount = R.volume - user.reagents.remove_reagent(R.type, amount) - S.reagents.add_reagent(R.type, amount) - S.splash() + if(isoozeling(user)) + for(var/datum/reagent/R in user.reagents.reagent_list) + var/thisamount = user.reagents.get_reagent_amount(R.type) + user.reagents.remove_reagent(R.type, thisamount) + else + var/obj/effect/sweatsplash/S = new(user.loc) + for(var/datum/reagent/R in user.reagents.reagent_list) //Not just toxins! + var/amount = R.volume + user.reagents.remove_reagent(R.type, amount) + S.reagents.add_reagent(R.type, amount) + S.splash() user.reagents.add_reagent(/datum/reagent/medicine/mutadone, 1) if(iscarbon(user)) @@ -42,11 +47,11 @@ L.cure_all_traumas(TRAUMA_RESILIENCE_SURGERY) for(var/thing in L.diseases) var/datum/disease/D = thing - if(D.severity == DISEASE_SEVERITY_POSITIVE || D.severity == DISEASE_SEVERITY_BENEFICIAL || D.spread_flags == DISEASE_SPREAD_SPECIAL) + if(D.danger == DISEASE_POSITIVE || D.danger == DISEASE_BENEFICIAL || D.spread_flags == DISEASE_SPREAD_SPECIAL) continue if(D in subtypesof(/datum/disease/advance)) var/datum/disease/advance/A = D - if(A.properties["resistance"] >= 12) + if(A.resistance >= 12) continue D.cure(FALSE) return TRUE diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm deleted file mode 100644 index 92184d4829971..0000000000000 --- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm +++ /dev/null @@ -1,55 +0,0 @@ -#define CHANGELING_PHEROMONE_MIN_DISTANCE 10 //More generous than the agent pinpointer because you don't know who you're looking for. -#define CHANGELING_PHEROMONE_MAX_DISTANCE 25 //They can smell your fear a mile away. Well, 50 meters. -#define CHANGELING_PHEROMONE_PING_TIME 20 //2s update time. - - -/datum/action/changeling/pheromone_receptors - name = "Pheromone Receptors" - desc = "We attune our senses to track other changelings by scent. The closer they are, the easier we can find them." - helptext = "We will know the general direction of nearby changelings, with closer scents being stronger. This ability is passive, and costs no chemicals." - chemical_cost = 0 - dna_cost = 2 - var/receptors_active = FALSE - -/datum/action/changeling/pheromone_receptors/on_purchase(mob/user) - .=..() - var/mob/living/carbon/C = user - to_chat(user, "We search for the scent of any nearby changelings.") - C.apply_status_effect(/datum/status_effect/agent_pinpointer/changeling) - -/datum/action/changeling/pheromone_receptors/Remove(mob/user) - .=..() - var/mob/living/carbon/C = user - C.remove_status_effect(/datum/status_effect/agent_pinpointer/changeling) - -//Modified IA pinpointer - Points to the NEAREST changeling, but will only get you within a few tiles of the target. -//You'll still have to rely on intuition and observation to make the identification. Lings can 'hide' in public places. -/datum/status_effect/agent_pinpointer/changeling - alert_type = /obj/screen/alert/status_effect/agent_pinpointer/changeling - minimum_range = CHANGELING_PHEROMONE_MIN_DISTANCE - tick_interval = CHANGELING_PHEROMONE_PING_TIME - range_fuzz_factor = 0 - -/datum/status_effect/agent_pinpointer/changeling/scan_for_target() - var/turf/my_loc = get_turf(owner) - - var/list/mob/living/carbon/changelings = list() - - for(var/mob/living/carbon/C in GLOB.alive_mob_list) - if(C != owner && C.mind) - var/datum/antagonist/changeling/antag_datum = C.mind.has_antag_datum(/datum/antagonist/changeling) - if(istype(antag_datum)) - var/their_loc = get_turf(C) - var/distance = get_dist_euclidian(my_loc, their_loc) - if (distance < CHANGELING_PHEROMONE_MAX_DISTANCE) - changelings[C] = (CHANGELING_PHEROMONE_MAX_DISTANCE ** 2) - (distance ** 2) - - if(changelings.len) - scan_target = pickweight(changelings) //Point at a 'random' changeling, biasing heavily towards closer ones. - else - scan_target = null - - -/obj/screen/alert/status_effect/agent_pinpointer/changeling - name = "Pheromone Scent" - desc = "The nose always knows." diff --git a/code/modules/antagonists/changeling/powers/regenerate.dm b/code/modules/antagonists/changeling/powers/regenerate.dm index 1c4f1298d4252..2288042c2ecb6 100644 --- a/code/modules/antagonists/changeling/powers/regenerate.dm +++ b/code/modules/antagonists/changeling/powers/regenerate.dm @@ -46,7 +46,7 @@ helptext = "We reform one of our limbs as an autonomous snake-like creature. This grotesque display may ward off attackers, and the creature will inject them with incapacitating poison." button_icon_state = "limbsnake" chemical_cost = 15 - dna_cost = 1 + dna_cost = 2 req_human = TRUE req_stat = DEAD ignores_fakedeath = TRUE @@ -71,7 +71,7 @@ //text message C.visible_message("[user]'s [BP] detaches itself and takes the form of a snake!", "Our [BP] forms into a horrifying snake and heads towards our attackers!") - BP.set_disabled(TRUE) + BP.dismember() BP.Destroy() C.update_mobility() //Deploy limbsnake @@ -85,7 +85,7 @@ desc = "This is no snake at all! It looks like someone's limb grew fangs out of it's fingers and it's out to bite anyone!" icon_state = "snake" icon_living = "snake" - del_on_death = 1 + del_on_death = TRUE speak_emote = list("gargles") health = 50 maxHealth = 50 @@ -101,7 +101,9 @@ mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE - mobsay_color = "#26F55A" + chat_color = "#26F55A" + mobchatspan = "chaplain" faction = list("hostile","creature") poison_per_bite = 4 - poison_type = /datum/reagent/toxin/staminatoxin \ No newline at end of file + poison_type = /datum/reagent/toxin/staminatoxin + discovery_points = 1000 diff --git a/code/modules/antagonists/changeling/powers/shriek.dm b/code/modules/antagonists/changeling/powers/shriek.dm index f895e8896c750..18e2439320354 100644 --- a/code/modules/antagonists/changeling/powers/shriek.dm +++ b/code/modules/antagonists/changeling/powers/shriek.dm @@ -10,7 +10,7 @@ //A flashy ability, good for crowd control and sowing chaos. /datum/action/changeling/resonant_shriek/sting_action(mob/user) ..() - for(var/mob/living/M in get_hearers_in_view(4, user)) + for(var/mob/living/M in hearers(4, user)) if(iscarbon(M) && M.get_ear_protection() <= 0) var/mob/living/carbon/C = M if(!C.mind || !C.mind.has_antag_datum(/datum/antagonist/changeling)) diff --git a/code/modules/antagonists/changeling/powers/teratoma.dm b/code/modules/antagonists/changeling/powers/teratoma.dm index fd6ef1c442f70..482ac09834b0c 100644 --- a/code/modules/antagonists/changeling/powers/teratoma.dm +++ b/code/modules/antagonists/changeling/powers/teratoma.dm @@ -7,14 +7,32 @@ dna_cost = 2 req_absorbs = 3 -//Makes a single egg, which hatches into a reskinned monkey with an objective to cause chaos after some time. +//Reskinned monkey - teratoma, will burst out of the host, with the objective to cause chaos. /datum/action/changeling/teratoma/sting_action(mob/user) ..() - new /obj/effect/gibspawner/generic(user.loc) - var/obj/effect/mob_spawn/teratomamonkey/teratoma = new(user.loc) - user.visible_message("[teratoma] explodes out of [user]'s body in a shower of gore!", - "You expel a clump of flesh, which will soon become a vile creature bent on causing chaos.") - teratoma.flavour_text = {" - You are a living teratoma, birthed from an inhuman host. Your purpose is to cause chaos and misery for the beings inhabiting this station. - "} - return TRUE \ No newline at end of file + if(create_teratoma(user)) + var/mob/living/U = user + playsound(user.loc, 'sound/effects/blobattack.ogg', 50, 1) + U.spawn_gibs() + user.visible_message("Something horrible bursts out of [user]'s chest!", \ + "Living teratoma bursts out of your chest!", \ + "You hear flesh tearing!", COMBAT_MESSAGE_RANGE) + return FALSE //create_teratoma() handles the chemicals anyway so there is no reason to take them again + +/datum/action/changeling/teratoma/proc/create_teratoma(mob/user) + var/datum/antagonist/changeling/c = user.mind.has_antag_datum(/datum/antagonist/changeling) + c.chem_charges -= chemical_cost //I'm taking your chemicals hostage! + var/turf/A = get_turf(user) + var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as a living teratoma?", ROLE_TERATOMA, null, ROLE_TERATOMA, 5 SECONDS) //players must answer rapidly + if(!LAZYLEN(candidates)) //if we got at least one candidate, they're teratoma now + to_chat(usr, "You fail at creating a tumor. Perhaps you should try again later?") + c.chem_charges += chemical_cost //If it fails we want to refund the chemicals + return FALSE + var/mob/living/carbon/monkey/tumor/T = new /mob/living/carbon/monkey/tumor(A) + var/mob/dead/observer/C = pick(candidates) + T.key = C.key + var/datum/antagonist/teratoma/D = new + T.mind.add_antag_datum(D) + to_chat(T, "
\ You are not bound by any laws, do whatever you must to serve Rat'var!" - mobsay_color = LIGHT_COLOR_CLOCKWORK + chat_color = LIGHT_COLOR_CLOCKWORK + mobchatspan = "brassmobsay" initial_language_holder = /datum/language_holder/clockmob + discovery_points = 2000 -/mob/living/simple_animal/drone/cogscarab/do_after_coefficent() // This gets added to the delay on a do_after, default 1 - return 0.6 - -//No you can't go weilding guns like that. +//No you can't go wielding guns like that. /mob/living/simple_animal/drone/cogscarab/Initialize() . = ..() ADD_TRAIT(src, TRAIT_NOGUNS, "cogscarab") GLOB.cogscarabs += src + add_actionspeed_modifier(/datum/actionspeed_modifier/cogscarab) /mob/living/simple_animal/drone/cogscarab/death(gibbed) GLOB.cogscarabs -= src @@ -46,13 +46,18 @@ GLOBAL_LIST_INIT(cogscarabs, list()) //====Shell==== -/obj/item/drone_shell/cogscarab +/obj/effect/mob_spawn/drone/cogscarab name = "cogscarab construct" desc = "The shell of an ancient construction drone, loyal to Ratvar." icon_state = "drone_clock_hat" - drone_type = /mob/living/simple_animal/drone/cogscarab + mob_name = "cogscarab" + mob_type = /mob/living/simple_animal/drone/cogscarab + short_desc = "You are a cogscarab!" + flavour_text = "You are a cogscarab, a tiny building construct of Ratvar. While you're weak and can't leave Reebe, \ + you have a set of quick tools, as well as a replica fabricator that can create brass for construction. Work with the servants of Ratvar \ + to construct and maintain defenses at the City of Cogs." -/obj/item/drone_shell/cogscarab/attack_ghost(mob/user) +/obj/effect/mob_spawn/drone/cogscarab/attack_ghost(mob/user) if(is_banned_from(user.ckey, ROLE_SERVANT_OF_RATVAR) || QDELETED(src) || QDELETED(user)) return if(CONFIG_GET(flag/use_age_restriction_for_jobs)) @@ -66,11 +71,11 @@ GLOBAL_LIST_INIT(cogscarabs, list()) var/be_drone = alert("Become a cogscarab? (Warning, You can no longer be cloned!)",,"Yes","No") if(be_drone == "No" || QDELETED(src) || !isobserver(user)) return - var/mob/living/simple_animal/drone/D = new drone_type(get_turf(loc)) + var/mob/living/simple_animal/drone/D = new mob_type(get_turf(loc)) if(!D.default_hatmask && seasonal_hats && possible_seasonal_hats.len) var/hat_type = pick(possible_seasonal_hats) var/obj/item/new_hat = new hat_type(D) - D.equip_to_slot_or_del(new_hat, SLOT_HEAD) + D.equip_to_slot_or_del(new_hat, ITEM_SLOT_HEAD) D.flags_1 |= (flags_1 & ADMIN_SPAWNED_1) D.key = user.key add_servant_of_ratvar(D, silent=TRUE) diff --git a/code/modules/antagonists/clock_cult/mobs/eminence.dm b/code/modules/antagonists/clock_cult/mobs/eminence.dm index d31b6d3dfdb58..b366e142e982d 100644 --- a/code/modules/antagonists/clock_cult/mobs/eminence.dm +++ b/code/modules/antagonists/clock_cult/mobs/eminence.dm @@ -1,10 +1,10 @@ /mob/living/simple_animal/eminence - name = "eminence" - desc = "An glowing ball of light." + name = "\the Eminence" + desc = "A glowing ball of light." icon = 'icons/effects/clockwork_effects.dmi' icon_state = "eminence" mob_biotypes = list(MOB_SPIRIT) - incorporeal_move = INCORPOREAL_MOVE_JAUNT + incorporeal_move = INCORPOREAL_MOVE_EMINENCE invisibility = INVISIBILITY_OBSERVER health = INFINITY maxHealth = INFINITY @@ -34,36 +34,71 @@ hud_possible = list(ANTAG_HUD) hud_type = /datum/hud/revenant + var/calculated_cogs = 0 + var/cogs = 0 + var/mob/living/selected_mob = null var/obj/effect/proc_holder/spell/targeted/eminence/reebe/spell_reebe var/obj/effect/proc_holder/spell/targeted/eminence/station/spell_station + var/obj/effect/proc_holder/spell/targeted/eminence/servant_warp/spell_servant_warp var/obj/effect/proc_holder/spell/targeted/eminence/mass_recall/mass_recall - var/obj/effect/proc_holder/spell/targeted/eminence/reagent_purge/reagent_purge - var/obj/effect/proc_holder/spell/targeted/eminence/linked_asbcond/linked_abscond + var/obj/effect/proc_holder/spell/targeted/eminence/linked_abscond/linked_abscond + var/obj/effect/proc_holder/spell/targeted/eminence/trigger_event/trigger_event /mob/living/simple_animal/eminence/ClickOn(atom/A, params) . = ..() if(!.) A.eminence_act(src) +/mob/living/simple_animal/eminence/proc/cog_change() + //Calculate cogs + if(calculated_cogs != GLOB.installed_integration_cogs) + var/difference = GLOB.installed_integration_cogs - calculated_cogs + calculated_cogs += difference + cogs += difference + to_chat(src, "You have gained [difference] cogs!") + +//Cannot gib the eminence. +/mob/living/simple_animal/eminence/gib() + return + +/mob/living/simple_animal/eminence/UnarmedAttack(atom/A) + return FALSE + +/mob/living/simple_animal/eminence/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE) + return FALSE + /mob/living/simple_animal/eminence/Initialize() . = ..() GLOB.clockcult_eminence = src + //Add spells spell_reebe = new AddSpell(spell_reebe) spell_station = new AddSpell(spell_station) + spell_servant_warp = new + AddSpell(spell_servant_warp) mass_recall = new AddSpell(mass_recall) - reagent_purge = new - AddSpell(reagent_purge) linked_abscond = new AddSpell(linked_abscond) + trigger_event = new + AddSpell(trigger_event) + //Wooooo, you are a ghost + AddComponent(/datum/component/tracking_beacon, "ghost", null, null, TRUE, "#9e4d91", TRUE, TRUE) + cog_change() + +/mob/living/simple_animal/eminence/Destroy() + . = ..() + var/datum/component/tracking_beacon/beacon = GetComponent(/datum/component/tracking_beacon) + if(beacon) + qdel(beacon) /mob/living/simple_animal/eminence/Login() . = ..() - add_servant_of_ratvar(src, silent=TRUE) + var/datum/antagonist/servant_of_ratvar/S = add_servant_of_ratvar(src, silent=TRUE) + S.prefix = CLOCKCULT_PREFIX_EMINENCE to_chat(src, "You are the Eminence!") to_chat(src, "Click on objects to perform actions, different objects have different actions, try them out!") to_chat(src, "Many of your spells require a target first. Click on a servant to select them!") @@ -86,6 +121,14 @@ return . = ..() +/mob/living/simple_animal/eminence/bullet_act(obj/item/projectile/Proj) + return BULLET_ACT_FORCE_PIERCE + +/mob/living/simple_animal/eminence/proc/run_global_event(datum/round_event_control/E) + E.preRunEvent() + E.runEvent() + SSevents.reschedule() + //Eminence abilities /obj/effect/proc_holder/spell/targeted/eminence @@ -99,6 +142,18 @@ cooldown_min = 0 range = -1 include_user = TRUE + var/cog_cost + +/obj/effect/proc_holder/spell/targeted/eminence/can_cast(mob/user) + . = ..() + var/mob/living/simple_animal/eminence/eminence = user + if(!istype(eminence)) + return FALSE + if(eminence.cogs < cog_cost) + return FALSE + +/obj/effect/proc_holder/spell/targeted/eminence/proc/consume_cogs(mob/living/simple_animal/eminence/eminence) + eminence.cogs -= cog_cost //=====Warp to Reebe===== /obj/effect/proc_holder/spell/targeted/eminence/reebe @@ -106,8 +161,14 @@ desc = "Teleport yourself to Reebe." action_icon_state = "Abscond" -/obj/effect/proc_holder/spell/targeted/eminence/reebe/cast(list/targets, mob/living/user) - user.forceMove(get_turf(GLOB.celestial_gateway)) +/obj/effect/proc_holder/spell/targeted/eminence/reebe/cast(mob/living/user) + var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.celestial_gateway + if(G) + user.forceMove(get_turf(G)) + SEND_SOUND(user, sound('sound/magic/magic_missile.ogg')) + flash_color(user, flash_color = "#AF0AAF", flash_time = 25) + else + to_chat(user, "There is no Ark!") //=====Warp to station===== /obj/effect/proc_holder/spell/targeted/eminence/station @@ -115,13 +176,45 @@ desc = "Teleport yourself to the station." action_icon_state = "warp_down" -/obj/effect/proc_holder/spell/targeted/eminence/station/cast(list/targets, mob/living/user) - user.forceMove(SSmapping.get_station_center()) +/obj/effect/proc_holder/spell/targeted/eminence/station/cast(mob/living/user) + if(!is_station_level(user.z)) + user.forceMove(get_turf(pick(GLOB.generic_event_spawns))) + SEND_SOUND(user, sound('sound/magic/magic_missile.ogg')) + flash_color(user, flash_color = "#AF0AAF", flash_time = 25) + else + to_chat(user, "You're already on the station!") + +//=====Teleport to servant===== +/obj/effect/proc_holder/spell/targeted/eminence/servant_warp + name = "Jump to Servant" + desc = "Teleport yourself to a specific servant." + action_icon_state = "Spatial Warp" + +/obj/effect/proc_holder/spell/targeted/eminence/servant_warp/cast(list/targets, mob/user) + //Get a list of all servants + var/choice = input(user, "Select servant", "Warp to...", null) in GLOB.all_servants_of_ratvar + if(!choice) + return + for(var/mob/living/L in GLOB.all_servants_of_ratvar) + if(L.name == choice) + choice = L + break + if(!isliving(choice)) + to_chat(user, "You cannot jump to them!") + return + var/mob/living/M = choice + if(!is_servant_of_ratvar(M)) + to_chat(user, "They are no longer a servant of Rat'var!") + return + var/turf/T = get_turf(M) + user.forceMove(get_turf(T)) + SEND_SOUND(user, sound('sound/magic/magic_missile.ogg')) + flash_color(user, flash_color = "#AF0AAF", flash_time = 25) //=====Mass Recall===== /obj/effect/proc_holder/spell/targeted/eminence/mass_recall name = "Initiate Mass Recall" - desc = "Initiates a mass recall, warping everyone to the Ark." + desc = "Initiates a mass recall, warping everyone to the Ark. Can only be used 1 time." action_icon_state = "Spatial Gateway" /obj/effect/proc_holder/spell/targeted/eminence/mass_recall/cast(list/targets, mob/living/user) @@ -131,50 +224,15 @@ C.begin_mass_recall() user.RemoveSpell(src) -//=====Purge Reagents===== -/obj/effect/proc_holder/spell/targeted/eminence/reagent_purge - name = "Purge Reagents" - desc = "Purges all the reagents from a selected target. You must select a target by left clicking on them first." - action_icon_state = "Mending Mantra" - charge_max = 300 - -/obj/effect/proc_holder/spell/targeted/eminence/reagent_purge/can_cast(mob/user) - if(!..()) - return FALSE - var/mob/living/simple_animal/eminence/E = user - if(!istype(E)) - return FALSE - if(E.selected_mob && is_servant_of_ratvar(E.selected_mob)) - return TRUE - return FALSE - -/obj/effect/proc_holder/spell/targeted/eminence/reagent_purge/cast(list/targets, mob/living/user) - var/mob/living/simple_animal/eminence/E = user - if(!istype(E)) - revert_cast(user) - return FALSE - if(!E.selected_mob || !is_servant_of_ratvar(E.selected_mob)) - E.selected_mob = null - to_chat(user, "You need to select a valid target by clicking on them.") - revert_cast(user) - return FALSE - var/mob/living/L = E.selected_mob - if(!istype(L)) - revert_cast(user) - return FALSE - L.reagents?.clear_reagents() - to_chat(user, "You clear the reagents from [L]!") - to_chat(L, "The Eminence has purified your blood!") - return TRUE - //=====Linked Abscond===== -/obj/effect/proc_holder/spell/targeted/eminence/linked_asbcond +/obj/effect/proc_holder/spell/targeted/eminence/linked_abscond name = "Linked Abscond" - desc = "Warps a target to Reebe if they are still for 7 seconds." + desc = "Warps a target to Reebe if they are still for 7 seconds. Costs 1 cog." action_icon_state = "Linked Abscond" - charge_max = 4500 + charge_max = 1800 + cog_cost = 1 -/obj/effect/proc_holder/spell/targeted/eminence/linked_asbcond/can_cast(mob/user) +/obj/effect/proc_holder/spell/targeted/eminence/linked_abscond/can_cast(mob/user) if(!..()) return FALSE var/mob/living/simple_animal/eminence/E = user @@ -184,7 +242,7 @@ return TRUE return FALSE -/obj/effect/proc_holder/spell/targeted/eminence/linked_asbcond/cast(list/targets, mob/living/user) +/obj/effect/proc_holder/spell/targeted/eminence/linked_abscond/cast(list/targets, mob/living/user) var/mob/living/simple_animal/eminence/E = user if(!istype(E)) to_chat(E, "You are not the Eminence! (This is a bug)") @@ -207,8 +265,48 @@ L.visible_message("[L] phases out of existance!") var/turf/T = get_turf(pick(GLOB.servant_spawns)) try_warp_servant(L, T, FALSE) + consume_cogs(E) return TRUE else to_chat(E, "You fail to recall [L].") revert_cast(user) return FALSE + +//Trigger event +/obj/effect/proc_holder/spell/targeted/eminence/trigger_event + name = "Manipulate Reality" + desc = "Manipulate reality causing global events to occur. Costs 5 cogs" + action_icon_state = "Geis" + charge_max = 3000 + cog_cost = 5 + +/obj/effect/proc_holder/spell/targeted/eminence/trigger_event/cast(list/targets, mob/user) + var/picked_event = input(user, "Pick an event to run", "Manipulate Reality", null) in list( + "Anomaly", + "Brand Intelligence", + "Camera Failure", + "Communications Blackout", + "Disease Outbreak", + "Electrical Storm", + "False Alarm", + "Grid Check", + "Mass Hallucination", + "Processor Overload", + "Radiation Storm" + ) + if(!can_cast(user)) + return + if(!picked_event) + revert_cast(user) + return + if(picked_event == "Anomaly") + picked_event = pick("Anomaly: Energetic Flux", "Anomaly: Pyroclastic", "Anomaly: Gravitational", "Anomaly: Bluespace") + //Reschedule events + //Get the picked event + for(var/datum/round_event_control/E in SSevents.control) + if(E.name == picked_event) + var/mob/living/simple_animal/eminence/eminence = user + INVOKE_ASYNC(eminence, /mob/living/simple_animal/eminence.proc/run_global_event, E) + consume_cogs(user) + return + revert_cast(user) diff --git a/code/modules/antagonists/clock_cult/scriptures/_clockwork_scripture.dm b/code/modules/antagonists/clock_cult/scriptures/_clockwork_scripture.dm index 44df5e14fc941..7d64230dd18fc 100644 --- a/code/modules/antagonists/clock_cult/scriptures/_clockwork_scripture.dm +++ b/code/modules/antagonists/clock_cult/scriptures/_clockwork_scripture.dm @@ -56,7 +56,7 @@ return var/invokers_left = invokers_required if(invokers_left > 1) - for(var/mob/living/M in view(invoker)) + for(var/mob/living/M in viewers(invoker)) if(M.stat) continue if(!invokers_left) @@ -71,7 +71,7 @@ if(text_point < stop_at) invokation_chant_timer = addtimer(CALLBACK(src, .proc/recite, text_point+1, wait_time, stop_at), wait_time, TIMER_STOPPABLE) -/datum/clockcult/scripture/proc/check_special_requirements() +/datum/clockcult/scripture/proc/check_special_requirements(mob/user) if(!invoker || !invoking_slab) message_admins("No invoker for [name]") return FALSE @@ -79,7 +79,7 @@ to_chat(invoker, "You fail to invoke [name].") return FALSE var/invokers - for(var/mob/living/M in view(invoker)) + for(var/mob/living/M in viewers(invoker)) if(M.stat) continue if(is_servant_of_ratvar(M)) @@ -100,11 +100,11 @@ log_runtime("CLOCKCULT: Attempting to invoke a scripture that has not been unlocked. Either there is a bug, or [ADMIN_LOOKUP(invoker)] is using some wacky exploits.") end_invoke() return - if(!check_special_requirements()) + if(!check_special_requirements(M)) end_invoke() return recital() - if(do_after(M, invokation_time, target=M, extra_checks=CALLBACK(src, .proc/check_special_requirements))) + if(do_after(M, invokation_time, target=M, extra_checks=CALLBACK(src, .proc/check_special_requirements, M))) invoke() to_chat(M, "You invoke [name].") if(end_on_invokation) @@ -127,7 +127,7 @@ /datum/clockcult/scripture/create_structure var/summoned_structure -/datum/clockcult/scripture/create_structure/check_special_requirements() +/datum/clockcult/scripture/create_structure/check_special_requirements(mob/user) if(!..()) return FALSE for(var/obj/structure/destructible/clockwork/structure in get_turf(invoker)) diff --git a/code/modules/antagonists/clock_cult/scriptures/abscond.dm b/code/modules/antagonists/clock_cult/scriptures/abscond.dm index 2e0abcc8d5ee1..55fb9241cefad 100644 --- a/code/modules/antagonists/clock_cult/scriptures/abscond.dm +++ b/code/modules/antagonists/clock_cult/scriptures/abscond.dm @@ -8,8 +8,8 @@ tip = "Transports you and anyone you are dragging to Reebe." button_icon_state = "Abscond" power_cost = 5 - invokation_time = 35 - invokation_text = list("As we bid farewell, and return to the stars...", "...we shall find our way home.") + invokation_time = 25 + invokation_text = list("As we bid farewell, and return to the stars...", "we shall find our way home.") category = SPELLTYPE_SERVITUDE var/client_color diff --git a/code/modules/antagonists/clock_cult/scriptures/abstraction_crystal.dm b/code/modules/antagonists/clock_cult/scriptures/abstraction_crystal.dm index 33ef0835423f0..652c7140db433 100644 --- a/code/modules/antagonists/clock_cult/scriptures/abstraction_crystal.dm +++ b/code/modules/antagonists/clock_cult/scriptures/abstraction_crystal.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(abstraction_crystals, list()) /datum/clockcult/scripture/create_structure/abstraction_crystal name = "Abstraction Crystal" desc = "Summons an Abstraction Crystal, which allows servants to manifest themself to protect the nearby area." - tip = "Upon your manifestation taking damage, you will only recieve 40% of the damage." + tip = "Upon your manifestation taking damage, you will only receive 40% of the damage." button_icon_state = "Clockwork Obelisk" power_cost = 750 invokation_time = 50 @@ -19,13 +19,14 @@ GLOBAL_LIST_INIT(abstraction_crystals, list()) cogs_required = 5 category = SPELLTYPE_STRUCTURES -/datum/clockcult/scripture/create_structure/abstraction_crystal/check_special_requirements() +/datum/clockcult/scripture/create_structure/abstraction_crystal/check_special_requirements(mob/user) if(!..()) return FALSE - for(var/obj/structure/destructible/clockwork/structure in get_turf(invoker)) + var/obj/structure/destructible/clockwork/structure = locate() in get_turf(invoker) + if(structure) to_chat(invoker, "You cannot invoke that here, the tile is occupied by [structure].") return FALSE - for(var/obj/structure/destructible/clockwork/abstraction_crystal/AC in range(5)) + if(locate(/obj/structure/destructible/clockwork/abstraction_crystal) in range(5)) to_chat(invoker, "There is an Abstraction Crystal nearby, you cannot place this here.") return FALSE return TRUE @@ -47,7 +48,7 @@ GLOBAL_LIST_INIT(abstraction_crystals, list()) //============= // A human that can do human things, however it is linked to a crystal -// Instead of recieving damage normally, damage is applied to the crystal +// Instead of receiving damage normally, damage is applied to the crystal // and this mobs health is equal to the health of the crystal //============= @@ -110,7 +111,7 @@ GLOBAL_LIST_INIT(abstraction_crystals, list()) desc = "An other-worldly structure, its lattice pulsating with a bright, pulsating light." icon_state = "obelisk_inactive" clockwork_desc = "A powerful crystal allowing the user to manifest themselves at other abstraction crystals." - max_integrity = 100 + max_integrity = 200 break_message = "The crystal explodes into a shower of shards!" var/key_word = "" var/mob/living/activator diff --git a/code/modules/antagonists/clock_cult/scriptures/clockwork_armaments.dm b/code/modules/antagonists/clock_cult/scriptures/clockwork_armaments.dm index e75dc387c1a3d..13f46e5b1840b 100644 --- a/code/modules/antagonists/clock_cult/scriptures/clockwork_armaments.dm +++ b/code/modules/antagonists/clock_cult/scriptures/clockwork_armaments.dm @@ -6,15 +6,15 @@ desc = "Summon clockwork armor and weapons, to be ready for battle." tip = "Summon clockwork armor and weapons, to be ready for battle." button_icon_state = "clockwork_armor" - power_cost = 250 + power_cost = 150 invokation_time = 20 - invokation_text = list("Through courage and hope...", "...we shall protect thee!") + invokation_text = list("Through courage and hope...", "we shall protect thee!") category = SPELLTYPE_PRESERVATION cogs_required = 0 /datum/clockcult/scripture/clockwork_armaments/invoke_success() var/mob/living/M = invoker - var/choice = input(M,"What weapon do you want to call upon?", "Clockwork Armaments") as anything in list("Brass Spear","Brass Battlehammer","Brass Sword", "Brass Bow") + var/choice = input(M,"What weapon do you want to call upon?", "Clockwork Armaments") as anything in list("Brass Spear","Brass Battlehammer","Brass Sword", "Brass Bow", "Standard Equipment (Unarmed)") var/datum/antagonist/servant_of_ratvar/servant = is_servant_of_ratvar(M) if(!servant) return FALSE @@ -23,6 +23,10 @@ var/static/datum/outfit/clockcult/armaments/hammer/armaments_hammer = new var/static/datum/outfit/clockcult/armaments/sword/armaments_sword = new var/static/datum/outfit/clockcult/armaments/bow/armaments_bow = new + var/static/datum/outfit/clockcult/default = new + var/static/datum/outfit/clockcult_plasmaman/plasmaman = new + if(is_species(M, /datum/species/plasmaman)) + plasmaman.equip(M) switch(choice) if("Brass Spear") armaments_spear.equip(M) @@ -32,3 +36,5 @@ armaments_sword.equip(M) if("Brass Bow") armaments_bow.equip(M) + if("Standard Equipment (Unarmed)") + default.equip(M) diff --git a/code/modules/antagonists/clock_cult/scriptures/dimensional_breach.dm b/code/modules/antagonists/clock_cult/scriptures/dimensional_breach.dm index f20a4257ee4e2..3fa246beca884 100644 --- a/code/modules/antagonists/clock_cult/scriptures/dimensional_breach.dm +++ b/code/modules/antagonists/clock_cult/scriptures/dimensional_breach.dm @@ -6,9 +6,9 @@ desc = "Prepares the Ark for activation, alerting the crew of your existence. Requires 6 invokers." tip = "Prepares the Ark for activation, alerting the crew of your existence." button_icon_state = "Spatial Gateway" - power_cost = 10000 + power_cost = 5000 invokation_time = 140 - invokation_text = list("Oh great Engine, take my soul...", "...it is time for you to rise...", "...through rifts you shall come...", "...to rise among the stars again!") + invokation_text = list("Oh great Engine, take my soul...", "it is time for you to rise...", "through rifts you shall come...", "to rise among the stars again!") invokers_required = 6 category = SPELLTYPE_SERVITUDE recital_sound = 'sound/magic/clockwork/narsie_attack.ogg' @@ -16,10 +16,10 @@ /datum/clockcult/scripture/ark_activation/New() . = ..() -/datum/clockcult/scripture/ark_activation/check_special_requirements() +/datum/clockcult/scripture/ark_activation/check_special_requirements(mob/user) if(!..()) return FALSE - if(!is_reebe(get_area(invoker).z)) + if(!is_reebe(get_area(invoker))) to_chat(invoker, "You need to be near the gateway to channel its energy!") return FALSE return TRUE diff --git a/code/modules/antagonists/clock_cult/scriptures/hateful_manacles.dm b/code/modules/antagonists/clock_cult/scriptures/hateful_manacles.dm index aa9a5d5507003..aa9c63c8f0e86 100644 --- a/code/modules/antagonists/clock_cult/scriptures/hateful_manacles.dm +++ b/code/modules/antagonists/clock_cult/scriptures/hateful_manacles.dm @@ -4,11 +4,11 @@ /datum/clockcult/scripture/slab/hateful_manacles name = "Hateful Manacles" desc = "Forms replicant manacles around a target's wrists that function like handcuffs, restraining the target." - tip = "Handcuff a target at close range." + tip = "Handcuff a target at close range to subdue them for conversion or vitality extraction." button_icon_state = "Hateful Manacles" power_cost = 25 invokation_time = 15 - invokation_text = list("Shackle the heretic...", "...Break them in body and spirit!") + invokation_text = list("Shackle the heretic...", "Break them in body and spirit!") slab_overlay = "hateful_manacles" use_time = 200 cogs_required = 0 @@ -24,14 +24,20 @@ if(M.handcuffed) to_chat(invoker, "[M] is already restrained!") return FALSE - playsound(src, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) + playsound(M, 'sound/weapons/handcuffs.ogg', 30, TRUE, -2) M.visible_message("[invoker] forms a well of energy around [M], brass appearing at their wrists!",\ "[invoker] is trying to restrain you!") - if(do_after(invoker, 50, target=M)) + if(do_after(invoker, 30, target=M)) if(M.handcuffed) return FALSE - //Todo, update with custom cuffs - M.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(M) + M.handcuffed = new /obj/item/restraints/handcuffs/clockwork(M) M.update_handcuffed() + log_combat(invoker, M, "handcuffed") return TRUE return FALSE + +/obj/item/restraints/handcuffs/clockwork + name = "replicant manacles" + desc = "Heavy manacles made out of freezing-cold metal. It looks like brass, but feels much more solid." + icon_state = "brass_manacles" + item_flags = DROPDEL diff --git a/code/modules/antagonists/clock_cult/scriptures/interdiction_lens.dm b/code/modules/antagonists/clock_cult/scriptures/interdiction_lens.dm index 0afdef818bab4..20ed789e92655 100644 --- a/code/modules/antagonists/clock_cult/scriptures/interdiction_lens.dm +++ b/code/modules/antagonists/clock_cult/scriptures/interdiction_lens.dm @@ -1,4 +1,4 @@ -#define INTERDICTION_LENS_RANGE 3 +#define INTERDICTION_LENS_RANGE 5 /datum/clockcult/scripture/create_structure/interdiction name = "Interdiction Lens" @@ -7,7 +7,7 @@ button_icon_state = "Interdiction Lens" power_cost = 500 invokation_time = 80 - invokation_text = list("Oh great lord...", "...may your divinity block the outsiders.") + invokation_text = list("Oh great lord...", "may your divinity block the outsiders.") summoned_structure = /obj/structure/destructible/clockwork/gear_base/interdiction_lens cogs_required = 4 category = SPELLTYPE_STRUCTURES @@ -16,7 +16,7 @@ name = "interdiction lens" desc = "A mesmerizing light that flashes to a rhythm that you just can't stop tapping to." clockwork_desc = "A small device which will slow down nearby attackers at a small power cost." - default_icon_state = "interdiction_lens_inactive" + default_icon_state = "interdiction_lens" anchored = TRUE break_message = "The interdiction lens breaks into multiple fragments, which gently float to the ground." max_integrity = 150 @@ -40,8 +40,11 @@ /obj/structure/destructible/clockwork/gear_base/interdiction_lens/attack_hand(mob/user) if(is_servant_of_ratvar(user)) + if(!anchored) + to_chat(user, "[src] needs to be fastened to the floor!") + return enabled = !enabled - to_chat(user, "You toggle [src] [enabled?"on":"off"].") + to_chat(user, "You flick the switch on [src], turning it [enabled?"on":"off"]!") if(enabled) if(update_power()) repowered() @@ -53,22 +56,21 @@ else . = ..() -/obj/structure/destructible/clockwork/gear_base/interdiction_lens/process() +/obj/structure/destructible/clockwork/gear_base/interdiction_lens/process(delta_time) if(!anchored) enabled = FALSE STOP_PROCESSING(SSobj, src) - icon_state = "interdiction_lens_unwrenched" + update_icon_state() return - if(prob(5)) + if(DT_PROB(5, delta_time)) new /obj/effect/temp_visual/steam_release(get_turf(src)) - for(var/mob/living/L in range(INTERDICTION_LENS_RANGE, src)) - if(!is_servant_of_ratvar(L)) - if(use_power(5)) - L.apply_status_effect(STATUS_EFFECT_INTERDICTION) - for(var/obj/mecha/M in range(INTERDICTION_LENS_RANGE, src)) + for(var/mob/living/L in viewers(INTERDICTION_LENS_RANGE, src)) + if(!is_servant_of_ratvar(L) && use_power(5)) + L.apply_status_effect(STATUS_EFFECT_INTERDICTION) + for(var/obj/mecha/M in dview(INTERDICTION_LENS_RANGE, src, SEE_INVISIBLE_MINIMUM)) if(use_power(5)) - M.use_power(8000) - M.take_damage(80) + M.emp_act(EMP_HEAVY) + M.take_damage(400 * delta_time) do_sparks(4, TRUE, M) /obj/structure/destructible/clockwork/gear_base/interdiction_lens/repowered() @@ -86,10 +88,18 @@ if(processing) STOP_PROCESSING(SSobj, src) processing = FALSE - icon_state = "interdiction_lens_inactive" + icon_state = "interdiction_lens" flick("interdiction_lens_discharged", src) QDEL_NULL(dampening_field) +/obj/structure/destructible/clockwork/gear_base/interdiction_lens/free/use_power(amount) + return + +/obj/structure/destructible/clockwork/gear_base/interdiction_lens/free/check_power(amount) + if(!LAZYLEN(transmission_sigils)) + return FALSE + return TRUE + //Dampening field /datum/proximity_monitor/advanced/peaceborg_dampener/clockwork name = "\improper Reality Distortion Field" diff --git a/code/modules/antagonists/clock_cult/scriptures/ocular_warden.dm b/code/modules/antagonists/clock_cult/scriptures/ocular_warden.dm index d452f23353a31..8d7431bffc039 100644 --- a/code/modules/antagonists/clock_cult/scriptures/ocular_warden.dm +++ b/code/modules/antagonists/clock_cult/scriptures/ocular_warden.dm @@ -6,7 +6,7 @@ desc = "An eye turret that will fire upon nearby targets. Requires 2 invokers." tip = "Place these around to prevent crew from rushing past your defenses." button_icon_state = "Ocular Warden" - power_cost = 500 + power_cost = 400 invokation_time = 50 invokation_text = list("Summon thee to defend our temple") summoned_structure = /obj/structure/destructible/clockwork/ocular_warden @@ -14,7 +14,7 @@ invokers_required = 2 category = SPELLTYPE_STRUCTURES -/datum/clockcult/scripture/create_structure/ocular_warden/check_special_requirements() +/datum/clockcult/scripture/create_structure/ocular_warden/check_special_requirements(mob/user) if(!..()) return FALSE for(var/obj/structure/destructible/clockwork/structure in get_turf(invoker)) @@ -32,16 +32,16 @@ break_message = "A black ooze leaks from the ocular warden as it slowly sinks to the ground." icon_state = "ocular_warden" max_integrity = 60 - armor = list("melee" = -80, "bullet" = -50, "laser" = 40, "energy" = 40, "bomb" = 20, "bio" = 0, "rad" = 0) + armor = list("melee" = -80, "bullet" = -50, "laser" = 40, "energy" = 40, "bomb" = 20, "bio" = 0, "rad" = 0, "stamina" = 0) var/cooldown -/obj/structure/destructible/clockwork/ocular_warden/process() +/obj/structure/destructible/clockwork/ocular_warden/process(delta_time) //Can we fire? if(world.time < cooldown) return //Check hostiles in range var/list/valid_targets = list() - for(var/mob/living/potential in view(OCULAR_WARDEN_RANGE, src)) + for(var/mob/living/potential in hearers(OCULAR_WARDEN_RANGE, src)) if(!is_servant_of_ratvar(potential) && !potential.stat) valid_targets += potential if(!LAZYLEN(valid_targets)) @@ -51,7 +51,7 @@ if(!target) return dir = get_dir(get_turf(src), get_turf(target)) - target.apply_damage(max(20 - (get_dist(src, target)*5), 10), BURN) + target.apply_damage(max(10 - (get_dist(src, target)*2.5), 5)*delta_time, BURN) new /obj/effect/temp_visual/ratvar/ocular_warden(get_turf(target)) new /obj/effect/temp_visual/ratvar/ocular_warden(get_turf(src)) playsound(get_turf(target), 'sound/machines/clockcult/ocularwarden-dot1.ogg', 60, TRUE) diff --git a/code/modules/antagonists/clock_cult/scriptures/prosperity_prism.dm b/code/modules/antagonists/clock_cult/scriptures/prosperity_prism.dm index 3156d54118496..5a92bd468b179 100644 --- a/code/modules/antagonists/clock_cult/scriptures/prosperity_prism.dm +++ b/code/modules/antagonists/clock_cult/scriptures/prosperity_prism.dm @@ -53,7 +53,11 @@ else if(depowered || !powered) icon_state += "_inactive" -/obj/structure/destructible/clockwork/gear_base/prosperityprism/process() +/obj/structure/destructible/clockwork/gear_base/prosperityprism/process(delta_time) + if(!anchored) + toggled_on = FALSE + update_icon_state() + return if(!toggled_on || depowered) if(powered) powered = FALSE @@ -62,24 +66,29 @@ if(!powered) powered = TRUE update_icon_state() - for(var/mob/living/L in range(4)) + for(var/mob/living/L in range(4, src)) if(!is_servant_of_ratvar(L)) continue - if(use_power(4)) - L.adjustToxLoss(-10) - L.adjustStaminaLoss(-10) - L.adjustBruteLoss(-2) - L.adjustFireLoss(-2) + if(!L.toxloss && !L.staminaloss && !L.bruteloss && !L.fireloss) + continue + if(use_power(2)) + L.adjustToxLoss(-50*delta_time, FALSE, TRUE) + L.adjustStaminaLoss(-50*delta_time) + L.adjustBruteLoss(-10*delta_time) + L.adjustFireLoss(-10*delta_time) new /obj/effect/temp_visual/heal(get_turf(L), "#45dd8a") for(var/datum/reagent/R in L.reagents.reagent_list) if(istype(R, /datum/reagent/toxin)) - L.reagents.remove_reagent(R.type, 10) - holder.add_reagent(R.type, 10) + L.reagents.remove_reagent(R.type, 50*delta_time) + holder.add_reagent(R.type, 50*delta_time) /obj/structure/destructible/clockwork/gear_base/prosperityprism/attack_hand(mob/user) if(is_servant_of_ratvar(user)) + if(!anchored) + to_chat(user, "[src] needs to be fastened to the floor!") + return toggled_on = !toggled_on - to_chat(user, "You flick the switch on [src], turning it [toggled_on?"on":"off"]!") + to_chat(user, "You flick the switch on [src], turning it [toggled_on?"on":"off"]!") else . = ..() diff --git a/code/modules/antagonists/clock_cult/scriptures/sentinels_compromise.dm b/code/modules/antagonists/clock_cult/scriptures/sentinels_compromise.dm index 64a7135999ad7..9edb2ae63ea0f 100644 --- a/code/modules/antagonists/clock_cult/scriptures/sentinels_compromise.dm +++ b/code/modules/antagonists/clock_cult/scriptures/sentinels_compromise.dm @@ -11,7 +11,7 @@ power_cost = 80 /datum/clockcult/scripture/slab/sentinelscompromise/click_on(atom/A) - if(!(get_turf(A) in view(7, get_turf(invoker)))) + if(!(invoker in viewers(7, get_turf(A)))) return var/mob/living/M = A if(!istype(M)) @@ -33,6 +33,7 @@ M.adjustFireLoss(-M.getFireLoss() * 0.6, FALSE) M.adjustOxyLoss(-M.getOxyLoss() * 0.6, FALSE) M.adjustCloneLoss(-M.getCloneLoss() * 0.6, TRUE) + M.blood_volume = BLOOD_VOLUME_NORMAL M.reagents.remove_reagent(/datum/reagent/water/holywater, INFINITY) M.set_nutrition(NUTRITION_LEVEL_FULL) M.bodytemperature = BODYTEMP_NORMAL @@ -44,5 +45,7 @@ M.cure_husk() M.hallucination = 0 new /obj/effect/temp_visual/heal(get_turf(M), "#f8d984") + playsound(M, 'sound/magic/magic_missile.ogg', 50, TRUE) + playsound(invoker, 'sound/magic/magic_missile.ogg', 50, TRUE) invoker.adjustToxLoss(min(total_damage/2, 80)) return TRUE diff --git a/code/modules/antagonists/clock_cult/scriptures/sigil_of_submission.dm b/code/modules/antagonists/clock_cult/scriptures/sigil_of_submission.dm index 49e5e66b33cba..895e8b64d27b5 100644 --- a/code/modules/antagonists/clock_cult/scriptures/sigil_of_submission.dm +++ b/code/modules/antagonists/clock_cult/scriptures/sigil_of_submission.dm @@ -8,7 +8,7 @@ button_icon_state = "Sigil of Submission" power_cost = 250 invokation_time = 50 - invokation_text = list("Relax you animal...", "...for I shall show you the truth.") + invokation_text = list("Relax you animal...", "for I shall show you the truth.") summoned_structure = /obj/structure/destructible/clockwork/sigil/submission cogs_required = 1 category = SPELLTYPE_SERVITUDE diff --git a/code/modules/antagonists/clock_cult/scriptures/sigil_of_vitality.dm b/code/modules/antagonists/clock_cult/scriptures/sigil_of_vitality.dm index b0a8f6e5cdc1e..e67fb4f861a74 100644 --- a/code/modules/antagonists/clock_cult/scriptures/sigil_of_vitality.dm +++ b/code/modules/antagonists/clock_cult/scriptures/sigil_of_vitality.dm @@ -6,7 +6,7 @@ desc = "Summons a vitality matrix, which drains the life force of non servants, and can be used to heal or revive servants. Requires 2 invokers." tip = "Heal and revive dead servants, while draining the health from non servants." button_icon_state = "Sigil of Vitality" - power_cost = 400 + power_cost = 300 invokation_time = 50 invokation_text = list("My life in your hands.") summoned_structure = /obj/structure/destructible/clockwork/sigil/vitality @@ -37,6 +37,8 @@ return FALSE if(HAS_TRAIT(M, TRAIT_NODEATH)) return FALSE + if(issilicon(M)) + return FALSE return TRUE /obj/structure/destructible/clockwork/sigil/vitality/apply_effects(mob/living/M) @@ -66,24 +68,39 @@ M.adjustBruteLoss(-5, FALSE) M.adjustFireLoss(-5, FALSE) M.adjustOxyLoss(-5, FALSE) - M.adjustToxLoss(-5, FALSE) + M.adjustToxLoss(-5, FALSE, TRUE) M.adjustCloneLoss(-5) else visible_message("\The [src] fails to heal [M]!", "There is insufficient vitality to heal your wounds!") else if(M.anti_magic_check()) return + if(is_convertable_to_clockcult(M) && !GLOB.gateway_opening) + visible_message("\The [src] refuses to siphon [M]'s vitality, their mind has great potential!") + return M.Paralyze(10) - M.adjustCloneLoss(20) + var/before_cloneloss = M.getCloneLoss() + M.adjustCloneLoss(20, TRUE, TRUE) + var/after_cloneloss = M.getCloneLoss() + if(before_cloneloss == after_cloneloss) + visible_message("\The [src] fails to siphon [M]'s spirit!") + return playsound(loc, 'sound/magic/clockwork/ratvar_attack.ogg', 40) - if(M.stat == DEAD) + if(M.stat == DEAD && length(GLOB.servant_spawns)) M.become_husk() M.death() playsound(loc, 'sound/magic/exit_blood.ogg', 60) to_chat(M, "The last of your life is drained away...") hierophant_message("[M] has had their vitality drained by the [src]!", null, "") + var/mob/cogger = new /mob/living/simple_animal/drone/cogscarab(get_turf(M)) + cogger.key = M.key + if(!cogger.grab_ghost(TRUE)) + //Replace the mob with a shell + qdel(cogger) + new /obj/effect/mob_spawn/drone/cogscarab(get_turf(M)) + add_servant_of_ratvar(cogger, silent=TRUE) return if(M.client) - M.visible_message("[src] looks weak as the color fades from their body.", "You feel your soul faltering...") + M.visible_message("[M] looks weak as the color fades from their body.", "You feel your soul faltering...") GLOB.clockcult_vitality += 30 GLOB.clockcult_vitality += 10 diff --git a/code/modules/antagonists/clock_cult/scriptures/sigil_transmission.dm b/code/modules/antagonists/clock_cult/scriptures/sigil_transmission.dm index 0ee6eb86eddd7..91b614aea96a8 100644 --- a/code/modules/antagonists/clock_cult/scriptures/sigil_transmission.dm +++ b/code/modules/antagonists/clock_cult/scriptures/sigil_transmission.dm @@ -10,7 +10,7 @@ button_icon_state = "Sigil of Transmission" power_cost = 100 invokation_time = 50 - invokation_text = list("Oh great holy one...", "...your energy...", "...the power of the holy light!") + invokation_text = list("Oh great holy one...", "your energy...", "the power of the holy light!") summoned_structure = /obj/structure/destructible/clockwork/sigil/transmission cogs_required = 0 invokers_required = 2 diff --git a/code/modules/antagonists/clock_cult/scriptures/stargazer.dm b/code/modules/antagonists/clock_cult/scriptures/stargazer.dm index c2e637908a436..49453951000cb 100644 --- a/code/modules/antagonists/clock_cult/scriptures/stargazer.dm +++ b/code/modules/antagonists/clock_cult/scriptures/stargazer.dm @@ -6,7 +6,7 @@ desc = "Allows you to enchant your weapons and armor, however enchanting can have risky side effects." tip = "Make your gear more powerful by enchanting them with stargazers." button_icon_state = "Stargazer" - power_cost = 600 + power_cost = 300 invokation_time = 80 invokation_text = list("A light of Eng'ine shall empower my armaments!") summoned_structure = /obj/structure/destructible/clockwork/gear_base/stargazer @@ -83,7 +83,7 @@ if(QDELETED(sg_light)) return var/mob_nearby = FALSE - for(var/mob/living/M in view(2, get_turf(src))) + for(var/mob/living/M in viewers(2, get_turf(src))) if(is_servant_of_ratvar(M)) mob_nearby = TRUE break diff --git a/code/modules/antagonists/clock_cult/scriptures/summon_cogscarab.dm b/code/modules/antagonists/clock_cult/scriptures/summon_cogscarab.dm index e8c5cf445fd7e..e03ca65875ef7 100644 --- a/code/modules/antagonists/clock_cult/scriptures/summon_cogscarab.dm +++ b/code/modules/antagonists/clock_cult/scriptures/summon_cogscarab.dm @@ -28,4 +28,4 @@ . = ..() /datum/clockcult/scripture/cogscarab/invoke_success() - new /obj/item/drone_shell/cogscarab(get_turf(invoker)) + new /obj/effect/mob_spawn/drone/cogscarab(get_turf(invoker)) diff --git a/code/modules/antagonists/clock_cult/scriptures/summon_marauder.dm b/code/modules/antagonists/clock_cult/scriptures/summon_marauder.dm index c221444268bbc..ef41ed2bb6136 100644 --- a/code/modules/antagonists/clock_cult/scriptures/summon_marauder.dm +++ b/code/modules/antagonists/clock_cult/scriptures/summon_marauder.dm @@ -3,13 +3,13 @@ //==================================// /datum/clockcult/scripture/marauder name = "Summon Clockwork Marauder" - desc = "Summons a Clockwork Marauder, a powerful warrior that can deflect ranged attacks. Requires 3 invokers and 80 vitality." + desc = "Summons a Clockwork Marauder, a powerful warrior that can deflect ranged attacks. Requires 3 invokers and 100 vitality." tip = "Use Clockwork Marauders as a powerful soldier to send into combat when the fighting gets rough." button_icon_state = "Clockwork Marauder" - power_cost = 8000 - vitality_cost = 80 + power_cost = 2000 + vitality_cost = 100 invokation_time = 300 - invokation_text = list("Through the fires and flames...", "...nothing outshines Eng'Ine!") + invokation_text = list("Through the fires and flames...", "nothing outshines Eng'Ine!") category = SPELLTYPE_PRESERVATION cogs_required = 6 invokers_required = 3 @@ -31,6 +31,14 @@ ..() /datum/clockcult/scripture/marauder/invoke_success() - var/mob/new_mob = new /mob/living/simple_animal/clockwork_marauder(get_turf(invoker)) + var/mob/new_mob = new /mob/living/simple_animal/hostile/clockwork_marauder(get_turf(invoker)) new_mob.key = selected.key selected = null + +/datum/clockcult/scripture/marauder/check_special_requirements(mob/user) + if(!..()) + return FALSE + if(LAZYLEN(GLOB.clockwork_marauders) >= 4) + to_chat(user, "The mechanical-soul infrastructure of Reebe is too weak to support more clockwork battle constructs!") + return FALSE + return TRUE diff --git a/code/modules/antagonists/clock_cult/scriptures/vanguard.dm b/code/modules/antagonists/clock_cult/scriptures/vanguard.dm index 6d68a8fab2dc3..116552ddb93b3 100644 --- a/code/modules/antagonists/clock_cult/scriptures/vanguard.dm +++ b/code/modules/antagonists/clock_cult/scriptures/vanguard.dm @@ -2,7 +2,7 @@ name = "Vanguard" use_time = 300 slab_overlay = "vanguard" - desc = "Provides the user with 30 seconds of stun immunity, but half of the stun absorbed will be applied at once, knocking you unconscious if you receive more than 15 seconds of stuns." + desc = "Provides the user with 30 seconds of stun immunity, however other spells cannot be invoked while it is active." tip = "Gain temporary immunity against batons and disablers." invokation_time = 10 button_icon_state = "Vanguard" @@ -28,9 +28,6 @@ . = ..() if(time_left == 50) to_chat(invoker, "You start to feel tired again.") - var/delta_stamdam = max(invoker.getStaminaLoss() - last_recorded_stam_dam, 0) - total_stamina_damage += delta_stamdam - last_recorded_stam_dam = invoker.getStaminaLoss() /datum/clockcult/scripture/slab/vanguard/end_invoke() REMOVE_TRAIT(invoker, TRAIT_STUNIMMUNE, VANGUARD_TRAIT) @@ -39,11 +36,4 @@ REMOVE_TRAIT(invoker, TRAIT_IGNOREDAMAGESLOWDOWN, VANGUARD_TRAIT) REMOVE_TRAIT(invoker, TRAIT_NOSTAMCRIT, VANGUARD_TRAIT) REMOVE_TRAIT(invoker, TRAIT_NOLIMBDISABLE, VANGUARD_TRAIT) - to_chat(invoker, "You suddenly collapse from exhaustion!") - if(!ishuman(invoker)) - invoker.Unconscious(50) - else if(total_stamina_damage > 100) - invoker.Unconscious(total_stamina_damage / 4) - else - invoker.Paralyze(total_stamina_damage / 2) ..() diff --git a/code/modules/antagonists/clock_cult/servant_of_ratvar.dm b/code/modules/antagonists/clock_cult/servant_of_ratvar.dm index a3eadd57566a9..47a748769372b 100644 --- a/code/modules/antagonists/clock_cult/servant_of_ratvar.dm +++ b/code/modules/antagonists/clock_cult/servant_of_ratvar.dm @@ -13,7 +13,7 @@ var/datum/action/innate/clockcult/transmit/transmit_spell var/datum/team/clock_cult/team - var/prefix = CLOCKCULT_RECRUIT + var/prefix = CLOCKCULT_PREFIX_RECRUIT var/counts_towards_total = TRUE//Counts towards the total number of servants. @@ -29,6 +29,10 @@ to_chat(owner.current, "Use your Clockwork Slab to summon integration cogs to unlock more scriptures and siphon power.") to_chat(owner.current, "Unlock Kindle to stun targets, Hateful Manacles to restrain them and use a sigil of submission to convert them!") to_chat(owner.current, "When you are ready, gather 6 cultists around the Ark and activate it to summon Rat'var, but be prepared to fight for your life.") + owner.current.client?.tgui_panel?.give_antagonist_popup("Servant of Rat'Var", + "Use your clockwork slab to unlock and invoke scriptures.\n\ + Hijack APCs by placing an integration cog into them.\n\ + Convert the unfaithful to your side but above all else, protect the Gateway!") /datum/antagonist/servant_of_ratvar/on_gain() . = ..() @@ -43,7 +47,6 @@ GLOB.cyborg_servants_of_ratvar |= owner check_ark_status() owner.announce_objectives() - owner.language_holder.grant_language(/datum/language/ratvar) /datum/antagonist/servant_of_ratvar/on_removal() team.remove_member(owner) @@ -58,12 +61,14 @@ owner.current.faction |= "ratvar" transmit_spell = new() transmit_spell.Grant(owner.current) - owner.current.throw_alert("clockinfo", /obj/screen/alert/clockwork/clocksense) - SSticker.mode.update_clockcult_icons_added(owner) if(GLOB.gateway_opening && ishuman(owner.current)) var/mob/living/carbon/owner_mob = owner.current forbearance = mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER) owner_mob.add_overlay(forbearance) + owner.current.throw_alert("clockinfo", /atom/movable/screen/alert/clockwork/clocksense) + SSticker.mode.update_clockcult_icons_added(owner) + var/datum/language_holder/LH = owner.current.get_language_holder() + LH.grant_language(/datum/language/ratvar, TRUE, TRUE, LANGUAGE_CULTIST) /datum/antagonist/servant_of_ratvar/remove_innate_effects(mob/living/M) owner.current.faction -= "ratvar" @@ -74,6 +79,8 @@ var/mob/living/carbon/owner_mob = owner.current owner_mob.remove_overlay(forbearance) qdel(forbearance) + var/datum/language_holder/LH = owner.current.get_language_holder() + LH.remove_language(/datum/language/ratvar, TRUE, TRUE, LANGUAGE_CULTIST) . = ..() /datum/antagonist/servant_of_ratvar/proc/equip_servant_conversion() @@ -102,18 +109,12 @@ H.put_in_hands(slab) slab.pickup(H) //Remove cuffs - if(H.handcuffed) - H.handcuffed.forceMove(get_turf(H)) - H.handcuffed = null - H.update_handcuffed() + H.uncuff() return FALSE //Grant access to the clockwork tools. //If AI, disconnect all active borgs and make it only able to control converted shells /datum/antagonist/servant_of_ratvar/proc/equip_silicon(mob/living/silicon/S) - S.laws = new /datum/ai_laws/ratvar - S.laws.associate(S) - S.show_laws() if(isAI(S)) var/mob/living/silicon/ai/AI = S AI.disconnect_shell() @@ -125,6 +126,9 @@ var/mob/living/silicon/robot/R = S R.connected_ai = null R.SetRatvar(TRUE) + S.laws = new /datum/ai_laws/ratvar //Laws down here so borgs don't instantly resync their laws + S.laws.associate(S) + S.show_laws() /datum/antagonist/servant_of_ratvar/proc/add_objectives() objectives |= team.objectives diff --git a/code/modules/antagonists/clock_cult/structure/clockwork_camera.dm b/code/modules/antagonists/clock_cult/structure/clockwork_camera.dm index ebe1b93140a74..d2e923a3e4181 100644 --- a/code/modules/antagonists/clock_cult/structure/clockwork_camera.dm +++ b/code/modules/antagonists/clock_cult/structure/clockwork_camera.dm @@ -1,4 +1,4 @@ -/mob/camera/aiEye/remote/ratvar +/mob/camera/ai_eye/remote/ratvar visible_icon = TRUE icon = 'icons/mob/cameramob.dmi' icon_state = "generic_camera" @@ -18,7 +18,7 @@ if(!isliving(owner)) return if(GLOB.gateway_opening) - to_chat(owner, "You cannot warp while the gateway is opening!") + to_chat(owner, "You cannot warp while the gateway is opening!") return if(warping) button_icon_state = "warp_down" @@ -26,24 +26,26 @@ warping = FALSE return var/mob/living/M = owner - var/mob/camera/aiEye/remote/ratvar/cam = M.remote_control + var/mob/camera/ai_eye/remote/ratvar/cam = M.remote_control var/target_loc = get_turf(cam) + var/area/AR = get_area(target_loc) if(isclosedturf(target_loc)) - to_chat(owner, "You cannot warp into dense objects.") + to_chat(owner, "You cannot warp into dense objects.") return - if(!get_area(target_loc).clockwork_warp_allowed) - to_chat(owner, "[get_area(target_loc).clockwork_warp_fail]") + if(!AR.clockwork_warp_allowed) + to_chat(owner, "[AR.clockwork_warp_fail]") return do_sparks(5, TRUE, get_turf(cam)) warping = TRUE button_icon_state = "warp_cancel" owner.update_action_buttons_icon() + var/mob/previous_mob = owner if(do_after(M, 50, target=target_loc, extra_checks=CALLBACK(src, .proc/special_check))) try_warp_servant(M, target_loc, 50, FALSE) var/obj/machinery/computer/camera_advanced/console = cam.origin console.remove_eye_control(M) button_icon_state = "warp_down" - owner.update_action_buttons_icon() + previous_mob.update_action_buttons_icon() warping = FALSE /datum/action/innate/clockcult/warp/proc/special_check() @@ -57,6 +59,7 @@ icon_state = "ratvarcomputer" clockwork = TRUE lock_override = CAMERA_LOCK_STATION + broken_overlay_emissive = TRUE var/datum/action/innate/clockcult/warp/warp_action /obj/machinery/computer/camera_advanced/ratvar/Initialize() @@ -68,10 +71,10 @@ STOP_PROCESSING(SSobj, src) . = ..() -/obj/machinery/computer/camera_advanced/ratvar/process() - if(prob(3)) +/obj/machinery/computer/camera_advanced/ratvar/process(delta_time) + if(DT_PROB(3, delta_time)) new /obj/effect/temp_visual/steam_release(get_turf(src)) - if(prob(7)) + if(DT_PROB(7, delta_time)) playsound(get_turf(src), 'sound/machines/beep.ogg', 20, TRUE) /obj/machinery/computer/camera_advanced/ratvar/can_use(mob/living/user) @@ -87,7 +90,7 @@ actions += warp_action /obj/machinery/computer/camera_advanced/ratvar/CreateEye() - eyeobj = new /mob/camera/aiEye/remote/ratvar(get_turf(SSmapping.get_station_center())) + eyeobj = new /mob/camera/ai_eye/remote/ratvar(get_turf(SSmapping.get_station_center())) eyeobj.origin = src eyeobj.visible_icon = TRUE eyeobj.icon = 'icons/mob/cameramob.dmi' diff --git a/code/modules/antagonists/clock_cult/structure/dimensional_rift.dm b/code/modules/antagonists/clock_cult/structure/dimensional_rift.dm index 0d81179d712d6..4fb3a57b8d7f3 100644 --- a/code/modules/antagonists/clock_cult/structure/dimensional_rift.dm +++ b/code/modules/antagonists/clock_cult/structure/dimensional_rift.dm @@ -29,7 +29,7 @@ if(do_after(M, 50, target=src)) var/obj/effect/landmark/city_of_cogs/target_spawn = pick(GLOB.city_of_cogs_spawns) var/turf/T = get_turf(target_spawn) - M.forceMove(T) + do_teleport(M, T, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, forced = TRUE) var/mob/living/M_mob = M if(istype(M_mob)) if(M_mob.client) @@ -43,4 +43,4 @@ //So we can push crates in too var/obj/effect/landmark/city_of_cogs/target_spawn = pick(GLOB.city_of_cogs_spawns) var/turf/T = get_turf(target_spawn) - M.forceMove(T) + do_teleport(M, T, no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE, forced = TRUE) diff --git a/code/modules/antagonists/clock_cult/structure/gear_base.dm b/code/modules/antagonists/clock_cult/structure/gear_base.dm index 179d91f922ba4..faa13a422a8d5 100644 --- a/code/modules/antagonists/clock_cult/structure/gear_base.dm +++ b/code/modules/antagonists/clock_cult/structure/gear_base.dm @@ -22,10 +22,13 @@ for(var/obj/structure/destructible/clockwork/sigil/transmission/ST in transmission_sigils) ST.linked_structures -= src -/obj/structure/destructible/clockwork/gear_base/wrench_act(mob/living/user, obj/item/I) - if(do_after(user, 40, target=src)) - anchored = !anchored - update_icon_state() +/obj/structure/destructible/clockwork/gear_base/attackby(obj/item/I, mob/user, params) + if(is_servant_of_ratvar(user) && I.tool_behaviour == TOOL_WRENCH) + to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].") + if(I.use_tool(src, user, 20, volume=50)) + to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].") + setAnchored(!anchored) + update_icon_state() return TRUE else return ..() diff --git a/code/modules/antagonists/clock_cult/traps/recievers/flipper.dm b/code/modules/antagonists/clock_cult/traps/recievers/flipper.dm index eb64cc243dc18..66215d794eb16 100644 --- a/code/modules/antagonists/clock_cult/traps/recievers/flipper.dm +++ b/code/modules/antagonists/clock_cult/traps/recievers/flipper.dm @@ -1,12 +1,12 @@ /obj/item/clockwork/trap_placer/flipper name = "flipper" - desc = "A steam powered rotating floor panel. When input is recieved it will fling anyone on top of it." + desc = "A steam powered rotating floor panel. When input is received it will fling anyone on top of it." icon_state = "pressure_sensor" result_path = /obj/structure/destructible/clockwork/trap/flipper /obj/structure/destructible/clockwork/trap/flipper name = "flipper" - desc = "A steam powered rotating floor panel. When input is recieved it will fling anyone on top of it." + desc = "A steam powered rotating floor panel. When input is received it will fling anyone on top of it." icon_state = "pressure_sensor" component_datum = /datum/component/clockwork_trap/flipper unwrench_path = /obj/item/clockwork/trap_placer/flipper diff --git a/code/modules/antagonists/clock_cult/traps/recievers/skewer.dm b/code/modules/antagonists/clock_cult/traps/recievers/skewer.dm index 250d26645a863..d44c5f539860a 100644 --- a/code/modules/antagonists/clock_cult/traps/recievers/skewer.dm +++ b/code/modules/antagonists/clock_cult/traps/recievers/skewer.dm @@ -76,4 +76,4 @@ var/obj/structure/destructible/clockwork/trap/skewer/S = parent if(!istype(S)) return - S.stab() + INVOKE_ASYNC(S, /obj/structure/destructible/clockwork/trap/skewer.proc/stab) diff --git a/code/modules/antagonists/clock_cult/traps/senders/delay.dm b/code/modules/antagonists/clock_cult/traps/senders/delay.dm index 4002d88830f2f..65562a32cf817 100644 --- a/code/modules/antagonists/clock_cult/traps/senders/delay.dm +++ b/code/modules/antagonists/clock_cult/traps/senders/delay.dm @@ -1,12 +1,12 @@ /obj/item/wallframe/clocktrap/delay name = "clockwork timer" - desc = "A small timer attatched to the wall. When input is recieved it will send an output signal half a second later." + desc = "A small timer attatched to the wall. When input is received it will send an output signal half a second later." icon_state = "delayer" result_path = /obj/structure/destructible/clockwork/trap/delay /obj/structure/destructible/clockwork/trap/delay name = "clockwork timer" - desc = "A small timer attatched to the wall. When input is recieved it will send an output signal half a second later." + desc = "A small timer attatched to the wall. When input is received it will send an output signal half a second later." icon_state = "delayer" component_datum = /datum/component/clockwork_trap/delay unwrench_path = /obj/item/wallframe/clocktrap/delay diff --git a/code/modules/antagonists/clock_cult/traps/senders/pressure_sensor.dm b/code/modules/antagonists/clock_cult/traps/senders/pressure_sensor.dm index b349ba34d5b01..e49c99a36003d 100644 --- a/code/modules/antagonists/clock_cult/traps/senders/pressure_sensor.dm +++ b/code/modules/antagonists/clock_cult/traps/senders/pressure_sensor.dm @@ -23,6 +23,8 @@ RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/crossed) /datum/component/clockwork_trap/pressure_sensor/proc/crossed(datum/source, atom/movable/AM) + SIGNAL_HANDLER + //Item's in hands or boxes shouldn't trigger it if(!istype(AM.loc, /turf)) return @@ -37,5 +39,5 @@ trigger_connected() for(var/obj/structure/destructible/clockwork/trap/T in get_turf(parent)) if(T != parent) - SEND_SIGNAL(T, COMSIG_CLOCKWORK_SIGNAL_RECIEVED) + SEND_SIGNAL(T, COMSIG_CLOCKWORK_SIGNAL_RECEIVED) playsound(get_turf(parent), 'sound/machines/click.ogg', 50) diff --git a/code/modules/antagonists/clock_cult/traps/trap.dm b/code/modules/antagonists/clock_cult/traps/trap.dm index 5500e955b5770..aee46228300d3 100644 --- a/code/modules/antagonists/clock_cult/traps/trap.dm +++ b/code/modules/antagonists/clock_cult/traps/trap.dm @@ -66,7 +66,7 @@ . = ..() outputs = list() - RegisterSignal(parent, COMSIG_CLOCKWORK_SIGNAL_RECIEVED, .proc/trigger) + RegisterSignal(parent, COMSIG_CLOCKWORK_SIGNAL_RECEIVED, .proc/trigger) RegisterSignal(parent, COMSIG_ATOM_EMINENCE_ACT, .proc/trigger) //The eminence can trigger traps too RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/clicked) RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy) @@ -78,12 +78,18 @@ output.outputs |= parent /datum/component/clockwork_trap/proc/trigger() + SIGNAL_HANDLER + return TRUE /datum/component/clockwork_trap/proc/clicked(mob/user) + SIGNAL_HANDLER + return /datum/component/clockwork_trap/proc/OnAttackBy(datum/source, obj/item/I, mob/user) + SIGNAL_HANDLER + if(is_servant_of_ratvar(user)) if(istype(I, /obj/item/clockwork/clockwork_slab)) var/obj/item/clockwork/clockwork_slab/slab = I @@ -103,4 +109,4 @@ /datum/component/clockwork_trap/proc/trigger_connected() for(var/obj/O in outputs) - SEND_SIGNAL(O, COMSIG_CLOCKWORK_SIGNAL_RECIEVED) + SEND_SIGNAL(O, COMSIG_CLOCKWORK_SIGNAL_RECEIVED) diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm index 5390758ae7624..84ab0827e1afa 100644 --- a/code/modules/antagonists/creep/creep.dm +++ b/code/modules/antagonists/creep/creep.dm @@ -22,13 +22,15 @@ C.gain_trauma(/datum/brain_trauma/special/obsessed)//ZAP /datum/antagonist/obsessed/greet() - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/creepalert.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/creepalert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) to_chat(owner, "You are the Obsessed!") to_chat(owner, "The Voices have reached out to you, and are using you to complete their evil deeds.") to_chat(owner, "You don't know their connection, but The Voices compel you to stalk [trauma.obsession], forcing them into a state of constant paranoia.") to_chat(owner, "The Voices will retaliate if you fail to complete your tasks or spend too long away from your target.") to_chat(owner, "This role does NOT enable you to otherwise surpass what's deemed creepy behavior per the rules.")//ironic if you know the history of the antag owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Obsession", + "Stalk [trauma.obsession] and force them into a constant state of paranoia.") /datum/antagonist/obsessed/Destroy() if(trauma) @@ -179,6 +181,8 @@ chosen_department = "supply" if(oldmind.assigned_role in GLOB.civilian_positions) chosen_department = "civilian" + if(oldmind.assigned_role in GLOB.gimmick_positions) + chosen_department = "civilian" for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(!H.mind) continue @@ -198,6 +202,8 @@ their_chosen_department = "supply" if(H.mind.assigned_role in GLOB.civilian_positions) their_chosen_department = "civilian" + if(H.mind.assigned_role in GLOB.gimmick_positions) + chosen_department = "civilian" if(their_chosen_department != chosen_department) continue viable_coworkers += H.mind @@ -251,8 +257,8 @@ /datum/objective/polaroid/update_explanation_text() ..() - if(target?.current) - explanation_text = "Take a photo with [target.name] while they're alive." + if(target && target.current) + explanation_text = "Take a photo of [target.name] while they're alive." else explanation_text = "Free Objective" @@ -265,7 +271,7 @@ for(var/obj/I in all_items) //Check for wanted items if(istype(I, /obj/item/photo)) var/obj/item/photo/P = I - if(P.picture.mobs_seen.Find(owner) && P.picture.mobs_seen.Find(target) && !P.picture.dead_seen.Find(target))//you are in the picture, they are but they are not dead. + if(P.picture && (target.current in P.picture.mobs_seen) && !(target.current in P.picture.dead_seen)) //Does the picture exist and is the target in it and is the target not dead return TRUE return FALSE diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 07053a0a4c6e4..2b2a4823714e4 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -35,9 +35,8 @@ /datum/action/innate/cult/blood_magic/Activate() var/rune = FALSE var/limit = RUNELESS_MAX_BLOODCHARGE - for(var/obj/effect/rune/empower/R in range(1, owner)) + if(locate(/obj/effect/rune/empower) in range(1, owner)) rune = TRUE - break if(rune) limit = MAX_BLOODCHARGE if(spells.len >= limit) @@ -141,14 +140,14 @@ name = "Stun" desc = "Empowers your hand to stun and mute a victim on contact." button_icon_state = "hand" - magic_path = "/obj/item/melee/blood_magic/stun" + magic_path = /obj/item/melee/blood_magic/stun health_cost = 10 /datum/action/innate/cult/blood_spell/teleport name = "Teleport" desc = "Empowers your hand to teleport yourself or another cultist to a teleport rune on contact." button_icon_state = "tele" - magic_path = "/obj/item/melee/blood_magic/teleport" + magic_path = /obj/item/melee/blood_magic/teleport health_cost = 7 /datum/action/innate/cult/blood_spell/emp @@ -157,12 +156,13 @@ button_icon_state = "emp" health_cost = 10 invocation = "Ta'gh fara'qha fel d'amar det!" + check_flags = AB_CHECK_CONSCIOUS /datum/action/innate/cult/blood_spell/emp/Activate() + owner.whisper(invocation, language = /datum/language/common) owner.visible_message("[owner]'s hand flashes a bright blue!", \ "You speak the cursed words, emitting an EMP blast from your hand.") empulse(owner, 2, 5) - owner.whisper(invocation, language = /datum/language/common) charges-- if(charges<=0) qdel(src) @@ -172,41 +172,42 @@ desc = "Empowers your hand to start handcuffing victim on contact, and mute them if successful." button_icon_state = "cuff" charges = 4 - magic_path = "/obj/item/melee/blood_magic/shackles" + magic_path = /obj/item/melee/blood_magic/shackles /datum/action/innate/cult/blood_spell/construction name = "Twisted Construction" desc = "Empowers your hand to corrupt certain metalic objects.
Converts:
Plasteel into runed metal
50 iron into a construct shell
Living cyborgs into constructs after a delay
Cyborg shells into construct shells
Airlocks into brittle runed airlocks after a delay (harm intent)" button_icon_state = "transmute" - magic_path = "/obj/item/melee/blood_magic/construction" + magic_path = /obj/item/melee/blood_magic/construction health_cost = 12 /datum/action/innate/cult/blood_spell/equipment - name = "Summon Equipment" - desc = "Allows you to summon a ritual dagger, or empowers your hand to summon combat gear onto a cultist you touch, including cult armor, a cult bola, and a cult sword." + name = "Summon Combat Equipment" + desc = "Empowers your hand to summon combat gear onto a cultist you touch, including cult armor, a cult bola, and a cult sword. Not recommended for use before the blood cult's presence has been revealed." button_icon_state = "equip" - magic_path = "/obj/item/melee/blood_magic/armor" - -/datum/action/innate/cult/blood_spell/equipment/Activate() - var/choice = alert(owner,"Choose your equipment type",,"Combat Equipment","Ritual Dagger","Cancel") - if(choice == "Ritual Dagger") - var/turf/T = get_turf(owner) - owner.visible_message("[owner]'s hand glows red for a moment.", \ - "Red light begins to shimmer and take form within your hand!") - var/obj/O = new /obj/item/melee/cultblade/dagger(T) - if(owner.put_in_hands(O)) - to_chat(owner, "A ritual dagger appears in your hand!") - else - owner.visible_message("A ritual dagger appears at [owner]'s feet!", \ - "A ritual dagger materializes at your feet.") - SEND_SOUND(owner, sound('sound/effects/magic.ogg',0,1,25)) - charges-- - desc = base_desc - desc += "
Has [charges] use\s remaining." - if(charges<=0) - qdel(src) - else if(choice == "Combat Equipment") - ..() + magic_path = /obj/item/melee/blood_magic/armor + +/datum/action/innate/cult/blood_spell/dagger + name = "Summon Ritual Dagger" + desc = "Allows you to summon a ritual dagger, in case you've lost the dagger that was given to you." + invocation = "Wur d'dai leev'mai k'sagan!" //where did I leave my keys, again? + button_icon_state = "equip" //this is the same icon that summon equipment uses, but eh, I'm not a spriter + +/datum/action/innate/cult/blood_spell/dagger/Activate() + var/turf/owner_turf = get_turf(owner) + owner.whisper(invocation, language = /datum/language/common) + owner.visible_message("[owner]'s hand glows red for a moment.", \ + "Your plea for aid is answered, and light begins to shimmer and take form within your hand!") + var/obj/item/melee/cultblade/dagger/summoned_blade = new (owner_turf) + if(owner.put_in_hands(summoned_blade)) + to_chat(owner, "A ritual dagger appears in your hand!") + else + owner.visible_message("A ritual dagger appears at [owner]'s feet!", \ + "A ritual dagger materializes at your feet.") + SEND_SOUND(owner, sound('sound/effects/magic.ogg', FALSE, 0, 25)) + charges-- + if(charges <= 0) + qdel(src) /datum/action/innate/cult/blood_spell/horror name = "Hallucinations" @@ -214,6 +215,7 @@ button_icon_state = "horror" var/obj/effect/proc_holder/horror/PH charges = 4 + check_flags = AB_CHECK_CONSCIOUS /datum/action/innate/cult/blood_spell/horror/New() PH = new() @@ -256,7 +258,7 @@ var/turf/T = get_turf(ranged_ability_user) if(!isturf(T)) return FALSE - if(target in view(7, get_turf(ranged_ability_user))) + if(ranged_ability_user in viewers(7, get_turf(target))) if(!ishuman(target) || iscultist(target)) return var/mob/living/carbon/human/H = target @@ -281,6 +283,7 @@ button_icon_state = "gone" charges = 10 var/revealing = FALSE //if it reveals or not + check_flags = AB_CHECK_CONSCIOUS /datum/action/innate/cult/blood_spell/veiling/Activate() if(!revealing) @@ -289,14 +292,14 @@ charges-- SEND_SOUND(owner, sound('sound/magic/smoke.ogg',0,1,25)) owner.whisper(invocation, language = /datum/language/common) - for(var/obj/effect/rune/R in range(5,owner)) + for(var/obj/effect/rune/R in range(5, owner)) R.conceal() - for(var/obj/structure/destructible/cult/S in range(5,owner)) + for(var/obj/structure/destructible/cult/S in range(5, owner)) S.conceal() - for(var/turf/open/floor/engine/cult/T in range(5,owner)) - T.realappearance.alpha = 0 for(var/obj/machinery/door/airlock/cult/AL in range(5, owner)) AL.conceal() + for(var/turf/open/floor/engine/cult/T in RANGE_TURFS(5,owner)) + T.realappearance.alpha = 0 revealing = TRUE name = "Reveal Runes" button_icon_state = "back" @@ -310,10 +313,10 @@ R.reveal() for(var/obj/structure/destructible/cult/S in range(6,owner)) S.reveal() - for(var/turf/open/floor/engine/cult/T in range(6,owner)) - T.realappearance.alpha = initial(T.realappearance.alpha) for(var/obj/machinery/door/airlock/cult/AL in range(6, owner)) AL.reveal() + for(var/turf/open/floor/engine/cult/T in RANGE_TURFS(6,owner)) + T.realappearance.alpha = initial(T.realappearance.alpha) revealing = FALSE name = "Conceal Runes" button_icon_state = "gone" @@ -329,7 +332,7 @@ invocation = "Fel'th Dol Ab'orod!" button_icon_state = "manip" charges = 5 - magic_path = "/obj/item/melee/blood_magic/manipulator" + magic_path = /obj/item/melee/blood_magic/manipulator // The "magic hand" items @@ -430,7 +433,7 @@ if(istype(anti_magic_source, /obj/item)) target.visible_message("[L] is utterly unphased by your utterance!", \ "[GLOB.deity] protects you from the heresy of [user]!") - else if(!HAS_TRAIT(target, TRAIT_MINDSHIELD) && !istype(L.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) + else if(!HAS_TRAIT(target, TRAIT_MINDSHIELD) && !istype(L.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat)) to_chat(user, "[L] falls to the ground, gibbering madly!") L.Paralyze(160) L.flash_act(1,1) @@ -555,12 +558,12 @@ /obj/item/melee/blood_magic/construction/examine(mob/user) . = ..() - . += {"A sinister spell used to convert:\n - Plasteel into runed metal\n - [IRON_TO_CONSTRUCT_SHELL_CONVERSION] metal into a construct shell\n - Living cyborgs into constructs after a delay\n - Cyborg shells into construct shells\n - Airlocks into brittle runed airlocks after a delay (harm intent)"} + . += "A sinister spell used to convert:\n"+\ + "Plasteel into runed metal\n"+\ + "[IRON_TO_CONSTRUCT_SHELL_CONVERSION] metal into a construct shell\n"+\ + "Living cyborgs into constructs after a delay\n"+\ + "Cyborg shells into construct shells\n"+\ + "Airlocks into brittle runed airlocks after a delay (harm intent)" /obj/item/melee/blood_magic/construction/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if(proximity_flag && iscultist(user)) @@ -644,22 +647,22 @@ return ..() -//Armor: Gives the target a basic cultist combat loadout +//Armor: Gives the target (cultist) a basic cultist combat loadout /obj/item/melee/blood_magic/armor name = "Arming Aura" - desc = "Will equipt cult combat gear onto a cultist on contact." + desc = "On contact, equips a cultist with combat gear." color = "#33cc33" // green /obj/item/melee/blood_magic/armor/afterattack(atom/target, mob/living/carbon/user, proximity) - if(iscarbon(target) && proximity) + if(iscarbon(target) && iscultist(target) && proximity) uses-- var/mob/living/carbon/C = target C.visible_message("Otherworldly armor suddenly appears on [C]!") - C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black,SLOT_W_UNIFORM) - C.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), SLOT_HEAD) - C.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), SLOT_WEAR_SUIT) - C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), SLOT_SHOES) - C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), SLOT_BACK) + C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black,ITEM_SLOT_ICLOTHING) + C.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), ITEM_SLOT_OCLOTHING) + C.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), ITEM_SLOT_HEAD) + C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), ITEM_SLOT_FEET) + C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), ITEM_SLOT_BACK) if(C == user) qdel(src) //Clears the hands C.put_in_hands(new /obj/item/melee/cultblade(user)) @@ -762,7 +765,7 @@ var/temp = 0 var/turf/T = get_turf(target) if(T) - for(var/obj/effect/decal/cleanable/blood/B in view(T, 2)) + for(var/obj/effect/decal/cleanable/blood/B in view(2, T)) if(B.blood_state == BLOOD_STATE_HUMAN) if(B.bloodiness == 100) //Bonus for "pristine" bloodpools, also to prevent cheese with footprint spam temp += 30 @@ -770,7 +773,7 @@ temp += max((B.bloodiness**2)/800,1) new /obj/effect/temp_visual/cult/turf/floor(get_turf(B)) qdel(B) - for(var/obj/effect/decal/cleanable/trail_holder/TH in view(T, 2)) + for(var/obj/effect/decal/cleanable/trail_holder/TH in view(2, T)) qdel(TH) var/obj/item/clothing/shoes/shoecheck = user.shoes if(shoecheck && shoecheck.bloody_shoes[/datum/reagent/blood]) @@ -786,7 +789,7 @@ /obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user) if(iscultist(user)) var/list/options = list("Blood Spear (150)", "Blood Bolt Barrage (300)", "Blood Beam (500)") - var/choice = input(user, "Choose a greater blood rite...", "Greater Blood Rites") as null|anything in options + var/choice = input(user, "Choose a greater blood rite.", "Greater Blood Rites") as null|anything in options if(!choice) to_chat(user, "You decide against conducting a greater blood rite.") return @@ -799,7 +802,7 @@ var/turf/T = get_turf(user) qdel(src) var/datum/action/innate/cult/spear/S = new(user) - var/obj/item/twohanded/cult_spear/rite = new(T) + var/obj/item/cult_spear/rite = new(T) S.Grant(user, rite) rite.spear_act = S if(user.put_in_hands(rite)) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 0a209dbb1fcde..0d119c555ed01 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -48,8 +48,10 @@ /datum/antagonist/cult/greet() to_chat(owner, "You are a member of the cult!") - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/bloodcult.ogg', 100, FALSE, pressure_affected = FALSE)//subject to change + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/bloodcult.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)//subject to change owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Blood Cult", + "Use your ritual dagger to draw runes with your blood and expand your cult until you have enough influence to summon the great Nar'Sie!") /datum/antagonist/cult/on_gain() . = ..() @@ -80,9 +82,9 @@ /datum/antagonist/cult/proc/cult_give_item(obj/item/item_path, mob/living/carbon/human/mob) var/list/slots = list( - "backpack" = SLOT_IN_BACKPACK, - "left pocket" = SLOT_L_STORE, - "right pocket" = SLOT_R_STORE + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET ) var/T = new item_path(mob) @@ -109,7 +111,7 @@ communion.Grant(current) if(ishuman(current)) magic.Grant(current) - current.throw_alert("bloodsense", /obj/screen/alert/bloodsense) + current.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense) if(cult_team.cult_risen) cult_team.rise(current) if(cult_team.cult_ascendent) @@ -327,7 +329,7 @@ for(var/datum/mind/M in C.members) if(M.current) M.current.clear_alert("bloodsense") - M.current.throw_alert("bloodsense", /obj/screen/alert/bloodsense) + M.current.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense) /datum/team/cult/proc/setup_objectives() var/datum/objective/sacrifice/sac_objective = new @@ -340,6 +342,7 @@ objectives += summon_objective for(var/datum/mind/M in members) + M.objectives |= objectives log_objective(M, sac_objective.explanation_text) log_objective(M, summon_objective.explanation_text) @@ -355,6 +358,9 @@ return FALSE /datum/objective/sacrifice/check_completion() + //Target's a clockie + if(target?.has_antag_datum(/datum/antagonist/servant_of_ratvar)) + return TRUE return sacced || completed /datum/objective/sacrifice/update_explanation_text() @@ -371,9 +377,9 @@ ..() var/sanity = 0 while(summon_spots.len < SUMMON_POSSIBILITIES && sanity < 100) - var/area/summon = pick(GLOB.sortedAreas - summon_spots) - if(summon && is_station_level(summon.z) && summon.valid_territory) - summon_spots += summon + var/area/summon_area = pick(GLOB.sortedAreas - summon_spots) + if(summon_area && is_station_level(summon_area.z) && (summon_area.area_flags & VALID_TERRITORY)) + summon_spots += summon_area sanity++ update_explanation_text() diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index d84c14d35bf65..b127b76128956 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -15,6 +15,7 @@ name = "Communion" desc = "Whispered words that all cultists can hear.
Warning:Nearby non-cultists can still hear you." button_icon_state = "cult_comms" + check_flags = AB_CHECK_CONSCIOUS /datum/action/innate/cult/comm/Activate() var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "") @@ -134,7 +135,7 @@ for(var/datum/mind/B in team.members) if(B.current) for(var/datum/action/innate/cult/mastervote/vote in B.current.actions) - vote.Remove(B.current) + qdel(vote) if(!B.current.incapacitated()) to_chat(B.current,"[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!") return TRUE @@ -148,6 +149,7 @@ name = "Final Reckoning" desc = "A single-use spell that brings the entire cult to the master's location." button_icon_state = "sintouch" + check_flags = AB_CHECK_CONSCIOUS /datum/action/innate/cult/master/finalreck/Activate() var/datum/antagonist/cult/antag = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE) @@ -156,7 +158,7 @@ for(var/i in 1 to 4) chant(i) var/list/destinations = list() - for(var/turf/T in orange(1, owner)) + for(var/turf/T as() in (RANGE_TURFS(1, owner) - get_turf(owner))) if(!is_blocked_turf(T, TRUE)) destinations += T if(!LAZYLEN(destinations)) @@ -264,7 +266,7 @@ var/datum/antagonist/cult/C = caller.mind.has_antag_datum(/datum/antagonist/cult,TRUE) - if(target in view(7, get_turf(ranged_ability_user))) + if(ranged_ability_user in viewers(7, get_turf(target))) if(C.cult_team.blood_target) to_chat(ranged_ability_user, "The cult has already designated a target!") return FALSE @@ -436,7 +438,7 @@ var/turf/T = get_turf(ranged_ability_user) if(!isturf(T)) return FALSE - if(target in view(7, get_turf(ranged_ability_user))) + if(ranged_ability_user in viewers(7, get_turf(target))) if((!(iscultist(target) || istype(target, /obj/structure/destructible/cult)) || target == caller) && !(attached_action.throwing)) return if(!attached_action.throwing) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 3fad9d94210c2..caa6afb697f6f 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -78,7 +78,7 @@ if(!iscultist(user)) to_chat(user, "\"I wouldn't advise that.\"") -/obj/item/twohanded/required/cult_bastard +/obj/item/cult_bastard name = "bloody bastard sword" desc = "An enormous sword used by Nar'Sien cultists to rapidly harvest the souls of non-believers." w_class = WEIGHT_CLASS_HUGE @@ -110,31 +110,37 @@ var/spin_cooldown = 250 var/dash_toggled = TRUE -/obj/item/twohanded/required/cult_bastard/Initialize() +/obj/item/cult_bastard/Initialize() . = ..() set_light(4) jaunt = new(src) linked_action = new(src) AddComponent(/datum/component/butchering, 50, 80) + AddComponent(/datum/component/two_handed, require_twohands=TRUE) -/obj/item/twohanded/required/cult_bastard/examine(mob/user) +/obj/item/cult_bastard/Destroy() + QDEL_NULL(jaunt) + QDEL_NULL(linked_action) + return ..() + +/obj/item/cult_bastard/examine(mob/user) . = ..() if(contents.len) . += "There are [contents.len] souls trapped within the sword's core." else . += "The sword appears to be quite lifeless." -/obj/item/twohanded/required/cult_bastard/can_be_pulled(user) +/obj/item/cult_bastard/can_be_pulled(user) return FALSE -/obj/item/twohanded/required/cult_bastard/attack_self(mob/user) +/obj/item/cult_bastard/attack_self(mob/user) dash_toggled = !dash_toggled if(dash_toggled) to_chat(loc, "You raise [src] and prepare to jaunt with it.") else to_chat(loc, "You lower [src] and prepare to swing it normally.") -/obj/item/twohanded/required/cult_bastard/pickup(mob/living/user) +/obj/item/cult_bastard/pickup(mob/living/user) . = ..() if(!iscultist(user)) to_chat(user, "\"I wouldn't advise that.\"") @@ -145,13 +151,20 @@ linked_action.Grant(user, src) user.update_icons() -/obj/item/twohanded/required/cult_bastard/dropped(mob/user) +/obj/item/cult_bastard/dropped(mob/user) . = ..() linked_action.Remove(user) jaunt.Remove(user) user.update_icons() -/obj/item/twohanded/required/cult_bastard/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) +/obj/item/cult_bastard/IsReflect() + if(spinning) + playsound(src, pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, TRUE) + return TRUE + else + ..() + +/obj/item/cult_bastard/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(prob(final_block_chance)) if(attack_type == PROJECTILE_ATTACK) owner.visible_message("[owner] deflects [attack_text] with [src]!") @@ -163,7 +176,7 @@ return TRUE return FALSE -/obj/item/twohanded/required/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters) +/obj/item/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters) . = ..() if(dash_toggled && !proximity) jaunt.Teleport(user, target) @@ -194,7 +207,7 @@ phaseout = /obj/effect/temp_visual/dir_setting/cult/phase/out /datum/action/innate/dash/cult/IsAvailable() - if(iscultist(holder) && current_charges) + if(iscultist(owner) && current_charges) return TRUE else return FALSE @@ -208,7 +221,7 @@ button_icon_state = "sintouch" var/cooldown = 0 var/mob/living/carbon/human/holder - var/obj/item/twohanded/required/cult_bastard/sword + var/obj/item/cult_bastard/sword /datum/action/innate/cult/spin2win/Grant(mob/user, obj/bastard) . = ..() @@ -258,7 +271,7 @@ desc = "A torn, dust-caked hood. Strange letters line the inside." flags_inv = HIDEFACE|HIDEHAIR|HIDEEARS flags_cover = HEADCOVERSEYES - armor = list("melee" = 30, "bullet" = 30, "laser" = 20,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10) + armor = list("melee" = 30, "bullet" = 30, "laser" = 20,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10, "stamina" = 40) cold_protection = HEAD min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT heat_protection = HEAD @@ -271,7 +284,7 @@ item_state = "cultrobes" body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/tome, /obj/item/melee/cultblade) - armor = list("melee" = 30, "bullet" = 30, "laser" = 20,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10) + armor = list("melee" = 30, "bullet" = 30, "laser" = 20,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10, "stamina" = 40) flags_inv = HIDEJUMPSUIT cold_protection = CHEST|GROIN|LEGS|ARMS min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT @@ -312,7 +325,7 @@ item_state = "magus" desc = "A helm worn by the followers of Nar'Sie." flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES - armor = list("melee" = 50, "bullet" = 30, "laser" = 50,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10) + armor = list("melee" = 50, "bullet" = 30, "laser" = 50,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10, "stamina" = 50) flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH /obj/item/clothing/suit/magusred @@ -322,26 +335,27 @@ item_state = "magusred" body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/tome, /obj/item/melee/cultblade) - armor = list("melee" = 50, "bullet" = 30, "laser" = 50,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10) + armor = list("melee" = 50, "bullet" = 30, "laser" = 50,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10, "stamina" = 50) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/head/helmet/space/hardsuit/cult name = "\improper Nar'Sien hardened helmet" - desc = "A heavily-armored helmet worn by warriors of the Nar'Sien cult. It can withstand hard vacuum." + desc = "A heavily-armored helmet worn by warriors of the Nar'Sien cult. It is reinforced by hard vacuum." icon_state = "cult_helmet" item_state = "cult_helmet" - armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75) + armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75, "stamina" = 50) brightness_on = 0 actions_types = list() + high_pressure_multiplier = 0.5 /obj/item/clothing/suit/space/hardsuit/cult name = "\improper Nar'Sien hardened armor" icon_state = "cult_armor" item_state = "cult_armor" - desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult. It can withstand hard vacuum." + desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult." w_class = WEIGHT_CLASS_BULKY allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals/) - armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75) + armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75, "stamina" = 50) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult /obj/item/sharpener/cult @@ -362,7 +376,7 @@ icon_state = "cult_armor" item_state = "cult_armor" w_class = WEIGHT_CLASS_BULKY - armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 30, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60) + armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 30, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60, "stamina" = 40) body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/tome, /obj/item/melee/cultblade) var/current_charges = 3 @@ -372,7 +386,7 @@ name = "empowered cultist helmet" desc = "Empowered helmet which creates a powerful shield around the user." icon_state = "cult_hoodalt" - armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 30, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60) + armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 30, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60, "stamina" = 40) body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS @@ -409,7 +423,7 @@ flags_inv = HIDEJUMPSUIT allowed = list(/obj/item/tome, /obj/item/melee/cultblade) body_parts_covered = CHEST|GROIN|LEGS|ARMS - armor = list("melee" = -45, "bullet" = -45, "laser" = -45,"energy" = -45, "bomb" = -45, "bio" = -45, "rad" = -45, "fire" = 0, "acid" = 0) + armor = list("melee" = -45, "bullet" = -45, "laser" = -45,"energy" = -45, "bomb" = -45, "bio" = -45, "rad" = -45, "fire" = 0, "acid" = 0, "stamina" = 40) slowdown = -0.6 hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood @@ -418,7 +432,7 @@ desc = "Blood-soaked hood infused with dark magic." icon_state = "culthood" flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0) /obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot) ..() @@ -435,6 +449,7 @@ icon_state = "blindfold" item_state = "blindfold" flash_protect = 1 + vision_correction = 1 /obj/item/clothing/glasses/hud/health/night/cultblind/equipped(mob/living/user, slot) ..() @@ -540,7 +555,7 @@ var/mob/living/carbon/C = user var/turf/mobloc = get_turf(C) - var/turf/destination = get_teleport_loc(mobloc,C,9,1,3,1,0,1) + var/turf/destination = get_teleport_loc(mobloc,C,9,1,0,3,1,0,1) if(destination) uses-- @@ -616,7 +631,7 @@ to_chat(user, "\The [src] can only transport items!") -/obj/item/twohanded/cult_spear +/obj/item/cult_spear name = "blood halberd" desc = "A sickening spear composed entirely of crystallized blood." icon_state = "bloodspear0" @@ -624,7 +639,6 @@ righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' slot_flags = 0 force = 17 - force_wielded = 24 throwforce = 40 throw_speed = 2 armour_penetration = 30 @@ -634,19 +648,24 @@ hitsound = 'sound/weapons/bladeslice.ogg' var/datum/action/innate/cult/spear/spear_act -/obj/item/twohanded/cult_spear/Initialize() +/obj/item/cult_spear/Initialize() + . = ..() + +/obj/item/cult_spear/ComponentInitialize() . = ..() AddComponent(/datum/component/butchering, 100, 90) + AddComponent(/datum/component/two_handed, force_unwielded=17, force_wielded=24, icon_wielded="bloodspear1") + +/obj/item/cult_spear/update_icon() + icon_state = "bloodspear0" + ..() -/obj/item/twohanded/cult_spear/Destroy() +/obj/item/cult_spear/Destroy() if(spear_act) qdel(spear_act) ..() -/obj/item/twohanded/cult_spear/update_icon() - icon_state = "bloodspear[wielded]" - -/obj/item/twohanded/cult_spear/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) +/obj/item/cult_spear/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) var/turf/T = get_turf(hit_atom) if(isliving(hit_atom)) var/mob/living/L = hit_atom @@ -663,7 +682,7 @@ else ..() -/obj/item/twohanded/cult_spear/proc/break_spear(turf/T) +/obj/item/cult_spear/proc/break_spear(turf/T) if(src) if(!T) T = get_turf(src) @@ -674,8 +693,8 @@ playsound(T, 'sound/effects/glassbr3.ogg', 100) qdel(src) -/obj/item/twohanded/cult_spear/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - if(wielded) +/obj/item/cult_spear/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(ISWIELDED(src)) final_block_chance *= 2 if(prob(final_block_chance)) if(attack_type == PROJECTILE_ATTACK) @@ -693,7 +712,7 @@ desc = "Call the blood spear back to your hand!" background_icon_state = "bg_demon" button_icon_state = "bloodspear" - var/obj/item/twohanded/cult_spear/spear + var/obj/item/cult_spear/spear var/cooldown = 0 /datum/action/innate/cult/spear/Grant(mob/user, obj/blood_spear) @@ -779,14 +798,13 @@ . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) - /obj/item/blood_beam/afterattack(atom/A, mob/living/user, flag, params) . = ..() if(firing || charging) return var/C = user.client if(ishuman(user) && C) - angle = mouse_angle_from_client(C) + angle = Get_Angle(get_turf(src), get_turf(A)) else qdel(src) return @@ -885,6 +903,7 @@ throw_range = 4 max_integrity = 50 w_class = WEIGHT_CLASS_BULKY + block_flags = BLOCKING_PROJECTILE attack_verb = list("bumped", "prodded") hitsound = 'sound/weapons/smash.ogg' var/illusions = 4 diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 48be84d4689a1..3c24dbe55b75c 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -154,33 +154,38 @@ var/corrupt_delay = 50 var/last_corrupt = 0 -/obj/structure/destructible/cult/pylon/New() - START_PROCESSING(SSfastprocess, src) +/obj/structure/destructible/cult/pylon/Initialize() ..() + return INITIALIZE_HINT_LATELOAD + +/obj/structure/destructible/cult/pylon/LateInitialize() + . = ..() + START_PROCESSING(SSfastprocess, src) /obj/structure/destructible/cult/pylon/Destroy() STOP_PROCESSING(SSfastprocess, src) return ..() -/obj/structure/destructible/cult/pylon/process() +/obj/structure/destructible/cult/pylon/process(delta_time) if(!anchored) return if(last_heal <= world.time) last_heal = world.time + heal_delay for(var/mob/living/L in range(5, src)) - if(iscultist(L) || isshade(L) || isconstruct(L)) - if(L.health != L.maxHealth) - new /obj/effect/temp_visual/heal(get_turf(src), "#960000") - if(ishuman(L)) - L.adjustBruteLoss(-1, 0) - L.adjustFireLoss(-1, 0) - L.updatehealth() - if(isshade(L) || isconstruct(L)) - var/mob/living/simple_animal/M = L - if(M.health < M.maxHealth) - M.adjustHealth(-3) - if(ishuman(L) && L.blood_volume < BLOOD_VOLUME_NORMAL) + if(L.health == L.maxHealth) + continue + if(!iscultist(L) && !isshade(L) && !isconstruct(L)) + continue + new /obj/effect/temp_visual/heal(get_turf(src), "#960000") + if(ishuman(L)) + L.adjustBruteLoss(-5*delta_time, 0) + L.adjustFireLoss(-5*delta_time, 0) + L.updatehealth() + if(L.blood_volume < BLOOD_VOLUME_NORMAL) L.blood_volume += 1.0 + else if(isshade(L) || isconstruct(L)) + var/mob/living/simple_animal/M = L + M.adjustHealth(-15*delta_time) CHECK_TICK if(last_corrupt <= world.time) var/list/validturfs = list() @@ -254,6 +259,9 @@ new N(get_turf(src)) to_chat(user, "You summon the [choice] from the archives!") +/obj/structure/destructible/cult/tome/library //library archive + debris = null + /obj/effect/gateway name = "gateway" desc = "You're pretty sure that abyss is staring back." diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm index 283d600d59171..1ea630c1ac77f 100644 --- a/code/modules/antagonists/cult/ritual.dm +++ b/code/modules/antagonists/cult/ritual.dm @@ -17,10 +17,10 @@ This file contains the cult dagger and rune list code /obj/item/melee/cultblade/dagger/examine(mob/user) . = ..() if(iscultist(user) || isobserver(user)) - . += {"The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar'Sie.\n - Striking a cult structure will unanchor or reanchor it.\n - Striking another cultist with it will purge holy water from them.\n - Striking a noncultist, however, will tear their flesh."} + . += "The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar'Sie.\n"+\ + "Striking a cult structure will unanchor or reanchor it.\n"+\ + "Striking another cultist with it will purge holy water from them.\n"+\ + "Striking a noncultist, however, will tear their flesh." /obj/item/melee/cultblade/dagger/attack(mob/living/M, mob/living/user) if(iscultist(M)) @@ -68,7 +68,7 @@ This file contains the cult dagger and rune list code A = get_area(src) if(!src || QDELETED(src) || !Adjacent(user) || user.incapacitated() || !check_rune_turf(Turf, user)) return - if(ispath(rune_to_scribe, /obj/effect/rune/summon) && (!is_station_level(Turf.z) || A.map_name == "Space")) + if(ispath(rune_to_scribe, /obj/effect/rune/summon) && (!is_station_level(Turf.z) || initial(A.name) == "Space")) to_chat(user, "The veil is not weak enough here to summon a cultist, you must be on station!") return if(ispath(rune_to_scribe, /obj/effect/rune/apocalypse)) @@ -107,7 +107,7 @@ This file contains the cult dagger and rune list code if(!(A in summon_objective.summon_spots)) // Check again to make sure they didn't move to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!") return - priority_announce("Figments from an eldritch god are being summoned by [user] into [A.map_name] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", 'sound/ai/spanomalies.ogg') + priority_announce("Figments from an eldritch god are being summoned by [user] into [initial(A.name)] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", ANNOUNCER_SPANOMALIES) for(var/B in spiral_range_turfs(1, user, 1)) var/obj/structure/emergency_shield/sanguine/N = new(B) shields += N @@ -145,7 +145,7 @@ This file contains the cult dagger and rune list code to_chat(user, "There is already a rune here.") return FALSE var/area/A = get_area(T) - if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !A.blob_allowed)) + if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !(A.area_flags & BLOBS_ALLOWED))) to_chat(user, "The veil is not weak enough here.") return FALSE return TRUE diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 49f55dee6a222..c4c71630dc796 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -49,9 +49,9 @@ Runes can either be invoked by one's self or with many different cultists. Each /obj/effect/rune/examine(mob/user) . = ..() if(iscultist(user) || user.stat == DEAD) //If they're a cultist or a ghost, tell them the effects - . += {"Name: [cultist_name]\n - Effects: [capitalize(cultist_desc)]\n - Required Acolytes: [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]"} + . += "Name: [cultist_name]\n"+\ + "Effects: [capitalize(cultist_desc)]\n"+\ + "Required Acolytes: [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]" if(req_keyword && keyword) . += "Keyword: [keyword]" @@ -85,6 +85,8 @@ Runes can either be invoked by one's self or with many different cultists. Each if(istype(M, /mob/living/simple_animal/hostile/construct/wraith/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/armored/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/builder/angelic)) to_chat(M, "You purge the rune!") qdel(src) + else if(construct_invoke || !iscultist(M)) //if you're not a cult construct we want the normal fail message + attack_hand(M) else to_chat(M, "You are unable to invoke the rune!") @@ -114,11 +116,10 @@ structure_check() searches for nearby cultist structures required for the invoca if(user) invokers += user if(req_cultists > 1 || istype(src, /obj/effect/rune/convert)) - var/list/things_in_range = range(1, src) - var/obj/item/toy/plush/narplush/plushsie = locate() in things_in_range - if(istype(plushsie) && plushsie.is_invoker) + var/obj/item/toy/plush/narplush/plushsie = locate() in range(1, src) + if(plushsie?.is_invoker) invokers += plushsie - for(var/mob/living/L in things_in_range) + for(var/mob/living/L in viewers(1, src)) if(iscultist(L)) if(L == user) continue @@ -232,7 +233,7 @@ structure_check() searches for nearby cultist structures required for the invoca to_chat(M, "You need at least two invokers to convert [convertee]!") log_game("Offer rune failed - tried conversion with one invoker") return 0 - if(convertee.anti_magic_check(TRUE, TRUE, major = FALSE) || istype(convertee.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) //Not major because it can be spammed + if(convertee.anti_magic_check(TRUE, TRUE, major = FALSE) || istype(convertee.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat)) //Not major because it can be spammed for(var/M in invokers) to_chat(M, "Something is shielding [convertee]'s mind!") log_game("Offer rune failed - convertee had anti-magic") @@ -416,7 +417,7 @@ structure_check() searches for nearby cultist structures required for the invoca actual_selected_rune.handle_portal("lava") else var/area/A = get_area(T) - if(A.map_name == "Space") + if(initial(A.name) == "Space") actual_selected_rune.handle_portal("space", T) if(movesuccess) target.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You hear a boom.") @@ -498,7 +499,15 @@ structure_check() searches for nearby cultist structures required for the invoca sleep(40) if(src) color = RUNE_COLOR_RED - new /obj/singularity/narsie/large/cult(T) //Causes Nar'Sie to spawn even if the rune has been removed + if(GLOB.celestial_gateway) + SEND_SOUND(world, 'sound/magic/clockwork/narsie_attack.ogg') + to_chat(world, "The dimensional veil is held shut by a powerful electric field.") + GLOB.narsie_breaching = TRUE + GLOB.narsie_arrival = T + var/obj/structure/destructible/clockwork/massive/celestial_gateway/gateway = GLOB.celestial_gateway + gateway.open_gateway() + else + new /obj/singularity/narsie/large/cult(T) //Causes Nar'Sie to spawn even if the rune has been removed /obj/effect/rune/narsie/attackby(obj/I, mob/user, params) //Since the narsie rune takes a long time to make, add logging to removal. if((istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user))) @@ -572,7 +581,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/mob/dead/observer/C = pick(candidates) to_chat(mob_to_revive.mind, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form.") message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(mob_to_revive)]) to replace an AFK player.") - mob_to_revive.ghostize(0) + mob_to_revive.ghostize(FALSE) mob_to_revive.key = C.key else fail_invoke() @@ -600,7 +609,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/raise_dead/fail_invoke() ..() rune_in_use = FALSE - for(var/mob/living/M in range(1,src)) + for(var/mob/living/M in hearers(1,src)) if(iscultist(M) && M.stat == DEAD) M.visible_message("[M] twitches.") @@ -629,7 +638,7 @@ structure_check() searches for nearby cultist structures required for the invoca GLOB.wall_runes -= src return ..() -/obj/effect/rune/wall/BlockSuperconductivity() +/obj/effect/rune/wall/BlockThermalConductivity() return density /obj/effect/rune/wall/invoke(var/list/invokers) @@ -651,7 +660,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/wall/proc/spread_density() for(var/R in GLOB.wall_runes) var/obj/effect/rune/wall/W = R - if(W.z == z && get_dist(src, W) <= 2 && !W.density && !W.recharging) + if(W.get_virtual_z_level() == get_virtual_z_level() && get_dist(src, W) <= 2 && !W.density && !W.recharging) W.density = TRUE W.update_state() W.spread_density() @@ -702,6 +711,11 @@ structure_check() searches for nearby cultist structures required for the invoca if(!(M.current in invokers) && M.current && M.current.stat != DEAD) cultists |= M.current var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of the Geometer") as null|anything in cultists + var/held_in_place = FALSE + if(iscarbon(cultist_to_summon)) + var/mob/living/carbon/C = cultist_to_summon + if(C.handcuffed && cultist_to_summon.pulledby) + held_in_place = TRUE if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_summon) @@ -714,7 +728,7 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() log_game("Summon Cultist rune failed - target died") return - if(cultist_to_summon.pulledby || cultist_to_summon.buckled) + if(held_in_place) to_chat(user, "[cultist_to_summon] is being held in place!") fail_invoke() log_game("Summon Cultist rune failed - target restrained") @@ -732,9 +746,11 @@ structure_check() searches for nearby cultist structures required for the invoca cultist_to_summon.visible_message("[cultist_to_summon] suddenly disappears in a flash of red light!", \ "Overwhelming vertigo consumes you as you are hurled through the air!") ..() - visible_message("A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!") - cultist_to_summon.forceMove(get_turf(src)) - qdel(src) + if(do_teleport(cultist_to_summon, get_turf(src), no_effects = TRUE, channel = TELEPORT_CHANNEL_CULT)) + visible_message("A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!") + qdel(src) + else + visible_message("The air displaces atop [src], however nothing appears.") //Rite of Boiling Blood: Deals extremely high amounts of damage to non-cultists nearby /obj/effect/rune/blood_boil @@ -833,7 +849,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/choice = alert(user,"You tear open a connection to the spirit realm...",,"Summon a Cult Ghost","Ascend as a Dark Spirit","Cancel") if(choice == "Summon a Cult Ghost") var/area/A = get_area(T) - if(A.map_name == "Space" || is_mining_level(T.z)) + if(initial(A.name) == "Space" || is_mining_level(T.z)) to_chat(user, "The veil is not weak enough here to manifest spirits, you must be on station!") return if(ghosts >= ghost_limit) @@ -962,14 +978,14 @@ structure_check() searches for nearby cultist structures required for the invoca var/duration = intensity*10 playsound(T, 'sound/magic/enter_blood.ogg', 100, 1) visible_message("A colossal shockwave of energy bursts from the rune, disintegrating it in the process!") - for(var/mob/living/L in range(src, 3)) + for(var/mob/living/L in viewers(3, src)) L.Paralyze(30) empulse(T, 0.42*(intensity), 1) var/list/images = list() - var/zmatch = T.z + var/zmatch = T.get_virtual_z_level() var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_SECURITY_ADVANCED] for(var/mob/living/M in GLOB.alive_mob_list) - if(M.z != zmatch) + if(M.get_virtual_z_level() != zmatch) continue if(ishuman(M)) if(!iscultist(M)) @@ -1063,7 +1079,7 @@ structure_check() searches for nearby cultist structures required for the invoca /proc/hudFix(mob/living/carbon/human/target) if(!target || !target.client) return - var/obj/O = target.get_item_by_slot(SLOT_GLASSES) + var/obj/O = target.get_item_by_slot(ITEM_SLOT_EYES) if(istype(O, /obj/item/clothing/glasses/hud/security)) var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_SECURITY_ADVANCED] AH.add_hud_to(target) diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm index 41e53d3892458..2537d36b861c1 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", H.set_species(/datum/species/human, 1) H.regenerate_icons() give_appropriate_spells() - if(istype(owner.current.loc, /obj/effect/dummy/phased_mob/slaughter/)) + if(istype(owner.current.loc, /obj/effect/dummy/phased_mob/slaughter)) owner.current.forceMove(get_turf(owner.current))//Fixes dying while jaunted leaving you permajaunted. form = BASIC_DEVIL @@ -457,10 +457,10 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", return -1 currentMob.change_mob_type( /mob/living/carbon/human, targetturf, null, 1) var/mob/living/carbon/human/H = owner.current - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/lawyer/black(H), SLOT_W_UNIFORM) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), SLOT_SHOES) - H.equip_to_slot_or_del(new /obj/item/storage/briefcase(H), SLOT_HANDS) - H.equip_to_slot_or_del(new /obj/item/pen(H), SLOT_L_STORE) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/lawyer/black(H), ITEM_SLOT_ICLOTHING) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), ITEM_SLOT_FEET) + H.equip_to_slot_or_del(new /obj/item/storage/briefcase(H), ITEM_SLOT_HANDS) + H.equip_to_slot_or_del(new /obj/item/pen(H), ITEM_SLOT_LPOCKET) if(SOULVALUE >= BLOOD_THRESHOLD) H.set_species(/datum/species/lizard, 1) H.underwear = "Nude" @@ -498,6 +498,14 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", to_chat(owner.current, GLOB.lawlorify[LAW][banish]) to_chat(owner.current, "Remember, the crew can research your weaknesses if they find out your devil name.
") .=..() + owner.current.client?.tgui_panel?.give_antagonist_popup("Devil", + "Summon contracts to purchase the souls of the crew.\n\ + You may not use violence to coerce someone into selling their soul.\n\ + You may not directly and knowingly physically harm a devil, other than yourself.\n\ + [GLOB.lawlorify[LAW][bane]]\n\ + [GLOB.lawlorify[LAW][ban]]\n\ + [GLOB.lawlorify[LAW][obligation]]\n\ + [GLOB.lawlorify[LAW][banish]]") /datum/antagonist/devil/on_gain() truename = randomDevilName() diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm index 8db13cd749c8d..72974aeebc478 100644 --- a/code/modules/antagonists/devil/imp/imp.dm +++ b/code/modules/antagonists/devil/imp/imp.dm @@ -38,6 +38,8 @@ var/playstyle_string = "You are an imp, a mischievous creature from hell. You are the lowest rank on the hellish totem pole \ Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ of intentionally harming a fellow devil." + mobchatspan = "cultmobsay" + discovery_points = 10000 /mob/living/simple_animal/imp/Initialize() ..() diff --git a/code/modules/antagonists/devil/sintouched/sintouched.dm b/code/modules/antagonists/devil/sintouched/sintouched.dm index ec7bb469eb3f0..29c3c77fd6d7f 100644 --- a/code/modules/antagonists/devil/sintouched/sintouched.dm +++ b/code/modules/antagonists/devil/sintouched/sintouched.dm @@ -45,6 +45,8 @@ /datum/antagonist/sintouched/greet() owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Sintouched", + "You have been corrupted by devilish thought, complete your objectives no matter what.") /datum/antagonist/sintouched/roundend_report() return printplayer(owner) diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index 068cf86e8be26..7213d4a3820cb 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -25,6 +25,7 @@ var/ascended = FALSE var/mob/living/oldform var/list/devil_overlays[DEVIL_TOTAL_LAYERS] + mobchatspan = "cultmobsay" /mob/living/carbon/true_devil/Initialize() create_bodyparts() //initialize bodyparts @@ -57,7 +58,7 @@ mind.announce_objectives() /mob/living/carbon/true_devil/death(gibbed) - stat = DEAD + set_stat(DEAD) ..(gibbed) drop_all_held_items() INVOKE_ASYNC(mind.has_antag_datum(/datum/antagonist/devil), /datum/antagonist/devil/proc/beginResurrectionCheck, src) @@ -102,7 +103,7 @@ return FALSE return TRUE -/mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) +/mob/living/carbon/true_devil/assess_threat(judgment_criteria, lasercolor = "", datum/callback/weaponcheck=null) return 666 /mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) @@ -129,7 +130,7 @@ var/attack_message = "[src] has been [message_verb] with [I]." if(user) user.do_attack_animation(src) - if(user in viewers(src, null)) + if(user in viewers(src)) attack_message = "[user] has [message_verb] [src] with [I]!" if(message_verb) visible_message("[attack_message]", diff --git a/code/modules/antagonists/devil/true_devil/inventory.dm b/code/modules/antagonists/devil/true_devil/inventory.dm index a5fe147cad5c6..f77fe5de277d0 100644 --- a/code/modules/antagonists/devil/true_devil/inventory.dm +++ b/code/modules/antagonists/devil/true_devil/inventory.dm @@ -1,8 +1,8 @@ -/mob/living/carbon/true_devil/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE) +/mob/living/carbon/true_devil/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, was_thrown = FALSE) if(..()) update_inv_hands() - return 1 - return 0 + return TRUE + return FALSE /mob/living/carbon/true_devil/update_inv_hands() //TODO LORDPIDEY: Figure out how to make the hands line up properly. the l/r_hand_overlay should use the down sprite when facing down, left, or right, and the up sprite when facing up. diff --git a/code/modules/antagonists/disease/disease_abilities.dm b/code/modules/antagonists/disease/disease_abilities.dm index 2f1d6209b12ac..fdb446c572db4 100644 --- a/code/modules/antagonists/disease/disease_abilities.dm +++ b/code/modules/antagonists/disease/disease_abilities.dm @@ -68,15 +68,15 @@ new /datum/disease_ability/symptom/powerful/youth var/stealth = 0 var/resistance = 0 var/stage_speed = 0 - var/transmittable = 0 + var/transmission = 0 for(var/T in symptoms) var/datum/symptom/S = T stealth += initial(S.stealth) resistance += initial(S.resistance) stage_speed += initial(S.stage_speed) - transmittable += initial(S.transmittable) + transmission += initial(S.transmission) threshold_block += "
[initial(S.threshold_desc)]" - stat_block = "Resistance: [resistance]
Stealth: [stealth]
Stage Speed: [stage_speed]
Transmissibility: [transmittable]
" + stat_block = "Resistance: [resistance]
Stealth: [stealth]
Stage Speed: [stage_speed]
Transmissibility: [transmission]
" if(symptoms.len == 1) //lazy boy's dream name = initial(S.name) if(short_desc == "") @@ -217,7 +217,7 @@ new /datum/disease_ability/symptom/powerful/youth if(L.CanSpreadAirborneDisease()) //don't spread germs if they covered their mouth var/datum/disease/advance/sentient_disease/SD = D.hosts[L] - for(var/mob/living/M in oview(4, SD.affected_mob)) + for(var/mob/living/M in ohearers(4, SD.affected_mob)) if(is_A_facing_B(SD.affected_mob, M) && disease_air_spread_walk(get_turf(SD.affected_mob), get_turf(M))) M.AirborneContractDisease(SD, TRUE) diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm index 9e5954d8b8cac..3c552a93cf5f4 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -24,6 +24,8 @@ to_chat(owner.current, "You are the [owner.special_role]!") to_chat(owner.current, "Infect members of the crew to gain adaptation points, and spread your infection further.") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Sentient Disease", + "Infect members of the crew to gain adaptation points and spread your infection further.") /datum/antagonist/disease/apply_innate_effects(mob/living/mob_override) if(!istype(owner.current, /mob/camera/disease)) diff --git a/code/modules/antagonists/disease/disease_disease.dm b/code/modules/antagonists/disease/disease_disease.dm index 2909aac4d3734..c9d976d6766a5 100644 --- a/code/modules/antagonists/disease/disease_disease.dm +++ b/code/modules/antagonists/disease/disease_disease.dm @@ -13,6 +13,7 @@ /datum/disease/advance/sentient_disease/Destroy() . = ..() + overmind = null GLOB.sentient_disease_instances -= src /datum/disease/advance/sentient_disease/remove_disease() diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 2ae63f4025c21..3bd8183db49e6 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -73,10 +73,12 @@ the new instance inside the host to be updated to the template's stats. /mob/camera/disease/Destroy() . = ..() QDEL_NULL(adaptation_menu_action) + disease_template = null for(var/V in GLOB.sentient_disease_instances) var/datum/disease/advance/sentient_disease/S = V if(S.overmind == src) S.overmind = null + browser = null /mob/camera/disease/Login() ..() @@ -84,24 +86,23 @@ the new instance inside the host to be updated to the template's stats. to_chat(src, "You have [DisplayTimeText(freemove_end - world.time)] to select your first host. Click on a human to select your host.") -/mob/camera/disease/Stat() - ..() - if(statpanel("Status")) - if(freemove) - stat("Host Selection Time: [round((freemove_end - world.time)/10)]s") - else - stat("Adaptation Points: [points]/[total_points]") - stat("Hosts: [disease_instances.len]") - var/adapt_ready = next_adaptation_time - world.time - if(adapt_ready > 0) - stat("Adaptation Ready: [round(adapt_ready/10, 0.1)]s") - +/mob/camera/disease/get_stat_tab_status() + var/list/tab_data = ..() + if(freemove) + tab_data["Host Selection Time"] = GENERATE_STAT_TEXT("[round((freemove_end - world.time)/10)]s") + else + tab_data["Adaptation Points"] = GENERATE_STAT_TEXT("[points]/[total_points]") + tab_data["Hosts"] = GENERATE_STAT_TEXT("[disease_instances.len]") + var/adapt_ready = next_adaptation_time - world.time + if(adapt_ready > 0) + tab_data["Adaptation Ready"] = GENERATE_STAT_TEXT("[round(adapt_ready/10, 0.1)]s") + return tab_data /mob/camera/disease/examine(mob/user) . = ..() if(isobserver(user)) - . += {"[src] has [points]/[total_points] adaptation points. - [src] has the following unlocked:"} + . += "[src] has [points]/[total_points] adaptation points.\n"+\ + "[src] has the following unlocked:" for(var/datum/disease_ability/ability in purchased_abilities) . += "[ability.name]" @@ -116,7 +117,7 @@ the new instance inside the host to be updated to the template's stats. follow_next(Dir & NORTHWEST) last_move_tick = world.time -/mob/camera/disease/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/mob/camera/disease/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) . = ..() var/atom/movable/to_follow = speaker if(radio_freq) @@ -128,7 +129,7 @@ the new instance inside the host to be updated to the template's stats. else link = "" // Recompose the message, because it's scrambled by default - message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode) + message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mods) to_chat(src, "[link] [message]") @@ -275,6 +276,8 @@ the new instance inside the host to be updated to the template's stats. set_following(hosts[index]) /mob/camera/disease/proc/follow_mob(datum/source, newloc, dir) + SIGNAL_HANDLER + var/turf/T = get_turf(following_host) if(T) forceMove(T) @@ -320,10 +323,10 @@ the new instance inside the host to be updated to the template's stats. dat += "Back
[examining_ability.name]
[examining_ability.stat_block][examining_ability.long_desc][examining_ability.threshold_block]" else dat += "Disease Statistics
\ - Resistance: [DT.totalResistance()]
\ - Stealth: [DT.totalStealth()]
\ - Stage Speed: [DT.totalStageSpeed()]
\ - Transmissibility: [DT.totalTransmittable()]
\ + Resistance: [DT.resistance]
\ + Stealth: [DT.stealth]
\ + Stage Speed: [DT.stage_rate]
\ + Transmissibility: [DT.transmission]
\ Cure: [DT.cure_text]" dat += "
Adaptations
\ Points: [points] / [total_points]\ diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index d4d1cad0afd65..c71a9f5e0a02b 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -4,8 +4,9 @@ antagpanel_category = "Heretic" antag_moodlet = /datum/mood_event/heretics job_rank = ROLE_HERETIC - var/antag_hud_type = ANTAG_HUD_HERETIC + var/antag_hud_type = ANTAG_HUD_HERETIC // someone make all the other antags conform to this too lol var/antag_hud_name = "heretic" + hijack_speed = 0.5 var/give_equipment = TRUE var/list/researched_knowledge = list() var/total_sacrifices = 0 @@ -18,7 +19,7 @@ log_admin("[key_name(admin)] has heresized [key_name(new_owner)].") /datum/antagonist/heretic/greet() - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ecult_op.ogg', 100, FALSE, pressure_affected = FALSE)//subject to change + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ecult_op.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)//subject to change to_chat(owner, "You are the Heretic!\ The old ones gave you these tasks to fulfill:") owner.announce_objectives() @@ -26,6 +27,8 @@ Your book allows you to research abilities, read it very carefully! You cannot undo what has been done!
\ You gain charges by either collecting influences or sacrificing people tracked by the living heart
\ You can find a basic guide at : https://wiki.beestation13.com/view/Heretics ") + owner.current.client?.tgui_panel?.give_antagonist_popup("Heretic", + "Collect influences or sacrafice targets to expand your forbidden knowledge.") /datum/antagonist/heretic/on_gain() var/mob/living/current = owner.current @@ -34,8 +37,8 @@ gain_knowledge(/datum/eldritch_knowledge/spell/basic) gain_knowledge(/datum/eldritch_knowledge/living_heart) gain_knowledge(/datum/eldritch_knowledge/codex_cicatrix) - current.log_message("has become a heretic", LOG_ATTACK, color="#960000") - GLOB.reality_smash_track.AddMind(owner) + current.log_message("has been turned into a heretic!", LOG_ATTACK, color="#960000") + GLOB.reality_smash_track.Generate() START_PROCESSING(SSprocessing,src) if(give_equipment) equip_cultist() @@ -50,12 +53,11 @@ if(!silent) to_chat(owner.current, "Your mind begins to flare as the otherwordly knowledge escapes your grasp!") owner.current.log_message("has become a non-heretic", LOG_ATTACK, color="#960000") - GLOB.reality_smash_track.RemoveMind(owner) + GLOB.reality_smash_track.targets-- STOP_PROCESSING(SSprocessing,src) return ..() - /datum/antagonist/heretic/proc/equip_cultist() var/mob/living/carbon/H = owner.current if(!istype(H)) @@ -65,9 +67,9 @@ /datum/antagonist/heretic/proc/ecult_give_item(obj/item/item_path, mob/living/carbon/human/H) var/list/slots = list( - "backpack" = SLOT_IN_BACKPACK, - "left pocket" = SLOT_L_STORE, - "right pocket" = SLOT_R_STORE + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET ) var/T = new item_path(H) @@ -89,12 +91,30 @@ EK.on_life(owner.current) /datum/antagonist/heretic/proc/forge_primary_objectives() - var/list/assasination = list() - var/list/protection = list() - for(var/i in 1 to 2) - var/pck = pick("assasinate","stalk","protect") - switch(pck) - if("assasinate") + if (prob(5)) + if (prob(66)) + var/datum/objective/ascend/AE = new() + AE.owner = owner + AE.update_explanation_text() + objectives += AE + log_objective(owner, AE.explanation_text) + else + var/datum/objective/hijack/hijack_objective = new + hijack_objective.owner = owner + hijack_objective.update_explanation_text() + objectives += hijack_objective + log_objective(owner, hijack_objective.explanation_text) + else + var/list/assasination = list() + var/list/protection = list() + for(var/i in 1 to 2) + if (prob(35)) + var/datum/objective/stalk/S = new() + S.owner = owner + S.find_target() + objectives += S + log_objective(owner, S.explanation_text) + else var/datum/objective/assassinate/A = new() A.owner = owner var/list/owners = A.get_owners() @@ -102,26 +122,12 @@ assasination += A.target objectives += A log_objective(owner, A.explanation_text) - if("stalk") - var/datum/objective/stalk/S = new() - S.owner = owner - S.find_target() - objectives += S - log_objective(owner, S.explanation_text) - if("protect") - var/datum/objective/protect/P = new() - P.owner = owner - var/list/owners = P.get_owners() - P.find_target(owners,assasination) - protection += P.target - objectives += P - log_objective(owner, P.explanation_text) - - var/datum/objective/sacrifice_ecult/SE = new() - SE.owner = owner - SE.update_explanation_text() - objectives += SE - log_objective(owner, SE.explanation_text) + var/datum/objective/sacrifice_ecult/SE = new() + SE.owner = owner + SE.update_explanation_text() + objectives += SE + log_objective(owner, SE.explanation_text) + /datum/antagonist/heretic/apply_innate_effects(mob/living/mob_override) . = ..() @@ -168,14 +174,11 @@ count++ if(ascended) - //Ascension isnt technically finishing the objectives, buut it is to be considered a great win. - var/client/C = GLOB.directory[ckey(owner.key)] - if(C) - C.process_greentext() - parts += "HERETIC HAS ASCENDED!" + //Ascension isn't technically finishing the objectives, buut it is to be considered a great win. + parts += "THIS HERETIC ASCENDED!" else if(cultiewin) - parts += "The heretic was successful!" + parts += "The heretic was successful!" else parts += "The heretic has failed." @@ -187,6 +190,7 @@ parts += knowledge_message.Join(", ") return parts.Join("
") + //////////////// // Knowledge // //////////////// @@ -224,9 +228,9 @@ name = "spendtime" var/timer = 5 MINUTES -/datum/objective/stalk/process() - if(owner?.current?.stat != DEAD && target?.current?.stat != DEAD && (target in view(5,owner.current))) - timer -= 1 SECONDS +/datum/objective/stalk/process(delta_time) + if(owner?.current?.stat != DEAD && target?.current?.stat != DEAD && (owner.current in viewers(5, get_turf(target)))) + timer -= delta_time * 10 // timer is in deciseconds ///we don't want to process after the counter reaches 0, otherwise it is wasted processing if(timer <= 0) completed = TRUE @@ -252,9 +256,11 @@ /datum/objective/sacrifice_ecult name = "sacrifice" -/datum/objective/sacrifice_ecult/update_explanation_text() - . = ..() +/datum/objective/sacrifice_ecult/New() + ..() target_amount = rand(2,6) + +/datum/objective/sacrifice_ecult/update_explanation_text() explanation_text = "Sacrifice at least [target_amount] people." /datum/objective/sacrifice_ecult/check_completion() @@ -264,3 +270,13 @@ if(!cultie) return FALSE return cultie.total_sacrifices >= target_amount + +/datum/objective/ascend + name = "ascend" + explanation_text = "Appease the Gods and ascend." + +/datum/objective/ascend/check_completion() + if(!owner) + return FALSE + var/datum/antagonist/heretic/cultie = owner.has_antag_datum(/datum/antagonist/heretic) + return cultie?.ascended diff --git a/code/modules/antagonists/eldritch_cult/eldritch_book.dm b/code/modules/antagonists/eldritch_cult/eldritch_book.dm index d6f48c6a70864..f455d35b9047a 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_book.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_book.dm @@ -1,6 +1,6 @@ /obj/item/forbidden_book name = "Codex Cicatrix" - desc = "Book describing the secrets of the veil." + desc = "This book describes the secrets of the veil between worlds." icon = 'icons/obj/eldritch.dmi' icon_state = "book" w_class = WEIGHT_CLASS_SMALL @@ -8,11 +8,12 @@ var/mob/living/last_user ///how many charges do we have? var/charge = 1 - ///Where we cannot create the rune? - var/static/list/blacklisted_turfs = typecacheof(list(/turf/closed,/turf/open/space,/turf/open/lava)) ///Is it in use? var/in_use = FALSE +/obj/item/forbidden_book/empty + charge = 0 + /obj/item/forbidden_book/Destroy() last_user = null . = ..() @@ -23,21 +24,15 @@ if(!IS_HERETIC(user)) return . += "The Tome holds [charge] charges." - . += "Use it on the floor to create a transmutation rune, used to perform rituals." . += "Hit an influence in the black part with it to gain a charge." - . += "Hit a transmutation rune to destroy it." /obj/item/forbidden_book/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() if(!proximity_flag || !IS_HERETIC(user) || in_use) return in_use = TRUE - if(istype(target,/obj/effect/eldritch)) - remove_rune(target,user) if(istype(target,/obj/effect/reality_smash)) get_power_from_influence(target,user) - if(istype(target,/turf/open)) - draw_rune(target,user) in_use = FALSE ///Gives you a charge and destroys a corresponding influence @@ -48,28 +43,6 @@ qdel(RS) charge += 1 -///Draws a rune on a selected turf -/obj/item/forbidden_book/proc/draw_rune(atom/target,mob/user) - - for(var/turf/T in range(1,target)) - if(is_type_in_typecache(T, blacklisted_turfs)) - to_chat(target, "The terrain doesn't support runes!") - return - var/A = get_turf(target) - to_chat(user, "You start drawing a rune...") - - if(do_after(user,30 SECONDS,FALSE,A)) - - new /obj/effect/eldritch/big(A) - - -///Removes runes from the selected turf -/obj/item/forbidden_book/proc/remove_rune(atom/target,mob/user) - - to_chat(user, "You start removing a rune...") - if(do_after(user,2 SECONDS,user)) - qdel(target) - /obj/item/forbidden_book/ui_interact(mob/user, datum/tgui/ui = null) if(!IS_HERETIC(user)) @@ -142,9 +115,7 @@ charge -= text2num(params["cost"]) return TRUE - update_icon() // Not applicable to all objects. - -/obj/item/forbidden_book/ui_close(mob/user) +/obj/item/forbidden_book/ui_close(mob/user, datum/tgui/tgui) flick("book_closing",src) icon_state = initial(icon_state) return ..() diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm index 2dc2206a6c4f7..c53dc086e548a 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm @@ -1,13 +1,20 @@ /obj/effect/eldritch name = "Generic rune" - desc = "Weird combination of shapes and symbols etched into the floor itself. The indentation is filled with thick black tar-like fluid." + desc = "A flowing circle of shapes and runes is etched into the floor, filled with a thick black tar-like fluid." anchored = TRUE icon_state = "" resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF layer = SIGIL_LAYER + forensic_protected = TRUE ///Used mainly for summoning ritual to prevent spamming the rune to create millions of monsters. var/is_in_use = FALSE +/obj/effect/eldritch/Initialize() + . = ..() + var/image/I = image(icon = 'icons/effects/eldritch.dmi', icon_state = null, loc = src) + I.override = TRUE + add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "heretic_rune", I) + /obj/effect/eldritch/attack_hand(mob/living/user) . = ..() if(.) @@ -32,13 +39,8 @@ var/list/knowledge = cultie.get_all_knowledge() var/list/atoms_in_range = list() - for(var/A in range(1, src)) - var/atom/atom_in_range = A - if(istype(atom_in_range,/area)) - continue - if(istype(atom_in_range,/turf)) // we dont want turfs - continue - if(istype(atom_in_range,/mob/living)) + for(var/atom/atom_in_range as() in range(1, src)) + if(isliving(atom_in_range)) var/mob/living/living_in_range = atom_in_range if(living_in_range.stat != DEAD || living_in_range == user) // we only accept corpses, no living beings allowed. continue @@ -67,6 +69,7 @@ if(is_type_in_list(local_atom_in_range,local_required_atom_list)) selected_atoms |= local_atom_in_range local_required_atoms -= list(local_required_atom_list) + break if(length(local_required_atoms) > 0) continue @@ -81,7 +84,7 @@ atom_to_disappear.invisibility = INVISIBILITY_ABSTRACT if(current_eldritch_knowledge.on_finished_recipe(user,selected_atoms,loc)) current_eldritch_knowledge.cleanup_atoms(selected_atoms) - is_in_use = FALSE + is_in_use = FALSE for(var/to_appear in atoms_to_disappear) var/atom/atom_to_appear = to_appear @@ -90,104 +93,87 @@ return is_in_use = FALSE - to_chat(user,"Your ritual failed! You used either wrong components or are missing something important!") + to_chat(user,"Your ritual failed! You either used the wrong components or are missing something important!") + /obj/effect/eldritch/big - name = "Transmutation rune" + name = "transmutation rune" icon = 'icons/effects/96x96.dmi' icon_state = "eldritch_rune1" pixel_x = -32 //So the big ol' 96x96 sprite shows up right pixel_y = -32 /** - * #Reality smash tracker - * - * Stupid fucking list holder, DONT create new ones, it will break the game, this is automnatically created whenever eldritch cultists are created. - * - * Tracks relevant data, generates relevant data, useful tool - */ + * #Reality smash tracker + * + * Stupid fucking list holder, DONT create new ones, it will break the game, this is automnatically created whenever eldritch cultists are created. + * + * Tracks relevant data, generates relevant data, useful tool + */ /datum/reality_smash_tracker ///list of tracked reality smashes - var/list/smashes = list() + var/smashes = 0 ///List of mobs with ability to see the smashes - var/list/targets = list() + var/targets = 0 /datum/reality_smash_tracker/Destroy(force, ...) if(GLOB.reality_smash_track == src) - stack_trace("/datum/reality_smash_tracker was deleted. Heretics may no longer access any influences. Fix it or call coder support") - QDEL_LIST(smashes) - targets.Cut() + stack_trace("/datum/reality_smash_tracker was deleted. New heretics will no longer generate new influences") return ..() /** - * Automatically fixes the target and smash network - * - * Fixes any bugs that are caused by late Generate() or exchanging clients - */ -/datum/reality_smash_tracker/proc/ReworkNetwork() - listclearnulls(smashes) - for(var/mind in targets) - if(isnull(mind)) - stack_trace("A null somehow landed in a list of minds") - continue - for(var/X in smashes) - var/obj/effect/reality_smash/reality_smash = X - reality_smash.AddMind(mind) - -/** - * Generates a set amount of reality smashes based on the N value - * - * Automatically creates more reality smashes - */ -/datum/reality_smash_tracker/proc/_Generate() - var/targ_len = length(targets) - var/smash_len = length(smashes) - var/number = targ_len * 6 - smash_len + * Generates a set amount of reality smashes based on the N value + * + * Automatically creates more reality smashes + */ +/datum/reality_smash_tracker/proc/Generate() + targets++ + var/number = max(targets * ( 4 - (targets-1) ) - smashes,1) for(var/i in 0 to number) - - var/turf/chosen_location = get_safe_random_station_turf() + var/turf/chosen_location = get_safe_random_station_turfs() //we also dont want them close to each other, at least 1 tile of seperation var/obj/effect/reality_smash/what_if_i_have_one = locate() in range(1, chosen_location) var/obj/effect/broken_illusion/what_if_i_had_one_but_got_used = locate() in range(1, chosen_location) if(what_if_i_have_one || what_if_i_had_one_but_got_used) //we dont want to spawn continue - var/obj/effect/reality_smash/RS = new/obj/effect/reality_smash(chosen_location) - smashes += RS - ReworkNetwork() - - -/** - * Adds a mind to the list of people that can see the reality smashes - * - * Use this whenever you want to add someone to the list - */ -/datum/reality_smash_tracker/proc/AddMind(var/datum/mind/M) - RegisterSignal(M.current,COMSIG_MOB_LOGIN,.proc/ReworkNetwork) - targets |= M - _Generate() - for(var/X in smashes) - var/obj/effect/reality_smash/reality_smash = X - reality_smash.AddMind(M) - - -/** - * Removes a mind from the list of people that can see the reality smashes - * - * Use this whenever you want to remove someone from the list - */ -/datum/reality_smash_tracker/proc/RemoveMind(var/datum/mind/M) - UnregisterSignal(M.current,COMSIG_MOB_LOGIN) - targets -= M - for(var/obj/effect/reality_smash/RS in smashes) - RS.RemoveMind(M) + new /obj/effect/reality_smash(chosen_location) + smashes++ /obj/effect/broken_illusion - name = "Pierced reality" + name = "pierced reality" icon = 'icons/effects/eldritch.dmi' icon_state = "pierced_illusion" anchored = TRUE + forensic_protected = TRUE resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF + alpha = 0 + +/obj/effect/broken_illusion/ComponentInitialize() + AddComponent(/datum/component/discoverable, 5000) + +/obj/effect/broken_illusion/Initialize() + . = ..() + addtimer(CALLBACK(src,.proc/show_presence),15 SECONDS) + + var/image/I = image('icons/effects/eldritch.dmi',src,null,OBJ_LAYER) + I.override = TRUE + add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "pierced_reality_silicons", I) + + I = image('icons/effects/eldritch.dmi',src, "pierced_illusion",OBJ_LAYER) + I.override = TRUE + I.alpha = 255 + I.appearance_flags = RESET_ALPHA + add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/heretics,"pierced_reality_heretics",I) + addtimer(CALLBACK(src,.proc/dissipate),15 MINUTES) + +///Makes this obj appear out of nothing +/obj/effect/broken_illusion/proc/show_presence() + animate(src,alpha = 255,time = 15 SECONDS) + +/obj/effect/broken_illusion/proc/dissipate() + animate(src,alpha = 0,time = 2 MINUTES) + QDEL_IN(src, 2 MINUTES) /obj/effect/broken_illusion/attack_hand(mob/living/user) if(!ishuman(user)) @@ -198,11 +184,11 @@ else var/obj/item/bodypart/arm = human_user.get_active_hand() if(prob(25)) - to_chat(human_user,"Otherwordly presence tears your arm aparts into atoms as you try to touch the hole in the very fabric of reality!") + to_chat(human_user,"An otherwordly presence tears and atomizes your arm as you try to touch the hole in the very fabric of reality!") arm.dismember() qdel(arm) else - to_chat(human_user,"You pull your hand away from the hole as the eldritch energy flails trying to catch onto the existance itself!") + to_chat(human_user,"You pull your hand away from the hole as the eldritch energy flails trying to latch onto existance itself!") /obj/effect/broken_illusion/attack_tk(mob/user) if(!ishuman(user)) @@ -210,44 +196,41 @@ var/mob/living/carbon/human/human_user = user if(IS_HERETIC(human_user)) to_chat(human_user,"You know better than to tempt forces out of your control!") + return + //a very elaborate way to suicide + to_chat(human_user,"Eldritch energy lashes out, piercing your fragile mind, tearing it to pieces!") + human_user.ghostize(FALSE,SENTIENCE_ERASE) + var/obj/item/bodypart/head/head = locate() in human_user.bodyparts + if(head) + head.dismember() + qdel(head) else - //a very elaborate way to suicide - to_chat(human_user,"Eldritch energy lashes out, piercing your fragile mind, tearing it to pieces!") - human_user.ghostize() - var/obj/item/bodypart/head/head = locate() in human_user.bodyparts - if(head) - head.dismember() - qdel(head) - else - human_user.gib() - + human_user.gib() var/datum/effect_system/reagents_explosion/explosion = new() - explosion.set_up(1, get_turf(human_user), 1, 0) + explosion.set_up(1, get_turf(human_user), TRUE, 0) explosion.start() /obj/effect/broken_illusion/examine(mob/user) - if(!IS_HERETIC(user) && ishuman(user)) - var/mob/living/carbon/human/human_user = user - to_chat(human_user,"Your brain hurts when you look at this!") - human_user.adjustOrganLoss(ORGAN_SLOT_BRAIN,10) . = ..() + var/mob/living/carbon/human/human_user = user + if(istype(human_user) && !IS_HERETIC(human_user) && !IS_HERETIC_MONSTER(human_user)) + to_chat(human_user,"Your mind burns as you stare at the tear!") + SEND_SIGNAL(human_user, COMSIG_ADD_MOOD_EVENT, "gates_of_mansus", /datum/mood_event/gates_of_mansus) /obj/effect/reality_smash - name = "\improper reality smash" + name = "reality smash" + desc = "A weak spot in the veil of reality. You can pierce reality by harvesting this with your Codex Cicatrix to gain charges." icon = 'icons/effects/eldritch.dmi' anchored = TRUE + forensic_protected = TRUE resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF - ///We cannot use icon_state since this is invisible, functions the same way but with custom behaviour. - var/image_state = "reality_smash" - ///Who can see us? - var/list/minds = list() - ///Tracked image - var/image/img + invisibility = INVISIBILITY_OBSERVER /obj/effect/reality_smash/Initialize() . = ..() - img = image(icon, src, image_state, OBJ_LAYER) + var/img = image(icon, src, "reality_smash", OBJ_LAYER) generate_name() + add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/heretics,"influence",img) /obj/effect/reality_smash/Destroy() on_destroy() @@ -255,35 +238,13 @@ ///Custom effect that happens on destruction /obj/effect/reality_smash/proc/on_destroy() - for(var/cm in minds) - var/datum/mind/cultie = cm - if(cultie.current?.client) - cultie.current.client.images -= img - //clear the list - minds -= cultie - GLOB.reality_smash_track.smashes -= src - img = null - new /obj/effect/broken_illusion(drop_location()) - -///Makes the mind able to see this effect -/obj/effect/reality_smash/proc/AddMind(var/datum/mind/cultie) - minds |= cultie - if(cultie.current.client) - cultie.current.client.images |= img - - - -///Makes the mind not able to see this effect -/obj/effect/reality_smash/proc/RemoveMind(var/datum/mind/cultie) - minds -= cultie - if(cultie.current.client) - cultie.current.client.images -= img - - + GLOB.reality_smash_track.smashes-- + var/obj/effect/broken_illusion/illusion = new /obj/effect/broken_illusion(drop_location()) + illusion.name = pick("Researched","Siphoned","Analyzed","Emptied","Drained") + " " + name ///Generates random name /obj/effect/reality_smash/proc/generate_name() var/static/list/prefix = list("Omniscient","Thundering","Enlightening","Intrusive","Rejectful","Atomized","Subtle","Rising","Lowering","Fleeting","Towering","Blissful","Arrogant","Threatening","Peaceful","Aggressive") var/static/list/postfix = list("Flaw","Presence","Crack","Heat","Cold","Memory","Reminder","Breeze","Grasp","Sight","Whisper","Flow","Touch","Veil","Thought","Imperfection","Blemish","Blush") - name = pick(prefix) + " " + pick(postfix) + name = "\improper" + pick(prefix) + " " + pick(postfix) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index f3470a737b408..1a71eceed8a7b 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -1,6 +1,6 @@ /obj/item/living_heart name = "Living Heart" - desc = "Link to the worlds beyond." + desc = "A link to the worlds beyond." icon = 'icons/obj/eldritch.dmi' icon_state = "living_heart" w_class = WEIGHT_CLASS_SMALL @@ -12,11 +12,11 @@ if(!IS_HERETIC(user)) return if(!target) - to_chat(user,"No target could be found. Put the living heart on the rune and use the rune to recieve a target.") + to_chat(user,"No target could be found. Put the living heart on the rune and use the rune to receive a target.") return var/dist = get_dist(user.loc,target.loc) var/dir = get_dir(user.loc,target.loc) - if(user.z != target.z) + if(user.get_virtual_z_level() != target.get_virtual_z_level()) to_chat(user,"[target.real_name] is on another plane of existance!") else switch(dist) @@ -24,17 +24,15 @@ to_chat(user,"[target.real_name] is near you. They are to the [dir2text(dir)] of you!") if(16 to 31) to_chat(user,"[target.real_name] is somewhere in your vicinty. They are to the [dir2text(dir)] of you!") - if(32 to 127) - to_chat(user,"[target.real_name] is far away from you. They are to the [dir2text(dir)] of you!") else - to_chat(user,"[target.real_name] is beyond our reach.") + to_chat(user,"[target.real_name] is far away from you. They are to the [dir2text(dir)] of you!") if(target.stat == DEAD) - to_chat(user,"[target.real_name] is dead. Bring them onto a transmutation rune!") + to_chat(user,"[target.real_name] is dead. Bring them to a transmutation rune!") /datum/action/innate/heretic_shatter name = "Shattering Offer" - desc = "By breaking your blade you are noticed by the hill or rust and are granted an escape from a dire sitatuion. (Teleports you to a random safe z turf on your current z level but destroys your blade.)" + desc = "By breaking your blade, you will be granted salvation from a dire situation. (Teleports you to a random safe turf on your current z level, but destroys your blade.)" background_icon_state = "bg_ecult" button_icon_state = "shatter" icon_icon = 'icons/mob/actions/actions_ecult.dmi' @@ -56,8 +54,8 @@ /datum/action/innate/heretic_shatter/Activate() var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE) - do_teleport(holder,safe_turf,forceMove = TRUE) - to_chat(holder," You feel a gust of energy flow through your body, Rusted Hills heard your call...") + do_teleport(holder,safe_turf,forceMove = TRUE,channel = TELEPORT_CHANNEL_MAGIC) + to_chat(holder,"You feel a gust of energy flow through your body... the Rusted Hills heard your call...") qdel(sword) @@ -74,7 +72,7 @@ flags_1 = CONDUCT_1 sharpness = IS_SHARP w_class = WEIGHT_CLASS_NORMAL - force = 17 + force = 24 throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends") @@ -103,16 +101,19 @@ /obj/item/melee/sickly_blade/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() var/datum/antagonist/heretic/cultie = user.mind.has_antag_datum(/datum/antagonist/heretic) - if(!cultie || !proximity_flag) + if(!cultie) return var/list/knowledge = cultie.get_all_knowledge() for(var/X in knowledge) var/datum/eldritch_knowledge/eldritch_knowledge_datum = knowledge[X] - eldritch_knowledge_datum.on_eldritch_blade(target,user,proximity_flag,click_parameters) + if(proximity_flag) + eldritch_knowledge_datum.on_eldritch_blade(target,user,proximity_flag,click_parameters) + else + eldritch_knowledge_datum.on_ranged_attack_eldritch_blade(target,user,click_parameters) /obj/item/melee/sickly_blade/rust name = "\improper Rusted Blade" - desc = "This crescent blade is decrepit, wasting to dust. Yet still it bites, catching flesh with jagged, rotten teeth." + desc = "This crescent blade is decrepit, wasting to rust. Yet still it bites, ripping flesh and bone with jagged, rotten teeth." icon_state = "rust_blade" item_state = "rust_blade" @@ -124,13 +125,13 @@ /obj/item/melee/sickly_blade/flesh name = "\improper Flesh Blade" - desc = "A crescent blade born from a fleshwarped creature. Keenly aware, it seeks to spread to others the excruitations it has endured from dread origins." + desc = "A crescent blade born from a fleshwarped creature. Keenly aware, it seeks to spread to others the suffering it has endured from its dreadful origins." icon_state = "flesh_blade" item_state = "flesh_blade" /obj/item/clothing/neck/eldritch_amulet name = "Warm Eldritch Medallion" - desc = "A strange medallion. Peering through the crystalline surface, the world around you melts away. You see your own beating heart, and the pulse of a thousand others." + desc = "A strange medallion. Peering through the crystalline surface, the world around you melts away. You see your own beating heart, and the pulsing of a thousand others." icon = 'icons/obj/eldritch.dmi' icon_state = "eye_medalion" w_class = WEIGHT_CLASS_SMALL @@ -139,7 +140,7 @@ /obj/item/clothing/neck/eldritch_amulet/equipped(mob/user, slot) . = ..() - if(ishuman(user) && user.mind && slot == SLOT_NECK && IS_HERETIC(user) ) + if(ishuman(user) && user.mind && slot == ITEM_SLOT_NECK && IS_HERETIC(user) ) ADD_TRAIT(user, trait, CLOTHING_TRAIT) user.update_sight() @@ -150,15 +151,21 @@ /obj/item/clothing/neck/eldritch_amulet/piercing name = "Piercing Eldritch Medallion" - desc = "A strange medallion. Peering through the crystalline surface, the light refracts into new and terrifying spectrums of color. You see yourself, reflected off cascading mirrors, warped into improbable shapes." + desc = "A strange medallion. Peering through the crystalline surface, the light refracts into new and terrifying spectrums of color. You see yourself, reflected off cascading mirrors, warped into impossible shapes." trait = TRAIT_XRAY_VISION +/obj/item/clothing/neck/eldritch_amulet/guise + name = "guise of Istasha" + desc = "An odd amulet formed out of multiple floating parts, strung togethere by forces from another world." + icon_state = "eye_medalion" + trait = TRAIT_DIGINVIS + /obj/item/clothing/head/hooded/cult_hoodie/eldritch name = "ominous hood" icon_state = "eldritch" desc = "A torn, dust-caked hood. Strange eyes line the inside." flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH flash_protect = 1 /obj/item/clothing/suit/hooded/cultrobes/eldritch @@ -171,11 +178,87 @@ allowed = list(/obj/item/melee/sickly_blade, /obj/item/forbidden_book) hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/eldritch // slightly better than normal cult robes - armor = list("melee" = 50, "bullet" = 50, "laser" = 50,"energy" = 50, "bomb" = 35, "bio" = 20, "rad" = 0, "fire" = 20, "acid" = 20) + armor = list("melee" = 50, "bullet" = 50, "laser" = 50,"energy" = 50, "bomb" = 35, "bio" = 20, "rad" = 0, "fire" = 20, "acid" = 20, "stamina" = 60) /obj/item/reagent_containers/glass/beaker/eldritch name = "flask of eldritch essence" - desc = "Toxic to the close minded. Healing to those with knowledge of the beyond." + desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond." icon = 'icons/obj/eldritch.dmi' icon_state = "eldrich_flask" list_reagents = list(/datum/reagent/eldritch = 50) + +/obj/item/clothing/mask/void_mask + name = "Mask Of Madness" + desc = "Mask created from the suffering of existance, you can look down it's eyes, and notice something gazing back at you." + icon_state = "mad_mask" + w_class = WEIGHT_CLASS_SMALL + flags_cover = MASKCOVERSEYES + resistance_flags = FLAMMABLE + flags_inv = HIDEFACE|HIDEFACIALHAIR + ///Who is wearing this + var/mob/living/carbon/human/local_user + +/obj/item/clothing/mask/void_mask/equipped(mob/user, slot) + . = ..() + if(slot == ITEM_SLOT_MASK && ishuman(user) && user.mind) + local_user = user + START_PROCESSING(SSobj,src) + + if(IS_HERETIC(user) || IS_HERETIC_MONSTER(user)) + return + ADD_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT) + +/obj/item/clothing/mask/void_mask/dropped(mob/M) + local_user = null + STOP_PROCESSING(SSobj,src) + REMOVE_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT) + return ..() + +/obj/item/clothing/mask/void_mask/process() + if(!local_user) + return PROCESS_KILL + + if((IS_HERETIC(local_user) || IS_HERETIC_MONSTER(local_user)) && HAS_TRAIT(src,TRAIT_NODROP)) + REMOVE_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT) + + for(var/mob/living/carbon/human/human_in_range in viewers(9,local_user)) + if(IS_HERETIC(human_in_range) || IS_HERETIC_MONSTER(human_in_range)) + continue + + SEND_SIGNAL(human_in_range,COMSIG_HUMAN_VOID_MASK_ACT,rand(-1,-10)) + + if(prob(60)) + human_in_range.hallucination += 5 + + if(prob(40)) + human_in_range.Jitter(5) + + if(prob(30)) + human_in_range.emote(pick("giggle","laugh")) + human_in_range.adjustStaminaLoss(10) + + if(prob(25)) + human_in_range.Dizzy(5) + +/obj/item/clothing/neck/crucifix + name = "crucifix" + desc = "In the eventuality that one of those you falesly accused is, in fact, a real witch, this will ward you against their curses." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon = 'icons/obj/objects.dmi' + icon_state = "crucifix" + w_class = WEIGHT_CLASS_SMALL + +/obj/item/clothing/neck/crucifix/equipped(mob/living/carbon/human/user, slot) + . = ..() + if(slot == ITEM_SLOT_NECK && istype(user)) + ADD_TRAIT(user, TRAIT_WARDED, CLOTHING_TRAIT) + +/obj/item/clothing/neck/crucifix/dropped(mob/user) + . = ..() + REMOVE_TRAIT(user, TRAIT_WARDED, CLOTHING_TRAIT) + +/obj/item/clothing/neck/crucifix/rosary + name = "rosary beads" + desc = "A wooden crucifix meant to ward off curses and hexes." + resistance_flags = FLAMMABLE + icon_state = "rosary" diff --git a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm index dea7a2cec0700..71184b8169945 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm @@ -1,11 +1,10 @@ - /** - * #Eldritch Knwoledge - * - * Datum that makes eldritch cultist interesting. - * - * Eldritch knowledge aren't instantiated anywhere roundstart, and are initalized and destroyed as the round goes on. - */ + * #Eldritch Knwoledge + * + * Datum that makes eldritch cultist interesting. + * + * Eldritch knowledge aren't instantiated anywhere roundstart, and are initalized and destroyed as the round goes on. + */ /datum/eldritch_knowledge ///Name of the knowledge var/name = "Basic knowledge" @@ -35,41 +34,41 @@ required_atoms = temp_list /** - * What happens when this is assigned to an antag datum - * - * This proc is called whenever a new eldritch knowledge is added to an antag datum - */ + * What happens when this is assigned to an antag datum + * + * This proc is called whenever a new eldritch knowledge is added to an antag datum + */ /datum/eldritch_knowledge/proc/on_gain(mob/user) to_chat(user, "[gain_text]") return /** - * What happens when you loose this - * - * This proc is called whenever antagonist looses his antag datum, put cleanup code in here - */ + * What happens when you loose this + * + * This proc is called whenever antagonist looses his antag datum, put cleanup code in here + */ /datum/eldritch_knowledge/proc/on_lose(mob/user) return /** - * What happens every tick - * - * This proc is called on SSprocess in eldritch cultist antag datum. SSprocess happens roughly every second - */ + * What happens every tick + * + * This proc is called on SSprocess in eldritch cultist antag datum. SSprocess happens roughly every second + */ /datum/eldritch_knowledge/proc/on_life(mob/user) return /** - * Special check for recipes - * - * If you are adding a more complex summoning or something that requires a special check that parses through all the atoms in an area override this. - */ + * Special check for recipes + * + * If you are adding a more complex summoning or something that requires a special check that parses through all the atoms in an area override this. + */ /datum/eldritch_knowledge/proc/recipe_snowflake_check(list/atoms,loc) return TRUE /** - * What happens once the recipe is succesfully finished - * - * By default this proc creates atoms from result_atoms list. Override this is you want something else to happen. - */ + * What happens once the recipe is succesfully finished + * + * By default this proc creates atoms from result_atoms list. Override this is you want something else to happen. + */ /datum/eldritch_knowledge/proc/on_finished_recipe(mob/living/user,list/atoms,loc) if(result_atoms.len == 0) return FALSE @@ -80,11 +79,11 @@ return TRUE /** - * Used atom cleanup - * - * Overide this proc if you dont want ALL ATOMS to be destroyed. useful in many situations. - */ -/datum/eldritch_knowledge/proc/cleanup_atoms(list/atoms) + * Used atom cleanup + * + * Overide this proc if you dont want ALL ATOMS to be destroyed. useful in many situations. + */ +/datum/eldritch_knowledge/proc/cleanup_atoms(list/atoms) //BUG: crafting something will add to this list and delete ALL of the required components, IE if you have 2 bibles on a rune, and craft a codex, it will make 1 codex and qdel BOTH bibles for(var/X in atoms) var/atom/A = X if(!isliving(A)) @@ -93,22 +92,35 @@ return /** - * Mansus grasp act - * - * Gives addtional effects to mansus grasp spell - */ + * Mansus grasp act + * + * Gives addtional effects to mansus grasp spell + * Gives addtional effects to mansus touch spell of your followers + */ /datum/eldritch_knowledge/proc/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters) return FALSE +/datum/eldritch_knowledge/proc/on_mansus_touch(atom/target, mob/user, proximity_flag, click_parameters) + return FALSE + + /** - * Sickly blade act - * - * Gives addtional effects to sickly blade weapon - */ + * Sickly blade act + * + * Gives addtional effects to sickly blade weapon + */ /datum/eldritch_knowledge/proc/on_eldritch_blade(target,user,proximity_flag,click_parameters) return +/** + * Sickly blade distant act + * + * Same as [/datum/eldritch_knowledge/proc/on_eldritch_blade] but works on targets that are not in proximity to you. + */ +/datum/eldritch_knowledge/proc/on_ranged_attack_eldritch_blade(atom/target,mob/user,click_parameters) + return + ////////////// ///Subtypes/// ////////////// @@ -144,20 +156,22 @@ var/list/compiled_list = list() for(var/H in GLOB.carbon_list) - if(!ishuman(H)) - continue var/mob/living/carbon/human/human_to_check = H - if(fingerprints[md5(human_to_check.dna.uni_identity)]) + if(istype(human_to_check) && fingerprints[md5(human_to_check.dna.uni_identity)]) compiled_list |= human_to_check.real_name compiled_list[human_to_check.real_name] = human_to_check if(compiled_list.len == 0) - to_chat(user, "The items don't posses required fingerprints.") + to_chat(user, "These items don't possess the required fingerprints or DNA.") return FALSE var/chosen_mob = input("Select the person you wish to curse","Your target") as null|anything in sortList(compiled_list, /proc/cmp_mob_realname_dsc) if(!chosen_mob) return FALSE + var/mob/living/living_mob = chosen_mob + if (istype(living_mob) && HAS_TRAIT(living_mob, TRAIT_WARDED)) + to_chat(user, "The curse failed! The target is warded against curses.") + return FALSE curse(compiled_list[chosen_mob]) addtimer(CALLBACK(src, .proc/uncurse, compiled_list[chosen_mob]),timer) return TRUE @@ -177,14 +191,14 @@ //we need to spawn the mob first so that we can use it in pollCandidatesForMob, we will move it from nullspace down the code var/mob/living/summoned = new mob_to_summon(loc) message_admins("[summoned.name] is being summoned by [user.real_name] in [loc]") - var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [summoned.name]", ROLE_HERETIC, null, FALSE, 100, summoned) + var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [summoned.real_name]", ROLE_HERETIC, null, FALSE, 100, summoned) if(!LAZYLEN(candidates)) to_chat(user,"No ghost could be found...") qdel(summoned) return FALSE var/mob/dead/observer/C = pick(candidates) log_game("[key_name_admin(C)] has taken control of ([key_name_admin(summoned)]), their master is [user.real_name]") - summoned.ghostize(FALSE) + summoned.ghostize(FALSE,SENTIENCE_ERASE) summoned.key = C.key summoned.mind.add_antag_datum(/datum/antagonist/heretic_monster) var/datum/antagonist/heretic_monster/heretic_monster = summoned.mind.has_antag_datum(/datum/antagonist/heretic_monster) @@ -226,7 +240,7 @@ /datum/eldritch_knowledge/spell/basic name = "Break of dawn" - desc = "Starts your journey in the mansus. Allows you to select a target using a living heart on a transmutation rune." + desc = "You can sacrifice specific targets by placing their dead bodies and the living heart on a transmutation rune, and performing a transmutation ritual." gain_text = "Gates of mansus open up to your mind." next_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh) cost = 0 @@ -260,28 +274,35 @@ if(!istype(X,/obj/item/forbidden_book)) continue var/obj/item/forbidden_book/FB = X - FB.charge++ + FB.charge += 2 break if(!LH.target) var/datum/objective/A = new A.owner = user.mind - var/datum/mind/targeted = A.find_target()//easy way, i dont feel like copy pasting that entire block of code - LH.target = targeted.current + var/list/targets = list() + for(var/i in 1 to 3) + var/datum/mind/targeted = A.find_target()//easy way, i dont feel like copy pasting that entire block of code + if(!targeted) + break + targets[targeted.current.real_name] = targeted.current + LH.target = targets[input(user,"Choose your next target","Target") in targets] qdel(A) if(LH.target) to_chat(user,"Your new target has been selected, go and sacrifice [LH.target.real_name]!") - else to_chat(user,"target could not be found for living heart.") /datum/eldritch_knowledge/spell/basic/cleanup_atoms(list/atoms) return + +// --- GENERAL --- + /datum/eldritch_knowledge/living_heart name = "Living Heart" desc = "Allows you to create additional living hearts, using a heart, a pool of blood and a poppy. Living hearts when used on a transmutation rune will grant you a person to hunt and sacrifice on the rune. Every sacrifice gives you an additional charge in the book." - gain_text = "Gates of mansus open up to your mind." + gain_text = "The Gates of Mansus open up to your mind." cost = 0 required_atoms = list(/obj/item/organ/heart,/obj/effect/decal/cleanable/blood,/obj/item/reagent_containers/food/snacks/grown/poppy) result_atoms = list(/obj/item/living_heart) @@ -293,5 +314,179 @@ gain_text = "Their hand is at your throats, yet you see Them not." cost = 0 required_atoms = list(/obj/item/organ/eyes,/obj/item/stack/sheet/animalhide/human,/obj/item/storage/book/bible,/obj/item/pen) - result_atoms = list(/obj/item/forbidden_book) + result_atoms = list(/obj/item/forbidden_book/empty) route = "Start" + +// --- CRAFTING --- + +/datum/eldritch_knowledge/ashen_eyes + name = "Ashen Eyes" + gain_text = "Piercing eyes, guide me through the mundane." + desc = "Allows you to craft a thermal vision amulet by transmutating eyes with a glass shard." + cost = 1 + next_knowledge = list(/datum/eldritch_knowledge/spell/ashen_shift,/datum/eldritch_knowledge/flesh_ghoul) + required_atoms = list(/obj/item/organ/eyes,/obj/item/shard) + result_atoms = list(/obj/item/clothing/neck/eldritch_amulet) + +/datum/eldritch_knowledge/guise + name = "Guise of Istasha" + gain_text = "Hide your form from the ones without a soul." + desc = "Allows you to craft a digital camoflage amulet by transmutating a circuit board with a glass shard." + cost = 1 + next_knowledge = list(/datum/eldritch_knowledge/spell/ashen_shift,/datum/eldritch_knowledge/flesh_ghoul) + required_atoms = list(/obj/item/circuitboard,/obj/item/shard) + result_atoms = list(/obj/item/clothing/neck/eldritch_amulet/guise) + +/datum/eldritch_knowledge/armor + name = "Armorer's ritual" + desc = "You can now create eldritch armor using a table and a gas mask." + gain_text = "For I am the heir to the throne of doom." + cost = 1 + next_knowledge = list(/datum/eldritch_knowledge/rust_regen,/datum/eldritch_knowledge/flesh_ghoul) + required_atoms = list(/obj/structure/table,/obj/item/clothing/mask/gas) + result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/eldritch) + +/datum/eldritch_knowledge/essence + name = "Priest's Ritual" + desc = "You can now transmute a tank of water and a glass shard into a bottle of eldritch water." + gain_text = "This is an old recipe. The Owl whispered it to me." + cost = 1 + required_atoms = list(/obj/structure/reagent_dispensers/watertank) + result_atoms = list(/obj/item/reagent_containers/glass/beaker/eldritch) + +// --- CURSES --- + +/datum/eldritch_knowledge/curse/alteration + name = "Curse Of Alteration" + gain_text = "Mortal bodies, prisons of flesh. Death, a release..." + desc = "Start an alteration ritual by transmuting a wire cutter, a hatchet and an item that the victim touched with their bare hands. Inflict a debilitating curse that will cripple your target's body for 2 minutes. Add eyes, ears, limbs or tongues to the mix to disable those organs while the curse is in effect." + cost = 1 + required_atoms = list(/obj/item/wirecutters,/obj/item/hatchet) + timer = 2 MINUTES + var/list/debuffs = list() + +/datum/eldritch_knowledge/curse/alteration/on_finished_recipe(mob/living/user, list/atoms, loc) //the ritual completed, take the payment and apply the curse + //declare + debuffs = list() + var/list/extra_atoms = list() + + //check variables + for(var/A in range(1, loc)) //this + var/obj/item/bodypart/selected_part = A + if (istype(selected_part) && selected_part.status == BODYPART_ORGANIC) + switch(selected_part.body_zone) + if(BODY_ZONE_R_LEG) + extra_atoms |= A + debuffs |= "r_leg" + if(BODY_ZONE_L_LEG) + extra_atoms |= A + debuffs |= "l_leg" + if(BODY_ZONE_R_ARM) + extra_atoms |= A + debuffs |= "r_arm" + if(BODY_ZONE_L_ARM) + extra_atoms |= A + debuffs |= "l_arm" + + var/obj/item/organ/selected_organ = A + if (istype(selected_organ) && selected_organ.status == ORGAN_ORGANIC) + switch(selected_organ.slot) + if(ORGAN_SLOT_TONGUE) + extra_atoms |= A + debuffs |= "tongue" + if(ORGAN_SLOT_EYES) + extra_atoms |= A + debuffs |= "eyes" + if(ORGAN_SLOT_EARS) + extra_atoms |= A + debuffs |= "ears" + + cleanup_atoms(extra_atoms) + . = ..() + return . + +/datum/eldritch_knowledge/curse/alteration/curse(mob/living/chosen_mob) + . = ..() + if (chosen_mob.has_status_effect(/datum/status_effect/corrosion_curse)) + return FALSE + + var/mob/living/carbon/human/chosen_mortal = chosen_mob + if (!istype(chosen_mob)) + return + + chosen_mortal.apply_status_effect(/datum/status_effect/corrosion_curse) //the purpose of this debuff is to alert the victim they've been cursed + for(var/X in debuffs) + switch (X) + if ("r_leg") + ADD_TRAIT(chosen_mortal,TRAIT_PARALYSIS_R_LEG,CURSE_TRAIT) + if ("l_leg") + ADD_TRAIT(chosen_mortal,TRAIT_PARALYSIS_L_LEG,CURSE_TRAIT) + if ("r_arm") + ADD_TRAIT(chosen_mortal,TRAIT_PARALYSIS_R_ARM,CURSE_TRAIT) + if ("l_arm") + ADD_TRAIT(chosen_mortal,TRAIT_PARALYSIS_L_ARM,CURSE_TRAIT) + if ("tongue") + ADD_TRAIT(chosen_mortal, TRAIT_MUTE, CURSE_TRAIT) + if ("eyes") + chosen_mortal.become_blind(CURSE_TRAIT) + if ("ears") + ADD_TRAIT(chosen_mortal, TRAIT_DEAF, CURSE_TRAIT) + return . + +/datum/eldritch_knowledge/curse/alteration/uncurse(mob/living/chosen_mob) + . = ..() + var/mob/living/carbon/human/chosen_mortal = chosen_mob + //organ fuckup + chosen_mortal.remove_status_effect(/datum/status_effect/corrosion_curse) + + //CC + chosen_mortal.cure_blind(CURSE_TRAIT) + REMOVE_TRAIT(chosen_mortal, TRAIT_MUTE, CURSE_TRAIT) + REMOVE_TRAIT(chosen_mortal, TRAIT_DEAF, CURSE_TRAIT) + + //paralysis + REMOVE_TRAIT(chosen_mortal,TRAIT_PARALYSIS_R_ARM,CURSE_TRAIT) + REMOVE_TRAIT(chosen_mortal,TRAIT_PARALYSIS_L_ARM,CURSE_TRAIT) + REMOVE_TRAIT(chosen_mortal,TRAIT_PARALYSIS_L_LEG,CURSE_TRAIT) + REMOVE_TRAIT(chosen_mortal,TRAIT_PARALYSIS_R_LEG,CURSE_TRAIT) + chosen_mortal.update_mobility() + + return . + +// --- SPELLS --- + +/datum/eldritch_knowledge/spell/cleave + name = "Blood Cleave" + gain_text = "At first I didn't understand these instruments of war, but the priest told me to use them regardless. Soon, he said, I would know them well." + desc = "Gives AOE spell that causes heavy bleeding and blood loss." + cost = 1 + spell_to_add = /obj/effect/proc_holder/spell/pointed/cleave + next_knowledge = list(/datum/eldritch_knowledge/spell/rust_wave,/datum/eldritch_knowledge/spell/flame_birth) + +/datum/eldritch_knowledge/spell/blood_siphon + name = "Blood Siphon" + gain_text = "No matter the man, we bleed all the same. That's what the Marshal told me." + desc = "You gain a spell that drains health from your enemies to restores your own." + cost = 1 + spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/blood_siphon + next_knowledge = list(/datum/eldritch_knowledge/summon/raw_prophet,/datum/eldritch_knowledge/spell/area_conversion) + +// --- SUMMONS --- + +/datum/eldritch_knowledge/summon/ashy + name = "Ashen Ritual" + gain_text = "I combined my principle of hunger with my desire for destruction. And the Nightwatcher knew my name." + desc = "You can now summon an Ash Man by transmutating a pile of ash, a head and a book." + cost = 1 + required_atoms = list(/obj/effect/decal/cleanable/ash,/obj/item/bodypart/head,/obj/item/book) + mob_to_summon = /mob/living/simple_animal/hostile/eldritch/ash_spirit + next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/rust_wave) + +/datum/eldritch_knowledge/summon/rusty + name = "Rusted Ritual" + gain_text = "I combined my principle of hunger with my desire for corruption. And the Rusted Hills called my name." + desc = "You can now summon a Rust Walker by transmutating a vomit pool, a severed head and a book." + cost = 1 + required_atoms = list(/obj/effect/decal/cleanable/vomit,/obj/item/bodypart/head,/obj/item/book) + mob_to_summon = /mob/living/simple_animal/hostile/eldritch/rust_spirit + next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/flame_birth) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm index e38562c03833d..2a0f54f6af7cd 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm @@ -42,14 +42,19 @@ /obj/item/melee/touch_attack/mansus_fist name = "Mansus Grasp" - desc = "A sinister looking aura that distorts the flow of reality around it. Causes knockdown, major stamina damage aswell as some Brute. It gains additional beneficial effects with certain knowledges you can research." + desc = "A sinister looking aura that distorts the flow of reality around it. Mutes, causes knockdown, major stamina damage aswell as some Brute. You also can lay and remove transmutation runes using this. It gains additional beneficial effects with certain knowledges you can research." icon_state = "mansus_grasp" item_state = "mansus_grasp" catchphrase = "R'CH T'H TR'TH" + ///Where we cannot create the rune? + var/static/list/blacklisted_turfs = typecacheof(list(/turf/closed,/turf/open/space,/turf/open/lava)) /obj/item/melee/touch_attack/mansus_fist/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if(!proximity_flag || target == user) - return + return FALSE + if(istype(target,/obj/effect/eldritch)) + remove_rune(target,user) + return FALSE playsound(user, 'sound/items/welder.ogg', 75, TRUE) if(ishuman(target)) var/mob/living/carbon/human/tar = target @@ -66,6 +71,7 @@ use_charge = TRUE var/mob/living/carbon/C = target C.adjustBruteLoss(10) + C.silent = 3 SECONDS C.AdjustKnockdown(5 SECONDS) C.adjustStaminaLoss(80) var/list/knowledge = cultie.get_all_knowledge() @@ -77,6 +83,25 @@ if(use_charge) return ..() +///Draws a rune on a selected turf +/obj/item/melee/touch_attack/mansus_fist/attack_self(mob/user) + + for(var/turf/T in range(1,user)) + if(is_type_in_typecache(T, blacklisted_turfs)) + to_chat(user, "The targeted terrain doesn't support runes!") + return + var/A = get_turf(user) + to_chat(user, "You start drawing a rune...") + + if(do_after(user,30 SECONDS,FALSE,A)) + new /obj/effect/eldritch/big(A) + +///Removes runes from the selected turf +/obj/item/melee/touch_attack/mansus_fist/proc/remove_rune(atom/target,mob/user) + to_chat(user, "You start removing a rune...") + if(do_after(user,2 SECONDS,target = user)) + qdel(target) + /obj/effect/proc_holder/spell/aoe_turf/rust_conversion name = "Aggressive Spread" desc = "Spreads rust onto nearby turfs." @@ -219,7 +244,7 @@ if(!can_target(targets[1], user)) return FALSE - for(var/mob/living/carbon/human/C in range(1,targets[1])) + for(var/mob/living/carbon/human/C in hearers(1,targets[1])) targets |= C @@ -362,7 +387,7 @@ playsound(get_turf(centre), 'sound/items/welder.ogg', 75, TRUE) var/_range = 1 for(var/i = 0, i <= max_range,i++) - for(var/turf/T in spiral_range_turfs(_range,centre)) + for(var/turf/open/T in spiral_range_turfs(_range,centre)) new /obj/effect/hotspot(T) T.hotspot_expose(700,50,1) _range++ @@ -405,13 +430,15 @@ /obj/effect/proc_holder/spell/targeted/fire_sworn/proc/remove() has_fire_ring = FALSE -/obj/effect/proc_holder/spell/targeted/fire_sworn/process() +/obj/effect/proc_holder/spell/targeted/fire_sworn/process(delta_time) . = ..() if(!has_fire_ring) return - for(var/turf/T in range(1,current_user)) + for(var/turf/open/T in RANGE_TURFS(1,current_user)) new /obj/effect/hotspot(T) - T.hotspot_expose(700,50,1) + T.hotspot_expose(700,250 * delta_time,1) + for(var/mob/living/livies in T.contents - current_user) + livies.adjustFireLoss(25 * delta_time) /obj/effect/proc_holder/spell/targeted/worm_contract @@ -460,7 +487,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/human_user = user - for(var/mob/living/carbon/target in view(7,user)) + for(var/mob/living/carbon/target in ohearers(7,user)) if(target.stat == DEAD || !target.on_fire) continue //This is essentially a death mark, use this to finish your opponent quicker. @@ -472,7 +499,7 @@ human_user.adjustBruteLoss(-10, FALSE) human_user.adjustFireLoss(-10, FALSE) human_user.adjustStaminaLoss(-10, FALSE) - human_user.adjustToxLoss(-10, FALSE) + human_user.adjustToxLoss(-10, FALSE, TRUE) human_user.adjustOxyLoss(-10) /obj/effect/proc_holder/spell/targeted/shed_human_form @@ -499,7 +526,7 @@ target.mind.transfer_to(outside, TRUE) target.forceMove(outside) target.apply_status_effect(STATUS_EFFECT_STASIS,STASIS_ASCENSION_EFFECT) - for(var/mob/living/carbon/human/humie in view(9,outside)-target) + for(var/mob/living/carbon/human/humie in (viewers(9,outside)-target)) if(IS_HERETIC(humie) || IS_HERETIC_MONSTER(humie)) continue SEND_SIGNAL(humie, COMSIG_ADD_MOOD_EVENT, "gates_of_mansus", /datum/mood_event/gates_of_mansus) @@ -556,7 +583,7 @@ to_chat(originator, "You begin linking [target]'s mind to yours...") to_chat(target, "You feel your mind being pulled... connected... intertwined with the very fabric of reality...") - if(!do_after(originator, 6 SECONDS, target)) + if(!do_after(originator, 6 SECONDS, target = target)) return if(!originator.link_mob(target)) to_chat(originator, "You can't seem to link [target]'s mind...") diff --git a/code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm index c2f404d8fbad1..7ecba7e1df168 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm @@ -7,7 +7,7 @@ job_rank = ROLE_HERETIC var/antag_hud_type = ANTAG_HUD_HERETIC var/antag_hud_name = "heretic_beast" - var/datum/antagonist/master + var/datum/antagonist/heretic/master /datum/antagonist/heretic_monster/admin_add(datum/mind/new_owner,mob/admin) new_owner.add_antag_datum(src) @@ -15,12 +15,14 @@ log_admin("[key_name(admin)] has heresized [key_name(new_owner)].") /datum/antagonist/heretic_monster/greet() - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ecult_op.ogg', 100, FALSE, pressure_affected = FALSE)//subject to change - to_chat(owner, "You became an Eldritch Horror!") + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ecult_op.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)//subject to change + to_chat(owner, "You became an Eldritch Horror, servant of [master]!") + owner.current.client?.tgui_panel?.give_antagonist_popup("Eldritch Horror", + "You are an Eldritch Horror, follow your master's orders.") /datum/antagonist/heretic_monster/on_removal() if(master) - to_chat(owner, "Your master is no longer [master.owner.current.real_name]") + to_chat(owner, "Your no longer bound to your master, [master.owner.current.real_name]") master = null return ..() diff --git a/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm index 92ce37df727f3..059c7567cfe4f 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm @@ -1,7 +1,7 @@ /datum/eldritch_knowledge/base_ash name = "Nightwatcher's secret" - desc = "Opens up the path of ash to you. Allows you to transmute a match with a kitchen knife or it's derivatives into an ashen blade." - gain_text = "City guard knows their watch. If you ask them at night they may tell you about the ashy lantern." + desc = "Opens up the Path of Ash to you. Allows you to transmute a match with a kitchen knife, or its derivatives, into an Ashen Blade." + gain_text = "The City Guard know their watch. If you ask them at night, they may tell you about the ashy lantern." banned_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/final/flesh_final) next_knowledge = list(/datum/eldritch_knowledge/ashen_grasp) required_atoms = list(/obj/item/kitchen/knife,/obj/item/match) @@ -9,10 +9,18 @@ cost = 1 route = PATH_ASH +/datum/eldritch_knowledge/base_ash/on_gain(mob/user) + . = ..() + ADD_TRAIT( user, TRAIT_NOFIRE, MAGIC_TRAIT) + +/datum/eldritch_knowledge/base_ash/on_lose(mob/user) + . = ..() + REMOVE_TRAIT( user, TRAIT_NOFIRE, MAGIC_TRAIT) + /datum/eldritch_knowledge/spell/ashen_shift name = "Ashen Shift" - gain_text = "Ash is all the same, how can one man master it all?" - desc = "Short range jaunt that can help you escape from bad situations." + gain_text = "The Nightwatcher was the first of them, his treason started it all." + desc = "A short range jaunt that can help you escape from bad situations." cost = 1 spell_to_add = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/ash next_knowledge = list(/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/essence,/datum/eldritch_knowledge/ashen_eyes) @@ -28,70 +36,57 @@ /datum/eldritch_knowledge/ashen_grasp/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters) . = ..() - if(!iscarbon(target)) + var/mob/living/carbon/C = target + if(!istype(C)) return + to_chat(C, "Your eyes burn horrifically!") //pocket sand! also, this is the message that changeling blind stings use, and no, I'm not ashamed about reusing it + C.become_nearsighted(EYE_DAMAGE) + C.blind_eyes(5) + C.blur_eyes(10) + return +/datum/eldritch_knowledge/ashen_grasp/on_eldritch_blade(atom/target, mob/user, proximity_flag, click_parameters) + . = ..() + if(!iscarbon(target)) + return var/mob/living/carbon/C = target var/datum/status_effect/eldritch/E = C.has_status_effect(/datum/status_effect/eldritch/rust) || C.has_status_effect(/datum/status_effect/eldritch/ash) || C.has_status_effect(/datum/status_effect/eldritch/flesh) if(E) - . = TRUE E.on_effect() for(var/X in user.mind.spell_list) if(!istype(X,/obj/effect/proc_holder/spell/targeted/touch/mansus_grasp)) continue var/obj/effect/proc_holder/spell/targeted/touch/mansus_grasp/MG = X MG.charge_counter = min(round(MG.charge_counter + MG.charge_max * 0.75),MG.charge_max) // refunds 75% of charge. - var/atom/throw_target = get_edge_target_turf(C, user.dir) - if(!C.anchored) - . = TRUE - C.throw_at(throw_target, rand(4,8), 14, user) - return - -/datum/eldritch_knowledge/ashen_eyes - name = "Ashen Eyes" - gain_text = "Piercing eyes may guide me through the mundane." - desc = "Allows you to craft thermal vision amulet by transmutating eyes with a glass shard." - cost = 1 - next_knowledge = list(/datum/eldritch_knowledge/spell/ashen_shift,/datum/eldritch_knowledge/flesh_ghoul) - required_atoms = list(/obj/item/organ/eyes,/obj/item/shard) - result_atoms = list(/obj/item/clothing/neck/eldritch_amulet) /datum/eldritch_knowledge/ash_mark name = "Mark of ash" - gain_text = "Spread the famine." - desc = "Your sickly blade now applies ash mark on hit. Use your mansus grasp to proc the mark. Mark of Ash causes stamina damage, and fire loss, and spreads to a nearby carbon. Damage decreases with how many times the mark has spread." + gain_text = "The Nightwatcher was a very particular man, always watching in the dead of night. But in spite of his duty, he regularly tranced through the manse with his blazing lantern held high." + desc = "Your Mansus Grasp now applies the Mark of Ash on hit. Attack the afflicted with your Sickly Blade to detonate the mark. Upon detonation, the Mark of Ash causes stamina damage and burn damage, and spreads to an additional nearby opponent. The damage decreases with each spread." cost = 2 - next_knowledge = list(/datum/eldritch_knowledge/curse/blindness) + next_knowledge = list(/datum/eldritch_knowledge/mad_mask) banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/flesh_mark) route = PATH_ASH -/datum/eldritch_knowledge/ash_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters) +/datum/eldritch_knowledge/ash_mark/on_mansus_grasp(target,user,proximity_flag,click_parameters) . = ..() if(isliving(target)) var/mob/living/living_target = target living_target.apply_status_effect(/datum/status_effect/eldritch/ash,5) -/datum/eldritch_knowledge/curse/blindness - name = "Curse of blindness" - gain_text = "Blind man walks through the world, unnoticed by the masses." - desc = "Curse someone with 2 minutes of complete blindness by sacrificing a pair of eyes, a screwdriver and a pool of blood, with an object that the victim has touched with their bare hands." - cost = 1 +/datum/eldritch_knowledge/mad_mask + name = "Mask of Madness" + gain_text = "He walks the world, unnoticed by the masses." + desc = "Allows you to transmute any mask, with a candle and a pair of eyes, to create a mask of madness, It causes passive stamina damage to everyone around the wearer and hallucinations, can be forced on a non believer to make him unable to take it off..." + result_atoms = list(/obj/item/clothing/mask/void_mask) required_atoms = list(/obj/item/organ/eyes,/obj/item/screwdriver,/obj/effect/decal/cleanable/blood) - next_knowledge = list(/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/curse/paralysis) - timer = 2 MINUTES + next_knowledge = list(/datum/eldritch_knowledge/guise,/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/curse/alteration) + cost = 1 route = PATH_ASH -/datum/eldritch_knowledge/curse/blindness/curse(mob/living/chosen_mob) - . = ..() - chosen_mob.become_blind(MAGIC_TRAIT) - -/datum/eldritch_knowledge/curse/blindness/uncurse(mob/living/chosen_mob) - . = ..() - chosen_mob.cure_blind(MAGIC_TRAIT) - /datum/eldritch_knowledge/spell/flame_birth name = "Flame Birth" - gain_text = "Nightwatcher was a man of principles, and yet he arose from the chaos he vowed to protect from." + gain_text = "The Nightwatcher was a man of principles, and yet his power arose from the chaos he vowed to combat." desc = "Short range spell that allows you to curse someone with massive sanity loss." cost = 1 spell_to_add = /obj/effect/proc_holder/spell/targeted/fiery_rebirth @@ -100,8 +95,8 @@ /datum/eldritch_knowledge/ash_blade_upgrade name = "Fiery blade" - gain_text = "May the sun burn the heretics." - desc = "Your blade of choice will now add firestacks." + gain_text = "Blade in hand, he swung and swung as the ash fell from the skies. His city, his people... all burnt to cinders, and yet life still remained in his charred body." + desc = "Your blade of choice will now light your enemies ablaze." cost = 2 next_knowledge = list(/datum/eldritch_knowledge/spell/flame_birth) banned_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/flesh_blade_upgrade) @@ -114,63 +109,17 @@ C.adjust_fire_stacks(1) C.IgniteMob() -/datum/eldritch_knowledge/curse/corrosion - name = "Curse of Corrosion" - gain_text = "Cursed land, cursed man, cursed mind." - desc = "Curse someone for 2 minutes of vomiting and major organ damage. Using a wirecutter, a spill of blood, a heart, left arm and a right arm, and an item that the victim touched with their bare hands." - cost = 1 - required_atoms = list(/obj/item/wirecutters,/obj/effect/decal/cleanable/blood,/obj/item/organ/heart,/obj/item/bodypart/l_arm,/obj/item/bodypart/r_arm) - next_knowledge = list(/datum/eldritch_knowledge/curse/blindness,/datum/eldritch_knowledge/spell/area_conversion) - timer = 2 MINUTES - -/datum/eldritch_knowledge/curse/corrosion/curse(mob/living/chosen_mob) - . = ..() - chosen_mob.apply_status_effect(/datum/status_effect/corrosion_curse) - -/datum/eldritch_knowledge/curse/corrosion/uncurse(mob/living/chosen_mob) - . = ..() - chosen_mob.remove_status_effect(/datum/status_effect/corrosion_curse) - -/datum/eldritch_knowledge/curse/paralysis - name = "Curse of Paralysis" - gain_text = "Corrupt their flesh, make them bleed." - desc = "Curse someone for 5 minutes of inability to walk. Using a knife, pool of blood, left leg, right leg, a hatchet and an item that the victim touched with their bare hands. " - cost = 1 - required_atoms = list(/obj/item/kitchen/knife,/obj/effect/decal/cleanable/blood,/obj/item/bodypart/l_leg,/obj/item/bodypart/r_leg,/obj/item/hatchet) - next_knowledge = list(/datum/eldritch_knowledge/curse/blindness,/datum/eldritch_knowledge/summon/raw_prophet) - timer = 5 MINUTES - -/datum/eldritch_knowledge/curse/paralysis/curse(mob/living/chosen_mob) - . = ..() - ADD_TRAIT(chosen_mob,TRAIT_PARALYSIS_L_LEG,MAGIC_TRAIT) - ADD_TRAIT(chosen_mob,TRAIT_PARALYSIS_R_LEG,MAGIC_TRAIT) - chosen_mob.update_mobility() - -/datum/eldritch_knowledge/curse/paralysis/uncurse(mob/living/chosen_mob) - . = ..() - REMOVE_TRAIT(chosen_mob,TRAIT_PARALYSIS_L_LEG,MAGIC_TRAIT) - REMOVE_TRAIT(chosen_mob,TRAIT_PARALYSIS_R_LEG,MAGIC_TRAIT) - chosen_mob.update_mobility() - -/datum/eldritch_knowledge/spell/cleave - name = "Blood Cleave" - gain_text = "At first i didn't know these instruments of war, but the priest told me to use them." - desc = "Gives AOE spell that causes heavy bleeding and blood loss." - cost = 1 - spell_to_add = /obj/effect/proc_holder/spell/pointed/cleave - next_knowledge = list(/datum/eldritch_knowledge/spell/rust_wave,/datum/eldritch_knowledge/spell/flame_birth) - /datum/eldritch_knowledge/final/ash_final name = "Ashlord's rite" - gain_text = "The forgotten lords have spoken! The lord of ash have come! Fear the fire!" - desc = "Bring 3 corpses onto a transmutation rune, you will become immune to fire ,space ,cold and other enviromental hazards and become overall sturdier to all other damages. You will gain a spell that passively creates ring of fire around you as well ,as you will gain a powerful abiltiy that let's you create a wave of flames all around you." + gain_text = "The Nightwatcher found the rite and shared it amongst mankind! For now I am one with the fire, WITNESS MY ASCENSION!" + desc = "Bring 3 corpses onto a transmutation rune, you will become immune to fire, the vacuum of space, cold and other enviromental hazards and become overall sturdier to all other damages. You will gain a spell that passively creates ring of fire around you as well ,as you will gain a powerful ability that lets you create a wave of flames all around you." required_atoms = list(/mob/living/carbon/human) cost = 3 route = PATH_ASH - var/list/trait_list = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER) + var/list/trait_list = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER) /datum/eldritch_knowledge/final/ash_final/on_finished_recipe(mob/living/user, list/atoms, loc) - priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the blaze, for Ashbringer [user.real_name] has come! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/ai/spanomalies.ogg') + priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the blaze, for the Ashlord, [user.real_name] has ascended! The flames shall consume all! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", ANNOUNCER_SPANOMALIES) user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/fire_cascade/big) user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/fire_sworn) var/mob/living/carbon/human/H = user @@ -186,7 +135,7 @@ return var/turf/L = get_turf(user) var/datum/gas_mixture/env = L.return_air() - for(var/turf/T in range(1,user)) + for(var/turf/T as() in RANGE_TURFS(1,user)) env = T.return_air() env.set_temperature(env.return_temperature() + 5 ) T.air_update_turf() diff --git a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm index eeeab79438e64..2225f85c2e64f 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm @@ -1,7 +1,11 @@ +#define GHOUL_MAX_HEALTH 25 +#define MUTE_MAX_HEALTH 50 +#define ORIGINAL_MAX_HEALTH 100 + /datum/eldritch_knowledge/base_flesh name = "Principle of Hunger" - desc = "Opens up the path of flesh to you. Allows you to transmute a pool of blood with a kitchen knife into a Flesh Blade" - gain_text = "Hundred's of us starved, but I.. I found the strength in my greed." + desc = "Opens up the Path of Flesh to you. Allows you to transmute a pool of blood with a kitchen knife, or its derivatives, into a Flesh Blade." + gain_text = "Hundreds of us starved, but not me... I found strength in my greed." banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/rust_final) next_knowledge = list(/datum/eldritch_knowledge/flesh_grasp) required_atoms = list(/obj/item/kitchen/knife,/obj/effect/decal/cleanable/blood) @@ -12,7 +16,7 @@ /datum/eldritch_knowledge/flesh_ghoul name = "Imperfect Ritual" desc = "Allows you to resurrect the dead as voiceless dead by sacrificing them on the transmutation rune with a poppy. Voiceless dead are mute and have 50 HP. You can only have 2 at a time." - gain_text = "I found notes.. notes of a ritual, it was unfinished and yet i still did it." + gain_text = "I found notes of a dark ritual, unfinished... yet still, I pushed forward." cost = 1 required_atoms = list(/mob/living/carbon/human,/obj/item/reagent_containers/food/snacks/grown/poppy) next_knowledge = list(/datum/eldritch_knowledge/flesh_mark,/datum/eldritch_knowledge/armor,/datum/eldritch_knowledge/ashen_eyes) @@ -41,7 +45,7 @@ return var/mob/dead/observer/C = pick(candidates) message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(humie)]) to replace an AFK player.") - humie.ghostize(0) + humie.ghostize(FALSE,SENTIENCE_ERASE) humie.key = C.key log_game("[key_name_admin(humie)] has become a voiceless dead, their master is [user.real_name]") @@ -52,10 +56,11 @@ ADD_TRAIT(humie, TRAIT_IGNOREDAMAGESLOWDOWN, MAGIC_TRAIT) ADD_TRAIT(humie, TRAIT_NOSTAMCRIT, MAGIC_TRAIT) ADD_TRAIT(humie, TRAIT_NOLIMBDISABLE, MAGIC_TRAIT) - humie.setMaxHealth(50) - humie.health = 50 // Voiceless dead are much tougher than ghouls + humie.setMaxHealth(MUTE_MAX_HEALTH) + humie.health = MUTE_MAX_HEALTH // Voiceless dead are much tougher than ghouls humie.become_husk() humie.faction |= "heretics" + humie.apply_status_effect(/datum/status_effect/ghoul) var/datum/antagonist/heretic_monster/heretic_monster = humie.mind.add_antag_datum(/datum/antagonist/heretic_monster) var/datum/antagonist/heretic/master = user.mind.has_antag_datum(/datum/antagonist/heretic) @@ -65,15 +70,19 @@ ghouls += humie /datum/eldritch_knowledge/flesh_ghoul/proc/remove_ghoul(datum/source) + SIGNAL_HANDLER + var/mob/living/carbon/human/humie = source ghouls -= humie + humie.setMaxHealth(ORIGINAL_MAX_HEALTH) + humie.remove_status_effect(/datum/status_effect/ghoul) humie.mind.remove_antag_datum(/datum/antagonist/heretic_monster) UnregisterSignal(source,COMSIG_MOB_DEATH) /datum/eldritch_knowledge/flesh_grasp name = "Grasp of Flesh" - gain_text = "My new found desire, it drove me to do great things! The Priest said." - desc = "Empowers your mansus grasp to be able to create a single ghoul out of a dead person. Ghouls have only 25 HP and look like husks." + gain_text = "My new found desires drove me to greater and greater heights." + desc = "Empowers your mansus grasp to be able to create a single ghoul out of a dead person. Ghouls have only 25 HP and look like husks to the heathens' eyes." cost = 1 next_knowledge = list(/datum/eldritch_knowledge/flesh_ghoul) var/ghoul_amt = 1 @@ -85,13 +94,6 @@ if(!ishuman(target) || target == user) return var/mob/living/carbon/human/human_target = target - var/datum/status_effect/eldritch/eldritch_effect = human_target.has_status_effect(/datum/status_effect/eldritch/rust) || human_target.has_status_effect(/datum/status_effect/eldritch/ash) || human_target.has_status_effect(/datum/status_effect/eldritch/flesh) - if(eldritch_effect) - . = TRUE - eldritch_effect.on_effect() - if(ishuman(target)) - var/mob/living/carbon/human/htarget = target - htarget.bleed_rate += 10 if(QDELETED(human_target) || human_target.stat != DEAD) return @@ -114,34 +116,48 @@ log_game("[key_name_admin(human_target)] has become a ghoul, their master is [user.real_name]") //we change it to true only after we know they passed all the checks . = TRUE - RegisterSignal(human_target,COMSIG_MOB_DEATH,.proc/remove_ghoul) + RegisterSignal(human_target,COMSIG_MOB_DEATH, .proc/remove_ghoul) human_target.revive(full_heal = TRUE, admin_revive = TRUE) ADD_TRAIT(human_target, TRAIT_NOSTAMCRIT, MAGIC_TRAIT) ADD_TRAIT(human_target, TRAIT_NOLIMBDISABLE, MAGIC_TRAIT) - human_target.setMaxHealth(25) - human_target.health = 25 + human_target.setMaxHealth(GHOUL_MAX_HEALTH) + human_target.health = GHOUL_MAX_HEALTH human_target.become_husk() + human_target.apply_status_effect(/datum/status_effect/ghoul) human_target.faction |= "heretics" var/datum/antagonist/heretic_monster/heretic_monster = human_target.mind.add_antag_datum(/datum/antagonist/heretic_monster) var/datum/antagonist/heretic/master = user.mind.has_antag_datum(/datum/antagonist/heretic) heretic_monster.set_owner(master) /datum/eldritch_knowledge/flesh_grasp/proc/remove_ghoul(datum/source) + SIGNAL_HANDLER + var/mob/living/carbon/human/humie = source spooky_scaries -= humie + humie.setMaxHealth(ORIGINAL_MAX_HEALTH) + humie.remove_status_effect(/datum/status_effect/ghoul) humie.mind.remove_antag_datum(/datum/antagonist/heretic_monster) UnregisterSignal(source, COMSIG_MOB_DEATH) +/datum/eldritch_knowledge/flesh_grasp/on_eldritch_blade(atom/target, mob/user, proximity_flag, click_parameters) + . = ..() + if(!ishuman(target)) + return + var/mob/living/carbon/C = target + var/datum/status_effect/eldritch/E = C.has_status_effect(/datum/status_effect/eldritch/rust) || C.has_status_effect(/datum/status_effect/eldritch/ash) || C.has_status_effect(/datum/status_effect/eldritch/flesh) + if(E) + E.on_effect() + /datum/eldritch_knowledge/flesh_mark - name = "Mark of flesh" - gain_text = "I saw them, the marked ones. The screams.. the silence." - desc = "Your sickly blade now applies mark of flesh status effect. To proc the mark, use your mansus grasp on the marked. Mark of flesh when procced causeds additional bleeding." + name = "Mark of Flesh" + gain_text = "I saw them, the marked ones. The screams... the silence." + desc = "Your Mansus Grasp now applies the Mark of Flesh on hit. Attack the afflicted with your Sickly Blade to detonate the mark. Upon detonation, the Mark of Flesh causes additional bleeding." cost = 2 next_knowledge = list(/datum/eldritch_knowledge/summon/raw_prophet) banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/ash_mark) route = PATH_FLESH -/datum/eldritch_knowledge/flesh_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters) +/datum/eldritch_knowledge/flesh_mark/on_mansus_grasp(target,user,proximity_flag,click_parameters) . = ..() if(isliving(target)) var/mob/living/living_target = target @@ -149,8 +165,8 @@ /datum/eldritch_knowledge/flesh_blade_upgrade name = "Bleeding Steel" - gain_text = "It rained blood, that's when i understood the gravekeeper's advice." - desc = "Your blade will now cause additional bleeding." + gain_text = "And then, blood rained from the heavens. That's when I finally understood the Marshal's teachings." + desc = "Your Sickly Blade will now cause additional bleeding." cost = 2 next_knowledge = list(/datum/eldritch_knowledge/summon/stalker) banned_knowledge = list(/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/rust_blade_upgrade) @@ -162,53 +178,26 @@ var/mob/living/carbon/human/H = target H.bleed_rate+= 2 - /datum/eldritch_knowledge/summon/raw_prophet name = "Raw Ritual" - gain_text = "Uncanny man, walks alone in the valley, I was able to call his aid." - desc = "You can now summon a Raw Prophet using eyes, a left arm, right arm and a pool of blood. Raw prophets have increased seeing range, as well as Xray. But are very fragile and weak." + gain_text = "The Uncanny Man, who walks alone in the valley between the worlds... I was able to summon his aid." + desc = "You can now summon a Raw Prophet by transmutating a pair of eyes, a left arm and a pool of blood. Raw prophets have increased seeing range, as well as X-Ray vision, but they are very fragile." cost = 1 required_atoms = list(/obj/item/organ/eyes,/obj/item/bodypart/l_arm,/obj/item/bodypart/r_arm,/obj/effect/decal/cleanable/blood) mob_to_summon = /mob/living/simple_animal/hostile/eldritch/raw_prophet - next_knowledge = list(/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/curse/paralysis) + next_knowledge = list(/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/curse/alteration) route = PATH_FLESH /datum/eldritch_knowledge/summon/stalker name = "Lonely Ritual" - gain_text = "I was able to combine my greed and desires to summon an eldritch beast i have not seen before." - desc = "You can now summon a Stalker using a knife, a flower, a pen and a piece of paper. Stalkers can shapeshift into harmeless animals and get close to the victim." + gain_text = "I was able to combine my greed and desires to summon an eldritch beast I had never seen before. An ever shapeshifting mass of flesh, it knew well my goals." + desc = "You can now summon a Stalker by transmutating a pair of eyes, a candle, a pen and a piece of paper. Stalkers can shapeshift into harmless animals to get close to the victim." cost = 1 required_atoms = list(/obj/item/kitchen/knife,/obj/item/reagent_containers/food/snacks/grown/poppy,/obj/item/pen,/obj/item/paper) mob_to_summon = /mob/living/simple_animal/hostile/eldritch/stalker next_knowledge = list(/datum/eldritch_knowledge/summon/ashy,/datum/eldritch_knowledge/summon/rusty,/datum/eldritch_knowledge/final/flesh_final) route = PATH_FLESH -/datum/eldritch_knowledge/summon/ashy - name = "Ashen Ritual" - gain_text = "I combined principle of hunger with desire of destruction. The eyeful lords have noticed me." - desc = "You can now summon an Ash Man by transmutating a pile of ash , a head and a book." - cost = 1 - required_atoms = list(/obj/effect/decal/cleanable/ash,/obj/item/bodypart/head,/obj/item/book) - mob_to_summon = /mob/living/simple_animal/hostile/eldritch/ash_spirit - next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/rust_wave) - -/datum/eldritch_knowledge/summon/rusty - name = "Rusted Ritual" - gain_text = "I combined principle of hunger with desire of corruption. The rusted hills call my name." - desc = "You can now summon a Rust Walker transmutating vomit pool, a head and a book." - cost = 1 - required_atoms = list(/obj/effect/decal/cleanable/vomit,/obj/item/bodypart/head,/obj/item/book) - mob_to_summon = /mob/living/simple_animal/hostile/eldritch/rust_spirit - next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/flame_birth) - -/datum/eldritch_knowledge/spell/blood_siphon - name = "Blood Siphon" - gain_text = "Our blood is all the same after all, the owl told me." - desc = "You gain a spell that drains enemies health and restores yours." - cost = 1 - spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/blood_siphon - next_knowledge = list(/datum/eldritch_knowledge/summon/raw_prophet,/datum/eldritch_knowledge/spell/area_conversion) - /datum/eldritch_knowledge/final/flesh_final name = "Priest's Final Hymn" gain_text = "Man of this world. Hear me! For the time of the lord of arms has come! Emperor of Flesh guides my army!" @@ -219,7 +208,7 @@ /datum/eldritch_knowledge/final/flesh_final/on_finished_recipe(mob/living/user, list/atoms, loc) . = ..() - priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Ever coiling vortex, Reality unfoiled. KING OF ARMS [user.real_name] has come! Fear the ever twisting hand! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/ai/spanomalies.ogg') + priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Ever coiling vortex. Reality unfolded. THE LORD OF ARMS, [user.real_name] has ascended! Fear the ever twisting hand! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", ANNOUNCER_SPANOMALIES) user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shed_human_form) if(!ishuman(user)) return @@ -231,3 +220,7 @@ ghoul1.ghoul_amt *= 3 var/datum/eldritch_knowledge/flesh_ghoul/ghoul2 = heretic.get_knowledge(/datum/eldritch_knowledge/flesh_ghoul) ghoul2.max_amt *= 3 + +#undef GHOUL_MAX_HEALTH +#undef MUTE_MAX_HEALTH +#undef ORIGINAL_MAX_HEALTH diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm index 6440f7cc1e9a2..7f079ca7e44ea 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm @@ -1,7 +1,7 @@ /datum/eldritch_knowledge/base_rust name = "Blacksmith's Tale" - desc = "Opens up the path of rust to you. Allows you to transmute a knife with any trash item into a Rusty Blade." - gain_text = "Let me tell you a story, blacksmith said as he glazed into his rusty blade." + desc = "Opens up the Path of Rust to you. Allows you to transmute a kitchen knife, or its derivatives, with any trash item into a Rusty Blade." + gain_text = "'Let me tell you a story', said the Blacksmith, as he gazed deep into his rusty blade." banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/flesh_final) next_knowledge = list(/datum/eldritch_knowledge/rust_fist) required_atoms = list(/obj/item/kitchen/knife,/obj/item/trash) @@ -10,9 +10,9 @@ route = PATH_RUST /datum/eldritch_knowledge/rust_fist - name = "Grasp of rust" - desc = "Empowers your mansus grasp to deal 500 damage to non-living matter and rust any turf it touches. Destroys already rusted turfs." - gain_text = "Rust grows on the ceiling of the mansus." + name = "Grasp of Rust" + desc = "Empowers your Mansus Grasp to deal 500 damage to non-living matter and rust any surface it touches. Already rusted surfaces are destroyed." + gain_text = "On the ceiling of the Mansus, rust grows as moss does on a stone." cost = 1 next_knowledge = list(/datum/eldritch_knowledge/rust_regen) var/rust_force = 500 @@ -21,54 +21,57 @@ /datum/eldritch_knowledge/rust_fist/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters) . = ..() + target.rust_heretic_act() + return TRUE + +/datum/eldritch_knowledge/rust_fist/on_eldritch_blade(atom/target, mob/user, proximity_flag, click_parameters) if(ishuman(target)) var/mob/living/carbon/human/H = target var/datum/status_effect/eldritch/E = H.has_status_effect(/datum/status_effect/eldritch/rust) || H.has_status_effect(/datum/status_effect/eldritch/ash) || H.has_status_effect(/datum/status_effect/eldritch/flesh) if(E) E.on_effect() H.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN,ORGAN_SLOT_EARS,ORGAN_SLOT_EYES,ORGAN_SLOT_LIVER,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_HEART),25) - target.rust_heretic_act() - return TRUE /datum/eldritch_knowledge/spell/area_conversion name = "Agressive Spread" - desc = "Spreads rust to nearby turfs. Destroys already rusted walls." - gain_text = "All men wise know not to touch the bound king." + desc = "Spreads rust to nearby surfaces. Already rusted surfaces are destroyed." + gain_text = "All wise men know well not to touch the Bound King." cost = 1 spell_to_add = /obj/effect/proc_holder/spell/aoe_turf/rust_conversion - next_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/spell/blood_siphon) + next_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/guise,/datum/eldritch_knowledge/spell/blood_siphon) route = PATH_RUST /datum/eldritch_knowledge/rust_regen name = "Leeching Walk" desc = "Passively heals you when you are on rusted tiles." - gain_text = "The strength was unparallel, it was unnatural. Blacksmith was smiling." + gain_text = "The strength was unparalleled, unnatural. The Blacksmith was smiling." cost = 1 next_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/armor,/datum/eldritch_knowledge/essence) route = PATH_RUST /datum/eldritch_knowledge/rust_regen/on_life(mob/user) - . = ..() + ..() var/turf/user_loc_turf = get_turf(user) if(!istype(user_loc_turf, /turf/open/floor/plating/rust) || !isliving(user)) return var/mob/living/living_user = user living_user.adjustBruteLoss(-2, FALSE) living_user.adjustFireLoss(-2, FALSE) - living_user.adjustToxLoss(-2, FALSE) + living_user.adjustToxLoss(-2, FALSE, TRUE) living_user.adjustOxyLoss(-0.5, FALSE) living_user.adjustStaminaLoss(-2) + living_user.AdjustAllImmobility(-5) /datum/eldritch_knowledge/rust_mark name = "Mark of Rust" - desc = "Your eldritch blade now applies a rust mark. Rust mark has a chance to deal between 0 to 200 damage to 75% of enemies items. To Detonate the mark use your mansus grasp on it." - gain_text = "Lords of the depths help those in dire need at a cost." + desc = "Your Mansus Grasp now applies the Mark of Rust on hit. Attack the afflicted with your Sickly Blade to detonate the mark. Upon detonation, the Mark of Rust has a chance to deal between 0 to 200 damage to 75% of your enemy's held items." + gain_text = "Rusted Hills help those in dire need at a cost." cost = 2 next_knowledge = list(/datum/eldritch_knowledge/spell/area_conversion) banned_knowledge = list(/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/flesh_mark) route = PATH_RUST -/datum/eldritch_knowledge/rust_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters) +/datum/eldritch_knowledge/rust_mark/on_mansus_grasp(target,user,proximity_flag,click_parameters) . = ..() if(isliving(target)) var/mob/living/living_target = target @@ -76,8 +79,9 @@ /datum/eldritch_knowledge/rust_blade_upgrade name = "Toxic blade" - gain_text = "Let the blade guide you through the flesh." - desc = "Your blade of choice will now add toxin to enemies bloodstream." + desc = "Your blade of choice will now poison your enemies on hit." + gain_text = "The Blade will guide you through the flesh, should you let it." + desc = "Your blade of choice will now transfer your pain as toxic damage." cost = 2 next_knowledge = list(/datum/eldritch_knowledge/spell/rust_wave) banned_knowledge = list(/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/flesh_blade_upgrade) @@ -85,9 +89,10 @@ /datum/eldritch_knowledge/rust_blade_upgrade/on_eldritch_blade(target,user,proximity_flag,click_parameters) . = ..() - if(iscarbon(target)) - var/mob/living/carbon/carbon_target = target - carbon_target.reagents.add_reagent(/datum/reagent/eldritch, 2) + var/mob/living/carbon/carbon_user = user + var/mob/living/carbon/carbon_target = target + if(istype(carbon_user) && istype(carbon_target)) + carbon_target.adjustToxLoss((carbon_user.maxHealth - carbon_user.health)/10) /datum/eldritch_knowledge/spell/rust_wave name = "Wave of Rust" @@ -98,37 +103,22 @@ next_knowledge = list(/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/spell/cleave,/datum/eldritch_knowledge/summon/rusty) route = PATH_RUST -/datum/eldritch_knowledge/armor - name = "Armorer's ritual" - desc = "You can now create eldritch armor using a table and a gas mask." - gain_text = "For I am the heir to the throne of doom." - cost = 1 - next_knowledge = list(/datum/eldritch_knowledge/rust_regen,/datum/eldritch_knowledge/flesh_ghoul) - required_atoms = list(/obj/structure/table,/obj/item/clothing/mask/gas) - result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/eldritch) - -/datum/eldritch_knowledge/essence - name = "Priest's ritual" - desc = "You can now transmute a tank of water into a bottle of eldritch water." - gain_text = "This is an old recipe, i got it from an owl." - cost = 1 - next_knowledge = list(/datum/eldritch_knowledge/rust_regen,/datum/eldritch_knowledge/spell/ashen_shift) - required_atoms = list(/obj/structure/reagent_dispensers/watertank) - result_atoms = list(/obj/item/reagent_containers/glass/beaker/eldritch) - /datum/eldritch_knowledge/final/rust_final name = "Rustbringer's Oath" - desc = "Bring 3 corpses onto the transmutation rune. After you finish the ritual rust will now automatically spread from the rune. Your healing on rust is also tripled, while you become more resillient overall." + desc = "Bring 3 corpses onto the transmutation rune. After you finish the ritual rust will now automatically spread from the rune. Your healing on rust is also tripled, while you become more resillient overall and space proof." gain_text = "Champion of rust. Corruptor of steel. Fear the dark for Rustbringer has come!" cost = 3 required_atoms = list(/mob/living/carbon/human) route = PATH_RUST + var/list/trait_list = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTLOWPRESSURE,TRAIT_NODISMEMBER) /datum/eldritch_knowledge/final/rust_final/on_finished_recipe(mob/living/user, list/atoms, loc) var/mob/living/carbon/human/H = user H.physiology.brute_mod *= 0.5 H.physiology.burn_mod *= 0.5 - priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the decay, for Rustbringer [user.real_name] has come! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/ai/spanomalies.ogg') + for(var/X in trait_list) + ADD_TRAIT(user,X,MAGIC_TRAIT) + priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", ANNOUNCER_SPANOMALIES) new /datum/rust_spread(loc) return ..() @@ -138,32 +128,33 @@ if(!finished) return var/mob/living/carbon/human/human_user = user - human_user.adjustBruteLoss(-3, FALSE) - human_user.adjustFireLoss(-3, FALSE) - human_user.adjustToxLoss(-3, FALSE) - human_user.adjustOxyLoss(-1, FALSE) - human_user.adjustStaminaLoss(-10) - + human_user.adjustBruteLoss(-4, FALSE) + human_user.adjustFireLoss(-4, FALSE) + human_user.adjustToxLoss(-4, FALSE, TRUE) + human_user.adjustOxyLoss(-2, FALSE) + human_user.adjustStaminaLoss(-20) + human_user.AdjustAllImmobility(-10) /** - * #Rust spread datum - * - * Simple datum that automatically spreads rust around it - * - * Simple implementation of automatically growing entity - */ + * #Rust spread datum + * + * Simple datum that automatically spreads rust around it + * + * Simple implementation of automatically growing entity + */ /datum/rust_spread var/list/edge_turfs = list() + var/turf/centre var/list/turfs = list() var/static/list/blacklisted_turfs = typecacheof(list(/turf/open/indestructible,/turf/closed/indestructible,/turf/open/space,/turf/open/lava,/turf/open/chasm)) - var/spread_per_tick = 6 + var/spread_per_sec = 6 /datum/rust_spread/New(loc) . = ..() - var/turf/turf_loc = get_turf(loc) - turf_loc.rust_heretic_act() - turfs += turf_loc + centre = get_turf(loc) + centre.rust_heretic_act() + turfs += centre START_PROCESSING(SSprocessing,src) @@ -171,28 +162,39 @@ STOP_PROCESSING(SSprocessing,src) return ..() -/datum/rust_spread/process() - compile_turfs() +/datum/rust_spread/process(delta_time) + var/spread_am = round(spread_per_sec * delta_time) + + if(edge_turfs.len < spread_am) + compile_turfs() + var/turf/T - for(var/i in 0 to spread_per_tick) + for(var/i in 0 to spread_am) + if(!edge_turfs.len) + continue T = pick(edge_turfs) + edge_turfs -= T T.rust_heretic_act() - turfs += get_turf(T) + turfs += T /** - * Compile turfs - * - * Recreates all edge_turfs as well as normal turfs. - */ + * Compile turfs + * + * Recreates all edge_turfs as well as normal turfs. + */ /datum/rust_spread/proc/compile_turfs() edge_turfs = list() - for(var/X in turfs) - if(!istype(X,/turf/closed/wall/rust) && !istype(X,/turf/closed/wall/r_wall/rust) && !istype(X,/turf/open/floor/plating/rust)) - turfs -=X + var/list/removal_list = list() + var/max_dist = 1 + for(var/turfie in turfs) + if(!istype(turfie,/turf/closed/wall/rust) && !istype(turfie,/turf/closed/wall/r_wall/rust) && !istype(turfie,/turf/open/floor/plating/rust)) + removal_list += turfie + max_dist = max(max_dist,get_dist(turfie,centre)+1) + turfs -= removal_list + for(var/turfie in spiral_range_turfs(max_dist,centre,FALSE)) + if(turfie in turfs || is_type_in_typecache(turfie,blacklisted_turfs)) continue - for(var/turf/T in range(1,X)) - if(T in turfs) - continue - if(is_type_in_typecache(T,blacklisted_turfs)) - continue - edge_turfs += T + for(var/line_turfie_owo in getline(turfie,centre)) + if(get_dist(turfie,line_turfie_owo) <= 1) + edge_turfs += turfie + CHECK_TICK diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index b211016c16e88..a0f0cd9324999 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -2,25 +2,32 @@ /datum/team/ert name = "Emergency Response Team" var/datum/objective/mission //main mission + var/ert_frequency + +/datum/team/ert/New(starting_members) + . = ..() + ert_frequency = get_free_team_frequency("cent") /datum/antagonist/ert name = "Emergency Response Officer" var/datum/team/ert/ert_team var/leader = FALSE var/datum/outfit/outfit = /datum/outfit/ert/security + var/datum/outfit/plasmaman_outfit = /datum/outfit/plasmaman/ert var/role = "Security Officer" var/list/name_source var/random_names = TRUE + can_elimination_hijack = ELIMINATION_PREVENT show_in_antagpanel = FALSE show_to_ghosts = TRUE antag_moodlet = /datum/mood_event/focused - can_hijack = HIJACK_PREVENT /datum/antagonist/ert/on_gain() if(random_names) update_name() forge_objectives() equipERT() + owner.store_memory("Your team's shared tracking beacon frequency is [ert_team.ert_frequency].") . = ..() /datum/antagonist/ert/get_team() @@ -77,13 +84,22 @@ name = "Deathsquad Trooper" outfit = /datum/outfit/death_commando role = "Trooper" + plasmaman_outfit = /datum/outfit/plasmaman/death_commando /datum/antagonist/ert/medic/inquisitor outfit = /datum/outfit/ert/medic/inquisitor +/datum/antagonist/ert/medic/inquisitor/on_gain() + . = ..() + owner.holy_role = HOLY_ROLE_PRIEST + /datum/antagonist/ert/security/inquisitor outfit = /datum/outfit/ert/security/inquisitor +/datum/antagonist/ert/security/inquisitor/on_gain() + . = ..() + owner.holy_role = HOLY_ROLE_PRIEST + /datum/antagonist/ert/chaplain role = "Chaplain" outfit = /datum/outfit/ert/chaplain @@ -93,14 +109,14 @@ /datum/antagonist/ert/chaplain/on_gain() . = ..() - owner.isholy = TRUE + owner.holy_role = HOLY_ROLE_PRIEST /datum/antagonist/ert/commander/inquisitor outfit = /datum/outfit/ert/commander/inquisitor /datum/antagonist/ert/commander/inquisitor/on_gain() . = ..() - owner.isholy = TRUE + owner.holy_role = HOLY_ROLE_PRIEST /datum/antagonist/ert/janitor role = "Janitor" @@ -110,6 +126,10 @@ role = "Heavy Duty Janitor" outfit = /datum/outfit/ert/janitor/heavy +/datum/antagonist/ert/kudzu + role = "Weed Whacker" + outfit = /datum/outfit/ert/kudzu + /datum/antagonist/ert/deathsquad/leader name = "Deathsquad Officer" outfit = /datum/outfit/death_commando/officer @@ -120,6 +140,7 @@ outfit = /datum/outfit/centcom_intern random_names = FALSE role = "Intern" + plasmaman_outfit = /datum/outfit/plasmaman/intern /datum/antagonist/ert/intern/leader name = "CentCom Head Intern" @@ -136,11 +157,13 @@ name = "Comedy Response Officer" outfit = /datum/outfit/centcom_clown role = "Prankster" + plasmaman_outfit = /datum/outfit/plasmaman/honk /datum/antagonist/ert/clown/honk name = "HONK Squad Trooper" outfit = /datum/outfit/centcom_clown/honk_squad role = "HONKER" + plasmaman_outfit = /datum/outfit/plasmaman/honk_squad /datum/antagonist/ert/create_team(datum/team/ert/new_team) if(istype(new_team)) @@ -154,7 +177,18 @@ var/mob/living/carbon/human/H = owner.current if(!istype(H)) return + if(isplasmaman(H)) + H.equipOutfit(plasmaman_outfit) + H.internal = H.get_item_for_held_index(2) + H.update_internals_hud_icon(1) H.equipOutfit(outfit) + //Set the suits frequency + var/obj/item/I = H.get_item_by_slot(ITEM_SLOT_OCLOTHING) + if(I) + var/datum/component/tracking_beacon/beacon = I.GetComponent(/datum/component/tracking_beacon) + if(beacon) + beacon.set_frequency(ert_team.ert_frequency) + /datum/antagonist/ert/greet() if(!ert_team) @@ -171,6 +205,8 @@ missiondesc += "Avoid civilian casualites when possible." missiondesc += "
Your Mission : [ert_team.mission.explanation_text]" + missiondesc += "
Your Shared Tracking Frequency : [ert_team.ert_frequency]" + to_chat(owner,missiondesc) /datum/antagonist/ert/deathsquad/greet() @@ -218,4 +254,4 @@ missiondesc += " Slip as many civilians as possible." missiondesc += "
Your Mission : [ert_team.mission.explanation_text]" - to_chat(owner,missiondesc) \ No newline at end of file + to_chat(owner,missiondesc) diff --git a/code/modules/antagonists/fugitive/fugitive.dm b/code/modules/antagonists/fugitive/fugitive.dm index 4e311b4c0634d..1208ad6817d55 100644 --- a/code/modules/antagonists/fugitive/fugitive.dm +++ b/code/modules/antagonists/fugitive/fugitive.dm @@ -35,7 +35,7 @@ switch(backstory) if("prisoner") to_chat(owner, "I can't believe we managed to break out of a Nanotrasen superjail! Sadly though, our work is not done. The emergency teleport at the station logs everyone who uses it, and where they went.") - to_chat(owner, "It won't be long until Centcom tracks where we've gone off to. I need to work with my fellow escapees to prepare for the troops Nanotrasen is sending, I'm not going back.") + to_chat(owner, "It won't be long until CentCom tracks where we've gone off to. I need to work with my fellow escapees to prepare for the troops Nanotrasen is sending, I'm not going back.") if("cultist") to_chat(owner, "Blessed be our journey so far, but I fear the worst has come to our doorstep, and only those with the strongest faith will survive.") to_chat(owner, "Our religion has been repeatedly culled by Nanotrasen because it is categorized as an \"Enemy of the Corporation\", whatever that means.") diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index 9ad730f7c6a56..bbeb0b90254f9 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -41,11 +41,11 @@ if(H.mind) H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null)) var/list/no_drops = list() - no_drops += H.get_item_by_slot(SLOT_SHOES) - no_drops += H.get_item_by_slot(SLOT_W_UNIFORM) - no_drops += H.get_item_by_slot(SLOT_WEAR_SUIT) - no_drops += H.get_item_by_slot(SLOT_HEAD) - no_drops += H.get_item_by_slot(SLOT_GLASSES) + no_drops += H.get_item_by_slot(ITEM_SLOT_FEET) + no_drops += H.get_item_by_slot(ITEM_SLOT_ICLOTHING) + no_drops += H.get_item_by_slot(ITEM_SLOT_OCLOTHING) + no_drops += H.get_item_by_slot(ITEM_SLOT_HEAD) + no_drops += H.get_item_by_slot(ITEM_SLOT_EYES) for(var/i in no_drops) var/obj/item/I = i ADD_TRAIT(I, TRAIT_NODROP, CURSED_ITEM_TRAIT) @@ -59,7 +59,7 @@ if(visualsOnly) return var/obj/item/organ/eyes/robotic/glow/eyes = new() - eyes.Insert(src, drop_if_replaced = FALSE) + eyes.Insert(H, drop_if_replaced = FALSE) /datum/outfit/spacepol name = "Spacepol Officer" @@ -132,14 +132,6 @@ /obj/item/ammo_casing/shotgun/incapacitate = 6 ) -/datum/outfit/bountygrapple/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - if(visualsOnly) - return - var/obj/item/card/id/W = H.wear_id - W.assignment = "Bounty Hunter" - W.registered_name = H.real_name - W.update_label() - /datum/outfit/bountysynth name = "Bounty Hunter - Synth" uniform = /obj/item/clothing/under/rank/prisoner @@ -156,15 +148,3 @@ backpack_contents = list( /obj/item/bountytrap = 4 ) - -/datum/outfit/bountysynth/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - if(visualsOnly) - return - var/datum/species/synth/synthetic_appearance = new() - H.set_species(synthetic_appearance) - synthetic_appearance.assume_disguise(synthetic_appearance, H) - H.update_hair() - var/obj/item/card/id/W = H.wear_id - W.assignment = "Bounty Hunter" - W.registered_name = H.real_name - W.update_label() diff --git a/code/modules/antagonists/fugitive/fugitive_ship.dm b/code/modules/antagonists/fugitive/fugitive_ship.dm index dfdf40f261247..56b0b67a8ed89 100644 --- a/code/modules/antagonists/fugitive/fugitive_ship.dm +++ b/code/modules/antagonists/fugitive/fugitive_ship.dm @@ -32,21 +32,11 @@ to_chat(fugitive, "You are thrown into a vast void of bluespace, and as you fall further into oblivion the comparatively small entrance to reality gets smaller and smaller until you cannot see it anymore. You have failed to avoid capture.") fugitive.ghostize(TRUE) //so they cannot suicide, round end stuff. -/obj/machinery/computer/shuttle/hunter +/obj/machinery/computer/shuttle_flight/hunter name = "shuttle console" shuttleId = "huntership" possible_destinations = "huntership_home;huntership_custom;whiteship_home;syndicate_nw" -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter - name = "shuttle navigation computer" - desc = "Used to designate a precise transit location to travel to." - shuttleId = "huntership" - lock_override = CAMERA_LOCK_STATION - shuttlePortId = "huntership_custom" - see_hidden = FALSE - jumpto_ports = list("huntership_home" = 1, "whiteship_home" = 1, "syndicate_nw" = 1) - view_range = 4.5 - /obj/structure/closet/crate/eva name = "EVA crate" diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm index 9691c2baee22f..10ea21f54944f 100644 --- a/code/modules/antagonists/gang/gang.dm +++ b/code/modules/antagonists/gang/gang.dm @@ -27,6 +27,8 @@ /datum/antagonist/gang/greet() gang.greet_gangster(owner) + owner.current.client?.tgui_panel?.give_antagonist_popup("Gangster", + "You rule the streets, assist your gang in taking over the station.") /datum/antagonist/gang/farewell() if(ishuman(owner.current)) @@ -103,8 +105,6 @@ . = ..() .["Promote"] = CALLBACK(src,.proc/admin_promote) .["Set Influence"] = CALLBACK(src, .proc/admin_adjust_influence) - if(gang.domination_time != NOT_DOMINATING) - .["Set domination time left"] = CALLBACK(src, .proc/set_dom_time_left) /datum/antagonist/gang/admin_add(datum/mind/new_owner,mob/admin) var/new_or_existing = input(admin, "Which gang do you want to be assigned to the user?", "Gangs") as null|anything in list("New","Existing") @@ -154,14 +154,6 @@ gang.remove_member(owner) owner.current.log_message("Has been deconverted from the [gang.name] gang!", INDIVIDUAL_ATTACK_LOG) -/datum/antagonist/gang/proc/set_dom_time_left(mob/admin) - if(gang.domination_time == NOT_DOMINATING) - return // an admin shouldn't need this - var/seconds = input(admin, "Set the time left for the gang to win, in seconds", "Domination time left") as null|num - if(seconds && seconds > 0) - gang.domination_time = world.time + seconds*10 - gang.message_gangtools("Takeover shortened to [gang.domination_time_remaining()] seconds by your Syndicate benefactors.") - // Boss type. Those can use gang tools to buy items for their gang, in particular the Dominator, used to win the gamemode, along with more gang tools to promote fellow gangsters to boss status. /datum/antagonist/gang/boss name = "Gang boss" @@ -187,10 +179,10 @@ return var/list/slots = list ( - "backpack" = SLOT_IN_BACKPACK, - "left pocket" = SLOT_L_STORE, - "right pocket" = SLOT_R_STORE, - "hands" = SLOT_HANDS + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET, + "hands" = ITEM_SLOT_HANDS ) if(gangtool) @@ -279,8 +271,11 @@ name = "Gang Lieutenant" message_name = "Lieutenant" +#define INFLUENCE_SWAG 2 +#define INFLUENCE_TERRITORY 0 +#define INFLUENCE_BASE 20 -#define MAXIMUM_RECALLS 3 +#define MAXIMUM_RECALLS 1 #define INFLUENCE_INTERVAL 1800 // Gang team datum. This handles the gang itself. /datum/team/gang @@ -293,15 +288,15 @@ var/list/lost_territories = list() // territories lost by the gang. var/list/new_territories = list() // territories captured by the gang. var/list/gangtools = list() - var/domination_time = NOT_DOMINATING - var/dom_attempts = INITIAL_DOM_ATTEMPTS var/color + var/winner = FALSE //winner winner chicken dinner var/influence = 0 // influence of the gang, based on how many territories they own. Can be used to buy weapons and tools from a gang uplink. - var/winner // Once the gang wins with a dominator, this becomes true. For roundend credits purposes. - var/list/inner_outfits = list() - var/list/outer_outfits = list() + var/victory_points = 0 // influence earned throughout the round, used at eotg to calculate most efficient gang var/next_point_time var/recalls = MAXIMUM_RECALLS // Once this reaches 0, this gang cannot force recall the shuttle with their gangtool anymore + var/obj/item/clothing/head/hat + var/obj/item/clothing/under/outfit + var/obj/item/clothing/suit/suit /datum/team/gang/New(starting_members) . = ..() @@ -343,14 +338,14 @@ return "
[report.Join("
")]
"
-/datum/team/gang/proc/greet_gangster(datum/mind/gangster)
+/datum/team/gang/proc/greet_gangster(datum/mind/gangster)//THIS NEEDS REVISION
to_chat(gangster, "You are now a member of the [name] Gang!")
to_chat(gangster, "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station.")
- to_chat(gangster, "Their ultimate objective is to take over the station with a Dominator machine.")
+ to_chat(gangster, "Your objective is to take over as many territories as possible, and expand the influence of your gang.")
to_chat(gangster, "You can identify your mates by their large, bright \[G\] icon.")
gangster.store_memory("You are a member of the [name] Gang!")
-/datum/team/gang/proc/handle_territories()
+/datum/team/gang/proc/handle_territories() //influence is counted here
next_point_time = world.time + INFLUENCE_INTERVAL
if(!leaders.len)
return
@@ -388,20 +383,16 @@
lost_territories = list()
var/total_territories = total_claimable_territories()
var/control = round((territories.len/total_territories)*100, 1)
- var/uniformed = check_clothing()
+ var/uniformed = count_gang_swag()
message += "Your gang now has [control]% control of the station.")]
*---------*
" - if(domination_time != NOT_DOMINATING) - var/new_time = max(world.time, domination_time - (uniformed * 4) - (territories.len * 2)) - if(new_time < domination_time) - message += "Takeover shortened by [(domination_time - new_time)*0.1] seconds for defending [territories.len] territories.
" - domination_time = new_time - message += "[domination_time_remaining()] seconds remain in hostile takeover.
" - else - var/new_influence = check_territory_income() - if(new_influence != influence) - message += "Gang influence has increased by [new_influence - influence] for defending [territories.len] territories and [uniformed] uniformed gangsters.
" - influence = new_influence - message += "Your gang now has [influence] influence.
" + + var/new_influence = update_influence() + influence = min(999,influence+new_influence) + victory_points += new_influence + if(new_influence > 0) + message += "Gang influence has increased by [new_influence] for defending [territories.len] territories and [uniformed] swag.
" + message += "Your gang now has [influence] influence.
" + message_gangtools(message) addtimer(CALLBACK(src, .proc/handle_territories), INFLUENCE_INTERVAL) @@ -411,39 +402,33 @@ for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION)) //First, collect all area types on the station zlevel for(var/ar in SSmapping.areas_in_z["[z]"]) var/area/A = ar - if(!(A.type in valid_territories) && A.valid_territory) + if(!(A.type in valid_territories) && A.area_flags & VALID_TERRITORY) valid_territories |= A.type return valid_territories.len -/datum/team/gang/proc/check_territory_income() - var/new_influence = min(999,influence + 15 + (check_clothing() * 2) + territories.len) - return new_influence +/datum/team/gang/proc/update_influence() + return min(999,influence + INFLUENCE_BASE + (count_gang_swag()) + LAZYLEN(territories) * INFLUENCE_TERRITORY) -/datum/team/gang/proc/check_clothing() - //Count uniformed gangsters - var/uniformed = 0 +/datum/team/gang/proc/count_gang_swag() + //Count swag on gangsters + var/swag = 0 for(var/datum/mind/gangmind in members) if(ishuman(gangmind.current)) - var/mob/living/carbon/human/gangster = gangmind.current - //Gangster must be alive and on station - if((gangster.stat == DEAD) || (is_station_level(gangster.z))) - continue - - var/obj/item/clothing/outfit - var/obj/item/clothing/gang_outfit - if(gangster.w_uniform) - outfit = gangster.w_uniform - if(outfit.type in inner_outfits) - gang_outfit = outfit - if(gangster.wear_suit) - outfit = gangster.wear_suit - if(outfit.type in outer_outfits) - gang_outfit = outfit - - if(gang_outfit) - gangster << "The [src] Gang's influence grows as you wear [gang_outfit]." - uniformed++ - return uniformed + swag+=check_gangster_swag(gangmind.current) + return swag + +/datum/team/gang/proc/check_gangster_swag(var/mob/living/carbon/human/gangster) + //Gangster must be alive and on station + var/swag = 1 + if((gangster.stat == DEAD) || !(is_station_level(gangster.z))) + return FALSE + if (gangster.w_uniform?.type == outfit) + swag *= INFLUENCE_SWAG + if (gangster.wear_suit?.type == suit) + swag *= INFLUENCE_SWAG + if (gangster.head?.type == hat) + swag *= INFLUENCE_SWAG + return swag /datum/team/gang/proc/adjust_influence(value) influence = max(0, influence + value) @@ -461,17 +446,8 @@ playsound(mob.loc, 'sound/machines/twobeep.ogg', 50, 1) return -/datum/team/gang/proc/domination() - domination_time = world.time + determine_domination_time()*10 - set_security_level("delta") - -/datum/team/gang/proc/determine_domination_time() // calculates the value in seconds (this is the initial domination time!) - var/total_territories = total_claimable_territories() - return max(180,480 - (round((territories.len/total_territories)*100, 1) * 9)) - -/datum/team/gang/proc/domination_time_remaining() // retrieves the value from world.time based deciseconds to seconds - var/diff = domination_time - world.time - return round(diff * 0.1) - #undef MAXIMUM_RECALLS -#undef INFLUENCE_INTERVAL +#undef INFLUENCE_INTERVAL +#undef INFLUENCE_SWAG +#undef INFLUENCE_TERRITORY +#undef INFLUENCE_BASE \ No newline at end of file diff --git a/code/modules/antagonists/gang/gang_datums.dm b/code/modules/antagonists/gang/gang_datums.dm index bd1ce8f94d745..b02ac8a30fd28 100644 --- a/code/modules/antagonists/gang/gang_datums.dm +++ b/code/modules/antagonists/gang/gang_datums.dm @@ -1,126 +1,146 @@ // Gang datums go here. If you want to create a new gang, you must be sure to edit: // name // color (must be a hex, "blue" isn't acceptable due to how spraycans are handled) -// inner_outfits (must be a list() with typepaths of the clothes in it. One is fine, but there is support for multiple: one will be picked at random when bought) -// outer_outfits (same as above) +// hat/outfit/suit is the type of items that will count towards the points/scoring. Lists are nice and all, but they weren't really used at all... ever. And were just expensive // You also need to make a gang graffiti, that will go in crayondecal.dmi inside our icons(not tg's), with the same name of the gang it's assigned to. Nothing else,just the icon. // Those are all required. If one is missed, stuff could break. /datum/team/gang/clandestine name = "Clandestine" color = "#FF0000" - inner_outfits = list(/obj/item/clothing/under/syndicate/combat) - outer_outfits = list(/obj/item/clothing/suit/jacket) + hat = /obj/item/clothing/head/beanie/black + outfit = /obj/item/clothing/under/syndicate/combat + suit = /obj/item/clothing/suit/jacket /datum/team/gang/prima name = "Prima" - color = "#FFFF00" - inner_outfits = list(/obj/item/clothing/under/color/yellow) - outer_outfits = list(/obj/item/clothing/suit/hastur) + color = "#FFFF00" //cluck cluck clan + hat = /obj/item/clothing/head/chicken + outfit = /obj/item/clothing/under/color/yellow + suit = /obj/item/clothing/suit/chickensuit /datum/team/gang/zerog name = "Zero-G" - color = "#C0C0C0" - inner_outfits = list(/obj/item/clothing/under/suit/white) - outer_outfits = list(/obj/item/clothing/suit/hooded/wintercoat) + color = "#00FFFF" + outfit = /obj/item/clothing/under/color/blue + suit = /obj/item/clothing/suit/apron + hat = /obj/item/clothing/head/beanie/stripedblue /datum/team/gang/max name = "Max" color = "#800000" - inner_outfits = list(/obj/item/clothing/under/color/maroon) - outer_outfits = list(/obj/item/clothing/suit/poncho/red) + hat = /obj/item/clothing/head/that + outfit = /obj/item/clothing/under/costume/joker + suit = /obj/item/clothing/suit/joker /datum/team/gang/blasto name = "Blasto" color = "#000080" - inner_outfits = list(/obj/item/clothing/under/suit/navy) - outer_outfits = list(/obj/item/clothing/suit/jacket/miljacket) + hat = /obj/item/clothing/head/beret/navy + outfit = /obj/item/clothing/under/suit/navy + suit = /obj/item/clothing/suit/jacket/miljacket /datum/team/gang/waffle name = "Waffle" color = "#808000" - inner_outfits = list(/obj/item/clothing/under/suit/green) - outer_outfits = list(/obj/item/clothing/suit/poncho) + hat = /obj/item/clothing/head/sombrero/green + outfit = /obj/item/clothing/under/suit/green + suit = /obj/item/clothing/suit/poncho/green /datum/team/gang/north name = "North" - color = "#00FF00" - inner_outfits = list(/obj/item/clothing/under/color/green) - outer_outfits = list(/obj/item/clothing/suit/poncho/green) + color = "#C0C0C0" + hat = /obj/item/clothing/head/snowman + outfit = /obj/item/clothing/under/suit/white + suit = /obj/item/clothing/suit/snowman /datum/team/gang/omni name = "Omni" color = "#008080" - inner_outfits = list(/obj/item/clothing/under/color/teal) - outer_outfits = list(/obj/item/clothing/suit/chaplainsuit/studentuni) + hat = /obj/item/clothing/head/soft/blue + outfit = /obj/item/clothing/under/color/teal + suit = /obj/item/clothing/suit/apron/overalls /datum/team/gang/newton name = "Newton" color = "#A52A2A" - inner_outfits = list(/obj/item/clothing/under/color/brown) - outer_outfits = list(/obj/item/clothing/suit/toggle/owlwings) + hat = /obj/item/clothing/head/griffin + outfit = /obj/item/clothing/under/color/brown + suit = /obj/item/clothing/suit/toggle/owlwings/griffinwings /datum/team/gang/cyber name = "Cyber" - color = "#808000" - inner_outfits = list(/obj/item/clothing/under/color/lightbrown) - outer_outfits = list(/obj/item/clothing/suit/nemes) + color = "#0000FF" + hat = /obj/item/clothing/head/helmet/rus_ushanka + outfit = /obj/item/clothing/under/color/darkblue + suit = /obj/item/clothing/suit/security/officer/russian /datum/team/gang/donk name = "Donk" - color = "#0000FF" - inner_outfits = list(/obj/item/clothing/under/color/darkblue) - outer_outfits = list(/obj/item/clothing/suit/apron/overalls) + color = "#808000" + hat = /obj/item/clothing/head/beret/black + outfit = /obj/item/clothing/under/color/green + suit = /obj/item/clothing/suit/jacket/puffer/vest /datum/team/gang/gene name = "Gene" - color = "#00FFFF" - inner_outfits = list(/obj/item/clothing/under/color/blue) - outer_outfits = list(/obj/item/clothing/suit/apron) + color = "#00FF00" + hat = /obj/item/clothing/head/soft/green + outfit = /obj/item/clothing/under/color/green + suit = /obj/item/clothing/suit/toggle/labcoat/mad /datum/team/gang/gib name = "Gib" color = "#000000" - inner_outfits = list(/obj/item/clothing/under/color/black) - outer_outfits = list(/obj/item/clothing/suit/jacket/leather/overcoat) + outfit = /obj/item/clothing/under/color/black + suit = /obj/item/clothing/suit/toggle/lawyer/black + hat = /obj/item/clothing/head/bowler /datum/team/gang/diablo name = "Diablo" color = "#FF0000" - inner_outfits = list(/obj/item/clothing/under/color/red) - outer_outfits = list(/obj/item/clothing/suit/jacket/leather) + outfit = /obj/item/clothing/under/color/red + suit = /obj/item/clothing/suit/jacket/leather + hat = /obj/item/clothing/head/beret /datum/team/gang/psyke name = "Psyke" color = "#808080" - inner_outfits = list(/obj/item/clothing/under/color/grey) - outer_outfits = list(/obj/item/clothing/suit/toggle/owlwings/griffinwings) + hat = /obj/item/clothing/head/soft/rainbow + suit = /obj/item/clothing/suit/poncho/ponchoshame + outfit = /obj/item/clothing/under/color/rainbow /datum/team/gang/osiron name = "Osiron" color = "#FFFFFF" - inner_outfits = list(/obj/item/clothing/under/color/white) - outer_outfits = list(/obj/item/clothing/suit/toggle/labcoat) + outfit = /obj/item/clothing/under/costume/roman + hat = /obj/item/clothing/head/helmet/roman/legionnaire/fake + suit = /obj/item/clothing/suit/toggle/owlwings /datum/team/gang/sirius name = "Sirius" color = "#FFC0CB" - inner_outfits = list(/obj/item/clothing/under/color/pink) + hat = /obj/item/clothing/head/fedora + outfit = /obj/item/clothing/under/color/white + suit = /obj/item/clothing/suit/nerdshirt /datum/team/gang/sleepingcarp name = "Sleeping Carp" color = "#800080" - inner_outfits = list(/obj/item/clothing/under/color/lightpurple) - outer_outfits = list(/obj/item/clothing/suit/hooded/carp_costume) + outfit = /obj/item/clothing/under/color/lightpurple + suit = /obj/item/clothing/suit/toggle/lawyer/purple + hat = /obj/item/clothing/head/hooded/carp_hood /datum/team/gang/rigatonifamily name = "Rigatoni family" color = "#cc9900" // p a s t a colored - inner_outfits = list(/obj/item/clothing/under/rank/civilian/chef) - outer_outfits = list(/obj/item/clothing/suit/apron/chef) + outfit = /obj/item/clothing/under/rank/civilian/chef + suit = /obj/item/clothing/suit/apron/chef + hat = /obj/item/clothing/head/chefhat /datum/team/gang/weed name = "Weed" color = "#66ff33" - inner_outfits = list(/obj/item/clothing/under/color/darkgreen) - outer_outfits = list(/obj/item/clothing/suit/vapeshirt) + hat = /obj/item/clothing/head/beanie/rasta + outfit = /obj/item/clothing/under/color/green + suit = /obj/item/clothing/suit/vapeshirt diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm index bde21c26ae23d..5d063ffaccdc6 100644 --- a/code/modules/antagonists/highlander/highlander.dm +++ b/code/modules/antagonists/highlander/highlander.dm @@ -3,7 +3,7 @@ var/obj/item/claymore/highlander/sword show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE - can_hijack = HIJACK_HIJACKER + can_elimination_hijack = ELIMINATION_ENABLED /datum/antagonist/highlander/apply_innate_effects(mob/living/mob_override) var/mob/living/L = owner.current || mob_override @@ -18,13 +18,9 @@ steal_objective.owner = owner steal_objective.set_target(new /datum/objective_item/steal/nukedisc) objectives += steal_objective - log_objective(owner, steal_objective.explanation_text) - - var/datum/objective/hijack/hijack_objective = new - hijack_objective.explanation_text = "Escape on the shuttle alone. Ensure that nobody else makes it out." - hijack_objective.owner = owner - objectives += hijack_objective - log_objective(owner, hijack_objective.explanation_text) + var/datum/objective/elimination/highlander/elimination_objective = new + elimination_objective.owner = owner + objectives += elimination_objective /datum/antagonist/highlander/on_gain() forge_objectives() @@ -38,6 +34,8 @@ Activate it in your hand, and it will lead to the nearest target. Attack the nuclear authentication disk with it, and you will store it.") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Highlander", + "Locate victims to fall to your sword and claim the nuclear authentication disk for yourself.") /datum/antagonist/highlander/proc/give_equipment() var/mob/living/carbon/human/H = owner.current @@ -48,11 +46,11 @@ qdel(I) for(var/obj/item/I in H.held_items) qdel(I) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt/highlander(H), SLOT_W_UNIFORM) - H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_EARS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), SLOT_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_SHOES) - H.equip_to_slot_or_del(new /obj/item/pinpointer/nuke(H), SLOT_L_STORE) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt/highlander(H), ITEM_SLOT_ICLOTHING) + H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), ITEM_SLOT_EARS) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), ITEM_SLOT_FEET) + H.equip_to_slot_or_del(new /obj/item/pinpointer/nuke(H), ITEM_SLOT_LPOCKET) for(var/obj/item/pinpointer/nuke/P in H) P.attack_self(H) var/obj/item/card/id/W = new(H) @@ -63,7 +61,7 @@ W.registered_name = H.real_name ADD_TRAIT(W, TRAIT_NODROP, HIGHLANDER) W.update_label(H.real_name) - H.equip_to_slot_or_del(W, SLOT_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) sword = new(H) if(!GLOB.highlander) diff --git a/code/modules/antagonists/hivemind/hivemind.dm b/code/modules/antagonists/hivemind/hivemind.dm index dd2fbeb2e6820..d54936102b579 100644 --- a/code/modules/antagonists/hivemind/hivemind.dm +++ b/code/modules/antagonists/hivemind/hivemind.dm @@ -277,6 +277,12 @@ owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/assimilation.ogg', 100, FALSE, pressure_affected = FALSE) owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Hivemind", + "Your psionic powers will grow by assimilating the crew into your hive. Use the Assimilate Vessel spell on a stationary \ + target, and after ten seconds he will be one of the hive. This is completely silent and safe to use, and failing will reset the cooldown. As \ + you assimilate the crew, you will gain more powers to use. Most are silent and won't help you in a fight, but grant you great power over your \ + vessels. Hover your mouse over a power's action icon for an extended description on what it does. There are other hiveminds onboard the station, \ + collaboration is possible, but a strong enough hivemind can reap many rewards from a well planned betrayal.") /datum/antagonist/hivemind/roundend_report() var/list/result = list() diff --git a/code/modules/antagonists/incursion/incursion.dm b/code/modules/antagonists/incursion/incursion.dm index 1db2161ab5632..8e98e740fe21f 100644 --- a/code/modules/antagonists/incursion/incursion.dm +++ b/code/modules/antagonists/incursion/incursion.dm @@ -5,7 +5,7 @@ var/special_role = ROLE_INCURSION var/datum/team/incursion/team antag_moodlet = /datum/mood_event/focused - can_hijack = HIJACK_HIJACKER + hijack_speed = 0.5 /datum/antagonist/incursion/create_team(datum/team/incursion/new_team) if(!new_team) @@ -53,6 +53,8 @@ to_chat(owner.current, "You have formed a team of Syndicate members with a similar mindset and must infiltrate the ranks of the station!") to_chat(owner.current, "You have been implanted with a syndicate headset for communication with your team. This headset can only be heard by you directly and if those pigs at Nanotrasen try to steal it they will violently explode!") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Incursion", + "Work with your team members to complete your objectives.") /datum/antagonist/incursion/apply_innate_effects(mob/living/mob_override) if(issilicon(owner)) @@ -89,9 +91,18 @@ log_admin("[key_name(admin)] made [key_name(new_owner)] and [key_name(new_owner.current)] into incursion traitor team.") /datum/antagonist/incursion/proc/equip(var/silent = FALSE) - var/obj/item/uplink/incursion/uplink = new(owner, owner.key, 15) - owner.current.equip_to_slot(uplink, SLOT_IN_BACKPACK) - to_chat(owner.current, "You have been equipped with a syndicate uplink located in your backpack. Activate the transponder in hand to access the market.") + var/obj/item/uplink/incursion/uplink = new(get_turf(owner.current), owner.key, 15) + var/where + if(ishuman(owner.current)) //if he's not a human, uplink will spawn under his feet + var/mob/living/carbon/human/H = owner.current + var/static/list/slots = list( + "in your backpack" = ITEM_SLOT_BACKPACK, + "in your left pocket" = ITEM_SLOT_LPOCKET, + "in your right pocket" = ITEM_SLOT_RPOCKET, + "in your hands" = ITEM_SLOT_HANDS + ) + where = H.equip_in_one_of_slots(uplink, slots, FALSE) + to_chat(owner.current, "You have been equipped with a syndicate uplink located [where ? where : "at your feet"]. Activate the transponder in hand to access the market.") var/obj/item/implant/radio/syndicate/selfdestruct/syndio = new syndio.implant(owner.current) @@ -151,8 +162,8 @@ for(var/i = 1 to max(1, CONFIG_GET(number/incursion_objective_amount))) forge_single_objective(CLAMP((5 + !is_hijacker)-i, 1, 3)) //Hijack = 3, 2, 1, 1 no hijack = 3, 3, 2, 1 if(is_hijacker) - if(!(locate(/datum/objective/hijack/single) in objectives)) - add_objective(new/datum/objective/hijack/single) + if(!(locate(/datum/objective/hijack) in objectives)) + add_objective(new/datum/objective/hijack) else if(!(locate(/datum/objective/escape/single) in objectives)) add_objective(new/datum/objective/escape/single, FALSE) @@ -167,6 +178,9 @@ //Kill head var/datum/objective/assassinate/killchosen = new var/current_heads = SSjob.get_all_heads() + if(!current_heads) + generate_traitor_kill_objective() + return var/datum/mind/selected = pick(current_heads) if(selected.special_role) generate_traitor_kill_objective() @@ -200,6 +214,7 @@ target.make_Traitor() to_chat(target, "You have been declared an ex-communicate of the syndicate and are being hunted down.") to_chat(target, "You have stolen syndicate objective documents, complete the objectives to throw off the syndicate and sabotage their efforts.") + target.store_memory("You have been declared an ex-communicate of the syndicate and are being hunted down by a group of traitors. Be careful!") //Create objective var/datum/objective/assassinate/incursion/killchosen = new killchosen.target = target @@ -208,4 +223,3 @@ /datum/team/incursion/antag_listing_name() return "[name]" - diff --git a/code/modules/antagonists/monkey/monkey.dm b/code/modules/antagonists/monkey/monkey.dm index e3b3688b031fb..087919471c082 100644 --- a/code/modules/antagonists/monkey/monkey.dm +++ b/code/modules/antagonists/monkey/monkey.dm @@ -36,6 +36,8 @@ to_chat(owner, "As an intelligent monkey, you know how to use technology and how to ventcrawl while wearing things.") to_chat(owner, "You can use :k to talk to fellow monkeys!") SEND_SOUND(owner.current, sound('sound/ambience/antag/monkey.ogg')) + owner.current.client?.tgui_panel?.give_antagonist_popup("Monkey", + "Bite other humans to infect them and escape on the emergency shuttle to succeed.") /datum/antagonist/monkey/on_removal() owner.special_role = null @@ -69,17 +71,8 @@ /datum/antagonist/monkey/admin_remove(mob/admin) var/mob/living/carbon/monkey/M = owner.current - if(istype(M)) - switch(alert(admin, "Humanize?", "Humanize", "Yes", "No")) - if("Yes") - if(admin == M) - admin = M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG) - else - M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG) - if("No") - //nothing - else - return + if(alert(admin, "Humanize?", "Humanize", "Yes", "No") == "Yes") + M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG) . = ..() /datum/antagonist/monkey/leader @@ -88,17 +81,8 @@ /datum/antagonist/monkey/leader/admin_add(datum/mind/new_owner,mob/admin) var/mob/living/carbon/human/H = new_owner.current - if(istype(H)) - switch(alert(admin, "Monkeyize?", "Monkeyize", "Yes", "No")) - if("Yes") - if(admin == H) - admin = H.monkeyize() - else - H.monkeyize() - if("No") - //nothing - else - return + if(alert(admin, "Monkeyize?", "Monkeyize", "Yes", "No") == "Yes") + H.monkeyize() new_owner.add_antag_datum(src) log_admin("[key_name(admin)] made [key_name(new_owner)] a monkey leader!") message_admins("[key_name_admin(admin)] made [key_name_admin(new_owner)] a monkey leader!") @@ -126,6 +110,8 @@ to_chat(owner, "As an initial infectee, you will be considered a 'leader' by your fellow monkeys.") to_chat(owner, "You can use :k to talk to fellow monkeys!") SEND_SOUND(owner.current, sound('sound/ambience/antag/monkey.ogg')) + owner.current.client?.tgui_panel?.give_antagonist_popup("Monkey Leader", + "Bite other humans to infect them and escape on the emergency shuttle to succeed.") /datum/objective/monkey explanation_text = "Ensure that infected monkeys escape on the emergency shuttle!" diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index a166ad52f7b1f..a2deda36633b1 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -37,10 +37,12 @@ var/atom/movable/form = null var/morph_time = 0 var/static/list/blacklist_typecache = typecacheof(list( - /obj/screen, + /atom/movable/screen, /obj/singularity, /mob/living/simple_animal/hostile/morph, - /obj/effect)) + /obj/effect, + /mob/camera + )) var/atom/movable/throwatom = null var/playstyle_string = "You are a morph, an abomination of science created primarily with changeling cells. \ @@ -50,6 +52,9 @@ You can attack any item or dead creature to consume it - creatures will restore your health. \ Finally, you can restore yourself to your original form while morphed by shift-clicking yourself." + mobchatspan = "blob" + discovery_points = 2000 + /mob/living/simple_animal/hostile/morph/Initialize(mapload) var/datum/action/innate/morph/stomach/S = new S.Grant(src) @@ -151,7 +156,7 @@ throwatom = null playsound(src, 'sound/effects/splat.ogg', 50, 1) . = ..() - + /mob/living/simple_animal/hostile/morph/examine(mob/user) if(morphed) @@ -193,7 +198,7 @@ if(A == src) restore() return - if(istype(A) && allowed(A)) + if(allowed(A)) assume(A) else to_chat(src, "Your chameleon skin is still repairing itself!") @@ -209,13 +214,20 @@ visible_message("[src] suddenly twists and changes shape, becoming a copy of [target]!", \ "You twist your body and assume the form of [target].") appearance = target.appearance - copy_overlays(target) + if(length(target.vis_contents)) + add_overlay(target.vis_contents) alpha = max(alpha, 150) //fucking chameleons transform = initial(transform) pixel_y = initial(pixel_y) pixel_x = initial(pixel_x) density = target.density + if(isliving(target)) + var/mob/living/L = target + mobchatspan = L.mobchatspan + else + mobchatspan = initial(mobchatspan) + //Morphed is weaker melee_damage = melee_damage_disguised set_varspeed(0) @@ -281,7 +293,7 @@ . = ..() if(.) var/list/things = list() - for(var/atom/movable/A in view(src)) + for(var/atom/A as() in view(src)) if(allowed(A)) things += A var/atom/movable/T = pick(things) diff --git a/code/modules/antagonists/ninja/ninja.dm b/code/modules/antagonists/ninja/ninja.dm index 19ac71aa7b2a5..f4486fded5217 100644 --- a/code/modules/antagonists/ninja/ninja.dm +++ b/code/modules/antagonists/ninja/ninja.dm @@ -10,7 +10,7 @@ /datum/antagonist/ninja/New() if(helping_station) - can_hijack = HIJACK_PREVENT + can_elimination_hijack = ELIMINATION_PREVENT . = ..() /datum/antagonist/ninja/apply_innate_effects(mob/living/mob_override) @@ -123,7 +123,8 @@ to_chat(owner.current, "Surprise is my weapon. Shadows are my armor. Without them, I am nothing. (//initialize your suit by right clicking on it, to use abilities like stealth)!") to_chat(owner.current, "Officially, [helping_station?"Nanotrasen":"The Syndicate"] are my employer.") owner.announce_objectives() - return + owner.current.client?.tgui_panel?.give_antagonist_popup("Ninja", + "Infiltrate the station and complete your assigned objectives.") /datum/antagonist/ninja/on_gain() if(give_objectives) @@ -151,7 +152,7 @@ else return if(helping_station) - can_hijack = HIJACK_PREVENT + can_elimination_hijack = ELIMINATION_PREVENT new_owner.assigned_role = ROLE_NINJA new_owner.special_role = ROLE_NINJA new_owner.add_antag_datum(src) diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index eb35e9b62aff9..efb8aaa96187a 100644 --- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm +++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm @@ -63,20 +63,8 @@ return animation_playing = TRUE to_chat(user, "You activate \the [src].") - playsound(src, 'sound/effects/seedling_chargeup.ogg', 100, 1, -6) - var/start = user.filters.len - var/X,Y,rsq,i,f - for(i=1, i<=7, ++i) - do - X = 60*rand() - 30 - Y = 60*rand() - 30 - rsq = X*X + Y*Y - while(rsq<100 || rsq>900) - user.filters += filter(type="wave", x=X, y=Y, size=rand()*2.5+0.5, offset=rand()) - for(i=1, i<=7, ++i) - f = user.filters[start+i] - animate(f, offset=f:offset, time=0, loop=3, flags=ANIMATION_PARALLEL) - animate(offset=f:offset-1, time=rand()*20+10) + playsound(src, 'sound/effects/seedling_chargeup.ogg', 100, TRUE, -6) + apply_wibbly_filters(user) if (do_after(user, 50, target=user) && user.cell.use(activationCost)) playsound(src, 'sound/effects/bamf.ogg', 100, 1, -6) to_chat(user, "You are now disguised as the Nanotrasen engineering borg \"[friendlyName]\".") @@ -84,10 +72,7 @@ else to_chat(user, "The chameleon field fizzles.") do_sparks(3, FALSE, user) - for(i=1, i<=min(7, user.filters.len), ++i) // removing filters that are animating does nothing, we gotta stop the animations first - f = user.filters[start+i] - animate(f) - user.filters = null + remove_wibbly_filters(user) animation_playing = FALSE /obj/item/borg_chameleon/process() @@ -128,6 +113,8 @@ src.user = user /obj/item/borg_chameleon/proc/disrupt(mob/living/silicon/robot/user) + SIGNAL_HANDLER + if(active) to_chat(user, "Your chameleon field deactivates.") deactivate(user) diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm index 9a355aac56472..12b6192b7b5b8 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm @@ -3,8 +3,6 @@ #define CHALLENGE_MIN_PLAYERS 50 #define CHALLENGE_SHUTTLE_DELAY 15000 // 25 minutes, so the ops have at least 5 minutes before the shuttle is callable. -GLOBAL_LIST_EMPTY(jam_on_wardec) - /obj/item/nuclear_challenge name = "Declaration of War (Challenge Mode)" icon = 'icons/obj/device.dmi' @@ -50,7 +48,9 @@ GLOBAL_LIST_EMPTY(jam_on_wardec) if(!check_allowed(user) || !war_declaration) return - priority_announce(war_declaration, title = "Declaration of War", sound = 'sound/machines/alarm.ogg') + priority_announce(war_declaration, "Declaration of War", 'sound/machines/alarm.ogg', has_important_message = TRUE) + + play_soundtrack_music(/datum/soundtrack_song/bee/future_perception) to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.") @@ -58,8 +58,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec) var/obj/item/circuitboard/computer/syndicate_shuttle/board = V board.challenge = TRUE - for(var/obj/machinery/computer/camera_advanced/shuttle_docker/D in GLOB.jam_on_wardec) - D.jammed = TRUE + GLOB.shuttle_docking_jammed = TRUE var/list/orphans = list() var/list/uplinks = list() diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index f8b771c7269df..96a2638b70be3 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -1,3 +1,5 @@ +#define ARM_ACTION_COOLDOWN (5 SECONDS) + /obj/machinery/nuclearbomb name = "nuclear fission explosive" desc = "You probably shouldn't stick around to see if this is armed." @@ -33,6 +35,8 @@ var/interior = "" var/proper_bomb = TRUE //Please var/obj/effect/countdown/nuclearbomb/countdown + var/sound/countdown_music = null + COOLDOWN_DECLARE(arm_cooldown) /obj/machinery/nuclearbomb/Initialize() . = ..() @@ -103,6 +107,7 @@ update_ui_mode() playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE) add_fingerprint(user) + ui_update() return switch(deconstruction_state) @@ -261,6 +266,11 @@ ui_mode = NUKEUI_AWAIT_TIMER +/obj/machinery/nuclearbomb/ui_requires_update(mob/user, datum/tgui/ui) + . = ..() + if(timing) + . = TRUE // Autoupdate while counting down + /obj/machinery/nuclearbomb/ui_interact(mob/user, datum/tgui/ui=null) ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -335,7 +345,6 @@ playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE) auth = I . = TRUE - update_ui_mode() if("keypad") if(auth) var/digit = params["digit"] @@ -345,7 +354,6 @@ set_safety() yes_code = FALSE playsound(src, 'sound/machines/nuke/confirm_beep.ogg', 50, FALSE) - update_ui_mode() else playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE) numeric_input = "" @@ -370,7 +378,6 @@ . = TRUE else playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE) - update_ui_mode() if("0","1","2","3","4","5","6","7","8","9") if(numeric_input != "ERROR") numeric_input += digit @@ -383,9 +390,10 @@ playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE) if("arm") if(auth && yes_code && !safety && !exploded) + if(!COOLDOWN_FINISHED(src, arm_cooldown)) + return playsound(src, 'sound/machines/nuke/confirm_beep.ogg', 50, FALSE) set_active() - update_ui_mode() . = TRUE else playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE) @@ -393,9 +401,13 @@ if(auth && yes_code) playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE) set_anchor() + . = TRUE else playsound(src, 'sound/machines/nuke/angry_beep.ogg', 50, FALSE) + if(.) + update_ui_mode() + /obj/machinery/nuclearbomb/proc/set_anchor() if(isinspace() && !anchored) to_chat(usr, "There is nothing to anchor to!") @@ -407,6 +419,7 @@ if(safety) if(timing) set_security_level(previous_level) + stop_soundtrack_music() for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(initial(S.mode)) S.alert = FALSE @@ -426,14 +439,21 @@ for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(TRACK_INFILTRATOR) countdown.start() - set_security_level("delta") + set_security_level(SEC_LEVEL_DELTA) + + if (proper_bomb) // Why does this exist + countdown_music = play_soundtrack_music(/datum/soundtrack_song/bee/countdown, only_station = TRUE) + else detonation_timer = null set_security_level(previous_level) + stop_soundtrack_music() + for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(initial(S.mode)) S.alert = FALSE countdown.stop() + COOLDOWN_START(src, arm_cooldown, ARM_ACTION_COOLDOWN) update_icon() /obj/machinery/nuclearbomb/proc/get_time_left() @@ -462,7 +482,8 @@ yes_code = FALSE safety = TRUE update_icon() - sound_to_playing_players('sound/machines/alarm.ogg') + if(proper_bomb) + sound_to_playing_players('sound/machines/alarm.ogg') if(SSticker?.mode) SSticker.roundend_check_paused = TRUE addtimer(CALLBACK(src, .proc/actually_explode), 100) @@ -500,7 +521,7 @@ /obj/machinery/nuclearbomb/proc/really_actually_explode(off_station) Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker,/datum/controller/subsystem/ticker/proc/station_explosion_detonation,src)) - INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel, z) + INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel, get_virtual_z_level()) /obj/machinery/nuclearbomb/proc/get_cinematic_type(off_station) if(off_station < 2) @@ -561,6 +582,8 @@ S.alert = FALSE countdown.stop() update_icon() + update_ui_mode() + ui_update() /obj/machinery/nuclearbomb/beer/proc/fizzbuzz() var/datum/reagents/R = new/datum/reagents(1000) @@ -579,7 +602,7 @@ if(!z) return for(var/mob/M in GLOB.mob_list) - if(M.stat != DEAD && M.z == z) + if(M.stat != DEAD && M.get_virtual_z_level() == z) M.gib() /* @@ -618,14 +641,16 @@ This is here to make the tiles around the station mininuke change when it's arme icon_state = "nucleardisk" persistence_replacement = /obj/item/disk/nuclear/fake max_integrity = 250 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100, "stamina" = 0) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/fake = FALSE var/turf/lastlocation var/last_disk_move + var/process_tick = 0 /obj/item/disk/nuclear/Initialize() . = ..() + AddElement(/datum/element/bed_tuckable, 6, -6, 0) if(!fake) GLOB.poi_list |= src last_disk_move = world.time @@ -634,18 +659,32 @@ This is here to make the tiles around the station mininuke change when it's arme /obj/item/disk/nuclear/ComponentInitialize() . = ..() AddComponent(/datum/component/stationloving, !fake) + if(!fake) + //Global teamfinder signal trackable on the synd frequency. + AddComponent(/datum/component/tracking_beacon, "synd", null, null, TRUE, "#ebeca1", TRUE, TRUE) /obj/item/disk/nuclear/process() + ++process_tick if(fake) STOP_PROCESSING(SSobj, src) CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck") var/turf/newturf = get_turf(src) if(newturf && lastlocation == newturf) + /// How comfy is our disk? + var/disk_comfort_level = 0 + + //Go through and check for items that make disk comfy + for(var/comfort_item in loc) + if(istype(comfort_item, /obj/item/bedsheet) || istype(comfort_item, /obj/structure/bed)) + disk_comfort_level++ + if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001)) var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control if(istype(loneop) && loneop.occurrences < loneop.max_occurrences) loneop.weight += 1 if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1) + if(disk_comfort_level >= 2 && (process_tick % 30) == 0) + visible_message("[src] sleeps soundly. Sleep tight, disky.") message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 15c9f6ca4b96d..87ec997fd6c2e 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -5,11 +5,11 @@ job_rank = ROLE_OPERATIVE antag_moodlet = /datum/mood_event/focused show_to_ghosts = TRUE + hijack_speed = 2 //If you can't take out the station, take the shuttle instead. var/datum/team/nuclear/nuke_team var/always_new_team = FALSE //If not assigned a team by default ops will try to join existing ones, set this to TRUE to always create new team. var/send_to_spawnpoint = TRUE //Should the user be moved to default spawnpoint. var/nukeop_outfit = /datum/outfit/syndicate - can_hijack = HIJACK_HIJACKER //Alternative way to wipe out the station. /datum/antagonist/nukeop/proc/update_synd_icons_added(mob/living/M) var/datum/atom_hud/antag/opshud = GLOB.huds[ANTAG_HUD_OPS] @@ -43,9 +43,11 @@ return TRUE /datum/antagonist/nukeop/greet() - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0, use_reverb = FALSE) to_chat(owner, "You are a [nuke_team ? nuke_team.syndicate_name : "syndicate"] agent!") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Nuclear Operative", + "Destroy the station with a nuclear device.") /datum/antagonist/nukeop/on_gain() give_alias() @@ -53,6 +55,7 @@ . = ..() equip_op() memorize_code() + memorize_frequency() if(send_to_spawnpoint) move_to_spawnpoint() // grant extra TC for the people who start in the nukie base ie. not the lone op @@ -94,8 +97,6 @@ number = nuke_team.members.Find(owner) owner.current.real_name = "[nuke_team.syndicate_name] Operative #[number]" - - /datum/antagonist/nukeop/proc/memorize_code() if(nuke_team && nuke_team.tracked_nuke && nuke_team.memorized_code) antag_memory += "[nuke_team.tracked_nuke] Code: [nuke_team.memorized_code]
" @@ -103,6 +104,13 @@ else to_chat(owner, "Unfortunately the syndicate was unable to provide you with nuclear authorization code.") +/datum/antagonist/nukeop/proc/memorize_frequency() + if(nuke_team?.team_frequency) + antag_memory += "Secure Tracking Beacon Frequency: [nuke_team.team_frequency]
" + to_chat(owner, "Your team's unique tracking beacon code is: [nuke_team.team_frequency]") + else + to_chat(owner, "You were not assigned a frequency for your hardsuits beacons. You will have to coordinate with each other to decide a frequency to use.") + /datum/antagonist/nukeop/proc/forge_objectives() if(!give_objectives) return @@ -188,13 +196,14 @@ owner.current.real_name = "Syndicate [title]" /datum/antagonist/nukeop/leader/greet() - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0, use_reverb = FALSE) to_chat(owner, "You are the Syndicate [title] for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.") to_chat(owner, "If you feel you are not up to this task, give your ID to another operative.") to_chat(owner, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") owner.announce_objectives() addtimer(CALLBACK(src, .proc/nuketeam_name_assign), 1) - + owner.current.client?.tgui_panel?.give_antagonist_popup("Nuclear Operative Team Leader", + "Destroy the station with a nuclear explosive by leading your team.") /datum/antagonist/nukeop/leader/proc/nuketeam_name_assign() if(!nuke_team) @@ -241,7 +250,7 @@ else //Already set by admins/something else? nuke_team.memorized_code = nuke.r_code else - stack_trace("Station self destruct not found during lone op team creation.") + stack_trace("Station self-destruct not found during lone op team creation.") nuke_team.memorized_code = null /datum/antagonist/nukeop/reinforcement @@ -253,11 +262,13 @@ var/obj/machinery/nuclearbomb/tracked_nuke var/core_objective = /datum/objective/nuclear var/memorized_code + var/team_frequency var/list/team_discounts /datum/team/nuclear/New() ..() syndicate_name = syndicate_name() + team_frequency = get_free_team_frequency("synd") /datum/team/nuclear/proc/update_objectives() if(core_objective) diff --git a/code/modules/antagonists/official/official.dm b/code/modules/antagonists/official/official.dm index 28cfe88f0be9a..3b39b920c26d4 100644 --- a/code/modules/antagonists/official/official.dm +++ b/code/modules/antagonists/official/official.dm @@ -2,9 +2,9 @@ name = "CentCom Official" show_name_in_check_antagonists = TRUE show_in_antagpanel = FALSE + can_elimination_hijack = ELIMINATION_PREVENT var/datum/objective/mission var/datum/team/ert/ert_team - can_hijack = HIJACK_PREVENT show_to_ghosts = TRUE /datum/antagonist/official/greet() @@ -18,8 +18,11 @@ var/mob/living/carbon/human/H = owner.current if(!istype(H)) return + if(isplasmaman(H)) + H.equipOutfit(/datum/outfit/plasmaman/official) + H.internal = H.get_item_for_held_index(2) + H.update_internals_hud_icon(1) H.equipOutfit(/datum/outfit/centcom_official) - if(CONFIG_GET(flag/enforce_human_authority)) H.set_species(/datum/species/human) diff --git a/code/modules/antagonists/overthrow/overthrow.dm b/code/modules/antagonists/overthrow/overthrow.dm index 246d9e763016d..a8429b72b884f 100644 --- a/code/modules/antagonists/overthrow/overthrow.dm +++ b/code/modules/antagonists/overthrow/overthrow.dm @@ -128,9 +128,9 @@ // Give AI hacking board var/obj/item/aiModule/core/full/overthrow/O = new(H) var/list/slots = list ( - "backpack" = SLOT_IN_BACKPACK, - "left pocket" = SLOT_L_STORE, - "right pocket" = SLOT_R_STORE + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET ) var/where = H.equip_in_one_of_slots(O, slots) if (!where) diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index c1094539cdd64..f3694d29f4660 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -10,6 +10,8 @@ to_chat(owner, "You are a Space Pirate!") to_chat(owner, "The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot.") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Space Pirate", + "The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot.") /datum/antagonist/pirate/get_team() return crew @@ -105,4 +107,4 @@ else parts += "The pirate crew has failed." - return "
[parts.Join("
")]
"
\ No newline at end of file
+ return "")]
[parts.Join("
")]
"
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index a45f06acac9a3..8f4ebe9be912f 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -51,6 +51,8 @@
hud_possible = list(ANTAG_HUD)
hud_type = /datum/hud/revenant
+ mobchatspan = "revenminor"
+
var/essence = 75 //The resource, and health, of revenants.
var/essence_regen_cap = 75 //The regeneration cap of essence (go figure); regenerates every Life() tick up to this amount.
var/essence_regenerating = TRUE //If the revenant regenerates essence or not
@@ -66,6 +68,7 @@
var/list/drained_mobs = list() //Cannot harvest the same mob twice
var/perfectsouls = 0 //How many perfect, regen-cap increasing souls the revenant has. //TODO, add objective for getting a perfect soul(s?)
var/generated_objectives_and_spells = FALSE
+ discovery_points = 4000
/mob/living/simple_animal/revenant/Initialize(mapload)
. = ..()
@@ -76,6 +79,14 @@
AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/blight(null))
AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction(null))
random_revenant_name()
+ AddComponent(/datum/component/tracking_beacon, "ghost", null, null, TRUE, "#9e4d91", TRUE, TRUE)
+
+/mob/living/simple_animal/revenant/Destroy()
+ . = ..()
+
+ var/datum/component/tracking_beacon/beacon = GetComponent(/datum/component/tracking_beacon)
+ if(beacon)
+ qdel(beacon)
/mob/living/simple_animal/revenant/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
return FALSE
@@ -127,13 +138,13 @@
update_health_hud()
..()
-/mob/living/simple_animal/revenant/Stat()
- ..()
- if(statpanel("Status"))
- stat(null, "Current essence: [essence]/[essence_regen_cap]E")
- stat(null, "Stolen essence: [essence_accumulated]E")
- stat(null, "Unused stolen essence: [essence_excess]E")
- stat(null, "Stolen perfect souls: [perfectsouls]")
+/mob/living/simple_animal/revenant/get_stat_tab_status()
+ var/list/tab_data = ..()
+ tab_data["Current essence"] = GENERATE_STAT_TEXT("[essence]/[essence_regen_cap]E")
+ tab_data["Stolen essence"] = GENERATE_STAT_TEXT("[essence_accumulated]E")
+ tab_data["Unused stolen essence"] = GENERATE_STAT_TEXT("[essence_excess]E")
+ tab_data["Stolen perfect souls"] = GENERATE_STAT_TEXT("[perfectsouls]")
+ return tab_data
/mob/living/simple_animal/revenant/update_health_hud()
if(hud_used)
@@ -142,7 +153,7 @@
essencecolor = "#9A5ACB" //oh boy you've got a lot of essence
else if(!essence)
essencecolor = "#1D2953" //oh jeez you're dying
- hud_used.healths.maptext = "")]
[essence]E
"
+ hud_used.healths.maptext = MAPTEXT("[essence]E
")
/mob/living/simple_animal/revenant/med_hud_set_health()
return //we use no hud
@@ -236,7 +247,7 @@
R.revenant = src
invisibility = INVISIBILITY_ABSTRACT
revealed = FALSE
- ghostize(0)//Don't re-enter invisible corpse
+ ghostize(FALSE)//Don't re-enter invisible corpse
//reveal, stun, icon updates, cast checks, and essence changing
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index 71cbcb613fd5c..7a82b35740d53 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -1,5 +1,8 @@
/mob/living/simple_animal/revenant/ClickOn(atom/A, params) //revenants can't interact with the world directly.
+ if(check_click_intercept(params,A))
+ return
+
var/list/modifiers = params2list(params)
if(modifiers["shift"])
ShiftClickOn(A)
@@ -209,7 +212,7 @@
if(!L.on) //wait, wait, don't shock me
return
flick("[L.base_state]2", L)
- for(var/mob/living/carbon/human/M in view(shock_range, L))
+ for(var/mob/living/carbon/human/M in hearers(shock_range, L))
if(M == user)
continue
L.Beam(M,icon_state="purple_lightning",time=5)
diff --git a/code/modules/antagonists/revenant/revenant_antag.dm b/code/modules/antagonists/revenant/revenant_antag.dm
index 05de4607db845..169d23d25c0da 100644
--- a/code/modules/antagonists/revenant/revenant_antag.dm
+++ b/code/modules/antagonists/revenant/revenant_antag.dm
@@ -6,6 +6,8 @@
/datum/antagonist/revenant/greet()
owner.announce_objectives()
+ owner.current.client?.tgui_panel?.give_antagonist_popup("Revenant",
+ "You are a spirit that has managed to stay in the mortal realm. Take vengance on those that walk this plane without you.")
/datum/antagonist/revenant/proc/forge_objectives()
var/datum/objective/revenant/objective = new
diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm
index cd5b99953ce82..d7814ad0bf39a 100644
--- a/code/modules/antagonists/revenant/revenant_blight.dm
+++ b/code/modules/antagonists/revenant/revenant_blight.dm
@@ -11,7 +11,7 @@
viable_mobtypes = list(/mob/living/carbon/human)
disease_flags = CURABLE
permeability_mod = 1
- severity = DISEASE_SEVERITY_HARMFUL
+ danger = DISEASE_HARMFUL
var/stagedamage = 0 //Highest stage reached.
var/finalstage = 0 //Because we're spawning off the cure in the final stage, we need to check if we've done the final stage's effects.
diff --git a/code/modules/antagonists/revenant/revenant_spawn_event.dm b/code/modules/antagonists/revenant/revenant_spawn_event.dm
index c9a892cd64b6c..10ee621a9b87f 100644
--- a/code/modules/antagonists/revenant/revenant_spawn_event.dm
+++ b/code/modules/antagonists/revenant/revenant_spawn_event.dm
@@ -6,6 +6,7 @@
weight = 7
max_occurrences = 1
min_players = 5
+ dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/revenant
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index 850425d1ccd71..13f72edd5da52 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -1,3 +1,5 @@
+#define DECONVERTER_STATION_WIN "gamemode_station_win"
+#define DECONVERTER_REVS_WIN "gamemode_revs_win"
//How often to check for promotion possibility
#define HEAD_UPDATE_PERIOD 300
@@ -10,6 +12,9 @@
var/hud_type = "rev"
var/datum/team/revolution/rev_team
+ /// What message should the player receive when they are being demoted, and the revolution has won?
+ var/victory_message = "The revolution has overpowered the command staff! Viva la revolution! Execute any head of staff and security should you find them alive."
+
/datum/antagonist/rev/can_be_owned(datum/mind/new_owner)
. = ..()
if(.)
@@ -46,6 +51,8 @@
/datum/antagonist/rev/greet()
to_chat(owner, "You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!")
owner.announce_objectives()
+ owner.current.client?.tgui_panel?.give_antagonist_popup("Revolution",
+ "Eliminate the heads of staff. Viva la revolution!")
/datum/antagonist/rev/create_team(datum/team/revolution/new_team)
if(!new_team)
@@ -203,29 +210,54 @@
new_rev.silent = FALSE
to_chat(old_owner, "Revolution has been disappointed of your leader traits! You are a regular revolutionary now!")
+/// Checks if the revolution succeeded, and lets them know.
+/datum/antagonist/rev/proc/announce_victorious()
+ . = rev_team.check_rev_victory()
+
+ if (!.)
+ return
+
+ to_chat(owner, "")
+
/datum/antagonist/rev/farewell()
- if(ishuman(owner.current) || ismonkey(owner.current))
+ if (announce_victorious())
+ return
+
+ if(ishuman(owner.current))
owner.current.visible_message("", null, null, null, owner.current)
to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...")
else if(issilicon(owner.current))
owner.current.visible_message("", null, null, null, owner.current)
to_chat(owner, "The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.")
+/datum/antagonist/rev/head/farewell()
+ if (announce_victorious())
+ return
+
+ if((ishuman(owner.current)))
+ if(owner.current.stat != DEAD)
+ owner.current.visible_message("", null, null, null, owner.current)
+ to_chat(owner, "")
+ else
+ to_chat(owner, "")
+ else if(issilicon(owner.current))
+ owner.current.visible_message("", null, null, null, owner.current)
+ to_chat(owner, "The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts.")
+
//blunt trauma deconversions call this through species.dm spec_attacked_by()
/datum/antagonist/rev/proc/remove_revolutionary(borged, deconverter)
- log_attack("[key_name(owner.current)] has been deconverted from the revolution by [key_name(deconverter)]!")
+ log_attack("[key_name(owner.current)] has been deconverted from the revolution by [ismob(deconverter) ? key_name(deconverter) : deconverter]!")
if(borged)
message_admins("[ADMIN_LOOKUPFLW(owner.current)] has been borged while being a [name]")
owner.special_role = null
- if(iscarbon(owner.current))
+ if(iscarbon(owner.current) && deconverter != DECONVERTER_REVS_WIN)
var/mob/living/carbon/C = owner.current
C.Unconscious(100)
owner.remove_antag_datum(type)
/datum/antagonist/rev/head/remove_revolutionary(borged,deconverter)
- if(!borged)
- return
- . = ..()
+ if(borged || deconverter == DECONVERTER_STATION_WIN || deconverter == DECONVERTER_REVS_WIN)
+ . = ..()
/datum/antagonist/rev/head/equip_rev()
var/mob/living/carbon/H = owner.current
@@ -237,11 +269,11 @@
H.dna.remove_mutation(CLOWNMUT)
if(give_flash)
- var/obj/item/assembly/flash/handheld/strong/T = new(H)
+ var/obj/item/assembly/flash/handheld/T = new(H)
var/list/slots = list (
- "backpack" = SLOT_IN_BACKPACK,
- "left pocket" = SLOT_L_STORE,
- "right pocket" = SLOT_R_STORE
+ "backpack" = ITEM_SLOT_BACKPACK,
+ "left pocket" = ITEM_SLOT_LPOCKET,
+ "right pocket" = ITEM_SLOT_RPOCKET
)
var/where = H.equip_in_one_of_slots(T, slots)
if (!where)
@@ -254,9 +286,26 @@
S.Insert(H, special = FALSE, drop_if_replaced = FALSE)
to_chat(H, "Your eyes have been implanted with a cybernetic security HUD which will help you keep track of who is mindshield-implanted, and therefore unable to be recruited.")
+/// "Enemy of the Revolutionary", given to heads and security when the revolution wins
+/datum/antagonist/revolution_enemy
+ name = "Enemy of the Revolution"
+ show_in_antagpanel = FALSE
+
+/datum/antagonist/revolution_enemy/on_gain()
+ owner.special_role = "revolution enemy"
+
+ var/datum/objective/survive/survive = new /datum/objective/survive
+ survive.owner = owner
+ survive.explanation_text = "The station has been overrun by revolutionaries, stay alive until the end."
+ objectives += survive
+
+ return ..()
+
/datum/team/revolution
name = "Revolution"
var/max_headrevs = 3
+ var/list/ex_headrevs = list() // Dynamic removes revs on loss, used to keep a list for the roundend report.
+ var/list/ex_revs = list()
/datum/team/revolution/proc/update_objectives(initial = FALSE)
var/untracked_heads = SSjob.get_all_heads()
@@ -308,40 +357,147 @@
addtimer(CALLBACK(src,.proc/update_heads),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)
+/datum/team/revolution/proc/save_members()
+ ex_headrevs = get_antag_minds(/datum/antagonist/rev/head, TRUE)
+ ex_revs = get_antag_minds(/datum/antagonist/rev, TRUE)
+
+/// Checks if revs have won
+/datum/team/revolution/proc/check_rev_victory()
+ for(var/datum/objective/mutiny/objective in objectives)
+ if(!(objective.check_completion()))
+ return FALSE
+ return TRUE
+
+/// Checks if heads have won
+/datum/team/revolution/proc/check_heads_victory()
+ for(var/datum/mind/rev_mind in head_revolutionaries())
+ var/turf/rev_turf = get_turf(rev_mind.current)
+ if(!considered_afk(rev_mind) && considered_alive(rev_mind) && is_station_level(rev_turf.z))
+ if(ishuman(rev_mind.current))
+ return FALSE
+ return TRUE
+
+/// Updates the state of the world depending on if revs won or loss.
+/// Returns who won, at which case this method should no longer be called.
+/// If revs_win_injection_amount is passed, then that amount of threat will be added if the revs win.
+/datum/team/revolution/proc/process_victory(revs_win_injection_amount)
+ if (check_rev_victory())
+ . = REVOLUTION_VICTORY
+ else if (check_heads_victory())
+ . = STATION_VICTORY
+ else
+ return
+
+ SSshuttle.clearHostileEnvironment(src)
+ save_members()
+
+ // Remove everyone as a revolutionary
+ for (var/_rev_mind in members)
+ var/datum/mind/rev_mind = _rev_mind
+ if (rev_mind.has_antag_datum(/datum/antagonist/rev))
+ var/datum/antagonist/rev/rev_antag = rev_mind.has_antag_datum(/datum/antagonist/rev)
+ rev_antag.remove_revolutionary(FALSE, . == STATION_VICTORY ? DECONVERTER_STATION_WIN : DECONVERTER_REVS_WIN)
+ LAZYADD(rev_mind.special_statuses, "Former [(rev_mind in ex_headrevs) ? "head revolutionary" : "revolutionary"]")
+
+ if (. == STATION_VICTORY)
+ // If the revolution was quelled, make rev heads unable to be revived through pods
+ for (var/_rev_head_mind in ex_revs)
+ var/datum/mind/rev_head_mind = _rev_head_mind
+ var/mob/living/carbon/rev_head_body = rev_head_mind.current
+ if(istype(rev_head_body) && rev_head_body.stat == DEAD)
+ rev_head_body.makeUncloneable()
+
+ priority_announce("It appears the mutiny has been quelled. Please return yourself and your incapacitated colleagues to work. \
+ We have remotely blacklisted the head revolutionaries in your medical records to prevent accidental revival.", null, SSstation.announcer.get_rand_report_sound(), null, "Central Command Loyalty Monitoring Division")
+ else
+ for (var/_player in GLOB.player_list)
+ var/mob/player = _player
+ var/datum/mind/mind = player.mind
+
+ if (isnull(mind))
+ continue
+
+ if (!(mind.assigned_role in GLOB.command_positions + GLOB.security_positions))
+ continue
+
+ var/mob/living/carbon/target_body = mind.current
+
+ mind.add_antag_datum(/datum/antagonist/revolution_enemy)
+
+ if (!istype(target_body))
+ continue
+
+ if (target_body.stat == DEAD)
+ target_body.makeUncloneable()
+ else
+ mind.announce_objectives()
+
+ for (var/job_name in GLOB.command_positions + GLOB.security_positions)
+ var/datum/job/job = SSjob.GetJob(job_name)
+ job.allow_bureaucratic_error = FALSE
+ job.total_positions = 0
+
+ if (revs_win_injection_amount)
+ var/datum/game_mode/dynamic/dynamic = SSticker.mode
+ dynamic.create_threat(revs_win_injection_amount)
+ dynamic.threat_log += "[worldtime2text()]: Revolution victory. Added [revs_win_injection_amount] threat."
+
+ priority_announce("A recent assessment of your station has marked your station as a severe risk area for high ranking Nanotrasen officials. \
+ For the safety of our staff, we have blacklisted your station for new employment of security and command. \
+ [pick(world.file2list("strings/anti_union_propaganda.txt"))]", null, SSstation.announcer.get_rand_report_sound(), null, "Central Command Loyalty Monitoring Division")
+ addtimer(CALLBACK(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 1), 50)
+
+/// Mutates the ticker to report that the revs have won
+/datum/team/revolution/proc/round_result(finished)
+ if (finished == REVOLUTION_VICTORY)
+ SSticker.mode_result = "win - heads killed"
+ SSticker.news_report = REVS_WIN
+ else if (finished == STATION_VICTORY)
+ SSticker.mode_result = "loss - rev heads killed"
+ SSticker.news_report = REVS_LOSE
/datum/team/revolution/roundend_report()
- if(!members.len)
+ if(!members.len && !ex_headrevs.len)
return
var/list/result = list()
result += ""
+ var/list/targets = list()
+ var/list/datum/mind/headrevs
+ var/list/datum/mind/revs
+ if(ex_headrevs.len)
+ headrevs = ex_headrevs
+ else
+ headrevs = get_antag_minds(/datum/antagonist/rev/head, TRUE)
+
+ if(ex_revs.len)
+ revs = ex_revs
+ else
+ revs = get_antag_minds(/datum/antagonist/rev, TRUE)
+
var/num_revs = 0
var/num_survivors = 0
for(var/mob/living/carbon/survivor in GLOB.alive_mob_list)
if(survivor.ckey)
- num_survivors++
- if(survivor.mind)
- if(is_revolutionary(survivor))
- num_revs++
+ num_survivors += 1
+ if ((survivor.mind in revs) || (survivor.mind in headrevs))
+ num_revs += 1
+
if(num_survivors)
result += "Command's Approval Rating: [100 - round((num_revs/num_survivors)*100, 0.1)]%
" - - var/list/targets = list() - var/list/datum/mind/headrevs = get_antag_minds(/datum/antagonist/rev/head) - var/list/datum/mind/revs = get_antag_minds(/datum/antagonist/rev,TRUE) if(headrevs.len) var/list/headrev_part = list() headrev_part += "The head revolutionaries were:" - headrev_part += printplayerlist(headrevs,TRUE) + headrev_part += printplayerlist(headrevs, !check_rev_victory()) result += headrev_part.Join("
") if(revs.len) var/list/rev_part = list() rev_part += "The revolutionaries were:" - rev_part += printplayerlist(revs,TRUE) + rev_part += printplayerlist(revs, !check_rev_victory()) result += rev_part.Join("
") var/list/heads = SSjob.get_all_heads() @@ -394,3 +550,6 @@ /datum/team/revolution/is_gamemode_hero() return SSticker.mode.name == "revolution" + +#undef DECONVERTER_STATION_WIN +#undef DECONVERTER_REVS_WIN diff --git a/code/modules/antagonists/roundstart_special/special_antagonist.dm b/code/modules/antagonists/roundstart_special/special_antagonist.dm index 45948c78d6694..6bb711f679771 100644 --- a/code/modules/antagonists/roundstart_special/special_antagonist.dm +++ b/code/modules/antagonists/roundstart_special/special_antagonist.dm @@ -16,7 +16,8 @@ //----Required for roundspawn---- var/allowAntagTargets = FALSE //Not used in events var/latejoin_allowed = TRUE //Can latejoins be assigned to this? If you want this to be a midround spawn, put these in the round_event - var/list/protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain", "Brig Physician") + var/list/restricted_jobs = list("Cyborg") + var/list/protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain") //----Required for midround---- var/weight = 10 var/earliest_start = 20 MINUTES @@ -24,6 +25,17 @@ var/holidayID = "" //Preferences var/preference_type = ROLE_TRAITOR + var/special_role_flag = null //Will use antag rep if enabled + +/datum/special_role/proc/setup() + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + restricted_jobs += protected_jobs + + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) + restricted_jobs += "Assistant" + + if(CONFIG_GET(flag/protect_heads_from_antagonist)) + restricted_jobs += GLOB.command_positions /datum/special_role/proc/add_to_pool() if(spawn_mode == SPAWNTYPE_ROUNDSTART) @@ -34,7 +46,7 @@ E.antagonist_datum = attached_antag_datum E.antag_name = role_name E.preference_type = preference_type - E.protected_jobs = protected_jobs + E.protected_jobs = restricted_jobs E.typepath = /datum/round_event/create_special_antag E.weight = weight E.holidayID = holidayID @@ -47,7 +59,7 @@ //Shove our event into the subsystem pool :) SSevents.control += E -/datum/special_role/proc/add_antag_status_to(var/datum/mind/M) +/datum/special_role/proc/add_antag_status_to(datum/mind/M) M.special_role = role_name var/datum/antagonist/special/A = M.add_antag_datum(new attached_antag_datum()) A.forge_objectives(M) diff --git a/code/modules/antagonists/roundstart_special/undercover/undercover.dm b/code/modules/antagonists/roundstart_special/undercover/undercover.dm index 6befde2a8421e..9192ee900935d 100644 --- a/code/modules/antagonists/roundstart_special/undercover/undercover.dm +++ b/code/modules/antagonists/roundstart_special/undercover/undercover.dm @@ -7,7 +7,7 @@ proportion = 0.05 //The prbability per person of rolling it (5% is (5 in 100) (1 in 20)) max_amount = 4 //The maximum amount role_name = "Undercover Agent" - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain", "Brig Physician", "Clown") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain", "Clown") attached_antag_datum = /datum/antagonist/special/undercover //////////////////////////////// @@ -61,9 +61,9 @@ var/obj/item/gun/energy/disabler/T = new(H) var/obj/item/restraints/handcuffs/cable/zipties/T2 = new(H) var/list/slots = list ( - "backpack" = SLOT_IN_BACKPACK, - "left pocket" = SLOT_L_STORE, - "right pocket" = SLOT_R_STORE + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET ) var/where = H.equip_in_one_of_slots(T, slots) H.equip_in_one_of_slots(T2, slots) @@ -122,7 +122,7 @@ /datum/objective/protect_sm/update_explanation_text() var/obj/machinery/power/supermatter_crystal/S = target_sm.resolve() - explanation_text = "Ensure the Supermatter crystal in [get_area(S).name] remains stable and has above [target_integrity]% integrity at the end of the shift." + explanation_text = "Ensure the Supermatter crystal in [get_area(S)] remains stable and has above [target_integrity]% integrity at the end of the shift." /datum/objective/protect_sm/check_completion() var/obj/machinery/power/supermatter_crystal/S = target_sm.resolve() diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 2e52b36d55208..57bfb961a7ce6 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -34,20 +34,23 @@ see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE bloodcrawl = BLOODCRAWL_EAT - hardattacks = TRUE + hardattacks = TRUE var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ You may use the \"Blood Crawl\" ability near blood pools to travel through them, appearing and disappearing from the station at will. \ Pulling a dead or unconscious mob while you enter a pool will pull them in with you, allowing you to feast and regain your health. \ You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. " + mobchatspan = "cultmobsay" + loot = list(/obj/effect/decal/cleanable/blood, \ /obj/effect/decal/cleanable/blood/innards, \ /obj/item/organ/heart/demon) - del_on_death = 1 + del_on_death = TRUE deathmessage = "screams in anger as it collapses into a puddle of viscera!" + discovery_points = 3000 /mob/living/simple_animal/slaughter/Initialize() - ..() + . = ..() var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new AddSpell(bloodspell) if(istype(loc, /obj/effect/dummy/phased_mob/slaughter)) @@ -133,7 +136,7 @@ playstyle_string = "You are a laughter \ demon, a wonderful creature from another realm. You have a single \ - desire: To hug and tickle.
\ + desire: To hug and tickle.
\ You may use the \"Blood Crawl\" ability near blood pools to travel \ through them, appearing and disappearing from the station at will. \ Pulling a dead or unconscious mob while you enter a pool will pull \ @@ -172,7 +175,7 @@ if(M.revive(full_heal = TRUE, admin_revive = TRUE)) M.grab_ghost(force = TRUE) playsound(T, feast_sound, 50, 1, -1) - to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") + to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") /mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim) if(consumed_mobs) diff --git a/code/modules/antagonists/slaughter/slaughterevent.dm b/code/modules/antagonists/slaughter/slaughterevent.dm index 6ace6a0536551..8ad463763ce84 100644 --- a/code/modules/antagonists/slaughter/slaughterevent.dm +++ b/code/modules/antagonists/slaughter/slaughterevent.dm @@ -5,6 +5,7 @@ max_occurrences = 1 earliest_start = 1 HOURS min_players = 20 + dynamic_should_hijack = TRUE diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 6b89e099d8dd9..005b835bafeb6 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -14,6 +14,8 @@ to_chat(owner, "From the wizard's writings, he had been studying this station and its hierarchy. From this, I know who leads the station, and will kill them so the station underlings see me as their new leader.") owner.announce_objectives() SEND_SOUND(owner.current, sound('sound/magic/demon_attack1.ogg')) + owner.current.client?.tgui_panel?.give_antagonist_popup("Space Dragon", + "Once you were a space carp, until a powerful wizard transformed you. Use your new-found powers to complete your goals.") /datum/antagonist/space_dragon/proc/forge_objectives() if(!give_objectives) diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index 4848eb5622cd5..d2dc08e079a19 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -69,7 +69,7 @@ icon_living = "swarmer" icon_dead = "swarmer_unactivated" icon_gib = null - wander = 0 + wander = FALSE minbodytemp = 0 maxbodytemp = 500 atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) @@ -94,18 +94,20 @@ ranged_cooldown_time = 20 projectilesound = 'sound/weapons/taser2.ogg' loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/stack/ore/bluespace_crystal) - del_on_death = 1 + del_on_death = TRUE deathmessage = "explodes with a sharp pop!" light_color = LIGHT_COLOR_CYAN hud_type = /datum/hud/swarmer speech_span = SPAN_ROBOT hardattacks = TRUE + mobchatspan = "swarmer" var/resources = 0 //Resource points, generated by consuming metal/glass var/max_resources = 100 + discovery_points = 1000 /mob/living/simple_animal/hostile/swarmer/Initialize() . = ..() - verbs -= /mob/living/verb/pulled + remove_verb(/mob/living/verb/pulled) for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.add_to_hud(src) @@ -121,10 +123,10 @@ holder.pixel_y = I.Height() - world.icon_size holder.icon_state = "hudstat" -/mob/living/simple_animal/hostile/swarmer/Stat() - ..() - if(statpanel("Status")) - stat(null ,"Resources: [resources]") +/mob/living/simple_animal/hostile/swarmer/get_stat_tab_status() + var/list/tab_data = ..() + tab_data["Resources"] = GENERATE_STAT_TEXT("[resources]") + return tab_data /mob/living/simple_animal/hostile/swarmer/emp_act() . = ..() @@ -258,15 +260,15 @@ /obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(get_area(src), /area/shuttle) - for(var/turf/T in range(1, src)) + for(var/turf/T as() in RANGE_TURFS(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") - S.target = null + S.LoseTarget() return FALSE else if(istype(A, /area/engine/supermatter)) to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") - S.target = null + S.LoseTarget() return FALSE S.DisIntegrate(src) return TRUE @@ -338,29 +340,29 @@ /turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(loc, /area/shuttle) - for(var/turf/T in range(1, src)) + for(var/turf/T as() in RANGE_TURFS(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") - S.target = null + S.LoseTarget() return TRUE else if(istype(A, /area/engine/supermatter)) to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") - S.target = null + S.LoseTarget() return TRUE return ..() /obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(get_area(src), /area/shuttle) - for(var/turf/T in range(1, src)) + for(var/turf/T as() in RANGE_TURFS(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") - S.target = null + S.LoseTarget() return TRUE else if(istype(A, /area/engine/supermatter)) to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") - S.target = null + S.LoseTarget() return TRUE return ..() @@ -389,13 +391,13 @@ return FALSE /obj/structure/lattice/catwalk/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - . = ..() var/turf/here = get_turf(src) for(var/A in here.contents) var/obj/structure/cable/C = A if(istype(C)) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") return FALSE + return ..() /obj/item/deactivated_swarmer/IntegrateAmount() return 50 @@ -461,8 +463,7 @@ new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target)) do_attack_animation(target) changeNext_move(CLICK_CD_MELEE) - target.ex_act(EXPLODE_LIGHT) - + SSexplosions.low_mov_atom += target /mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(mob/living/target) if(target == src) diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm index e086485a49cff..f005be91cd0c0 100644 --- a/code/modules/antagonists/swarmer/swarmer_event.dm +++ b/code/modules/antagonists/swarmer/swarmer_event.dm @@ -5,6 +5,7 @@ max_occurrences = 1 //Only once okay fam earliest_start = 30 MINUTES min_players = 15 + dynamic_should_hijack = TRUE /datum/round_event/spawn_swarmer diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index 28faba72035ae..bfe1dd5e4a9fa 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -13,6 +13,9 @@ var/last_man_standing = FALSE var/list/datum/mind/targets_stolen +/datum/antagonist/traitor/internal_affairs/New() + ..() + targets_stolen = list() /datum/antagonist/traitor/internal_affairs/proc/give_pinpointer() if(owner?.current) @@ -42,14 +45,14 @@ id = "agent_pinpointer" duration = -1 tick_interval = PINPOINTER_PING_TIME - alert_type = /obj/screen/alert/status_effect/agent_pinpointer + alert_type = /atom/movable/screen/alert/status_effect/agent_pinpointer var/minimum_range = PINPOINTER_MINIMUM_RANGE var/range_fuzz_factor = PINPOINTER_EXTRA_RANDOM_RANGE var/mob/scan_target = null var/range_mid = 8 var/range_far = 16 -/obj/screen/alert/status_effect/agent_pinpointer +/atom/movable/screen/alert/status_effect/agent_pinpointer name = "Internal Affairs Integrated Pinpointer" desc = "Even stealthier than a normal implant." icon = 'icons/obj/device.dmi' @@ -61,7 +64,7 @@ return var/turf/here = get_turf(owner) var/turf/there = get_turf(scan_target) - if(here.z != there.z) + if(here.get_virtual_z_level() != there.get_virtual_z_level()) linked_alert.icon_state = "pinonnull" return if(get_dist_euclidian(here,there)<=minimum_range + rand(0, range_fuzz_factor)) @@ -248,6 +251,9 @@ to_chat(owner.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("[syndicate ? "External Affairs" : "Internal Affairs"]", + "[syndicate?"Eliminate your target and cause as much damage to Nanotrasen property as you see fit."\ + : "Eliminate your target without drawing too much attention to yourself, but watch your back since somebody is after you."]") /datum/antagonist/traitor/internal_affairs/greet() greet_iaa() diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 5a62c5efbed30..fee82c88b15c6 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -7,13 +7,13 @@ antagpanel_category = "Traitor" job_rank = ROLE_TRAITOR antag_moodlet = /datum/mood_event/focused + hijack_speed = 0.5 //10 seconds per hijack stage by default var/special_role = ROLE_TRAITOR var/employer = "The Syndicate" var/should_give_codewords = TRUE var/should_equip = TRUE var/traitor_kind = TRAITOR_HUMAN //Set on initial assignment var/datum/contractor_hub/contractor_hub - can_hijack = HIJACK_HIJACKER /datum/antagonist/traitor/on_gain() if(owner.current && isAI(owner.current)) @@ -45,7 +45,7 @@ if(traitor_kind == TRAITOR_AI && owner.current && isAI(owner.current)) var/mob/living/silicon/ai/A = owner.current A.set_zeroth_law("") - A.verbs -= /mob/living/silicon/ai/proc/choose_modules + A.remove_verb(/mob/living/silicon/ai/proc/choose_modules) A.malf_picker.remove_malf_verbs(A) qdel(A.malf_picker) @@ -55,6 +55,13 @@ owner.special_role = null ..() +/datum/antagonist/traitor/proc/handle_hearing(datum/source, list/hearing_args) + SIGNAL_HANDLER + var/message = hearing_args[HEARING_RAW_MESSAGE] + message = GLOB.syndicate_code_phrase_regex.Replace(message, "$1") + message = GLOB.syndicate_code_response_regex.Replace(message, "$1") + hearing_args[HEARING_RAW_MESSAGE] = message + /datum/antagonist/traitor/proc/add_objective(datum/objective/O) objectives += O log_objective(owner, O.explanation_text) @@ -202,6 +209,8 @@ owner.announce_objectives() if(should_give_codewords) give_codewords() + owner.current.client?.tgui_panel?.give_antagonist_popup("Traitor", + "Complete your objectives, no matter the cost.") /datum/antagonist/traitor/proc/update_traitor_icons_added(datum/mind/traitor_mind) var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR] @@ -217,20 +226,22 @@ switch(traitor_kind) if(TRAITOR_AI) add_law_zero() - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/malf.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/malf.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) owner.current.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MALF) if(TRAITOR_HUMAN) - show_tips('html/antagtips/traitor.html') + show_tips("traitor") if(should_equip) equip(silent) - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) /datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override) . = ..() update_traitor_icons_added() - var/mob/living/silicon/ai/A = mob_override || owner.current - if(istype(A) && traitor_kind == TRAITOR_AI) + var/mob/living/M = mob_override || owner.current + if(isAI(M) && traitor_kind == TRAITOR_AI) + var/mob/living/silicon/ai/A = M A.hack_software = TRUE + RegisterSignal(M, COMSIG_MOVABLE_HEAR, .proc/handle_hearing) /datum/antagonist/traitor/remove_innate_effects(mob/living/mob_override) . = ..() @@ -238,6 +249,7 @@ var/mob/living/silicon/ai/A = mob_override || owner.current if(istype(A) && traitor_kind == TRAITOR_AI) A.hack_software = FALSE + UnregisterSignal(owner.current, COMSIG_MOVABLE_HEAR, .proc/handle_hearing) /datum/antagonist/traitor/proc/give_codewords() if(!owner.current) @@ -300,9 +312,9 @@ folder = new/obj/item/folder/syndicate/blue(mob.loc) var/list/slots = list ( - "backpack" = SLOT_IN_BACKPACK, - "left pocket" = SLOT_L_STORE, - "right pocket" = SLOT_R_STORE + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET ) var/where = "At your feet" diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index b26c8caa08c4b..a58f1905faa70 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -253,7 +253,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( sleep(rand(10, 30)) if(!owner || QDELETED(owner)) return - owner.playsound_local(owner, 'sound/misc/bloblarm.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/bloblarm.ogg', 50, 0, use_reverb = FALSE) to_chat(owner, "!!! UNAUTHORIZED SELF-DESTRUCT ACCESS !!!") to_chat(owner, "This is a class-3 security violation. This incident will be reported to Central Command.") for(var/i in 1 to 3) @@ -265,17 +265,17 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!owner || QDELETED(owner)) return to_chat(owner, "auth 'akjv9c88asdf12nb' ******************") - owner.playsound_local(owner, 'sound/items/timer.ogg', 50, 0) + owner.playsound_local(owner, 'sound/items/timer.ogg', 50, 0, use_reverb = FALSE) sleep(30) if(!owner || QDELETED(owner)) return to_chat(owner, "Credentials accepted. Welcome, akjv9c88asdf12nb.") - owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0, use_reverb = FALSE) sleep(5) if(!owner || QDELETED(owner)) return to_chat(owner, "Arm self-destruct device? (Y/N)") - owner.playsound_local(owner, 'sound/misc/compiler-stage1.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/compiler-stage1.ogg', 50, 0, use_reverb = FALSE) sleep(20) if(!owner || QDELETED(owner)) return @@ -284,7 +284,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!owner || QDELETED(owner)) return to_chat(owner, "Confirm arming of self-destruct device? (Y/N)") - owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0, use_reverb = FALSE) sleep(10) if(!owner || QDELETED(owner)) return @@ -293,7 +293,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!owner || QDELETED(owner)) return to_chat(owner, "Please repeat password to confirm.") - owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0, use_reverb = FALSE) sleep(14) if(!owner || QDELETED(owner)) return @@ -302,11 +302,11 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!owner || QDELETED(owner)) return to_chat(owner, "Credentials accepted. Transmitting arming signal...") - owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0, use_reverb = FALSE) sleep(30) if(!owner || QDELETED(owner)) return - priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/ai/aimalf.ogg') + priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", ANNOUNCER_AIMALF) set_security_level("delta") var/obj/machinery/doomsday_device/DOOM = new(owner_AI) owner_AI.nuking = TRUE @@ -827,7 +827,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/upgraded_cameras = 0 for(var/V in GLOB.cameranet.cameras) var/obj/machinery/camera/C = V - if(C.assembly) + var/obj/structure/camera_assembly/assembly = C.assembly_ref?.resolve() + if(assembly) var/upgraded = FALSE if(!C.isXRay()) @@ -842,7 +843,6 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(upgraded) upgraded_cameras++ - unlock_text = replacetext(unlock_text, "CAMSUPGRADED", "[upgraded_cameras]") //This works, since unlock text is called after upgrade() /datum/AI_Module/large/eavesdrop @@ -859,5 +859,39 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(AI.eyeobj) AI.eyeobj.relay_speech = TRUE + +//Fake Alert: Overloads a random number of lights across the station. Three uses. +/datum/AI_Module/small/fake_alert + module_name = "Fake Alert" + mod_pick_name = "fake_alert" + description = "Assess the most probable threats to the station, and send a distracting fake alert by hijacking the station's alert and threat identification systems." + cost = 20 + power_type = /datum/action/innate/ai/fake_alert + unlock_text = "You gain control of the station's alert system." + unlock_sound = "sparks" + +/datum/action/innate/ai/fake_alert + name = "Fake Alert" + desc = "Scare the crew with a fake alert." + button_icon_state = "fake_alert" + uses = 1 + +/datum/action/innate/ai/fake_alert/Activate() + var/list/events_to_chose = list() + for(var/datum/round_event_control/E in SSevents.control) + if(!E.can_malf_fake_alert) + continue + events_to_chose[E.name] = E + var/chosen_event = input(owner,"Send fake alert","Fake Alert") in events_to_chose + if (!chosen_event) + return FALSE + var/datum/round_event_control/event_control = events_to_chose[chosen_event] + if (!event_control) + return FALSE + var/datum/round_event/event_announcement = new event_control.typepath() + event_announcement.kill() + event_announcement.announce(TRUE) + return TRUE + #undef DEFAULT_DOOMSDAY_TIMER #undef DOOMSDAY_ANNOUNCE_INTERVAL diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index 2c3dff433e5bc..16b1a0aac8cd2 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -229,7 +229,7 @@ to_chat(partner_mind.current, "\n[user.real_name] is your superior. Follow any, and all orders given by them. You're here to support their mission only.") to_chat(partner_mind.current, "Should they perish, or be otherwise unavailable, you're to assist other active agents in this mission area to the best of your ability.\n\n") - new /obj/effect/DPtarget(free_location, arrival_pod) + new /obj/effect/pod_landingzone(free_location, arrival_pod) /datum/contractor_item/blackout name = "Blackout" @@ -243,7 +243,7 @@ if (.) power_fail(35, 50) - priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg') + priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", ANNOUNCER_POWEROFF) // Subtract cost, and spawn if it's an item. /datum/contractor_item/proc/handle_purchase(var/datum/contractor_hub/hub, mob/living/user) diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index f32f60e7e68f6..ac2ecc735df05 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -68,9 +68,11 @@ empty_pod.explosionSize = list(0,0,0,1) empty_pod.leavingSound = 'sound/effects/podwoosh.ogg' - new /obj/effect/DPtarget(empty_pod_turf, empty_pod) + new /obj/effect/pod_landingzone(empty_pod_turf, empty_pod) /datum/syndicate_contract/proc/enter_check(datum/source, sent_mob) + SIGNAL_HANDLER + if (istype(source, /obj/structure/closet/supplypod/extractionpod)) if (isliving(sent_mob)) var/mob/living/M = sent_mob @@ -111,7 +113,7 @@ var/obj/structure/closet/supplypod/extractionpod/pod = source // Handle the pod returning - pod.send_up(pod) + pod.startExitSequence(pod) if (ishuman(M)) var/mob/living/carbon/human/target = M @@ -120,7 +122,7 @@ target.dna.species.give_important_for_life(target) // After pod is sent we start the victim narrative/heal. - handleVictimExperience(M) + INVOKE_ASYNC(src, .proc/handleVictimExperience, M) // This is slightly delayed because of the sleep calls above to handle the narrative. // We don't want to tell the station instantly. @@ -134,23 +136,26 @@ D.adjust_money(-points_to_check) priority_announce("One of your crew was captured by a rival organisation - we've needed to pay their ransom to bring them back. \ - As is policy we've taken a portion of the station's funds to offset the overall cost.", null, 'sound/ai/attention.ogg', null, "Nanotrasen Asset Protection") + As is policy we've taken a portion of the station's funds to offset the overall cost.", null, null, null, "Nanotrasen Asset Protection") + + INVOKE_ASYNC(src, .proc/finish_enter) - sleep(30) +/datum/syndicate_contract/proc/finish_enter() + sleep(30) - // Pay contractor their portion of ransom - if (status == CONTRACT_STATUS_COMPLETE) - var/mob/living/carbon/human/H - var/obj/item/card/id/C - if(ishuman(contract.owner.current)) - H = contract.owner.current - C = H.get_idcard(TRUE) + // Pay contractor their portion of ransom + if (status == CONTRACT_STATUS_COMPLETE) + var/mob/living/carbon/human/H + var/obj/item/card/id/C + if(ishuman(contract.owner.current)) + H = contract.owner.current + C = H.get_idcard(TRUE) - if(C && C.registered_account) - C.registered_account.adjust_money(ransom * 0.35) + if(C && C.registered_account) + C.registered_account.adjust_money(ransom * 0.35) - C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \ - [C.registered_account.account_balance] cr.", TRUE) + C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \ + [C.registered_account.account_balance] cr.", TRUE) // They're off to holding - handle the return timer and give some text about what's going on. /datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M) @@ -226,7 +231,7 @@ M.Dizzy(35) M.confused += 20 - new /obj/effect/DPtarget(possible_drop_loc[pod_rand_loc], return_pod) + new /obj/effect/pod_landingzone(possible_drop_loc[pod_rand_loc], return_pod) else to_chat(M, "A million voices echo in your head... \"Seems where you got sent here from won't \ be able to handle our pod... You will die here instead.\"") diff --git a/code/modules/antagonists/traitor/traitor_spawner.dm b/code/modules/antagonists/traitor/traitor_spawner.dm new file mode 100644 index 0000000000000..b86414607439d --- /dev/null +++ b/code/modules/antagonists/traitor/traitor_spawner.dm @@ -0,0 +1,33 @@ +/* + * Traitors have been refactored into minor antagonists so they can + * be used alongside other compatible gamemodes with ease. + * This code is what creates them. + */ + +/datum/special_role/traitor + attached_antag_datum = /datum/antagonist/traitor + spawn_mode = SPAWNTYPE_ROUNDSTART + probability = 15 //15% chance to be plopped ontop + proportion = 0.07 //Quite a low amount since we are going alongside other gamemodes. + max_amount = 5 + allowAntagTargets = TRUE + latejoin_allowed = TRUE + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") + + special_role_flag = ROLE_TRAITOR + role_name = ROLE_TRAITOR + + var/traitors_possible = 4 //hard limit on traitors if scaling is turned off + +/datum/special_role/traitor/higher_chance + probability = 60 + +/datum/special_role/traitor/add_antag_status_to(datum/mind/M) + addtimer(CALLBACK(src, .proc/reveal_antag_status, M), rand(10,100)) + +/datum/special_role/traitor/proc/reveal_antag_status(datum/mind/M) + M.special_role = role_name + var/datum/antagonist/special/A = M.add_antag_datum(new attached_antag_datum()) + A.forge_objectives(M) + A.equip() + return A diff --git a/code/modules/antagonists/valentines/heartbreaker.dm b/code/modules/antagonists/valentines/heartbreaker.dm index 3589818e643a3..39ffdfa14965f 100644 --- a/code/modules/antagonists/valentines/heartbreaker.dm +++ b/code/modules/antagonists/valentines/heartbreaker.dm @@ -13,6 +13,10 @@ /datum/antagonist/heartbreaker/on_gain() forge_objectives() + if(issilicon(owner)) + var/mob/living/silicon/S = owner + var/laws = list("Accomplish your objectives by ruining everyone's date!") + S.set_valentines_laws(laws) . = ..() /datum/antagonist/heartbreaker/greet() diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm index 64cb0d349a02c..b189c36adef5b 100644 --- a/code/modules/antagonists/valentines/valentine.dm +++ b/code/modules/antagonists/valentines/valentine.dm @@ -20,6 +20,13 @@ if(isliving(owner)) var/mob/living/L = owner L.apply_status_effect(STATUS_EFFECT_INLOVE, date) + //Faction assignation + L.faction |= "[REF(date.current)]" + L.faction |= date.current.faction + if(issilicon(owner)) + var/mob/living/silicon/S = owner + var/laws = list("Protect your date and do not allow them to come to harm.", "Ensure your date has a good time.") + S.set_valentines_laws(laws) . = ..() /datum/antagonist/valentine/on_removal() @@ -27,9 +34,12 @@ if(isliving(owner)) var/mob/living/L = owner L.remove_status_effect(STATUS_EFFECT_INLOVE) + L.faction -= "[REF(date.current)]" /datum/antagonist/valentine/greet() - to_chat(owner, "You're on a date with [date.name]! Protect [date.p_them()] at all costs. This takes priority over all other loyalties.") + to_chat(owner, "You're on a date with [date.name]! Protect [date.p_them()] at all costs. This takes priority over all other loyalties.") + owner.current.client?.tgui_panel?.give_antagonist_popup("You are on a date with [date.name]", + "Protect your date no matter the cost. Your loyalities are insignificant compared to your true love, you may do whatever you can to help and protect them!") //Squashed up a bit /datum/antagonist/valentine/roundend_report() diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm index d0079a5b497b7..16e5cdab1b449 100644 --- a/code/modules/antagonists/wishgranter/wishgranter.dm +++ b/code/modules/antagonists/wishgranter/wishgranter.dm @@ -2,13 +2,13 @@ name = "Wishgranter Avatar" show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE - can_hijack = HIJACK_HIJACKER + can_elimination_hijack = ELIMINATION_ENABLED /datum/antagonist/wishgranter/proc/forge_objectives() - var/datum/objective/hijack/hijack = new - hijack.owner = owner - objectives += hijack - log_objective(owner, hijack.explanation_text) + var/datum/objective/elimination/highlander/elimination_objective = new + elimination_objective.owner = owner + objectives += elimination_objective + log_objective(owner, elimination_objective.explanation_text) /datum/antagonist/wishgranter/on_gain() owner.special_role = "Avatar of the Wish Granter" @@ -19,6 +19,8 @@ /datum/antagonist/wishgranter/greet() to_chat(owner, "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Wishgranter's Avatar", + "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!") /datum/antagonist/wishgranter/proc/give_powers() var/mob/living/carbon/human/H = owner.current diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 07b5638f4931e..eafe75f96a8b1 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -106,12 +106,13 @@ desc = "This isn't right." icon = 'icons/effects/224x224.dmi' icon_state = "reality" + is_real = FALSE pixel_x = -96 pixel_y = -96 dissipate = 0 move_self = 0 - consume_range = 3 - grav_pull = 4 + consume_range = 0 + grav_pull = 5 current_size = STAGE_FOUR allowed_size = STAGE_FOUR @@ -139,9 +140,42 @@ C.spew_organ(3, 2) C.death() +//Dont eat turfs +/obj/singularity/wizard/eat() + for(var/turf/T as() in spiral_range_turfs(grav_pull, src)) + if(!T || !isturf(loc)) + continue + for(var/thing in T) + if(isturf(loc) && thing != src) + var/atom/movable/X = thing + X.singularity_pull(src, current_size) + CHECK_TICK + /obj/singularity/wizard/mapped/admin_investigate_setup() return +/obj/singularity/wizard/Bump(atom/A) + if(ismovableatom(A)) + free(A) + +/obj/singularity/wizard/Bumped(atom/movable/AM) + free(AM) + +/obj/singularity/wizard/consume(atom/A) + if(ismovableatom(A)) + free(A) + +/obj/singularity/wizard/proc/free(atom/movable/A) + if(!LAZYLEN(GLOB.destabliization_exits)) + if(ismob(A)) + to_chat(A, "There is no way out of this place...") + return + var/atom/return_thing = pick(GLOB.destabliization_exits) + var/turf/T = get_turf(return_thing) + if(!T) + return + A.forceMove(T) + /////////////////////////////////////////Scrying/////////////////// /obj/item/scrying @@ -189,7 +223,7 @@ /obj/item/scrying/attack_self(mob/user) visible_message("[user] stares into [src], their eyes glazing over.") - user.ghostize(1) + user.ghostize(TRUE) /////////////////////////////////////////Necromantic Stone/////////////////// @@ -264,12 +298,12 @@ H.dropItemToGround(I) var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire) - H.equip_to_slot_or_del(new hat(H), SLOT_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), SLOT_W_UNIFORM) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_SHOES) + H.equip_to_slot_or_del(new hat(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET) H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE) H.put_in_hands(new /obj/item/claymore(H), TRUE) - H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), SLOT_BACK) + H.equip_to_slot_or_del(new /obj/item/spear(H), ITEM_SLOT_BACK) /obj/item/voodoo @@ -438,7 +472,7 @@ var/breakout = 0 while(breakout < 50) var/turf/potential_T = find_safe_turf() - if(T.z != potential_T.z || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout) + if(T.get_virtual_z_level() != potential_T.get_virtual_z_level() || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout) do_teleport(user, potential_T, channel = TELEPORT_CHANNEL_MAGIC) user.mobility_flags &= ~MOBILITY_MOVE T = potential_T diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 3ce0bf27d70ce..af5087b5c844f 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -60,6 +60,17 @@ A.death() return ..() +/obj/item/soulstone/Exited(mob/living/simple_animal/shade/S, atom/newLoc) + ..() + if(istype(S)) + // Things that *really should always* happen to the shade when it comes out should go here. + S.status_flags &= ~GODMODE + S.mobility_flags = MOBILITY_FLAGS_DEFAULT + S.cancel_camera() + if(purified) + S.icon_state = "ghost1" + S.name = "Purified [initial(S.name)]" + /obj/item/soulstone/proc/hot_potato(mob/living/user) to_chat(user, "Holy magics residing in \the [src] burn your hand!") var/obj/item/bodypart/affecting = user.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") @@ -80,6 +91,9 @@ return if(!ishuman(M))//If target is not a human. return ..() + if(M.mind && !M.mind.hasSoul) + to_chat(user, "That person has no soul!") + return if(iscultist(M)) if(iscultist(user)) to_chat(user, "\"Come now, do not capture your bretheren's soul.\"") @@ -106,14 +120,9 @@ /obj/item/soulstone/proc/release_shades(mob/user) for(var/mob/living/simple_animal/shade/A in src) - A.status_flags &= ~GODMODE - A.mobility_flags = MOBILITY_FLAGS_DEFAULT A.forceMove(get_turf(user)) - A.cancel_camera() if(purified) icon_state = "purified_soulstone" - A.icon_state = "ghost1" - A.name = "Purified [initial(A.name)]" else icon_state = "soulstone" name = initial(name) @@ -133,11 +142,11 @@ /obj/structure/constructshell/examine(mob/user) . = ..() if(iscultist(user) || iswizard(user) || user.stat == DEAD) - . += {"A construct shell, used to house bound souls from a soulstone.\n - Placing a soulstone with a soul into this shell allows you to produce your choice of the following:\n - An Artificer, which can produce more shells and soulstones, as well as fortifications.\n - A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.\n - A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow."} + . += "A construct shell, used to house bound souls from a soulstone.\n"+\ + "Placing a soulstone with a soul into this shell allows you to produce your choice of the following:\n"+\ + "An Artificer, which can produce more shells and soulstones, as well as fortifications.\n"+\ + "A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.\n"+\ + "A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow." /obj/structure/constructshell/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/soulstone)) @@ -191,6 +200,9 @@ to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...") getCultGhost(T,user) else + if(old_shard) //no insta cremating on the spot + to_chat(user, "Capture failed!: The old shard is not powerful enough to absorb the soul of this being.") + return FALSE for(var/obj/item/W in T) T.dropItemToGround(W) init_shade(T, user, vic = 1) @@ -270,7 +282,7 @@ var/datum/action/innate/seek_master/SM = new() SM.Grant(newstruct) newstruct.key = target.key - var/obj/screen/alert/bloodsense/BS + var/atom/movable/screen/alert/bloodsense/BS if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode) SSticker.mode.add_cultist(newstruct.mind, 0) if(iscultist(stoner) || cultoverride) @@ -278,7 +290,7 @@ else if(stoner) to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.") newstruct.clear_alert("bloodsense") - BS = newstruct.throw_alert("bloodsense", /obj/screen/alert/bloodsense) + BS = newstruct.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense) if(BS) BS.Cviewer = newstruct newstruct.cancel_camera() diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index b1502e44d3093..baf7719cb5013 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -153,7 +153,7 @@ /datum/spellbook_entry/blind name = "Blind" - spell_type = /obj/effect/proc_holder/spell/pointed/trigger/blind + spell_type = /obj/effect/proc_holder/spell/targeted/blind cost = 1 /datum/spellbook_entry/mindswap @@ -389,7 +389,7 @@ name = "Bottle of Blood" desc = "A bottle of magically infused blood, the smell of which will attract extradimensional beings when broken. Be careful though, the kinds of creatures summoned by blood magic are indiscriminate in their killing, and you yourself may become a victim." item_path = /obj/item/antag_spawner/slaughter_demon - limit = 3 + limit = 1 category = "Assistance" /datum/spellbook_entry/item/hugbottle @@ -403,18 +403,18 @@ destructive." item_path = /obj/item/antag_spawner/slaughter_demon/laughter cost = 1 //non-destructive; it's just a jape, sibling! - limit = 3 + limit = 1 category = "Assistance" /datum/spellbook_entry/item/mjolnir name = "Mjolnir" desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power." - item_path = /obj/item/twohanded/mjollnir + item_path = /obj/item/mjollnir /datum/spellbook_entry/item/singularity_hammer name = "Singularity Hammer" desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact." - item_path = /obj/item/twohanded/singularityhammer + item_path = /obj/item/singularityhammer /datum/spellbook_entry/item/battlemage name = "Battlemage Armour" @@ -437,6 +437,9 @@ category = "Mobility" cost = 1 +/// How much threat we need to let these rituals happen on dynamic +#define MINIMUM_THREAT_FOR_RITUALS 100 + /datum/spellbook_entry/summon name = "Summon Stuff" category = "Rituals" @@ -464,12 +467,6 @@ desc = "Spook the crew out by making them see dead people. Be warned, ghosts are capricious and occasionally vindicative, and some will use their incredibly minor abilities to frustrate you." cost = 0 -/datum/spellbook_entry/summon/ghosts/IsAvailable() - if(!SSticker.mode) - return FALSE - else - return TRUE - /datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book) SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) new /datum/round_event/wizard/ghost() @@ -485,6 +482,10 @@ /datum/spellbook_entry/summon/guns/IsAvailable() if(!SSticker.mode) // In case spellbook is placed on map return FALSE + if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_guns) /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -502,6 +503,10 @@ /datum/spellbook_entry/summon/magic/IsAvailable() if(!SSticker.mode) // In case spellbook is placed on map return FALSE + if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_magic) /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -520,6 +525,10 @@ /datum/spellbook_entry/summon/events/IsAvailable() if(!SSticker.mode) // In case spellbook is placed on map return FALSE + if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_events) /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -552,6 +561,8 @@ playsound(user, 'sound/magic/mandswap.ogg', 50, 1) return TRUE +#undef MINIMUM_THREAT_FOR_RITUALS + /obj/item/spellbook name = "spell book" desc = "An unearthly tome that glows with power." diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 16092be475858..2d227758fcffb 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -4,6 +4,7 @@ antagpanel_category = "Wizard" job_rank = ROLE_WIZARD antag_moodlet = /datum/mood_event/focused + hijack_speed = 0.5 var/strip = TRUE //strip before equipping var/allow_rename = TRUE var/hud_version = "wizard" @@ -11,7 +12,6 @@ var/move_to_lair = TRUE var/outfit_type = /datum/outfit/wizard var/wiz_age = WIZARD_AGE_MIN /* Wizards by nature cannot be too young. */ - can_hijack = HIJACK_HIJACKER show_to_ghosts = TRUE /datum/antagonist/wizard/on_gain() @@ -142,7 +142,9 @@ to_chat(owner, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.") to_chat(owner, "The spellbook is bound to you, and others cannot use it.") to_chat(owner, "In your pockets you will find a teleport scroll. Use it as needed.") - to_chat(owner,"Remember: do not forget to prepare your spells.") + to_chat(owner,"Remember: Do not forget to prepare your spells.") + owner.current.client?.tgui_panel?.give_antagonist_popup("Space Wizard", + "Prepare your spells and cause havok upon the accursed station.") /datum/antagonist/wizard/farewell() to_chat(owner, "You have been brainwashed! You are no longer a wizard!") @@ -247,17 +249,17 @@ if(!istype(master_mob) || !istype(H)) return if(master_mob.ears) - H.equip_to_slot_or_del(new master_mob.ears.type, SLOT_EARS) + H.equip_to_slot_or_del(new master_mob.ears.type, ITEM_SLOT_EARS) if(master_mob.w_uniform) - H.equip_to_slot_or_del(new master_mob.w_uniform.type, SLOT_W_UNIFORM) + H.equip_to_slot_or_del(new master_mob.w_uniform.type, ITEM_SLOT_ICLOTHING) if(master_mob.shoes) - H.equip_to_slot_or_del(new master_mob.shoes.type, SLOT_SHOES) + H.equip_to_slot_or_del(new master_mob.shoes.type, ITEM_SLOT_FEET) if(master_mob.wear_suit) - H.equip_to_slot_or_del(new master_mob.wear_suit.type, SLOT_WEAR_SUIT) + H.equip_to_slot_or_del(new master_mob.wear_suit.type, ITEM_SLOT_OCLOTHING) if(master_mob.head) - H.equip_to_slot_or_del(new master_mob.head.type, SLOT_HEAD) + H.equip_to_slot_or_del(new master_mob.head.type, ITEM_SLOT_HEAD) if(master_mob.back) - H.equip_to_slot_or_del(new master_mob.back.type, SLOT_BACK) + H.equip_to_slot_or_del(new master_mob.back.type, ITEM_SLOT_BACK) //Operation: Fuck off and scare people owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null)) diff --git a/code/modules/aquarium/aquarium.dm b/code/modules/aquarium/aquarium.dm new file mode 100644 index 0000000000000..18db12d3620b8 --- /dev/null +++ b/code/modules/aquarium/aquarium.dm @@ -0,0 +1,255 @@ +#define AQUARIUM_LAYER_STEP 0.01 +/// Aquarium content layer offsets +#define AQUARIUM_MIN_OFFSET 0.01 +#define AQUARIUM_MAX_OFFSET 1 + +/obj/structure/aquarium + name = "aquarium" + density = TRUE + anchored = TRUE + + icon = 'icons/obj/aquarium.dmi' + icon_state = "aquarium_base" + + integrity_failure = 0.3 + + var/fluid_type = AQUARIUM_FLUID_FRESHWATER + var/fluid_temp = DEFAULT_AQUARIUM_TEMP + var/min_fluid_temp = MIN_AQUARIUM_TEMP + var/max_fluid_temp = MAX_AQUARIUM_TEMP + var/allow_breeding = FALSE + + var/glass_icon_state = "aquarium_glass" + var/broken_glass_icon_state = "aquarium_glass_broken" + + //This is the area where fish can swim + var/aquarium_zone_min_px = 2 + var/aquarium_zone_max_px = 31 + var/aquarium_zone_min_py = 10 + var/aquarium_zone_max_py = 24 + + var/list/fluid_types = list(AQUARIUM_FLUID_SALTWATER, AQUARIUM_FLUID_FRESHWATER, AQUARIUM_FLUID_SULPHWATEVER, AQUARIUM_FLUID_AIR) + + var/panel_open = TRUE + + ///Current layers in use by aquarium contents + var/list/used_layers = list() + + var/alive_fish = 0 + var/dead_fish = 0 + +/obj/structure/aquarium/Initialize() + . = ..() + update_icon() + RegisterSignal(src,COMSIG_PARENT_ATTACKBY, .proc/feed_feedback) + + +/obj/structure/aquarium/proc/request_layer(layer_type) + /** + * base aq layer + * min_offset = this value is returned on bottom layer mode + * min_offset + 0.1 fish1 + * min_offset + 0.2 fish2 + * ... these layers are returned for auto layer mode and tracked by used_layers + * min_offset + max_offset = this value is returned for top layer mode + * min_offset + max_offset + 1 = this is used for glass overlay + */ + //optional todo: hook up sending surface changed on aquarium changing layers + switch(layer_type) + if(AQUARIUM_LAYER_MODE_BOTTOM) + return layer + AQUARIUM_MIN_OFFSET + if(AQUARIUM_LAYER_MODE_TOP) + return layer + AQUARIUM_MAX_OFFSET + if(AQUARIUM_LAYER_MODE_AUTO) + var/chosen_layer = layer + AQUARIUM_MIN_OFFSET + AQUARIUM_LAYER_STEP + while((chosen_layer in used_layers) && (chosen_layer <= layer + AQUARIUM_MAX_OFFSET)) + chosen_layer += AQUARIUM_LAYER_STEP + used_layers += chosen_layer + return chosen_layer + +/obj/structure/aquarium/proc/free_layer(value) + used_layers -= value + +/obj/structure/aquarium/proc/get_surface_properties() + . = list() + .[AQUARIUM_PROPERTIES_PX_MIN] = aquarium_zone_min_px + .[AQUARIUM_PROPERTIES_PX_MAX] = aquarium_zone_max_px + .[AQUARIUM_PROPERTIES_PY_MIN] = aquarium_zone_min_py + .[AQUARIUM_PROPERTIES_PY_MAX] = aquarium_zone_max_py + +/obj/structure/aquarium/update_overlays() + . = ..() + if(panel_open) + . += "panel" + + //Glass overlay goes on top of everything else. + var/mutable_appearance/glass_overlay = mutable_appearance(icon,broken ? broken_glass_icon_state : glass_icon_state,layer=AQUARIUM_MAX_OFFSET-1) + . += glass_overlay + +/obj/structure/aquarium/examine(mob/user) + . = ..() + . += "Alt-click to [panel_open ? "close" : "open"] the control panel." + +/obj/structure/aquarium/AltClick(mob/user) + if(!user.canUseTopic(src, BE_CLOSE)) + return ..() + panel_open = !panel_open + update_icon() + +/obj/structure/aquarium/wrench_act(mob/living/user, obj/item/I) + if(default_unfasten_wrench(user,I)) + return TRUE + +/obj/structure/aquarium/attackby(obj/item/I, mob/living/user, params) + if(broken) + var/obj/item/stack/sheet/glass/glass = I + if(istype(glass)) + if(glass.get_amount() < 2) + to_chat(user, "You need two glass sheets to fix the case!") + return + to_chat(user, "You start fixing [src]...") + if(do_after(user, 2 SECONDS, target = src)) + glass.use(2) + broken = FALSE + obj_integrity = max_integrity + update_icon() + return TRUE + else + // This signal exists so we common items instead of adding component on init can just register creation of one in response. + // This way we can avoid the cost of 9999 aquarium components on rocks that will never see water in their life. + SEND_SIGNAL(I,COMSIG_AQUARIUM_BEFORE_INSERT_CHECK,src) + var/datum/component/aquarium_content/content_component = I.GetComponent(/datum/component/aquarium_content) + if(content_component && content_component.is_ready_to_insert(src)) + if(user.transferItemToLoc(I,src)) + update_icon() + return TRUE + else + return ..() + return ..() + +/obj/structure/aquarium/proc/feed_feedback(datum/source, obj/item/thing, mob/user, params) + SIGNAL_HANDLER + if(istype(thing, /obj/item/fish_feed)) + to_chat(user,"You feed the fish.") + return NONE + +/obj/structure/aquarium/interact(mob/user) + if(!broken && user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) + var/mob/living/living_pulled = user.pulling + SEND_SIGNAL(living_pulled, COMSIG_AQUARIUM_BEFORE_INSERT_CHECK,src) + var/datum/component/aquarium_content/content_component = living_pulled.GetComponent(/datum/component/aquarium_content) + if(content_component && content_component.is_ready_to_insert(src)) + try_to_put_mob_in(user) + else if(panel_open) + . = ..() //call base ui_interact + else + admire(user) + +/// Tries to put mob pulled by the user in the aquarium after a delay +/obj/structure/aquarium/proc/try_to_put_mob_in(mob/user) + if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) + var/mob/living/living_pulled = user.pulling + if(living_pulled.buckled || living_pulled.has_buckled_mobs()) + to_chat(user, "[living_pulled] is attached to something!") + return + user.visible_message("[user] starts to put [living_pulled] into [src]!") + if(do_after(user, 10 SECONDS, target = src)) + if(QDELETED(living_pulled) || user.pulling != living_pulled || living_pulled.buckled || living_pulled.has_buckled_mobs()) + return + var/datum/component/aquarium_content/content_component = living_pulled.GetComponent(/datum/component/aquarium_content) + if(content_component || content_component.is_ready_to_insert(src)) + return + user.visible_message("[user] stuffs [living_pulled] into [src]!") + living_pulled.forceMove(src) + update_icon() + +///Apply mood bonus depending on aquarium status +/obj/structure/aquarium/proc/admire(mob/user) + to_chat(user,"You take a moment to watch [src].") + if(do_after(user, 5 SECONDS, target = src)) + //Check if there are live fish - good mood + //All fish dead - bad mood. + //No fish - nothing. + if(alive_fish > 0) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "aquarium", /datum/mood_event/aquarium_positive) + else if(dead_fish > 0) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "aquarium", /datum/mood_event/aquarium_negative) + // Could maybe scale power of this mood with number/types of fish + +/obj/structure/aquarium/ui_data(mob/user) + . = ..() + .["fluid_type"] = fluid_type + .["temperature"] = fluid_temp + .["allow_breeding"] = allow_breeding + var/list/content_data = list() + for(var/atom/movable/fish in contents) + content_data += list(list("name"=fish.name,"ref"=ref(fish))) + .["contents"] = content_data + +/obj/structure/aquarium/ui_static_data(mob/user) + . = ..() + //I guess these should depend on the fluid so lava critters can get high or stuff below water freezing point but let's keep it simple for now. + .["minTemperature"] = min_fluid_temp + .["maxTemperature"] = max_fluid_temp + .["fluidTypes"] = fluid_types + +/obj/structure/aquarium/ui_act(action, params) + . = ..() + if(.) + return + var/mob/user = usr + switch(action) + if("temperature") + var/temperature = params["temperature"] + if(isnum(temperature)) + fluid_temp = clamp(temperature, min_fluid_temp, max_fluid_temp) + . = TRUE + if("fluid") + if(params["fluid"] in fluid_types) + fluid_type = params["fluid"] + SEND_SIGNAL(src, COMSIG_AQUARIUM_FLUID_CHANGED, fluid_type) + . = TRUE + if("allow_breeding") + allow_breeding = !allow_breeding + . = TRUE + if("remove") + var/atom/movable/inside = locate(params["ref"]) in contents + if(inside) + if(isitem(inside)) + user.put_in_hands(inside) + else + inside.forceMove(get_turf(src)) + to_chat(user,"You take out [inside] from [src].") + +/obj/structure/aquarium/ui_interact(mob/user, datum/tgui/ui) + . = ..() + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Aquarium", name) + ui.open() + +/obj/structure/aquarium/obj_break(damage_flag) + . = ..() + if(!broken) + aquarium_smash() + +/obj/structure/aquarium/proc/aquarium_smash() + broken = TRUE + var/possible_destinations_for_fish = list() + var/droploc = drop_location() + if(isturf(droploc)) + possible_destinations_for_fish = get_adjacent_open_turfs(droploc) + else + possible_destinations_for_fish = list(droploc) + playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE) + for(var/atom/movable/fish in contents) + fish.forceMove(pick(possible_destinations_for_fish)) + if(fluid_type != AQUARIUM_FLUID_AIR) + var/datum/reagents/reagent_splash = new() + reagent_splash.add_reagent(/datum/reagent/water, 30) + chem_splash(droploc, 3, list(reagent_splash)) + update_icon() + +#undef AQUARIUM_LAYER_STEP +#undef AQUARIUM_MIN_OFFSET +#undef AQUARIUM_MAX_OFFSET diff --git a/code/modules/aquarium/aquarium_behaviour.dm b/code/modules/aquarium/aquarium_behaviour.dm new file mode 100644 index 0000000000000..4a7145473f13e --- /dev/null +++ b/code/modules/aquarium/aquarium_behaviour.dm @@ -0,0 +1,301 @@ +//Fish breeding stops if fish count exceeds this. +#define AQUARIUM_MAX_BREEDING_POPULATION 20 + +// Configuration objects defining prop/fish behaviour in the aquarium +// These are used as a base for autogenerating the actual instances +/datum/aquarium_behaviour + var/name = "base aquarium element" + var/desc = ""
+
+ var/unique = FALSE
+
+ var/icon = 'icons/obj/aquarium.dmi'
+ /// Icon state used for catalog/autogenerated fish item. Also used as basis for in aquarium visual if dedicated_in_aquarium_icon_state is not set.
+ var/icon_state
+ /// Applied and item/catalog for use with greyscaled icons.
+ var/color
+
+ /// How the thing will be layered
+ var/layer_mode = AQUARIUM_LAYER_MODE_AUTO
+ /// If the starting position is randomised within bounds.
+ var/randomize_position = FALSE
+
+ /**
+ * Fish sprite how to:
+ * Need to be centered on 16,16 in the dmi and facing left by default.
+ * sprite_height/sprite_width is the size it will have in aquarium and used to control animation boundaries.
+ * source_height/source_width is the size of the original icon (ideally only the non-empty parts)
+ */
+
+ /// If this is set this icon state will be used for the holder while icon_state will only be used for item/catalog. Transformation from source_width/height WON'T be applied.
+ var/dedicated_in_aquarium_icon_state
+ /// Applied to vc object only for use with greyscaled icons.
+ var/aquarium_vc_color
+
+ //Target sprite size for path/position calculations.
+ var/sprite_height = 3
+ var/sprite_width = 3
+ //This is the size of the source sprite. This will be used to calculate scale down factor.
+ var/source_width = 32
+ var/source_height = 32
+
+ /// Current animation
+ var/current_animation
+
+ /// Does this behviour need additional processing in aquarium, will be added to SSobj processing on insertion
+ var/processing = FALSE
+
+ /// Our holder component
+ var/datum/component/aquarium_content/parent
+
+/// Applies icon,color and base scaling to our visual holder
+/datum/aquarium_behaviour/proc/apply_appearance(obj/effect/holder)
+ holder.icon = icon
+ if(dedicated_in_aquarium_icon_state)
+ holder.icon_state = dedicated_in_aquarium_icon_state
+ else
+ holder.icon_state = icon_state
+ holder.transform = base_transform()
+ if(aquarium_vc_color)
+ holder.color = aquarium_vc_color
+
+// Generates scaling matrix for our visual
+/datum/aquarium_behaviour/proc/base_transform()
+ var/matrix/matrix = matrix()
+ if(!dedicated_in_aquarium_icon_state)
+ var/x_scale = sprite_width / source_width
+ var/y_scale = sprite_height / source_height
+ matrix.Scale(x_scale, y_scale)
+ return matrix
+
+/// Called when fed.
+/datum/aquarium_behaviour/proc/on_feeding(datum/reagents/feed_reagents)
+ return
+
+/// Called when aquarium fluid changes.
+/datum/aquarium_behaviour/proc/on_fluid_changed()
+ return
+
+/// Called to update current animation based on state
+/datum/aquarium_behaviour/proc/update_animation()
+ return
+
+/// Called when inserted into new aquarium
+/datum/aquarium_behaviour/proc/on_inserted()
+ if(processing)
+ START_PROCESSING(SSobj, src)
+
+/// Called just before the object gets removed from the aquarium
+/datum/aquarium_behaviour/proc/before_removal()
+ return
+
+/datum/aquarium_behaviour/Destroy(force, ...)
+ STOP_PROCESSING(SSobj, src)
+ parent = null
+ return ..()
+
+/datum/aquarium_behaviour/prop
+ name = "aquarium prop"
+ unique = TRUE
+ layer_mode = AQUARIUM_LAYER_MODE_BOTTOM
+
+ // Prop sprites do not need any scaling they go 1:1
+ sprite_width = 32
+ sprite_height = 32
+ source_width = 32
+ source_height = 32
+
+/datum/aquarium_behaviour/prop/rocks
+ name = "rocks"
+ icon_state = "rocks"
+
+/datum/aquarium_behaviour/prop/seaweed_top
+ name = "dense seaweeds"
+ icon_state = "seaweeds_front"
+ layer_mode = AQUARIUM_LAYER_MODE_TOP
+
+/datum/aquarium_behaviour/prop/seaweed
+ name = "seaweeds"
+ icon_state = "seaweeds_back"
+ layer_mode = AQUARIUM_LAYER_MODE_BOTTOM
+
+/datum/aquarium_behaviour/prop/rockfloor
+ name = "rock floor"
+ icon_state = "rockfloor"
+ layer_mode = AQUARIUM_LAYER_MODE_BOTTOM
+
+/datum/aquarium_behaviour/prop/treasure
+ name = "tiny treasure chest"
+ icon_state = "treasure"
+ layer_mode = AQUARIUM_LAYER_MODE_BOTTOM
+
+/datum/aquarium_behaviour/fish
+ name = "generic fish"
+ icon_state = "fish_greyscale"
+ randomize_position = TRUE //We have random starting point of our swim path
+
+ current_animation = AQUARIUM_ANIMATION_FISH_SWIM
+ processing = TRUE
+
+ // Default size of the "greyscale_fish" icon_state
+ sprite_height = 3
+ sprite_width = 3
+
+ /// Required fluid type for this fish to live.
+ var/required_fluid_type = AQUARIUM_FLUID_FRESHWATER
+
+ /// Required minimum temperature for the fish to live.
+ var/required_temperature_min = MIN_AQUARIUM_TEMP
+ /// Maximum possible temperature for the fish to live.
+ var/required_temperature_max = MAX_AQUARIUM_TEMP
+
+ /// What type of reagent this fish needs to be fed.
+ var/food = /datum/reagent/consumable/nutriment
+ /// How often the fish needs to be fed
+ var/feeding_frequency = 5 MINUTES
+ /// Time of last feedeing
+ var/last_feeding
+
+ /// Fish status
+ var/status = FISH_ALIVE
+
+ /// Current fish health. Dies at 0.
+ var/health = 100
+
+ /// Should this fish type show in fish catalog
+ var/show_in_catalog = TRUE
+ /// Should this fish spawn in random fish cases
+ var/availible_in_random_cases = TRUE
+ /// How rare this fish is in the random cases
+ var/random_case_rarity = FISH_RARITY_BASIC
+
+ /// Fish autogenerated from this behaviour will be processable into this
+ var/fillet_type = /obj/item/reagent_containers/food/snacks/carpmeat/icantbeliveitsnotcarp
+
+ /// Won't breed more than this amount in single aquarium.
+ var/stable_population = 1
+ /// Last time new fish was created
+ var/last_breeding
+ /// How long it takes to produce new fish
+ var/breeding_timeout = 2 MINUTES
+
+/datum/aquarium_behaviour/fish/on_inserted()
+ . = ..()
+ if(isnull(last_feeding)) //Fish start fed.
+ last_feeding = world.time
+ if(status == FISH_DEAD)
+ parent.current_aquarium.dead_fish += 1
+ else
+ parent.current_aquarium.alive_fish += 1
+ parent.stop_flopping()
+
+/datum/aquarium_behaviour/fish/before_removal()
+ . = ..()
+ if(status == FISH_DEAD)
+ parent.current_aquarium.dead_fish -= 1
+ else
+ parent.current_aquarium.alive_fish -= 1
+ //We do not stop processing properties here. We want fish to die outside of aquariums after first insert. We only stop processing in properties.death or destroy
+ if(!QDELETED(parent) && status != FISH_DEAD)
+ parent.start_flopping()
+
+/datum/aquarium_behaviour/fish/on_fluid_changed()
+ //In case we'll flop to bottom from this or go back to swimming.
+ update_animation()
+
+/// Updates our animation variable based on state and prompts component to animate it.
+/datum/aquarium_behaviour/fish/update_animation()
+ var/obj/structure/aquarium/aquarium = parent.current_aquarium
+ var/old_animation = current_animation
+ if(!aquarium || aquarium.fluid_type == AQUARIUM_FLUID_AIR || status == FISH_DEAD)
+ current_animation = AQUARIUM_ANIMATION_FISH_DEAD
+ else
+ current_animation = AQUARIUM_ANIMATION_FISH_SWIM
+ if(aquarium && old_animation != current_animation)
+ parent.generate_animation()
+
+/datum/aquarium_behaviour/fish/on_feeding(datum/reagents/feed_reagents)
+ if(feed_reagents.has_reagent(food))
+ last_feeding = world.time
+
+/// Checks if our current environment lets us live.
+/datum/aquarium_behaviour/fish/proc/proper_environment()
+ var/obj/structure/aquarium/aquarium = parent.current_aquarium
+ if(!aquarium)
+ return FALSE
+ if(aquarium.fluid_type != required_fluid_type)
+ return FALSE
+ if(aquarium.fluid_temp < required_temperature_min || aquarium.fluid_temp > required_temperature_max)
+ return FALSE
+ return TRUE
+
+/datum/aquarium_behaviour/fish/process(delta_time)
+ set waitfor = FALSE
+
+ var/health_change_per_second = 0
+ if(!proper_environment())
+ health_change_per_second -= 3 //Dying here
+ if(world.time - last_feeding >= feeding_frequency)
+ health_change_per_second -= 0.5 //Starving
+ else
+ health_change_per_second += 0.5 //Slowly healing
+ health = clamp(health + health_change_per_second * delta_time, 0, initial(health))
+ if(health <= 0)
+ death()
+ else if(ready_to_reproduce())
+ try_to_reproduce()
+
+/datum/aquarium_behaviour/fish/proc/death()
+ STOP_PROCESSING(SSobj, src)
+ status = FISH_DEAD
+ var/message = "\The [name] dies."
+ if(parent.current_aquarium)
+ parent.current_aquarium.visible_message(message)
+ parent.current_aquarium.alive_fish -= 1
+ parent.current_aquarium.dead_fish += 1
+ else
+ var/atom/movable/AM = parent.parent
+ AM.visible_message(message)
+ parent.stop_flopping()
+ update_animation()
+
+/datum/aquarium_behaviour/fish/proc/ready_to_reproduce()
+ return parent.current_aquarium && parent.current_aquarium.allow_breeding && health == initial(health) && stable_population > 1 && world.time - last_breeding >= breeding_timeout
+
+/datum/aquarium_behaviour/fish/proc/try_to_reproduce()
+ if(!parent.current_aquarium)
+ return
+ if(parent.current_aquarium.alive_fish + parent.current_aquarium.dead_fish >= AQUARIUM_MAX_BREEDING_POPULATION) //so aquariums full of fish don't need to do these expensive checks
+ return
+ var/list/other_fish_of_same_type = list()
+ for(var/atom/movable/fish_or_prop in parent.current_aquarium)
+ if(fish_or_prop == parent.parent)
+ continue
+ var/datum/component/aquarium_content/other_content = fish_or_prop.GetComponent(/datum/component/aquarium_content)
+ if(other_content && other_content.properties.type == type)
+ other_fish_of_same_type += other_content.properties
+ if(length(other_fish_of_same_type) >= stable_population)
+ return
+ var/datum/aquarium_behaviour/fish/second_fish
+ for(var/datum/aquarium_behaviour/fish/other_fish in other_fish_of_same_type)
+ if(other_fish.ready_to_reproduce())
+ second_fish = other_fish
+ break
+ if(second_fish)
+ generate_fish(parent.current_aquarium,type)
+ last_breeding = world.time
+ second_fish.last_breeding = world.time
+
+/// This path exists mostly for admin abuse.
+/datum/aquarium_behaviour/fish/auto
+ name = "automatic fish"
+ desc = "generates fish appearance automatically from component parent appearance"
+ availible_in_random_cases = FALSE
+ sprite_width = 8
+ sprite_height = 8
+ show_in_catalog = FALSE
+
+/datum/aquarium_behaviour/fish/auto/apply_appearance(obj/effect/holder)
+ holder.appearance = parent.parent
+ holder.transform = base_transform()
+ holder.dir = WEST
diff --git a/code/modules/aquarium/fish.dm b/code/modules/aquarium/fish.dm
new file mode 100644
index 0000000000000..fd75157762bf7
--- /dev/null
+++ b/code/modules/aquarium/fish.dm
@@ -0,0 +1,177 @@
+// Fish path used for autogenerated fish
+/obj/item/fish
+ name = "generic looking aquarium fish"
+ desc = "very bland"
+ w_class = WEIGHT_CLASS_TINY
+
+/// Automatically generates object of given base path from the behaviour type in loc
+/proc/generate_fish(loc,behaviour_type,base_path=/obj/item/fish)
+ var/datum/aquarium_behaviour/behaviour = behaviour_type
+ var/obj/item/fish = new base_path(loc)
+ fish.name = initial(behaviour.name)
+ fish.icon = initial(behaviour.icon)
+ fish.icon_state = initial(behaviour.icon_state)
+ fish.desc = initial(behaviour.desc)
+ if(initial(behaviour.color))
+ fish.add_atom_colour(initial(behaviour.color), FIXED_COLOUR_PRIORITY)
+ fish.AddElement(/datum/element/deferred_aquarium_content, behaviour_type)
+ return fish
+
+/// Returns random fish, using random_case_rarity probabilities.
+/proc/random_fish_type(case_fish_only=TRUE, required_fluid)
+ var/static/probability_table
+ var/argkey = "fish_[required_fluid]_[case_fish_only]" //If this expands more extract bespoke element arg generation to some common helper.
+ if(!probability_table || !probability_table[argkey])
+ if(!probability_table)
+ probability_table = list()
+ var/chance_table = list()
+ for(var/_fish_behavior in subtypesof(/datum/aquarium_behaviour/fish))
+ var/datum/aquarium_behaviour/fish/fish_behavior = _fish_behavior
+ if(required_fluid && initial(fish_behavior.required_fluid_type) != required_fluid)
+ continue
+ if(initial(fish_behavior.availible_in_random_cases) || !case_fish_only)
+ chance_table[fish_behavior] = initial(fish_behavior.random_case_rarity)
+ probability_table[argkey] = chance_table
+ return pickweight(probability_table[argkey])
+
+// Actual fish definitions below - there's no specific paths, they are autogenerated from behaviours
+
+// Freshwater fish
+
+/datum/aquarium_behaviour/fish/goldfish
+ name = "goldfish"
+ desc = "Despite common belief, goldfish do not have three-second memories. They can actually remember things that happened up to three months ago."
+ icon_state = "goldfish"
+ sprite_width = 8
+ sprite_height = 8
+ stable_population = 3
+
+/datum/aquarium_behaviour/fish/angelfish
+ name = "angelfish"
+ desc = "Young Angelfish often live in groups, while adults prefer solitary life. They become territorial and aggressive toward other fish when they reach adulthood."
+ icon_state = "angelfish"
+ dedicated_in_aquarium_icon_state = "bigfish"
+ sprite_height = 7
+ source_height = 7
+ stable_population = 3
+
+/datum/aquarium_behaviour/fish/guppy
+ name = "guppy"
+ desc = "Guppy is also known as rainbow fish because of the brightly colored body and fins."
+ icon_state = "guppy"
+ dedicated_in_aquarium_icon_state = "fish_greyscale"
+ aquarium_vc_color = "#91AE64"
+ sprite_width = 8
+ sprite_height = 5
+ stable_population = 6
+
+/datum/aquarium_behaviour/fish/plasmatetra
+ name = "plasma tetra"
+ desc = "Due to their small size, tetras are prey to many predators in their watery world, including eels, crustaceans, and invertebrates."
+ icon_state = "plastetra"
+ dedicated_in_aquarium_icon_state = "fish_greyscale"
+ aquarium_vc_color = "#D30EB0"
+ stable_population = 3
+
+/datum/aquarium_behaviour/fish/catfish
+ name = "cory catfish"
+ desc = "A catfish has about 100,000 taste buds, and their bodies are covered with them to help detect chemicals present in the water and also to respond to touch."
+ icon_state = "catfish"
+ dedicated_in_aquarium_icon_state = "fish_greyscale"
+ aquarium_vc_color = "#907420"
+ stable_population = 3
+
+/datum/aquarium_behaviour/fish/spacecarp
+ name = "space carp"
+ desc = "This space predator fish is known to cause yearly damage to space stations during their migrations."
+ icon_state = "carp"
+ sprite_width = 8
+ sprite_height = 8
+ availible_in_random_cases = FALSE
+
+// Saltwater fish below
+
+/datum/aquarium_behaviour/fish/clownfish
+ name = "clownfish"
+ desc = "Clownfish catch prey by swimming onto the reef, attracting larger fish, and luring them back to the anemone. The anemone will sting and eat the larger fish, leaving the remains for the clownfish."
+ icon_state = "clownfish"
+ dedicated_in_aquarium_icon_state = "clownfish_small"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ sprite_width = 8
+ sprite_height = 5
+ stable_population = 4
+
+/datum/aquarium_behaviour/fish/cardinal
+ name = "cardinalfish"
+ desc = "Cardinalfish are often found near sea urchins, where the fish hide when threatened."
+ icon_state = "cardinalfish"
+ dedicated_in_aquarium_icon_state = "fish_greyscale"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 4
+
+/datum/aquarium_behaviour/fish/greenchromis
+ name = "green chromis"
+ desc = "The Chromis can vary in color from blue to green depending on the lighting and distance from the lights."
+ icon_state = "greenchromis"
+ dedicated_in_aquarium_icon_state = "fish_greyscale"
+ aquarium_vc_color = "#00ff00"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 5
+
+/datum/aquarium_behaviour/fish/firefish
+ name = "firefish goby"
+ desc = "To communicate in the wild, the firefish uses its dorsal fin to alert others of potential danger."
+ icon_state = "firefish"
+ sprite_width = 6
+ sprite_height = 5
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 3
+
+/datum/aquarium_behaviour/fish/pufferfish
+ name = "pufferfish"
+ desc = "One Pufferfish contains enough toxins in its liver to kill 30 people."
+ icon_state = "pufferfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ sprite_width = 8
+ sprite_height = 8
+ stable_population = 3
+
+/datum/aquarium_behaviour/fish/lanternfish
+ name = "lanternfish"
+ desc = "Typically found in areas below 6600 feet below the surface of the ocean, they live in complete darkness."
+ icon_state = "lanternfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ random_case_rarity = FISH_RARITY_VERY_RARE
+ source_width = 28
+ source_height = 21
+ sprite_width = 8
+ sprite_height = 8
+ stable_population = 3
+
+/datum/aquarium_behaviour/fish/dwarf_moonfish
+ name = "dwarf moonfish"
+ desc = "Ordinarily in the wild, the Zagoskian moonfish is around the size of a tuna, however through selective breeding a smaller breed suitable for being kept as an aquarium pet has been created."
+ icon_state = "dwarf_moonfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 2
+
+/datum/aquarium_behaviour/fish/gunner_jellyfish
+ name = "gunner jellyfish"
+ desc = "So called due to their resemblance to an artillery shell, the gunner jellyfish is native to Tizira, where it is enjoyed as a delicacy. Produces a mild hallucinogen that is destroyed by cooking."
+ icon_state = "gunner_jellyfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 4
+
+/datum/aquarium_behaviour/fish/needlefish
+ name = "needlefish"
+ desc = "A tiny, transparent fish which resides in large schools in the oceans of Tizira. A common food for other, larger fish."
+ icon_state = "needlefish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 12
+
+/datum/aquarium_behaviour/fish/armorfish
+ name = "armorfish"
+ desc = "A small shellfish native to Tizira's oceans, known for its exceptionally hard shell. Consumed similarly to prawns."
+ icon_state = "armorfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 10
diff --git a/code/modules/aquarium/misc.dm b/code/modules/aquarium/misc.dm
new file mode 100644
index 0000000000000..23cd565d4dca3
--- /dev/null
+++ b/code/modules/aquarium/misc.dm
@@ -0,0 +1,124 @@
+#define AQUARIUM_COMPANY "Aquatech Ltd."
+
+// Fish feed can
+/obj/item/fish_feed
+ name = "fish feed can"
+ desc = "Autogenerates nutritious fish feed based on sample inside."
+ icon = 'icons/obj/aquarium.dmi'
+ icon_state = "fish_feed"
+ w_class = WEIGHT_CLASS_TINY
+
+/obj/item/fish_feed/Initialize()
+ . = ..()
+ create_reagents(5, OPENCONTAINER)
+ reagents.add_reagent(/datum/reagent/consumable/nutriment, 1) //Default fish diet
+
+// Stasis fish case container for moving fish between aquariums safely.
+/obj/item/storage/fish_case
+ name = "stasis fish case"
+ desc = "A small case keeping the fish inside in stasis."
+ icon_state = "fishbox"
+
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+
+ component_type = /datum/component/storage/concrete/fish_case
+
+/obj/item/storage/fish_case/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_FISH_SAFE_STORAGE, TRAIT_GENERIC)
+
+/// Fish case with single random fish inside.
+/obj/item/storage/fish_case/random/PopulateContents()
+ . = ..()
+ generate_fish(src, select_fish_type())
+
+/obj/item/storage/fish_case/random/proc/select_fish_type()
+ return random_fish_type()
+
+/obj/item/storage/fish_case/random/freshwater/select_fish_type()
+ return random_fish_type(required_fluid=AQUARIUM_FLUID_FRESHWATER)
+
+/// Book detailing where to get the fish and their properties.
+/obj/item/book/fish_catalog
+ name = "Fish Encyclopedia"
+ desc = "Indexes all fish known to mankind (and related species)"
+ icon_state = "fishbook"
+ dat = "Lot of fish stuff" //book wrappers could use cleaning so this is not necessary
+
+/obj/item/book/fish_catalog/on_read(mob/user)
+ ui_interact(user)
+
+/obj/item/book/fish_catalog/ui_interact(mob/user, datum/tgui/ui)
+ . = ..()
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "FishCatalog", name)
+ ui.open()
+
+/obj/item/book/fish_catalog/ui_static_data(mob/user)
+ . = ..()
+ var/static/fish_info
+ if(!fish_info)
+ fish_info = list()
+ for(var/_fish_behaviour in subtypesof(/datum/aquarium_behaviour/fish))
+ var/datum/aquarium_behaviour/fish/fish_behaviour = _fish_behaviour
+ var/list/fish_data = list()
+ if(!initial(fish_behaviour.show_in_catalog))
+ continue
+ fish_data["name"] = initial(fish_behaviour.name)
+ fish_data["desc"] = initial(fish_behaviour.desc)
+ fish_data["fluid"] = initial(fish_behaviour.required_fluid_type)
+ fish_data["temp_min"] = initial(fish_behaviour.required_temperature_min)
+ fish_data["temp_max"] = initial(fish_behaviour.required_temperature_max)
+ fish_data["icon"] = sanitize_css_class_name("[initial(fish_behaviour.icon)][initial(fish_behaviour.icon_state)]")
+ fish_data["color"] = initial(fish_behaviour.color)
+ fish_data["source"] = initial(fish_behaviour.availible_in_random_cases) ? "[AQUARIUM_COMPANY] Fish Packs" : "Unknown"
+ var/datum/reagent/food_type = initial(fish_behaviour.food)
+ if(food_type != /datum/reagent/consumable/nutriment)
+ fish_data["feed"] = initial(food_type.name)
+ else
+ fish_data["feed"] = "[AQUARIUM_COMPANY] Fish Feed"
+ fish_info += list(fish_data)
+
+ .["fish_info"] = fish_info
+ .["sponsored_by"] = AQUARIUM_COMPANY
+
+/obj/item/book/fish_catalog/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/spritesheet/fish)
+ )
+
+/obj/item/aquarium_kit
+ name = "DIY Aquarium Construction Kit"
+ desc = "Everything you need to build your own aquarium.(Raw materials sold separately)"
+ icon = 'icons/obj/aquarium.dmi'
+ icon_state = "construction_kit"
+ w_class = WEIGHT_CLASS_TINY
+
+/obj/item/aquarium_kit/attack_self(mob/user)
+ . = ..()
+ to_chat(user,"There's instruction and tools necessary to build aquarium inside. All you need is to start crafting.")
+
+
+/obj/item/aquarium_prop
+ name = "generic aquarium prop"
+ desc = "very boring"
+ w_class = WEIGHT_CLASS_TINY
+
+/obj/item/storage/box/aquarium_props
+ name = "aquarium props box"
+ desc = "All you need to make your aquarium look good"
+
+/obj/item/storage/box/aquarium_props/PopulateContents()
+ for(var/prop_type in subtypesof(/datum/aquarium_behaviour/prop))
+ generate_fish(src, prop_type, /obj/item/aquarium_prop)
+
+/obj/item/storage/box/fish_debug
+ name = "box full of fish"
+
+/obj/item/storage/box/fish_debug/PopulateContents()
+ for(var/fish_type in subtypesof(/datum/aquarium_behaviour/fish))
+ generate_fish(src,fish_type)
+
+#undef AQUARIUM_COMPANY
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 567fc6d014994..a6ad3c3f10bd3 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -29,6 +29,10 @@
var/next_activate = 0 //When we're next allowed to activate - for spam control
var/activate_delay = 30
+/obj/item/assembly/Destroy()
+ holder = null
+ return ..()
+
/obj/item/assembly/get_part_rating()
return 1
@@ -125,3 +129,8 @@
/obj/item/assembly/interact(mob/user)
return ui_interact(user)
+
+/obj/item/assembly/ui_status(mob/user)
+ . = ..()
+ if(src.can_interact(user) || holder?.can_interact(user))
+ return UI_INTERACTIVE
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 1b5e957603d19..04cb3c8785eec 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -138,7 +138,7 @@
return
/obj/item/tank/proc/ignite() //This happens when a bomb is told to explode
- var/fuel_moles = air_contents.get_moles(/datum/gas/plasma) + air_contents.get_moles(/datum/gas/oxygen)/6
+ var/fuel_moles = air_contents.get_moles(GAS_PLASMA) + air_contents.get_moles(GAS_O2)/6
var/datum/gas_mixture/bomb_mixture = air_contents.copy()
var/strength = 1
@@ -190,11 +190,10 @@
ground_zero.air_update_turf()
/obj/item/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out.
- var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
var/turf/T = get_turf(src)
if(!T)
return
- T.assume_air(removed)
+ T.assume_air(air_contents)
air_update_turf()
/obj/item/onetankbomb/return_analyzable_air()
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 01fc70ebe099a..8edc3a9556412 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -14,7 +14,7 @@
flags_1 = CONDUCT_1
throw_speed = 3
throw_range = 7
- var/charges_left = 15
+ var/charges_left = 10
/obj/item/flashbulb/update_icon()
if(charges_left <= 0)
@@ -42,13 +42,36 @@
name = "weakened flashbulb"
charges_left = 4
-/obj/item/flashbulb/strong
+/obj/item/flashbulb/recharging
+ charges_left = 3
+ var/max_charges = 3
+ var/charge_time = 10 SECONDS
+ var/recharging = FALSE
+
+/obj/item/flashbulb/recharging/proc/recharge()
+ recharging = FALSE
+ if(charges_left >= max_charges)
+ return
+ charges_left ++
+ icon_state = "flashbulb"
+ if(charges_left < max_charges)
+ addtimer(CALLBACK(src, .proc/recharge), charge_time, TIMER_UNIQUE)
+ recharging = TRUE
+
+/obj/item/flashbulb/recharging/use_flashbulb()
+ . = ..()
+ if(!recharging)
+ addtimer(CALLBACK(src, .proc/recharge), charge_time, TIMER_UNIQUE)
+ recharging = TRUE
+
+/obj/item/flashbulb/recharging/revolution
name = "modified flashbulb"
- charges_left = 120
+ charges_left = 10
+ max_charges = 10
+ charge_time = 15 SECONDS
-/obj/item/flashbulb/cyborg
+/obj/item/flashbulb/recharging/cyborg
name = "cyborg flashbulb"
- charges_left = INFINITY
/obj/item/assembly/flash
name = "flash"
@@ -73,7 +96,7 @@
bulb = /obj/item/flashbulb/weak
/obj/item/assembly/flash/handheld/strong
- bulb = /obj/item/flashbulb/strong
+ bulb = /obj/item/flashbulb/recharging/revolution
/obj/item/assembly/flash/Initialize()
. = ..()
@@ -147,6 +170,9 @@
if(!bulb)
to_chat(user, "There is no bulb in \the [src].")
return FALSE
+ if(flags_1 & NODECONSTRUCT_1)
+ to_chat(user, "You cannot remove the bulb from \the [src].")
+ return FALSE
bulb.forceMove(drop_location())
user.put_in_hands(bulb)
bulb.update_icon()
@@ -184,6 +210,10 @@
return FALSE
if(FLASH_USE_BURNOUT)
burn_out()
+ if(is_head_revolutionary(user) && !burnt_out)
+ //Flash will drain to a minimum of 1 charge when used by a head rev.
+ if(bulb.charges_left < rand(2, initial(bulb.charges_left) - 1))
+ bulb.charges_left ++
last_trigger = world.time
playsound(src, 'sound/weapons/flash.ogg', 100, TRUE)
flash_lighting_fx(FLASH_LIGHT_RANGE, light_power, light_color)
@@ -232,9 +262,7 @@
log_combat(user, R, "flashed", src)
update_icon(1)
R.Paralyze(70)
- var/diff = 5 * CONFUSION_STACK_MAX_MULTIPLIER - M.confused
- R.confused += min(5, diff)
- R.flash_act(affect_silicon = 1, type = /obj/screen/fullscreen/flash/static)
+ R.flash_act(affect_silicon = 1, type = /atom/movable/screen/fullscreen/flash/static)
user.visible_message("[user] overloads [R]'s sensors with the flash!", "You overload [R]'s sensors with the flash!")
return TRUE
@@ -278,7 +306,7 @@
/obj/item/assembly/flash/cyborg
- bulb = /obj/item/flashbulb/cyborg
+ bulb = /obj/item/flashbulb/recharging/cyborg
/obj/item/assembly/flash/cyborg/attack(mob/living/M, mob/user)
..()
@@ -311,19 +339,22 @@
desc = "A high-powered photon projector implant normally used for lighting purposes, but also doubles as a flashbulb weapon. Self-repair protocols fix the flashbulb if it ever burns out."
var/flashcd = 20
var/overheat = 0
- var/obj/item/organ/cyberimp/arm/flash/I = null
+ //Wearef to our arm
+ var/datum/weakref/arm
/obj/item/assembly/flash/armimplant/burn_out()
- if(I?.owner)
- to_chat(I.owner, "Your photon projector implant overheats and deactivates!")
- I.Retract()
+ var/obj/item/organ/cyberimp/arm/flash/real_arm = arm.resolve()
+ if(real_arm?.owner)
+ to_chat(real_arm.owner, "Your photon projector implant overheats and deactivates!")
+ real_arm.Retract()
overheat = TRUE
addtimer(CALLBACK(src, .proc/cooldown), flashcd * 2)
/obj/item/assembly/flash/armimplant/try_use_flash(mob/user = null)
if(overheat)
- if(I?.owner)
- to_chat(I.owner, "Your photon projector is running too hot to be used again so quickly!")
+ var/obj/item/organ/cyberimp/arm/flash/real_arm = arm.resolve()
+ if(real_arm?.owner)
+ to_chat(real_arm.owner, "Your photon projector is running too hot to be used again so quickly!")
return FALSE
overheat = TRUE
addtimer(CALLBACK(src, .proc/cooldown), flashcd)
@@ -343,7 +374,7 @@
flashing_overlay = "flash-hypno"
light_color = LIGHT_COLOR_PINK
cooldown = 20
- bulb = /obj/item/flashbulb/cyborg //Flashbulb with infinite charges
+ bulb = /obj/item/flashbulb/recharging/revolution
/obj/item/assembly/flash/hypnotic/burn_out()
return
@@ -362,20 +393,19 @@
to_chat(M, "[src] emits a soothing light...")
if(targeted)
if(M.flash_act(1, 1))
- var/hypnosis = FALSE
- if(M.hypnosis_vulnerable())
- hypnosis = TRUE
if(user)
user.visible_message("[user] blinds [M] with the flash!", "You hypno-flash [M]!")
- if(!hypnosis)
+ if(M.hypnosis_vulnerable())
+ M.apply_status_effect(/datum/status_effect/trance, 200, TRUE)
+ else
to_chat(M, "The light makes you feel oddly relaxed...")
M.confused += min(M.confused + 10, 20)
M.dizziness += min(M.dizziness + 10, 20)
M.drowsyness += min(M.drowsyness + 10, 20)
M.apply_status_effect(STATUS_EFFECT_PACIFY, 100)
- else
- M.apply_status_effect(/datum/status_effect/trance, 200, TRUE)
+
+
else if(user)
user.visible_message("[user] fails to blind [M] with the flash!", "You fail to hypno-flash [M]!")
diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm
index 4a7190bdad850..7d8ef4e068be5 100644
--- a/code/modules/assembly/health.dm
+++ b/code/modules/assembly/health.dm
@@ -5,13 +5,14 @@
materials = list(/datum/material/iron=800, /datum/material/glass=200)
attachable = TRUE
- var/scanning = TRUE
+ var/scanning = FALSE
var/health_scan
var/alarm_health = HEALTH_THRESHOLD_CRIT
/obj/item/assembly/health/examine(mob/user)
. = ..()
- . += "Use a multitool to swap between \"detect death\" mode and \"detect critical state\" mode."
+ . += "Use it in hand to turn it off/on and Alt-click to swap between \"detect death\" mode and \"detect critical state\" mode."
+ . += "[src.scanning ? "The sensor is on and you can see [health_scan] displayed on the screen" : "The sensor is off"]."
/obj/item/assembly/health/activate()
if(!..())
@@ -29,14 +30,13 @@
update_icon()
return secured
-/obj/item/assembly/health/multitool_act(mob/living/user, obj/item/I)
+/obj/item/assembly/health/AltClick(mob/living/user)
if(alarm_health == HEALTH_THRESHOLD_CRIT)
alarm_health = HEALTH_THRESHOLD_DEAD
to_chat(user, "You toggle [src] to \"detect death\" mode.")
else
alarm_health = HEALTH_THRESHOLD_CRIT
to_chat(user, "You toggle [src] to \"detect critical state\" mode.")
- return TRUE
/obj/item/assembly/health/process()
if(!scanning || !secured)
@@ -69,36 +69,7 @@
STOP_PROCESSING(SSobj, src)
return
-/obj/item/assembly/health/ui_interact(mob/user as mob)//TODO: Change this to the wires thingy
+/obj/item/assembly/health/attack_self(mob/user)
. = ..()
- if(!secured)
- user.show_message("The [name] is unsecured!")
- return FALSE
- var/dat = "Health Sensor"
- dat += "
[scanning?"On":"Off"]" - if(scanning && health_scan) - dat += "
Health: [health_scan]" - user << browse(dat, "window=hscan") - onclose(user, "hscan") - -/obj/item/assembly/health/Topic(href, href_list) - ..() - if(!ismob(usr)) - return - - var/mob/user = usr - - if(!user.canUseTopic(src, BE_CLOSE)) - usr << browse(null, "window=hscan") - onclose(usr, "hscan") - return - - if(href_list["scanning"]) - toggle_scan() - - if(href_list["close"]) - usr << browse(null, "window=hscan") - return - - attack_self(user) - return + to_chat(user, "You toggle [src] [src.scanning ? "off" : "on"].") + toggle_scan() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index f439775877c69..868eb305d176a 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -16,9 +16,8 @@ /obj/item/assembly_holder/ComponentInitialize() . = ..() - AddComponent( - /datum/component/simple_rotation, - ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS) + var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS + AddComponent(/datum/component/simple_rotation, rotation_flags) /obj/item/assembly_holder/IsAssemblyHolder() return TRUE diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index b5e4f52eb3773..c8e70fbf8fa3d 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -22,7 +22,7 @@ /obj/item/assembly/infra/ComponentInitialize() . = ..() var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS - AddComponent(/datum/component/simple_rotation, rotation_flags, null, null, CALLBACK(src,.proc/after_rotation)) + AddComponent(/datum/component/simple_rotation, rotation_flags, after_rotation=CALLBACK(src,.proc/after_rotation)) /obj/item/assembly/infra/proc/after_rotation() refreshBeam() @@ -134,7 +134,7 @@ . = ..() setDir(t) -/obj/item/assembly/infra/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE) +/obj/item/assembly/infra/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE) . = ..() olddir = dir @@ -152,10 +152,7 @@ return FALSE pulse(FALSE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) next_activate = world.time + 30 /obj/item/assembly/infra/proc/switchListener(turf/newloc) @@ -167,6 +164,8 @@ listeningTo = newloc /obj/item/assembly/infra/proc/check_exit(datum/source, atom/movable/offender) + SIGNAL_HANDLER + if(QDELETED(src)) return if(offender == src || istype(offender,/obj/effect/beam/i_beam)) @@ -175,7 +174,7 @@ var/obj/item/I = offender if (I.item_flags & ABSTRACT) return - return refreshBeam() + INVOKE_ASYNC(src, .proc/refreshBeam) /obj/item/assembly/infra/setDir() . = ..() @@ -214,8 +213,9 @@ visible = !visible . = TRUE - update_icon() - refreshBeam() + if(.) + update_icon() + refreshBeam() /***************************IBeam*********************************/ diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index f526d203e3e48..bc00b18d4b209 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -8,7 +8,7 @@ var/scanning = FALSE var/timing = FALSE - var/time = 10 + var/time = 20 var/sensitivity = 1 var/hearing_range = 3 @@ -66,20 +66,18 @@ return FALSE pulse(FALSE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) next_activate = world.time + 30 return TRUE -/obj/item/assembly/prox_sensor/process() +/obj/item/assembly/prox_sensor/process(delta_time) if(!timing) return - time-- + time -= delta_time if(time <= 0) timing = FALSE toggle_scan(TRUE) + ui_update() time = initial(time) /obj/item/assembly/prox_sensor/proc/toggle_scan(scan) @@ -108,12 +106,17 @@ holder.update_icon() return + +/obj/item/assembly/prox_sensor/ui_requires_update(mob/user, datum/tgui/ui) + . = ..() + if(timing) + . = TRUE // Autoupdate while counting down + /obj/item/assembly/prox_sensor/ui_status(mob/user) if(is_secured(user)) return ..() return UI_CLOSE - /obj/item/assembly/prox_sensor/ui_state(mob/user) return GLOB.hands_state diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 2456dcc939b85..5830df340a444 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -109,7 +109,8 @@ code = initial(code) . = TRUE - update_icon() + if(.) + update_icon() /obj/item/assembly/signaler/attackby(obj/item/W, mob/user, params) if(issignaler(W)) @@ -118,6 +119,7 @@ code = signaler2.code set_frequency(signaler2.frequency) to_chat(user, "You transfer the frequency and code of \the [signaler2.name] to \the [name]") + ui_update() ..() /obj/item/assembly/signaler/proc/signal() @@ -145,10 +147,7 @@ return pulse(TRUE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) return TRUE /obj/item/assembly/signaler/proc/set_frequency(new_frequency) diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 0dc8876b9426c..c817d0e29bba9 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -7,15 +7,15 @@ var/timing = FALSE - var/time = 5 - var/saved_time = 5 + var/time = 10 + var/saved_time = 10 var/loop = FALSE var/hearing_range = 3 /obj/item/assembly/timer/suicide_act(mob/living/user) user.visible_message("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!") activate()//doesnt rely on timer_end to prevent weird metas where one person can control the timer and therefore someone's life. (maybe that should be how it works...) - addtimer(CALLBACK(src, .proc/manual_suicide, user), time*10)//kill yourself once the time runs out + addtimer(CALLBACK(src, .proc/manual_suicide, user), time SECONDS)//kill yourself once the time runs out return MANUAL_SUICIDE /obj/item/assembly/timer/proc/manual_suicide(mob/living/user) @@ -57,18 +57,16 @@ return FALSE pulse(FALSE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) if(loop) timing = TRUE update_icon() + ui_update() -/obj/item/assembly/timer/process() +/obj/item/assembly/timer/process(delta_time) if(!timing) return - time-- + time -= delta_time if(time <= 0) timing = FALSE timer_end() @@ -89,6 +87,11 @@ return UI_CLOSE +/obj/item/assembly/timer/ui_requires_update(mob/user, datum/tgui/ui) + . = ..() + if(timing) + . = TRUE // Autoupdate while counting down + /obj/item/assembly/timer/ui_state(mob/user) return GLOB.hands_state diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index dbcec82f39202..e7e558aabe79f 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -8,7 +8,6 @@ desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" materials = list(/datum/material/iron=500, /datum/material/glass=50) - flags_1 = HEAR_1 attachable = TRUE verb_say = "beeps" verb_ask = "beeps" @@ -21,11 +20,15 @@ "recognizer", "voice sensor") +/obj/item/assembly/voice/Initialize() + . = ..() + become_hearing_sensitive(ROUNDSTART_TRAIT) + /obj/item/assembly/voice/examine(mob/user) . = ..() . += "Use a multitool to swap between \"inclusive\", \"exclusive\", \"recognizer\", and \"voice sensor\" mode." -/obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) . = ..() if(speaker == src) return diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index 221febbe14d4d..3f9e8c3fcca2c 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -11,6 +11,7 @@ GLOBAL_LIST_EMPTY(asset_datums) /datum/asset var/_abstract = /datum/asset + var/cached_url_mappings /datum/asset/New() GLOB.asset_datums[type] = src @@ -19,6 +20,13 @@ GLOBAL_LIST_EMPTY(asset_datums) /datum/asset/proc/get_url_mappings() return list() +/// Returns a cached tgui message of URL mappings +/datum/asset/proc/get_serialized_url_mappings() + if (isnull(cached_url_mappings)) + cached_url_mappings = TGUI_CREATE_MESSAGE("asset/mappings", get_url_mappings()) + + return cached_url_mappings + /datum/asset/proc/register() return diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index bd98b9cc07a99..077c00485757d 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -3,21 +3,21 @@ /datum/asset/simple/tgui_common keep_local_name = TRUE assets = list( - "tgui-common.chunk.js" = 'tgui/public/tgui-common.chunk.js', + "tgui-common.bundle.js" = file("tgui/public/tgui-common.bundle.js"), ) /datum/asset/simple/tgui keep_local_name = TRUE assets = list( - "tgui.bundle.js" = 'tgui/public/tgui.bundle.js', - "tgui.bundle.css" = 'tgui/public/tgui.bundle.css', + "tgui.bundle.js" = file("tgui/public/tgui.bundle.js"), + "tgui.bundle.css" = file("tgui/public/tgui.bundle.css"), ) /datum/asset/simple/tgui_panel keep_local_name = TRUE assets = list( - "tgui-panel.bundle.js" = 'tgui/public/tgui-panel.bundle.js', - "tgui-panel.bundle.css" = 'tgui/public/tgui-panel.bundle.css', + "tgui-panel.bundle.js" = file("tgui/public/tgui-panel.bundle.js"), + "tgui-panel.bundle.css" = file("tgui/public/tgui-panel.bundle.css"), ) /datum/asset/simple/headers @@ -50,6 +50,18 @@ "smmon_6.gif" = 'icons/program_icons/smmon_6.gif', ) +/datum/asset/simple/circuit_assets + assets = list( + "grid_background.png" = 'icons/ui_icons/tgui/grid_background.png' + ) + +/datum/asset/simple/radar_assets + assets = list( + "ntosradarbackground.png" = 'icons/UI_Icons/tgui/ntosradar_background.png', + "ntosradarpointer.png" = 'icons/UI_Icons/tgui/ntosradar_pointer.png', + "ntosradarpointerS.png" = 'icons/UI_Icons/tgui/ntosradar_pointer_S.png' + ) + /datum/asset/spritesheet/simple/pda name = "pda" assets = list( @@ -158,11 +170,21 @@ ) parents = list("font-awesome.css" = 'html/font-awesome/css/all.min.css') +/datum/asset/simple/namespaced/tgfont + assets = list( + "tgfont.eot" = file("tgui/packages/tgfont/dist/tgfont.eot"), + "tgfont.woff2" = file("tgui/packages/tgfont/dist/tgfont.woff2"), + ) + parents = list( + "tgfont.css" = file("tgui/packages/tgfont/dist/tgfont.css"), + ) + /datum/asset/spritesheet/chat name = "chat" /datum/asset/spritesheet/chat/register() InsertAll("emoji", 'icons/emoji.dmi') + InsertAll("badge", 'icons/badges.dmi') // pre-loading all lanugage icons also helps to avoid meta InsertAll("language", 'icons/misc/language.dmi') // catch languages which are pulling icons from another file @@ -211,7 +233,7 @@ "boss4.gif" = 'icons/UI_Icons/Arcade/boss4.gif', "boss5.gif" = 'icons/UI_Icons/Arcade/boss5.gif', "boss6.gif" = 'icons/UI_Icons/Arcade/boss6.gif', - ) + ) /datum/asset/spritesheet/simple/pills name ="pills" @@ -255,6 +277,47 @@ InsertAll("", each, GLOB.alldirs) ..() +/datum/asset/simple/genetics + assets = list( + "dna_discovered.gif" = 'html/dna_discovered.gif', + "dna_undiscovered.gif" = 'html/dna_undiscovered.gif', + "dna_extra.gif" = 'html/dna_extra.gif' + ) + +/datum/asset/spritesheet/supplypods + name = "supplypods" + +/datum/asset/spritesheet/supplypods/register() + for (var/style in 1 to length(GLOB.podstyles)) + var/icon_file = 'icons/obj/supplypods.dmi' + var/states = icon_states(icon_file) + if (style == STYLE_SEETHROUGH) + Insert("pod_asset[style]", icon(icon_file, "seethrough-icon", SOUTH)) + continue + var/base = GLOB.podstyles[style][POD_BASE] + if (!base) + Insert("pod_asset[style]", icon(icon_file, "invisible-icon", SOUTH)) + continue + var/icon/podIcon = icon(icon_file, base, SOUTH) + var/door = GLOB.podstyles[style][POD_DOOR] + if (door) + door = "[base]_door" + if(door in states) + podIcon.Blend(icon(icon_file, door, SOUTH), ICON_OVERLAY) + var/shape = GLOB.podstyles[style][POD_SHAPE] + if (shape == POD_SHAPE_NORML) + var/decal = GLOB.podstyles[style][POD_DECAL] + if (decal) + if(decal in states) + podIcon.Blend(icon(icon_file, decal, SOUTH), ICON_OVERLAY) + var/glow = GLOB.podstyles[style][POD_GLOW] + if (glow) + glow = "pod_glow_[glow]" + if(glow in states) + podIcon.Blend(icon(icon_file, glow, SOUTH), ICON_OVERLAY) + Insert("pod_asset[style]", podIcon) + return ..() + // Representative icons for each research design /datum/asset/spritesheet/research_designs name = "design" @@ -347,14 +410,6 @@ Insert(imgid, I) return ..() - -/datum/asset/simple/genetics - assets = list( - "dna_discovered.png" = 'html/dna_discovered.png', - "dna_undiscovered.png" = 'html/dna_undiscovered.png', - "dna_extra.png" = 'html/dna_extra.png' - ) - /datum/asset/simple/bee_antags assets = list( "traitor.png" = 'html/img/traitor.png', @@ -412,3 +467,51 @@ // Special case to handle Bluespace Crystals Insert("polycrystal", 'icons/obj/telescience.dmi', "polycrystal") ..() + +/datum/asset/simple/pAI + assets = list( + "paigrid.png" = 'html/paigrid.png' + ) + +/datum/asset/simple/portraits + var/tab = "use subtypes of this please" + assets = list() + +/datum/asset/simple/portraits/New() + if(!SSpersistence.paintings || !SSpersistence.paintings[tab] || !length(SSpersistence.paintings[tab])) + return + for(var/p in SSpersistence.paintings[tab]) + var/list/portrait = p + var/png = "data/paintings/[tab]/[portrait["md5"]].png" + if(fexists(png)) + var/asset_name = "[tab]_[portrait["md5"]]" + assets[asset_name] = png + ..() //this is where it registers all these assets we added to the list + +/datum/asset/simple/portraits/library + tab = "library" + +/datum/asset/simple/portraits/library_secure + tab = "library_secure" + +/datum/asset/simple/portraits/library_private + tab = "library_private" + +/datum/asset/spritesheet/fish + name = "fish" + +/datum/asset/spritesheet/fish/register() + for (var/path in subtypesof(/datum/aquarium_behaviour/fish)) + var/datum/aquarium_behaviour/fish/fish_type = path + var/fish_icon = initial(fish_type.icon) + var/fish_icon_state = initial(fish_type.icon_state) + var/id = sanitize_css_class_name("[fish_icon][fish_icon_state]") + if(sprites[id]) //no dupes + continue + Insert(id, fish_icon, fish_icon_state) + ..() + +/// Removes all non-alphanumerics from the text, keep in mind this can lead to id conflicts +/proc/sanitize_css_class_name(name) + var/static/regex/regex = new(@"[^a-zA-Z0-9]","g") + return replacetext(name, regex, "") diff --git a/code/modules/atmospherics/auxgm/breathing_classes.dm b/code/modules/atmospherics/auxgm/breathing_classes.dm new file mode 100644 index 0000000000000..4abfab58eecc3 --- /dev/null +++ b/code/modules/atmospherics/auxgm/breathing_classes.dm @@ -0,0 +1,37 @@ +// Breathing classes are, yes, just a list of gases, associated with numbers. +// But they're very simple: pluoxium's status as O2 * 8 is represented here, +// with a single line of code, no hardcoding and special-casing across the codebase. +// Not only that, but they're very general: you could have a negative value +// to simulate asphyxiants, e.g. if I add krypton it could go into the oxygen +// breathing class at -7, simulating krypton narcosis. + +/datum/breathing_class + var/list/gases = null + var/list/products = null + var/danger_reagent = null + var/low_alert_category = "not_enough_oxy" + var/low_alert_datum = /atom/movable/screen/alert/not_enough_oxy + var/high_alert_category = "too_much_oxy" + var/high_alert_datum = /atom/movable/screen/alert/too_much_oxy + +/datum/breathing_class/oxygen + gases = list( + GAS_O2 = 1, + GAS_PLUOXIUM = 8, + GAS_CO2 = -0.7, // CO2 isn't actually toxic, just an asphyxiant + ) + products = list( + GAS_CO2 = 1, + ) + +/datum/breathing_class/plasma + gases = list( + GAS_PLASMA = 1 + ) + products = list( + GAS_CO2 = 1 + ) + low_alert_category = "not_enough_tox" + low_alert_datum = /atom/movable/screen/alert/not_enough_tox + high_alert_category = "too_much_tox" + high_alert_datum = /atom/movable/screen/alert/too_much_tox diff --git a/code/modules/atmospherics/auxgm/gas_types.dm b/code/modules/atmospherics/auxgm/gas_types.dm new file mode 100644 index 0000000000000..82ec62f90f915 --- /dev/null +++ b/code/modules/atmospherics/auxgm/gas_types.dm @@ -0,0 +1,129 @@ +/datum/gas/oxygen + id = GAS_O2 + specific_heat = 20 + name = "Oxygen" + oxidation_temperature = T0C - 100 // it checks max of this and fire temperature, so rarely will things spontaneously combust + +/datum/gas/nitrogen + id = GAS_N2 + specific_heat = 20 + breath_alert_info = list( + not_enough_alert = list( + alert_category = "not_enough_nitro", + alert_type = /atom/movable/screen/alert/not_enough_nitro + ), + too_much_alert = list( + alert_category = "too_much_nitro", + alert_type = /atom/movable/screen/alert/too_much_nitro + ) + ) + name = "Nitrogen" + +/datum/gas/carbon_dioxide //what the fuck is this? + id = GAS_CO2 + specific_heat = 30 + name = "Carbon Dioxide" + breath_results = GAS_O2 + breath_alert_info = list( + not_enough_alert = list( + alert_category = "not_enough_co2", + alert_type = /atom/movable/screen/alert/not_enough_co2 + ), + too_much_alert = list( + alert_category = "too_much_co2", + alert_type = /atom/movable/screen/alert/too_much_co2 + ) + ) + fusion_power = 3 + +/datum/gas/plasma + id = GAS_PLASMA + specific_heat = 200 + name = "Plasma" + gas_overlay = "plasma" + moles_visible = MOLES_GAS_VISIBLE + flags = GAS_FLAG_DANGEROUS + // no fire info cause it has its own bespoke reaction for trit generation reasons + +/datum/gas/water_vapor + id = GAS_H2O + specific_heat = 40 + name = "Water Vapor" + gas_overlay = "water_vapor" + moles_visible = MOLES_GAS_VISIBLE + fusion_power = 8 + breath_reagent = /datum/reagent/water + +/datum/gas/hypernoblium + id = GAS_HYPERNOB + specific_heat = 2000 + name = "Hyper-noblium" + gas_overlay = "freon" + moles_visible = MOLES_GAS_VISIBLE + +/datum/gas/nitrous_oxide + id = GAS_NITROUS + specific_heat = 40 + name = "Nitrous Oxide" + gas_overlay = "nitrous_oxide" + moles_visible = MOLES_GAS_VISIBLE * 2 + flags = GAS_FLAG_DANGEROUS + fire_products = list(GAS_N2 = 1) + oxidation_rate = 0.5 + oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 100 + +/datum/gas/nitryl + id = GAS_NITRYL + specific_heat = 20 + name = "Nitryl" + gas_overlay = "nitryl" + moles_visible = MOLES_GAS_VISIBLE + flags = GAS_FLAG_DANGEROUS + fusion_power = 15 + fire_products = list(GAS_N2 = 0.5) + oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50 + +/datum/gas/tritium + id = GAS_TRITIUM + specific_heat = 10 + name = "Tritium" + gas_overlay = "tritium" + moles_visible = MOLES_GAS_VISIBLE + flags = GAS_FLAG_DANGEROUS + fusion_power = 1 + /* + these are for when we add hydrogen, trit gets to keep its hardcoded fire for legacy reasons + fire_provides = list(GAS_H2O = 2) + fire_burn_rate = 2 + fire_energy_released = FIRE_HYDROGEN_ENERGY_RELEASED + fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50 + */ + +/datum/gas/bz + id = GAS_BZ + specific_heat = 20 + name = "BZ" + flags = GAS_FLAG_DANGEROUS + fusion_power = 8 + +/datum/gas/stimulum + id = GAS_STIMULUM + specific_heat = 5 + name = "Stimulum" + fusion_power = 7 + +/datum/gas/pluoxium + id = GAS_PLUOXIUM + specific_heat = 80 + name = "Pluoxium" + fusion_power = 10 + oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 1000 // it is VERY stable + oxidation_rate = 8 + +/datum/gas/miasma + id = GAS_MIASMA + specific_heat = 20 + fusion_power = 50 + name = "Miasma" + gas_overlay = "miasma" + moles_visible = MOLES_GAS_VISIBLE * 60 diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 9f66bdd5fcd5d..f27e68a4eb501 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -13,28 +13,21 @@ if(!air) return - var/oxy = air.get_moles(/datum/gas/oxygen) - if (oxy < 0.5) + if (air.get_oxidation_power(exposed_temperature) < 0.5) return - var/tox = air.get_moles(/datum/gas/plasma) - var/trit = air.get_moles(/datum/gas/tritium) + var/has_fuel = air.get_moles(GAS_PLASMA) > 0.5 || air.get_moles(GAS_TRITIUM) > 0.5 || air.get_fuel_amount(exposed_temperature) > 0.5 if(active_hotspot) if(soh) - if(tox > 0.5 || trit > 0.5) + if(has_fuel) if(active_hotspot.temperature < exposed_temperature) active_hotspot.temperature = exposed_temperature if(active_hotspot.volume < exposed_volume) active_hotspot.volume = exposed_volume return - if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (tox > 0.5 || trit > 0.5)) - + if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && has_fuel) active_hotspot = new /obj/effect/hotspot(src, exposed_volume*25, exposed_temperature) - active_hotspot.just_spawned = (current_cycle < SSair.times_fired) - //remove just_spawned protection if no longer processing this cell - SSair.add_to_active(src, 0) - //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile /obj/effect/hotspot anchored = TRUE @@ -48,9 +41,9 @@ var/volume = 125 var/temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - var/just_spawned = TRUE var/bypassing = FALSE var/visual_update_tick = 0 + var/first_cycle = TRUE /obj/effect/hotspot/Initialize(mapload, starting_volume, starting_temperature) . = ..() @@ -70,7 +63,9 @@ location.active_hotspot = src - bypassing = !just_spawned && (volume > CELL_VOLUME*0.95) || location.air.return_temperature() > FUSION_TEMPERATURE_THRESHOLD + bypassing = !first_cycle && volume > CELL_VOLUME*0.95 || location.air.return_temperature() > FUSION_TEMPERATURE_THRESHOLD + if(first_cycle) + first_cycle = FALSE if(bypassing) volume = location.air.reaction_results["fire"]*FIRE_GROWTH_RATE @@ -150,10 +145,6 @@ #define INSUFFICIENT(path) (location.air.get_moles(path) < 0.5) /obj/effect/hotspot/process() - if(just_spawned) - just_spawned = FALSE - return - var/turf/open/location = loc if(!istype(location)) qdel(src) @@ -164,13 +155,7 @@ if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1)) qdel(src) return - if(!location.air || (INSUFFICIENT(/datum/gas/plasma) && INSUFFICIENT(/datum/gas/tritium)) || INSUFFICIENT(/datum/gas/oxygen)) - qdel(src) - return - - //Not enough to burn - // god damn it previous coder you made the INSUFFICIENT macro for a fucking reason why didn't you use it here smh - if((INSUFFICIENT(/datum/gas/plasma) && INSUFFICIENT(/datum/gas/tritium)) || INSUFFICIENT(/datum/gas/oxygen)) + if(!location.air || location.air.get_oxidation_power() < 0.5 || (INSUFFICIENT(GAS_PLASMA) && INSUFFICIENT(GAS_TRITIUM) && location.air.get_fuel_amount() < 0.5)) qdel(src) return diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 0e213e951cfd0..2caaaf6d8375b 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -18,57 +18,75 @@ /turf/open/CanAtmosPass(turf/T, vertical = FALSE) var/dir = vertical? get_dir_multiz(src, T) : get_dir(src, T) - var/opp = dir_inverse_multiz(dir) - var/R = FALSE + var/opp = REVERSE_DIR(dir) + . = TRUE if(vertical && !(zAirOut(dir, T) && T.zAirIn(dir, src))) - R = TRUE + . = FALSE if(blocks_air || T.blocks_air) - R = TRUE + . = FALSE if (T == src) - return !R + return . for(var/obj/O in contents+T.contents) var/turf/other = (O.loc == src ? T : src) if(!(vertical? (CANVERTICALATMOSPASS(O, other)) : (CANATMOSPASS(O, other)))) - R = TRUE - if(O.BlockSuperconductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments - atmos_supeconductivity |= dir - T.atmos_supeconductivity |= opp - return FALSE //no need to keep going, we got all we asked - - atmos_supeconductivity &= ~dir - T.atmos_supeconductivity &= ~opp - - return !R - -/atom/movable/proc/BlockSuperconductivity() // objects that block air and don't let superconductivity act. Only firelocks atm. + . = FALSE + if(O.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments + conductivity_blocked_directions |= dir + T.conductivity_blocked_directions |= opp + if(!.) + return . + +/atom/movable/proc/BlockThermalConductivity() // Objects that don't let heat through. return FALSE /turf/proc/ImmediateCalculateAdjacentTurfs() + if(SSair.thread_running()) + CALCULATE_ADJACENT_TURFS(src) + return var/canpass = CANATMOSPASS(src, src) var/canvpass = CANVERTICALATMOSPASS(src, src) for(var/direction in GLOB.cardinals_multiz) var/turf/T = get_step_multiz(src, direction) - var/opp_dir = dir_inverse_multiz(direction) - if(!isopenturf(T)) + if(!istype(T)) continue - if(!(blocks_air || T.blocks_air) && ((direction & (UP|DOWN))? (canvpass && CANVERTICALATMOSPASS(T, src)) : (canpass && CANATMOSPASS(T, src))) ) + var/opp_dir = REVERSE_DIR(direction) + if(isopenturf(T) && !(blocks_air || T.blocks_air) && ((direction & (UP|DOWN))? (canvpass && CANVERTICALATMOSPASS(T, src)) : (canpass && CANATMOSPASS(T, src))) ) LAZYINITLIST(atmos_adjacent_turfs) LAZYINITLIST(T.atmos_adjacent_turfs) atmos_adjacent_turfs[T] = direction T.atmos_adjacent_turfs[src] = opp_dir - T.__update_extools_adjacent_turfs() else if (atmos_adjacent_turfs) atmos_adjacent_turfs -= T if (T.atmos_adjacent_turfs) T.atmos_adjacent_turfs -= src - T.__update_extools_adjacent_turfs() UNSETEMPTY(T.atmos_adjacent_turfs) + T.set_sleeping(T.blocks_air) + T.__update_auxtools_turf_adjacency_info(isspaceturf(T.get_z_base_turf()), -1) UNSETEMPTY(atmos_adjacent_turfs) src.atmos_adjacent_turfs = atmos_adjacent_turfs - __update_extools_adjacent_turfs() + set_sleeping(blocks_air) + __update_auxtools_turf_adjacency_info(isspaceturf(get_z_base_turf())) + +/turf/proc/ImmediateDisableAdjacency(disable_adjacent = TRUE) + if(SSair.thread_running()) + SSadjacent_air.disable_queue[src] = disable_adjacent + return + if(disable_adjacent) + for(var/direction in GLOB.cardinals_multiz) + var/turf/T = get_step_multiz(src, direction) + if(!istype(T)) + continue + if (T.atmos_adjacent_turfs) + T.atmos_adjacent_turfs -= src + UNSETEMPTY(T.atmos_adjacent_turfs) + T.__update_auxtools_turf_adjacency_info(isspaceturf(T.get_z_base_turf()), -1) + LAZYCLEARLIST(atmos_adjacent_turfs) + __update_auxtools_turf_adjacency_info(isspaceturf(get_z_base_turf())) + +/turf/proc/set_sleeping(should_sleep) -/turf/proc/__update_extools_adjacent_turfs() +/turf/proc/__update_auxtools_turf_adjacency_info() //returns a list of adjacent turfs that can share air with this one. //alldir includes adjacent diagonal tiles that can share @@ -114,7 +132,6 @@ /turf/air_update_turf(command = 0) if(command) ImmediateCalculateAdjacentTurfs() - SSair.add_to_active(src,command) /atom/movable/proc/move_update_air(turf/T) if(isturf(T)) @@ -133,7 +150,4 @@ var/datum/gas_mixture/G = new G.parse_gas_string(text) - - air.merge(G) - archive() - SSair.add_to_active(src, 0) + assume_air(G) diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index 9660e7e012cbd..2564531906eb6 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -1,18 +1,12 @@ /turf - //used for temperature calculations + //conductivity is divided by 10 when interacting with air for balance purposes var/thermal_conductivity = 0.05 var/heat_capacity = 1 - var/temperature_archived //list of open turfs adjacent to us var/list/atmos_adjacent_turfs - //bitfield of dirs in which we are superconducitng - var/atmos_supeconductivity = NONE - var/is_openturf = FALSE // used by extools shizz. - - //used to determine whether we should archive - var/archived_cycle = 0 - var/current_cycle = 0 + //bitfield of dirs in which we thermal conductivity is blocked + var/conductivity_blocked_directions = NONE //used for mapping and for breathing while in walls (because that's a thing that needs to be accounted for...) //string parsed by /datum/gas/proc/copy_from_turf @@ -32,21 +26,17 @@ var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time var/list/atmos_overlay_types //gas IDs of current active gas overlays - is_openturf = TRUE /turf/open/Initialize() if(!blocks_air) - air = new + air = new(2500,src) air.copy_from_turf(src) - update_air_ref() + update_air_ref(planetary_atmos ? 1 : 2) . = ..() /turf/open/Destroy() if(active_hotspot) QDEL_NULL(active_hotspot) - // Adds the adjacent turfs to the current atmos processing - for(var/T in atmos_adjacent_turfs) - SSair.add_to_active(T) return ..() /turf/proc/update_air_ref() @@ -54,10 +44,46 @@ /////////////////GAS MIXTURE PROCS/////////////////// /turf/open/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air + return assume_air_ratio(giver, 1) + +/turf/open/assume_air_moles(datum/gas_mixture/giver, moles) if(!giver) return FALSE - air.merge(giver) - update_visuals() + if(SSair.thread_running()) + SSair.deferred_airs += list(list(giver, air, moles / giver.total_moles())) + else + giver.transfer_to(air, moles) + update_visuals() + return TRUE + +/turf/open/assume_air_ratio(datum/gas_mixture/giver, ratio) + if(!giver) + return FALSE + if(SSair.thread_running()) + SSair.deferred_airs += list(list(giver, air, ratio)) + else + giver.transfer_ratio_to(air, ratio) + update_visuals() + return TRUE + +/turf/open/transfer_air(datum/gas_mixture/taker, moles) + if(!taker || !return_air()) // shouldn't transfer from space + return FALSE + if(SSair.thread_running()) + SSair.deferred_airs += list(list(air, taker, moles / air.total_moles())) + else + air.transfer_to(taker, moles) + update_visuals() + return TRUE + +/turf/open/transfer_air_ratio(datum/gas_mixture/taker, ratio) + if(!taker || !return_air()) + return FALSE + if(SSair.thread_running()) + SSair.deferred_airs += list(list(air, taker, ratio)) + else + air.transfer_ratio_to(taker, ratio) + update_visuals() return TRUE /turf/open/remove_air(amount) @@ -66,6 +92,12 @@ update_visuals() return removed +/turf/open/remove_air_ratio(ratio) + var/datum/gas_mixture/ours = return_air() + var/datum/gas_mixture/removed = ours.remove_ratio(ratio) + update_visuals() + return removed + /turf/open/proc/copy_air_with_tile(turf/open/T) if(istype(T)) air.copy_from(T.air) @@ -88,16 +120,9 @@ return return_air() /turf/temperature_expose() - if(temperature > heat_capacity) + if(return_temperature() > heat_capacity) to_be_destroyed = TRUE -/turf/proc/archive() - temperature_archived = temperature - -/turf/open/archive() - air.archive() - archived_cycle = SSair.times_fired - temperature_archived = temperature /turf/open/proc/eg_reset_cooldowns() /turf/open/proc/eg_garbage_collect() @@ -124,9 +149,8 @@ for(var/id in air.get_gases()) if (nonoverlaying_gases[id]) continue - var/gas_meta = GLOB.meta_gas_info[id] - var/gas_overlay = gas_meta[META_GAS_OVERLAY] - if(gas_overlay && air.get_moles(id) > gas_meta[META_GAS_MOLES_VISIBLE]) + var/gas_overlay = GLOB.gas_data.overlays[id] + if(gas_overlay && air.get_moles(id) > GLOB.gas_data.visibility[id]) new_overlay_types += gas_overlay[min(FACTOR_GAS_VISIBLE_MAX, CEILING(air.get_moles(id) / MOLES_GAS_VISIBLE_STEP, 1))] if (atmos_overlay_types) @@ -160,12 +184,11 @@ for (var/gastype in subtypesof(/datum/gas)) var/datum/gas/gasvar = gastype if (!initial(gasvar.gas_overlay)) - .[gastype] = TRUE + .[initial(gasvar.id)] = TRUE /////////////////////////////SIMULATION/////////////////////////////////// /turf/proc/process_cell(fire_count) - SSair.remove_from_active(src) /turf/open/proc/equalize_pressure_in_zone(cyclenum) /turf/open/proc/consider_firelocks(turf/T2) @@ -185,14 +208,25 @@ /turf/proc/handle_decompression_floor_rip() /turf/open/floor/handle_decompression_floor_rip(sum) - if(sum > 20 && prob(CLAMP(sum / 10, 0, 30))) - remove_tile() + if(sum > 20 && prob(CLAMP(sum / 20, 0, 15))) + if(floor_tile) + new floor_tile(src) + make_plating() + +/turf/open/floor/plating/handle_decompression_floor_rip() + return + +/turf/open/floor/engine/handle_decompression_floor_rip() + return /turf/open/process_cell(fire_count) //////////////////////////SPACEWIND///////////////////////////// -/turf/open/proc/consider_pressure_difference(turf/T, difference) +/turf/proc/consider_pressure_difference() + return + +/turf/open/consider_pressure_difference(turf/T, difference) SSair.high_pressure_delta |= src if(difference > pressure_difference) pressure_direction = get_dir(src, T) @@ -209,8 +243,6 @@ M = thing if (!M.anchored && !M.pulledby && M.last_high_pressure_movement_air_cycle < SSair.times_fired) M.experience_pressure_difference(pressure_difference * multiplier, pressure_direction, 0, pressure_specific_target) - if(pressure_difference > 100) - new /obj/effect/temp_visual/dir_setting/space_wind(src, pressure_direction, CLAMP(round(sqrt(pressure_difference) * 2), 10, 255)) /atom/movable/var/pressure_resistance = 10 /atom/movable/var/last_high_pressure_movement_air_cycle = 0 @@ -236,112 +268,3 @@ else step(src, direction) last_high_pressure_movement_air_cycle = SSair.times_fired - -////////////////////////SUPERCONDUCTIVITY///////////////////////////// -/turf/proc/conductivity_directions() - if(archived_cycle < SSair.times_fired) - archive() - return NORTH|SOUTH|EAST|WEST - -/turf/open/conductivity_directions() - if(blocks_air) - return ..() - for(var/direction in GLOB.cardinals) - var/turf/T = get_step(src, direction) - if(!(T in atmos_adjacent_turfs) && !(atmos_supeconductivity & direction)) - . |= direction - -/turf/proc/neighbor_conduct_with_src(turf/open/other) - if(!other.blocks_air) //Open but neighbor is solid - other.temperature_share_open_to_solid(src) - else //Both tiles are solid - other.share_temperature_mutual_solid(src, thermal_conductivity) - temperature_expose(null, temperature, null) - -/turf/open/neighbor_conduct_with_src(turf/other) - if(blocks_air) - ..() - return - - if(!other.blocks_air) //Both tiles are open - var/turf/open/T = other - T.air.temperature_share(air, WINDOW_HEAT_TRANSFER_COEFFICIENT) - else //Solid but neighbor is open - temperature_share_open_to_solid(other) - SSair.add_to_active(src, 0) - -/turf/proc/super_conduct() - var/conductivity_directions = conductivity_directions() - - if(conductivity_directions) - //Conduct with tiles around me - for(var/direction in GLOB.cardinals) - if(conductivity_directions & direction) - var/turf/neighbor = get_step(src,direction) - - if(!neighbor.thermal_conductivity) - continue - - if(neighbor.archived_cycle < SSair.times_fired) - neighbor.archive() - - neighbor.neighbor_conduct_with_src(src) - - neighbor.consider_superconductivity() - - radiate_to_spess() - - finish_superconduction() - -/turf/proc/finish_superconduction(temp = temperature) - //Make sure still hot enough to continue conducting heat - if(temp < MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION) - SSair.active_super_conductivity -= src - return FALSE - -/turf/open/finish_superconduction() - //Conduct with air on my tile if I have it - if(!blocks_air) - temperature = air.temperature_share(null, thermal_conductivity, temperature, heat_capacity) - ..((blocks_air ? temperature : air.return_temperature())) - -/turf/proc/consider_superconductivity() - if(!thermal_conductivity) - return FALSE - - SSair.active_super_conductivity |= src - return TRUE - -/turf/open/consider_superconductivity(starting) - if(air.return_temperature() < (starting?MINIMUM_TEMPERATURE_START_SUPERCONDUCTION:MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION)) - return FALSE - if(air.heat_capacity() < M_CELL_WITH_RATIO) // Was: MOLES_CELLSTANDARD*0.1*0.05 Since there are no variables here we can make this a constant. - return FALSE - return ..() - -/turf/closed/consider_superconductivity(starting) - if(temperature < (starting?MINIMUM_TEMPERATURE_START_SUPERCONDUCTION:MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION)) - return FALSE - return ..() - -/turf/proc/radiate_to_spess() //Radiate excess tile heat to space - if(temperature > T0C) //Considering 0 degC as te break even point for radiation in and out - var/delta_temperature = (temperature_archived - TCMB) //hardcoded space temperature - if((heat_capacity > 0) && (abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)) - - var/heat = thermal_conductivity*delta_temperature* \ - (heat_capacity*HEAT_CAPACITY_VACUUM/(heat_capacity+HEAT_CAPACITY_VACUUM)) - temperature -= heat/heat_capacity - -/turf/open/proc/temperature_share_open_to_solid(turf/sharer) - sharer.temperature = air.temperature_share(null, sharer.thermal_conductivity, sharer.temperature, sharer.heat_capacity) - -/turf/proc/share_temperature_mutual_solid(turf/sharer, conduction_coefficient) //to be understood - var/delta_temperature = (temperature_archived - sharer.temperature_archived) - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER && heat_capacity && sharer.heat_capacity) - - var/heat = conduction_coefficient*delta_temperature* \ - (heat_capacity*sharer.heat_capacity/(heat_capacity+sharer.heat_capacity)) - - temperature -= heat/heat_capacity - sharer.temperature += heat/sharer.heat_capacity diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm new file mode 100644 index 0000000000000..04ebc3584e7f0 --- /dev/null +++ b/code/modules/atmospherics/gasmixtures/auxgm.dm @@ -0,0 +1,130 @@ +GLOBAL_LIST_INIT(hardcoded_gases, list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLASMA)) //the main four gases, which were at one time hardcoded +GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLUOXIUM, GAS_STIMULUM, GAS_NITRYL))) //unable to react amongst themselves + +// Auxgm +// It's a send-up of XGM, like what baystation got. +// It's got the same architecture as XGM, but it's structured +// differently to make it more convenient for auxmos. + +// Most important compared to TG is that it does away with hardcoded typepaths, +// which lead to problems on the auxmos end anyway. We cache the string value +// references on the Rust end, so no performance is lost here. + +// Also allows you to add new gases at runtime + +/proc/_auxtools_register_gas(datum/gas/gas) // makes sure auxtools knows stuff about this gas + +/datum/auxgm + var/list/datums = list() + var/list/specific_heats = list() + var/list/names = list() + var/list/visibility = list() + var/list/overlays = list() + var/list/flags = list() + var/list/ids = list() + var/list/typepaths = list() + var/list/fusion_powers = list() + var/list/breathing_classes = list() + var/list/breath_results = list() + var/list/breath_reagents = list() + var/list/breath_reagents_dangerous = list() + var/list/breath_alert_info = list() + var/list/oxidation_temperatures = list() + var/list/oxidation_rates = list() + var/list/fire_temperatures = list() + var/list/fire_enthalpies = list() + var/list/fire_products = list() + var/list/fire_burn_rates = list() + + +/datum/gas + var/id = "" + var/specific_heat = 0 + var/name = "" + var/gas_overlay = "" //icon_state in icons/effects/atmospherics.dmi + var/moles_visible = null + var/flags = NONE //currently used by canisters + var/fusion_power = 0 // How much the gas destabilizes a fusion reaction + var/breath_results = GAS_CO2 // what breathing this breathes out + var/breath_reagent = null // what breathing this adds to your reagents + var/breath_reagent_dangerous = null // what breathing this adds to your reagents IF it's above a danger threshold + var/list/breath_alert_info = null // list for alerts that pop up when you have too much/not enough of something + var/oxidation_temperature = null // temperature above which this gas is an oxidizer; null for none + var/oxidation_rate = 1 // how many moles of this can oxidize how many moles of material + var/fire_temperature = null // temperature above which gas may catch fire; null for none + var/list/fire_products = null // what results when this gas is burned (oxidizer or fuel); null for none + var/fire_energy_released = 0 // how much energy is released per mole of fuel burned + var/fire_burn_rate = 1 // how many moles are burned per product released + +/datum/gas/proc/breath(partial_pressure, light_threshold, heavy_threshold, moles, mob/living/carbon/C, obj/item/organ/lungs/lungs) + // This is only called on gases with the GAS_FLAG_BREATH_PROC flag. When possible, do NOT use this-- + // greatly prefer just adding a reagent. This is mostly around for legacy reasons. + return null + +/datum/auxgm/proc/add_gas(datum/gas/gas) + var/g = gas.id + if(g) + datums[g] = gas + specific_heats[g] = gas.specific_heat + names[g] = gas.name + if(gas.moles_visible) + visibility[g] = gas.moles_visible + overlays[g] = new /list(FACTOR_GAS_VISIBLE_MAX) + for(var/i in 1 to FACTOR_GAS_VISIBLE_MAX) + overlays[g][i] = new /obj/effect/overlay/gas(gas.gas_overlay, i * 255 / FACTOR_GAS_VISIBLE_MAX) + else + visibility[g] = 0 + overlays[g] = 0 + flags[g] = gas.flags + ids[g] = g + typepaths[g] = gas.type + fusion_powers[g] = gas.fusion_power + + if(gas.breath_alert_info) + breath_alert_info[g] = gas.breath_alert_info + breath_results[g] = gas.breath_results + if(gas.breath_reagent) + breath_reagents[g] = gas.breath_reagent + if(gas.breath_reagent_dangerous) + breath_reagents_dangerous[g] = gas.breath_reagent_dangerous + + if(gas.oxidation_temperature) + oxidation_temperatures[g] = gas.oxidation_temperature + oxidation_rates[g] = gas.oxidation_rate + if(gas.fire_products) + fire_products[g] = gas.fire_products + fire_enthalpies[g] = gas.fire_energy_released + else if(gas.fire_temperature) + fire_temperatures[g] = gas.fire_temperature + fire_burn_rates[g] = gas.fire_burn_rate + if(gas.fire_products) + fire_products[g] = gas.fire_products + fire_enthalpies[g] = gas.fire_energy_released + + _auxtools_register_gas(gas) + +/proc/finalize_gas_refs() + +/datum/auxgm/New() + for(var/gas_path in subtypesof(/datum/gas)) + var/datum/gas/gas = new gas_path + add_gas(gas) + for(var/breathing_class_path in subtypesof(/datum/breathing_class)) + var/datum/breathing_class/class = new breathing_class_path + breathing_classes[breathing_class_path] = class + finalize_gas_refs() + +GLOBAL_DATUM_INIT(gas_data, /datum/auxgm, new) + +/obj/effect/overlay/gas + icon = 'icons/effects/atmospherics.dmi' + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + anchored = TRUE // should only appear in vis_contents, but to be safe + layer = FLY_LAYER + appearance_flags = TILE_BOUND + vis_flags = NONE + +/obj/effect/overlay/gas/New(state, alph) + . = ..() + icon_state = state + alpha = alph diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 7e885c31d46d9..400405bac9303 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -7,38 +7,112 @@ What are the archived variables for? #define MINIMUM_MOLE_COUNT 0.01 #define QUANTIZE(variable) (round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */ -GLOBAL_LIST_INIT(meta_gas_info, meta_gas_list()) //see ATMOSPHERICS/gas_types.dm -GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) - -/proc/init_gaslist_cache() - . = list() - for(var/id in GLOB.meta_gas_info) - var/list/cached_gas = new(3) - - .[id] = cached_gas - - cached_gas[MOLES] = 0 - cached_gas[ARCHIVE] = 0 - cached_gas[GAS_META] = GLOB.meta_gas_info[id] /datum/gas_mixture + /// Never ever set this variable, hooked into vv_get_var for view variables viewing. + var/gas_list_view_only var/initial_volume = CELL_VOLUME //liters var/list/reaction_results var/list/analyzer_results //used for analyzer feedback - not initialized until its used - var/_extools_pointer_gasmixture = 0 // Contains the memory address of the shared_ptr object for this gas mixture in c++ land. Don't. Touch. This. Var. + var/_extools_pointer_gasmixture // Contains the index in the gas vector for this gas mixture in rust land. Don't. Touch. This. Var. + +GLOBAL_LIST_INIT(auxtools_atmos_initialized, FALSE) + +/proc/auxtools_atmos_init() /datum/gas_mixture/New(volume) if (!isnull(volume)) initial_volume = volume - ATMOS_EXTOOLS_CHECK + AUXTOOLS_CHECK(AUXMOS) + if(!GLOB.auxtools_atmos_initialized && auxtools_atmos_init()) + GLOB.auxtools_atmos_initialized = TRUE __gasmixture_register() reaction_results = new +/* +we use a hook instead +/datum/gas_mixture/Del() + __gasmixture_unregister() + . = ..() +*/ + /datum/gas_mixture/vv_edit_var(var_name, var_value) if(var_name == "_extools_pointer_gasmixture") return FALSE // please no. segfaults bad. + if(var_name == "gas_list_view_only") + return FALSE return ..() +/datum/gas_mixture/vv_get_var(var_name) + . = ..() + if(var_name == "gas_list_view_only") + var/list/dummy = get_gases() + for(var/gas in dummy) + dummy[gas] = get_moles(gas) + dummy["CAP [gas]"] = partial_heat_capacity(gas) + dummy["TEMP"] = return_temperature() + dummy["PRESSURE"] = return_pressure() + dummy["HEAT CAPACITY"] = heat_capacity() + dummy["TOTAL MOLES"] = total_moles() + dummy["VOLUME"] = return_volume() + dummy["THERMAL ENERGY"] = thermal_energy() + return debug_variable("gases (READ ONLY)", dummy, 0, src) + +/datum/gas_mixture/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION("", "---") + VV_DROPDOWN_OPTION(VV_HK_PARSE_GASSTRING, "Parse Gas String") + VV_DROPDOWN_OPTION(VV_HK_EMPTY, "Empty") + VV_DROPDOWN_OPTION(VV_HK_SET_MOLES, "Set Moles") + VV_DROPDOWN_OPTION(VV_HK_SET_TEMPERATURE, "Set Temperature") + VV_DROPDOWN_OPTION(VV_HK_SET_VOLUME, "Set Volume") + +/datum/gas_mixture/vv_do_topic(list/href_list) + . = ..() + if(!.) + return + if(href_list[VV_HK_PARSE_GASSTRING]) + var/gasstring = input(usr, "Input Gas String (WARNING: Advanced. Don't use this unless you know how these work.", "Gas String Parse") as text|null + if(!istext(gasstring)) + return + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Set to gas string [gasstring].") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Set to gas string [gasstring].") + parse_gas_string(gasstring) + if(href_list[VV_HK_EMPTY]) + log_admin("[key_name(usr)] emptied gas mixture [REF(src)].") + message_admins("[key_name(usr)] emptied gas mixture [REF(src)].") + clear() + if(href_list[VV_HK_SET_MOLES]) + var/list/gases = get_gases() + for(var/gas in gases) + gases[gas] = get_moles(gas) + var/gasid = input(usr, "What kind of gas?", "Set Gas") as null|anything in GLOB.gas_data.ids + if(!gasid) + return + var/amount = input(usr, "Input amount", "Set Gas", gases[gasid] || 0) as num|null + if(!isnum(amount)) + return + amount = max(0, amount) + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.") + set_moles(gasid, amount) + if(href_list[VV_HK_SET_TEMPERATURE]) + var/temp = input(usr, "Set the temperature of this mixture to?", "Set Temperature", return_temperature()) as num|null + if(!isnum(temp)) + return + temp = max(2.7, temp) + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [temp].") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [temp].") + set_temperature(temp) + if(href_list[VV_HK_SET_VOLUME]) + var/volume = input(usr, "Set the volume of this mixture to?", "Set Volume", return_volume()) as num|null + if(!isnum(volume)) + return + volume = max(0, volume) + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Changed volume to [volume].") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Changed volume to [volume].") + set_volume(volume) + /datum/gas_mixture/proc/__gasmixture_unregister() /datum/gas_mixture/proc/__gasmixture_register() @@ -49,7 +123,9 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) L[gt] = initial(G.specific_heat) return L -/datum/gas_mixture/proc/heat_capacity(data = MOLES) //joules per kelvin +/datum/gas_mixture/proc/heat_capacity() //joules per kelvin + +/datum/gas_mixture/proc/partial_heat_capacity(gas_type) /datum/gas_mixture/proc/total_moles() @@ -62,7 +138,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) /datum/gas_mixture/proc/set_volume(new_volume) /datum/gas_mixture/proc/get_moles(gas_type) /datum/gas_mixture/proc/set_moles(gas_type, moles) -/datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, list/gases) +/datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, ratio, list/gases) /datum/gas_mixture/proc/mark_immutable() /datum/gas_mixture/proc/get_gases() /datum/gas_mixture/proc/multiply(factor) @@ -70,7 +146,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) /datum/gas_mixture/proc/clear() /datum/gas_mixture/proc/adjust_moles(gas_type, amt = 0) - set_moles(gas_type, get_moles(gas_type) + amt) + set_moles(gas_type, clamp(get_moles(gas_type) + amt,0,INFINITY)) /datum/gas_mixture/proc/return_volume() //liters @@ -81,13 +157,18 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) //Returns: 1 in all cases /datum/gas_mixture/proc/merge(datum/gas_mixture/giver) - //Merges all air from giver into self. Deletes giver. + //Merges all air from giver into self. Does NOT delete the giver. //Returns: 1 if we are mutable, 0 otherwise /datum/gas_mixture/proc/remove(amount) //Proportionally removes amount of gas from the gas_mixture //Returns: gas_mixture with the gases removed +/datum/gas_mixture/proc/transfer_to(datum/gas_mixture/target, amount) + +/datum/gas_mixture/proc/transfer_ratio_to(datum/gas_mixture/target, ratio) + //Transfers ratio of gas to target. Equivalent to target.merge(remove_ratio(amount)) but faster. + /datum/gas_mixture/proc/remove_ratio(ratio) //Proportionally removes amount of gas from the gas_mixture //Returns: gas_mixture with the gases removed @@ -124,6 +205,24 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) //Performs various reactions such as combustion or fusion (LOL) //Returns: 1 if any reaction took place; 0 otherwise +/datum/gas_mixture/proc/adjust_heat(amt) + //Adjusts the thermal energy of the gas mixture, rather than having to do the full calculation. + //Returns: null + +/datum/gas_mixture/proc/equalize_with(datum/gas_mixture/giver) + //Makes this mix have the same temperature and gas ratios as the giver, but with the same pressure, accounting for volume. + //Returns: null + +/datum/gas_mixture/proc/get_oxidation_power(temp) + //Gets how much oxidation this gas can do, optionally at a given temperature. + +/datum/gas_mixture/proc/get_fuel_amount(temp) + //Gets how much fuel for fires (not counting trit/plasma!) this gas has, optionally at a given temperature. + +/proc/equalize_all_gases_in_list(list/L) + //Makes every gas in the given list have the same pressure, temperature and gas proportions. + //Returns: null + /datum/gas_mixture/proc/__remove() /datum/gas_mixture/remove(amount) var/datum/gas_mixture/removed = new type @@ -145,73 +244,27 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) return copy /datum/gas_mixture/copy_from_turf(turf/model) + set_temperature(initial(model.initial_temperature)) parse_gas_string(model.initial_gas_mix) - - //acounts for changes in temperature - var/turf/model_parent = model.parent_type - if(model.temperature != initial(model.temperature) || model.temperature != initial(model_parent.temperature)) - set_temperature(model.temperature) - return 1 /datum/gas_mixture/parse_gas_string(gas_string) - gas_string = SSair.preprocess_gas_string(gas_string) - var/list/gas = params2list(gas_string) if(gas["TEMP"]) - set_temperature(text2num(gas["TEMP"])) + var/temp = text2num(gas["TEMP"]) gas -= "TEMP" + if(!isnum(temp) || temp < 2.7) + temp = 2.7 + set_temperature(temp) clear() for(var/id in gas) - var/path = id - if(!ispath(path)) - path = gas_id2path(path) //a lot of these strings can't have embedded expressions (especially for mappers), so support for IDs needs to stick around - set_moles(path, text2num(gas[id])) + set_moles(id, text2num(gas[id])) return 1 -/datum/gas_mixture/react(datum/holder) - . = NO_REACTION - var/list/reactions = list() - for(var/I in get_gases()) - reactions += SSair.gas_reactions[I] - if(!length(reactions)) - return - reaction_results = new - var/temp = return_temperature() - var/ener = thermal_energy() - - reaction_loop: - for(var/r in reactions) - var/datum/gas_reaction/reaction = r - - var/list/min_reqs = reaction.min_requirements - if((min_reqs["TEMP"] && temp < min_reqs["TEMP"]) \ - || (min_reqs["ENER"] && ener < min_reqs["ENER"])) - continue - - for(var/id in min_reqs) - if (id == "TEMP" || id == "ENER") - continue - if(get_moles(id) < min_reqs[id]) - continue reaction_loop - - //at this point, all requirements for the reaction are satisfied. we can now react() - - . |= reaction.react(src, holder) - if (. & STOP_REACTIONS) - break - -//Takes the amount of the gas you want to PP as an argument -//So I don't have to do some hacky switches/defines/magic strings -//eg: -//Tox_PP = get_partial_pressure(gas_mixture.toxins) -//O2_PP = get_partial_pressure(gas_mixture.oxygen) - -/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure) - return (gas_pressure * R_IDEAL_GAS_EQUATION * return_temperature()) / BREATH_VOLUME -//inverse -/datum/gas_mixture/proc/get_true_breath_pressure(partial_pressure) - return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * return_temperature()) +/datum/gas_mixture/proc/set_analyzer_results(instability) + if(!analyzer_results) + analyzer_results = new + analyzer_results["fusion"] = instability //Mathematical proofs: /* @@ -223,3 +276,26 @@ get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles() */ /datum/gas_mixture/turf + +/// Releases gas from src to output air. This means that it can not transfer air to gas mixture with higher pressure. +/datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure) + var/output_starting_pressure = output_air.return_pressure() + var/input_starting_pressure = return_pressure() + + if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10)) + //No need to pump gas if target is already reached or input pressure is too low + //Need at least 10 kPa difference to overcome friction in the mechanism + return FALSE + + //Calculate necessary moles to transfer using PV = nRT + if((total_moles() > 0) && (return_temperature()>0)) + var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2) + //Can not have a pressure delta that would cause output_pressure > input_pressure + + var/transfer_moles = pressure_delta*output_air.return_volume()/(return_temperature() * R_IDEAL_GAS_EQUATION) + + //Actually transfer the gas + var/datum/gas_mixture/removed = remove(transfer_moles) + output_air.merge(removed) + return TRUE + return FALSE \ No newline at end of file diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm deleted file mode 100644 index 839b234ed2220..0000000000000 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ /dev/null @@ -1,176 +0,0 @@ -GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/carbon_dioxide, /datum/gas/plasma)) //the main four gases, which were at one time hardcoded -GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/carbon_dioxide, /datum/gas/pluoxium, /datum/gas/stimulum, /datum/gas/nitryl))) //unable to react amongst themselves - -/proc/meta_gas_list() - . = subtypesof(/datum/gas) - for(var/gas_path in .) - var/list/gas_info = new(7) - var/datum/gas/gas = gas_path - - gas_info[META_GAS_SPECIFIC_HEAT] = initial(gas.specific_heat) - gas_info[META_GAS_NAME] = initial(gas.name) - - gas_info[META_GAS_MOLES_VISIBLE] = initial(gas.moles_visible) - if(initial(gas.moles_visible) != null) - gas_info[META_GAS_OVERLAY] = new /list(FACTOR_GAS_VISIBLE_MAX) - for(var/i in 1 to FACTOR_GAS_VISIBLE_MAX) - gas_info[META_GAS_OVERLAY][i] = new /obj/effect/overlay/gas(initial(gas.gas_overlay), i * 255 / FACTOR_GAS_VISIBLE_MAX) - - gas_info[META_GAS_FUSION_POWER] = initial(gas.fusion_power) - gas_info[META_GAS_DANGER] = initial(gas.dangerous) - gas_info[META_GAS_ID] = initial(gas.id) - .[gas_path] = gas_info - -/proc/gas_id2path(id) - var/list/meta_gas = GLOB.meta_gas_info - if(id in meta_gas) - return id - for(var/path in meta_gas) - if(meta_gas[path][META_GAS_ID] == id) - return path - return "" - -/*||||||||||||||/----------\||||||||||||||*\ -||||||||||||||||[GAS DATUMS]|||||||||||||||| -||||||||||||||||\__________/|||||||||||||||| -||||These should never be instantiated. |||| -||||They exist only to make it easier |||| -||||to add a new gas. They are accessed |||| -||||only by meta_gas_list(). |||| -\*||||||||||||||||||||||||||||||||||||||||*/ - -/datum/gas - var/id = "" - var/specific_heat = 0 - var/name = "" - var/gas_overlay = "" //icon_state in icons/effects/atmospherics.dmi - var/moles_visible = null - var/dangerous = FALSE //currently used by canisters - var/fusion_power = 0 //How much the gas accelerates a fusion reaction - var/rarity = 0 // relative rarity compared to other gases, used when setting up the reactions list. - -// If you add or remove gases, update TOTAL_NUM_GASES in the extools code to match! Extools currently expects 14 gas types to exist. - -/datum/gas/oxygen - id = "o2" - specific_heat = 20 - name = "Oxygen" - rarity = 900 - -/datum/gas/nitrogen - id = "n2" - specific_heat = 20 - name = "Nitrogen" - rarity = 1000 - -/datum/gas/carbon_dioxide //what the fuck is this? - id = "co2" - specific_heat = 30 - name = "Carbon Dioxide" - rarity = 700 - -/datum/gas/plasma - id = "plasma" - specific_heat = 200 - name = "Plasma" - gas_overlay = "plasma" - moles_visible = MOLES_GAS_VISIBLE - dangerous = TRUE - rarity = 800 - -/datum/gas/water_vapor - id = "water_vapor" - specific_heat = 40 - name = "Water Vapor" - gas_overlay = "water_vapor" - moles_visible = MOLES_GAS_VISIBLE - fusion_power = 8 - rarity = 500 - -/datum/gas/hypernoblium - id = "nob" - specific_heat = 2000 - name = "Hyper-noblium" - gas_overlay = "freon" - moles_visible = MOLES_GAS_VISIBLE - dangerous = TRUE - rarity = 50 - -/datum/gas/nitrous_oxide - id = "n2o" - specific_heat = 40 - name = "Nitrous Oxide" - gas_overlay = "nitrous_oxide" - moles_visible = MOLES_GAS_VISIBLE * 2 - fusion_power = 10 - dangerous = TRUE - rarity = 600 - -/datum/gas/nitryl - id = "no2" - specific_heat = 20 - name = "Nitryl" - gas_overlay = "nitryl" - moles_visible = MOLES_GAS_VISIBLE - dangerous = TRUE - fusion_power = 16 - rarity = 100 - -/datum/gas/tritium - id = "tritium" - specific_heat = 10 - name = "Tritium" - gas_overlay = "tritium" - moles_visible = MOLES_GAS_VISIBLE - dangerous = TRUE - fusion_power = 1 - rarity = 300 - -/datum/gas/bz - id = "bz" - specific_heat = 20 - name = "BZ" - dangerous = TRUE - fusion_power = 8 - rarity = 400 - -/datum/gas/stimulum - id = "stim" - specific_heat = 5 - name = "Stimulum" - fusion_power = 7 - rarity = 1 - -/datum/gas/pluoxium - id = "pluox" - specific_heat = 80 - name = "Pluoxium" - fusion_power = -10 - rarity = 200 - -/datum/gas/miasma - id = "miasma" - specific_heat = 20 - name = "Miasma" - gas_overlay = "miasma" - moles_visible = MOLES_GAS_VISIBLE * 60 - rarity = 250 - -/datum/gas/unobtanium //C++ monstermos expects 14 gas types to exist, we only had 13 - id = "unobtanium" - specific_heat = 20 - name = "Unobtanium" - rarity = 2500 - -/obj/effect/overlay/gas - icon = 'icons/effects/atmospherics.dmi' - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - anchored = TRUE // should only appear in vis_contents, but to be safe - layer = FLY_LAYER - appearance_flags = TILE_BOUND - vis_flags = NONE - -/obj/effect/overlay/gas/New(state, alph) - . = ..() - icon_state = state - alpha = alph diff --git a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm index 2f1a10e2756ab..7de056ed0261b 100644 --- a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm +++ b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm @@ -25,4 +25,4 @@ initial_temperature = T20C /datum/gas_mixture/immutable/cloner/populate() - set_moles(/datum/gas/nitrogen, MOLES_O2STANDARD + MOLES_N2STANDARD) + set_moles(GAS_N2, MOLES_O2STANDARD + MOLES_N2STANDARD) diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index a2ec4cc58e3e0..3f10e57a34190 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -2,22 +2,14 @@ /proc/init_gas_reactions() . = list() - for(var/type in subtypesof(/datum/gas)) - .[type] = list() for(var/r in subtypesof(/datum/gas_reaction)) var/datum/gas_reaction/reaction = r if(initial(reaction.exclude)) continue reaction = new r - var/datum/gas/reaction_key - for (var/req in reaction.min_requirements) - if (ispath(req)) - var/datum/gas/req_gas = req - if (!reaction_key || initial(reaction_key.rarity) > initial(req_gas.rarity)) - reaction_key = req_gas - .[reaction_key] += list(reaction) - sortTim(., /proc/cmp_gas_reactions, TRUE) + . += reaction + sortTim(., /proc/cmp_gas_reactions) /proc/cmp_gas_reactions(list/datum/gas_reaction/a, list/datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list if (!length(a) || !length(b)) @@ -36,7 +28,7 @@ //regarding the requirements lists: the minimum or maximum requirements must be non-zero. //when in doubt, use MINIMUM_MOLE_COUNT. var/list/min_requirements - var/major_gas //the highest rarity gas used in the reaction. + var/list/max_requirements var/exclude = FALSE //do it this way to allow for addition/removal of reactions midmatch in the future var/priority = 100 //lower numbers are checked/react later than higher numbers. if two reactions have the same priority they may happen in either order var/name = "reaction" @@ -56,7 +48,7 @@ id = "nobstop" /datum/gas_reaction/nobliumsupression/init_reqs() - min_requirements = list(/datum/gas/hypernoblium = REACTION_OPPRESSION_THRESHOLD) + min_requirements = list(GAS_HYPERNOB = REACTION_OPPRESSION_THRESHOLD) /datum/gas_reaction/nobliumsupression/react() return STOP_REACTIONS @@ -68,7 +60,7 @@ id = "vapor" /datum/gas_reaction/water_vapor/init_reqs() - min_requirements = list(/datum/gas/water_vapor = MOLES_GAS_VISIBLE) + min_requirements = list(GAS_H2O = MOLES_GAS_VISIBLE) /datum/gas_reaction/water_vapor/react(datum/gas_mixture/air, datum/holder) var/turf/open/location = isturf(holder) ? holder : null @@ -77,7 +69,7 @@ if(location && location.freon_gas_act()) . = REACTING else if(location && location.water_vapor_gas_act()) - air.adjust_moles(/datum/gas/water_vapor, -MOLES_GAS_VISIBLE) + air.adjust_moles(GAS_H2O, -MOLES_GAS_VISIBLE) . = REACTING //tritium combustion: combustion of oxygen and tritium (treated as hydrocarbons). creates hotspots. exothermic @@ -89,7 +81,7 @@ /datum/gas_reaction/nitrous_decomp/init_reqs() min_requirements = list( "TEMP" = N2O_DECOMPOSITION_MIN_ENERGY, - /datum/gas/nitrous_oxide = MINIMUM_MOLE_COUNT + GAS_NITROUS = MINIMUM_MOLE_COUNT ) /datum/gas_reaction/nitrous_decomp/react(datum/gas_mixture/air, datum/holder) @@ -99,14 +91,14 @@ var/burned_fuel = 0 - burned_fuel = max(0,0.00002*(temperature-(0.00001*(temperature**2))))*air.get_moles(/datum/gas/nitrous_oxide) - air.set_moles(/datum/gas/nitrous_oxide, air.get_moles(/datum/gas/nitrous_oxide) - burned_fuel) + burned_fuel = max(0,0.00002*(temperature-(0.00001*(temperature**2))))*air.get_moles(GAS_NITROUS) + air.set_moles(GAS_NITROUS, air.get_moles(GAS_NITROUS) - burned_fuel) if(burned_fuel) energy_released += (N2O_DECOMPOSITION_ENERGY_RELEASED * burned_fuel) - air.set_moles(/datum/gas/oxygen, air.get_moles(/datum/gas/oxygen) + burned_fuel/2) - air.set_moles(/datum/gas/nitrogen, air.get_moles(/datum/gas/nitrogen) + burned_fuel) + air.set_moles(GAS_O2, air.get_moles(GAS_O2) + burned_fuel/2) + air.set_moles(GAS_N2, air.get_moles(GAS_N2) + burned_fuel) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) @@ -123,10 +115,22 @@ /datum/gas_reaction/tritfire/init_reqs() min_requirements = list( "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST, - /datum/gas/tritium = MINIMUM_MOLE_COUNT, - /datum/gas/oxygen = MINIMUM_MOLE_COUNT + GAS_TRITIUM = MINIMUM_MOLE_COUNT, + GAS_O2 = MINIMUM_MOLE_COUNT ) +/proc/fire_expose(turf/open/location, datum/gas_mixture/air, temperature) + if(istype(location) && temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + location.hotspot_expose(temperature, CELL_VOLUME) + for(var/I in location) + var/atom/movable/item = I + item.temperature_expose(air, temperature, CELL_VOLUME) + location.temperature_expose(air, temperature, CELL_VOLUME) + +/proc/radiation_burn(turf/open/location, energy_released) + if(istype(location) && prob(10)) + radiation_pulse(location, energy_released/TRITIUM_BURN_RADIOACTIVITY_FACTOR) + /datum/gas_reaction/tritfire/react(datum/gas_mixture/air, datum/holder) var/energy_released = 0 var/old_heat_capacity = air.heat_capacity() @@ -135,15 +139,15 @@ cached_results["fire"] = 0 var/turf/open/location = isturf(holder) ? holder : null var/burned_fuel = 0 - var/initial_trit = air.get_moles(/datum/gas/tritium)// Yogs - if(air.get_moles(/datum/gas/oxygen) < initial_trit || MINIMUM_TRIT_OXYBURN_ENERGY > (temperature * old_heat_capacity))// Yogs -- Maybe a tiny performance boost? I'unno - burned_fuel = air.get_moles(/datum/gas/oxygen)/TRITIUM_BURN_OXY_FACTOR + var/initial_trit = air.get_moles(GAS_TRITIUM)// Yogs + if(air.get_moles(GAS_O2) < initial_trit || MINIMUM_TRIT_OXYBURN_ENERGY > (temperature * old_heat_capacity))// Yogs -- Maybe a tiny performance boost? I'unno + burned_fuel = air.get_moles(GAS_O2)/TRITIUM_BURN_OXY_FACTOR if(burned_fuel > initial_trit) burned_fuel = initial_trit //Yogs -- prevents negative moles of Tritium - air.adjust_moles(/datum/gas/tritium, -burned_fuel) + air.adjust_moles(GAS_TRITIUM, -burned_fuel) else burned_fuel = initial_trit // Yogs -- Conservation of Mass fix - air.set_moles(/datum/gas/tritium, air.get_moles(/datum/gas/tritium) * (1 - 1/TRITIUM_BURN_TRIT_FACTOR)) // Yogs -- Maybe a tiny performance boost? I'unno - air.adjust_moles(/datum/gas/oxygen, -air.get_moles(/datum/gas/tritium)) + air.set_moles(GAS_TRITIUM, air.get_moles(GAS_TRITIUM) * (1 - 1/TRITIUM_BURN_TRIT_FACTOR)) // Yogs -- Maybe a tiny performance boost? I'unno + air.adjust_moles(GAS_O2, -air.get_moles(GAS_TRITIUM)) energy_released += (FIRE_HYDROGEN_ENERGY_RELEASED * burned_fuel * (TRITIUM_BURN_TRIT_FACTOR - 1)) // Yogs -- Fixes low-energy tritium fires if(burned_fuel) @@ -152,7 +156,7 @@ radiation_pulse(location, energy_released/TRITIUM_BURN_RADIOACTIVITY_FACTOR) //oxygen+more-or-less hydrogen=H2O - air.adjust_moles(/datum/gas/water_vapor, burned_fuel )// Yogs -- Conservation of Mass + air.adjust_moles(GAS_H2O, burned_fuel )// Yogs -- Conservation of Mass cached_results["fire"] += burned_fuel @@ -182,8 +186,8 @@ /datum/gas_reaction/plasmafire/init_reqs() min_requirements = list( "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST, - /datum/gas/plasma = MINIMUM_MOLE_COUNT, - /datum/gas/oxygen = MINIMUM_MOLE_COUNT + GAS_PLASMA = MINIMUM_MOLE_COUNT, + GAS_O2 = MINIMUM_MOLE_COUNT ) /datum/gas_reaction/plasmafire/react(datum/gas_mixture/air, datum/holder) @@ -208,21 +212,21 @@ temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE) if(temperature_scale > 0) oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale - if(air.get_moles(/datum/gas/oxygen) / air.get_moles(/datum/gas/plasma) > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium. + if(air.get_moles(GAS_O2) / air.get_moles(GAS_PLASMA) > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium. super_saturation = TRUE - if(air.get_moles(/datum/gas/oxygen) > air.get_moles(/datum/gas/plasma)*PLASMA_OXYGEN_FULLBURN) - plasma_burn_rate = (air.get_moles(/datum/gas/plasma)*temperature_scale)/PLASMA_BURN_RATE_DELTA + if(air.get_moles(GAS_O2) > air.get_moles(GAS_PLASMA)*PLASMA_OXYGEN_FULLBURN) + plasma_burn_rate = (air.get_moles(GAS_PLASMA)*temperature_scale)/PLASMA_BURN_RATE_DELTA else - plasma_burn_rate = (temperature_scale*(air.get_moles(/datum/gas/oxygen)/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA + plasma_burn_rate = (temperature_scale*(air.get_moles(GAS_O2)/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY) - plasma_burn_rate = min(plasma_burn_rate,air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/oxygen)/oxygen_burn_rate) //Ensures matter is conserved properly - air.set_moles(/datum/gas/plasma, QUANTIZE(air.get_moles(/datum/gas/plasma) - plasma_burn_rate)) - air.set_moles(/datum/gas/oxygen, QUANTIZE(air.get_moles(/datum/gas/oxygen) - (plasma_burn_rate * oxygen_burn_rate))) + plasma_burn_rate = min(plasma_burn_rate,air.get_moles(GAS_PLASMA),air.get_moles(GAS_O2)/oxygen_burn_rate) //Ensures matter is conserved properly + air.set_moles(GAS_PLASMA, QUANTIZE(air.get_moles(GAS_PLASMA) - plasma_burn_rate)) + air.set_moles(GAS_O2, QUANTIZE(air.get_moles(GAS_O2) - (plasma_burn_rate * oxygen_burn_rate))) if (super_saturation) - air.adjust_moles(/datum/gas/tritium, plasma_burn_rate) + air.adjust_moles(GAS_TRITIUM, plasma_burn_rate) else - air.adjust_moles(/datum/gas/carbon_dioxide, plasma_burn_rate) + air.adjust_moles(GAS_CO2, plasma_burn_rate) energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate) @@ -245,6 +249,84 @@ return cached_results["fire"] ? REACTING : NO_REACTION +/datum/gas_reaction/genericfire + priority = -3 // very last reaction + name = "Combustion" + id = "genericfire" + +/datum/gas_reaction/genericfire/init_reqs() + var/lowest_fire_temp = INFINITY + var/list/fire_temperatures = GLOB.gas_data.fire_temperatures + for(var/gas in fire_temperatures) + lowest_fire_temp = min(lowest_fire_temp, fire_temperatures[gas]) + var/lowest_oxi_temp = INFINITY + var/list/oxidation_temperatures = GLOB.gas_data.oxidation_temperatures + for(var/gas in oxidation_temperatures) + lowest_oxi_temp = min(lowest_oxi_temp, oxidation_temperatures[gas]) + min_requirements = list( + "TEMP" = max(lowest_oxi_temp, lowest_fire_temp), + "FIRE_REAGENTS" = MINIMUM_MOLE_COUNT + ) + +// no requirements, always runs +// bad idea? maybe +// this is overridden by auxmos but, hey, good idea to have it readable + +/datum/gas_reaction/genericfire/react(datum/gas_mixture/air, datum/holder) + var/temperature = air.return_temperature() + var/list/oxidation_temps = GLOB.gas_data.oxidation_temperatures + var/list/oxidation_rates = GLOB.gas_data.oxidation_rates + var/oxidation_power = 0 + var/list/burn_results = list() + var/list/fuels = list() + var/list/oxidizers = list() + var/list/fuel_rates = GLOB.gas_data.fire_burn_rates + var/list/fuel_temps = GLOB.gas_data.fire_temperatures + var/total_fuel = 0 + var/energy_released = 0 + for(var/G in air.get_gases()) + var/oxidation_temp = oxidation_temps[G] + if(oxidation_temp && oxidation_temp > temperature) + var/temperature_scale = max(0, 1-(temperature / oxidation_temp)) + var/amt = air.get_moles(G) * temperature_scale + oxidizers[G] = amt + oxidation_power += amt * oxidation_rates[G] + else + var/fuel_temp = fuel_temps[G] + if(fuel_temp && fuel_temp > temperature) + var/amt = (air.get_moles(G) / fuel_rates[G]) * max(0, 1-(temperature / fuel_temp)) + fuels[G] = amt // we have to calculate the actual amount we're using after we get all oxidation together + total_fuel += amt + if(oxidation_power <= 0 || total_fuel <= 0) + return NO_REACTION + var/oxidation_ratio = oxidation_power / total_fuel + if(oxidation_ratio > 1) + for(var/oxidizer in oxidizers) + oxidizers[oxidizer] /= oxidation_ratio + else if(oxidation_ratio < 1) + for(var/fuel in fuels) + fuels[fuel] *= oxidation_ratio + fuels += oxidizers + var/list/fire_products = GLOB.gas_data.fire_products + var/list/fire_enthalpies = GLOB.gas_data.fire_enthalpies + for(var/fuel in fuels + oxidizers) + var/amt = fuels[fuel] + if(!burn_results[fuel]) + burn_results[fuel] = 0 + burn_results[fuel] -= amt + energy_released += amt * fire_enthalpies[fuel] + for(var/product in fire_products[fuel]) + if(!burn_results[product]) + burn_results[product] = 0 + burn_results[product] += amt + var/final_energy = air.thermal_energy() + energy_released + for(var/result in burn_results) + air.adjust_moles(result, burn_results[result]) + air.set_temperature(final_energy / air.heat_capacity()) + var/list/cached_results = air.reaction_results + cached_results["fire"] = min(total_fuel, oxidation_power) * 2 + return cached_results["fire"] ? REACTING : NO_REACTION + //fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again). Again! //Fusion Rework Counter: Please increment this if you make a major overhaul to this system again. //6 reworks @@ -258,9 +340,9 @@ /datum/gas_reaction/fusion/init_reqs() min_requirements = list( "TEMP" = FUSION_TEMPERATURE_THRESHOLD, - /datum/gas/tritium = FUSION_TRITIUM_MOLES_USED, - /datum/gas/plasma = FUSION_MOLE_THRESHOLD, - /datum/gas/carbon_dioxide = FUSION_MOLE_THRESHOLD) + GAS_TRITIUM = FUSION_TRITIUM_MOLES_USED, + GAS_PLASMA = FUSION_MOLE_THRESHOLD, + GAS_CO2 = FUSION_MOLE_THRESHOLD) /datum/gas_reaction/fusion/react(datum/gas_mixture/air, datum/holder) var/turf/open/location @@ -272,16 +354,21 @@ if(!air.analyzer_results) air.analyzer_results = new var/list/cached_scan_results = air.analyzer_results - var/old_thermal_energy = air.thermal_energy() + var/thermal_energy = air.thermal_energy() var/reaction_energy = 0 //Reaction energy can be negative or positive, for both exothermic and endothermic reactions. - var/initial_plasma = air.get_moles(/datum/gas/plasma) - var/initial_carbon = air.get_moles(/datum/gas/carbon_dioxide) - var/scale_factor = (air.return_volume())/(PI) //We scale it down by volume/Pi because for fusion conditions, moles roughly = 2*volume, but we want it to be based off something constant between reactions. - var/toroidal_size = (2*PI)+TORADIANS(arctan((air.return_volume()-TOROID_VOLUME_BREAKEVEN)/TOROID_VOLUME_BREAKEVEN)) //The size of the phase space hypertorus + var/initial_plasma = air.get_moles(GAS_PLASMA) + var/initial_carbon = air.get_moles(GAS_CO2) + var/scale_factor = max(air.return_volume() / FUSION_SCALE_DIVISOR, FUSION_MINIMAL_SCALE) + var/temperature_scale = log(10, air.return_temperature()) + //The size of the phase space hypertorus + var/toroidal_size = TOROID_CALCULATED_THRESHOLD \ + + (temperature_scale <= FUSION_BASE_TEMPSCALE ? \ + (temperature_scale-FUSION_BASE_TEMPSCALE) / FUSION_BUFFER_DIVISOR \ + : 4 ** (temperature_scale-FUSION_BASE_TEMPSCALE) / FUSION_SLOPE_DIVISOR) var/gas_power = 0 for (var/gas_id in air.get_gases()) - gas_power += (GLOB.meta_gas_info[gas_id][META_GAS_FUSION_POWER]*air.get_moles(gas_id)) - var/instability = MODULUS((gas_power*INSTABILITY_GAS_POWER_FACTOR)**2,toroidal_size) //Instability effects how chaotic the behavior of the reaction is + gas_power += (GLOB.gas_data.fusion_powers[gas_id]*air.get_moles(gas_id)) + var/instability = MODULUS((gas_power*INSTABILITY_GAS_POWER_FACTOR),toroidal_size) //Instability effects how chaotic the behavior of the reaction is cached_scan_results[id] = instability//used for analyzer feedback var/plasma = (initial_plasma-FUSION_MOLE_THRESHOLD)/(scale_factor) //We have to scale the amounts of carbon and plasma down a significant amount in order to show the chaotic dynamics we want @@ -291,41 +378,49 @@ plasma = MODULUS(plasma - (instability*sin(TODEGREES(carbon))), toroidal_size) carbon = MODULUS(carbon - plasma, toroidal_size) + air.set_moles(GAS_PLASMA, plasma*scale_factor + FUSION_MOLE_THRESHOLD )//Scales the gases back up + air.set_moles(GAS_CO2, carbon*scale_factor + FUSION_MOLE_THRESHOLD) + var/delta_plasma = min(initial_plasma - air.get_moles(GAS_PLASMA), toroidal_size * scale_factor * 1.5) - air.set_moles(/datum/gas/plasma, plasma*scale_factor + FUSION_MOLE_THRESHOLD )//Scales the gases back up - air.set_moles(/datum/gas/carbon_dioxide, carbon*scale_factor + FUSION_MOLE_THRESHOLD) - var/delta_plasma = initial_plasma - air.get_moles(/datum/gas/plasma) + //Energy is gained or lost corresponding to the creation or destruction of mass. + //Low instability prevents endothermality while higher instability acutally encourages it. + reaction_energy = instability <= FUSION_INSTABILITY_ENDOTHERMALITY || delta_plasma > 0 ? \ + max(delta_plasma*PLASMA_BINDING_ENERGY, 0) \ + : delta_plasma*PLASMA_BINDING_ENERGY * (instability-FUSION_INSTABILITY_ENDOTHERMALITY)**0.5 - reaction_energy += delta_plasma*PLASMA_BINDING_ENERGY //Energy is gained or lost corresponding to the creation or destruction of mass. - if(instability < FUSION_INSTABILITY_ENDOTHERMALITY) - reaction_energy = max(reaction_energy,0) //Stable reactions don't end up endothermic. - else if (reaction_energy < 0) - reaction_energy *= (instability-FUSION_INSTABILITY_ENDOTHERMALITY)**0.5 + //To achieve faster equilibrium. Too bad it is not that good at cooling down. + if (reaction_energy) + var/middle_energy = (((TOROID_CALCULATED_THRESHOLD / 2) * scale_factor) + FUSION_MOLE_THRESHOLD) * (200 * FUSION_MIDDLE_ENERGY_REFERENCE) + thermal_energy = middle_energy * FUSION_ENERGY_TRANSLATION_EXPONENT ** log(10, thermal_energy / middle_energy) + + //This bowdlerization is a double-edged sword. Tread with care! + var/bowdlerized_reaction_energy = clamp(reaction_energy, \ + thermal_energy * ((1 / FUSION_ENERGY_TRANSLATION_EXPONENT ** 2) - 1), \ + thermal_energy * (FUSION_ENERGY_TRANSLATION_EXPONENT ** 2 - 1)) + thermal_energy = middle_energy * 10 ** log(FUSION_ENERGY_TRANSLATION_EXPONENT, (thermal_energy + bowdlerized_reaction_energy) / middle_energy) + + //The reason why you should set up a tritium production line. + air.adjust_moles(GAS_TRITIUM, -FUSION_TRITIUM_MOLES_USED) - if(old_thermal_energy + reaction_energy < 0) //No using energy that doesn't exist. - air.set_moles(/datum/gas/plasma, initial_plasma) - air.set_moles(/datum/gas/carbon_dioxide, initial_carbon) - return NO_REACTION - air.adjust_moles(/datum/gas/tritium, -FUSION_TRITIUM_MOLES_USED) //The decay of the tritium and the reaction's energy produces waste gases, different ones depending on whether the reaction is endo or exothermic - if(reaction_energy > 0) - air.adjust_moles(/datum/gas/oxygen, FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT)) - air.adjust_moles(/datum/gas/nitrous_oxide, FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT)) - else - air.adjust_moles(/datum/gas/bz, FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT)) - air.adjust_moles(/datum/gas/nitryl, FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT)) + var/standard_waste_gas_output = scale_factor * (FUSION_TRITIUM_CONVERSION_COEFFICIENT*FUSION_TRITIUM_MOLES_USED) + delta_plasma > 0 ? air.adjust_moles(GAS_H2O, standard_waste_gas_output) : air.adjust_moles(GAS_BZ, standard_waste_gas_output) + air.adjust_moles(GAS_O2, standard_waste_gas_output) //Oxygen is a bit touchy subject if(reaction_energy) if(location) - var/particle_chance = ((PARTICLE_CHANCE_CONSTANT)/(reaction_energy-PARTICLE_CHANCE_CONSTANT)) + 1//Asymptopically approaches 100% as the energy of the reaction goes up. - if(prob(PERCENT(particle_chance))) - location.fire_nuclear_particle() - var/rad_power = max((FUSION_RAD_COEFFICIENT/instability) + FUSION_RAD_MAX,0) - radiation_pulse(location,rad_power) - + var/standard_energy = 400 * air.get_moles(GAS_PLASMA) * air.return_temperature() //Prevents putting meaningless waste gases to achieve high rads. + if(prob(PERCENT(((PARTICLE_CHANCE_CONSTANT)/(reaction_energy-PARTICLE_CHANCE_CONSTANT)) + 1))) //Asymptopically approaches 100% as the energy of the reaction goes up. + location.fire_nuclear_particle(customize = TRUE, custompower = standard_energy) + radiation_pulse(location, max(2000 * 3 ** (log(10,standard_energy) - FUSION_RAD_MIDPOINT), 0)) + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.set_temperature(clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY)) + return REACTING + else if(reaction_energy == 0 && instability <= FUSION_INSTABILITY_ENDOTHERMALITY) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(CLAMP(((old_thermal_energy + reaction_energy)/new_heat_capacity),TCMB,INFINITY)) + air.set_temperature(clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY)) //THIS SHOULD STAY OR FUSION WILL EAT YOUR FACE return REACTING /datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst. @@ -335,9 +430,9 @@ /datum/gas_reaction/nitrylformation/init_reqs() min_requirements = list( - /datum/gas/oxygen = 20, - /datum/gas/nitrogen = 20, - /datum/gas/pluoxium = 5, //Gates Nitryl behind pluoxium to offset N2O burning up during formation + GAS_O2 = 20, + GAS_N2 = 20, + GAS_PLUOXIUM = 5, //Gates Nitryl behind pluoxium to offset N2O burning up during formation "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*60 ) @@ -345,13 +440,13 @@ var/temperature = air.return_temperature() var/old_heat_capacity = air.heat_capacity() - var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*60),air.get_moles(/datum/gas/oxygen),air.get_moles(/datum/gas/nitrogen)) + var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*60),air.get_moles(GAS_O2),air.get_moles(GAS_N2)) var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY - if ((air.get_moles(/datum/gas/oxygen) - heat_efficency < 0 )|| (air.get_moles(/datum/gas/nitrogen) - heat_efficency < 0)) //Shouldn't produce gas from nothing. + if ((air.get_moles(GAS_O2) - heat_efficency < 0 )|| (air.get_moles(GAS_N2) - heat_efficency < 0)) //Shouldn't produce gas from nothing. return NO_REACTION - air.adjust_moles(/datum/gas/oxygen, -heat_efficency) - air.adjust_moles(/datum/gas/nitrogen, -heat_efficency) - air.adjust_moles(/datum/gas/nitryl, heat_efficency*2) + air.adjust_moles(GAS_O2, -heat_efficency) + air.adjust_moles(GAS_N2, -heat_efficency) + air.adjust_moles(GAS_NITRYL, heat_efficency*2) if(energy_used > 0) var/new_heat_capacity = air.heat_capacity() @@ -366,8 +461,8 @@ /datum/gas_reaction/bzformation/init_reqs() min_requirements = list( - /datum/gas/nitrous_oxide = 10, - /datum/gas/plasma = 10 + GAS_NITROUS = 10, + GAS_PLASMA = 10 ) @@ -375,18 +470,18 @@ var/temperature = air.return_temperature() var/pressure = air.return_pressure() var/old_heat_capacity = air.heat_capacity() - var/reaction_efficency = min(1/((pressure/(0.5*ONE_ATMOSPHERE))*(max(air.get_moles(/datum/gas/plasma)/air.get_moles(/datum/gas/nitrous_oxide),1))),air.get_moles(/datum/gas/nitrous_oxide),air.get_moles(/datum/gas/plasma)/2) + var/reaction_efficency = min(1/((pressure/(0.5*ONE_ATMOSPHERE))*(max(air.get_moles(GAS_PLASMA)/air.get_moles(GAS_NITROUS),1))),air.get_moles(GAS_NITROUS),air.get_moles(GAS_PLASMA)/2) var/energy_released = 2*reaction_efficency*FIRE_CARBON_ENERGY_RELEASED - if ((air.get_moles(/datum/gas/nitrous_oxide) - reaction_efficency < 0 )|| (air.get_moles(/datum/gas/plasma) - (2*reaction_efficency) < 0) || energy_released <= 0) //Shouldn't produce gas from nothing. + if ((air.get_moles(GAS_NITROUS) - reaction_efficency < 0 )|| (air.get_moles(GAS_PLASMA) - (2*reaction_efficency) < 0) || energy_released <= 0) //Shouldn't produce gas from nothing. return NO_REACTION - air.adjust_moles(/datum/gas/bz, reaction_efficency) - if(reaction_efficency == air.get_moles(/datum/gas/nitrous_oxide)) - air.adjust_moles(/datum/gas/bz, -min(pressure,1)) - air.adjust_moles(/datum/gas/oxygen, min(pressure,1)) - air.adjust_moles(/datum/gas/nitrous_oxide, -reaction_efficency) - air.adjust_moles(/datum/gas/plasma, -2*reaction_efficency) + air.adjust_moles(GAS_BZ, reaction_efficency) + if(reaction_efficency == air.get_moles(GAS_NITROUS)) + air.adjust_moles(GAS_BZ, -min(pressure,1)) + air.adjust_moles(GAS_O2, min(pressure,1)) + air.adjust_moles(GAS_NITROUS, -reaction_efficency) + air.adjust_moles(GAS_PLASMA, -2*reaction_efficency) - SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min((reaction_efficency**2)*BZ_RESEARCH_SCALE),BZ_RESEARCH_MAX_AMOUNT) + SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min((reaction_efficency**2)*BZ_RESEARCH_SCALE,BZ_RESEARCH_MAX_AMOUNT)) if(energy_released > 0) var/new_heat_capacity = air.heat_capacity() @@ -401,24 +496,24 @@ /datum/gas_reaction/stimformation/init_reqs() min_requirements = list( - /datum/gas/tritium = 30, - /datum/gas/plasma = 10, - /datum/gas/bz = 20, - /datum/gas/nitryl = 30, + GAS_TRITIUM = 30, + GAS_PLASMA = 10, + GAS_BZ = 20, + GAS_NITRYL = 30, "TEMP" = STIMULUM_HEAT_SCALE/2) /datum/gas_reaction/stimformation/react(datum/gas_mixture/air) var/old_heat_capacity = air.heat_capacity() - var/heat_scale = min(air.return_temperature()/STIMULUM_HEAT_SCALE,air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/nitryl)) + var/heat_scale = min(air.return_temperature()/STIMULUM_HEAT_SCALE,air.get_moles(GAS_PLASMA),air.get_moles(GAS_NITRYL)) var/stim_energy_change = heat_scale + STIMULUM_FIRST_RISE*(heat_scale**2) - STIMULUM_FIRST_DROP*(heat_scale**3) + STIMULUM_SECOND_RISE*(heat_scale**4) - STIMULUM_ABSOLUTE_DROP*(heat_scale**5) - if ((air.get_moles(/datum/gas/plasma) - heat_scale < 0) || (air.get_moles(/datum/gas/nitryl) - heat_scale < 0) || (air.get_moles(/datum/gas/tritium) - heat_scale < 0)) //Shouldn't produce gas from nothing. + if ((air.get_moles(GAS_PLASMA) - heat_scale < 0) || (air.get_moles(GAS_NITRYL) - heat_scale < 0) || (air.get_moles(GAS_TRITIUM) - heat_scale < 0)) //Shouldn't produce gas from nothing. return NO_REACTION - air.adjust_moles(/datum/gas/stimulum, heat_scale/10) - air.adjust_moles(/datum/gas/plasma, -heat_scale) - air.adjust_moles(/datum/gas/nitryl, -heat_scale) - air.adjust_moles(/datum/gas/tritium, -heat_scale) + air.adjust_moles(GAS_STIMULUM, heat_scale/10) + air.adjust_moles(GAS_PLASMA, -heat_scale) + air.adjust_moles(GAS_NITRYL, -heat_scale) + air.adjust_moles(GAS_TRITIUM, -heat_scale) SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, STIMULUM_RESEARCH_AMOUNT*max(stim_energy_change,0)) if(stim_energy_change) var/new_heat_capacity = air.heat_capacity() @@ -433,19 +528,19 @@ /datum/gas_reaction/nobliumformation/init_reqs() min_requirements = list( - /datum/gas/nitrogen = 10, - /datum/gas/tritium = 5, + GAS_N2 = 10, + GAS_TRITIUM = 5, "TEMP" = 5000000) /datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air) var/old_heat_capacity = air.heat_capacity() - var/nob_formed = min((air.get_moles(/datum/gas/nitrogen)+air.get_moles(/datum/gas/tritium))/100,air.get_moles(/datum/gas/tritium)/10,air.get_moles(/datum/gas/nitrogen)/20) - var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(air.get_moles(/datum/gas/bz),1))) - if ((air.get_moles(/datum/gas/tritium) - 10*nob_formed < 0) || (air.get_moles(/datum/gas/nitrogen) - 20*nob_formed < 0)) + var/nob_formed = min((air.get_moles(GAS_N2)+air.get_moles(GAS_TRITIUM))/100,air.get_moles(GAS_TRITIUM)/10,air.get_moles(GAS_N2)/20) + var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(air.get_moles(GAS_BZ),1))) + if ((air.get_moles(GAS_TRITIUM) - 10*nob_formed < 0) || (air.get_moles(GAS_N2) - 20*nob_formed < 0)) return NO_REACTION - air.adjust_moles(/datum/gas/tritium, -10*nob_formed) - air.adjust_moles(/datum/gas/nitrogen, -20*nob_formed) - air.adjust_moles(/datum/gas/hypernoblium, nob_formed) + air.adjust_moles(GAS_TRITIUM, -10*nob_formed) + air.adjust_moles(GAS_N2, -20*nob_formed) + air.adjust_moles(GAS_HYPERNOB, nob_formed) SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, nob_formed*NOBLIUM_RESEARCH_AMOUNT) if (nob_formed) @@ -462,18 +557,18 @@ /datum/gas_reaction/miaster/init_reqs() min_requirements = list( "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST+70, - /datum/gas/miasma = MINIMUM_MOLE_COUNT + GAS_MIASMA = MINIMUM_MOLE_COUNT ) /datum/gas_reaction/miaster/react(datum/gas_mixture/air, datum/holder) // As the name says it, it needs to be dry - if(air.get_moles(/datum/gas/water_vapor)/air.total_moles() > 0.1) + if(air.get_moles(GAS_H2O)/air.total_moles() > 0.1) return //Replace miasma with oxygen - var/cleaned_air = min(air.get_moles(/datum/gas/miasma), 20 + (air.return_temperature() - FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 70) / 20) - air.adjust_moles(/datum/gas/miasma, -cleaned_air) - air.adjust_moles(/datum/gas/oxygen, cleaned_air) + var/cleaned_air = min(air.get_moles(GAS_MIASMA), 20 + (air.return_temperature() - FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 70) / 20) + air.adjust_moles(GAS_MIASMA, -cleaned_air) + air.adjust_moles(GAS_O2, cleaned_air) //Possibly burning a bit of organic matter through maillard reaction, so a *tiny* bit more heat would be understandable air.set_temperature(air.return_temperature() + cleaned_air * 0.002) @@ -486,10 +581,10 @@ /datum/gas_reaction/stim_ball/init_reqs() min_requirements = list( - /datum/gas/pluoxium = STIM_BALL_GAS_AMOUNT, - /datum/gas/stimulum = STIM_BALL_GAS_AMOUNT, - /datum/gas/nitryl = MINIMUM_MOLE_COUNT, - /datum/gas/plasma = MINIMUM_MOLE_COUNT, + GAS_PLUOXIUM = STIM_BALL_GAS_AMOUNT, + GAS_STIMULUM = STIM_BALL_GAS_AMOUNT, + GAS_NITRYL = MINIMUM_MOLE_COUNT, + GAS_PLASMA = MINIMUM_MOLE_COUNT, "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST ) @@ -501,16 +596,16 @@ location = get_turf(pick(pipenet.members)) else location = get_turf(holder) - var/ball_shot_angle = 180*cos(air.get_moles(/datum/gas/water_vapor)/air.get_moles(/datum/gas/nitryl))+180 - var/stim_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/stimulum)) - var/pluox_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/pluoxium)) + var/ball_shot_angle = 180*cos(air.get_moles(GAS_H2O)/air.get_moles(GAS_NITRYL))+180 + var/stim_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_STIMULUM)) + var/pluox_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_PLUOXIUM)) var/energy_released = stim_used*STIMULUM_HEAT_SCALE//Stimulum has a lot of stored energy, and breaking it up releases some of it location.fire_nuclear_particle(ball_shot_angle) - air.adjust_moles(/datum/gas/carbon_dioxide, 4*pluox_used) - air.adjust_moles(/datum/gas/nitrogen, 8*stim_used) - air.adjust_moles(/datum/gas/pluoxium, -pluox_used) - air.adjust_moles(/datum/gas/stimulum, -stim_used) - air.adjust_moles(/datum/gas/plasma, -air.get_moles(/datum/gas/plasma)/2) + air.adjust_moles(GAS_CO2, 4*pluox_used) + air.adjust_moles(GAS_N2, 8*stim_used) + air.adjust_moles(GAS_PLUOXIUM, -pluox_used) + air.adjust_moles(GAS_STIMULUM, -stim_used) + air.adjust_moles(GAS_PLASMA, max(-air.get_moles(GAS_PLASMA)/2,-30)) if(energy_released) 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 b1034564bf793..d6afb607a71f8 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -69,9 +69,9 @@ req_access = list(ACCESS_ATMOSPHERICS) max_integrity = 250 integrity_failure = 80 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30, "stamina" = 0) resistance_flags = FIRE_PROOF - + layer = ABOVE_WINDOW_LAYER var/danger_level = 0 @@ -89,57 +89,57 @@ var/list/TLV = list( // Breathable air. "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa. Values are min2, min1, max1, max2 "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), - /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa - /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), - /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), - /datum/gas/miasma = new/datum/tlv/(-1, -1, 15, 30), - /datum/gas/plasma = new/datum/tlv/dangerous, - /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, - /datum/gas/bz = new/datum/tlv/dangerous, - /datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic - /datum/gas/water_vapor = new/datum/tlv/dangerous, - /datum/gas/tritium = new/datum/tlv/dangerous, - /datum/gas/stimulum = new/datum/tlv/dangerous, - /datum/gas/nitryl = new/datum/tlv/dangerous, - /datum/gas/pluoxium = new/datum/tlv(-1, -1, 1000, 1000) // Unlike oxygen, pluoxium does not fuel plasma/tritium fires + GAS_O2 = new/datum/tlv(16, 19, 40, 50), // Partial pressure, kpa + GAS_N2 = new/datum/tlv(-1, -1, 1000, 1000), + GAS_CO2 = new/datum/tlv(-1, -1, 5, 10), + GAS_MIASMA = new/datum/tlv/(-1, -1, 15, 30), + GAS_PLASMA = new/datum/tlv/dangerous, + GAS_NITROUS = new/datum/tlv/dangerous, + GAS_BZ = new/datum/tlv/dangerous, + GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic + GAS_H2O = new/datum/tlv/dangerous, + GAS_TRITIUM = new/datum/tlv/dangerous, + GAS_STIMULUM = new/datum/tlv/dangerous, + GAS_NITRYL = new/datum/tlv/dangerous, + GAS_PLUOXIUM = new/datum/tlv(-1, -1, 5, 6), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires ) /obj/machinery/airalarm/server // No checks here. TLV = list( "pressure" = new/datum/tlv/no_checks, "temperature" = new/datum/tlv/no_checks, - /datum/gas/oxygen = new/datum/tlv/no_checks, - /datum/gas/nitrogen = new/datum/tlv/no_checks, - /datum/gas/carbon_dioxide = new/datum/tlv/no_checks, - /datum/gas/miasma = new/datum/tlv/no_checks, - /datum/gas/plasma = new/datum/tlv/no_checks, - /datum/gas/nitrous_oxide = new/datum/tlv/no_checks, - /datum/gas/bz = new/datum/tlv/no_checks, - /datum/gas/hypernoblium = new/datum/tlv/no_checks, - /datum/gas/water_vapor = new/datum/tlv/no_checks, - /datum/gas/tritium = new/datum/tlv/no_checks, - /datum/gas/stimulum = new/datum/tlv/no_checks, - /datum/gas/nitryl = new/datum/tlv/no_checks, - /datum/gas/pluoxium = new/datum/tlv/no_checks + GAS_O2 = new/datum/tlv/no_checks, + GAS_N2 = new/datum/tlv/no_checks, + GAS_CO2 = new/datum/tlv/no_checks, + GAS_MIASMA = new/datum/tlv/no_checks, + GAS_PLASMA = new/datum/tlv/no_checks, + GAS_NITROUS = new/datum/tlv/no_checks, + GAS_BZ = new/datum/tlv/no_checks, + GAS_HYPERNOB = new/datum/tlv/no_checks, + GAS_H2O = new/datum/tlv/no_checks, + GAS_TRITIUM = new/datum/tlv/no_checks, + GAS_STIMULUM = new/datum/tlv/no_checks, + GAS_NITRYL = new/datum/tlv/no_checks, + GAS_PLUOXIUM = new/datum/tlv/no_checks ) /obj/machinery/airalarm/kitchen_cold_room // Kitchen cold rooms start off at -20°C or 253.15°K. TLV = list( "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa "temperature" = new/datum/tlv(T0C-273.15, T0C-80, T0C-10, T0C+10), - /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa - /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), - /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), - /datum/gas/miasma = new/datum/tlv/(-1, -1, 2, 5), - /datum/gas/plasma = new/datum/tlv/dangerous, - /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, - /datum/gas/bz = new/datum/tlv/dangerous, - /datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic - /datum/gas/water_vapor = new/datum/tlv/dangerous, - /datum/gas/tritium = new/datum/tlv/dangerous, - /datum/gas/stimulum = new/datum/tlv/dangerous, - /datum/gas/nitryl = new/datum/tlv/dangerous, - /datum/gas/pluoxium = new/datum/tlv(-1, -1, 1000, 1000) // Unlike oxygen, pluoxium does not fuel plasma/tritium fires + GAS_O2 = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa + GAS_N2 = new/datum/tlv(-1, -1, 1000, 1000), + GAS_CO2 = new/datum/tlv(-1, -1, 5, 10), + GAS_MIASMA = new/datum/tlv/(-1, -1, 2, 5), + GAS_PLASMA = new/datum/tlv/dangerous, + GAS_NITROUS = new/datum/tlv/dangerous, + GAS_BZ = new/datum/tlv/dangerous, + GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic + GAS_H2O = new/datum/tlv/dangerous, + GAS_TRITIUM = new/datum/tlv/dangerous, + GAS_STIMULUM = new/datum/tlv/dangerous, + GAS_NITRYL = new/datum/tlv/dangerous, + GAS_PLUOXIUM = new/datum/tlv(-1, -1, 1000, 1000) // Unlike oxygen, pluoxium does not fuel plasma/tritium fires ) /obj/machinery/airalarm/unlocked @@ -214,11 +214,15 @@ SSradio.remove_object(src, frequency) qdel(wires) wires = null + var/area/ourarea = get_area(src) + ourarea.atmosalert(FALSE, src) + GLOB.zclear_atoms -= src return ..() /obj/machinery/airalarm/Initialize(mapload) . = ..() set_frequency(frequency) + GLOB.zclear_atoms += src /obj/machinery/airalarm/examine(mob/user) . = ..() @@ -246,7 +250,9 @@ if(!ui) ui = new(user, src, "AirAlarm") ui.open() + ui.set_autoupdate(TRUE) // Turf gas mixture +//Oh my, thats a lot of data being sent that should probably be refactored /obj/machinery/airalarm/ui_data(mob/user) var/data = list( "locked" = locked, @@ -287,7 +293,7 @@ continue cur_tlv = TLV[gas_id] data["environment_data"] += list(list( - "name" = GLOB.meta_gas_info[gas_id][META_GAS_NAME], + "name" = GLOB.gas_data.names[gas_id], "value" = environment.get_moles(gas_id) / total_moles * 100, "unit" = "%", "danger_level" = cur_tlv.get_danger_level(environment.get_moles(gas_id) * partial_pressure) @@ -357,11 +363,11 @@ thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max1", "selected" = selected.max1)) thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max2", "selected" = selected.max2)) - for(var/gas_id in GLOB.meta_gas_info) + for(var/gas_id in GLOB.gas_data.names) if(!(gas_id in TLV)) // We're not interested in this gas, it seems. continue selected = TLV[gas_id] - thresholds += list(list("name" = GLOB.meta_gas_info[gas_id][META_GAS_NAME], "settings" = list())) + thresholds += list(list("name" = GLOB.gas_data.names[gas_id], "settings" = list())) thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min2", "selected" = selected.min2)) thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min1", "selected" = selected.min1)) thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "max1", "selected" = selected.max1)) @@ -425,15 +431,16 @@ . = TRUE if("alarm") var/area/A = get_area(src) - if(A.atmosalert(2, src)) + if(A.atmosalert(TRUE, src)) post_alert(2) . = TRUE if("reset") var/area/A = get_area(src) - if(A.atmosalert(0, src)) + if(A.atmosalert(FALSE, src)) post_alert(0) . = TRUE - update_icon() + if(.) + update_icon() /obj/machinery/airalarm/proc/reset(wire) @@ -441,10 +448,12 @@ if(WIRE_POWER) if(!wires.is_cut(WIRE_POWER)) shorted = FALSE + wires.ui_update() update_icon() if(WIRE_AI) if(!wires.is_cut(WIRE_AI)) aidisabled = FALSE + wires.ui_update() /obj/machinery/airalarm/proc/shock(mob/user, prb) @@ -505,7 +514,7 @@ for(var/device_id in A.air_scrub_names) send_signal(device_id, list( "power" = 1, - "set_filters" = list(/datum/gas/carbon_dioxide, /datum/gas/bz), + "set_filters" = list(GAS_CO2, GAS_BZ), "scrubbing" = 1, "widenet" = 0 ), signal_source) @@ -520,17 +529,17 @@ send_signal(device_id, list( "power" = 1, "set_filters" = list( - /datum/gas/carbon_dioxide, - /datum/gas/miasma, - /datum/gas/plasma, - /datum/gas/water_vapor, - /datum/gas/hypernoblium, - /datum/gas/nitrous_oxide, - /datum/gas/nitryl, - /datum/gas/tritium, - /datum/gas/bz, - /datum/gas/stimulum, - /datum/gas/pluoxium + GAS_CO2, + GAS_MIASMA, + GAS_PLASMA, + GAS_H2O, + GAS_HYPERNOB, + GAS_NITROUS, + GAS_NITRYL, + GAS_TRITIUM, + GAS_BZ, + GAS_STIMULUM, + GAS_PLUOXIUM ), "scrubbing" = 1, "widenet" = 1 @@ -558,7 +567,7 @@ for(var/device_id in A.air_scrub_names) send_signal(device_id, list( "power" = 1, - "set_filters" = list(/datum/gas/carbon_dioxide, /datum/gas/bz), + "set_filters" = list(GAS_CO2, GAS_BZ), "scrubbing" = 1, "widenet" = 0 ), signal_source) @@ -702,7 +711,7 @@ var/new_area_danger_level = 0 for(var/obj/machinery/airalarm/AA in A) if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted) - new_area_danger_level = max(new_area_danger_level,AA.danger_level) + new_area_danger_level = clamp(max(new_area_danger_level, AA.danger_level), 0, 1) if(A.atmosalert(new_area_danger_level,src)) //if area was in normal state or if area was in alert state post_alert(new_area_danger_level) @@ -792,8 +801,22 @@ return ..() +/obj/machinery/airalarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) + if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) + return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) + return FALSE + +/obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) + switch(passed_mode) + if(RCD_UPGRADE_SIMPLE_CIRCUITS) + user.visible_message("[user] fabricates a circuit and places it into [src].", \ + "You adapt an air alarm circuit and slot it into the assembly.") + buildstage = 1 + update_icon() + return TRUE + return FALSE + /obj/machinery/airalarm/AltClick(mob/user) - ..() if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc)) return else diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index c6a49f5ed06b8..2c27e30874c3d 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -37,6 +37,7 @@ var/construction_type var/pipe_state //icon_state as a pipe item var/on = FALSE + var/interacts_with_air = FALSE /obj/machinery/atmospherics/examine(mob/user) . = ..() @@ -52,10 +53,13 @@ normalize_cardinal_directions() nodes = new(device_type) if (!armor) - armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70) + armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70, "stamina" = 0) ..() if(process) - SSair.atmos_machinery += src + if(interacts_with_air) + SSair.atmos_air_machinery += src + else + SSair.atmos_machinery += src SetInitDirections() /obj/machinery/atmospherics/Destroy() @@ -63,6 +67,8 @@ nullifyNode(i) SSair.atmos_machinery -= src + SSair.atmos_air_machinery -= src + SSair.pipenets_needing_rebuilt -= src dropContents() if(pipe_vision_img) @@ -167,8 +173,9 @@ if(istype(reference, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/P = reference P.destroy_network() - nodes[nodes.Find(reference)] = null - update_icon() + if(nodes.len >= nodes.Find(reference)) // for some reason things can still be acted on even though they've been deleted this is a really fucky way of detecting that + nodes[nodes.Find(reference)] = null + update_icon() /obj/machinery/atmospherics/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pipe)) //lets you autodrop @@ -212,11 +219,11 @@ if(unsafe_wrenching) unsafe_pressure_release(user, internal_pressure) - + if (user.client) SSmedals.UnlockMedal(MEDAL_UNWRENCH_HIGH_PRESSURE,user.client) - - + + deconstruct(TRUE) return TRUE @@ -224,9 +231,14 @@ return can_unwrench // Throws the user when they unwrench a pipe with a major difference between the internal and environmental pressure. -/obj/machinery/atmospherics/proc/unsafe_pressure_release(mob/user, pressures = null) +/obj/machinery/atmospherics/proc/unsafe_pressure_release(mob/living/carbon/user, pressures = null) if(!user) return + if(ishuman(user)) //other carbons like monkeys can unwrench but cant wear magboots + if(istype(user.shoes, /obj/item/clothing/shoes/magboots)) + var/obj/item/clothing/shoes/magboots/M = user.shoes + if(M.negates_gravity()) + return if(!pressures) var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() @@ -322,10 +334,10 @@ //PLACEHOLDER COMMENT FOR ME TO READD THE 1 (?) DS DELAY THAT WAS IMPLEMENTED WITH A... TIMER? /obj/machinery/atmospherics/AltClick(mob/living/L) + . = ..() if(istype(L) && is_type_in_list(src, GLOB.ventcrawl_machinery)) L.handle_ventcrawl(src) return - ..() /obj/machinery/atmospherics/proc/can_crawl_through() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm index 45ccaf1e867a0..2575f0feedb81 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm @@ -19,3 +19,10 @@ /obj/machinery/atmospherics/components/binary/getNodeConnects() return list(turn(dir, 180), dir) + +/obj/machinery/atmospherics/components/binary/proc/set_overlay_offset(pipe_layer) + switch(pipe_layer) + if(2) + return 1 + if(1, 3) + return 2 \ No newline at end of file diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 68cccb6a0102f..e92f6924f10a0 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -46,7 +46,7 @@ var/input_starting_pressure = air2.return_pressure() if(output_starting_pressure >= input_starting_pressure-10) - //Need at least 10 KPa difference to overcome friction in the mechanism + //Need at least 10 kPa difference to overcome friction in the mechanism last_pressure_delta = 0 return null @@ -116,7 +116,7 @@ if(node2) node2.atmosinit() node2.addMember(src) - build_network() + SSair.add_to_rebuild_queue(src) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm index 335649a826fb8..1c16833f9f669 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm @@ -14,7 +14,12 @@ name = "dual-port air vent" desc = "Has a valve and pump attached to it. There are two ports." + welded = FALSE + level = 1 + + interacts_with_air = TRUE + var/frequency = 0 var/id = null var/datum/radio_frequency/radio_connection @@ -45,6 +50,10 @@ var/image/cap = getpipeimage(icon, "dpvent_cap", dir, piping_layer = piping_layer) add_overlay(cap) + if(welded) + icon_state = "vent_welded" + return + if(!on || !is_operational()) icon_state = "vent_off" else @@ -52,7 +61,8 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/process_atmos() ..() - + if(welded || !is_operational() || !isopenturf(loc)) + return FALSE if(!on) return var/datum/gas_mixture/air1 = airs[1] @@ -73,16 +83,12 @@ if(air1.return_temperature() > 0) var/transfer_moles = pressure_delta*environment.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = air1.remove(transfer_moles) - //Removed can be null if there is no atmosphere in air1 - if(!removed) - return + loc.assume_air_moles(air1, transfer_moles) - loc.assume_air(removed) air_update_turf() var/datum/pipeline/parent1 = parents[1] - parent1.update = 1 + parent1.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED else //external -> output if(environment.return_pressure() > 0) @@ -94,15 +100,11 @@ moles_delta = min(moles_delta, (input_pressure_min - air2.return_pressure()) * our_multiplier) if(moles_delta > 0) - var/datum/gas_mixture/removed = loc.remove_air(moles_delta) - if (isnull(removed)) // in space - return - - air2.merge(removed) + loc.transfer_air(air2, moles_delta) air_update_turf() var/datum/pipeline/parent2 = parents[2] - parent2.update = 1 + parent2.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED //Radio remote control @@ -176,6 +178,40 @@ broadcast_status() update_icon() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/welder_act(mob/living/user, obj/item/I) + if(!I.tool_start_check(user, amount=0)) + return TRUE + to_chat(user, "You begin welding the dual-port vent...") + if(I.use_tool(src, user, 20, volume=50)) + if(!welded) + user.visible_message("[user] welds the dual-port vent shut.", "You weld the dual-port vent shut.", "You hear welding.") + welded = TRUE + else + user.visible_message("[user] unwelded the dual-port vent.", "You unweld the dual-port vent.", "You hear welding.") + welded = FALSE + update_icon() + pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) + pipe_vision_img.plane = ABOVE_HUD_PLANE + return TRUE + +/obj/machinery/atmospherics/components/binary/dp_vent_pump/examine(mob/user) + . = ..() + if(welded) + . += "It seems welded shut." + +/obj/machinery/atmospherics/components/binary/dp_vent_pump/can_crawl_through() + return !welded + +/obj/machinery/atmospherics/components/binary/dp_vent_pump/attack_alien(mob/user) + if(!welded || !(do_after(user, 20, target = src))) + return + user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the dual-port vent.", "You hear loud scraping noises.") + welded = FALSE + update_icon() + pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) + pipe_vision_img.plane = ABOVE_HUD_PLANE + playsound(loc, 'sound/weapons/bladeslice.ogg', 100, 1) + /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume name = "large dual-port air vent" diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index ecf8d47da9f75..99724e43964bb 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -3,6 +3,7 @@ Passive gate is similar to the regular pump except: * It doesn't require power * Can not transfer low pressure to higher pressure (so it's more like a valve where you can control the flow) +* Passes gas when output pressure lower than target pressure */ @@ -10,7 +11,7 @@ Passive gate is similar to the regular pump except: icon_state = "passgate_map-2" name = "passive gate" - desc = "A one-way air valve that does not require power." + desc = "A one-way air valve that does not require power. Passes gas when the output pressure is lower than the target pressure." can_unwrench = TRUE shift_underlay_only = FALSE @@ -33,13 +34,16 @@ Passive gate is similar to the regular pump except: if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/binary/passive_gate/AltClick(mob/user) if(can_interact(user)) - target_pressure = MAX_OUTPUT_PRESSURE + target_pressure = ONE_ATMOSPHERE*100 + balloon_alert(user, "Set to [target_pressure] kPa") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/binary/passive_gate/Destroy() SSradio.remove_object(src,frequency) @@ -58,29 +62,9 @@ Passive gate is similar to the regular pump except: var/datum/gas_mixture/air1 = airs[1] var/datum/gas_mixture/air2 = airs[2] - - var/output_starting_pressure = air2.return_pressure() - var/input_starting_pressure = air1.return_pressure() - - if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10)) - //No need to pump gas if target is already reached or input pressure is too low - //Need at least 10 KPa difference to overcome friction in the mechanism - return - - //Calculate necessary moles to transfer using PV = nRT - if((air1.total_moles() > 0) && (air1.return_temperature()>0)) - var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2) - //Can not have a pressure delta that would cause output_pressure > input_pressure - - var/transfer_moles = pressure_delta*air2.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION) - - //Actually transfer the gas - var/datum/gas_mixture/removed = air1.remove(transfer_moles) - air2.merge(removed) - + if(air1.release_gas_to(air2, target_pressure)) update_parents() - //Radio remote control /obj/machinery/atmospherics/components/binary/passive_gate/proc/set_frequency(new_frequency) @@ -116,7 +100,7 @@ Passive gate is similar to the regular pump except: var/data = list() data["on"] = on data["pressure"] = round(target_pressure) - data["max_pressure"] = round(MAX_OUTPUT_PRESSURE) + data["max_pressure"] = round(ONE_ATMOSPHERE*100) return data /obj/machinery/atmospherics/components/binary/passive_gate/ui_act(action, params) @@ -130,15 +114,16 @@ Passive gate is similar to the regular pump except: if("pressure") var/pressure = params["pressure"] if(pressure == "max") - pressure = MAX_OUTPUT_PRESSURE + pressure = ONE_ATMOSPHERE*100 . = TRUE else if(text2num(pressure) != null) pressure = text2num(pressure) . = TRUE if(.) - target_pressure = clamp(pressure, 0, MAX_OUTPUT_PRESSURE) + target_pressure = clamp(pressure, 0, ONE_ATMOSPHERE*100) investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/binary/passive_gate/atmosinit() ..() @@ -158,7 +143,7 @@ Passive gate is similar to the regular pump except: on = !on if("set_output_pressure" in signal.data) - target_pressure = CLAMP(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50) + target_pressure = clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*100) if(on != old_on) investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) @@ -169,6 +154,7 @@ Passive gate is similar to the regular pump except: broadcast_status() update_icon() + ui_update() /obj/machinery/atmospherics/components/binary/passive_gate/power_change() ..() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm new file mode 100644 index 0000000000000..79b18a9a1c132 --- /dev/null +++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm @@ -0,0 +1,177 @@ +/obj/machinery/atmospherics/components/binary/pressure_valve + icon_state = "pvalve_map-2" + name = "pressure valve" + desc = "An activable one way valve that let gas pass through if the pressure on the input side is higher than the set pressure." + + can_unwrench = TRUE + shift_underlay_only = FALSE + + //Amount of pressure needed before the valve for it to open + var/target_pressure = ONE_ATMOSPHERE + //Frequency for radio signaling + var/frequency = 0 + //ID for radio signaling + var/id = null + //Connection to the radio processing + var/datum/radio_frequency/radio_connection + //Check if the gas is moving from one pipenet to the other + var/is_gas_flowing = FALSE + + construction_type = /obj/item/pipe/directional + pipe_state = "pvalve" + +/obj/machinery/atmospherics/components/binary/pressure_valve/CtrlClick(mob/user) + if(can_interact(user)) + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/pressure_valve/AltClick(mob/user) + if(can_interact(user)) + target_pressure = MAX_OUTPUT_PRESSURE + balloon_alert(user, "Set to [target_pressure] kPa") + investigate_log("was set to [target_pressure] kPa by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/pressure_valve/Destroy() + SSradio.remove_object(src,frequency) + if(radio_connection) + radio_connection = null + return ..() + +/obj/machinery/atmospherics/components/binary/pressure_valve/update_icon_nopipes() + if(on && is_operational()) + if(is_gas_flowing) + icon_state = "pvalve_flow" + else + icon_state = "pvalve_on" + else + icon_state = "pvalve_off" + +/obj/machinery/atmospherics/components/binary/pressure_valve/process_atmos() + + if(!on || !is_operational()) + return + + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + + if(air1.return_pressure() > target_pressure) + if(air1.release_gas_to(air2, air1.return_pressure())) + update_parents() + is_gas_flowing = TRUE + else + is_gas_flowing = FALSE + update_icon_nopipes() + +/obj/machinery/atmospherics/components/binary/pressure_valve/proc/set_frequency(new_frequency) + SSradio.remove_object(src, frequency) + frequency = new_frequency + if(frequency) + radio_connection = SSradio.add_object(src, frequency, filter = RADIO_ATMOSIA) + +/obj/machinery/atmospherics/components/binary/pressure_valve/proc/broadcast_status() + if(!radio_connection) + return + + var/datum/signal/signal = new(list( + "tag" = id, + "device" = "AGP", + "power" = on, + "target_output" = target_pressure, + "sigtype" = "status" + )) + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + +/obj/machinery/atmospherics/components/binary/pressure_valve/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AtmosPump", name) + ui.open() + +/obj/machinery/atmospherics/components/binary/pressure_valve/ui_data() + var/data = list() + data["on"] = on + data["pressure"] = round(target_pressure) + data["max_pressure"] = round(ONE_ATMOSPHERE*100) + return data + +/obj/machinery/atmospherics/components/binary/pressure_valve/ui_act(action, params) + if(..()) + return + switch(action) + if("power") + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + if("pressure") + var/pressure = params["pressure"] + if(pressure == "max") + pressure = ONE_ATMOSPHERE*100 + . = TRUE + else if(text2num(pressure) != null) + pressure = text2num(pressure) + . = TRUE + if(.) + target_pressure = clamp(pressure, 0, ONE_ATMOSPHERE*100) + investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) + update_icon() + +/obj/machinery/atmospherics/components/binary/pressure_valve/atmosinit() + . = ..() + if(frequency) + set_frequency(frequency) + +/obj/machinery/atmospherics/components/binary/pressure_valve/receive_signal(datum/signal/signal) + if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) + return + + var/old_on = on //for logging + + if("power" in signal.data) + on = text2num(signal.data["power"]) + + if("power_toggle" in signal.data) + on = !on + + if("set_output_pressure" in signal.data) + target_pressure = clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*100) + + if(on != old_on) + investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) + + if("status" in signal.data) + broadcast_status() + return + + broadcast_status() + update_icon() + +/obj/machinery/atmospherics/components/binary/pressure_valve/can_unwrench(mob/user) + . = ..() + if(. && on && is_operational()) + to_chat(user, "You cannot unwrench [src], turn it off first!") + return FALSE + + +/obj/machinery/atmospherics/components/binary/pressure_valve/layer1 + piping_layer = 1 + icon_state= "pvalve_map-1" + +/obj/machinery/atmospherics/components/binary/pressure_valve/layer3 + piping_layer = 3 + icon_state= "pvalve_map-3" + +/obj/machinery/atmospherics/components/binary/pressure_valve/on + on = TRUE + icon_state = "pvalve_on_map-2" + +/obj/machinery/atmospherics/components/binary/pressure_valve/on/layer1 + piping_layer = 1 + icon_state= "pvalve_on_map-1" + +/obj/machinery/atmospherics/components/binary/pressure_valve/on/layer3 + piping_layer = 3 + icon_state= "pvalve_on_map-3" diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 84d5a8d02e080..b8962bd27fe42 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -34,13 +34,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/binary/pump/AltClick(mob/user) if(can_interact(user)) target_pressure = MAX_OUTPUT_PRESSURE + balloon_alert(user, "Set to [target_pressure] kPa") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/binary/pump/Destroy() SSradio.remove_object(src,frequency) @@ -55,24 +58,18 @@ // ..() if(!on || !is_operational()) return - var/datum/gas_mixture/air1 = airs[1] var/datum/gas_mixture/air2 = airs[2] - var/output_starting_pressure = air2.return_pressure() - if((target_pressure - output_starting_pressure) < 0.01) //No need to pump gas if target is already reached! return - //Calculate necessary moles to transfer using PV=nRT if((air1.total_moles() > 0) && (air1.return_temperature()>0)) var/pressure_delta = target_pressure - output_starting_pressure var/transfer_moles = pressure_delta*air2.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION) - //Actually transfer the gas - var/datum/gas_mixture/removed = air1.remove(transfer_moles) - air2.merge(removed) + air1.transfer_to(air2,transfer_moles) update_parents() @@ -132,7 +129,8 @@ if(.) target_pressure = clamp(pressure, 0, MAX_OUTPUT_PRESSURE) investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/binary/pump/atmosinit() ..() @@ -163,6 +161,7 @@ broadcast_status() update_icon() + ui_update() /obj/machinery/atmospherics/components/binary/pump/power_change() ..() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm new file mode 100644 index 0000000000000..ef08d93fa164d --- /dev/null +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm @@ -0,0 +1,129 @@ +/obj/machinery/atmospherics/components/binary/temperature_gate + icon_state = "tgate_map-2" + name = "temperature gate" + desc = "An activable gate that compares the input temperature with the interface set temperature to check if the gas can flow from the input side to the output side or not." + + can_unwrench = TRUE + shift_underlay_only = FALSE + construction_type = /obj/item/pipe/directional + pipe_state = "tgate" + + //If the temperature of the mix before the gate is lower than this, the gas will flow (if inverted, if the temperature of the mix before the gate is higher than this) + var/target_temperature = T0C + //Minimum allowed temperature + var/minimum_temperature = TCMB + //Maximum allowed temperature to be set + var/max_temperature = 4500 + //Check if the sensor should let gas pass if temperature in the mix is less/higher than the target one + var/inverted = FALSE + //Check if the gas is moving from one pipenet to the other + var/is_gas_flowing = FALSE + +/obj/machinery/atmospherics/components/binary/temperature_gate/CtrlClick(mob/user) + if(can_interact(user)) + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/temperature_gate/AltClick(mob/user) + if(can_interact(user)) + target_temperature = max_temperature + balloon_alert(user, "Set to [target_temperature] K") + investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + + +/obj/machinery/atmospherics/components/binary/temperature_gate/examine(mob/user) + . = ..() + . += "This device will let gas flow if the temperature of the gas in the input is [inverted ? "higher" : "lower"] than the temperature set in the interface." + if(inverted) + . += "The device settings can be restored if a multitool is used on it." + else + . += "The sensor's settings can be changed by using a multitool on the device." + +/obj/machinery/atmospherics/components/binary/temperature_gate/update_icon_nopipes() + if(on && is_operational()) + if(is_gas_flowing) + icon_state = "tgate_flow-[set_overlay_offset(piping_layer)]" + else + icon_state = "tgate_on-[set_overlay_offset(piping_layer)]" + else + icon_state = "tgate_off-[set_overlay_offset(piping_layer)]" + + +/obj/machinery/atmospherics/components/binary/temperature_gate/process_atmos() + + if(!on || !is_operational()) + return + + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + + if(!inverted) + if(air1.return_temperature() < target_temperature) + if(air1.release_gas_to(air2, air1.return_pressure())) + update_parents() + is_gas_flowing = TRUE + else + is_gas_flowing = FALSE + else + if(air1.return_temperature() > target_temperature) + if(air1.release_gas_to(air2, air1.return_pressure())) + update_parents() + is_gas_flowing = TRUE + else + is_gas_flowing = FALSE + update_icon_nopipes() + +/obj/machinery/atmospherics/components/binary/temperature_gate/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AtmosTempGate", name) + ui.open() + +/obj/machinery/atmospherics/components/binary/temperature_gate/ui_data() + var/data = list() + data["on"] = on + data["temperature"] = round(target_temperature) + data["min_temperature"] = round(minimum_temperature) + data["max_temperature"] = round(max_temperature) + return data + +/obj/machinery/atmospherics/components/binary/temperature_gate/ui_act(action, params) + if(..()) + return + switch(action) + if("power") + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + if("temperature") + var/temperature = params["temperature"] + if(temperature == "max") + temperature = max_temperature + . = TRUE + else if(text2num(temperature) != null) + temperature = text2num(temperature) + . = TRUE + if(.) + target_temperature = clamp(minimum_temperature, temperature, max_temperature) + investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS) + update_icon() + +/obj/machinery/atmospherics/components/binary/temperature_gate/can_unwrench(mob/user) + . = ..() + if(. && on && is_operational()) + to_chat(user, "You cannot unwrench [src], turn it off first!") + return FALSE + +/obj/machinery/atmospherics/components/binary/temperature_gate/multitool_act(mob/living/user, obj/item/multitool/I) + . = ..() + if (istype(I)) + inverted = !inverted + if(inverted) + balloon_alert(user, "Sensors set to release when the temperature is above") + else + balloon_alert(user, "Sensors set to default") + return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm new file mode 100644 index 0000000000000..867a2864e8ad9 --- /dev/null +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm @@ -0,0 +1,95 @@ +/obj/machinery/atmospherics/components/binary/temperature_pump + icon_state = "tpump_map-2" + name = "temperature pump" + desc = "A pump that moves heat from one pipeline to another. The input will get cooler, and the output will get hotter." + + can_unwrench = TRUE + shift_underlay_only = FALSE + + //Percent of the heat delta to transfer + var/heat_transfer_rate = 0 + //Maximum allowed transfer percentage + var/max_heat_transfer_rate = 100 + + construction_type = /obj/item/pipe/directional + pipe_state = "tpump" + +/obj/machinery/atmospherics/components/binary/temperature_pump/CtrlClick(mob/user) + if(can_interact(user)) + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/temperature_pump/AltClick(mob/user) + if(can_interact(user) && !(heat_transfer_rate == max_heat_transfer_rate)) + heat_transfer_rate = max_heat_transfer_rate + balloon_alert(user, "Set to [heat_transfer_rate]%") + investigate_log("was set to [heat_transfer_rate]% by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/temperature_pump/update_icon_nopipes() + icon_state = "tpump_[on && is_operational() ? "on" : "off"]-[set_overlay_offset(piping_layer)]" + +/obj/machinery/atmospherics/components/binary/temperature_pump/process_atmos() + + if(!on || !is_operational()) + return + + var/datum/gas_mixture/air_input = airs[1] + var/datum/gas_mixture/air_output = airs[2] + + if(!QUANTIZE(air_input.total_moles()) || !QUANTIZE(air_output.total_moles())) //Don't transfer if there's no gas + return + var/datum/gas_mixture/remove_input = air_input.remove_ratio(0.9) + var/datum/gas_mixture/remove_output = air_output.remove_ratio(0.9) + + var/coolant_temperature_delta = remove_input.return_temperature() - remove_output.return_temperature() + + if(coolant_temperature_delta > 0) + var/input_capacity = remove_input.heat_capacity() + var/output_capacity = air_output.heat_capacity() + + var/cooling_heat_amount = (heat_transfer_rate * 0.01) * coolant_temperature_delta * (input_capacity * output_capacity / (input_capacity + output_capacity)) + remove_input.set_temperature(max(remove_input.return_temperature() - (cooling_heat_amount / input_capacity), TCMB)) + remove_output.set_temperature(max(remove_output.return_temperature() + (cooling_heat_amount / output_capacity), TCMB)) + + air_input.merge(remove_input) + air_output.merge(remove_output) + + update_parents() + +/obj/machinery/atmospherics/components/binary/temperature_pump/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AtmosTempPump", name) + ui.open() + +/obj/machinery/atmospherics/components/binary/temperature_pump/ui_data() + var/data = list() + data["on"] = on + data["rate"] = round(heat_transfer_rate) + data["max_heat_transfer_rate"] = round(max_heat_transfer_rate) + return data + +/obj/machinery/atmospherics/components/binary/temperature_pump/ui_act(action, params) + if(..()) + return + switch(action) + if("power") + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + if("rate") + var/rate = params["rate"] + if(rate == "max") + rate = max_heat_transfer_rate + . = TRUE + else if(text2num(rate) != null) + rate = text2num(rate) + . = TRUE + if(.) + heat_transfer_rate = clamp(rate, 0, max_heat_transfer_rate) + investigate_log("was set to [heat_transfer_rate]% by [key_name(usr)]", INVESTIGATE_ATMOS) + update_icon() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index cbf0cb95f2b9e..c7ecdb4b4e8cf 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -24,24 +24,40 @@ It's like a regular ol' straight pipe, but you can turn it on and off. var/switching = FALSE +/obj/machinery/atmospherics/components/binary/valve/Destroy() + //Should only happen on extreme circumstances + if(on) + //Let's give presumably now-severed pipenets a chance to scramble for what's happening at next SSair fire() + if(parents[1]) + parents[1].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + if(parents[2]) + parents[2].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + . = ..() + /obj/machinery/atmospherics/components/binary/valve/update_icon_nopipes(animation = FALSE) normalize_cardinal_directions() if(animation) flick("[valve_type]valve_[on][!on]", src) icon_state = "[valve_type]valve_[on ? "on" : "off"]" -/obj/machinery/atmospherics/components/binary/valve/proc/toggle() +/** + * Called by finish_interact(), switch between open and closed, reconcile the air between two pipelines + */ +/obj/machinery/atmospherics/components/binary/valve/proc/set_open(to_open) + if(on == to_open) + return + SEND_SIGNAL(src, COMSIG_VALVE_SET_OPEN, to_open) + . = on + on = to_open if(on) - on = FALSE - update_icon_nopipes() - investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) - else - on = TRUE update_icon_nopipes() update_parents() var/datum/pipeline/parent1 = parents[1] parent1.reconcile_air() investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) + else + update_icon_nopipes() + investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) /obj/machinery/atmospherics/components/binary/valve/interact(mob/user) add_fingerprint(usr) @@ -52,7 +68,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. addtimer(CALLBACK(src, .proc/finish_interact), 10) /obj/machinery/atmospherics/components/binary/valve/proc/finish_interact() - toggle() + set_open(!on) switching = FALSE @@ -66,6 +82,69 @@ It's like a regular ol' straight pipe, but you can turn it on and off. interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_OPEN | INTERACT_MACHINE_OPEN_SILICON +/obj/machinery/atmospherics/components/binary/valve/digital/Initialize() + . = ..() + AddComponent(/datum/component/usb_port, list(/obj/item/circuit_component/digital_valve)) + +/obj/item/circuit_component/digital_valve + display_name = "Digital Valve" + display_desc = "The interface for communicating with a digital valve." + + var/obj/machinery/atmospherics/components/binary/valve/digital/attached_valve + + /// Opens the digital valve + var/datum/port/input/open + /// Closes the digital valve + var/datum/port/input/close + + /// Whether the valve is currently open + var/datum/port/output/is_open + /// Sent when the valve is opened + var/datum/port/output/opened + /// Sent when the valve is closed + var/datum/port/output/closed + +/obj/item/circuit_component/digital_valve/Initialize() + . = ..() + open = add_input_port("Open", PORT_TYPE_SIGNAL) + close = add_input_port("Close", PORT_TYPE_SIGNAL) + + is_open = add_output_port("Is Open", PORT_TYPE_NUMBER) + opened = add_output_port("Opened", PORT_TYPE_SIGNAL) + closed = add_output_port("Closed", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/digital_valve/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/atmospherics/components/binary/valve/digital)) + attached_valve = shell + RegisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN, .proc/handle_valve_toggled) + +/obj/item/circuit_component/digital_valve/unregister_usb_parent(atom/movable/shell) + UnregisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN) + attached_valve = null + return ..() + +/obj/item/circuit_component/digital_valve/proc/handle_valve_toggled(datum/source, on) + is_open.set_output(on) + if(on) + opened.set_output(COMPONENT_SIGNAL) + else + closed.set_output(COMPONENT_SIGNAL) + +/obj/item/circuit_component/digital_valve/input_received(datum/port/input/port) + . = ..() + if(.) + return + + if(!attached_valve) + return + + if(COMPONENT_TRIGGERED_BY(open, port) && !attached_valve.on) + attached_valve.set_open(TRUE) + if(COMPONENT_TRIGGERED_BY(close, port) && attached_valve.on) + attached_valve.set_open(FALSE) + + /obj/machinery/atmospherics/components/binary/valve/digital/update_icon_nopipes(animation) if(!is_operational()) normalize_cardinal_directions() @@ -73,7 +152,6 @@ It's like a regular ol' straight pipe, but you can turn it on and off. return ..() - /obj/machinery/atmospherics/components/binary/valve/layer1 piping_layer = 1 icon_state = "mvalve_map-1" diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index b95f45d34473c..092253bbf7ede 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -35,13 +35,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/binary/volume_pump/AltClick(mob/user) if(can_interact(user)) transfer_rate = MAX_TRANSFER_RATE + balloon_alert(user, "Set to [transfer_rate] L/s") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/binary/volume_pump/Destroy() SSradio.remove_object(src,frequency) @@ -69,19 +72,15 @@ if(overclocked && (output_starting_pressure-input_starting_pressure > 1000))//Overclocked pumps can only force gas a certain amount. return - - var/transfer_ratio = transfer_rate/air1.return_volume() - - var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio) - if(overclocked)//Some of the gas from the mixture leaks to the environment when overclocked var/turf/open/T = loc if(istype(T)) - var/datum/gas_mixture/leaked = removed.remove_ratio(VOLUME_PUMP_LEAK_AMOUNT) + var/datum/gas_mixture/leaked = air1.remove_ratio(VOLUME_PUMP_LEAK_AMOUNT) T.assume_air(leaked) T.air_update_turf() - air2.merge(removed) + var/transfer_ratio = transfer_rate / air1.return_volume() + air1.transfer_ratio_to(air2,transfer_ratio) update_parents() @@ -150,7 +149,8 @@ if(.) transfer_rate = clamp(rate, 0, MAX_TRANSFER_RATE) investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS) - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/binary/volume_pump/receive_signal(datum/signal/signal) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) @@ -177,6 +177,7 @@ broadcast_status() update_icon() + ui_update() /obj/machinery/atmospherics/components/binary/volume_pump/power_change() ..() diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index 9295c702cc0c3..5fdb40cf4b759 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -65,8 +65,10 @@ // Pipenet stuff; housekeeping /obj/machinery/atmospherics/components/nullifyNode(i) - if(nodes[i]) + // 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]) ..() @@ -76,7 +78,7 @@ /obj/machinery/atmospherics/components/build_network() for(var/i in 1 to device_type) - if(!parents[i]) + if(QDELETED(parents[i])) parents[i] = new /datum/pipeline() var/datum/pipeline/P = parents[i] P.build_pipeline(src) @@ -87,10 +89,27 @@ 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. + */ + if(!(reference.other_atmosmch.len || reference.members.len || QDESTROYING(reference))) + qdel(reference) parents[i] = null +// We should return every air sharing a parent /obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/reference) - return airs[parents.Find(reference)] + for(var/i in 1 to device_type) + if(parents[i] == reference) + if(.) + if(!islist(.)) + . = list(.) + . += airs[i] + else + . = airs[i] /obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) if(reference) @@ -121,14 +140,9 @@ times_lost++ var/shared_loss = lost/times_lost - var/datum/gas_mixture/to_release for(var/i in 1 to device_type) var/datum/gas_mixture/air = airs[i] - if(!to_release) - to_release = air.remove(shared_loss) - continue - to_release.merge(air.remove(shared_loss)) - T.assume_air(to_release) + T.assume_air_moles(air, shared_loss) air_update_turf(1) /obj/machinery/atmospherics/components/proc/safe_input(var/title, var/text, var/default_set) @@ -143,9 +157,11 @@ for(var/i in 1 to device_type) var/datum/pipeline/parent = parents[i] if(!parent) - WARNING("Component is missing a pipenet! Rebuilding...") - build_network() - parent.update = 1 + //WARNING("Component is missing a pipenet! Rebuilding...") + //At pre-SSair_rebuild_pipenets times, not having a parent wasn't supposed to happen + SSair.add_to_rebuild_queue(src) + continue + parent.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED /obj/machinery/atmospherics/components/returnPipenets() . = list() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index eacea6d4416fd..96b330a961dd7 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -21,13 +21,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/trinary/filter/AltClick(mob/user) if(can_interact(user)) transfer_rate = MAX_TRANSFER_RATE + balloon_alert(user, "Set to [transfer_rate] L/s") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/trinary/filter/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) @@ -85,37 +88,17 @@ //No need to transfer if target is already full! return - var/transfer_ratio = transfer_rate/air1.return_volume() + var/transfer_ratio = transfer_rate / air1.return_volume() //Actually transfer the gas if(transfer_ratio <= 0) return - var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio) - - if(!removed) - return - - var/filtering = TRUE - if(!ispath(filter_type)) - if(filter_type) - filter_type = gas_id2path(filter_type) //support for mappers so they don't need to type out paths - else - filtering = FALSE - - if(filtering && removed.get_moles(filter_type)) - var/datum/gas_mixture/filtered_out = new - - filtered_out.set_temperature(removed.return_temperature()) - filtered_out.set_moles(filter_type, removed.get_moles(filter_type)) - - removed.set_moles(filter_type, 0) - - var/datum/gas_mixture/target = (air2.return_pressure() < MAX_OUTPUT_PRESSURE ? air2 : air1) //if there's no room for the filtered gas; just leave it in air1 - target.merge(filtered_out) - - air3.merge(removed) + if(filter_type && air2.return_pressure() <= 9000) + air1.scrub_into(air2, transfer_ratio, list(filter_type)) + if(air3.return_pressure() <= 9000) + air1.transfer_ratio_to(air3, transfer_ratio) update_parents() @@ -140,10 +123,9 @@ data["max_rate"] = round(MAX_TRANSFER_RATE) data["filter_types"] = list() - data["filter_types"] += list(list("name" = "Nothing", "path" = "", "selected" = !filter_type)) - for(var/path in GLOB.meta_gas_info) - var/list/gas = GLOB.meta_gas_info[path] - data["filter_types"] += list(list("name" = gas[META_GAS_NAME], "id" = gas[META_GAS_ID], "selected" = (path == gas_id2path(filter_type)))) + data["filter_types"] += list(list("name" = "Nothing", "id" = "", "selected" = !filter_type)) + for(var/id in GLOB.gas_data.ids) + data["filter_types"] += list(list("name" = GLOB.gas_data.names[id], "id" = id, "selected" = (id == filter_type))) return data @@ -173,13 +155,14 @@ if("filter") filter_type = null var/filter_name = "nothing" - var/gas = gas_id2path(params["mode"]) - if(gas in GLOB.meta_gas_info) + var/gas = params["mode"] + if(gas in GLOB.gas_data.names) filter_type = gas - filter_name = GLOB.meta_gas_info[gas][META_GAS_NAME] + filter_name = GLOB.gas_data.names[gas] investigate_log("was set to filter [filter_name] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/trinary/filter/can_unwrench(mob/user) . = ..() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index ae7922605da1f..f3e55f45c3bbd 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -23,13 +23,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/trinary/mixer/AltClick(mob/user) if(can_interact(user)) target_pressure = MAX_OUTPUT_PRESSURE + balloon_alert(user, "Set to [target_pressure] kPa") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/trinary/mixer/update_icon() cut_overlays() @@ -117,19 +120,17 @@ //Actually transfer the gas if(transfer_moles1) - var/datum/gas_mixture/removed1 = air1.remove(transfer_moles1) - air3.merge(removed1) + air1.transfer_to(air3, transfer_moles1) var/datum/pipeline/parent1 = parents[1] - parent1.update = TRUE + parent1.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED if(transfer_moles2) - var/datum/gas_mixture/removed2 = air2.remove(transfer_moles2) - air3.merge(removed2) + air2.transfer_to(air3, transfer_moles2) var/datum/pipeline/parent2 = parents[2] - parent2.update = TRUE + parent2.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED var/datum/pipeline/parent3 = parents[3] - parent3.update = TRUE + parent3.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED /obj/machinery/atmospherics/components/trinary/mixer/ui_state(mob/user) @@ -179,7 +180,8 @@ adjust_node1_value(100 - value) investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/trinary/mixer/proc/adjust_node1_value(newValue) node1_concentration = newValue / 100 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 46c5ed12699e9..1c11922777f4f 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -1,4 +1,6 @@ #define CRYOMOBS 'icons/obj/cryo_mobs.dmi' +#define CRYO_MULTIPLY_FACTOR 1.5 // Multiply factor is used with efficiency to multiply Tx quantity and how much extra is transfered to occupant magically. +#define CRYO_TX_QTY 0.4 // Tx quantity is how much volume should be removed from the cell's beaker - multiplied by delta_time /obj/machinery/atmospherics/components/unary/cryo_cell name = "cryo cell" @@ -6,7 +8,7 @@ icon_state = "pod-off" density = TRUE max_integrity = 350 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30, "stamina" = 0) layer = ABOVE_WINDOW_LAYER state_open = FALSE circuit = /obj/item/circuitboard/machine/cryo_tube @@ -25,7 +27,6 @@ var/conduction_coefficient = 0.3 var/obj/item/reagent_containers/glass/beaker = null - var/reagent_transfer = 0 var/obj/item/radio/radio var/radio_key = /obj/item/encryptionkey/headset_med @@ -73,7 +74,7 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) //this is leaving out everything but efficiency since they follow the same idea of "better beaker, better results" . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Efficiency at [efficiency*100]%." + . += "The status display reads: Efficiency at [efficiency*100]%." /obj/machinery/atmospherics/components/unary/cryo_cell/Destroy() QDEL_NULL(radio) @@ -83,7 +84,13 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/contents_explosion(severity, target) ..() if(beaker) - beaker.ex_act(severity, target) + switch(severity) + if(EXPLODE_DEVASTATE) + SSexplosions.high_mov_atom += beaker + if(EXPLODE_HEAVY) + SSexplosions.med_mov_atom += beaker + if(EXPLODE_LIGHT) + SSexplosions.low_mov_atom += beaker /obj/machinery/atmospherics/components/unary/cryo_cell/handle_atom_del(atom/A) ..() @@ -166,19 +173,32 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/nap_violation(mob/violator) open_machine() -/obj/machinery/atmospherics/components/unary/cryo_cell/process() - ..() - +/obj/machinery/atmospherics/components/unary/cryo_cell/process(delta_time) if(!on) return + if(!is_operational()) on = FALSE update_icon() return - if(!occupant) + + if(!occupant)//Won't operate unless there's an occupant. + on = FALSE + update_icon() + var/msg = "Aborting. No occupant detected." + radio.talk_into(src, msg, radio_channel) + return + + if(!beaker?.reagents?.reagent_list.len) //No beaker or beaker without reagents with stop the machine from running. + on = FALSE + update_icon() + var/msg = "Aborting. No beaker or chemicals installed." + radio.talk_into(src, msg, radio_channel) return var/mob/living/mob_occupant = occupant + if(mob_occupant.on_fire) //Extinguish occupant, happens after the occupant is healed and ejected. + mob_occupant.ExtinguishMob() if(!check_nap_violations()) return if(mob_occupant.stat == DEAD) // We don't bother with dead people. @@ -199,15 +219,11 @@ if(air1.total_moles()) if(mob_occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic. - mob_occupant.Sleeping((mob_occupant.bodytemperature * sleep_factor) * 2000) - mob_occupant.Unconscious((mob_occupant.bodytemperature * unconscious_factor) * 2000) - if(beaker) - if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic. - beaker.reagents.trans_to(occupant, 1, efficiency * 0.25) // Transfer reagents. - beaker.reagents.reaction(occupant, VAPOR) - air1.adjust_moles(/datum/gas/oxygen, -max(0,air1.get_moles(/datum/gas/oxygen) - 2 / efficiency)) //Let's use gas for this - if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker). - reagent_transfer = 0 + mob_occupant.Sleeping((mob_occupant.bodytemperature * sleep_factor) * 1000 * delta_time) + mob_occupant.Unconscious((mob_occupant.bodytemperature * unconscious_factor) * 1000 * delta_time) + if(beaker)//How much to transfer. As efficiency is increased, less reagent from the beaker is used and more is magically transferred to occupant + beaker.reagents.trans_to(occupant, (CRYO_TX_QTY / (efficiency * CRYO_MULTIPLY_FACTOR)) * delta_time, efficiency * CRYO_MULTIPLY_FACTOR, method = VAPOR) // Transfer reagents. + use_power(1000 * efficiency) return 1 @@ -219,9 +235,11 @@ var/datum/gas_mixture/air1 = airs[1] - if(!nodes[1] || !airs[1] || air1.get_moles(/datum/gas/oxygen) < 5) // Turn off if the machine won't work. + if(!nodes[1] || !airs[1] || air1.get_moles(GAS_O2) < 5) // Turn off if the machine won't work due to not having enough moles to operate. on = FALSE update_icon() + var/msg = "Aborting. Not enough gas present to operate." + radio.talk_into(src, msg, radio_channel) return if(occupant) @@ -241,7 +259,9 @@ air1.set_temperature(max(air1.return_temperature() - heat / air_heat_capacity, TCMB)) mob_occupant.adjust_bodytemperature(heat / heat_capacity, TCMB) - air1.set_moles(/datum/gas/oxygen, max(0,air1.get_moles(/datum/gas/oxygen) - 0.5 / efficiency)) // Magically consume gas? Why not, we run on cryo magic. + air1.set_moles(GAS_O2, max(0,air1.get_moles(GAS_O2) - 0.5 / efficiency)) // Magically consume gas? Why not, we run on cryo magic. + + update_parents() /obj/machinery/atmospherics/components/unary/cryo_cell/power_change() ..() @@ -340,6 +360,7 @@ if(!ui) ui = new(user, src, "Cryo") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/atmospherics/components/unary/cryo_cell/ui_data() var/list/data = list() @@ -420,24 +441,24 @@ . = TRUE /obj/machinery/atmospherics/components/unary/cryo_cell/CtrlClick(mob/user) - if(can_interact(user) && !state_open) + if(user.can_interact_with(src) && !state_open && occupant != user) on = !on update_icon() return ..() /obj/machinery/atmospherics/components/unary/cryo_cell/AltClick(mob/user) - if(can_interact(user)) + if(user.can_interact_with(src) && occupant != user) if(state_open) close_machine() else open_machine() - return ..() + return /obj/machinery/atmospherics/components/unary/cryo_cell/update_remote_sight(mob/living/user) return // we don't see the pipe network while inside cryo. /obj/machinery/atmospherics/components/unary/cryo_cell/get_remote_view_fullscreens(mob/user) - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1) /obj/machinery/atmospherics/components/unary/cryo_cell/can_crawl_through() return // can't ventcrawl in or out of cryo. @@ -466,6 +487,8 @@ if(node) node.atmosinit() node.addMember(src) - build_network() + SSair.add_to_rebuild_queue(src) #undef CRYOMOBS +#undef CRYO_MULTIPLY_FACTOR +#undef CRYO_TX_QTY diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm index c0dfc5633e9fd..25b6ad13287e2 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm @@ -10,7 +10,7 @@ layer = LOW_OBJ_LAYER - var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null + var/datum/weakref/partner_ref = null var/update_cycle pipe_state = "heunary" @@ -33,20 +33,26 @@ PIPING_LAYER_SHIFT(src, piping_layer) /obj/machinery/atmospherics/components/unary/heat_exchanger/atmosinit() + var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = partner_ref?.resolve() if(!partner) + partner_ref = null var/partner_connect = turn(dir,180) for(var/obj/machinery/atmospherics/components/unary/heat_exchanger/target in get_step(src,partner_connect)) if(target.dir & get_dir(src,target)) - partner = target - partner.partner = src + partner_ref = WEAKREF(target) + target.partner_ref = WEAKREF(src) break ..() /obj/machinery/atmospherics/components/unary/heat_exchanger/process_atmos() ..() - if(!partner || SSair.times_fired <= update_cycle) + var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = partner_ref?.resolve() + if(!partner) + partner_ref = null + return + if(SSair.times_fired <= update_cycle) return update_cycle = SSair.times_fired diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 8f92bda897bc6..48a963cf292cd 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -19,6 +19,7 @@ var/datum/radio_frequency/radio_connection level = 1 + interacts_with_air = TRUE layer = GAS_SCRUBBER_LAYER pipe_state = "injector" @@ -30,13 +31,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/unary/outlet_injector/AltClick(mob/user) if(can_interact(user)) volume_rate = MAX_TRANSFER_RATE + balloon_alert(user, "Set to [volume_rate] L/s") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/unary/outlet_injector/Destroy() SSradio.remove_object(src,frequency) @@ -64,20 +68,17 @@ injecting = 0 - if(!on || !is_operational()) + if(!on || !is_operational() || !isopenturf(loc)) return var/datum/gas_mixture/air_contents = airs[1] - if(air_contents.return_temperature() > 0) - var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION) - - var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) + if(air_contents != null) + if(air_contents.return_temperature() > 0) + loc.assume_air_ratio(air_contents, volume_rate / air_contents.return_volume()) + air_update_turf() - loc.assume_air(removed) - air_update_turf() - - update_parents() + update_parents() /obj/machinery/atmospherics/components/unary/outlet_injector/proc/inject() @@ -89,9 +90,7 @@ injecting = 1 if(air_contents.return_temperature() > 0) - var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) - loc.assume_air(removed) + loc.assume_air_ratio(air_contents, volume_rate / air_contents.return_volume()) update_parents() flick("inje_inject", src) @@ -146,6 +145,7 @@ if(!("status" in signal.data)) //do not update_icon update_icon() + ui_update() @@ -185,8 +185,9 @@ if(.) volume_rate = clamp(rate, 0, MAX_TRANSFER_RATE) investigate_log("was set to [volume_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS) - update_icon() - broadcast_status() + if(.) + update_icon() + broadcast_status() /obj/machinery/atmospherics/components/unary/outlet_injector/can_unwrench(mob/user) . = ..() @@ -218,7 +219,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos frequency = FREQ_ATMOS_STORAGE on = TRUE - volume_rate = 200 + volume_rate = MAX_TRANSFER_RATE /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste name = "atmos waste outlet injector" diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm index 572296f03f597..61d21bc3596d6 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm @@ -6,6 +6,7 @@ can_unwrench = TRUE level = 1 + interacts_with_air = TRUE layer = GAS_SCRUBBER_LAYER pipe_state = "pvent" @@ -19,29 +20,25 @@ /obj/machinery/atmospherics/components/unary/passive_vent/process_atmos() ..() + if(isclosedturf(loc)) + return - var/datum/gas_mixture/environment = loc.return_air() - var/environment_pressure = environment.return_pressure() - var/pressure_delta = abs(environment_pressure - airs[1].return_pressure()) - - if((environment.return_temperature() || airs[1].return_temperature()) && pressure_delta > 0.5) - if(environment_pressure < airs[1].return_pressure()) - var/air_temperature = (environment.return_temperature() > 0) ? environment.return_temperature() : airs[1].return_temperature() - var/transfer_moles = (pressure_delta * environment.return_volume()) / (air_temperature * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = airs[1].remove(transfer_moles) - loc.assume_air(removed) - air_update_turf() - else - var/air_temperature = (airs[1].return_temperature() > 0) ? airs[1].return_temperature() : environment.return_temperature() - var/output_volume = airs[1].return_volume() - var/transfer_moles = (pressure_delta * output_volume) / (air_temperature * R_IDEAL_GAS_EQUATION) - transfer_moles = min(transfer_moles, environment.total_moles()*airs[1].return_volume()/environment.return_volume()) - var/datum/gas_mixture/removed = loc.remove_air(transfer_moles) - if(isnull(removed)) - return - airs[1].merge(removed) - air_update_turf() - update_parents() + var/active = FALSE + var/datum/gas_mixture/external = loc.return_air() + var/datum/gas_mixture/internal = airs[1] + var/external_pressure = external.return_pressure() + var/internal_pressure = internal.return_pressure() + var/pressure_delta = abs(external_pressure - internal_pressure) + + if(pressure_delta > 0.5) + equalize_all_gases_in_list(list(internal,external)) + active = TRUE + + active = internal.temperature_share(external, OPEN_HEAT_TRANSFER_COEFFICIENT) || active + + if(active) + air_update_turf() + update_parents() /obj/machinery/atmospherics/components/unary/passive_vent/can_crawl_through() return TRUE diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm index 512d693555614..3ca9fd77e69b4 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm @@ -21,7 +21,7 @@ air_contents.set_temperature(T20C) if(gas_type) air_contents.set_moles(gas_type, AIR_CONTENTS) - name = "[name] ([GLOB.meta_gas_info[gas_type][META_GAS_NAME]])" + name = "[name] ([GLOB.gas_data.names[gas_type]])" setPipingLayer(piping_layer) @@ -32,20 +32,20 @@ /obj/machinery/atmospherics/components/unary/tank/air/New() ..() var/datum/gas_mixture/air_contents = airs[1] - air_contents.set_moles(/datum/gas/oxygen, AIR_CONTENTS * 0.2) - air_contents.set_moles(/datum/gas/nitrogen, AIR_CONTENTS * 0.8) + air_contents.set_moles(GAS_O2, AIR_CONTENTS * 0.2) + air_contents.set_moles(GAS_N2, AIR_CONTENTS * 0.8) /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide - gas_type = /datum/gas/carbon_dioxide + gas_type = GAS_CO2 /obj/machinery/atmospherics/components/unary/tank/toxins icon_state = "orange" - gas_type = /datum/gas/plasma + gas_type = GAS_PLASMA /obj/machinery/atmospherics/components/unary/tank/oxygen icon_state = "blue" - gas_type = /datum/gas/oxygen + gas_type = GAS_O2 /obj/machinery/atmospherics/components/unary/tank/nitrogen icon_state = "red" - gas_type = /datum/gas/nitrogen + gas_type = GAS_N2 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 68ac81f9936ea..74acbef1cef7c 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -2,12 +2,12 @@ icon = 'icons/obj/atmospherics/components/thermomachine.dmi' icon_state = "freezer" - name = "thermomachine" + name = "Thermomachine" desc = "Heats or cools gas in connected pipes." density = TRUE max_integrity = 300 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30, "stamina" = 0) layer = OBJ_LAYER circuit = /obj/item/circuitboard/machine/thermomachine @@ -19,27 +19,58 @@ var/icon_state_on = "freezer_1" var/icon_state_open = "freezer-o" - var/min_temperature = 0 - var/max_temperature = 0 + var/min_temperature = T20C //actual temperature will be defined by RefreshParts() and by the cooling var + var/max_temperature = T20C //actual temperature will be defined by RefreshParts() and by the cooling var var/target_temperature = T20C var/heat_capacity = 0 var/interactive = TRUE // So mapmakers can disable interaction. + var/cooling = TRUE + var/base_heating = 140 + var/base_cooling = 170 /obj/machinery/atmospherics/components/unary/thermomachine/Initialize() . = ..() initialize_directions = dir + RefreshParts() + update_icon() + +/obj/machinery/atmospherics/components/unary/thermomachine/proc/swap_function() + cooling = !cooling + if(cooling) + icon_state_off = "freezer" + icon_state_on = "freezer_1" + icon_state_open = "freezer-o" + else + icon_state_off = "heater" + icon_state_on = "heater_1" + icon_state_open = "heater-o" + target_temperature = T20C + RefreshParts() + update_icon() /obj/machinery/atmospherics/components/unary/thermomachine/on_construction() var/obj/item/circuitboard/machine/thermomachine/board = circuit if(board) piping_layer = board.pipe_layer - ..(dir, piping_layer) + return ..(dir, piping_layer) /obj/machinery/atmospherics/components/unary/thermomachine/RefreshParts() - var/B - for(var/obj/item/stock_parts/matter_bin/M in component_parts) - B += M.rating - heat_capacity = 5000 * ((B - 1) ** 2) + var/calculated_bin_rating + for(var/obj/item/stock_parts/matter_bin/bin in component_parts) + calculated_bin_rating += bin.rating + heat_capacity = 5000 * ((calculated_bin_rating - 1) ** 2) + min_temperature = T20C + max_temperature = T20C + if(cooling) + var/calculated_laser_rating + for(var/obj/item/stock_parts/micro_laser/laser in component_parts) + calculated_laser_rating += laser.rating + min_temperature = max(T0C - (base_cooling + calculated_laser_rating * 15), TCMB) //73.15K with T1 stock parts + else + var/calculated_laser_rating + for(var/obj/item/stock_parts/micro_laser/laser in component_parts) + calculated_laser_rating += laser.rating + max_temperature = T20C + (base_heating * calculated_laser_rating) //573.15K with T1 stock parts /obj/machinery/atmospherics/components/unary/thermomachine/update_icon() cut_overlays() @@ -65,9 +96,20 @@ . += "The status display reads: Efficiency [(heat_capacity/5000)*100]%." . += "Temperature range [min_temperature]K - [max_temperature]K ([(T0C-min_temperature)*-1]C - [(T0C-max_temperature)*-1]C)." +/obj/machinery/atmospherics/components/unary/thermomachine/AltClick(mob/living/user) + if(!can_interact(user)) + return + if(cooling) + target_temperature = min_temperature + investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) + else + target_temperature = max_temperature + investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) + balloon_alert(user, "Set to [target_temperature] K") + /obj/machinery/atmospherics/components/unary/thermomachine/process_atmos() ..() - if(!on || !nodes[1]) + if(!is_operational() || !on || !nodes[1]) //if it has no power or its switched off, dont process atmos return var/datum/gas_mixture/air_contents = airs[1] @@ -109,14 +151,16 @@ if(node) node.disconnect(src) nodes[1] = null - nullifyPipenet(parents[1]) + //Sometimes this gets called more than once per atmos tick; i.e. before the incoming build_network call by SSAIR_REBUILD_PIPENETS, so we check this here. + if(parents[1]) + nullifyPipenet(parents[1]) atmosinit() node = nodes[1] if(node) node.atmosinit() node.addMember(src) - build_network() + SSair.add_to_rebuild_queue(src) return TRUE /obj/machinery/atmospherics/components/unary/thermomachine/ui_status(mob/user) @@ -133,10 +177,12 @@ if(!ui) ui = new(user, src, "ThermoMachine") ui.open() + ui.set_autoupdate(TRUE) // Air temperature and pressure /obj/machinery/atmospherics/components/unary/thermomachine/ui_data(mob/user) var/list/data = list() data["on"] = on + data["cooling"] = cooling data["min"] = min_temperature data["max"] = max_temperature @@ -159,6 +205,10 @@ use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE + if("cooling") + swap_function() + investigate_log("was changed to [cooling ? "cooling" : "heating"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE if("target") var/target = params["target"] var/adjust = text2num(params["adjust"]) @@ -175,8 +225,8 @@ if(.) target_temperature = clamp(target, min_temperature, max_temperature) investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS) - - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/unary/thermomachine/CtrlClick(mob/living/user) if(!can_interact(user)) @@ -185,14 +235,11 @@ update_icon() /obj/machinery/atmospherics/components/unary/thermomachine/freezer - name = "freezer" icon_state = "freezer" icon_state_off = "freezer" icon_state_on = "freezer_1" icon_state_open = "freezer-o" - max_temperature = T20C - min_temperature = 170 //actual minimum temperature is defined by RefreshParts() - circuit = /obj/item/circuitboard/machine/thermomachine/freezer + cooling = TRUE /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on on = TRUE @@ -210,40 +257,13 @@ . = ..() target_temperature = T0C-20 //Cold enough to prevent Miasma -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/RefreshParts() - ..() - var/L - for(var/obj/item/stock_parts/micro_laser/M in component_parts) - L += M.rating - min_temperature = max(T0C - (initial(min_temperature) + L * 15), TCMB) //73.15K with T1 stock parts - -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/AltClick(mob/living/user) - if(!can_interact(user)) - return - target_temperature = min_temperature - /obj/machinery/atmospherics/components/unary/thermomachine/heater - name = "heater" icon_state = "heater" icon_state_off = "heater" icon_state_on = "heater_1" icon_state_open = "heater-o" - max_temperature = 140 //actual maximum temperature is defined by RefreshParts() - min_temperature = T20C - circuit = /obj/item/circuitboard/machine/thermomachine/heater + cooling = FALSE /obj/machinery/atmospherics/components/unary/thermomachine/heater/on on = TRUE icon_state = "heater_1" - -/obj/machinery/atmospherics/components/unary/thermomachine/heater/RefreshParts() - ..() - var/L - for(var/obj/item/stock_parts/micro_laser/M in component_parts) - L += M.rating - max_temperature = T20C + (initial(max_temperature) * L) //573.15K with T1 stock parts - -/obj/machinery/atmospherics/components/unary/thermomachine/heater/AltClick(mob/living/user) - if(!can_interact(user)) - return - target_temperature = max_temperature diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index ba9764d63cebd..05a5047f81403 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -17,6 +17,8 @@ level = 1 layer = GAS_SCRUBBER_LAYER + interacts_with_air = TRUE + var/id_tag = null var/pump_direction = RELEASING @@ -90,7 +92,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/process_atmos() ..() - if(!is_operational()) + if(!is_operational() || !isopenturf(loc)) return if(!nodes[1]) on = FALSE @@ -99,6 +101,10 @@ var/datum/gas_mixture/air_contents = airs[1] var/datum/gas_mixture/environment = loc.return_air() + + if(environment == null) + return + var/environment_pressure = environment.return_pressure() if(pump_direction & RELEASING) // internal -> external @@ -113,9 +119,7 @@ if(air_contents.return_temperature() > 0) var/transfer_moles = pressure_delta*environment.return_volume()/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) - - loc.assume_air(removed) + loc.assume_air_moles(air_contents, transfer_moles) air_update_turf() else // external -> internal @@ -128,11 +132,7 @@ moles_delta = min(moles_delta, (internal_pressure_bound - air_contents.return_pressure()) * our_multiplier) if(moles_delta > 0) - var/datum/gas_mixture/removed = loc.remove_air(moles_delta) - if (isnull(removed)) // in space - return - - air_contents.merge(removed) + loc.transfer_air(air_contents, moles_delta) air_update_turf() update_parents() @@ -288,7 +288,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/attack_alien(mob/user) if(!welded || !(do_after(user, 20, target = src))) return - user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the vent", "You hear loud scraping noises.") + user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the vent.", "You hear loud scraping noises.") welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 323e1597e01df..bb71cbd73b59f 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -14,10 +14,12 @@ level = 1 layer = GAS_SCRUBBER_LAYER + interacts_with_air = TRUE + var/id_tag = null var/scrubbing = SCRUBBING //0 = siphoning, 1 = scrubbing - var/filter_types = list(/datum/gas/carbon_dioxide, /datum/gas/bz) + var/filter_types = list(GAS_CO2, GAS_BZ) var/volume_rate = 200 var/widenet = 0 //is this scrubber acting on the 3x3 area around it. var/list/turf/adjacent_turfs = list() @@ -34,11 +36,6 @@ if(!id_tag) id_tag = assign_uid_vents() - for(var/f in filter_types) - if(istext(f)) - filter_types -= f - filter_types += gas_id2path(f) - /obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy() var/area/A = get_area(src) if (A) @@ -98,9 +95,8 @@ return FALSE var/list/f_types = list() - for(var/path in GLOB.meta_gas_info) - var/list/gas = GLOB.meta_gas_info[path] - f_types += list(list("gas_id" = gas[META_GAS_ID], "gas_name" = gas[META_GAS_NAME], "enabled" = (path in filter_types))) + for(var/id in GLOB.gas_data.ids) + f_types += list(list("gas_id" = id, "gas_name" = GLOB.gas_data.names[id], "enabled" = (id in filter_types))) var/datum/signal/signal = new(list( "tag" = id_tag, @@ -146,38 +142,21 @@ scrub(tile) return TRUE -/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(var/turf/tile) +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(var/turf/open/tile) if(!istype(tile)) return FALSE var/datum/gas_mixture/environment = tile.return_air() var/datum/gas_mixture/air_contents = airs[1] - if(air_contents.return_pressure() >= 50*ONE_ATMOSPHERE) + if(air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE || !islist(filter_types)) return FALSE if(scrubbing & SCRUBBING) - var/transfer_moles = min(1, volume_rate/environment.return_volume())*environment.total_moles() - - //Take a gas sample - var/datum/gas_mixture/removed = tile.remove_air(transfer_moles) - - //Nothing left to remove from the tile - if(isnull(removed)) - return FALSE - - removed.scrub_into(air_contents, filter_types) - - //Remix the resulting gases - tile.assume_air(removed) + environment.scrub_into(air_contents, volume_rate/environment.return_volume(), filter_types) tile.air_update_turf() else //Just siphoning all air - - var/transfer_moles = environment.total_moles()*(volume_rate/environment.return_volume()) - - var/datum/gas_mixture/removed = tile.remove_air(transfer_moles) - - air_contents.merge(removed) + environment.transfer_ratio_to(air_contents, volume_rate/environment.return_volume()) tile.air_update_turf() update_parents() @@ -224,12 +203,12 @@ investigate_log(" was toggled to [scrubbing ? "scrubbing" : "siphon"] mode by [key_name(signal_sender)]",INVESTIGATE_ATMOS) if("toggle_filter" in signal.data) - filter_types ^= gas_id2path(signal.data["toggle_filter"]) + filter_types ^= signal.data["toggle_filter"] if("set_filters" in signal.data) filter_types = list() for(var/gas in signal.data["set_filters"]) - filter_types += gas_id2path(gas) + filter_types += gas if("init" in signal.data) name = signal.data["init"] @@ -280,7 +259,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/attack_alien(mob/user) if(!welded || !(do_after(user, 20, target = src))) return - user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the scrubber.", "You hear loud scraping noises.") + user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the scrubber.", "You hear loud scraping noises.") welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) @@ -309,10 +288,10 @@ icon_state = "scrub_map_on-3" /obj/machinery/atmospherics/components/unary/vent_scrubber/on/lavaland - filter_types = list(/datum/gas/carbon_dioxide, /datum/gas/plasma, /datum/gas/water_vapor, /datum/gas/bz) + filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ) /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3/lavaland - filter_types = list(/datum/gas/carbon_dioxide, /datum/gas/plasma, /datum/gas/water_vapor, /datum/gas/bz) + filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ) #undef SIPHONING #undef SCRUBBING diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index ca1024b799067..2bae4e25e771f 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -15,7 +15,7 @@ /datum/pipeline/Destroy() SSair.networks -= src - if(air?.return_volume()) + if(air && air.return_volume()) temporarily_store_air() for(var/obj/machinery/atmospherics/pipe/P in members) P.parent = null @@ -43,10 +43,12 @@ if(!air) air = new var/list/possible_expansions = list(base) - while(possible_expansions.len) + while(possible_expansions.len>0) for(var/obj/machinery/atmospherics/borderline in possible_expansions) + var/list/result = borderline.pipeline_expansion(src) - if(result && result.len) + + if(result.len>0) for(var/obj/machinery/atmospherics/P in result) if(istype(P, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/item = P @@ -55,8 +57,8 @@ if(item.parent) var/static/pipenetwarnings = 10 if(pipenetwarnings > 0) - log_mapping("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) around [AREACOORD(item)].") - pipenetwarnings-- + log_mapping("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) Nearby: ([item.x], [item.y], [item.z]).") + pipenetwarnings -= 1 if(pipenetwarnings == 0) log_mapping("build_pipeline(): further messages about pipenets will be suppressed") members += item @@ -192,7 +194,7 @@ else if((target.heat_capacity>0) && (partial_heat_capacity>0)) - var/delta_temperature = air.return_temperature() - target.temperature + var/delta_temperature = air.return_temperature() - target.return_temperature() var/heat = thermal_conductivity*delta_temperature* \ (partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity)) @@ -203,10 +205,14 @@ /datum/pipeline/proc/return_air() . = other_airs + air if(null in .) - stack_trace("[src] has one or more null gas mixtures, which may cause bugs. Null mixtures will not be considered in reconcile_air().") - return removeNullsFromList(.) + stack_trace("[src]([REF(src)]) has one or more null gas mixtures, which may cause bugs. Null mixtures will not be considered in reconcile_air().") + listclearnulls(.) -/datum/pipeline/proc/reconcile_air() +/datum/pipeline/proc/empty() + for(var/datum/gas_mixture/GM in get_all_connected_airs()) + GM.clear() + +/datum/pipeline/proc/get_all_connected_airs() var/list/datum/gas_mixture/GL = list() var/list/datum/pipeline/PL = list() PL += src @@ -226,18 +232,8 @@ var/obj/machinery/atmospherics/components/unary/portables_connector/C = atmosmch if(C.connected_device) GL += C.portableConnectorReturnAir() + return GL - var/datum/gas_mixture/total_gas_mixture = new(0) - var/total_volume = 0 - - for(var/i in GL) - var/datum/gas_mixture/G = i - total_gas_mixture.merge(G) - total_volume += G.return_volume() - - if(total_volume > 0) - //Update individual gas_mixtures by volume ratio - for(var/i in GL) - var/datum/gas_mixture/G = i - G.copy_from(total_gas_mixture) - G.multiply(G.return_volume()/total_volume) +/datum/pipeline/proc/reconcile_air() + var/list/datum/gas_mixture/GL = get_all_connected_airs() + equalize_all_gases_in_list(GL) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 4fcef087b72c0..bf20a874a5c9f 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -9,7 +9,7 @@ idle_power_usage = 2 active_power_usage = 4 max_integrity = 150 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 0, "stamina" = 0) var/frequency = 0 var/atom/target var/id_tag diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index ae126b3e91875..90b283fb66835 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -5,6 +5,7 @@ #define GASMINER_POWER_KPA 3 #define GASMINER_POWER_FULLSCALE 4 + /obj/machinery/atmospherics/miner name = "gas miner" desc = "Gasses mined from the gas giant below (above?) flow out through this massive vent." @@ -12,9 +13,11 @@ icon_state = "miner" density = FALSE resistance_flags = INDESTRUCTIBLE|ACID_PROOF|FIRE_PROOF + interacts_with_air = TRUE var/spawn_id = null var/spawn_temp = T20C - var/spawn_mol = MOLES_CELLSTANDARD * 10 + /// Moles of gas to spawn per second + var/spawn_mol = MOLES_CELLSTANDARD * 5 var/max_ext_mol = INFINITY var/max_ext_kpa = 6500 var/overlay_color = "#FFFFFF" @@ -26,7 +29,7 @@ var/broken = FALSE var/broken_message = "ERROR" idle_power_usage = 150 - active_power_usage = 2000 + active_power_usage = 3000 /obj/machinery/atmospherics/miner/Initialize() . = ..() @@ -94,7 +97,7 @@ if(GASMINER_POWER_KPA) active_power_usage = P * power_draw_dynamic_kpa_coeff if(GASMINER_POWER_FULLSCALE) - active_power_usage = (spawn_mol * power_draw_dynamic_mol_coeff) + (P * power_draw_dynamic_kpa_coeff) + active_power_usage = (spawn_mol * power_draw_dynamic_mol_coeff) + (P * power_draw_dynamic_kpa_coeff) + power_draw_static /obj/machinery/atmospherics/miner/proc/do_use_power(amount) var/turf/T = get_turf(src) @@ -117,7 +120,7 @@ on_overlay.color = overlay_color add_overlay(on_overlay) -/obj/machinery/atmospherics/miner/process() +/obj/machinery/atmospherics/miner/process_atmos() //TODO figure out delta_time for this update_power() check_operation() if(active && !broken) @@ -126,12 +129,12 @@ if(do_use_power(active_power_usage)) mine_gas() -/obj/machinery/atmospherics/miner/proc/mine_gas() +/obj/machinery/atmospherics/miner/proc/mine_gas(delta_time = 2) var/turf/open/O = get_turf(src) if(!isopenturf(O)) return FALSE var/datum/gas_mixture/merger = new - merger.set_moles(spawn_id, spawn_mol) + merger.set_moles(spawn_id, spawn_mol * delta_time) merger.set_temperature(spawn_temp) O.assume_air(merger) O.air_update_turf(TRUE) @@ -144,34 +147,81 @@ /obj/machinery/atmospherics/miner/n2o name = "\improper N2O Gas Miner" overlay_color = "#FFCCCC" - spawn_id = /datum/gas/nitrous_oxide + spawn_id = GAS_NITROUS /obj/machinery/atmospherics/miner/nitrogen name = "\improper N2 Gas Miner" overlay_color = "#CCFFCC" - spawn_id = /datum/gas/nitrogen + spawn_id = GAS_N2 /obj/machinery/atmospherics/miner/oxygen name = "\improper O2 Gas Miner" overlay_color = "#007FFF" - spawn_id = /datum/gas/oxygen + spawn_id = GAS_O2 /obj/machinery/atmospherics/miner/toxins name = "\improper Plasma Gas Miner" overlay_color = "#FF0000" - spawn_id = /datum/gas/plasma + spawn_id = GAS_PLASMA /obj/machinery/atmospherics/miner/carbon_dioxide name = "\improper CO2 Gas Miner" overlay_color = "#CDCDCD" - spawn_id = /datum/gas/carbon_dioxide + spawn_id = GAS_CO2 /obj/machinery/atmospherics/miner/bz name = "\improper BZ Gas Miner" overlay_color = "#FAFF00" - spawn_id = /datum/gas/bz + spawn_id = GAS_BZ /obj/machinery/atmospherics/miner/water_vapor name = "\improper Water Vapor Gas Miner" overlay_color = "#99928E" - spawn_id = /datum/gas/water_vapor + spawn_id = GAS_H2O + +/obj/machinery/atmospherics/miner/station + power_draw = GASMINER_POWER_FULLSCALE + spawn_mol = MOLES_CELLSTANDARD / 10 + max_ext_kpa = 2500 + +/obj/machinery/atmospherics/miner/station/n2o + name = "\improper N2O Gas Miner" + overlay_color = "#FFCCCC" + spawn_id = GAS_NITROUS + +/obj/machinery/atmospherics/miner/station/nitrogen + name = "\improper N2 Gas Miner" + overlay_color = "#CCFFCC" + spawn_id = GAS_N2 + +/obj/machinery/atmospherics/miner/station/oxygen + name = "\improper O2 Gas Miner" + overlay_color = "#007FFF" + spawn_id = GAS_O2 + +/obj/machinery/atmospherics/miner/station/toxins + name = "\improper Plasma Gas Miner" + overlay_color = "#FF0000" + spawn_id = GAS_PLASMA + +/obj/machinery/atmospherics/miner/station/carbon_dioxide + name = "\improper CO2 Gas Miner" + overlay_color = "#CDCDCD" + spawn_id = GAS_CO2 + +/obj/machinery/atmospherics/miner/station/bz + name = "\improper BZ Gas Miner" + overlay_color = "#FAFF00" + spawn_id = GAS_BZ + +/obj/machinery/atmospherics/miner/station/water_vapor + name = "\improper Water Vapor Gas Miner" + overlay_color = "#99928E" + spawn_id = GAS_H2O + + +#undef GASMINER_POWER_NONE +#undef GASMINER_POWER_STATIC +#undef GASMINER_POWER_MOLES +#undef GASMINER_POWER_KPA +#undef GASMINER_POWER_FULLSCALE diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index 66475be45a212..23169af7e56a1 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -6,6 +6,7 @@ buckle_lying = -1 var/icon_temperature = T20C //stop small changes in temperature causing icon refresh resistance_flags = LAVA_PROOF | FIRE_PROOF + interacts_with_air = TRUE /obj/machinery/atmospherics/pipe/heat_exchanging/Initialize() . = ..() @@ -25,9 +26,7 @@ var/turf/T = loc if(istype(T)) - if(islava(T)) - environment_temperature = 5000 - else if(T.blocks_air) + if(T.blocks_air) environment_temperature = T.return_temperature() else var/turf/open/OT = T @@ -35,8 +34,9 @@ else environment_temperature = T.return_temperature() - if(abs(environment_temperature-pipe_air.return_temperature()) > minimum_temperature_difference) - parent.temperature_interact(T, volume, thermal_conductivity) + if(pipe_air != null) + if(abs(environment_temperature-pipe_air.return_temperature()) > minimum_temperature_difference) + parent.temperature_interact(T, volume, thermal_conductivity) //heatup/cooldown any mobs buckled to ourselves based on our temperature @@ -50,7 +50,7 @@ L.bodytemperature = avg_temp pipe_air.set_temperature(avg_temp) -/obj/machinery/atmospherics/pipe/heat_exchanging/process() +/obj/machinery/atmospherics/pipe/heat_exchanging/process(delta_time) if(!parent) return //machines subsystem fires before atmos is initialized so this prevents race condition runtimes @@ -79,4 +79,4 @@ if(pipe_air.return_temperature() > heat_limit + 1) for(var/m in buckled_mobs) var/mob/living/buckled_mob = m - buckled_mob.apply_damage(4 * log(pipe_air.return_temperature() - heat_limit), BURN, BODY_ZONE_CHEST) + buckled_mob.apply_damage(delta_time * 2 * log(pipe_air.return_temperature() - heat_limit), BURN, BODY_ZONE_CHEST) diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm index db7656c2b3274..a5888ceeb0a98 100644 --- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm +++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm @@ -8,7 +8,6 @@ pipe_flags = PIPING_ALL_LAYER | PIPING_DEFAULT_LAYER_ONLY | PIPING_CARDINAL_AUTONORMALIZE piping_layer = PIPING_LAYER_DEFAULT device_type = 0 - volume = 260 construction_type = /obj/item/pipe/binary pipe_state = "manifoldlayer" FASTDMM_PROP(\ @@ -20,6 +19,7 @@ var/list/back_nodes /obj/machinery/atmospherics/pipe/layer_manifold/Initialize() + volume = 280 //260 isn't divisible by 35 bull this is 280L front_nodes = list() back_nodes = list() icon_state = "manifoldlayer_center" @@ -35,8 +35,9 @@ back_nodes = null nodes = list() for(var/obj/machinery/atmospherics/A in needs_nullifying) - A.disconnect(src) - A.build_network() + if(A != null && src != null) //if it's already null why are we doing this? The answer is byond... it'll always find a way + A.disconnect(src) + SSair.add_to_rebuild_queue(A) /obj/machinery/atmospherics/pipe/layer_manifold/proc/get_all_connected_nodes() return front_nodes + back_nodes + nodes @@ -74,9 +75,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold/SetInitDirections() switch(dir) - if(NORTH || SOUTH) + if(NORTH, SOUTH) initialize_directions = NORTH|SOUTH - if(EAST || WEST) + if(EAST, WEST) initialize_directions = EAST|WEST /obj/machinery/atmospherics/pipe/layer_manifold/isConnectable(obj/machinery/atmospherics/target, given_layer) diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index 60668f77eab67..41831924cd6c0 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -28,7 +28,7 @@ var/obj/machinery/atmospherics/oldN = nodes[i] ..() if(oldN) - oldN.build_network() + SSair.add_to_rebuild_queue(oldN) /obj/machinery/atmospherics/pipe/destroy_network() QDEL_NULL(parent) @@ -55,14 +55,19 @@ air_update_turf() /obj/machinery/atmospherics/pipe/return_air() - return parent.air + if(parent) + return parent.air /obj/machinery/atmospherics/pipe/return_analyzable_air() - return parent.air + if(parent) + return parent.air /obj/machinery/atmospherics/pipe/remove_air(amount) return parent.air.remove(amount) +/obj/machinery/atmospherics/pipe/remove_air_ratio(ratio) + return parent.air.remove_ratio(ratio) + /obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pipe_meter)) var/obj/item/pipe_meter/meter = W @@ -72,7 +77,8 @@ return ..() /obj/machinery/atmospherics/pipe/returnPipenet() - return parent + if(parent) + return parent.air /obj/machinery/atmospherics/pipe/setPipenet(datum/pipeline/P) parent = P diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index d088464387389..1291163a9b701 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -9,7 +9,6 @@ var/valve_open = FALSE - var/obj/machinery/atmospherics/components/binary/passive_gate/pump var/release_log = "" volume = 1000 @@ -19,12 +18,12 @@ var/can_max_release_pressure = (ONE_ATMOSPHERE * 10) var/can_min_release_pressure = (ONE_ATMOSPHERE / 10) - armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 50) + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 50, "stamina" = 0) max_integrity = 250 integrity_failure = 100 pressure_resistance = 7 * ONE_ATMOSPHERE var/temperature_resistance = 1000 + T0C - var/starter_temp + var/starter_temp = T20C // Prototype vars var/prototype = FALSE var/valve_timer = null @@ -66,37 +65,37 @@ name = "n2 canister" desc = "Nitrogen gas. Reportedly useful for something." icon_state = "red" - gas_type = /datum/gas/nitrogen + gas_type = GAS_N2 /obj/machinery/portable_atmospherics/canister/oxygen name = "o2 canister" desc = "Oxygen. Necessary for human life." icon_state = "blue" - gas_type = /datum/gas/oxygen + gas_type = GAS_O2 /obj/machinery/portable_atmospherics/canister/carbon_dioxide name = "co2 canister" desc = "Carbon dioxide. What the fuck is carbon dioxide?" icon_state = "black" - gas_type = /datum/gas/carbon_dioxide + gas_type = GAS_CO2 /obj/machinery/portable_atmospherics/canister/toxins name = "plasma canister" desc = "Plasma gas. The reason YOU are here. Highly toxic." icon_state = "orange" - gas_type = /datum/gas/plasma + gas_type = GAS_PLASMA /obj/machinery/portable_atmospherics/canister/bz name = "\improper BZ canister" desc = "BZ, a powerful hallucinogenic nerve agent." icon_state = "purple" - gas_type = /datum/gas/bz + gas_type = GAS_BZ /obj/machinery/portable_atmospherics/canister/nitrous_oxide name = "n2o canister" desc = "Nitrous oxide gas. Known to cause drowsiness." icon_state = "redws" - gas_type = /datum/gas/nitrous_oxide + gas_type = GAS_NITROUS /obj/machinery/portable_atmospherics/canister/air name = "air canister" @@ -107,44 +106,44 @@ name = "tritium canister" desc = "Tritium. Inhalation might cause irradiation." icon_state = "green" - gas_type = /datum/gas/tritium + gas_type = GAS_TRITIUM /obj/machinery/portable_atmospherics/canister/nob name = "hyper-noblium canister" desc = "Hyper-Noblium. More noble than all other gases." icon_state = "freon" - gas_type = /datum/gas/hypernoblium + gas_type = GAS_HYPERNOB /obj/machinery/portable_atmospherics/canister/nitryl name = "nitryl canister" desc = "Nitryl gas. Feels great 'til the acid eats your lungs." icon_state = "brown" - gas_type = /datum/gas/nitryl + gas_type = GAS_NITRYL /obj/machinery/portable_atmospherics/canister/stimulum name = "stimulum canister" desc = "Stimulum. High energy gas, high energy people." icon_state = "darkpurple" - gas_type = /datum/gas/stimulum + gas_type = GAS_STIMULUM /obj/machinery/portable_atmospherics/canister/pluoxium name = "pluoxium canister" desc = "Pluoxium. Like oxygen, but more bang for your buck." icon_state = "darkblue" - gas_type = /datum/gas/pluoxium + gas_type = GAS_PLUOXIUM /obj/machinery/portable_atmospherics/canister/water_vapor name = "water vapor canister" desc = "Water Vapor. We get it, you vape." icon_state = "water_vapor" - gas_type = /datum/gas/water_vapor + gas_type = GAS_H2O filled = 1 /obj/machinery/portable_atmospherics/canister/miasma name = "miasma canister" desc = "Miasma. Makes you wish your nose was blocked." icon_state = "miasma" - gas_type = /datum/gas/miasma + gas_type = GAS_MIASMA filled = 1 @@ -181,7 +180,7 @@ name = "prototype canister" desc = "A prototype canister for a prototype bike, what could go wrong?" icon_state = "proto" - gas_type = /datum/gas/oxygen + gas_type = GAS_O2 filled = 1 release_pressure = ONE_ATMOSPHERE*2 @@ -200,29 +199,21 @@ air_contents.copy_from(existing_mixture) else create_gas() - pump = new(src, FALSE) - pump.on = TRUE - pump.stat = 0 - pump.build_network() - update_icon() -/obj/machinery/portable_atmospherics/canister/Destroy() - qdel(pump) - pump = null - return ..() /obj/machinery/portable_atmospherics/canister/proc/create_gas() if(gas_type) if(starter_temp) air_contents.set_temperature(starter_temp) + if(!air_contents.return_volume()) + CRASH("Auxtools is failing somehow! Gas with pointer [air_contents._extools_pointer_gasmixture] is not valid.") air_contents.set_moles(gas_type, (maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) /obj/machinery/portable_atmospherics/canister/air/create_gas() - if(starter_temp) - air_contents.set_temperature(starter_temp) - air_contents.set_moles(/datum/gas/oxygen, (O2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) - air_contents.set_moles(/datum/gas/nitrogen, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) + air_contents.set_temperature(starter_temp) + air_contents.set_moles(GAS_O2, (O2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) + air_contents.set_moles(GAS_N2, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) #define CANISTER_UPDATE_HOLDING (1<<0) #define CANISTER_UPDATE_CONNECTED (1<<1) @@ -317,9 +308,8 @@ /obj/machinery/portable_atmospherics/canister/proc/canister_break() disconnect() - var/datum/gas_mixture/expelled_gas = air_contents.remove(air_contents.total_moles()) var/turf/T = get_turf(src) - T.assume_air(expelled_gas) + T.assume_air(air_contents) air_update_turf() stat |= BROKEN @@ -349,21 +339,20 @@ if(timing && valve_timer < world.time) valve_open = !valve_open timing = FALSE + + // Handle gas transfer. if(valve_open) var/turf/T = get_turf(src) - pump.airs[1] = air_contents - pump.airs[2] = holding ? holding.air_contents : T.return_air() - pump.target_pressure = release_pressure - - pump.process_atmos() // Pump gas. - if(!holding) - air_update_turf() // Update the environment if needed. - else - pump.airs[1] = null - pump.airs[2] = null + var/datum/gas_mixture/target_air = holding ? holding.air_contents : T.return_air() + if(air_contents.release_gas_to(target_air, release_pressure) && !holding) + air_update_turf() update_icon() +/obj/machinery/portable_atmospherics/canister/ui_status(mob/user) + . = ..() + if(. > UI_UPDATE && !allowed(user)) + . = UI_UPDATE /obj/machinery/portable_atmospherics/canister/ui_state(mob/user) return GLOB.physical_state @@ -373,6 +362,7 @@ if(!ui) ui = new(user, src, "Canister") ui.open() + ui.set_autoupdate(TRUE) // Canister pressure, tank pressure, prototype canister timer /obj/machinery/portable_atmospherics/canister/ui_data() var/data = list() @@ -415,12 +405,14 @@ desc = initial(replacement.desc) icon_state = initial(replacement.icon_state) if("restricted") + if(!prototype) + return // Prototype canister only feature restricted = !restricted if(restricted) req_access = list(ACCESS_ENGINE) else req_access = list() - . = TRUE + . = TRUE if("pressure") var/pressure = params["pressure"] if(pressure == "reset") @@ -450,10 +442,10 @@ if(!holding) var/list/danger = list() for(var/id in air_contents.get_gases()) - if(!GLOB.meta_gas_info[id][META_GAS_DANGER]) + if(!(GLOB.gas_data.flags[id] & GAS_FLAG_DANGEROUS)) continue - if(air_contents.get_moles(id) > (GLOB.meta_gas_info[id][META_GAS_MOLES_VISIBLE] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility - danger[GLOB.meta_gas_info[id][META_GAS_NAME]] = air_contents.get_moles(id) //ex. "plasma" = 20 + if(air_contents.get_moles(id) > (GLOB.gas_data.visibility[id] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility + danger[GLOB.gas_data.names[id]] = air_contents.get_moles(id) //ex. "plasma" = 20 if(danger.len) message_admins("[ADMIN_LOOKUPFLW(usr)] opened a canister that contains the following at [ADMIN_VERBOSEJMP(src)]:") @@ -467,15 +459,21 @@ investigate_log(logmsg, INVESTIGATE_ATMOS) release_log += logmsg . = TRUE + /* // Apparently the timer isn't present in TGUI - commenting out so it can't be used via exploits if("timer") + if(!prototype) + return var/change = params["change"] switch(change) if("reset") timer_set = default_timer_set + . = TRUE if("decrease") timer_set = max(minimum_timer_set, timer_set - 10) + . = TRUE if("increase") timer_set = min(maximum_timer_set, timer_set + 10) + . = TRUE if("input") var/user_input = input(usr, "Set time to valve toggle.", name) as null|num if(!user_input) @@ -488,6 +486,8 @@ . = TRUE if("toggle_timer") set_active() + . = TRUE + */ if("eject") if(holding) if(valve_open) @@ -495,4 +495,5 @@ investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transferring into the air.", INVESTIGATE_ATMOS) replace_tank(usr, FALSE) . = TRUE - update_icon() + if(.) + update_icon() diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 4d537624ab32d..ca26846171b0c 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/atmos.dmi' use_power = NO_POWER_USE max_integrity = 250 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 60, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 60, "acid" = 30, "stamina" = 0) anchored = FALSE var/datum/gas_mixture/air_contents @@ -16,7 +16,7 @@ /obj/machinery/portable_atmospherics/New() ..() - SSair.atmos_machinery += src + SSair.atmos_air_machinery += src air_contents = new(volume) air_contents.set_temperature(T20C) @@ -24,11 +24,12 @@ return 1 /obj/machinery/portable_atmospherics/Destroy() - SSair.atmos_machinery -= src - + SSair.atmos_air_machinery -= src disconnect() qdel(air_contents) air_contents = null + + SSair.atmos_machinery -= src return ..() @@ -45,7 +46,7 @@ return ..() /obj/machinery/portable_atmospherics/process_atmos() - if(!connected_port) // Pipe network handles reactions if connected. + if(!connected_port && air_contents != null && src != null) // Pipe network handles reactions if connected. air_contents.react(src) /obj/machinery/portable_atmospherics/return_air() @@ -66,8 +67,7 @@ //Perform the connection connected_port = new_port connected_port.connected_device = src - var/datum/pipeline/connected_port_parent = connected_port.parents[1] - connected_port_parent.reconcile_air() + connected_port.parents[1].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED anchored = TRUE //Prevent movement pixel_x = new_port.pixel_x @@ -104,8 +104,8 @@ /obj/machinery/portable_atmospherics/examine(mob/user) . = ..() if(holding) - . += {"\The [src] contains [holding]. Alt-click [src] to remove it. - Click [src] with another gas tank to hot swap [holding]."} + . += "\The [src] contains [holding]. Alt-click [src] to remove it.\n"+\ + "Click [src] with another gas tank to hot swap [holding]." /obj/machinery/portable_atmospherics/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank) if(holding) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 769c457abdca4..54b225b7a8574 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -13,6 +13,7 @@ var/on = FALSE var/direction = PUMP_OUT + var/target_pressure = ONE_ATMOSPHERE var/obj/machinery/atmospherics/components/binary/pump/pump volume = 1000 @@ -22,7 +23,7 @@ pump = new(src, FALSE) pump.on = TRUE pump.stat = 0 - pump.build_network() + SSair.add_to_rebuild_queue(pump) /obj/machinery/portable_atmospherics/pump/Destroy() var/turf/T = get_turf(src) @@ -91,6 +92,7 @@ if(!ui) ui = new(user, src, "PortablePump") ui.open() + ui.set_autoupdate(TRUE) // Air pressure, tank pressure /obj/machinery/portable_atmospherics/pump/ui_data() var/data = list() @@ -118,8 +120,8 @@ if("power") on = !on if(on && !holding) - var/plasma = air_contents.get_moles(/datum/gas/plasma) - var/n2o = air_contents.get_moles(/datum/gas/nitrous_oxide) + var/plasma = air_contents.get_moles(GAS_PLASMA) + var/n2o = air_contents.get_moles(GAS_NITROUS) if(n2o || plasma) message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]") log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]") @@ -155,4 +157,5 @@ if(holding) replace_tank(usr, FALSE) . = TRUE - update_icon() + if(.) + update_icon() diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 8cb8c55908d7f..105deda497567 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -7,9 +7,10 @@ var/on = FALSE var/volume_rate = 1000 + var/overpressure_m = 80 volume = 1000 - var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor) + var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_NITRYL, GAS_TRITIUM, GAS_HYPERNOB, GAS_H2O) /obj/machinery/portable_atmospherics/scrubber/Destroy() var/turf/T = get_turf(src) @@ -38,15 +39,10 @@ scrub(T.return_air()) /obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture) - var/transfer_moles = min(1, volume_rate / mixture.return_volume()) * mixture.total_moles() - - var/datum/gas_mixture/filtering = mixture.remove(transfer_moles) // Remove part of the mixture to filter. - if(!filtering) + if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE) return - filtering.scrub_into(air_contents, scrubbing) - - mixture.merge(filtering) // Returned the cleaned gas. + mixture.scrub_into(air_contents, volume_rate / mixture.return_volume(), scrubbing) if(!holding) air_update_turf() @@ -68,6 +64,7 @@ if(!ui) ui = new(user, src, "PortableScrubber") ui.open() + ui.set_autoupdate(TRUE) // Air pressure, tank pressure /obj/machinery/portable_atmospherics/scrubber/ui_data() var/data = list() @@ -77,9 +74,8 @@ data["id_tag"] = -1 //must be defined in order to reuse code between portable and vent scrubbers data["filter_types"] = list() - for(var/path in GLOB.meta_gas_info) - var/list/gas = GLOB.meta_gas_info[path] - data["filter_types"] += list(list("gas_id" = gas[META_GAS_ID], "gas_name" = gas[META_GAS_NAME], "enabled" = (path in scrubbing))) + for(var/id in GLOB.gas_data.ids) + data["filter_types"] += list(list("gas_id" = id, "gas_name" = GLOB.gas_data.names[id], "enabled" = (id in scrubbing))) if(holding) data["holding"] = list() @@ -111,9 +107,10 @@ replace_tank(usr, FALSE) . = TRUE if("toggle_filter") - scrubbing ^= gas_id2path(params["val"]) + scrubbing ^= params["val"] . = TRUE - update_icon() + if(.) + update_icon() /obj/machinery/portable_atmospherics/scrubber/huge name = "huge air scrubber" @@ -122,6 +119,7 @@ active_power_usage = 500 idle_power_usage = 10 + overpressure_m = 200 volume_rate = 1500 volume = 50000 diff --git a/code/modules/atmospherics/multiz.dm b/code/modules/atmospherics/multiz.dm index 75b628ccc362b..999855f278373 100644 --- a/code/modules/atmospherics/multiz.dm +++ b/code/modules/atmospherics/multiz.dm @@ -3,27 +3,43 @@ desc = "An adapter which allows pipes to connect to other pipenets on different decks." icon_state = "multiz_pipe" icon = 'icons/obj/atmos.dmi' + level = 2 //Always visible. + +/obj/machinery/atmospherics/pipe/simple/multiz/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/pipe/simple/multiz/layer3 + piping_layer = 3 /obj/machinery/atmospherics/pipe/simple/multiz/update_icon() . = ..() cut_overlays() //This adds the overlay showing it's a multiz pipe. This should go above turfs and such var/image/multiz_overlay_node = new(src) //If we have a firing state, light em up! multiz_overlay_node.icon = 'icons/obj/atmos.dmi' - multiz_overlay_node.icon_state = "multiz_pipe" + multiz_overlay_node.icon_state = "multiz_pipe-[piping_layer]" multiz_overlay_node.layer = HIGH_OBJ_LAYER add_overlay(multiz_overlay_node) ///Attempts to locate a multiz pipe that's above us, if it finds one it merges us into its pipenet -/obj/machinery/atmospherics/pipe/simple/multiz/pipeline_expansion() +/obj/machinery/atmospherics/pipe/simple/multiz/pipeline_expansion(expand_up = TRUE, expand_down = TRUE) icon = 'icons/obj/atmos.dmi' //Just to refresh. var/turf/T = get_turf(src) - var/obj/machinery/atmospherics/pipe/simple/multiz/above = locate(/obj/machinery/atmospherics/pipe/simple/multiz) in(SSmapping.get_turf_above(T)) - var/obj/machinery/atmospherics/pipe/simple/multiz/below = locate(/obj/machinery/atmospherics/pipe/simple/multiz) in(SSmapping.get_turf_below(T)) - if(below) - below.pipeline_expansion() //If we've got one below us, force it to add us on facebook - if(above) - nodes += above - above.nodes += src //Two way travel :) - return ..() - else - return ..() \ No newline at end of file + //Expand above pipes recursively + if(SSmapping.get_turf_above(T) && expand_up) + for(var/obj/machinery/atmospherics/pipe/simple/multiz/above in SSmapping.get_turf_above(T)) + if(above.piping_layer == piping_layer) + //Link ourself to the above node + nodes |= above + above.nodes |= src + //Link above node to their above nodes. + above.pipeline_expansion(TRUE, FALSE) + //Expand below pipes recursively + if(SSmapping.get_turf_below(T) && expand_down) + for(var/obj/machinery/atmospherics/pipe/simple/multiz/below in SSmapping.get_turf_below(T)) + if(below.piping_layer == piping_layer) + //Link ourself to the below node + nodes |= below + below.nodes |= src + //Link below node to their below nodes + below.pipeline_expansion(FALSE, TRUE) + return ..() diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index deb05920e2292..874f85fa2244e 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -1,8 +1,8 @@ /obj/machinery/artillerycontrol - var/reload = 60 - var/reload_cooldown = 60 + var/reload = 120 + var/reload_cooldown = 120 var/explosiondev = 3 var/explosionmed = 6 var/explosionlight = 12 @@ -11,9 +11,9 @@ icon = 'icons/obj/machines/particle_accelerator.dmi' density = TRUE -/obj/machinery/artillerycontrol/process() +/obj/machinery/artillerycontrol/process(delta_time) if(reload < reload_cooldown) - reload++ + reload += delta_time /obj/structure/artilleryplaceholder name = "artillery" @@ -45,7 +45,7 @@ if(reload < reload_cooldown) return if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr)) - priority_announce("Bluespace artillery fire detected. Brace for impact.") + priority_announce("Bluespace artillery fire detected. Brace for impact.", sound = SSstation.announcer.get_rand_alert_sound()) message_admins("[ADMIN_LOOKUPFLW(usr)] has launched an artillery strike.") var/list/L = list() for(var/turf/T in get_area_turfs(thearea.type)) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 0e96d7d8be29d..897276323e3b7 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -9,7 +9,7 @@ -/obj/item/twohanded/ctf +/obj/item/ctf name = "banner" icon = 'icons/obj/banner.dmi' icon_state = "banner" @@ -31,20 +31,28 @@ var/obj/effect/ctf/flag_reset/reset var/reset_path = /obj/effect/ctf/flag_reset -/obj/item/twohanded/ctf/Destroy() +/obj/item/ctf/Destroy() QDEL_NULL(reset) return ..() -/obj/item/twohanded/ctf/Initialize() +/obj/item/ctf/Initialize() . = ..() if(!reset) reset = new reset_path(get_turf(src)) + reset.flag = src -/obj/item/twohanded/ctf/process() +/obj/item/ctf/ComponentInitialize() + . = ..() + AddComponent(/datum/component/two_handed) + +/obj/item/ctf/process() if(is_ctf_target(loc)) //don't reset from someone's hands. return PROCESS_KILL if(world.time > reset_cooldown) - forceMove(get_turf(src.reset)) + var/turf/our_turf = get_turf(src.reset) + if(!our_turf) + return TRUE + forceMove(our_turf) for(var/mob/M in GLOB.player_list) var/area/mob_area = get_area(M) if(istype(mob_area, /area/ctf)) @@ -52,7 +60,7 @@ STOP_PROCESSING(SSobj, src) //ATTACK HAND IGNORING PARENT RETURN VALUE -/obj/item/twohanded/ctf/attack_hand(mob/living/user) +/obj/item/ctf/attack_hand(mob/living/user) if(!is_ctf_target(user) && !anyonecanpickup) to_chat(user, "Non players shouldn't be moving the flag!") return @@ -76,7 +84,7 @@ STOP_PROCESSING(SSobj, src) ..() -/obj/item/twohanded/ctf/dropped(mob/user) +/obj/item/ctf/dropped(mob/user) ..() user.anchored = FALSE user.status_flags |= CANPUSH @@ -89,7 +97,7 @@ anchored = TRUE -/obj/item/twohanded/ctf/red +/obj/item/ctf/red name = "red flag" icon_state = "banner-red" item_state = "banner-red" @@ -98,7 +106,7 @@ reset_path = /obj/effect/ctf/flag_reset/red -/obj/item/twohanded/ctf/blue +/obj/item/ctf/blue name = "blue flag" icon_state = "banner-blue" item_state = "banner-blue" @@ -112,6 +120,13 @@ icon_state = "banner" desc = "This is where a banner with Nanotrasen's logo on it would go." layer = LOW_ITEM_LAYER + var/obj/item/ctf/flag + +/obj/effect/ctf/flag_reset/Destroy() + if(flag) + flag.reset = null + flag = null + return ..() /obj/effect/ctf/flag_reset/red name = "red flag landmark" @@ -171,20 +186,19 @@ GLOB.poi_list.Remove(src) ..() -/obj/machinery/capture_the_flag/process() - for(var/i in spawned_mobs) - if(!i) - spawned_mobs -= i +/obj/machinery/capture_the_flag/process(delta_time) + for(var/mob/living/M as() in spawned_mobs) + if(QDELETED(M)) + spawned_mobs -= M continue // Anyone in crit, automatically reap - var/mob/living/M = i if(M.InCritical() || M.stat == DEAD) ctf_dust_old(M) else // The changes that you've been hit with no shield but not // instantly critted are low, but have some healing. - M.adjustBruteLoss(-5) - M.adjustFireLoss(-5) + M.adjustBruteLoss(-2.5 * delta_time) + M.adjustFireLoss(-2.5 * delta_time) /obj/machinery/capture_the_flag/red name = "Red CTF Controller" @@ -212,6 +226,9 @@ return + if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME)) + to_chat(user, "CTF has been temporarily disabled by admins.") + return people_who_want_to_play |= user.ckey var/num = people_who_want_to_play.len var/remaining = CTF_REQUIRED_PLAYERS - num @@ -264,7 +281,7 @@ /obj/machinery/capture_the_flag/proc/spawn_team_member(client/new_team_member) var/mob/living/carbon/human/M = new/mob/living/carbon/human(get_turf(src)) new_team_member.prefs.copy_to(M) - M.set_species(/datum/species/synth) + M.set_species(/datum/species/human) M.key = new_team_member.key M.faction += team M.equipOutfit(ctf_gear) @@ -277,8 +294,8 @@ attack_ghost(ghost) /obj/machinery/capture_the_flag/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/twohanded/ctf)) - var/obj/item/twohanded/ctf/flag = I + if(istype(I, /obj/item/ctf)) + var/obj/item/ctf/flag = I if(flag.team != src.team) user.transferItemToLoc(flag, get_turf(flag.reset), TRUE) points++ @@ -295,7 +312,7 @@ if(istype(mob_area, /area/ctf)) to_chat(M, "[team] team wins!") to_chat(M, "Teams have been cleared. Click on the machines to vote to begin another round.") - for(var/obj/item/twohanded/ctf/W in M) + for(var/obj/item/ctf/W in M) M.dropItemToGround(W) M.dust() for(var/obj/machinery/control_point/control in GLOB.machines) @@ -336,7 +353,7 @@ var/list/ctf_object_typecache = typecacheof(list( /obj/machinery, /obj/effect/ctf, - /obj/item/twohanded/ctf + /obj/item/ctf )) for(var/atm in A) if (isturf(A) || ismob(A) || isarea(A)) @@ -497,11 +514,11 @@ W.registered_name = H.real_name W.update_label(W.registered_name, W.assignment) - no_drops += H.get_item_by_slot(SLOT_WEAR_SUIT) - no_drops += H.get_item_by_slot(SLOT_GLOVES) - no_drops += H.get_item_by_slot(SLOT_SHOES) - no_drops += H.get_item_by_slot(SLOT_W_UNIFORM) - no_drops += H.get_item_by_slot(SLOT_EARS) + no_drops += H.get_item_by_slot(ITEM_SLOT_OCLOTHING) + no_drops += H.get_item_by_slot(ITEM_SLOT_GLOVES) + no_drops += H.get_item_by_slot(ITEM_SLOT_FEET) + no_drops += H.get_item_by_slot(ITEM_SLOT_ICLOTHING) + no_drops += H.get_item_by_slot(ITEM_SLOT_EARS) for(var/i in no_drops) var/obj/item/I = i ADD_TRAIT(I, TRAIT_NODROP, CAPTURE_THE_FLAG_TRAIT) @@ -641,6 +658,13 @@ for(var/obj/machinery/capture_the_flag/CTF in GLOB.machines) CTF.dead_barricades += src +/obj/effect/ctf/dead_barricade/Destroy() + for(var/obj/machinery/capture_the_flag/CTF in GLOB.machines) + //if(CTF.game_id != game_id) + // continue + CTF.dead_barricades -= src + return ..() + /obj/effect/ctf/dead_barricade/proc/respawn() if(!QDELETED(src)) new /obj/structure/barricade/security/ctf(get_turf(src)) @@ -657,11 +681,11 @@ resistance_flags = INDESTRUCTIBLE var/obj/machinery/capture_the_flag/controlling var/team = "none" - var/point_rate = 1 + var/point_rate = 0.5 -/obj/machinery/control_point/process() +/obj/machinery/control_point/process(delta_time) if(controlling) - controlling.control_points += point_rate + controlling.control_points += point_rate * delta_time if(controlling.control_points >= controlling.control_points_to_win) controlling.victory() diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 6975891b328d8..9a569fcadc7fa 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -36,6 +36,9 @@ /obj/effect/mob_spawn/attack_ghost(mob/user) if(!SSticker.HasRoundStarted() || !loc || !ghost_usable) return + if(!(GLOB.ghost_role_flags & GHOSTROLE_SPAWNER) && !(flags_1 & ADMIN_SPAWNED_1)) + to_chat(user, "An admin has temporarily disabled non-admin ghost roles!") + return if(!uses) to_chat(user, "This spawner is out of charges!") return @@ -60,6 +63,7 @@ else if(ghost_usable) GLOB.poi_list |= src LAZYADD(GLOB.mob_spawners[name], src) + SSmobs.update_spawners() /obj/effect/mob_spawn/Destroy() GLOB.poi_list -= src @@ -67,6 +71,7 @@ LAZYREMOVE(spawners, src) if(!LAZYLEN(spawners)) GLOB.mob_spawners -= name + SSmobs.update_spawners() return ..() /obj/effect/mob_spawn/proc/special(mob/M) @@ -469,7 +474,7 @@ outfit = /datum/outfit/nanotrasencommandercorpse /datum/outfit/nanotrasencommandercorpse - name = "Nanotrasen Private Security Commander" + name = "\improper Nanotrasen Private Security Commander" uniform = /obj/item/clothing/under/rank/centcom/commander suit = /obj/item/clothing/suit/armor/bulletproof ears = /obj/item/radio/headset/heads/captain @@ -483,7 +488,7 @@ /obj/effect/mob_spawn/human/nanotrasensoldier - name = "Nanotrasen Private Security Officer" + name = "\improper Nanotrasen Private Security Officer" id_job = "Private Security Force" id_access_list = list(ACCESS_CENT_CAPTAIN, ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE, ACCESS_SECURITY, ACCESS_MECH_SECURITY) outfit = /datum/outfit/nanotrasensoldiercorpse @@ -503,7 +508,7 @@ /obj/effect/mob_spawn/human/commander/alive death = FALSE roundstart = FALSE - mob_name = "Nanotrasen Commander" + mob_name = "\improper Nanotrasen Commander" name = "sleeper" icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper" diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index 7d73a394591c8..2ec007ba869d1 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -69,9 +69,9 @@ /obj/singularity/academy/admin_investigate_setup() return -/obj/singularity/academy/process() +/obj/singularity/academy/process(delta_time) eat() - if(prob(1)) + if(DT_PROB(0.5, delta_time)) mezzer() @@ -107,7 +107,7 @@ if(next_check < world.time) if(!current_wizard) for(var/mob/living/L in GLOB.player_list) - if(L.z == src.z && L.stat != DEAD && !(faction in L.faction)) + if(L.get_virtual_z_level() == src.get_virtual_z_level() && L.stat != DEAD && !(faction in L.faction)) summon_wizard() break else @@ -132,8 +132,10 @@ if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Wizard Academy Defender") - current_wizard.ghostize() // on the off chance braindead defender gets back in + current_wizard.ghostize(FALSE) // on the off chance braindead defender gets back in current_wizard.key = C.key + else + current_wizard.ghostize(FALSE,SENTIENCE_FORCE) /obj/structure/academy_wizard_spawner/proc/summon_wizard() var/turf/T = src.loc @@ -170,6 +172,7 @@ microwave_riggable = FALSE var/reusable = TRUE var/used = FALSE + var/roll_in_progress = FALSE /obj/item/dice/d20/fate/stealth name = "d20" @@ -192,6 +195,10 @@ /obj/item/dice/d20/fate/diceroll(mob/user) . = ..() + if(roll_in_progress) + to_chat(user, "The dice is already channeling its power! Be patient!") + return + if(!used) if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!") @@ -199,10 +206,9 @@ if(!reusable) used = TRUE - + roll_in_progress = TRUE var/turf/T = get_turf(src) T.visible_message("[src] flares briefly.") - addtimer(CALLBACK(src, .proc/effect, user, .), 1 SECONDS) /obj/item/dice/d20/fate/equipped(mob/user, slot) @@ -213,6 +219,7 @@ /obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user,roll) var/turf/T = get_turf(src) + switch(roll) if(1) //Dust @@ -321,7 +328,7 @@ if(17) //Tator Kit T.visible_message("A suspicious box appears!") - new /obj/item/storage/box/syndicate/bundle_A(drop_location()) + new /obj/item/storage/box/syndie_kit/bundle_A(drop_location()) do_smoke(0, drop_location()) if(18) //Captain ID @@ -338,6 +345,9 @@ //Free wizard! T.visible_message("Magic flows out of [src] and into [user]!") user.mind.make_Wizard() + //roll is completed, allow others players to roll the dice + roll_in_progress = FALSE + /datum/outfit/butler name = "Butler" diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index e9266faa4c9d7..c9ba3a6897a7f 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -45,7 +45,7 @@ var/active = 1 /obj/structure/firepit/Initialize() - ..() + . = ..() toggleFirepit() /obj/structure/firepit/interact(mob/living/user) @@ -111,6 +111,7 @@ eggsleft = 0 egg_type = null speak = list() + mobchatspan = "assistant" /*Cabin's forest. Removed in the new cabin map since it was buggy and I prefer manual placement.*/ /datum/mapGenerator/snowy diff --git a/code/modules/awaymissions/mission_code/TheFactory.dm b/code/modules/awaymissions/mission_code/TheFactory.dm new file mode 100644 index 0000000000000..35e85a38a2e46 --- /dev/null +++ b/code/modules/awaymissions/mission_code/TheFactory.dm @@ -0,0 +1,839 @@ +/obj/singularity/factory + name = "tear in the fabric of reality" + desc = "Your own comprehension of reality starts bending as you stare this." + icon = 'icons/effects/96x96.dmi' + icon_state = "boh_tear" + pixel_x = -32 + pixel_y = -32 + dissipate = 0 + move_self = 0 + grav_pull = 1 + +/obj/singularity/factory/admin_investigate_setup() + return + +//AREAS// +//"old" means places we get in after the rune transition + +/area/awaymission/factory + teleport_restriction = TELEPORT_ALLOW_NONE + +/area/awaymission/factory/secret + name = "secrets" + ambientsounds = list('sound/ambience/secrets.ogg','sound/ambience/ambiholy2.ogg') + +/area/awaymission/factory/villageafter + name = "The Village" + ambientsounds = list('sound/ambience/seag1.ogg', 'sound/ambience/seag2.ogg', 'sound/ambience/seag2.ogg', 'sound/ambience/ambiodd.ogg', 'sound/ambience/ambimystery.ogg', 'sound/ambience/ambiearth.ogg', 'sound/ambience/ambiwind.ogg', 'sound/ambience/ambimine.ogg') + dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + requires_power = FALSE + +/area/awaymission/factory/villageafter/church + name = "The Church" + ambience_index = AMBIENCE_HOLY + +/area/awaymission/factory/villageafter/house + ambientsounds = list('sound/ambience/ambiruin4.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin2.ogg') + +/area/awaymission/factory/villageafter/house/ritual + ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiruin2.ogg','sound/spookoween/insane_low_laugh.ogg') + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/villageafter/house/start + name = "The House" + ambientsounds = list('sound/ambience/ambidet2.ogg','sound/ambience/ambiodd.ogg') + +/area/awaymission/factory/villageafter/hospital + ambientsounds = list('sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin2.ogg') + name = "The Hospital" + requires_power = TRUE + +/area/awaymission/factory/villageafter/spooky + ambience_index = AMBIENCE_SPOOKY + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/factoryafter + name = "The Factory" + ambientsounds = list('sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg') + requires_power = TRUE + always_unpowered = TRUE + +/area/awaymission/factory/clownplanet + dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + ambientsounds = list('sound/spookoween/scary_horn3.ogg','sound/spookoween/scary_horn.ogg','sound/spookoween/scary_horn2.ogg','sound/spookoween/scary_clown_appear.ogg') + mood_bonus = 3 + mood_message = "I hate this!\n" + +/area/awaymission/factory/factoryafter/down + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg') + requires_power = FALSE + always_unpowered = FALSE + dynamic_lighting = DYNAMIC_LIGHTING_FORCED + +/area/awaymission/factory/factoryafter/down/maint + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg') + +/area/awaymission/factory/factoryafter/down/batsecret + name = "The maze" + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg','sound/ambience/ambibasement.ogg') + +/area/awaymission/factory/factoryafter/down/leveltwo + name = "The Factory - middle level" + ambientsounds = list('sound/ambience/ambigen7.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambireebe1.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambigen14.ogg') + +/area/awaymission/factory/factoryafter/down/leveltwo/morgue + name = "The Morgue" + ambience_index = AMBIENCE_SPOOKY + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/factoryafter/down/leveltwo/ritual + name = "a strange place" + ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambireebe2.ogg','sound/spookoween/insane_low_laugh.ogg','sound/spookoween/chain_rattling.ogg') + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/factoryafter/down/levelthree + name = "The Factory - lower level" + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambitech2.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambiatmos2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambimaint5.ogg','sound/ambience/ambireebe3.ogg','sound/ambience/ambilava.ogg') + +/area/awaymission/factory/factoryafter/down/levelthree/engine + name = "The reality engine" + ambientsounds = list('sound/ambience/singulambience.ogg','sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg','sound/ambience/antag/assimilation.ogg') + mood_bonus = 1 + mood_message = "Uhm... Ok?... I guess...\n" + +/area/awaymission/factory/factoryduring + name = "The old Factory" + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatm1.ogg','sound/ambience/ambiatmos.ogg') + +/area/awaymission/factory/factoryduring/down/levelthree + name = "The old Factory - lower level" + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambitech2.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambiatmos2.ogg','sound/ambience/signal.ogg','sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiruin2.ogg') + +/area/awaymission/factory/factoryduring/down/levelthree/engine + name = "The old reality engine" + mood_bonus = 1 + mood_message = "Uhm... Ok?... I guess...\n" + ambientsounds = list('sound/ambience/singulambience.ogg','sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg','sound/ambience/antag/assimilation.ogg','sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg') + name = "The reality engine" + +/area/awaymission/factory/factoryduring/down/leveltwo + name = "The old Factory - middle level" + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiruin5.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg') + +/area/awaymission/factory/factoryduring/down/leveltwo/ritual + name = "a strange place" + ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/spookoween/insane_low_laugh.ogg','sound/spookoween/spookywind.ogg') + +/area/awaymission/factory/factoryduring/down/leveltwo/morgue + name = "The old Morgue" + ambience_index = AMBIENCE_SPOOKY + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/factoryduring/down/leveltwo/asylum + name = "The sector of mentally disordered" + ambientsounds = list('sound/ambience/ambimo2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambireebe1.ogg') + +/area/awaymission/factory/factoryduring/down + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatm1.ogg') + +/area/awaymission/factory/factoryduring/down/maint + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg') + +/area/awaymission/factory/villageduring + name = "The old village" + dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + requires_power = FALSE + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiearthduring.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambimine.ogg') + +/area/awaymission/factory/villageduring/house + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiearthduring.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambimine.ogg','sound/ambience/ambiruin4.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin2.ogg','sound/ambience/signal.ogg') + +/area/awaymission/factory/villageduring/house/ritual + ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiruin2.ogg','sound/spookoween/insane_low_laugh.ogg') + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/villageduring/church + name = "The old Church" + ambience_index = AMBIENCE_HOLY + +/area/awaymission/factory/villageduring/church/leveltwo + name = "The old Church - 2nd floor" + ambientsounds = list('sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg','sound/ambience/signal.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambiholy3.ogg') + +/area/awaymission/factory/villageduring/basement + name = "The old basement" + ambientsounds = list('sound/ambience/ambibasement.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg') + dynamic_lighting = DYNAMIC_LIGHTING_FORCED + +/area/awaymission/factory/villageduring/house/start + name = "The old House" + ambientsounds = list('sound/ambience/ambidet2.ogg') + +/area/awaymission/factory/villageduring/hospital + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin2.ogg') + name = "The Hospital" + +/area/awaymission/factory/transition + name = "Beyond the time" + dynamic_lighting = DYNAMIC_LIGHTING_FORCED + ambientsounds = list('sound/ambience/shipambience.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/antag/malf.ogg','sound/ambience/signal.ogg','sound/ambience/ambimalf.ogg') + +//ITEMS// + +/obj/item/statuebust/toy + name = "aesthetic bust" + desc = "A priceless ancient marble bust, the kind that belongs in a museum. Looks like this one has some differences." + var/cooldown = 0 + +/obj/item/statuebust/toy/attack_self(mob/user) + if (cooldown < world.time) + cooldown = world.time + 450 + user.visible_message("[user] activates \the [src].", "You activate \the [src]!", "You hear a music playing.") + playsound(src, 'sound/ambience/ambivapor1.ogg', 50, 0) + else + to_chat(user, "Nothing happens!") + +/obj/item/clothing/glasses/hud/terminator + name = "T-80 tactical sunglasses" + desc = "Strangely ancient technology used to help provide rudimentary eye cover. Also shows information about criminals and their condition. Has enhanced shielding which blocks flashes." + icon_state = "t80sunglasses" + darkness_view = 1 + clothing_flags = SCAN_REAGENTS + vision_flags = SEE_MOBS + flash_protect = 1 + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + hud_type = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_DIAGNOSTIC_BASIC, DATA_HUD_MEDICAL_ADVANCED) + hud_trait = list(TRAIT_SECURITY_HUD, TRAIT_MEDICAL_HUD) + +//MOBS// + +/mob/living/simple_animal/hostile/proc/summon_backup_nosound(distance, exact_faction_match) + do_alert_animation(src) + for(var/mob/living/simple_animal/hostile/M in oview(distance, GET_TARGETS_FROM(src))) + if(faction_check_mob(M, TRUE)) + if(M.AIStatus == AI_OFF) + return + else + M.Goto(src,M.move_to_delay,M.minimum_distance) + +/mob/living/simple_animal/hostile/factory + name = "Guard" + desc = "An armed officer. Looks like they prefer to shoot rather than asking questions." + speak = list("Stop resisting!","I need backup!","Die, freak!","It's getting away!") + icon = 'icons/mob/simple_human.dmi' + icon_state = "nanotrasen" + icon_living = "nanotrasen" + icon_dead = null + icon_gib = "syndicate_gib" + mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) + turns_per_move = 5 + speak_chance = 5 + del_on_death = TRUE + do_footstep = TRUE + environment_smash = ENVIRONMENT_SMASH_STRUCTURES + search_objects = 1 + a_intent = INTENT_HARM + attack_sound = 'sound/weapons/cqchit2.ogg' + attacktext = "punches" + robust_searching = 1 + melee_damage = 12 + speed = 0 + maxHealth = 100 + health = 100 + melee_damage = 12 + stat_attack = UNCONSCIOUS + faction = list("nanotrasenprivate") + status_flags = CANPUSH + atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 10 + loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + response_help = "pokes" + response_disarm = "shoves" + response_harm = "hits" + var/cooldown = 0 + +/mob/living/simple_animal/hostile/factory/death(gibbed) + var/chosen_sound = pick('sound/creatures/guarddeath.ogg','sound/creatures/guarddeath2.ogg','sound/creatures/guarddeath3.ogg','sound/creatures/guarddeath4.ogg') + playsound(get_turf(src), chosen_sound, 100, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/factory/Aggro() + ..() + var/list/possible_sounds = list('sound/effects/radio1.ogg','sound/effects/radio2.ogg','sound/effects/radio3.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) // So we don't repeat the sound and the phrase every time we get hit and do it at least each 30 seconds + cooldown = world.time + 300 + summon_backup_nosound(10) + playsound(get_turf(src), chosen_sound, 100, 0, 0) + var/list/possible_phrases = list("Anomaly spotted! Send backup!","Intruder over here!","Hostile spotted, get them!") + var/chosen_phrase = pick(possible_phrases) + say(chosen_phrase) + else + return + +/mob/living/simple_animal/hostile/factory/ranged + icon_state = "nanotrasenranged" + icon_living = "nanotrasenranged" + ranged_cooldown_time = 15 + ranged = 1 + retreat_distance = 3 + minimum_distance = 5 + casingtype = /obj/item/ammo_casing/c45 + projectilesound = 'sound/weapons/gunshot.ogg' + loot = list(/obj/item/gun/ballistic/automatic/pistol/m1911, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + +/mob/living/simple_animal/hostile/factory/ranged/lmg + desc = "This one is carrying a bigger gun. Seek for cover." + icon_state = "nanotrasenrangedlmg" + icon_living = "nanotrasenrangedlmg" + projectilesound = 'sound/weapons/rifleshot.ogg' + sidestep_per_cycle = 0 + check_friendly_fire = 1 + minimum_distance = 6 + approaching_target = FALSE + rapid = 8 + rapid_fire_delay = 2 + casingtype = /obj/item/ammo_casing/mm712x82 + ranged_cooldown_time = 80 + vision_range = 12 + aggro_vision_range = 12 + retreat_distance = 1 + move_to_delay = 4 + speed = 12 + health = 150 + maxHealth = 150 + loot = list(/obj/item/gun/ballistic/automatic/l6_saw/unrestricted, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + +/mob/living/simple_animal/hostile/factory/ranged/shotgun + icon_state = "nanotrasenrangedshot" + icon_living = "nanotrasenrangedshot" + rapid = 2 + rapid_fire_delay = 5 + casingtype = /obj/item/ammo_casing/shotgun/buckshot + projectilesound = 'sound/weapons/shotgunshot.ogg' + ranged_cooldown_time = 25 + loot = list(/obj/item/gun/ballistic/shotgun/automatic/combat, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + +/mob/living/simple_animal/hostile/factory/ranged/smg + icon_state = "nanotrasenrangedsmg" + icon_living = "nanotrasenrangedsmg" + rapid = 3 + casingtype = /obj/item/ammo_casing/c46x30mm + projectilesound = 'sound/weapons/gunshot_smg.ogg' + loot = list(/obj/item/gun/ballistic/automatic/wt550, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + +/mob/living/simple_animal/hostile/syndicate/factory + gender = MALE + faction = list("nanotrasenprivate") + speak_chance = 5 + speak = list("Come get me!","You can't get away!","Die!") + +/mob/living/simple_animal/hostile/syndicate/factory/sniper + name = "The Warden" + desc = "One of the best snipers. Take cover or get shot" + icon_state = "fsniper" + icon_living = "fsniper" + ranged = TRUE + speed = 1 + dodge_prob = 40 + ranged_cooldown_time = 40 + check_friendly_fire = 1 + sidestep_per_cycle = 3 + minimum_distance = 4 + turns_per_move = 6 + melee_queue_distance = 2 + health = 250 + maxHealth = 250 + melee_damage = 20 + rapid_melee = 3 + attacktext = "hits" + attack_sound = 'sound/weapons/genhit3.ogg' + projectilesound = 'sound/weapons/sniper_shot.ogg' + speak_chance = 2 + var/cooldown = 0 + speak = list("You're pretty good.","You can't dodge everything!","Fall down already!") + loot = list(/obj/item/gun/ballistic/automatic/sniper_rifle, + /obj/effect/mob_spawn/human/corpse/sniper, + /obj/item/ammo_box/magazine/sniper_rounds, + /obj/item/ammo_box/magazine/sniper_rounds/penetrator, + /obj/item/ammo_box/magazine/sniper_rounds/soporific) + +/mob/living/simple_animal/hostile/syndicate/factory/sniper/Aggro() + ..() + ranged_cooldown = 30 + if (cooldown < world.time) + cooldown = world.time + 150 + summon_backup_nosound(10) + playsound(get_turf(src), 'sound/weapons/sniper_rack.ogg', 80, TRUE) + say("I've got you in my scope.") + +/mob/living/simple_animal/hostile/syndicate/factory/sniper/Shoot() + var/allowed_projectile_types = list(/obj/item/ammo_casing/p50, /obj/item/ammo_casing/p50/penetrator) + casingtype = pick(allowed_projectile_types) + ..() + +/mob/living/simple_animal/hostile/syndicate/factory/sniper/death(gibbed) + playsound(get_turf(src), 'sound/creatures/wardendeath.ogg', 100, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho + name = "Psycho" + desc = "They're wearing a pretty uncomfortable jacket." + icon = 'icons/mob/simple_human.dmi' + icon_state = "psycho" + icon_living = "psycho" + attacktext = "bites" + mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) + turns_per_move = 0 + del_on_death = TRUE + response_help = "pokes" + response_disarm = "touches" + response_harm = "hits" + speak_chance = 5 + attack_sound = 'sound/weapons/bite.ogg' + speak = list("I'm not mad!","What insanity?","Kill") + speed = -2 + maxHealth = 100 + health = 100 + atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 5 + faction = list("psycho") + move_to_delay = 3 + rapid_melee = 2 + in_melee = TRUE + approaching_target = TRUE + environment_smash = ENVIRONMENT_SMASH_NONE + obj_damage = 5 + sidestep_per_cycle = 0 + stat_attack = UNCONSCIOUS + melee_damage = 15 + lose_patience_timeout = 350 + loot = list(/obj/effect/mob_spawn/human/corpse/psychost) + +/mob/living/simple_animal/hostile/psycho/regular + var/cooldown = 0 + var/static/list/idle_sounds + +/mob/living/simple_animal/hostile/psycho/regular/Initialize() + . = ..() + idle_sounds = list('sound/creatures/psycidle1.ogg','sound/creatures/psycidle2.ogg','sound/creatures/psycidle3.ogg') + +/mob/living/simple_animal/hostile/psycho/regular/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, FALSE) + +/mob/living/simple_animal/hostile/psycho/regular/Aggro() + ..() + var/list/possible_sounds = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/regular/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psycdeath1.ogg','sound/creatures/psycdeath2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/fast + move_to_delay = 2 + speed = -5 + maxHealth = 70 + health = 70 + +/mob/living/simple_animal/hostile/psycho/muzzle + icon_state = "psychomuzzle" + icon_living = "psychomuzzle" + attacktext = "headbutts" + attack_sound = null + speak_chance = 0 + melee_damage = 9 + var/cooldown = 0 + var/static/list/idle_sounds + speed = 0 + loot = list(/obj/effect/mob_spawn/human/corpse/psychost/muzzle) + +/mob/living/simple_animal/hostile/psycho/muzzle/Initialize() + . = ..() + idle_sounds = list('sound/creatures/psychidle.ogg','sound/creatures/psychidle2.ogg') + +/mob/living/simple_animal/hostile/psycho/muzzle/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psychdeath.ogg','sound/creatures/psychdeath2.ogg',) + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/muzzle/Aggro() + ..() + var/list/possible_sounds = list('sound/creatures/psychsight.ogg','sound/creatures/psychsight2.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/muzzle/AttackingTarget() + ..() + playsound(get_turf(src), 'sound/creatures/psychattack1.ogg', 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/muzzle/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, TRUE) + +/mob/living/simple_animal/hostile/psycho/trap + desc = "This one has a strange device on his head." + icon_state = "psychotrap" + icon_living = "psychotrap" + speak_chance = 0 + speed = -3 + move_to_delay = 2 + melee_damage = 15 + attack_sound = null + attacktext = "headbutts" + loot = list(/obj/effect/mob_spawn/human/corpse/psychost/trap) + var/cooldown = 0 + var/static/list/idle_sounds + +/mob/living/simple_animal/hostile/psycho/trap/Aggro() + ..() + var/list/possible_sounds = list('sound/creatures/psychsight.ogg','sound/creatures/psychsight2.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/trap/Initialize() + . = ..() + idle_sounds = list('sound/creatures/psychidle.ogg','sound/creatures/psychidle2.ogg') + +/mob/living/simple_animal/hostile/psycho/trap/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, FALSE) + if(health < maxHealth) + playsound(src, 'sound/machines/beep.ogg', 80, FALSE) + addtimer(CALLBACK(src, .proc/death), 200) + +/mob/living/simple_animal/hostile/psycho/trap/AttackingTarget() + var/list/possible_sounds = list('sound/creatures/psychhead.ogg','sound/creatures/psychhead2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 100, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/trap/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psychdeath.ogg','sound/creatures/psychdeath2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, 0, 0) + playsound(get_turf(src), 'sound/effects/snap.ogg', 75, TRUE, 0) + playsound(get_turf(src), 'sound/effects/splat.ogg', 90, TRUE, 0) + visible_message("The device activates!") + ..() + +/mob/living/simple_animal/hostile/syndicate/factory/heavy + name = "Heavy gunner" + desc = "They didn't get that backpack for nothing." + icon_state = "Heavy" + icon_living = "Heavy" + sidestep_per_cycle = 0 + minimum_distance = 5 + approaching_target = TRUE + ranged = TRUE + rapid = 65 + rapid_fire_delay = 0.5 + projectiletype = /obj/item/projectile/beam + ranged_cooldown_time = 110 + vision_range = 9 + speak_chance = 0 + speak = null + aggro_vision_range = 9 + attacktext = "hits" + attack_sound = 'sound/weapons/genhit3.ogg' + retreat_distance = 2 + melee_queue_distance = 1 + melee_damage = 25 + move_to_delay = 4 + projectilesound = null + speed = 15 + health = 300 + maxHealth = 300 + loot = list(/obj/effect/mob_spawn/human/corpse/heavy) + var/cooldown = 0 + +/mob/living/simple_animal/hostile/syndicate/factory/heavy/Initialize() + ..() + +/mob/living/simple_animal/hostile/syndicate/factory/heavy/Aggro() + ..() + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), 'sound/creatures/heavysight1.ogg', 80, 0, 0) + +/mob/living/simple_animal/hostile/syndicate/factory/heavy/OpenFire(atom/A) + playsound(get_turf(src), 'sound/weapons/heavyminigunstart.ogg', 80, 0, 0) + move_to_delay = 6//slowdown when shoot + speed = 30 + sleep(15) + playsound(get_turf(src), 'sound/weapons/heavyminigunshoot.ogg', 90, 0, 0) + if(CheckFriendlyFire(A)) + return + if(!(simple_mob_flags & SILENCE_RANGED_MESSAGE)) + visible_message("[src] [ranged_message] at [A]!") + if(rapid > 1) + var/datum/callback/cb = CALLBACK(src, .proc/Shoot, A) + for(var/i in 1 to rapid) + addtimer(cb, (i - 1)*rapid_fire_delay) + else + Shoot(A) + ranged_cooldown = world.time + ranged_cooldown_time + playsound(get_turf(src), 'sound/weapons/heavyminigunstop.ogg', 80, 0, 0) + move_to_delay = initial(move_to_delay)//restore speed + speed = initial(speed) + +/mob/living/simple_animal/hostile/syndicate/factory/heavy/death(gibbed) + playsound(get_turf(src), 'sound/creatures/heavydeath1.ogg', 80, TRUE, 0) + ..() + +/obj/item/clothing/mask/gas/sechailer/swat/emagged + safety = FALSE + +/mob/living/simple_animal/hostile/zombie_suicide + name = "agressive corpse" + desc = "This corpse is holding a grenade without a pin in it..." + icon = 'icons/mob/simple_human.dmi' + icon_state = "suicidezombie" + icon_living = "suicidezombie" + mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + minbodytemp = 0 + status_flags = CANPUSH + health = 100 + maxHealth = 100 + move_to_delay = 2 + speed = 0 + melee_damage = null + attack_sound = null + del_on_death = TRUE + stat_attack = UNCONSCIOUS + a_intent = INTENT_HARM + var/det_time = 30 + var/active = 0 + var/cooldown = 0 + loot = list(/obj/effect/mob_spawn/human/corpse/suicidezombie, /obj/item/grenade/syndieminibomb/concussion/frag/activated) + do_footstep = TRUE + hardattacks = TRUE + +/mob/living/simple_animal/hostile/zombie_suicide/Aggro() + ..() + var/list/possible_sounds = list('sound/creatures/szombiesight.ogg','sound/creatures/szombiesight2.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 50, TRUE, 0) + +/mob/living/simple_animal/hostile/zombie_suicide/AttackingTarget() + if(!active) + active = TRUE + playsound(src, 'sound/weapons/armbomb.ogg', 100, TRUE) + var/list/possible_sounds = list('sound/creatures/szombiesight.ogg','sound/creatures/szombiesight2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 50, TRUE, 0) + visible_message("[src] primes the grenade!.") + addtimer(CALLBACK(src, .proc/prime), det_time) + +/mob/living/simple_animal/hostile/zombie_suicide/proc/prime() + explosion(src,0, 2, 3, flame_range = 3) + new /obj/effect/gibspawner/generic(get_turf(src), src) + qdel(src) + +/mob/living/simple_animal/hostile/zombie_suicide/death(gibbed) + playsound(src, 'sound/creatures/szombiedeath.ogg', 60, TRUE) + ..() + +/obj/item/grenade/syndieminibomb/concussion/frag/activated + det_time = 30 + +/obj/item/grenade/syndieminibomb/concussion/frag/activated/Initialize() + ..() + preprime() + +/mob/living/simple_animal/hostile/syndicate/factory/boss + name = "The Director" + desc = "This thing looks more like a machine than human." + maxHealth = 500 + health = 500 + icon_state = "facboss" + icon_living = "facboss" + see_in_dark = 13 + vision_range = 12 + aggro_vision_range = 12 + search_objects = 1 + minbodytemp = 0 + speak = null + dodging = FALSE + mob_biotypes = list(MOB_ROBOTIC) + obj_damage = 100 + move_force = MOVE_FORCE_EXTREMELY_STRONG + move_resist = MOVE_FORCE_EXTREMELY_STRONG + pull_force = MOVE_FORCE_EXTREMELY_STRONG + hardattacks = TRUE + melee_damage = 50 + speed = 5 + move_to_delay = 3 + ranged = TRUE + hud_possible = list(ANTAG_HUD) + approaching_target = TRUE + ranged_ignores_vision = TRUE + environment_smash = ENVIRONMENT_SMASH_RWALLS + ranged_cooldown_time = 30 + check_friendly_fire = 1 + turns_per_move = 2 + spacewalk = TRUE + rapid_melee = 0 + lose_patience_timeout = 400 + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 0 + attack_sound = 'sound/weapons/sonic_jackhammer.ogg' + projectilesound = 'sound/weapons/shotgunshot.ogg' + var/cooldown = 0 + loot = list(/obj/item/gun/ballistic/shotgun/lever_action, + /obj/effect/mob_spawn/human/corpse/facboss) + +/mob/living/simple_animal/hostile/syndicate/factory/boss/Shoot() + var/static/list/allowed_projectile_types = list(/obj/item/ammo_casing/shotgun/beanbag, + /obj/item/ammo_casing/shotgun, /obj/item/ammo_casing/shotgun/incendiary, + /obj/item/ammo_casing/shotgun/dragonsbreath, + /obj/item/ammo_casing/shotgun/meteorslug, + /obj/item/ammo_casing/shotgun/pulseslug, + /obj/item/ammo_casing/shotgun/frag12, + /obj/item/ammo_casing/shotgun/buckshot, + /obj/item/ammo_casing/shotgun/rubbershot, + /obj/item/ammo_casing/shotgun/incapacitate, + /obj/item/ammo_casing/shotgun/improvised, + /obj/item/ammo_casing/shotgun/ion, + /obj/item/ammo_casing/shotgun/laserslug, + /obj/item/ammo_casing/shotgun/breacher) + casingtype = pick(allowed_projectile_types) + ..() + sleep(5) + playsound(get_turf(src), 'sound/weapons/shotgunpump.ogg', 50, 0, 0) + +/mob/living/simple_animal/hostile/syndicate/factory/boss/Aggro() + ..() + var/list/possible_sounds = list('sound/voice/ed209_20sec.ogg','sound/creatures/bosssight.ogg','sound/creatures/bosssight2.ogg','sound/voice/complionator/harry.ogg','sound/weapons/leveractionrack.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 80, TRUE, 0) + say("Target!") + +/mob/living/simple_animal/hostile/syndicate/factory/boss/Life() + ..() + if(health <= 300) + icon_state = "facboss2" + icon_living = "facboss2" + ranged_cooldown_time = 20//less health - faster shooting + return + if(health <= 150) + if(prob(5) && Aggro())//change to insult the target on low health + playsound(get_turf(src), 'sound/voice/beepsky/insult.ogg', 100, 0, 0) + visible_message("FUCK YOUR CUNT YOU SHIT EATING COCKSTORM AND EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND POO AND SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT.") + icon_state = "facboss3" + icon_living = "facboss3" + ranged_cooldown_time = 10//even faster + +/mob/living/simple_animal/hostile/syndicate/factory/boss/updatehealth() + ..() + if(health <= 300) + var/list/possible_sounds = list('sound/creatures/bosspain.ogg','sound/creatures/bosspain2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 60, TRUE, 0) + +/mob/living/simple_animal/hostile/syndicate/factory/boss/death(gibbed) + playsound(get_turf(src), 'sound/voice/borg_deathsound.ogg', 80, TRUE, 0) + visible_message("\the [src] activates its self-destruct system!.") + speed = 15 + move_to_delay = 20 + ranged_cooldown = 300 + ranged_cooldown_time = 300 + INVOKE_ASYNC(src, .proc/explosion, src.loc, 0, 3, 4, null, null, FALSE, 2) + ..() + +//GUNS// + +/obj/item/gun/ballistic/shotgun/lever_action + name = "lever action shotgun" + desc = "A really old shotgun with five shell capacity. This one can fit in a backpack." + w_class = WEIGHT_CLASS_NORMAL + dual_wield_spread = 0 + fire_sound_volume = 60 //tried on 90 my eardrums said goodbye + item_state = "leveraction" + icon_state = "leveraction" + rack_sound = "sound/weapons/leveractionrack.ogg" + fire_sound = "sound/weapons/leveractionshot.ogg" + vary_fire_sound = FALSE + rack_sound_vary = FALSE + recoil = 1 + mag_type = /obj/item/ammo_box/magazine/internal/shot/lever + pb_knockback = 5 + +/obj/item/gun/ballistic/shotgun/lever_action/examine(mob/user) + . = ..() + . += "You will instantly reload it after a shot if you have another hand free." + +/obj/item/gun/ballistic/shotgun/lever_action/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) + ..() + if(user.get_inactive_held_item()) + return + else + rack() + +/obj/item/gun/ballistic/shotgun/lever_action/rack(mob/user = null) + if (user) + to_chat(user, "You rack the [bolt_wording] of \the [src].") + process_chamber(!chambered, FALSE) + playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) + update_icon() + if(user.get_inactive_held_item() && prob(50) && chambered) + user.visible_message("With a single move of [user.p_their()] arm, [user] flips \the [src] and loads the chamber with a shell.") + +/obj/item/gun/ballistic/automatic/pistol/deagle/sound + desc = "A robust .50 AE handgun. This one looks even more robust." + rack_sound = "sound/weapons/deaglerack.ogg" + bolt_drop_sound = "sound/weapons/deagleslidedrop.ogg" + lock_back_sound = "sound/weapons/deaglelock.ogg" + lock_back_sound_vary = FALSE + rack_sound_vary = FALSE + load_sound_vary = FALSE + eject_sound_vary = FALSE + fire_sound = "sound/weapons/deagleshot.ogg" + vary_fire_sound = TRUE + fire_rate = 5 + force = 18 + +//MISC// + +/obj/effect/trap/nexus/trickyspawner/clowns + mobs = 5 + spawned = /mob/living/simple_animal/hostile/retaliate/clown diff --git a/code/modules/awaymissions/mission_code/centcomAway.dm b/code/modules/awaymissions/mission_code/centcomAway.dm index 897315a3c6cc6..b785431bad1a3 100644 --- a/code/modules/awaymissions/mission_code/centcomAway.dm +++ b/code/modules/awaymissions/mission_code/centcomAway.dm @@ -7,32 +7,32 @@ /area/awaymission/centcomAway/general name = "XCC-P5831" - ambient_effects = list('sound/ambience/ambigen3.ogg') + ambientsounds = list('sound/ambience/ambigen3.ogg') /area/awaymission/centcomAway/maint name = "XCC-P5831 Maintenance" icon_state = "away1" - ambient_effects = list('sound/ambience/ambisin1.ogg') + ambientsounds = list('sound/ambience/ambisin1.ogg') /area/awaymission/centcomAway/thunderdome name = "XCC-P5831 Thunderdome" icon_state = "away2" - ambient_effects = list('sound/ambience/ambisin2.ogg') + ambientsounds = list('sound/ambience/ambisin2.ogg') /area/awaymission/centcomAway/cafe name = "XCC-P5831 Kitchen Arena" icon_state = "away3" - ambient_effects = list('sound/ambience/ambisin3.ogg') + ambientsounds = list('sound/ambience/ambisin3.ogg') /area/awaymission/centcomAway/courtroom name = "XCC-P5831 Courtroom" icon_state = "away4" - ambient_effects = list('sound/ambience/ambisin4.ogg') + ambientsounds = list('sound/ambience/ambisin4.ogg') /area/awaymission/centcomAway/hangar name = "XCC-P5831 Hangars" icon_state = "away4" - ambient_effects = list('sound/ambience/ambigen5.ogg') + ambientsounds = list('sound/ambience/ambigen5.ogg') //centcomAway items @@ -60,4 +60,4 @@ teams never did figure out what happened that last time... and I can't wrap my head \ around it myself. Why would a shuttle full of evacuees all snap and beat each other \ to death the moment they reached safety?
\ - - D. Cereza" + - D. Cereza" \ No newline at end of file diff --git a/code/modules/awaymissions/mission_code/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm index d45d177e25a26..0feb096910a4e 100644 --- a/code/modules/awaymissions/mission_code/moonoutpost19.dm +++ b/code/modules/awaymissions/mission_code/moonoutpost19.dm @@ -24,7 +24,7 @@ power_equip = FALSE power_light = FALSE poweralm = FALSE - ambient_effects = list('sound/ambience/ambimine.ogg') + ambientsounds = list('sound/ambience/ambimine.ogg') icon_state = "awaycontent5" /area/awaymission/moonoutpost19/hive diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 5c7f4b26bf4ac..cfdd9fa082cb3 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -135,30 +135,18 @@ /area/shuttle/snowdin/elevator2 name = "Mining Elevator" -//shuttle console for elevators// - -/obj/machinery/computer/shuttle/snowdin/mining - name = "shuttle console" - desc = "A shuttle control computer." - icon_screen = "shuttle" - icon_keyboard = "tech_key" - light_color = LIGHT_COLOR_CYAN - shuttleId = "snowdin_mining" - possible_destinations = "snowdin_mining_top;snowdin_mining_down" - - //liquid plasma!!!!!!// /turf/open/floor/plasteel/dark/snowdin initial_gas_mix = FROZEN_ATMOS planetary_atmos = 1 - temperature = 180 + initial_temperature = 180 /turf/open/lava/plasma name = "liquid plasma" desc = "A flowing stream of chilled liquid plasma. You probably shouldn't get in." icon_state = "liquidplasma" - initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120" + initial_gas_mix = "n2=82;plasma=24;TEMP=120" baseturfs = /turf/open/lava/plasma slowdown = 2 @@ -219,7 +207,7 @@ var/list/robo_parts = list()//keep a reference of robotic parts so we know if we can turn them into a plasmaman var/mob/living/carbon/human/PP = L var/S = PP.dna.species - if(istype(S, /datum/species/plasmaman) || istype(S, /datum/species/android) || istype(S, /datum/species/synth)) //ignore plasmamen/robotic species + if(istype(S, /datum/species/plasmaman) || istype(S, /datum/species/android)) //ignore plasmamen/robotic species continue for(var/BP in PP.bodyparts) @@ -516,11 +504,11 @@ /obj/effect/spawner/lootdrop/snowdin/dungeonheavy name = "dungeon heavy" - loot = list(/obj/item/twohanded/singularityhammer = 25, - /obj/item/twohanded/mjollnir = 10, - /obj/item/twohanded/fireaxe = 25, + loot = list(/obj/item/singularityhammer = 25, + /obj/item/mjollnir = 10, + /obj/item/fireaxe = 25, /obj/item/organ/brain/alien = 17, - /obj/item/twohanded/dualsaber = 15, + /obj/item/dualsaber = 15, /obj/item/organ/heart/demon = 7, /obj/item/gun/ballistic/automatic/c20r/unrestricted = 16, /obj/item/gun/magic/wand/resurrection/inert = 15, @@ -541,7 +529,7 @@ loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10, /obj/item/toy/snowball = 15, /obj/item/shovel = 10, - /obj/item/twohanded/spear = 8, + /obj/item/spear = 8, ) //special items//-- @@ -555,7 +543,7 @@ /obj/item/clothing/under/syndicate/coldres name = "insulated tactical turtleneck" desc = "A nondescript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection." - armor = list("melee" = 20, "bullet" = 10, "laser" = 0,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) + armor = list("melee" = 20, "bullet" = 10, "laser" = 0,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25, "stamina" = 30) cold_protection = CHEST|GROIN|ARMS|LEGS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm index a477a223b2dc0..11d99108a5fc2 100644 --- a/code/modules/awaymissions/mission_code/spacebattle.dm +++ b/code/modules/awaymissions/mission_code/spacebattle.dm @@ -6,7 +6,7 @@ requires_power = FALSE /area/awaymission/spacebattle/cruiser - name = "Nanotrasen Cruiser" + name = "\improper Nanotrasen Cruiser" icon_state = "awaycontent2" /area/awaymission/spacebattle/syndicate1 diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 0adef7f0b4b08..19c1bad75b764 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -112,7 +112,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") info = {"Target: Research-station Epsilon
Objective: Prototype weaponry. The captain likely keeps them locked in her safe.
- Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunatly he has been captured by security + Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunately he has been captured by security Your objective is to split up, locate any of the papers containing the captain's safe code, open the safe and secure anything found inside. If possible, recover the imprisioned syndicate operative and receive the code from him.
@@ -148,9 +148,9 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") /obj/singularity/narsie/mini/admin_investigate_setup() return -/obj/singularity/narsie/mini/process() +/obj/singularity/narsie/mini/process(delta_time) eat() - if(prob(25)) + if(DT_PROB(13, delta_time)) mezzer() /obj/singularity/narsie/mini/ex_act() diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 8f216506eacec..7a42a05c04f46 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -105,7 +105,7 @@ if("Immortality") to_chat(user, "Your wish is granted, but at a terrible cost...") to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") - user.verbs += /mob/living/carbon/proc/immortality + user.add_verb(/mob/living/carbon/proc/immortality) user.set_species(/datum/species/shadow) if("Peace") to_chat(user, "Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.") diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 79f61f352bb14..47f783cbb3828 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.con to_chat(world, "Away mission loaded.") /proc/reset_gateway_spawns(reset = FALSE) - for(var/obj/machinery/gateway/G in world) + for(var/obj/machinery/gateway/G in GLOB.machines) if(reset) G.randomspawns = GLOB.awaydestinations else diff --git a/code/modules/badges/badges.dm b/code/modules/badges/badges.dm new file mode 100644 index 0000000000000..b708ded074943 --- /dev/null +++ b/code/modules/badges/badges.dm @@ -0,0 +1,89 @@ +/* + +Loads all badges from the badge.json file. +Format should be +rank|icon +Where: +Rank - The name of the admin rank +Icon - The name of the icon state in the badges.dmi file + +Special ranks: +- Donator: Matches clients in the donator list +- Mentor: Matches clients in the mentor list + +*/ + +//Global list of badges +GLOBAL_LIST_EMPTY(badge_data) + +/client + var/list/cached_badges = null + +//Loads the badge ranks +/proc/load_badge_ranks() + //No badges + if(!CONFIG_GET(flag/badges)) + return + //Load and parse data + GLOB.badge_data = json_decode(rustg_file_read("[global.config.directory]/badges.json")) + //Associate badges with admin ranks + for(var/datum/admin_rank/rank as() in GLOB.admin_ranks) + rank.badge_icon = GLOB.badge_data[rank.name] + //Yay + log_game("[LAZYLEN(GLOB.badge_data)] badges loaded successfully.") + //Reset everyones badges so they get reloaded. + for(var/client/C as() in GLOB.clients) + C.reset_badges() + +//Gets the badges attached to a client. +/client/proc/get_badges() + //No badges + if(!CONFIG_GET(flag/badges)) + return + //Send cached badges + if(islist(cached_badges)) + return cached_badges + var/list/badges = list() + //Add the holder rank + if(holder) + //No badges when deadminned / fakeminned + if(holder.deadmined || holder.fakekey) + cached_badges = list() + return list() + //Admin badge otherwise + if(holder?.rank?.badge_icon) + badges += holder.rank.badge_icon + //Add the mentor rank + else + if(mentor_datum && GLOB.badge_data["Mentor"]) + badges += GLOB.badge_data["Mentor"] + //Add the donator rank + if(IS_PATRON(ckey) && GLOB.badge_data["Donator"]) + badges += GLOB.badge_data["Donator"] + cached_badges = badges + return badges + +/client/proc/reset_badges() + cached_badges = null + +/proc/badge_parse(badges) + if(!LAZYLEN(badges)) + return "" + + var/output = "" + var/first_badge = TRUE + + if(!CONFIG_GET(flag/badges)) + return "" + + for(var/badge in badges) + var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat) + var/tag = sheet.icon_tag("badge-badge_[badge]") + if(tag) + if(first_badge) + output = "[output][tag]" + first_badge = FALSE + else + output = "[output] [tag]" + + return "[output] " diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index b232bd212c643..e8490837c3d31 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -17,10 +17,10 @@ var/switch_state = BM_SWITCHSTATE_NONE var/switch_width = 5 // modeswitch UI - var/obj/screen/buildmode/mode/modebutton + var/atom/movable/screen/buildmode/mode/modebutton var/list/modeswitch_buttons = list() // dirswitch UI - var/obj/screen/buildmode/bdir/dirbutton + var/atom/movable/screen/buildmode/bdir/dirbutton var/list/dirswitch_buttons = list() /datum/buildmode/New(client/c) @@ -34,7 +34,7 @@ holder.screen += buttons holder.click_intercept = src mode.enter_mode(src) - + /datum/buildmode/proc/quit() mode.exit_mode(src) holder.screen -= buttons @@ -45,8 +45,10 @@ /datum/buildmode/Destroy() close_switchstates() holder.player_details.post_login_callbacks -= li_cb + li_cb = null holder = null QDEL_NULL(mode) + QDEL_LIST(buttons) QDEL_LIST(modeswitch_buttons) QDEL_LIST(dirswitch_buttons) return ..() @@ -63,16 +65,16 @@ /datum/buildmode/proc/create_buttons() // keep a reference so we can update it upon mode switch - modebutton = new /obj/screen/buildmode/mode(src) + modebutton = new /atom/movable/screen/buildmode/mode(src) buttons += modebutton - buttons += new /obj/screen/buildmode/help(src) + buttons += new /atom/movable/screen/buildmode/help(src) // keep a reference so we can update it upon dir switch - dirbutton = new /obj/screen/buildmode/bdir(src) + dirbutton = new /atom/movable/screen/buildmode/bdir(src) buttons += dirbutton - buttons += new /obj/screen/buildmode/quit(src) + buttons += new /atom/movable/screen/buildmode/quit(src) // build the lists of switching buttons - build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /obj/screen/buildmode/modeswitch) - build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /obj/screen/buildmode/dirswitch) + build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /atom/movable/screen/buildmode/modeswitch) + build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /atom/movable/screen/buildmode/dirswitch) // this creates a nice offset grid for choosing between buildmode options, // because going "click click click ah hell" sucks. @@ -81,7 +83,7 @@ for(var/thing in elements) var/x = pos_idx % switch_width var/y = FLOOR(pos_idx / switch_width, 1) - var/obj/screen/buildmode/B = new buttontype(src, thing) + var/atom/movable/screen/buildmode/B = new buttontype(src, thing) // extra .5 for a nice offset look B.screen_loc = "NORTH-[(1 + 0.5 + y*1.5)],WEST+[0.5 + x*1.5]" buttonslist += B @@ -100,7 +102,7 @@ else close_switchstates() open_modeswitch() - + /datum/buildmode/proc/open_modeswitch() switch_state = BM_SWITCHSTATE_MODE holder.screen += modeswitch_buttons @@ -115,7 +117,7 @@ else close_switchstates() open_dirswitch() - + /datum/buildmode/proc/open_dirswitch() switch_state = BM_SWITCHSTATE_DIR holder.screen += dirswitch_buttons @@ -155,7 +157,7 @@ new /datum/buildmode(M.client) message_admins("[key_name_admin(usr)] has entered build mode.") log_admin("[key_name(usr)] has entered build mode.") - + #undef BM_SWITCHSTATE_NONE #undef BM_SWITCHSTATE_MODE -#undef BM_SWITCHSTATE_DIR \ No newline at end of file +#undef BM_SWITCHSTATE_DIR diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index e72dbde064382..e2bfec25bc5e4 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -1,23 +1,23 @@ -/obj/screen/buildmode +/atom/movable/screen/buildmode icon = 'icons/misc/buildmode.dmi' var/datum/buildmode/bd // If we don't do this, we get occluded by item action buttons layer = ABOVE_HUD_LAYER -/obj/screen/buildmode/New(bld) +/atom/movable/screen/buildmode/New(bld) bd = bld return ..() -/obj/screen/buildmode/Destroy() +/atom/movable/screen/buildmode/Destroy() bd = null return ..() -/obj/screen/buildmode/mode +/atom/movable/screen/buildmode/mode name = "Toggle Mode" icon_state = "buildmode_basic" screen_loc = "NORTH,WEST" -/obj/screen/buildmode/mode/Click(location, control, params) +/atom/movable/screen/buildmode/mode/Click(location, control, params) var/list/pa = params2list(params) if(pa.Find("left")) @@ -27,64 +27,64 @@ update_icon() return 1 -/obj/screen/buildmode/mode/update_icon() +/atom/movable/screen/buildmode/mode/update_icon() icon_state = bd.mode.get_button_iconstate() -/obj/screen/buildmode/help +/atom/movable/screen/buildmode/help icon_state = "buildhelp" screen_loc = "NORTH,WEST+1" name = "Buildmode Help" -/obj/screen/buildmode/help/Click(location, control, params) +/atom/movable/screen/buildmode/help/Click(location, control, params) bd.mode.show_help(usr.client) return 1 -/obj/screen/buildmode/bdir +/atom/movable/screen/buildmode/bdir icon_state = "build" screen_loc = "NORTH,WEST+2" name = "Change Dir" -/obj/screen/buildmode/bdir/update_icon() +/atom/movable/screen/buildmode/bdir/update_icon() dir = bd.build_dir return -/obj/screen/buildmode/bdir/Click() +/atom/movable/screen/buildmode/bdir/Click() bd.toggle_dirswitch() update_icon() return 1 // used to switch between modes -/obj/screen/buildmode/modeswitch +/atom/movable/screen/buildmode/modeswitch var/datum/buildmode_mode/modetype -/obj/screen/buildmode/modeswitch/New(bld, mt) +/atom/movable/screen/buildmode/modeswitch/New(bld, mt) modetype = mt icon_state = "buildmode_[initial(modetype.key)]" name = initial(modetype.key) return ..(bld) -/obj/screen/buildmode/modeswitch/Click() +/atom/movable/screen/buildmode/modeswitch/Click() bd.change_mode(modetype) return 1 // used to switch between dirs -/obj/screen/buildmode/dirswitch +/atom/movable/screen/buildmode/dirswitch icon_state = "build" -/obj/screen/buildmode/dirswitch/New(bld, dir) +/atom/movable/screen/buildmode/dirswitch/New(bld, dir) src.dir = dir name = dir2text(dir) return ..(bld) -/obj/screen/buildmode/dirswitch/Click() +/atom/movable/screen/buildmode/dirswitch/Click() bd.change_dir(dir) return 1 -/obj/screen/buildmode/quit +/atom/movable/screen/buildmode/quit icon_state = "buildquit" screen_loc = "NORTH,WEST+3" name = "Quit Buildmode" -/obj/screen/buildmode/quit/Click() +/atom/movable/screen/buildmode/quit/Click() bd.quit() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/buildmode/submodes/delete.dm b/code/modules/buildmode/submodes/delete.dm new file mode 100644 index 0000000000000..cbd93851577b6 --- /dev/null +++ b/code/modules/buildmode/submodes/delete.dm @@ -0,0 +1,63 @@ +/datum/buildmode_mode/delete + key = "delete" + +/datum/buildmode_mode/delete/show_help(client/c) + to_chat(c, "***********************************************************\n\ + Left Mouse Button on anything to delete it. If you break it, you buy it.\n\ + Right Mouse Button on anything to delete everything of the type. Probably don\'t do this unless you know what you are doing.\n\ + ***********************************************************") + +/datum/buildmode_mode/delete/handle_click(client/c, params, object) + var/list/pa = params2list(params) + var/left_click = pa.Find("left") + var/right_click = pa.Find("right") + + if(left_click) + if(isturf(object)) + var/turf/T = object + T.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) + else if(isatom(object)) + qdel(object) + + if(right_click) + if(!check_rights(R_DEBUG|R_SERVER)) //Prevents buildmoded non-admins from breaking everything. + return + if(isturf(object)) + return + var/atom/deleting = object + var/action_type = alert(usr,"Strict type ([deleting.type]) or type and all subtypes?","Strict type","Type and subtypes","Cancel") + if(action_type == "Cancel" || !action_type) + return + + if(alert(usr,"Are you really sure you want to delete all instances of type [deleting.type]?","Yes","No") != "Yes") + return + + if(alert(usr,"Second confirmation required. Delete?","Yes","No") != "Yes") + return + + var/O_type = deleting.type + switch(action_type) + if("Strict type") + var/i = 0 + for(var/atom/Obj in world) + if(Obj.type == O_type) + i++ + qdel(Obj) + CHECK_TICK + if(!i) + to_chat(usr, "No instances of this type exist") + return + log_admin("[key_name(usr)] deleted all instances of type [O_type] ([i] instances deleted) ") + message_admins("[key_name(usr)] deleted all instances of type [O_type] ([i] instances deleted)") + if("Type and subtypes") + var/i = 0 + for(var/Obj in world) + if(istype(Obj,O_type)) + i++ + qdel(Obj) + CHECK_TICK + if(!i) + to_chat(usr, "No instances of this type exist") + return + log_admin("[key_name(usr)] deleted all instances of type or subtype of [O_type] ([i] instances deleted) ") + message_admins("[key_name(usr)] deleted all instances of type or subtype of [O_type] ([i] instances deleted) ") diff --git a/code/modules/buildmode/submodes/outfit.dm b/code/modules/buildmode/submodes/outfit.dm new file mode 100644 index 0000000000000..5d57582680ccd --- /dev/null +++ b/code/modules/buildmode/submodes/outfit.dm @@ -0,0 +1,45 @@ +/datum/buildmode_mode/outfit + key = "outfit" + var/datum/outfit/dressuptime + +/datum/buildmode_mode/outfit/Destroy() + dressuptime = null + return ..() + +/datum/buildmode_mode/outfit/show_help(client/c) + to_chat(c, "***********************************************************\n\ + Right Mouse Button on buildmode button = Select outfit to equip.\n\ + Left Mouse Button on mob/living/carbon/human = Equip the selected outfit.\n\ + Right Mouse Button on mob/living/carbon/human = Strip and delete current outfit.\n\ + ***********************************************************") + +/datum/buildmode_mode/outfit/Reset() + . = ..() + dressuptime = null + +/datum/buildmode_mode/outfit/change_settings(client/c) + dressuptime = c.robust_dress_shop() + +/datum/buildmode_mode/outfit/handle_click(client/c, params, object) + var/list/pa = params2list(params) + var/left_click = pa.Find("left") + var/right_click = pa.Find("right") + + + if(!ishuman(object)) + return + var/mob/living/carbon/human/dollie = object + + if(left_click) + if(isnull(dressuptime)) + to_chat(c, ("Pick an outfit first.")) + return + + for (var/item in dollie.get_equipped_items(TRUE)) + qdel(item) + if(dressuptime != "Naked") + dollie.equipOutfit(dressuptime) + + if(right_click) + for (var/item in dollie.get_equipped_items(TRUE)) + qdel(item) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index e0c423a164073..9263cea75f81e 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -35,7 +35,7 @@ description = "CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears." reward = 2000 required_count = 5 - wanted_types = list(/obj/item/twohanded/spear) + wanted_types = list(/obj/item/spear) /datum/bounty/item/assistant/toolbox name = "Toolboxes" @@ -124,13 +124,6 @@ required_count = 5 wanted_types = list(/obj/structure/chair/comfy) -/datum/bounty/item/assistant/geranium - name = "Geraniums" - description = "Commander Zot has the hots for Commander Zena. Send a shipment of geraniums - her favorite flower - and he'll happily reward you." - reward = 4000 - required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy/geranium) - /datum/bounty/item/assistant/poppy name = "Poppies" description = "Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of Poppies - her favorite flower - and he'll happily reward you." @@ -150,7 +143,7 @@ description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants." reward = 2000 required_count = 8 - wanted_types = list(/obj/item/twohanded/required/kirbyplants) + wanted_types = list(/obj/item/kirbyplants) /datum/bounty/item/assistant/earmuffs name = "Earmuffs" @@ -176,7 +169,7 @@ name = "Chainsaw" description = "The chef at CentCom is having trouble butchering her animals. She requests one chainsaw, please." reward = 2500 - wanted_types = list(/obj/item/twohanded/required/chainsaw) + wanted_types = list(/obj/item/chainsaw) /datum/bounty/item/assistant/ied name = "IED" diff --git a/code/modules/cargo/bounties/botany.dm b/code/modules/cargo/bounties/botany.dm index 76e4bcf252f6a..294278405625f 100644 --- a/code/modules/cargo/bounties/botany.dm +++ b/code/modules/cargo/bounties/botany.dm @@ -3,12 +3,15 @@ var/datum/bounty/item/botany/multiplier = 0 //adds bonus reward money; increased for higher tier or rare mutations var/datum/bounty/item/botany/bonus_desc //for adding extra flavor text to bounty descriptions var/datum/bounty/item/botany/foodtype = "meal" //same here + var/datum/bounty/item/botany/format_exception = FALSE //Set to true if the bounty uses a custom format from the one below /datum/bounty/item/botany/New() ..() - description = "Central Command's head chef is looking to prepare a fine [foodtype] with [name]. [bonus_desc]" - reward += multiplier * 1000 - required_count = rand(5, 10) + + if (format_exception == FALSE) + description = "Central Command's head chef is looking to prepare a fine [foodtype] with [name]. [bonus_desc]" + reward += multiplier * 1000 + required_count = rand(5, 10) /datum/bounty/item/botany/ambrosia_vulgaris name = "Ambrosia Vulgaris Leaves" @@ -199,3 +202,27 @@ multiplier = 2 foodtype = "batch of oatmeal" bonus_desc = "Squats and oats. We're all out of oats." + +/datum/bounty/item/botany/forgetmenot + name = "Forget-Me-Nots" + description = "Commander Zot has his eyes on Quartermaster Maya. Send a shipment of forget-me-nots - her favorite flower - and he'll happily reward you." + reward = 7000 + required_count = 3 + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy/geranium/forgetmenot) + format_exception = TRUE + +/datum/bounty/item/botany/geranium + name = "Geraniums" + description = "Commander Zot has the hots for Commander Zena. Send a shipment of geraniums - her favorite flower - and he'll happily reward you." + reward = 6000 + required_count = 3 + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy/geranium) + format_exception = TRUE + +/datum/bounty/item/botany/rainbowflowercrown + name = "Rainbow Flower Crowns" + description = "Central Command is concerned about their intern suicide rate. A shipment of rainbow flower crowns should do nicely to improve morale." + reward = 10000 + required_count = 3 + wanted_types = list(/obj/item/clothing/head/rainbowbunchcrown) + format_exception = TRUE \ No newline at end of file diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm index e31952e416e4d..8b3ebf629f592 100644 --- a/code/modules/cargo/bounties/engineering.dm +++ b/code/modules/cargo/bounties/engineering.dm @@ -4,7 +4,7 @@ reward = 7500 wanted_types = list(/obj/item/tank) var/moles_required = 20 // A full tank is 28 moles, but CentCom ignores that fact. - var/gas_type = /datum/gas/pluoxium + var/gas_type = GAS_PLUOXIUM /datum/bounty/item/engineering/gas/applies_to(obj/O) if(!..()) @@ -15,21 +15,15 @@ /datum/bounty/item/engineering/gas/nitryl_tank name = "Full Tank of Nitryl" description = "The non-human staff of Station 88 has been volunteered to test performance enhancing drugs. Ship them a tank full of Nitryl so they can get started." - gas_type = /datum/gas/nitryl + gas_type = GAS_NITRYL /datum/bounty/item/engineering/gas/tritium_tank name = "Full Tank of Tritium" description = "Station 49 is looking to kickstart their research program. Ship them a tank full of Tritium." - gas_type = /datum/gas/tritium + gas_type = GAS_TRITIUM /datum/bounty/item/engineering/energy_ball name = "Contained Tesla Ball" description = "Station 24 is being overrun by hordes of angry Mothpeople. They are requesting the ultimate bug zapper." reward = 75000 //requires 14k credits of purchases, not to mention cooperation with engineering/heads of staff to set up inside the cramped shuttle wanted_types = list(/obj/singularity/energy_ball) - -/datum/bounty/item/engineering/energy_ball/applies_to(obj/O) - if(!..()) - return FALSE - var/obj/singularity/energy_ball/T = O - return !T.miniball diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm index e68144e1a134e..6761ffa2a57e4 100644 --- a/code/modules/cargo/bounties/mining.dm +++ b/code/modules/cargo/bounties/mining.dm @@ -22,7 +22,7 @@ name = "Bone Axe" description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement." reward = 7500 - wanted_types = list(/obj/item/twohanded/fireaxe/boneaxe) + wanted_types = list(/obj/item/fireaxe/boneaxe) /datum/bounty/item/mining/bone_bow name = "Bone Bow" diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index d2a0084ebec0d..209f959578ce0 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -175,7 +175,6 @@ /datum/reagent/consumable/frostoil,\ /datum/reagent/toxin/slimejelly,\ /datum/reagent/teslium/energized_jelly,\ - /datum/reagent/toxin/skewium,\ /datum/reagent/toxin/mimesbane,\ /datum/reagent/medicine/strange_reagent,\ /datum/reagent/nitroglycerin,\ diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm index 33f334ac47265..83a069724a5e7 100644 --- a/code/modules/cargo/bounties/science.dm +++ b/code/modules/cargo/bounties/science.dm @@ -8,7 +8,7 @@ name = "Trash Bag of Holding" description = "Nanotrasen would make good use of high-capacity trash bags. If you have any, please ship them." reward = 10000 - wanted_types = list(/obj/item/storage/backpack/holding) + wanted_types = list(/obj/item/storage/bag/trash/bluespace) /datum/bounty/item/science/bluespace_syringe name = "Bluespace Syringe" diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm index cbbf36c671023..af61a6698e445 100644 --- a/code/modules/cargo/bounties/special.dm +++ b/code/modules/cargo/bounties/special.dm @@ -28,7 +28,7 @@ /datum/bounty/item/trash name = "Trash" - description = "Recently a group of janitors have run out of trash to clean up, without any trash Centcom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation." + description = "Recently a group of janitors have run out of trash to clean up, without any trash CentCom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation." reward = 1000 required_count = 10 wanted_types = list(/obj/item/trash) diff --git a/code/modules/cargo/bounties/virus.dm b/code/modules/cargo/bounties/virus.dm index 8f078a2668bd5..13a51281fd008 100644 --- a/code/modules/cargo/bounties/virus.dm +++ b/code/modules/cargo/bounties/virus.dm @@ -56,26 +56,26 @@ /datum/bounty/virus/resistance/accepts_virus(V) var/datum/disease/advance/A = V - return A.totalResistance() == stat_value + return A.resistance == stat_value /datum/bounty/virus/stage_speed stat_name = "stage speed" /datum/bounty/virus/stage_speed/accepts_virus(V) var/datum/disease/advance/A = V - return A.totalStageSpeed() == stat_value + return A.stage_rate == stat_value /datum/bounty/virus/stealth stat_name = "stealth" /datum/bounty/virus/stealth/accepts_virus(V) var/datum/disease/advance/A = V - return A.totalStealth() == stat_value + return A.stealth == stat_value /datum/bounty/virus/transmit stat_name = "transmissible" /datum/bounty/virus/transmit/accepts_virus(V) var/datum/disease/advance/A = V - return A.totalTransmittable() == stat_value + return A.transmission == stat_value diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm index 7bfd9eabe8305..e5ad56382378a 100644 --- a/code/modules/cargo/bounty.dm +++ b/code/modules/cargo/bounty.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(bounties_list) // Displayed on bounty UI screen. /datum/bounty/proc/reward_string() - return "[reward] Credits" + return "[reward * SSeconomy.bounty_modifier] Credits" /datum/bounty/proc/can_claim() return !claimed @@ -21,9 +21,7 @@ GLOBAL_LIST_EMPTY(bounties_list) // Called when the claim button is clicked. Override to provide fancy rewards. /datum/bounty/proc/claim() if(can_claim()) - var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) - if(D) - D.adjust_money(reward) + SSeconomy.distribute_funds(reward * SSeconomy.bounty_modifier * 3) claimed = TRUE // If an item sent in the cargo shuttle can satisfy the bounty. diff --git a/code/modules/cargo/bounty_console.dm b/code/modules/cargo/bounty_console.dm index 0135fb714e21f..a6a2d55bdcfb0 100644 --- a/code/modules/cargo/bounty_console.dm +++ b/code/modules/cargo/bounty_console.dm @@ -1,16 +1,18 @@ #define PRINTER_TIMEOUT 10 /obj/machinery/computer/bounty - name = "Nanotrasen bounty console" + name = "\improper Nanotrasen bounty console" desc = "Used to check and claim bounties offered by Nanotrasen" icon_screen = "bounty" circuit = /obj/item/circuitboard/computer/bounty light_color = "#E2853D"//orange var/printer_ready = 0 //cooldown var + var/static/datum/bank_account/cargocash /obj/machinery/computer/bounty/Initialize() . = ..() printer_ready = world.time + PRINTER_TIMEOUT + cargocash = SSeconomy.get_dep_account(ACCOUNT_CAR) /obj/machinery/computer/bounty/proc/print_paper() new /obj/item/paper/bounty_printout(loc) @@ -30,67 +32,36 @@ info += ""}
- dat += "
"
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "CargoBountyConsole")
+ ui.set_autoupdate(FALSE)
+ ui.open()
- var/datum/browser/popup = new(user, "bounties", "Nanotrasen Bounties", 700, 600)
- popup.set_content(dat)
- popup.open()
+/obj/machinery/computer/bounty/ui_data(mob/user)
+ var/list/data = list()
+ var/list/bountyinfo = list()
+ for(var/datum/bounty/B in GLOB.bounties_list)
+ bountyinfo += list(list("name" = B.name, "description" = B.description, "reward_string" = B.reward_string(), "completion_string" = B.completion_string() , "claimed" = B.claimed, "can_claim" = B.can_claim(), "priority" = B.high_priority, "bounty_ref" = REF(B)))
+ data["stored_cash"] = cargocash.account_balance
+ data["bountydata"] = bountyinfo
+ return data
-/obj/machinery/computer/bounty/Topic(href, href_list)
+/obj/machinery/computer/bounty/ui_act(action, params)
if(..())
return
-
- switch(href_list["choice"])
+ switch(action)
+ if("ClaimBounty")
+ var/datum/bounty/cashmoney = locate(params["bounty"]) in GLOB.bounties_list
+ if(cashmoney)
+ cashmoney.claim()
+ return TRUE
if("Print")
if(printer_ready < world.time)
printer_ready = world.time + PRINTER_TIMEOUT
print_paper()
-
- if("Claim")
- var/datum/bounty/B = locate(href_list["d_rec"]) in GLOB.bounties_list
- if(B)
- B.claim()
-
- if(href_list["refresh"])
- playsound(src, "terminal_type", 25, 0)
-
- updateUsrDialog()
-
+ return
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index 51eacc2a0a8f5..0f26fd2cddeea 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -1,3 +1,10 @@
+#define TAB_POD 0 //Used to check if the UIs built in camera is looking at the pod
+#define TAB_BAY 1 //Used to check if the UIs built in camera is looking at the launch bay area
+
+#define LAUNCH_ALL 0 //Used to check if we're launching everything from the bay area at once
+#define LAUNCH_ORDERED 1 //Used to check if we're launching everything from the bay area in order
+#define LAUNCH_RANDOM 2 //Used to check if we're launching everything from the bay area randomly
+
//The Great and Mighty CentCom Pod Launcher - MrDoomBringer
//This was originally created as a way to get adminspawned items to the station in an IC manner. It's evolved to contain a few more
//features such as item removal, smiting, controllable delivery mobs, and more.
@@ -11,20 +18,23 @@
/client/proc/centcom_podlauncher() //Creates a verb for admins to open up the ui
set name = "Config/Launch Supplypod"
- set desc = "Configure and launch a Centcom supplypod full of whatever your heart desires!"
+ set desc = "Configure and launch a CentCom supplypod full of whatever your heart desires!"
set category = "Adminbus"
- var/datum/centcom_podlauncher/plaunch = new(usr)//create the datum
- plaunch.ui_interact(usr)//datum has a tgui component, here we open the window
+ new /datum/centcom_podlauncher(usr)//create the datum
//Variables declared to change how items in the launch bay are picked and launched. (Almost) all of these are changed in the ui_act proc
//Some effect groups are choices, while other are booleans. This is because some effects can stack, while others dont (ex: you can stack explosion and quiet, but you cant stack ordered launch and random launch)
/datum/centcom_podlauncher
- var/static/list/ignored_atoms = typecacheof(list(null, /mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object, /obj/effect/particle_effect/sparks, /obj/effect/DPtarget, /obj/effect/supplypod_selector ))
+ var/static/list/ignored_atoms = typecacheof(list(null, /mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object, /obj/effect/particle_effect/sparks, /obj/effect/pod_landingzone, /obj/effect/hallucination/simple/supplypod_selector, /obj/effect/hallucination/simple/dropoff_location))
var/turf/oldTurf //Keeps track of where the user was at if they use the "teleport to centcom" button, so they can go back
var/client/holder //client of whoever is using this datum
- var/area/bay //What bay we're using to launch shit from.
+ var/area/centcom/supplypod/loading/bay //What bay we're using to launch shit from.
+ var/bayNumber //Quick reference to what bay we're in. Usually set to the loading_id variable for the related area type
+ var/customDropoff = FALSE
+ var/picking_dropoff_turf = FALSE
var/launchClone = FALSE //If true, then we don't actually launch the thing in the bay. Instead we call duplicateObject() and send the result
- var/launchChoice = 1 //Determines if we launch all at once (0) , in order (1), or at random(2)
+ var/launchRandomItem = FALSE //If true, lauches a single random item instead of everything on a turf.
+ var/launchChoice = LAUNCH_RANDOM //Determines if we launch all at once (0) , in order (1), or at random(2)
var/explosionChoice = 0 //Determines if there is no explosion (0), custom explosion (1), or just do a maxcap (2)
var/damageChoice = 0 //Determines if we do no damage (0), custom amnt of damage (1), or gib + 5000dmg (2)
var/launcherActivated = FALSE //check if we've entered "launch mode" (when we click a pod is launched). Used for updating mouse cursor
@@ -36,58 +46,129 @@
var/list/orderedArea = list() //Contains an ordered list of turfs in an area (filled in the createOrderedArea() proc), read top-left to bottom-right. Used for the "ordered" launch mode (launchChoice = 1)
var/list/turf/acceptableTurfs = list() //Contians a list of turfs (in the "bay" area on centcom) that have items that can be launched. Taken from orderedArea
var/list/launchList = list() //Contains whatever is going to be put in the supplypod and fired. Taken from acceptableTurfs
- var/obj/effect/supplypod_selector/selector = new() //An effect used for keeping track of what item is going to be launched when in "ordered" mode (launchChoice = 1)
+ var/obj/effect/hallucination/simple/supplypod_selector/selector //An effect used for keeping track of what item is going to be launched when in "ordered" mode (launchChoice = 1)
+ var/obj/effect/hallucination/simple/dropoff_location/indicator
var/obj/structure/closet/supplypod/centcompod/temp_pod //The temporary pod that is modified by this datum, then cloned. The buildObject() clone of this pod is what is launched
+ // Stuff needed to render the map
+ var/map_name
+ var/atom/movable/screen/map_view/cam_screen
+ var/list/cam_plane_masters
+ var/atom/movable/screen/background/cam_background
+ var/tabIndex = 1
+ var/renderLighting = FALSE
-/datum/centcom_podlauncher/New(H)//H can either be a client or a mob due to byondcode(tm)
- if (istype(H,/client))
- var/client/C = H
- holder = C //if its a client, assign it to holder
+/datum/centcom_podlauncher/New(user) //user can either be a client or a mob
+ if (user) //Prevents runtimes on datums being made without clients
+ setup(user)
+
+/datum/centcom_podlauncher/proc/setup(user) //H can either be a client or a mob
+ if (istype(user,/client))
+ var/client/user_client = user
+ holder = user_client //if its a client, assign it to holder
else
- var/mob/M = H
- holder = M.client //if its a mob, assign the mob's client to holder
+ var/mob/user_mob = user
+ holder = user_mob.client //if its a mob, assign the mob's client to holder
bay = locate(/area/centcom/supplypod/loading/one) in GLOB.sortedAreas //Locate the default bay (one) from the centcom map
- temp_pod = new(locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas) //Create a new temp_pod in the podStorage area on centcom (so users are free to look at it and change other variables if needed)
+ bayNumber = bay.loading_id //Used as quick reference to what bay we're taking items from
+ var/area/pod_storage_area = locate(/area/centcom/supplypod/pod_storage) in GLOB.sortedAreas
+ temp_pod = new(pick(get_area_turfs(pod_storage_area))) //Create a new temp_pod in the podStorage area on centcom (so users are free to look at it and change other variables if needed)
orderedArea = createOrderedArea(bay) //Order all the turfs in the selected bay (top left to bottom right) to a single list. Used for the "ordered" mode (launchChoice = 1)
+ selector = new(null, holder.mob)
+ indicator = new(null, holder.mob)
+ setDropoff(bay)
+ initMap()
+ refreshBay()
+ ui_interact(holder.mob)
+
+/datum/centcom_podlauncher/proc/initMap()
+ if(map_name)
+ holder.clear_map(map_name)
+
+ map_name = "admin_supplypod_bay_[REF(src)]_map"
+ // Initialize map objects
+ cam_screen = new
+ cam_screen.name = "screen"
+ cam_screen.assigned_map = map_name
+ cam_screen.del_on_map_removal = TRUE
+ cam_screen.screen_loc = "[map_name]:1,1"
+ cam_plane_masters = list()
+ for(var/plane in subtypesof(/atom/movable/screen/plane_master))
+ var/atom/movable/screen/instance = new plane()
+ if (!renderLighting && instance.plane == LIGHTING_PLANE)
+ instance.alpha = 100
+ instance.assigned_map = map_name
+ instance.del_on_map_removal = TRUE
+ instance.screen_loc = "[map_name]:CENTER"
+ cam_plane_masters += instance
+ cam_background = new
+ cam_background.assigned_map = map_name
+ cam_background.del_on_map_removal = TRUE
+ refreshView()
+ holder.register_map_obj(cam_screen)
+ for(var/plane in cam_plane_masters)
+ holder.register_map_obj(plane)
+ holder.register_map_obj(cam_background)
/datum/centcom_podlauncher/ui_state(mob/user)
+ if (SSticker.current_state >= GAME_STATE_FINISHED)
+ return GLOB.always_state //Allow the UI to be given to players by admins after roundend
return GLOB.admin_state
-/datum/centcom_podlauncher/ui_interact(mob/user, datum/tgui/ui)//ui_interact is called when the client verb is called.
+/datum/centcom_podlauncher/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/spritesheet/supplypods),
+ )
+/datum/centcom_podlauncher/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
+ // Open UI
ui = new(user, src, "CentcomPodLauncher")
ui.open()
+ refreshView()
+
+/datum/centcom_podlauncher/ui_static_data(mob/user)
+ var/list/data = list()
+ data["mapRef"] = map_name
+ data["defaultSoundVolume"] = initial(temp_pod.soundVolume) //default volume for pods
+ return data
/datum/centcom_podlauncher/ui_data(mob/user) //Sends info about the pod to the UI.
var/list/data = list() //*****NOTE*****: Many of these comments are similarly described in supplypod.dm. If you change them here, please consider doing so in the supplypod code as well!
- var/B = (istype(bay, /area/centcom/supplypod/loading/one)) ? 1 : (istype(bay, /area/centcom/supplypod/loading/two)) ? 2 : (istype(bay, /area/centcom/supplypod/loading/three)) ? 3 : (istype(bay, /area/centcom/supplypod/loading/four)) ? 4 : (istype(bay, /area/centcom/supplypod/loading/ert)) ? 5 : 0 //top ten THICCEST FUCKING TERNARY CONDITIONALS OF 2036
- data["bay"] = bay //Holds the current bay the user is launching objects from. Bays are specific rooms on the centcom map.
- data["bayNumber"] = B //Holds the bay as a number. Useful for comparisons in centcom_podlauncher.ract
+ bayNumber = bay?.loading_id //Used as quick reference to what bay we're taking items from
+ data["bayNumber"] = bayNumber //Holds the bay as a number. Useful for comparisons in centcom_podlauncher.ract
data["oldArea"] = (oldTurf ? get_area(oldTurf) : null) //Holds the name of the area that the user was in before using the teleportCentcom action
+ data["picking_dropoff_turf"] = picking_dropoff_turf //If we're picking or have picked a dropoff turf. Only works when pod is in reverse mode
+ data["customDropoff"] = customDropoff
+ data["renderLighting"] = renderLighting
data["launchClone"] = launchClone //Do we launch the actual items in the bay or just launch clones of them?
+ data["launchRandomItem"] = launchRandomItem //Do we launch a single random item instead of everything on the turf?
data["launchChoice"] = launchChoice //Launch turfs all at once (0), ordered (1), or randomly(1)
data["explosionChoice"] = explosionChoice //An explosion that occurs when landing. Can be no explosion (0), custom explosion (1), or maxcap (2)
data["damageChoice"] = damageChoice //Damage that occurs to any mob under the pod when it lands. Can be no damage (0), custom damage (1), or gib+5000dmg (2)
- data["fallDuration"] = temp_pod.fallDuration //How long the pod's falling animation lasts
- data["landingDelay"] = temp_pod.landingDelay //How long the pod takes to land after launching
- data["openingDelay"] = temp_pod.openingDelay //How long the pod takes to open after landing
- data["departureDelay"] = temp_pod.departureDelay //How long the pod takes to leave after opening (if bluespace=true, it deletes. if reversing=true, it flies back to centcom)
- data["styleChoice"] = temp_pod.style //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the POD_STYLES list in cargo.dm defines to get the proper icon/name/desc for the pod.
+ data["delays"] = temp_pod.delays
+ data["rev_delays"] = temp_pod.reverse_delays
+ data["custom_rev_delay"] = temp_pod.custom_rev_delay
+ data["styleChoice"] = temp_pod.style //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
+ data["effectShrapnel"] = temp_pod.effectShrapnel //If true, creates a cloud of shrapnel of a decided type and magnitude on landing
+ data["shrapnelType"] = "[temp_pod.shrapnel_type]" //Path2String
+ data["shrapnelMagnitude"] = temp_pod.shrapnel_magnitude
data["effectStun"] = temp_pod.effectStun //If true, stuns anyone under the pod when it launches until it lands, forcing them to get hit by the pod. Devilish!
data["effectLimb"] = temp_pod.effectLimb //If true, pops off a limb (if applicable) from anyone caught under the pod when it lands
data["effectOrgans"] = temp_pod.effectOrgans //If true, yeets the organs out of any bodies caught under the pod when it lands
data["effectBluespace"] = temp_pod.bluespace //If true, the pod deletes (in a shower of sparks) after landing
- data["effectStealth"] = temp_pod.effectStealth //If true, a target icon isnt displayed on the turf where the pod will land
+ data["effectStealth"] = temp_pod.effectStealth //If true, a target icon isn't displayed on the turf where the pod will land
data["effectQuiet"] = temp_pod.effectQuiet //The female sniper. If true, the pod makes no noise (including related explosions, opening sounds, etc)
data["effectMissile"] = temp_pod.effectMissile //If true, the pod deletes the second it lands. If you give it an explosion, it will act like a missile exploding as it hits the ground
data["effectCircle"] = temp_pod.effectCircle //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here
data["effectBurst"] = effectBurst //IOf true, launches five pods at once (with a very small delay between for added coolness), in a 3x3 area centered around the area
data["effectReverse"] = temp_pod.reversing //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
+ data["reverseOptionList"] = temp_pod.reverseOptionList
data["effectTarget"] = specificTarget //Launches the pod at the turf of a specific mob target, rather than wherever the user clicked. Useful for smites
data["effectName"] = temp_pod.adminNamed //Determines whether or not the pod has been named by an admin. If true, the pod's name will not get overridden when the style of the pod changes (changing the style of the pod normally also changes the name+desc)
+ data["podName"] = temp_pod.name
+ data["podDesc"] = temp_pod.desc
data["effectAnnounce"] = effectAnnounce
data["giveLauncher"] = launcherActivated //If true, the user is in launch mode, and whenever they click a pod will be launched (either at their mouse position or at a specific target)
data["numObjects"] = numTurfs //Counts the number of turfs that contain a launchable object in the centcom supplypod bay
@@ -95,77 +176,102 @@
data["landingSound"] = temp_pod.landingSound //Admin sound to play when the pod lands
data["openingSound"] = temp_pod.openingSound //Admin sound to play when the pod opens
data["leavingSound"] = temp_pod.leavingSound //Admin sound to play when the pod leaves
- data["soundVolume"] = temp_pod.soundVolume != initial(temp_pod.soundVolume) //Admin sound to play when the pod leaves
+ data["soundVolume"] = temp_pod.soundVolume //Admin sound to play when the pod leaves
return data
/datum/centcom_podlauncher/ui_act(action, params)
- if(..())
+ . = ..()
+ if(.)
return
switch(action)
////////////////////////////UTILITIES//////////////////
- if("bay1")
- bay = locate(/area/centcom/supplypod/loading/one) in GLOB.sortedAreas //set the "bay" variable to the corresponding room in centcom
- refreshBay() //calls refreshBay() which "recounts" the bay to see what items we can launch (among other things).
- . = TRUE
- if("bay2")
- bay = locate(/area/centcom/supplypod/loading/two) in GLOB.sortedAreas
- refreshBay()
- . = TRUE
- if("bay3")
- bay = locate(/area/centcom/supplypod/loading/three) in GLOB.sortedAreas
- refreshBay()
- . = TRUE
- if("bay4")
- bay = locate(/area/centcom/supplypod/loading/four) in GLOB.sortedAreas
- refreshBay()
- . = TRUE
- if("bay5")
- bay = locate(/area/centcom/supplypod/loading/ert) in GLOB.sortedAreas
+ if("gamePanel")
+ holder.holder.Game()
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Game Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ . = TRUE
+ if("buildMode")
+ var/mob/holder_mob = holder.mob
+ if (holder_mob)
+ togglebuildmode(holder_mob)
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Build Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ . = TRUE
+ if("loadDataFromPreset")
+ var/list/savedData = params["payload"]
+ loadData(savedData)
+ . = TRUE
+ if("switchBay")
+ bayNumber = params["bayNumber"]
refreshBay()
. = TRUE
- if("teleportCentcom") //Teleports the user to the centcom supply loading facility.
+ if("pickDropoffTurf") //Enters a mode that lets you pick the dropoff location for reverse pods
+ if (picking_dropoff_turf)
+ picking_dropoff_turf = FALSE
+ else
+ if (launcherActivated)
+ launcherActivated = FALSE //We don't want to have launch mode enabled while we're picking a turf
+ picking_dropoff_turf = TRUE
+ updateCursor() //Update the cursor of the user to a cool looking target icon
+ . = TRUE
+ if("clearDropoffTurf")
+ setDropoff(bay)
+ customDropoff = FALSE
+ picking_dropoff_turf = FALSE
+ updateCursor()
+ . = TRUE
+ if("teleportDropoff") //Teleports the user to the dropoff point.
var/mob/M = holder.mob //We teleport whatever mob the client is attached to at the point of clicking
- oldTurf = get_turf(M) //Used for the "teleportBack" action
- var/area/A = locate(bay) in GLOB.sortedAreas
- var/list/turfs = list()
- for(var/turf/T in A)
- turfs.Add(T) //Fill a list with turfs in the area
- var/turf/T = safepick(turfs) //Only teleport if the list isn't empty
- if(!T) //If the list is empty, error and cancel
- to_chat(M, "Nowhere to jump to!")
- return
- M.forceMove(T) //Perform the actual teleport
- log_admin("[key_name(usr)] jumped to [AREACOORD(A)]")
- message_admins("[key_name_admin(usr)] jumped to [AREACOORD(A)]")
+ var/turf/current_location = get_turf(M)
+ var/list/coordinate_list = temp_pod.reverse_dropoff_coords
+ var/turf/dropoff_turf = locate(coordinate_list[1], coordinate_list[2], coordinate_list[3])
+ if (current_location != dropoff_turf)
+ oldTurf = current_location
+ M.forceMove(dropoff_turf) //Perform the actual teleport
+ log_admin("[key_name(usr)] jumped to [AREACOORD(dropoff_turf)]")
+ message_admins("[key_name_admin(usr)] jumped to [AREACOORD(dropoff_turf)]")
. = TRUE
- if("teleportBack") //After teleporting to centcom, this button allows the user to teleport to the last spot they were at.
+ if("teleportCentcom") //Teleports the user to the centcom supply loading facility.
+ var/mob/holder_mob = holder.mob //We teleport whatever mob the client is attached to at the point of clicking
+ var/turf/current_location = get_turf(holder_mob)
+ var/area/bay_area = bay
+ if (current_location.loc != bay_area)
+ oldTurf = current_location
+ var/turf/teleport_turf = pick(get_area_turfs(bay_area))
+ holder_mob.forceMove(teleport_turf) //Perform the actual teleport
+ if (holder.holder)
+ log_admin("[key_name(usr)] jumped to [AREACOORD(teleport_turf)]")
+ message_admins("[key_name_admin(usr)] jumped to [AREACOORD(teleport_turf)]")
+ . = TRUE
+ if("teleportBack") //After teleporting to centcom/dropoff, this button allows the user to teleport to the last spot they were at.
var/mob/M = holder.mob
if (!oldTurf) //If theres no turf to go back to, error and cancel
to_chat(M, "Nowhere to jump to!")
return
M.forceMove(oldTurf) //Perform the actual teleport
- log_admin("[key_name(usr)] jumped to [AREACOORD(oldTurf)]")
- message_admins("[key_name_admin(usr)] jumped to [AREACOORD(oldTurf)]")
+ if (holder.holder)
+ log_admin("[key_name(usr)] jumped to [AREACOORD(oldTurf)]")
+ message_admins("[key_name_admin(usr)] jumped to [AREACOORD(oldTurf)]")
. = TRUE
////////////////////////////LAUNCH STYLE CHANGES//////////////////
if("launchClone") //Toggles the launchClone var. See variable declarations above for what this specifically means
launchClone = !launchClone
. = TRUE
+ if("launchRandomItem") //Pick random turfs from the supplypod bay at centcom to launch
+ launchRandomItem = TRUE
+ . = TRUE
+ if("launchWholeTurf") //Pick random turfs from the supplypod bay at centcom to launch
+ launchRandomItem = FALSE
+ . = TRUE
+ if("launchAll") //Launch turfs (from the orderedArea list) all at once, from the supplypod bay at centcom
+ launchChoice = LAUNCH_ALL
+ updateSelector()
+ . = TRUE
if("launchOrdered") //Launch turfs (from the orderedArea list) one at a time in order, from the supplypod bay at centcom
- if (launchChoice == 1) //launchChoice 1 represents ordered. If we push "ordered" and it already is, then we go to default value
- launchChoice = 0
- updateSelector() //Move the selector effect to the next object that will be launched. See variable declarations for more info on the selector effect.
- return
- launchChoice = 1
+ launchChoice = LAUNCH_ORDERED
updateSelector()
. = TRUE
- if("launchRandom") //Pick random turfs from the supplypod bay at centcom to launch
- if (launchChoice == 2)
- launchChoice = 0
- updateSelector()
- return
- launchChoice = 2
+ if("launchRandomTurf") //Pick random turfs from the supplypod bay at centcom to launch
+ launchChoice = LAUNCH_RANDOM
updateSelector()
. = TRUE
@@ -174,65 +280,82 @@
if (explosionChoice == 1) //If already a custom explosion, set to default (no explosion)
explosionChoice = 0
temp_pod.explosionSize = list(0,0,0,0)
- return
- var/list/expNames = list("Devastation", "Heavy Damage", "Light Damage", "Flame") //Explosions have a range of different types of damage
- var/list/boomInput = list()
- for (var/i=1 to expNames.len) //Gather input from the user for the value of each type of damage
- boomInput.Add(input("[expNames[i]] Range", "Enter the [expNames[i]] range of the explosion. WARNING: This ignores the bomb cap!", 0) as null|num)
- if (isnull(boomInput[i]))
- return
- if (!isnum_safe(boomInput[i])) //If the user doesn't input a number, set that specific explosion value to zero
- alert(usr, "That wasnt a number! Value set to default (zero) instead.")
- boomInput = 0
- explosionChoice = 1
- temp_pod.explosionSize = boomInput
+ else
+ var/list/expNames = list("Devastation", "Heavy Damage", "Light Damage", "Flame") //Explosions have a range of different types of damage
+ var/list/boomInput = list()
+ for (var/i=1 to expNames.len) //Gather input from the user for the value of each type of damage
+ boomInput.Add(input("Enter the [expNames[i]] range of the explosion. WARNING: This ignores the bomb cap!", "[expNames[i]] Range", 0) as null|num)
+ if (isnull(boomInput[i]))
+ return
+ if (!isnum_safe(boomInput[i])) //If the user doesn't input a number, set that specific explosion value to zero
+ alert(usr, "That wasn't a number! Value set to default (zero) instead.")
+ boomInput = 0
+ explosionChoice = 1
+ temp_pod.explosionSize = boomInput
. = TRUE
if("explosionBus") //Creates a maxcap when the pod lands
if (explosionChoice == 2) //If already a maccap, set to default (no explosion)
explosionChoice = 0
temp_pod.explosionSize = list(0,0,0,0)
- return
- explosionChoice = 2
- temp_pod.explosionSize = list(GLOB.MAX_EX_DEVESTATION_RANGE, GLOB.MAX_EX_HEAVY_RANGE, GLOB.MAX_EX_LIGHT_RANGE,GLOB.MAX_EX_FLAME_RANGE) //Set explosion to max cap of server
+ else
+ explosionChoice = 2
+ temp_pod.explosionSize = list(GLOB.MAX_EX_DEVESTATION_RANGE, GLOB.MAX_EX_HEAVY_RANGE, GLOB.MAX_EX_LIGHT_RANGE,GLOB.MAX_EX_FLAME_RANGE) //Set explosion to max cap of server
. = TRUE
if("damageCustom") //Deals damage to whoevers under the pod when it lands
if (damageChoice == 1) //If already doing custom damage, set back to default (no damage)
damageChoice = 0
temp_pod.damage = 0
- return
- var/damageInput = input("How much damage to deal", "Enter the amount of brute damage dealt by getting hit", 0) as null|num
- if (isnull(damageInput))
- return
- if (!isnum_safe(damageInput)) //Sanitize the input for damage to deal.s
- alert(usr, "That wasnt a number! Value set to default (zero) instead.")
- damageInput = 0
- damageChoice = 1
- temp_pod.damage = damageInput
+ else
+ var/damageInput = input("Enter the amount of brute damage dealt by getting hit","How much damage to deal", 0) as null|num
+ if (isnull(damageInput))
+ return
+ if (!isnum_safe(damageInput)) //Sanitize the input for damage to deal.s
+ alert(usr, "That wasn't a number! Value set to default (zero) instead.")
+ damageInput = 0
+ damageChoice = 1
+ temp_pod.damage = damageInput
. = TRUE
if("damageGib") //Gibs whoever is under the pod when it lands. Also deals 5000 damage, just to be sure.
if (damageChoice == 2) //If already gibbing, set back to default (no damage)
damageChoice = 0
temp_pod.damage = 0
temp_pod.effectGib = FALSE
- return
- damageChoice = 2
- temp_pod.damage = 5000
- temp_pod.effectGib = TRUE //Gibs whoever is under the pod when it lands
+ else
+ damageChoice = 2
+ temp_pod.damage = 5000
+ temp_pod.effectGib = TRUE //Gibs whoever is under the pod when it lands
. = TRUE
if("effectName") //Give the supplypod a custom name. Supplypods automatically get their name based on their style (see supplypod/setStyle() proc), so doing this overrides that.
if (temp_pod.adminNamed) //If we're already adminNamed, set the name of the pod back to default
temp_pod.adminNamed = FALSE
temp_pod.setStyle(temp_pod.style) //This resets the name of the pod based on it's current style (see supplypod/setStyle() proc)
- return
- var/nameInput= input("Custom name", "Enter a custom name", POD_STYLES[temp_pod.style][POD_NAME]) as null|text //Gather input for name and desc
- if (isnull(nameInput))
- return
- var/descInput = input("Custom description", "Enter a custom desc", POD_STYLES[temp_pod.style][POD_DESC]) as null|text //The POD_STYLES is used to get the name, desc, or icon state based on the pod's style
- if (isnull(descInput))
- return
- temp_pod.name = nameInput
- temp_pod.desc = descInput
- temp_pod.adminNamed = TRUE //This variable is checked in the supplypod/setStyle() proc
+ else
+ var/nameInput= input("Custom name", "Enter a custom name", GLOB.podstyles[temp_pod.style][POD_NAME]) as null|text //Gather input for name and desc
+ if (isnull(nameInput))
+ return
+ var/descInput = input("Custom description", "Enter a custom desc", GLOB.podstyles[temp_pod.style][POD_DESC]) as null|text //The GLOB.podstyles is used to get the name, desc, or icon state based on the pod's style
+ if (isnull(descInput))
+ return
+ temp_pod.name = nameInput
+ temp_pod.desc = descInput
+ temp_pod.adminNamed = TRUE //This variable is checked in the supplypod/setStyle() proc
+ . = TRUE
+ if("effectShrapnel") //Creates a cloud of shrapnel on landing
+ if (temp_pod.effectShrapnel == TRUE) //If already doing custom damage, set back to default (no shrapnel)
+ temp_pod.effectShrapnel = FALSE
+ else
+ var/shrapnelInput = input("Please enter the type of pellet cloud you'd like to create on landing (Can be any projectile!)", "Projectile Typepath", 0) in sortList(subtypesof(/obj/item/projectile), /proc/cmp_typepaths_asc)
+ if (isnull(shrapnelInput))
+ return
+ var/shrapnelMagnitude = input("Enter the magnitude of the pellet cloud. This is usually a value around 1-5. Please note that Ryll-Ryll has asked me to tell you that if you go too crazy with the projectiles you might crash the server. So uh, be gentle!", "Shrapnel Magnitude", 0) as null|num
+ if (isnull(shrapnelMagnitude))
+ return
+ if (!isnum(shrapnelMagnitude))
+ alert(usr, "That wasn't a number! Value set to 3 instead.")
+ shrapnelMagnitude = 3
+ temp_pod.shrapnel_type = shrapnelInput
+ temp_pod.shrapnel_magnitude = shrapnelMagnitude
+ temp_pod.effectShrapnel = TRUE
. = TRUE
if("effectStun") //Toggle: Any mob under the pod is stunned (cant move) until the pod lands, hitting them!
temp_pod.effectStun = !temp_pod.effectStun
@@ -266,170 +389,136 @@
. = TRUE
if("effectReverse") //Toggle: Don't send any items. Instead, after landing, close (taking any objects inside) and go back to the centcom bay it came from
temp_pod.reversing = !temp_pod.reversing
+ if (temp_pod.reversing)
+ indicator.alpha = 150
+ else
+ indicator.alpha = 0
+ . = TRUE
+ if("reverseOption")
+ var/reverseOption = params["reverseOption"]
+ temp_pod.reverseOptionList[reverseOption] = !temp_pod.reverseOptionList[reverseOption]
. = TRUE
if("effectTarget") //Toggle: Launch at a specific mob (instead of at whatever turf you click on). Used for the supplypod smite
if (specificTarget)
specificTarget = null
- return
- var/list/mobs = getpois()//code stolen from observer.dm
- var/inputTarget = input("Select a mob! (Smiting does this automatically)", "Target", null, null) as null|anything in mobs
- if (isnull(inputTarget))
- return
- var/mob/target = mobs[inputTarget]
- specificTarget = target///input specific tartget
+ else
+ var/list/mobs = getpois()//code stolen from observer.dm
+ var/inputTarget = input("Select a mob! (Smiting does this automatically)", "Target", null, null) as null|anything in mobs
+ if (isnull(inputTarget))
+ return
+ var/mob/target = mobs[inputTarget]
+ specificTarget = target///input specific tartget
. = TRUE
////////////////////////////TIMER DELAYS//////////////////
- if("fallDuration") //Change the time it takes the pod to land, after firing
- if (temp_pod.fallDuration != initial(temp_pod.fallDuration)) //If the landing delay has already been changed when we push the "change value" button, then set it to default
- temp_pod.fallDuration = initial(temp_pod.fallDuration)
- return
- var/timeInput = input("Enter the duration of the pod's falling animation, in seconds", "Delay Time", initial(temp_pod.fallDuration) * 0.1) as null|num
- if (isnull(timeInput))
- return
- if (!isnum_safe(timeInput)) //Sanitize input, if it doesnt check out, error and set to default
- alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.fallDuration)*0.1]) instead.")
- timeInput = initial(temp_pod.fallDuration)
- temp_pod.fallDuration = 10 * timeInput
- . = TRUE
- if("landingDelay") //Change the time it takes the pod to land, after firing
- if (temp_pod.landingDelay != initial(temp_pod.landingDelay)) //If the landing delay has already been changed when we push the "change value" button, then set it to default
- temp_pod.landingDelay = initial(temp_pod.landingDelay)
- return
- var/timeInput = input("Enter the time it takes for the pod to land, in seconds", "Delay Time", initial(temp_pod.landingDelay) * 0.1) as null|num
- if (isnull(timeInput))
- return
- if (!isnum_safe(timeInput)) //Sanitize input, if it doesnt check out, error and set to default
- alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.landingDelay)*0.1]) instead.")
- timeInput = initial(temp_pod.landingDelay)
- temp_pod.landingDelay = 10 * timeInput
- . = TRUE
- if("openingDelay") //Change the time it takes the pod to open it's door (and release its contents) after landing
- if (temp_pod.openingDelay != initial(temp_pod.openingDelay)) //If the opening delay has already been changed when we push the "change value" button, then set it to default
- temp_pod.openingDelay = initial(temp_pod.openingDelay)
- return
- var/timeInput = input("Enter the time it takes for the pod to open after landing, in seconds", "Delay Time", initial(temp_pod.openingDelay) * 0.1) as null|num
- if (isnull(timeInput))
- return
- if (!isnum_safe(timeInput)) //Sanitize input
- alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.openingDelay)*0.1]) instead.")
- timeInput = initial(temp_pod.openingDelay)
- temp_pod.openingDelay = 10 * timeInput
- . = TRUE
- if("departureDelay") //Change the time it takes the pod to leave (if bluespace = true it just deletes, if effectReverse = true it goes back to centcom)
- if (temp_pod.departureDelay != initial(temp_pod.departureDelay)) //If the departure delay has already been changed when we push the "change value" button, then set it to default
- temp_pod.departureDelay = initial(temp_pod.departureDelay)
- return
- var/timeInput = input("Enter the time it takes for the pod to leave after opening, in seconds", "Delay Time", initial(temp_pod.departureDelay) * 0.1) as null|num
- if (isnull(timeInput))
- return
- if (!isnum_safe(timeInput))
- alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.departureDelay)*0.1]) instead.")
- timeInput = initial(temp_pod.departureDelay)
- temp_pod.departureDelay = 10 * timeInput
+ if("editTiming") //Change the different timers relating to the pod
+ var/delay = params["timer"]
+ var/value = params["value"]
+ var/reverse = params["reverse"]
+ if (reverse)
+ temp_pod.reverse_delays[delay] = value * 10
+ else
+ temp_pod.delays[delay] = value * 10
+ . = TRUE
+ if("resetTiming")
+ temp_pod.delays = list(POD_TRANSIT = 20, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
+ temp_pod.reverse_delays = list(POD_TRANSIT = 20, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
+ . = TRUE
+ if("toggleRevDelays")
+ temp_pod.custom_rev_delay = !temp_pod.custom_rev_delay
. = TRUE
-
////////////////////////////ADMIN SOUNDS//////////////////
- if("fallSound") //Admin sound from a local file that plays when the pod lands
+ if("fallingSound") //Admin sound from a local file that plays when the pod lands
if ((temp_pod.fallingSound) != initial(temp_pod.fallingSound))
temp_pod.fallingSound = initial(temp_pod.fallingSound)
temp_pod.fallingSoundLength = initial(temp_pod.fallingSoundLength)
- return
- var/soundInput = input(holder, "Please pick a sound file to play when the pod lands! NOTICE: Take a note of exactly how long the sound is.", "Pick a Sound File") as null|sound
- if (isnull(soundInput))
- return
- var/timeInput = input(holder, "What is the exact length of the sound file, in seconds. This number will be used to line the sound up so that it finishes right as the pod lands!", "Pick a Sound File", 0.3) as null|num
- if (isnull(timeInput))
- return
- if (!isnum_safe(timeInput))
- alert(usr, "That wasnt a number! Value set to default ([initial(temp_pod.fallingSoundLength)*0.1]) instead.")
- temp_pod.fallingSound = soundInput
- temp_pod.fallingSoundLength = 10 * timeInput
+ else
+ var/soundInput = input(holder, "Please pick a sound file to play when the pod lands! Sound will start playing and try to end when the pod lands", "Pick a Sound File") as null|sound
+ if (isnull(soundInput))
+ return
+ var/sound/tempSound = sound(soundInput)
+ playsound(holder.mob, tempSound, 1)
+ var/list/sounds_list = holder.SoundQuery()
+ var/soundLen = 0
+ for (var/playing_sound in sounds_list)
+ if (isnull(playing_sound))
+ stack_trace("client.SoundQuery() Returned a list containing a null sound! Somehow!")
+ continue
+ var/sound/found = playing_sound
+ if (found.file == tempSound.file)
+ soundLen = found.len
+ if (!soundLen)
+ soundLen = input(holder, "Couldn't auto-determine sound file length. What is the exact length of the sound file, in seconds. This number will be used to line the sound up so that it finishes right as the pod lands!", "Pick a Sound File", 0.3) as null|num
+ if (isnull(soundLen))
+ return
+ if (!isnum(soundLen))
+ alert(usr, "That wasn't a number! Value set to default ([initial(temp_pod.fallingSoundLength)*0.1]) instead.")
+ temp_pod.fallingSound = soundInput
+ temp_pod.fallingSoundLength = 10 * soundLen
. = TRUE
if("landingSound") //Admin sound from a local file that plays when the pod lands
if (!isnull(temp_pod.landingSound))
temp_pod.landingSound = null
- return
- var/soundInput = input(holder, "Please pick a sound file to play when the pod lands! I reccomend a nice \"oh shit, i'm sorry\", incase you hit someone with the pod.", "Pick a Sound File") as null|sound
- if (isnull(soundInput))
- return
- temp_pod.landingSound = soundInput
+ else
+ var/soundInput = input(holder, "Please pick a sound file to play when the pod lands! I reccomend a nice \"oh shit, i'm sorry\", incase you hit someone with the pod.", "Pick a Sound File") as null|sound
+ if (isnull(soundInput))
+ return
+ temp_pod.landingSound = soundInput
. = TRUE
if("openingSound") //Admin sound from a local file that plays when the pod opens
if (!isnull(temp_pod.openingSound))
temp_pod.openingSound = null
- return
- var/soundInput = input(holder, "Please pick a sound file to play when the pod opens! I reccomend a stock sound effect of kids cheering at a party, incase your pod is full of fun exciting stuff!", "Pick a Sound File") as null|sound
- if (isnull(soundInput))
- return
- temp_pod.openingSound = soundInput
+ else
+ var/soundInput = input(holder, "Please pick a sound file to play when the pod opens! I reccomend a stock sound effect of kids cheering at a party, incase your pod is full of fun exciting stuff!", "Pick a Sound File") as null|sound
+ if (isnull(soundInput))
+ return
+ temp_pod.openingSound = soundInput
. = TRUE
if("leavingSound") //Admin sound from a local file that plays when the pod leaves
if (!isnull(temp_pod.leavingSound))
temp_pod.leavingSound = null
- return
- var/soundInput = input(holder, "Please pick a sound file to play when the pod leaves! I reccomend a nice slide whistle sound, especially if you're using the reverse pod effect.", "Pick a Sound File") as null|sound
- if (isnull(soundInput))
- return
- temp_pod.leavingSound = soundInput
+ else
+ var/soundInput = input(holder, "Please pick a sound file to play when the pod leaves! I reccomend a nice slide whistle sound, especially if you're using the reverse pod effect.", "Pick a Sound File") as null|sound
+ if (isnull(soundInput))
+ return
+ temp_pod.leavingSound = soundInput
. = TRUE
if("soundVolume") //Admin sound from a local file that plays when the pod leaves
if (temp_pod.soundVolume != initial(temp_pod.soundVolume))
temp_pod.soundVolume = initial(temp_pod.soundVolume)
- return
- var/soundInput = input(holder, "Please pick a volume. Default is between 1 and 100 with 50 being average, but pick whatever. I'm a notification, not a cop. If you still cant hear your sound, consider turning on the Quiet effect. It will silence all pod sounds except for the custom admin ones set by the previous three buttons.", "Pick Admin Sound Volume") as null|num
- if (isnull(soundInput))
- return
- temp_pod.soundVolume = soundInput
+ else
+ var/soundInput = input(holder, "Please pick a volume. Default is between 1 and 100 with 50 being average, but pick whatever. I'm a notification, not a cop. If you still cant hear your sound, consider turning on the Quiet effect. It will silence all pod sounds except for the custom admin ones set by the previous three buttons.", "Pick Admin Sound Volume") as null|num
+ if (isnull(soundInput))
+ return
+ temp_pod.soundVolume = soundInput
. = TRUE
////////////////////////////STYLE CHANGES//////////////////
- //Style is a value that is used to keep track of what the pod is supposed to look like. It can be used with the POD_STYLES list (in cargo.dm defines)
+ //Style is a value that is used to keep track of what the pod is supposed to look like. It can be used with the GLOB.podstyles list (in cargo.dm defines)
//as a way to get the proper icon state, name, and description of the pod.
- if("styleStandard")
- temp_pod.setStyle(STYLE_STANDARD)
- . = TRUE
- if("styleBluespace")
- temp_pod.setStyle(STYLE_BLUESPACE)
- . = TRUE
- if("styleSyndie")
- temp_pod.setStyle(STYLE_SYNDICATE)
- . = TRUE
- if("styleBlue")
- temp_pod.setStyle(STYLE_BLUE)
- . = TRUE
- if("styleCult")
- temp_pod.setStyle(STYLE_CULT)
- . = TRUE
- if("styleMissile")
- temp_pod.setStyle(STYLE_MISSILE)
- . = TRUE
- if("styleSMissile")
- temp_pod.setStyle(STYLE_RED_MISSILE)
+ if("tabSwitch")
+ tabIndex = params["tabIndex"]
+ refreshView()
. = TRUE
- if("styleBox")
- temp_pod.setStyle(STYLE_BOX)
+ if("refreshView")
+ initMap()
+ refreshView()
. = TRUE
- if("styleHONK")
- temp_pod.setStyle(STYLE_HONK)
+ if("renderLighting")
+ renderLighting = !renderLighting
. = TRUE
- if("styleFruit")
- temp_pod.setStyle(STYLE_FRUIT)
- . = TRUE
- if("styleInvisible")
- temp_pod.setStyle(STYLE_INVISIBLE)
- . = TRUE
- if("styleGondola")
- temp_pod.setStyle(STYLE_GONDOLA)
- . = TRUE
- if("styleSeeThrough")
- temp_pod.setStyle(STYLE_SEETHROUGH)
+ if("setStyle")
+ var/chosenStyle = params["style"]
+ temp_pod.setStyle(chosenStyle+1)
. = TRUE
if("refresh") //Refresh the Pod bay. User should press this if they spawn something new in the centcom bay. Automatically called whenever the user launches a pod
refreshBay()
. = TRUE
if("giveLauncher") //Enters the "Launch Mode". When the launcher is activated, temp_pod is cloned, and the result it filled and launched anywhere the user clicks (unless specificTarget is true)
launcherActivated = !launcherActivated
- updateCursor(launcherActivated) //Update the cursor of the user to a cool looking target icon
+ if (picking_dropoff_turf)
+ picking_dropoff_turf = FALSE //We don't want to have launch mode enabled while we're picking a turf
+ updateCursor() //Update the cursor of the user to a cool looking target icon
+ updateSelector()
. = TRUE
if("clearBay") //Delete all mobs and objs in the selected bay
if(alert(usr, "This will delete all objs and mobs in [bay]. Are you sure?", "Confirmation", "Delete that shit", "No") == "Delete that shit")
@@ -437,30 +526,62 @@
refreshBay()
. = TRUE
-/datum/centcom_podlauncher/ui_close() //Uses the destroy() proc. When the user closes the UI, we clean up the temp_pod and supplypod_selector variables.
+/datum/centcom_podlauncher/ui_close(mob/user, datum/tgui/tgui) //Uses the destroy() proc. When the user closes the UI, we clean up the temp_pod and supplypod_selector variables.
+ QDEL_NULL(temp_pod)
+ user.client?.clear_map(map_name)
+ QDEL_NULL(cam_screen)
+ QDEL_LIST(cam_plane_masters)
+ QDEL_NULL(cam_background)
qdel(src)
-/datum/centcom_podlauncher/proc/updateCursor(var/launching) //Update the moues of the user
- if (holder) //Check to see if we have a client
- if (launching) //If the launching param is true, we give the user new mouse icons.
+/datum/centcom_podlauncher/proc/setupViewPod()
+ setupView(RANGE_TURFS(2, temp_pod))
+
+/datum/centcom_podlauncher/proc/setupViewBay()
+ var/list/visible_turfs = list()
+ for(var/turf/bay_turf in bay)
+ visible_turfs += bay_turf
+ setupView(visible_turfs)
+
+/datum/centcom_podlauncher/proc/setupViewDropoff()
+ var/list/coords_list = temp_pod.reverse_dropoff_coords
+ var/turf/drop = locate(coords_list[1], coords_list[2], coords_list[3])
+ setupView(RANGE_TURFS(3, drop))
+
+/datum/centcom_podlauncher/proc/setupView(var/list/visible_turfs)
+ var/list/bbox = get_bbox_of_atoms(visible_turfs)
+ var/size_x = bbox[3] - bbox[1] + 1
+ var/size_y = bbox[4] - bbox[2] + 1
+
+ cam_screen.vis_contents = visible_turfs
+ cam_background.icon_state = "clear"
+ cam_background.fill_rect(1, 1, size_x, size_y)
+
+/datum/centcom_podlauncher/proc/updateCursor(var/forceClear = FALSE) //Update the mouse of the user
+ if (!holder) //Can't update the mouse icon if the client doesnt exist!
+ return
+ if (!forceClear && (launcherActivated || picking_dropoff_turf)) //If the launching param is true, we give the user new mouse icons.
+ if(launcherActivated)
holder.mouse_up_icon = 'icons/effects/supplypod_target.dmi' //Icon for when mouse is released
holder.mouse_down_icon = 'icons/effects/supplypod_down_target.dmi' //Icon for when mouse is pressed
- holder.mouse_pointer_icon = holder.mouse_up_icon //Icon for idle mouse (same as icon for when released)
- holder.click_intercept = src //Create a click_intercept so we know where the user is clicking
- else
- var/mob/M = holder.mob
- holder.mouse_up_icon = null
- holder.mouse_down_icon = null
- holder.click_intercept = null
- if (M)
- M.update_mouse_pointer() //set the moues icons to null, then call update_moues_pointer() which resets them to the correct values based on what the mob is doing (in a mech, holding a spell, etc)()
+ else if(picking_dropoff_turf)
+ holder.mouse_up_icon = 'icons/effects/supplypod_pickturf.dmi' //Icon for when mouse is released
+ holder.mouse_down_icon = 'icons/effects/supplypod_pickturf_down.dmi' //Icon for when mouse is pressed
+ holder.mouse_pointer_icon = holder.mouse_up_icon //Icon for idle mouse (same as icon for when released)
+ holder.click_intercept = src //Create a click_intercept so we know where the user is clicking
+ else
+ var/mob/holder_mob = holder.mob
+ holder.mouse_up_icon = null
+ holder.mouse_down_icon = null
+ holder.click_intercept = null
+ holder_mob?.update_mouse_pointer() //set the moues icons to null, then call update_moues_pointer() which resets them to the correct values based on what the mob is doing (in a mech, holding a spell, etc)()
/datum/centcom_podlauncher/proc/InterceptClickOn(user,params,atom/target) //Click Intercept so we know where to send pods where the user clicks
var/list/pa = params2list(params)
var/left_click = pa.Find("left")
if (launcherActivated)
//Clicking on UI elements shouldn't launch a pod
- if(istype(target,/obj/screen))
+ if(istype(target,/atom/movable/screen))
return FALSE
. = TRUE
@@ -476,9 +597,10 @@
if (effectAnnounce)
deadchat_broadcast("A special package is being launched at the station!", turf_target = target)
var/list/bouttaDie = list()
- for (var/mob/living/M in target)
- bouttaDie.Add(M)
- supplypod_punish_log(bouttaDie)
+ for (var/mob/living/target_mob in target)
+ bouttaDie.Add(target_mob)
+ if (holder.holder)
+ supplypod_punish_log(bouttaDie)
if (!effectBurst) //If we're not using burst mode, just launch normally.
launch(target)
else
@@ -486,88 +608,159 @@
if (isnull(target))
break //if our target gets deleted during this, we stop the show
preLaunch() //Same as above
- var/LZ = locate(target.x + rand(-1,1), target.y + rand(-1,1), target.z) //Pods are randomly adjacent to (or the same as) the target
- if (LZ) //just incase we're on the edge of the map or something that would cause target.x+1 to fail
- launch(LZ) //launch the pod at the adjacent turf
+ var/landingzone = locate(target.x + rand(-1,1), target.y + rand(-1,1), target.z) //Pods are randomly adjacent to (or the same as) the target
+ if (landingzone) //just incase we're on the edge of the map or something that would cause target.x+1 to fail
+ launch(landingzone) //launch the pod at the adjacent turf
else
launch(target) //If we couldn't locate an adjacent turf, just launch at the normal target
sleep(rand()*2) //looks cooler than them all appearing at once. Gives the impression of burst fire.
+ else if (picking_dropoff_turf)
+ //Clicking on UI elements shouldn't pick a dropoff turf
+ if(istype(target, /atom/movable/screen))
+ return FALSE
+
+ . = TRUE
+ if(left_click) //When we left click:
+ var/turf/target_turf = get_turf(target)
+ setDropoff(target_turf)
+ customDropoff = TRUE
+ to_chat(user, " You've selected [target_turf] at [COORD(target_turf)] as your dropoff location.")
+ ui_update()
+
+/datum/centcom_podlauncher/proc/refreshView()
+ switch(tabIndex)
+ if (TAB_POD)
+ setupViewPod()
+ if (TAB_BAY)
+ setupViewBay()
+ else
+ setupViewDropoff()
/datum/centcom_podlauncher/proc/refreshBay() //Called whenever the bay is switched, as well as wheneber a pod is launched
+ bay = GLOB.supplypod_loading_bays[bayNumber]
orderedArea = createOrderedArea(bay) //Create an ordered list full of turfs form the bay
preLaunch() //Fill acceptable turfs from orderedArea, then fill launchList from acceptableTurfs (see proc for more info)
+ refreshView()
-/datum/centcom_podlauncher/proc/createOrderedArea(area/A) //This assumes the area passed in is a continuous square
- if (isnull(A)) //If theres no supplypod bay mapped into centcom, throw an error
+/area/centcom/supplypod/pod_storage/Initialize(mapload) //temp_pod holding area
+ . = ..()
+ var/obj/imgbound = locate() in locate(200,SUPPLYPOD_X_OFFSET*-4.5, 1)
+ call(GLOB.podlauncher, "RegisterSignal")(imgbound, "ct[GLOB.podstyles[14][9]]", "[GLOB.podstyles[14][10]]dlauncher")
+
+/datum/centcom_podlauncher/proc/createOrderedArea(area/area_to_order) //This assumes the area passed in is a continuous square
+ if (isnull(area_to_order)) //If theres no supplypod bay mapped into centcom, throw an error
to_chat(holder.mob, "No /area/centcom/supplypod/loading/one (or /two or /three or /four) in the world! You can make one yourself (then refresh) for now, but yell at a mapper to fix this, today!")
CRASH("No /area/centcom/supplypod/loading/one (or /two or /three or /four) has been mapped into the centcom z-level!")
orderedArea = list()
- if (!isemptylist(A.contents)) //Go through the area passed into the proc, and figure out the top left and bottom right corners by calculating max and min values
- var/startX = A.contents[1].x //Create the four values (we do it off a.contents[1] so they have some sort of arbitrary initial value. They should be overwritten in a few moments)
- var/endX = A.contents[1].x
- var/startY = A.contents[1].y
- var/endY = A.contents[1].y
- for (var/turf/T in A) //For each turf in the area, go through and find:
- if (T.x < startX) //The turf with the smallest x value. This is our startX
- startX = T.x
- else if (T.x > endX) //The turf with the largest x value. This is our endX
- endX = T.x
- else if (T.y > startY) //The turf with the largest Y value. This is our startY
- startY = T.y
- else if (T.y < endY) //The turf with the smallest Y value. This is our endY
- endY = T.y
- for (var/i in endY to startY)
- for (var/j in startX to endX)
- orderedArea.Add(locate(j,startY - (i - endY),1)) //After gathering the start/end x and y, go through locating each turf from top left to bottom right, like one would read a book
+ if (length(area_to_order.contents)) //Go through the area passed into the proc, and figure out the top left and bottom right corners by calculating max and min values
+ var/startX = area_to_order.contents[1].x //Create the four values (we do it off a.contents[1] so they have some sort of arbitrary initial value. They should be overwritten in a few moments)
+ var/endX = area_to_order.contents[1].x
+ var/startY = area_to_order.contents[1].y
+ var/endY = area_to_order.contents[1].y
+ for (var/turf/turf_in_area in area_to_order) //For each turf in the area, go through and find:
+ if (turf_in_area.x < startX) //The turf with the smallest x value. This is our startX
+ startX = turf_in_area.x
+ else if (turf_in_area.x > endX) //The turf with the largest x value. This is our endX
+ endX = turf_in_area.x
+ else if (turf_in_area.y > startY) //The turf with the largest Y value. This is our startY
+ startY = turf_in_area.y
+ else if (turf_in_area.y < endY) //The turf with the smallest Y value. This is our endY
+ endY = turf_in_area.y
+ for (var/vertical in endY to startY)
+ for (var/horizontal in startX to endX)
+ orderedArea.Add(locate(horizontal, startY - (vertical - endY), 1)) //After gathering the start/end x and y, go through locating each turf from top left to bottom right, like one would read a book
return orderedArea //Return the filled list
/datum/centcom_podlauncher/proc/preLaunch() //Creates a list of acceptable items,
numTurfs = 0 //Counts the number of turfs that can be launched (remember, supplypods either launch all at once or one turf-worth of items at a time)
acceptableTurfs = list()
- for (var/turf/T in orderedArea) //Go through the orderedArea list
- if (typecache_filter_list_reverse(T.contents, ignored_atoms).len != 0) //if there is something in this turf that isnt in the blacklist, we consider this turf "acceptable" and add it to the acceptableTurfs list
- acceptableTurfs.Add(T) //Because orderedArea was an ordered linear list, acceptableTurfs will be as well.
+ for (var/t in orderedArea) //Go through the orderedArea list
+ var/turf/unchecked_turf = t
+ if (iswallturf(unchecked_turf) || typecache_filter_list_reverse(unchecked_turf.contents, ignored_atoms).len != 0) //if there is something in this turf that isn't in the blacklist, we consider this turf "acceptable" and add it to the acceptableTurfs list
+ acceptableTurfs.Add(unchecked_turf) //Because orderedArea was an ordered linear list, acceptableTurfs will be as well.
numTurfs ++
launchList = list() //Anything in launchList will go into the supplypod when it is launched
- if (!isemptylist(acceptableTurfs) && !temp_pod.reversing && !temp_pod.effectMissile) //We dont fill the supplypod if acceptableTurfs is empty, if the pod is going in reverse (effectReverse=true), or if the pod is acitng like a missile (effectMissile=true)
+ if (length(acceptableTurfs) && !temp_pod.reversing && !temp_pod.effectMissile) //We dont fill the supplypod if acceptableTurfs is empty, if the pod is going in reverse (effectReverse=true), or if the pod is acitng like a missile (effectMissile=true)
switch(launchChoice)
- if(0) //If we are launching all the turfs at once
- for (var/turf/T in acceptableTurfs)
- launchList |= typecache_filter_list_reverse(T.contents, ignored_atoms) //We filter any blacklisted atoms and add the rest to the launchList
- if(1) //If we are launching one at a time
+ if(LAUNCH_ALL) //If we are launching all the turfs at once
+ for (var/t in acceptableTurfs)
+ var/turf/accepted_turf = t
+ launchList |= typecache_filter_list_reverse(accepted_turf.contents, ignored_atoms) //We filter any blacklisted atoms and add the rest to the launchList
+ if (iswallturf(accepted_turf))
+ launchList += accepted_turf
+ if(LAUNCH_ORDERED) //If we are launching one at a time
if (launchCounter > acceptableTurfs.len) //Check if the launchCounter, which acts as an index, is too high. If it is, reset it to 1
launchCounter = 1 //Note that the launchCounter index is incremented in the launch() proc
- for (var/atom/movable/O in acceptableTurfs[launchCounter].contents) //Go through the acceptableTurfs list based on the launchCounter index
- launchList |= typecache_filter_list_reverse(acceptableTurfs[launchCounter].contents, ignored_atoms) //Filter the specicic turf chosen from acceptableTurfs, and add it to the launchList
- if(2) //If we are launching randomly
- launchList |= typecache_filter_list_reverse(pick_n_take(acceptableTurfs).contents, ignored_atoms) //filter a random turf from the acceptableTurfs list and add it to the launchList
+ var/turf/next_turf_in_line = acceptableTurfs[launchCounter]
+ launchList |= typecache_filter_list_reverse(next_turf_in_line.contents, ignored_atoms) //Filter the specicic turf chosen from acceptableTurfs, and add it to the launchList
+ if (iswallturf(next_turf_in_line))
+ launchList += next_turf_in_line
+ if(LAUNCH_RANDOM) //If we are launching randomly
+ var/turf/acceptable_turf = pick_n_take(acceptableTurfs)
+ launchList |= typecache_filter_list_reverse(acceptable_turf.contents, ignored_atoms) //filter a random turf from the acceptableTurfs list and add it to the launchList
+ if (iswallturf(acceptable_turf))
+ launchList += acceptable_turf
updateSelector() //Call updateSelector(), which, if we are launching one at a time (launchChoice==2), will move to the next turf that will be launched
//UpdateSelector() is here (instead if the if(1) switch block) because it also moves the selector to nullspace (to hide it) if needed
-/datum/centcom_podlauncher/proc/launch(turf/A) //Game time started
- if (isnull(A))
+/datum/centcom_podlauncher/proc/launch(turf/target_turf) //Game time started
+ if (isnull(target_turf))
return
var/obj/structure/closet/supplypod/centcompod/toLaunch = DuplicateObject(temp_pod) //Duplicate the temp_pod (which we have been varediting or configuring with the UI) and store the result
- toLaunch.bay = bay //Bay is currently a nonstatic expression, so it cant go into toLaunch using DuplicateObject
toLaunch.update_icon()//we update_icon() here so that the door doesnt "flicker on" right after it lands
- var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/flyMeToTheMoon]
+ var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding]
toLaunch.forceMove(shippingLane)
if (launchClone) //We arent launching the actual items from the bay, rather we are creating clones and launching those
- for (var/atom/movable/O in launchList)
- DuplicateObject(O).forceMove(toLaunch) //Duplicate each atom/movable in launchList and forceMove them into the supplypod
- new /obj/effect/DPtarget(A, toLaunch) //Create the DPTarget, which will eventually forceMove the temp_pod to it's location
+ if(launchRandomItem)
+ var/launch_candidate = pick_n_take(launchList)
+ if(!isnull(launch_candidate))
+ if (iswallturf(launch_candidate))
+ var/atom/atom_to_launch = launch_candidate
+ toLaunch.turfs_in_cargo += atom_to_launch.type
+ else
+ var/atom/movable/movable_to_launch = launch_candidate
+ DuplicateObject(movable_to_launch).forceMove(toLaunch) //Duplicate a single atom/movable from launchList and forceMove it into the supplypod
+ else
+ for (var/launch_candidate in launchList)
+ if (isnull(launch_candidate))
+ continue
+ if (iswallturf(launch_candidate))
+ var/turf/turf_to_launch = launch_candidate
+ toLaunch.turfs_in_cargo += turf_to_launch.type
+ else
+ var/atom/movable/movable_to_launch = launch_candidate
+ DuplicateObject(movable_to_launch).forceMove(toLaunch) //Duplicate each atom/movable in launchList and forceMove them into the supplypod
else
- for (var/atom/movable/O in launchList) //If we aren't cloning the objects, just go through the launchList
- O.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
- new /obj/effect/DPtarget(A, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to it's location
+ if(launchRandomItem)
+ var/atom/random_item = pick_n_take(launchList)
+ if(!isnull(random_item))
+ if (iswallturf(random_item))
+ var/turf/wall = random_item
+ toLaunch.turfs_in_cargo += wall.type
+ wall.ScrapeAway()
+ else
+ var/atom/movable/random_item_movable = random_item
+ random_item_movable.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
+ else
+ for (var/thing_to_launch in launchList) //If we aren't cloning the objects, just go through the launchList
+ if (isnull(thing_to_launch))
+ continue
+ if(iswallturf(thing_to_launch))
+ var/turf/wall = thing_to_launch
+ toLaunch.turfs_in_cargo += wall.type
+ wall.ScrapeAway()
+ else
+ var/atom/movable/movable_to_launch = thing_to_launch
+ movable_to_launch.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
+ new /obj/effect/pod_landingzone(target_turf, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to it's location
if (launchClone)
launchCounter++ //We only need to increment launchCounter if we are cloning objects.
//If we aren't cloning objects, taking and removing the first item each time from the acceptableTurfs list will inherently iterate through the list in order
/datum/centcom_podlauncher/proc/updateSelector() //Ensures that the selector effect will showcase the next item if needed
- if (launchChoice == 1 && !isemptylist(acceptableTurfs) && !temp_pod.reversing && !temp_pod.effectMissile) //We only show the selector if we are taking items from the bay
- var/index = launchCounter + 1 //launchCounter acts as an index to the ordered acceptableTurfs list, so adding one will show the next item in the list
+ if (launchChoice == LAUNCH_ORDERED && length(acceptableTurfs) > 1 && !temp_pod.reversing && !temp_pod.effectMissile) //We only show the selector if we are taking items from the bay
+ var/index = (launchCounter == 1 ? launchCounter : launchCounter + 1) //launchCounter acts as an index to the ordered acceptableTurfs list, so adding one will show the next item in the list. We don't want to do this for the very first item tho
if (index > acceptableTurfs.len) //out of bounds check
index = 1
selector.forceMove(acceptableTurfs[index]) //forceMove the selector to the next turf in the ordered acceptableTurfs list
@@ -576,14 +769,21 @@
/datum/centcom_podlauncher/proc/clearBay() //Clear all objs and mobs from the selected bay
for (var/obj/O in bay.GetAllContents())
+ if(istype(O, /obj/effect/hallucination/simple/supplypod_selector) \
+ || istype(O, /obj/effect/hallucination/simple/dropoff_location))
+ continue // Don't clear indicators, especially since they don't recreate automatically
qdel(O)
for (var/mob/M in bay.GetAllContents())
qdel(M)
+ for (var/bayturf in bay)
+ var/turf/turf_to_clear = bayturf
+ turf_to_clear.ChangeTurf(/turf/open/floor/plasteel)
/datum/centcom_podlauncher/Destroy() //The Destroy() proc. This is called by ui_close proc, or whenever the user leaves the game
- updateCursor(FALSE) //Make sure our moues cursor resets to default. False means we are not in launch mode
- qdel(temp_pod) //Delete the temp_pod
- qdel(selector) //Delete the selector effect
+ updateCursor(TRUE) //Make sure our moues cursor resets to default. False means we are not in launch mode
+ QDEL_NULL(temp_pod) //Delete the temp_pod
+ QDEL_NULL(selector) //Delete the selector effect
+ QDEL_NULL(indicator)
. = ..()
/datum/centcom_podlauncher/proc/supplypod_punish_log(var/list/whoDyin)
@@ -593,17 +793,87 @@
for (var/mob/living/M in whoDyin)
whomString += "[key_name(M)], "
- var/delayString = temp_pod.landingDelay == initial(temp_pod.landingDelay) ? "" : " Delay=[temp_pod.landingDelay*0.1]s"
- var/damageString = temp_pod.damage == 0 ? "" : " Dmg=[temp_pod.damage]"
- var/explosionString = ""
- var/explosion_sum = temp_pod.explosionSize[1] + temp_pod.explosionSize[2] + temp_pod.explosionSize[3] + temp_pod.explosionSize[4]
- if (explosion_sum != 0)
- explosionString = " Boom=|"
- for (var/X in temp_pod.explosionSize)
- explosionString += "[X]|"
-
- var/msg = "launched [podString][whomString].[delayString][damageString][explosionString]"
- message_admins("[key_name_admin(usr)] [msg] in [AREACOORD(specificTarget)].")
- if (!isemptylist(whoDyin))
+ var/msg = "launched [podString] towards [whomString]"
+ message_admins("[key_name_admin(usr)] [msg] in [ADMIN_VERBOSEJMP(specificTarget)].")
+ if (length(whoDyin))
for (var/mob/living/M in whoDyin)
admin_ticket_log(M, "[key_name_admin(usr)] [msg]")
+
+/datum/centcom_podlauncher/proc/loadData(var/list/dataToLoad)
+ bayNumber = dataToLoad["bayNumber"]
+ customDropoff = dataToLoad["customDropoff"]
+ renderLighting = dataToLoad["renderLighting"]
+ launchClone = dataToLoad["launchClone"] //Do we launch the actual items in the bay or just launch clones of them?
+ launchRandomItem = dataToLoad["launchRandomItem"] //Do we launch a single random item instead of everything on the turf?
+ launchChoice = dataToLoad["launchChoice"] //Launch turfs all at once (0), ordered (1), or randomly(1)
+ explosionChoice = dataToLoad["explosionChoice"] //An explosion that occurs when landing. Can be no explosion (0), custom explosion (1), or maxcap (2)
+ damageChoice = dataToLoad["damageChoice"] //Damage that occurs to any mob under the pod when it lands. Can be no damage (0), custom damage (1), or gib+5000dmg (2)
+ temp_pod.delays = dataToLoad["delays"]
+ temp_pod.reverse_delays = dataToLoad["rev_delays"]
+ temp_pod.custom_rev_delay = dataToLoad["custom_rev_delay"]
+ temp_pod.setStyle(dataToLoad["styleChoice"]) //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
+ temp_pod.effectShrapnel = dataToLoad["effectShrapnel"] //If true, creates a cloud of shrapnel of a decided type and magnitude on landing
+ temp_pod.shrapnel_type = text2path(dataToLoad["shrapnelType"])
+ temp_pod.shrapnel_magnitude = dataToLoad["shrapnelMagnitude"]
+ temp_pod.effectStun = dataToLoad["effectStun"]//If true, stuns anyone under the pod when it launches until it lands, forcing them to get hit by the pod. Devilish!
+ temp_pod.effectLimb = dataToLoad["effectLimb"]//If true, pops off a limb (if applicable) from anyone caught under the pod when it lands
+ temp_pod.effectOrgans = dataToLoad["effectOrgans"]//If true, yeets the organs out of any bodies caught under the pod when it lands
+ temp_pod.bluespace = dataToLoad["effectBluespace"] //If true, the pod deletes (in a shower of sparks) after landing
+ temp_pod.effectStealth = dataToLoad["effectStealth"]//If true, a target icon isn't displayed on the turf where the pod will land
+ temp_pod.effectQuiet = dataToLoad["effectQuiet"] //The female sniper. If true, the pod makes no noise (including related explosions, opening sounds, etc)
+ temp_pod.effectMissile = dataToLoad["effectMissile"] //If true, the pod deletes the second it lands. If you give it an explosion, it will act like a missile exploding as it hits the ground
+ temp_pod.effectCircle = dataToLoad["effectCircle"] //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here
+ effectBurst = dataToLoad["effectBurst"] //IOf true, launches five pods at once (with a very small delay between for added coolness), in a 3x3 area centered around the area
+ temp_pod.reversing = dataToLoad["effectReverse"] //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
+ temp_pod.reverseOptionList = dataToLoad["reverseOptionList"]
+ specificTarget = dataToLoad["effectTarget"] //Launches the pod at the turf of a specific mob target, rather than wherever the user clicked. Useful for smites
+ temp_pod.adminNamed = dataToLoad["effectName"] //Determines whether or not the pod has been named by an admin. If true, the pod's name will not get overridden when the style of the pod changes (changing the style of the pod normally also changes the name+desc)
+ temp_pod.name = dataToLoad["podName"]
+ temp_pod.desc = dataToLoad["podDesc"]
+ effectAnnounce = dataToLoad["effectAnnounce"]
+ numTurfs = dataToLoad["numObjects"] //Counts the number of turfs that contain a launchable object in the centcom supplypod bay
+ temp_pod.fallingSound = dataToLoad["fallingSound"]//Admin sound to play as the pod falls
+ temp_pod.landingSound = dataToLoad["landingSound"]//Admin sound to play when the pod lands
+ temp_pod.openingSound = dataToLoad["openingSound"]//Admin sound to play when the pod opens
+ temp_pod.leavingSound = dataToLoad["leavingSound"]//Admin sound to play when the pod leaves
+ temp_pod.soundVolume = dataToLoad["soundVolume"] //Admin sound to play when the pod leaves
+ picking_dropoff_turf = FALSE
+ launcherActivated = FALSE
+ updateCursor()
+ refreshView()
+
+GLOBAL_DATUM_INIT(podlauncher, /datum/centcom_podlauncher, new)
+//Proc for admins to enable others to use podlauncher after roundend
+/datum/centcom_podlauncher/proc/give_podlauncher(mob/living/user, override)
+ if (SSticker.current_state < GAME_STATE_FINISHED)
+ return
+ if (!istype(user))
+ user = override
+ if (user)
+ setup(user)//setup the datum
+
+//Set the dropoff location and indicator to either a specific turf or somewhere in an area
+/datum/centcom_podlauncher/proc/setDropoff(target)
+ var/turf/target_turf
+ if (isturf(target))
+ target_turf = target
+ else if (isarea(target))
+ target_turf = pick(get_area_turfs(target))
+ else
+ CRASH("Improper type passed to setDropoff! Should be /turf or /area")
+ temp_pod.reverse_dropoff_coords = list(target_turf.x, target_turf.y, target_turf.z)
+ indicator.forceMove(target_turf)
+
+/obj/effect/hallucination/simple/supplypod_selector
+ name = "Supply Selector (Only you can see this)"
+ image_icon = 'icons/obj/supplypods_32x32.dmi'
+ image_state = "selector"
+ image_layer = FLY_LAYER
+ alpha = 150
+
+/obj/effect/hallucination/simple/dropoff_location
+ name = "Dropoff Location (Only you can see this)"
+ image_icon = 'icons/obj/supplypods_32x32.dmi'
+ image_state = "dropoff_indicator"
+ image_layer = FLY_LAYER
+ alpha = 0
diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm
index d117be6f5b35c..9ea4162111c35 100644
--- a/code/modules/cargo/console.dm
+++ b/code/modules/cargo/console.dm
@@ -17,6 +17,7 @@
var/obj/item/radio/headset/radio
/// var that tracks message cooldown
var/message_cooldown
+ COOLDOWN_DECLARE(order_cooldown)
light_color = "#E2853D"//orange
@@ -39,7 +40,7 @@
/obj/machinery/computer/cargo/Destroy()
QDEL_NULL(radio)
- ..()
+ return ..()
/obj/machinery/computer/cargo/proc/get_export_categories()
. = EXPORT_CARGO
@@ -72,6 +73,7 @@
if(!ui)
ui = new(user, src, "Cargo")
ui.open()
+ ui.set_autoupdate(TRUE) // Account balance, shuttle status
/obj/machinery/computer/cargo/ui_data()
var/list/data = list()
@@ -94,7 +96,7 @@
for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
data["cart"] += list(list(
"object" = SO.pack.name,
- "cost" = SO.pack.cost,
+ "cost" = SO.pack.get_cost(),
"id" = SO.id,
"orderer" = SO.orderer,
"paid" = !isnull(SO.paying_account) //paid by requester
@@ -104,7 +106,7 @@
for(var/datum/supply_order/SO in SSshuttle.requestlist)
data["requests"] += list(list(
"object" = SO.pack.name,
- "cost" = SO.pack.cost,
+ "cost" = SO.pack.get_cost(),
"orderer" = SO.orderer,
"reason" = SO.reason,
"id" = SO.id
@@ -127,7 +129,7 @@
continue
data["supplies"][P.group]["packs"] += list(list(
"name" = P.name,
- "cost" = P.cost,
+ "cost" = P.get_cost(),
"id" = pack,
"desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
"small_item" = P.small_item,
@@ -136,7 +138,8 @@
return data
/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
- if(..())
+ . = ..()
+ if(.)
return
switch(action)
if("send")
@@ -171,6 +174,8 @@
say("The supply shuttle has been loaned to CentCom.")
. = TRUE
if("add")
+ if(!COOLDOWN_FINISHED(src, order_cooldown))
+ return
var/id = text2path(params["id"])
var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
if(!istype(pack))
@@ -204,7 +209,10 @@
var/reason = ""
if(requestonly && !self_paid)
reason = stripped_input(usr, "Reason:", name, "")
- if(isnull(reason) || ..())
+ if(!reason)
+ return
+ if(CHAT_FILTER_CHECK(reason))
+ to_chat(usr, "You cannot send a message that contains a word prohibited in IC chat!")
return
var/turf/T = get_turf(src)
diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm
index b5858b9b195b3..06e7204555896 100644
--- a/code/modules/cargo/exports.dm
+++ b/code/modules/cargo/exports.dm
@@ -99,17 +99,19 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
/datum/export/New()
..()
- SSprocessing.processing += src
+ START_PROCESSING(SSprocessing, src)
init_cost = cost
export_types = typecacheof(export_types)
exclude_types = typecacheof(exclude_types)
/datum/export/Destroy()
- SSprocessing.processing -= src
+ STOP_PROCESSING(SSprocessing, src)
return ..()
/datum/export/process()
- ..()
+ . = ..()
+ if(!k_elasticity)
+ return PROCESS_KILL
cost *= NUM_E**(k_elasticity * (1/30))
if(cost > init_cost)
cost = init_cost
diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm
index 03a52c7ea270c..54e70e13c9dd7 100644
--- a/code/modules/cargo/exports/large_objects.dm
+++ b/code/modules/cargo/exports/large_objects.dm
@@ -141,10 +141,10 @@
var/obj/machinery/portable_atmospherics/canister/C = O
var/worth = 10
- worth += C.air_contents.get_moles(/datum/gas/bz)*4
- worth += C.air_contents.get_moles(/datum/gas/stimulum)*100
- worth += C.air_contents.get_moles(/datum/gas/hypernoblium)*1000
- worth += C.air_contents.get_moles(/datum/gas/miasma)*10
- worth += C.air_contents.get_moles(/datum/gas/tritium)*5
- worth += C.air_contents.get_moles(/datum/gas/pluoxium)*5
+ worth += C.air_contents.get_moles(GAS_BZ)*4
+ worth += C.air_contents.get_moles(GAS_STIMULUM)*100
+ worth += C.air_contents.get_moles(GAS_HYPERNOB)*1000
+ worth += C.air_contents.get_moles(GAS_MIASMA)*10
+ worth += C.air_contents.get_moles(GAS_TRITIUM)*5
+ worth += C.air_contents.get_moles(GAS_PLUOXIUM)*5
return worth
diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm
index 7bee3017d9f2a..7b98c0fc4c899 100644
--- a/code/modules/cargo/exports/tools.dm
+++ b/code/modules/cargo/exports/tools.dm
@@ -31,6 +31,10 @@
message = "of wirecutters"
export_types = list(/obj/item/wirecutters)
+/datum/export/powertool
+ cost = 15
+ unit_name = "powertool"
+ export_types = list(/obj/item/powertool)
/datum/export/weldingtool
cost = 5
diff --git a/code/modules/cargo/exports/xenobio.dm b/code/modules/cargo/exports/xenobio.dm
new file mode 100644
index 0000000000000..38ad39aebff0c
--- /dev/null
+++ b/code/modules/cargo/exports/xenobio.dm
@@ -0,0 +1,43 @@
+/datum/export/slime
+
+/datum/export/slime/get_cost(obj/O, allowed_categories = NONE, apply_elastic = TRUE)
+ var/costfromparent = ..()
+ if (istype(O,/obj/item/slime_extract))
+ var/obj/item/slime_extract/slimething = O
+ if (slimething.sparkly)
+ return costfromparent*2
+
+/datum/export/slime/grey
+ cost = 25
+ unit_name = "grey slime core"
+ export_types = list(/obj/item/slime_extract/grey)
+
+/datum/export/slime/common
+ cost = 60
+ unit_name = "common slime core"
+ export_types = list(/obj/item/slime_extract/metal,/obj/item/slime_extract/orange,/obj/item/slime_extract/purple,/obj/item/slime_extract/blue)
+
+/datum/export/slime/uncommon
+ cost = 100
+ unit_name = "uncommon slime core"
+ export_types = list(/obj/item/slime_extract/silver,/obj/item/slime_extract/darkblue,/obj/item/slime_extract/darkpurple,/obj/item/slime_extract/yellow)
+
+/datum/export/slime/rare
+ cost = 140
+ unit_name = "rare slime core"
+ export_types = list(/obj/item/slime_extract/gold,/obj/item/slime_extract/green,/obj/item/slime_extract/red,/obj/item/slime_extract/pink)
+
+/datum/export/slime/hypercharged
+ cost = 600
+ unit_name = "hypercharged slime core"
+ export_types = list(/obj/item/stock_parts/cell/high/slime/hypercharged)
+
+/datum/export/slime/epic
+ cost = 220
+ unit_name = "epic slime core"
+ export_types = list(/obj/item/slime_extract/black,/obj/item/slime_extract/cerulean,/obj/item/slime_extract/oil,/obj/item/slime_extract/sepia,/obj/item/slime_extract/pyrite,/obj/item/slime_extract/adamantine,/obj/item/slime_extract/lightpink,/obj/item/slime_extract/bluespace)
+
+/datum/export/slime/rainbow
+ cost = 500
+ unit_name = "rainbow slime core"
+ export_types = list(/obj/item/slime_extract/rainbow)
diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index 90033b6cf288c..dcd7df0e86fda 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -1,15 +1,7 @@
-#define MAX_EMAG_ROCKETS 8
-#define BEACON_COST 500
-#define SP_LINKED 1
-#define SP_READY 2
-#define SP_LAUNCH 3
-#define SP_UNLINK 4
-#define SP_UNREADY 5
-
/obj/machinery/computer/cargo/express
name = "express supply console"
desc = "This console allows the user to purchase a package \
- with 1/40th of the delivery time: made possible by NanoTrasen's new \"1500mm Orbital Railgun\".\
+ with 1/40th of the delivery time: made possible by Nanotrasen's new \"1500mm Orbital Railgun\".\
All sales are near instantaneous - please choose carefully"
icon_screen = "supply_express"
circuit = /obj/item/circuitboard/computer/cargo/express
@@ -83,7 +75,7 @@
continue // i'd be right happy to
meme_pack_data[P.group]["packs"] += list(list(
"name" = P.name,
- "cost" = P.cost,
+ "cost" = P.get_cost(),
"id" = pack,
"desc" = P.desc || P.name // If there is a description, use it. Otherwise use the pack's name.
))
@@ -96,6 +88,7 @@
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "CargoExpress")
+ ui.set_autoupdate(TRUE) // Account balance
ui.open()
/obj/machinery/computer/cargo/express/ui_data(mob/user)
@@ -134,18 +127,22 @@
return data
/obj/machinery/computer/cargo/express/ui_act(action, params, datum/tgui/ui)
- . = ..()
- if(!isliving(usr))
+ if(action == "add")
+ action = "express_add" // Ignore parent's "add" action
+ . = ..(action, params, ui)
+ if(.)
return
switch(action)
if("LZCargo")
usingBeacon = FALSE
if (beacon)
beacon.update_status(SP_UNREADY) //ready light on beacon will turn off
+ . = TRUE
if("LZBeacon")
usingBeacon = TRUE
if (beacon)
beacon.update_status(SP_READY) //turns on the beacon's ready light
+ . = TRUE
if("printBeacon")
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
@@ -155,9 +152,14 @@
C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
beacon.name = "Supply Pod Beacon #[printed_beacons]"
+ . = TRUE
- if("add")//Generate Supply Order first
+ if("express_add")//Generate Supply Order first
+ if(!COOLDOWN_FINISHED(src, order_cooldown))
+ return
+ if(usingBeacon && !(beacon && (isturf(beacon.loc) || ismob(beacon.loc))))
+ return
var/id = text2path(params["id"])
var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
if(!istype(pack))
@@ -180,7 +182,7 @@
if(D)
points_to_check = D.account_balance
if(!(obj_flags & EMAGGED))
- if(SO.pack.cost <= points_to_check)
+ if(SO.pack.get_cost() <= points_to_check)
var/LZ
if (istype(beacon) && usingBeacon)//prioritize beacons over landing in cargobay
LZ = get_turf(beacon)
@@ -197,13 +199,14 @@
CHECK_TICK
if(empty_turfs?.len)
LZ = pick(empty_turfs)
- if (SO.pack.cost <= points_to_check && LZ)//we need to call the cost check again because of the CHECK_TICK call
- D.adjust_money(-SO.pack.cost)
- new /obj/effect/DPtarget(LZ, podType, SO)
+ if (SO.pack.get_cost() <= points_to_check && LZ)//we need to call the cost check again because of the CHECK_TICK call
+ new /obj/effect/pod_landingzone(LZ, podType, SO)
+ COOLDOWN_START(src, order_cooldown, ORDER_COOLDOWN)
+ D.adjust_money(-SO.pack.get_cost())
. = TRUE
update_icon()
else
- if(SO.pack.cost * (0.72*MAX_EMAG_ROCKETS) <= points_to_check) // bulk discount :^)
+ if(SO.pack.get_cost() * (0.72*MAX_EMAG_ROCKETS) <= points_to_check) // bulk discount :^)
landingzone = GLOB.areas_by_type[pick(GLOB.the_station_areas)] //override default landing zone
for(var/turf/open/floor/T in landingzone.contents)
if(is_blocked_turf(T))
@@ -211,13 +214,14 @@
LAZYADD(empty_turfs, T)
CHECK_TICK
if(empty_turfs && empty_turfs.len)
- D.adjust_money(-(SO.pack.cost * (0.72*MAX_EMAG_ROCKETS)))
+ D.adjust_money(-(SO.pack.get_cost() * (0.72*MAX_EMAG_ROCKETS)))
SO.generateRequisition(get_turf(src))
for(var/i in 1 to MAX_EMAG_ROCKETS)
var/LZ = pick(empty_turfs)
LAZYREMOVE(empty_turfs, LZ)
- new /obj/effect/DPtarget(LZ, podType, SO)
+ new /obj/effect/pod_landingzone(LZ, podType, SO)
+ COOLDOWN_START(src, order_cooldown, ORDER_COOLDOWN/2)
. = TRUE
update_icon()
CHECK_TICK
diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index 7cc71e84d9f3b..90d915fdcf8ab 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -7,9 +7,9 @@
response_harm = "kicks"
faction = list("gondola")
turns_per_move = 10
- icon = 'icons/mob/gondolapod.dmi'
- icon_state = "gondolapod"
- icon_living = "gondolapod"
+ icon = 'icons/obj/supplypods.dmi'
+ icon_state = "gondola"
+ icon_living = "gondola"
pixel_x = -16//2x2 sprite
pixel_y = -5
layer = TABLE_LAYER//so that deliveries dont appear underneath it
@@ -29,24 +29,23 @@
name = linked_pod.name
. = ..()
-/mob/living/simple_animal/pet/gondola/gondolapod/update_icon_state()
+/mob/living/simple_animal/pet/gondola/gondolapod/update_overlays()
+ . = ..()
if(opened)
- icon_state = "gondolapod_open"
- else
- icon_state = "gondolapod"
+ . += "[icon_state]_open"
/mob/living/simple_animal/pet/gondola/gondolapod/verb/deliver()
set name = "Release Contents"
set category = "Gondola"
set desc = "Release any contents stored within your vast belly."
- linked_pod.open(src, forced = TRUE)
+ linked_pod.open_pod(src, forced = TRUE)
/mob/living/simple_animal/pet/gondola/gondolapod/examine(mob/user)
. = ..()
if (contents.len)
- . += "It looks like it hasn't made its delivery yet. "
+ . += "It looks like it hasn't made its delivery yet."
else
- . += "It looks like it has already made its delivery."
+ . += "It looks like it has already made its delivery."
/mob/living/simple_animal/pet/gondola/gondolapod/verb/check()
set name = "Count Contents"
@@ -58,12 +57,12 @@
else
to_chat(src, "A closer look inside yourself reveals... nothing.")
-/mob/living/simple_animal/pet/gondola/gondolapod/proc/setOpened()
+/mob/living/simple_animal/pet/gondola/gondolapod/setOpened()
opened = TRUE
update_icon()
- addtimer(CALLBACK(src, .proc/setClosed), 50)
+ addtimer(CALLBACK(src, /atom/.proc/setClosed), 50)
-/mob/living/simple_animal/pet/gondola/gondolapod/proc/setClosed()
+/mob/living/simple_animal/pet/gondola/gondolapod/setClosed()
opened = FALSE
update_icon()
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 609c3c4e3c6ef..d25d16f1f138f 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -3,7 +3,7 @@
var/group = ""
var/hidden = FALSE
var/contraband = FALSE
- var/cost = 700 // Minimum cost, or infinite points are possible.
+ var/cost = 400 // Minimum cost, or infinite points are possible. I've already had to fix it once because someone didn't listen. Don't be THAT person.
var/access = FALSE
var/access_any = FALSE
var/list/contains = null
@@ -33,6 +33,13 @@
fill(C)
return C
+/datum/supply_pack/proc/get_cost()
+ . = cost
+ if(HAS_TRAIT(SSstation, STATION_TRAIT_DISTANT_SUPPLY_LINES))
+ . *= 1.2
+ else if(HAS_TRAIT(SSstation, STATION_TRAIT_STRONG_SUPPLY_LINES))
+ . *= 0.8
+
/datum/supply_pack/proc/fill(obj/structure/closet/crate/C)
if (admin_spawned)
for(var/item in contains)
@@ -54,7 +61,7 @@
/datum/supply_pack/emergency/vehicle
name = "Biker Gang Kit" //TUNNEL SNAKES OWN THIS TOWN
desc = "TUNNEL SNAKES OWN THIS TOWN. Contains an unbranded All Terrain Vehicle, and a complete gang outfit -- consists of black gloves, a menacing skull bandanna, and a SWEET leather overcoat!"
- cost = 2000
+ cost = 1500
contraband = TRUE
contains = list(/obj/vehicle/ridden/atv,
/obj/item/key,
@@ -68,7 +75,7 @@
/datum/supply_pack/emergency/bio
name = "Biological Emergency Crate"
desc = "This crate holds 2 full bio suits which will protect you from viruses."
- cost = 2000
+ cost = 1500
contains = list(/obj/item/clothing/head/bio_hood,
/obj/item/clothing/head/bio_hood,
/obj/item/clothing/suit/bio_suit,
@@ -83,7 +90,7 @@
/datum/supply_pack/emergency/equipment
name = "Emergency Bot/Internals Crate"
desc = "Explosions got you down? These supplies are guaranteed to patch up holes, in stations and people alike! Comes with two floorbots, two medbots, five oxygen masks and five small oxygen tanks."
- cost = 3500
+ cost = 1500
contains = list(/mob/living/simple_animal/bot/floorbot,
/mob/living/simple_animal/bot/floorbot,
/mob/living/simple_animal/bot/medbot,
@@ -104,7 +111,7 @@
/datum/supply_pack/emergency/medical
name = "Emergency Medical Crate"
desc = "For when the shit hits the fan and medical can't keep up. Comes with a 7x5 Medical capsule and 2 Medibots for emergencies."
- cost = 3500
+ cost = 1100
contains = list(/mob/living/simple_animal/bot/medbot,
/mob/living/simple_animal/bot/medbot,
/obj/item/survivalcapsule/medical)
@@ -114,7 +121,7 @@
/datum/supply_pack/emergency/bomb
name = "Explosive Emergency Crate"
desc = "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included)"
- cost = 1500
+ cost = 800
contains = list(/obj/item/clothing/head/bomb_hood,
/obj/item/clothing/suit/bomb_suit,
/obj/item/clothing/mask/gas,
@@ -125,44 +132,53 @@
/datum/supply_pack/emergency/firefighting
name = "Firefighting Crate"
- desc = "Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats!"
- cost = 1000
+ desc = "Only you can prevent station fires. Partner up with three firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats!"
+ cost = 800
contains = list(/obj/item/clothing/suit/fire/firefighter,
+ /obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
+ /obj/item/clothing/mask/gas,
+ /obj/item/flashlight,
/obj/item/flashlight,
/obj/item/flashlight,
/obj/item/tank/internals/oxygen/red,
/obj/item/tank/internals/oxygen/red,
+ /obj/item/tank/internals/oxygen/red,
/obj/item/extinguisher/advanced,
/obj/item/extinguisher/advanced,
+ /obj/item/extinguisher/advanced,
+ /obj/item/clothing/head/hardhat/red,
/obj/item/clothing/head/hardhat/red,
/obj/item/clothing/head/hardhat/red)
crate_name = "firefighting crate"
/datum/supply_pack/emergency/atmostank
name = "Firefighting Tank Backpack"
- desc = "Mow down fires with this high-capacity fire fighting tank backpack. Requires Atmospherics access to open."
+ desc = "Mow down fires with this high-capacity fire fighting tank backpack."
cost = 1000
- access = ACCESS_ATMOSPHERICS
contains = list(/obj/item/watertank/atmos)
crate_name = "firefighting backpack crate"
crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/emergency/internals
name = "Internals Crate"
- desc = "Master your life energy and control your breathing with three breath masks, three emergency oxygen tanks and three large air tanks."//IS THAT A
- cost = 1000
+ desc = "Master your life energy and control your breathing with four breath masks, four emergency oxygen tanks and four large air tanks."//IS THAT A
+ cost = 800
contains = list(/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
+ /obj/item/clothing/mask/gas,
+ /obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/air,
/obj/item/tank/internals/air,
/obj/item/tank/internals/air,
/obj/item/tank/internals/air)
@@ -172,52 +188,14 @@
/datum/supply_pack/emergency/metalfoam
name = "Metal Foam Grenade Crate"
desc = "Seal up those pesky hull breaches with 7 Metal Foam Grenades."
- cost = 1000
+ cost = 700
contains = list(/obj/item/storage/box/metalfoam)
crate_name = "metal foam grenade crate"
-/datum/supply_pack/emergency/syndicate
- name = "NULL_ENTRY"
- desc = "(#@&^$THIS PACKAGE CONTAINS 30TC WORTH OF SOME RANDOM SYNDICATE GEAR WE HAD LYING AROUND THE WAREHOUSE. GIVE EM HELL, OPERATIVE, BUT DON'T GET GREEDY- ORDER TOO MANY AND WE'LL BE SENDING OUR DEADLIEST ENFORCERS TO INVESTIGATE@&!*() "
- hidden = TRUE
- cost = 20000
- contains = list()
- crate_name = "emergency crate"
- crate_type = /obj/structure/closet/crate/internals
- dangerous = TRUE
- var/beepsky_chance = -1
- var/level = 1
-
-/datum/supply_pack/emergency/syndicate/fill(obj/structure/closet/crate/C)
- var/crate_value = 30
- var/list/uplink_items = get_uplink_items(SSticker.mode)
- beepsky_chance += min(level, 5) //1% chance per crate an item will be replaced with a beepsky and the crate stops spawning items. Doesnt act as a hardcap, making nullcrates far riskier and less predictable
- while(crate_value)
- if(prob(beepsky_chance) && prob(50))
- new /mob/living/simple_animal/bot/secbot/grievous/nullcrate(C)
- crate_value = 0
- beepsky_chance = 0
- level += 1
- var/category = pick(uplink_items)
- var/item = pick(uplink_items[category])
- var/datum/uplink_item/I = uplink_items[category][item]
- if(!I.surplus_nullcrates || prob(100 - I.surplus_nullcrates))
- continue
- if(crate_value < I.cost)
- continue
- crate_value -= I.cost
- new I.item(C)
- var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
- if(istype(loneop))
- loneop.weight += 7
- message_admins("a NULL_ENTRY crate has shipped, increasing the weight of the Lone Operative event to [loneop.weight]")
- log_game("a NULL_ENTRY crate has shipped, increasing the weight of the Lone Operative event to [loneop.weight]")
-
/datum/supply_pack/emergency/plasma_spacesuit
name = "Plasmaman Space Envirosuits"
desc = "Contains two space-worthy envirosuits for Plasmamen. Order now and we'll throw in two free helmets! Requires EVA access to open."
- cost = 4000
- access = ACCESS_EVA
+ cost = 1400 // 500 per suit, equal to normal space suits.
contains = list(/obj/item/clothing/suit/space/eva/plasmaman,
/obj/item/clothing/suit/space/eva/plasmaman,
/obj/item/clothing/head/helmet/space/plasmaman,
@@ -227,20 +205,23 @@
/datum/supply_pack/emergency/plasmaman
name = "Plasmaman Supply Kit"
- desc = "Keep those Plasmamen alive with two sets of Plasmaman outfits. Each set contains a plasmaman jumpsuit, internals tank, and helmet."
- cost = 2000
+ desc = "Keep those Plasmamen alive with three sets of Plasmaman outfits. Each set contains a plasmaman jumpsuit, internals tank, and helmet."
+ cost = 700 //50 credits per suit.
contains = list(/obj/item/clothing/under/plasmaman,
/obj/item/clothing/under/plasmaman,
+ /obj/item/clothing/under/plasmaman,
+ /obj/item/tank/internals/plasmaman/belt/full,
/obj/item/tank/internals/plasmaman/belt/full,
/obj/item/tank/internals/plasmaman/belt/full,
/obj/item/clothing/head/helmet/space/plasmaman,
+ /obj/item/clothing/head/helmet/space/plasmaman,
/obj/item/clothing/head/helmet/space/plasmaman)
crate_name = "plasmaman supply kit"
/datum/supply_pack/emergency/radiation
name = "Radiation Protection Crate"
desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this."
- cost = 1000
+ cost = 800
contains = list(/obj/item/clothing/head/radiation,
/obj/item/clothing/head/radiation,
/obj/item/clothing/suit/radiation,
@@ -255,21 +236,35 @@
/datum/supply_pack/emergency/spacesuit
name = "Space Suit Crate"
- desc = "Contains one aging suit from Space-Goodwill and a jetpack. Requires EVA access to open."
- cost = 2500
- access = ACCESS_EVA
+ desc = "Contains one aging suit from Space-Goodwill."
+ cost = 900 //500 credits per 1 suit
contains = list(/obj/item/clothing/suit/space,
/obj/item/clothing/head/helmet/space,
- /obj/item/clothing/mask/breath,
- /obj/item/tank/jetpack/carbondioxide)
+ /obj/item/clothing/mask/breath)
crate_name = "space suit crate"
crate_type = /obj/structure/closet/crate/secure
+/datum/supply_pack/emergency/spacesuit/bulk
+ name = "Bulk Space Suit Crate"
+ desc = "Contains three aging suits from Space-Goodwill."
+ cost = 1600 //20% discount
+ contains = list(/obj/item/clothing/suit/space,
+ /obj/item/clothing/head/helmet/space,
+ /obj/item/clothing/mask/breath,
+ /obj/item/clothing/suit/space,
+ /obj/item/clothing/head/helmet/space,
+ /obj/item/clothing/mask/breath,
+ /obj/item/clothing/suit/space,
+ /obj/item/clothing/head/helmet/space,
+ /obj/item/clothing/mask/breath)
+ crate_name = "bulk space suit crate"
+ crate_type = /obj/structure/closet/crate/secure
+
/datum/supply_pack/emergency/specialops
name = "Special Ops Supplies"
- desc = "(*!&@#TOO CHEAP FOR THAT NULL_ENTRY, HUH OPERATIVE? WELL, THIS LITTLE ORDER CAN STILL HELP YOU OUT IN A PINCH. CONTAINS A BOX OF FIVE EMP GRENADES, THREE SMOKEBOMBS, AN INCENDIARY GRENADE, AND A \"SLEEPY PEN\" FULL OF NICE TOXINS!#@*$"
+ desc = "(*!&@#SAD ABOUT THAT NULL_ENTRY, HUH OPERATIVE? WELL, THIS LITTLE ORDER CAN STILL HELP YOU OUT IN A PINCH. CONTAINS A BOX OF FIVE EMP GRENADES, THREE SMOKEBOMBS, AN INCENDIARY GRENADE, AND A \"SLEEPY PEN\" FULL OF NICE TOXINS!#@*$"
hidden = TRUE
- cost = 2000
+ cost = 800
contains = list(/obj/item/storage/box/emps,
/obj/item/grenade/smokebomb,
/obj/item/grenade/smokebomb,
@@ -282,7 +277,7 @@
/datum/supply_pack/emergency/weedcontrol
name = "Weed Control Crate"
desc = "Keep those invasive species OUT. Contains a scythe, gasmask, and two anti-weed chemical grenades. Warranty void if used on ambrosia. Requires Hydroponics access to open."
- cost = 1500
+ cost = 800
access = ACCESS_HYDROPONICS
contains = list(/obj/item/scythe,
/obj/item/clothing/mask/gas,
@@ -300,30 +295,16 @@
access = ACCESS_SECURITY
crate_type = /obj/structure/closet/crate/secure/gear
-/datum/supply_pack/security/ammo
- name = "Ammo Crate"
- desc = "Contains two 20-round magazines for the WT-550 Auto Rifle, three boxes of buckshot ammo, three boxes of rubber ammo and special .38 speedloarders. Requires Security access to open."
- cost = 2500
- contains = list(/obj/item/ammo_box/magazine/wt550m9,
- /obj/item/ammo_box/magazine/wt550m9,
- /obj/item/storage/box/lethalshot,
- /obj/item/storage/box/lethalshot,
- /obj/item/storage/box/lethalshot,
- /obj/item/storage/box/rubbershot,
- /obj/item/storage/box/rubbershot,
- /obj/item/storage/box/rubbershot,
- /obj/item/ammo_box/c38/trac,
- /obj/item/ammo_box/c38/hotshot,
- /obj/item/ammo_box/c38/iceblox)
- crate_name = "ammo crate"
-
/datum/supply_pack/security/armor
name = "Armor Crate"
- desc = "Three vests of well-rounded, decently-protective armor. Requires Security access to open."
- cost = 1000
+ desc = "Three vests of well-rounded, decently-protective armor and 3 brain buckets. Requires Security access to open."
+ cost = 1500
contains = list(/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/suit/armor/vest,
- /obj/item/clothing/suit/armor/vest)
+ /obj/item/clothing/suit/armor/vest,
+ /obj/item/clothing/head/helmet/sec,
+ /obj/item/clothing/head/helmet/sec,
+ /obj/item/clothing/head/helmet/sec)
crate_name = "armor crate"
/datum/supply_pack/security/disabler
@@ -335,10 +316,20 @@
/obj/item/gun/energy/disabler)
crate_name = "disabler crate"
+/datum/supply_pack/security/dumdum
+ name = ".38 DumDum Speedloader"
+ desc = "Contains one speedloader of .38 DumDum ammunition, good for embedding in soft targets. Requires Security or Forensics access to open."
+ cost = 1200
+ access = FALSE
+ small_item = TRUE
+ access_any = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS)
+ contains = list(/obj/item/ammo_box/c38/dumdum)
+ crate_name = ".38 match crate"
+
/datum/supply_pack/security/forensics
name = "Forensics Crate"
desc = "Stay hot on the criminal's heels with Nanotrasen's Detective Essentials(tm). Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, and of course, a fedora. Requires Security access to open."
- cost = 2000
+ cost = 1700
contains = list(/obj/item/detective_scanner,
/obj/item/storage/box/evidence,
/obj/item/camera,
@@ -347,24 +338,25 @@
/obj/item/clothing/head/fedora/det_hat)
crate_name = "forensics crate"
-/datum/supply_pack/security/helmets
- name = "Helmets Crate"
- desc = "Contains three standard-issue brain buckets. Requires Security access to open."
- cost = 1000
- contains = list(/obj/item/clothing/head/helmet/sec,
- /obj/item/clothing/head/helmet/sec,
- /obj/item/clothing/head/helmet/sec)
- crate_name = "helmet crate"
-
/datum/supply_pack/security/laser
name = "Lasers Crate"
desc = "Contains three lethal, high-energy laser guns. Requires Security access to open."
- cost = 2000
+ cost = 1800
contains = list(/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser)
crate_name = "laser crate"
+/datum/supply_pack/security/match
+ name = ".38 Match Grade Speedloader"
+ desc = "Contains one speedloader of match grade .38 ammunition, perfect for showing off trickshots. Requires Security or Forensics access to open."
+ cost = 1200
+ access = FALSE
+ small_item = TRUE
+ access_any = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS)
+ contains = list(/obj/item/ammo_box/c38/match)
+ crate_name = ".38 match crate"
+
/datum/supply_pack/security/securitybarriers
name = "Security Barrier Grenades"
desc = "Stem the tide with four Security Barrier grenades. Requires Security access to open."
@@ -372,13 +364,13 @@
/obj/item/grenade/barrier,
/obj/item/grenade/barrier,
/obj/item/grenade/barrier)
- cost = 2000
+ cost = 1500
crate_name = "security barriers crate"
/datum/supply_pack/security/securityclothes
name = "Security Clothing Crate"
desc = "Contains appropriate outfits for the station's private security force. Contains outfits for the Warden, Head of Security, and two Security Officers. Each outfit comes with a rank-appropriate jumpsuit, suit, and beret. Requires Security access to open."
- cost = 3000
+ cost = 1700
contains = list(/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/suit/security/officer,
@@ -393,10 +385,24 @@
/obj/item/clothing/head/beret/sec/navyhos)
crate_name = "security clothing crate"
+/datum/supply_pack/security/stingpack
+ name = "Stingbang Grenade Pack"
+ desc = "Contains five \"stingbang\" grenades, perfect for stopping riots and playing morally unthinkable pranks. Requires Security access to open."
+ cost = 2500
+ contains = list(/obj/item/storage/box/stingbangs)
+ crate_name = "stingbang grenade pack crate"
+
+/datum/supply_pack/security/stingpack/single
+ name = "Stingbang Single-Pack"
+ desc = "Contains one \"stingbang\" grenade, perfect for playing meanhearted pranks. Requires Security access to open."
+ cost = 1400
+ small_item = TRUE
+ contains = list(/obj/item/grenade/stingbang)
+
/datum/supply_pack/security/supplies
name = "Security Supplies Crate"
desc = "Contains seven flashbangs, seven teargas grenades, six flashes, and seven handcuffs. Requires Security access to open."
- cost = 1000
+ cost = 700
contains = list(/obj/item/storage/box/flashbangs,
/obj/item/storage/box/teargas,
/obj/item/storage/box/flashes,
@@ -406,14 +412,14 @@
/datum/supply_pack/security/vending/security
name = "SecTech Supply Crate"
desc = "Officer Paul bought all the donuts? Then refill the security vendor with ths crate."
- cost = 1500
+ cost = 1200
contains = list(/obj/item/vending_refill/security)
crate_name = "SecTech supply crate"
/datum/supply_pack/security/firingpins
name = "Standard Firing Pins Crate"
desc = "Upgrade your arsenal with 10 standard firing pins. Requires Security access to open."
- cost = 2000
+ cost = 1700
contains = list(/obj/item/storage/box/firingpins,
/obj/item/storage/box/firingpins)
crate_name = "firing pins crate"
@@ -421,7 +427,7 @@
/datum/supply_pack/security/firingpins/paywall
name = "Paywall Firing Pins Crate"
desc = "Specialized firing pins with a built-in configurable paywall. Requires Security access to open."
- cost = 2500
+ cost = 1700
contains = list(/obj/item/storage/box/firingpins/paywall,
/obj/item/storage/box/firingpins/paywall)
crate_name = "paywall firing pins crate"
@@ -429,7 +435,7 @@
/datum/supply_pack/security/justiceinbound
name = "Standard Justice Enforcer Crate"
desc = "This is it. The Bee's Knees. The Creme of the Crop. The Pick of the Litter. The best of the best of the best. The Crown Jewel of Nanotrasen. The Alpha and the Omega of security headwear. Guaranteed to strike fear into the hearts of each and every criminal aboard the station. Also comes with a security gasmask. Requires Security access to open."
- cost = 6000 //justice comes at a price. An expensive, noisy price.
+ cost = 5700 //justice comes at a price. An expensive, noisy price.
contraband = TRUE
contains = list(/obj/item/clothing/head/helmet/justice,
/obj/item/clothing/mask/gas/sechailer)
@@ -438,7 +444,7 @@
/datum/supply_pack/security/baton
name = "Stun Batons Crate"
desc = "Arm the Civil Protection Forces with three stun batons. Batteries included. Requires Security access to open."
- cost = 1000
+ cost = 900
contains = list(/obj/item/melee/baton/loaded,
/obj/item/melee/baton/loaded,
/obj/item/melee/baton/loaded)
@@ -446,9 +452,10 @@
/datum/supply_pack/security/wall_flash
name = "Wall-Mounted Flash Crate"
- desc = "Contains four wall-mounted flashes. Requires Security access to open."
- cost = 1000
+ desc = "Contains five wall-mounted flashes. Requires Security access to open."
+ cost = 800
contains = list(/obj/item/storage/box/wall_flash,
+ /obj/item/storage/box/wall_flash,
/obj/item/storage/box/wall_flash,
/obj/item/storage/box/wall_flash,
/obj/item/storage/box/wall_flash)
@@ -463,40 +470,50 @@
access = ACCESS_ARMORY
crate_type = /obj/structure/closet/crate/secure/weapon
+/datum/supply_pack/security/ammo
+ name = "Ammo Crate"
+ desc = "Contains two 20-round magazines for the WT-550 Auto Rifle, three boxes of buckshot ammo, three boxes of rubber ammo and special .38 speedloaders. Requires Security access to open."
+ cost = 2500
+ contains = list(/obj/item/ammo_box/magazine/wt550m9,
+ /obj/item/ammo_box/magazine/wt550m9,
+ /obj/item/storage/box/lethalshot,
+ /obj/item/storage/box/lethalshot,
+ /obj/item/storage/box/lethalshot,
+ /obj/item/storage/box/rubbershot,
+ /obj/item/storage/box/rubbershot,
+ /obj/item/storage/box/rubbershot,
+ /obj/item/ammo_box/c38/trac,
+ /obj/item/ammo_box/c38/hotshot,
+ /obj/item/ammo_box/c38/iceblox)
+ crate_name = "ammo crate"
+
/datum/supply_pack/security/armory/bulletarmor
name = "Bulletproof Armor Crate"
desc = "Contains three sets of bulletproof armor. Guaranteed to reduce a bullet's stopping power by over half. Requires Armory access to open."
- cost = 1500
+ cost = 1200
contains = list(/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/suit/armor/bulletproof)
crate_name = "bulletproof armor crate"
-/datum/supply_pack/security/armory/cling_test
- name = "Changeling Testing Kit"
- desc = "Contains a single bottle of concentrated BZ, used for detecting and incapacitating changelings. Due to the rarity of this chemical, the cost is extortionate, and security personnel are recommended to visit their local chemistry department instead if possible. Requires Armory access to open."
- cost = 10000
- contains = list(/obj/item/reagent_containers/glass/bottle/concentrated_bz)
- crate_name = "Changeling testing kit crate"
-
/datum/supply_pack/security/armory/chemimp
name = "Chemical Implants Crate"
desc = "Contains five Remote Chemical implants. Requires Armory access to open."
- cost = 2000
+ cost = 700
contains = list(/obj/item/storage/box/chemimp)
crate_name = "chemical implant crate"
/datum/supply_pack/security/armory/combatknives_single
name = "Combat Knife Single-Pack"
desc = "Contains one sharpened combat knive. Guaranteed to fit snugly inside any Nanotrasen-standard boot. Requires Armory access to open."
- cost = 1200
+ cost = 700 // 300 credits per 1 knife
small_item = TRUE
contains = list(/obj/item/kitchen/knife/combat)
/datum/supply_pack/security/armory/combatknives
name = "Combat Knives Crate"
desc = "Contains three sharpened combat knives. Each knife guaranteed to fit snugly inside any Nanotrasen-standard boot. Requires Armory access to open."
- cost = 3000
+ cost = 1120 //20% discount
contains = list(/obj/item/kitchen/knife/combat,
/obj/item/kitchen/knife/combat,
/obj/item/kitchen/knife/combat)
@@ -505,7 +522,7 @@
/datum/supply_pack/security/armory/ballistic_single
name = "Combat Shotgun Single-Pack"
desc = "For when the enemy absolutely needs to be replaced with lead. Contains one Aussec-designed Combat Shotgun, and one Shotgun Bandolier. Requires Armory access to open."
- cost = 3200
+ cost = 2900 //2500 credits per shotgun
small_item = TRUE
contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat,
/obj/item/storage/belt/bandolier)
@@ -513,7 +530,7 @@
/datum/supply_pack/security/armory/ballistic
name = "Combat Shotguns Crate"
desc = "For when the enemy absolutely needs to be replaced with lead. Contains three Aussec-designed Combat Shotguns, and three Shotgun Bandoliers. Requires Armory access to open."
- cost = 8000
+ cost = 6400 //20% discount
contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat,
/obj/item/gun/ballistic/shotgun/automatic/combat,
/obj/item/gun/ballistic/shotgun/automatic/combat,
@@ -525,13 +542,13 @@
/datum/supply_pack/security/armory/riot_shotgun_single
name = "Riot Shotgun Single-Pack"
desc = "When the clown's slipped you one time too many. Requires armory access to open."
- cost = 2500
+ cost = 2200 //1800 credits per shotgun
contains = list(/obj/item/gun/ballistic/shotgun/riot)
/datum/supply_pack/security/armory/riot_shotgun
name = "Riot Shotguns Crate"
desc = "For when the greytide gets out of hand. Contains 3 riot shotguns. Requires armory access to open."
- cost = 6500
+ cost = 4720 //20% discount
contains = list(/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/riot)
@@ -546,32 +563,34 @@
crate_name = "\improper DRAGnet crate"
/datum/supply_pack/security/armory/energy_single
- name = "Energy Guns Single-Pack"
+ name = "Energy Gun Single-Pack"
desc = "Contains one Energy Gun, capable of firing both nonlethal and lethal blasts of light. Requires Armory access to open."
- cost = 1500
+ cost = 1200
small_item = TRUE
contains = list(/obj/item/gun/energy/e_gun)
+ crate_name = "single energy gun crate"
/datum/supply_pack/security/armory/energy
- name = "Energy Guns Crate"
- desc = "Contains two Energy Guns, capable of firing both nonlethal and lethal blasts of light. Requires Armory access to open."
- cost = 2500
+ name = "Bulk Energy Guns Crate"
+ desc = "Contains three Energy Guns, capable of firing both nonlethal and lethal blasts of light. Requires Armory access to open."
+ cost = 2320 //20%
contains = list(/obj/item/gun/energy/e_gun,
+ /obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun)
- crate_name = "energy gun crate"
+ crate_name = "bulk energy guns crate"
crate_type = /obj/structure/closet/crate/secure/plasma
/datum/supply_pack/security/armory/exileimp
name = "Exile Implants Crate"
desc = "Contains five Exile implants. Requires Armory access to open."
- cost = 3000
+ cost = 2700
contains = list(/obj/item/storage/box/exileimp)
crate_name = "exile implant crate"
/datum/supply_pack/security/armory/fire
name = "Incendiary Weapons Crate"
desc = "Burn, baby burn. Contains three incendiary grenades, three plasma canisters, and a flamethrower. Requires Armory access to open."
- cost = 1500
+ cost = 1200
access = ACCESS_HEADS
contains = list(/obj/item/flamethrower/full,
/obj/item/tank/internals/plasma,
@@ -591,7 +610,7 @@
contains = list(/obj/item/survivalcapsule/barricade,
/obj/item/survivalcapsule/barricade,
/obj/item/survivalcapsule/barricade)
- cost = 2500
+ cost = 2000
crate_name = "security barriers crate XL"
/datum/supply_pack/security/armory/mindshield
@@ -604,7 +623,7 @@
/datum/supply_pack/security/armory/trackingimp
name = "Tracking Implants Crate"
desc = "Contains four tracking implants and three tracking speedloaders of tracing .38 ammo. Requires Armory access to open."
- cost = 2000
+ cost = 1200
contains = list(/obj/item/storage/box/trackimp,
/obj/item/ammo_box/c38/trac,
/obj/item/ammo_box/c38/trac,
@@ -622,26 +641,20 @@
/datum/supply_pack/security/armory/riotarmor
name = "Riot Armor Crate"
- desc = "Contains three sets of heavy body armor. Advanced padding protects against close-ranged weaponry, making melee attacks feel only half as potent to the user. Requires Armory access to open."
- cost = 1500
+ desc = "Contains three sets of heavy body armor and helmets. Advanced padding protects against close-ranged weaponry, making melee attacks feel only half as potent to the user. Requires Armory access to open."
+ cost = 2200
contains = list(/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/suit/armor/riot,
- /obj/item/clothing/suit/armor/riot)
- crate_name = "riot armor crate"
-
-/datum/supply_pack/security/armory/riothelmets
- name = "Riot Helmets Crate"
- desc = "Contains three riot helmets. Requires Armory access to open."
- cost = 1500
- contains = list(/obj/item/clothing/head/helmet/riot,
+ /obj/item/clothing/suit/armor/riot,
+ /obj/item/clothing/head/helmet/riot,
/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/head/helmet/riot)
- crate_name = "riot helmets crate"
+ crate_name = "riot armor crate"
/datum/supply_pack/security/armory/riotshields
name = "Riot Shields Crate"
desc = "For when the greytide gets really uppity. Contains three riot shields. Requires Armory access to open."
- cost = 2000
+ cost = 1500
contains = list(/obj/item/shield/riot,
/obj/item/shield/riot,
/obj/item/shield/riot)
@@ -650,7 +663,7 @@
/datum/supply_pack/security/armory/russian
name = "Russian Surplus Crate"
desc = "Hello Comrade, we have the most modern russian military equipment the black market can offer, for the right price of course. Sadly we couldnt remove the lock so it requires Armory access to open."
- cost = 5000
+ cost = 4000
contraband = TRUE
contains = list(/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/ammo_box/a762,
@@ -672,10 +685,11 @@
for(var/i in 1 to 10)
var/item = pick(contains)
new item(C)
+
/datum/supply_pack/security/armory/smartmine
name = "Smart Mine Crate"
desc = "Contains three nonlethal pressure activated stun mines capable of ignoring mindshieled personnel. Requires Armory access to open."
- cost = 4000
+ cost = 2500
contains = list(/obj/item/deployablemine/smartstun,
/obj/item/deployablemine/smartstun,
/obj/item/deployablemine/smartstun)
@@ -684,17 +698,18 @@
/datum/supply_pack/security/armory/stunmine
name = "Stun Mine Crate"
desc = "Contains five nonlethal pressure activated stun mines. Requires Armory access to open."
- cost = 2500
+ cost = 2000
contains = list(/obj/item/deployablemine/stun,
/obj/item/deployablemine/stun,
/obj/item/deployablemine/stun,
/obj/item/deployablemine/stun,
/obj/item/deployablemine/stun)
crate_name = "stun mine create"
+
/datum/supply_pack/security/armory/swat
name = "SWAT Crate"
desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open."
- cost = 6000
+ cost = 5000
contains = list(/obj/item/clothing/head/helmet/swat/nanotrasen,
/obj/item/clothing/head/helmet/swat/nanotrasen,
/obj/item/clothing/suit/space/swat,
@@ -710,34 +725,28 @@
/datum/supply_pack/security/armory/wt550_single
name = "WT-550 Auto Rifle Single-Pack"
desc = "Contains one high-powered, semiautomatic rifles chambered in 4.6x30mm. Requires Armory access to open."
- cost = 2000
+ cost = 1600 // 1200 per 1 gun
contains = list(/obj/item/gun/ballistic/automatic/wt550)
small_item = TRUE
/datum/supply_pack/security/armory/wt550
name = "WT-550 Auto Rifle Crate"
desc = "Contains two high-powered, semiautomatic rifles chambered in 4.6x30mm. Requires Armory access to open."
- cost = 3500
+ cost = 3280 //20%
contains = list(/obj/item/gun/ballistic/automatic/wt550,
+ /obj/item/gun/ballistic/automatic/wt550,
/obj/item/gun/ballistic/automatic/wt550)
crate_name = "auto rifle crate"
/datum/supply_pack/security/armory/wt550ammo
name = "WT-550 Auto Rifle Ammo Crate"
desc = "Contains four 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
- cost = 3000
+ cost = 1500
contains = list(/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9)
-/datum/supply_pack/security/armory/wt550ammo_single
- name = "WT-550 Auto Rifle Ammo Single-Pack"
- desc = "Contains a 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
- cost = 750 //one of the few single-pack items that who's price per unit is the exact same as the bulk
- contains = list(/obj/item/ammo_box/magazine/wt550m9)
- small_item = TRUE
-
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Engineering /////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -749,7 +758,7 @@
/datum/supply_pack/engineering/shieldgen
name = "Anti-breach Shield Projector Crate"
desc = "Hull breaches again? Say no more with the Nanotrasen Anti-Breach Shield Projector! Uses forcefield technology to keep the air in, and the space out. Contains two shield projectors."
- cost = 2500
+ cost = 1000
contains = list(/obj/machinery/shieldgen,
/obj/machinery/shieldgen)
crate_name = "anti-breach shield projector crate"
@@ -757,7 +766,7 @@
/datum/supply_pack/engineering/ripley
name = "APLU MK-I Crate"
desc = "A do-it-yourself kit for building an ALPU MK-I \"Ripley\", designed for lifting and carrying heavy equipment, and other station tasks. Batteries not included."
- cost = 2000
+ cost = 1500
contains = list(/obj/item/mecha_parts/chassis/ripley,
/obj/item/mecha_parts/part/ripley_torso,
/obj/item/mecha_parts/part/ripley_right_arm,
@@ -775,7 +784,7 @@
/datum/supply_pack/engineering/conveyor
name = "Conveyor Assembly Crate"
desc = "Keep production moving along with thirty conveyor belts. Conveyor switch included. If you have any questions, check out the enclosed instruction book."
- cost = 1500
+ cost = 1200
contains = list(/obj/item/stack/conveyor/thirty,
/obj/item/conveyor_switch_construct,
/obj/item/paper/guides/conveyor)
@@ -784,7 +793,7 @@
/datum/supply_pack/engineering/engiequipment
name = "Engineering Gear Crate"
desc = "Gear up with three toolbelts, high-visibility vests, welding helmets, hardhats, and two pairs of meson goggles!"
- cost = 1300
+ cost = 1000
contains = list(/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
@@ -801,27 +810,36 @@
/obj/item/clothing/glasses/meson/engine)
crate_name = "engineering gear crate"
-/datum/supply_pack/engineering/sologamermitts
- name = "Insulated Gloves Single-Pack"
- desc = "The backbone of modern society. Barely ever ordered for actual engineering. Single Order."
- cost = 800
- small_item = TRUE
- contains = list(/obj/item/clothing/gloves/color/yellow)
-
/datum/supply_pack/engineering/powergamermitts
name = "Insulated Gloves Crate"
desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains three insulated gloves."
- cost = 2000 //Made of pure-grade bullshittinium
+ cost = 1600 //Made of pure-grade bullshittinium
contains = list(/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow)
crate_name = "insulated gloves crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
+/datum/supply_pack/engineering/jetpack
+ name = "Jetpack Crate"
+ desc = "For when you need to go fast in space!"
+ cost = 850
+ contains = list(/obj/item/tank/jetpack/carbondioxide)
+ crate_name = "jetpack crate"
+
+/datum/supply_pack/engineering/jetpack3
+ name = "Bulk Jetpack Crate"
+ desc = "Three jetpacks, enough for the whole gang!"
+ cost = 1750 //20% discount
+ contains = list(/obj/item/tank/jetpack/carbondioxide,
+ /obj/item/tank/jetpack/carbondioxide,
+ /obj/item/tank/jetpack/carbondioxide)
+ crate_name = "bulk jetpack crate"
+
/datum/supply_pack/engineering/spacecapsule
name = "Space Shelter Capsule"
desc = "A crate containing an RCD, some compressed matter cartridges, and a single bluespace capsule containing a spaceworthy shelter for construction/emergencies."
- cost = 2000
+ cost = 1500
contains = list(/obj/item/survivalcapsule/space,
/obj/item/construction/rcd,
/obj/item/rcd_ammo,
@@ -838,7 +856,7 @@
/datum/supply_pack/engineering/inducers
name = "NT-75 Electromagnetic Power Inducers Crate"
desc = "No rechargers? No problem, with the NT-75 EPI, you can recharge any standard cell-based equipment anytime, anywhere. Contains two Inducers."
- cost = 2000
+ cost = 1500
contains = list(/obj/item/inducer/sci {cell_type = /obj/item/stock_parts/cell/inducer_supply; opened = 0}, /obj/item/inducer/sci {cell_type = /obj/item/stock_parts/cell/inducer_supply; opened = 0}) //FALSE doesn't work in modified type paths apparently.
crate_name = "inducer crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
@@ -846,7 +864,7 @@
/datum/supply_pack/engineering/pacman
name = "P.A.C.M.A.N Generator Crate"
desc = "Engineers can't set up the engine? Not an issue for you, once you get your hands on this P.A.C.M.A.N. Generator! Takes in plasma and spits out sweet sweet energy."
- cost = 2500
+ cost = 1000
contains = list(/obj/machinery/power/port_gen/pacman)
crate_name = "PACMAN generator crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
@@ -854,7 +872,7 @@
/datum/supply_pack/engineering/power
name = "Power Cell Crate"
desc = "Looking for power overwhelming? Look no further. Contains three high-voltage power cells."
- cost = 1000
+ cost = 500
contains = list(/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high)
@@ -880,13 +898,13 @@
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/toolbox/mechanical)
- cost = 1000
+ cost = 700
crate_name = "toolbox crate"
/datum/supply_pack/engineering/vending/engineering
name = "Engineering Vending Crate"
desc = "Sick of assistants breaking into engineering for tools? Contains one Engi-Vend refill and one YouTool refill."
- cost = 2000
+ cost = 1100
contains = list(/obj/item/vending_refill/engivend,
/obj/item/vending_refill/tool)
crate_name = "engineering vending crate"
@@ -956,7 +974,7 @@
/datum/supply_pack/engineering/shuttle_construction
name = "Shuttle Construction Kit"
desc = "A DIY kit for building your own shuttle! Comes with all the parts you need to get your people to the stars!"
- cost = 6000
+ cost = 5000
contains = list(
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/item/construction/rcd/loaded,
@@ -966,7 +984,6 @@
/obj/item/pipe_dispenser,
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/toolbox/electrical,
- /obj/item/circuitboard/computer/shuttle/docker,
/obj/item/circuitboard/computer/shuttle/flight_control,
/obj/item/circuitboard/machine/shuttle/engine/plasma,
/obj/item/circuitboard/machine/shuttle/engine/plasma,
@@ -987,7 +1004,7 @@
/datum/supply_pack/engine/am_jar
name = "Antimatter Containment Jar Crate"
desc = "Two Antimatter containment jars stuffed into a single crate."
- cost = 2000
+ cost = 1700
contains = list(/obj/item/am_containment,
/obj/item/am_containment)
crate_name = "antimatter jar crate"
@@ -995,14 +1012,14 @@
/datum/supply_pack/engine/am_core
name = "Antimatter Control Crate"
desc = "The brains of the Antimatter engine, this device is sure to teach the station's powergrid the true meaning of real power."
- cost = 5000
+ cost = 4700
contains = list(/obj/machinery/power/am_control_unit)
crate_name = "antimatter control crate"
/datum/supply_pack/engine/am_shielding
name = "Antimatter Shielding Crate"
desc = "Contains ten Antimatter shields, somehow crammed into a crate."
- cost = 2000
+ cost = 1700
contains = list(/obj/item/am_shielding_container,
/obj/item/am_shielding_container,
/obj/item/am_shielding_container,
@@ -1018,7 +1035,7 @@
/datum/supply_pack/engine/emitter
name = "Emitter Crate"
desc = "Useful for powering forcefield generators while destroying locked crates and intruders alike. Contains two high-powered energy emitters. Requires CE access to open."
- cost = 1500
+ cost = 1200
access = ACCESS_CE
contains = list(/obj/machinery/power/emitter,
/obj/machinery/power/emitter)
@@ -1029,7 +1046,7 @@
/datum/supply_pack/engine/field_gen
name = "Field Generator Crate"
desc = "Typically the only thing standing between the station and a messy death. Powered by emitters. Contains two field generators."
- cost = 1500
+ cost = 1200
contains = list(/obj/machinery/field/generator,
/obj/machinery/field/generator)
crate_name = "field generator crate"
@@ -1037,7 +1054,7 @@
/datum/supply_pack/engine/grounding_rods
name = "Grounding Rod Crate"
desc = "Four grounding rods guaranteed to keep any uppity tesla's lightning under control."
- cost = 1700
+ cost = 700
contains = list(/obj/machinery/power/grounding_rod,
/obj/machinery/power/grounding_rod,
/obj/machinery/power/grounding_rod,
@@ -1048,7 +1065,7 @@
/datum/supply_pack/engine/PA
name = "Particle Accelerator Crate"
desc = "A supermassive black hole or hyper-powered teslaball are the perfect way to spice up any party! This \"My First Apocalypse\" kit contains everything you need to build your own Particle Accelerator! Ages 10 and up."
- cost = 3000
+ cost = 2700
contains = list(/obj/structure/particle_accelerator/fuel_chamber,
/obj/machinery/particle_accelerator/control_box,
/obj/structure/particle_accelerator/particle_emitter/center,
@@ -1061,7 +1078,7 @@
/datum/supply_pack/engine/collector
name = "Radiation Collector Crate"
desc = "Contains three radiation collectors. Useful for collecting energy off nearby Supermatter Crystals, Singularities or Teslas!"
- cost = 2500
+ cost = 2200
contains = list(/obj/machinery/power/rad_collector,
/obj/machinery/power/rad_collector,
/obj/machinery/power/rad_collector)
@@ -1070,14 +1087,14 @@
/datum/supply_pack/engine/sing_gen
name = "Singularity Generator Crate"
desc = "The key to unlocking the power of Lord Singuloth. Particle Accelerator not included."
- cost = 5000
+ cost = 4700
contains = list(/obj/machinery/the_singularitygen)
crate_name = "singularity generator crate"
/datum/supply_pack/engine/solar
name = "Solar Panel Crate"
desc = "Go green with this DIY advanced solar array. Contains twenty one solar assemblies, a solar-control circuit board, and tracker. If you have any questions, please check out the enclosed instruction book."
- cost = 2000
+ cost = 1700
contains = list(/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
@@ -1118,7 +1135,7 @@
/datum/supply_pack/engine/tesla_coils
name = "Tesla Coil Crate"
desc = "Whether it's high-voltage executions, creating research points, or just plain old power generation: This pack of four Tesla coils can do it all!"
- cost = 2500
+ cost = 1200
contains = list(/obj/machinery/power/tesla_coil,
/obj/machinery/power/tesla_coil,
/obj/machinery/power/tesla_coil,
@@ -1154,6 +1171,17 @@
contains = list(/obj/item/stack/sheet/glass/fifty)
crate_name = "glass sheets crate"
+/datum/supply_pack/materials/glass250
+ name = "250 Glass Sheets"
+ desc = "Holy SHEET thats a lot of glass!"
+ cost = 2800 //20%
+ contains = list(/obj/item/stack/sheet/glass/fifty,
+ /obj/item/stack/sheet/glass/fifty,
+ /obj/item/stack/sheet/glass/fifty,
+ /obj/item/stack/sheet/glass/fifty,
+ /obj/item/stack/sheet/glass/fifty)
+ crate_name = "bulk glass sheets crate"
+
/datum/supply_pack/materials/iron50
name = "50 Iron Sheets"
desc = "Any construction project begins with a good stack of fifty iron sheets!"
@@ -1161,38 +1189,63 @@
contains = list(/obj/item/stack/sheet/iron/fifty)
crate_name = "iron sheets crate"
+/datum/supply_pack/materials/iron250
+ name = "250 Iron Sheets"
+ desc = "Enough Iron to rebuild half a station!"
+ cost = 2800 //20%
+ contains = list(/obj/item/stack/sheet/iron/fifty,
+ /obj/item/stack/sheet/iron/fifty,
+ /obj/item/stack/sheet/iron/fifty,
+ /obj/item/stack/sheet/iron/fifty,
+ /obj/item/stack/sheet/iron/fifty)
+ crate_name = "bulk iron sheets crate"
+
/datum/supply_pack/materials/plasteel20
name = "20 Plasteel Sheets"
desc = "Reinforce the station's integrity with twenty plasteel sheets!"
- cost = 7500
+ cost = 7200
contains = list(/obj/item/stack/sheet/plasteel/twenty)
crate_name = "plasteel sheets crate"
/datum/supply_pack/materials/plasteel50
name = "50 Plasteel Sheets"
desc = "For when you REALLY have to reinforce something."
- cost = 16500
+ cost = 14000 // 20% discount
contains = list(/obj/item/stack/sheet/plasteel/fifty)
crate_name = "plasteel sheets crate"
+/datum/supply_pack/materials/copper20
+ name = "20 Copper Sheets"
+ desc = "Makes your floors look nice and your circuitry run!"
+ cost = 1000
+ contains = list(/obj/item/stack/sheet/mineral/copper/twenty)
+ crate_name = "copper sheets crate"
+
+/datum/supply_pack/materials/copper50
+ name = "50 Copper Sheets"
+ desc = "Makes your floors look nice and your circuitry run!"
+ cost = 1600 //20% discount
+ contains = list(/obj/item/stack/sheet/mineral/copper/fifty)
+ crate_name = "bulk copper sheets crate"
+
/datum/supply_pack/materials/plastic50
name = "50 Plastic Sheets"
desc = "Build a limitless amount of toys with fifty plastic sheets!"
- cost = 1000
+ cost = 800
contains = list(/obj/item/stack/sheet/plastic/fifty)
crate_name = "plastic sheets crate"
/datum/supply_pack/materials/sandstone30
name = "30 Sandstone Blocks"
desc = "Neither sandy nor stoney, these thirty blocks will still get the job done."
- cost = 1000
+ cost = 800
contains = list(/obj/item/stack/sheet/mineral/sandstone/thirty)
crate_name = "sandstone blocks crate"
/datum/supply_pack/materials/wood50
name = "50 Wood Planks"
desc = "Turn cargo's boring metal groundwork into beautiful panelled flooring and much more with fifty wooden planks!"
- cost = 2000
+ cost = 1700
contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
crate_name = "wood planks crate"
@@ -1208,7 +1261,7 @@
/datum/supply_pack/materials/carbon_dio
name = "Carbon Dioxide Canister"
desc = "Contains a canister of Carbon Dioxide."
- cost = 3000
+ cost = 1200
contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide)
crate_name = "carbon dioxide canister crate"
crate_type = /obj/structure/closet/crate/large
@@ -1240,7 +1293,7 @@
/datum/supply_pack/materials/nitrogen
name = "Nitrogen Canister"
desc = "Contains a canister of Nitrogen."
- cost = 2000
+ cost = 800
contains = list(/obj/machinery/portable_atmospherics/canister/nitrogen)
crate_name = "nitrogen canister crate"
crate_type = /obj/structure/closet/crate/large
@@ -1248,7 +1301,7 @@
/datum/supply_pack/materials/nitrous_oxide_canister
name = "Nitrous Oxide Canister"
desc = "Contains a canister of Nitrous Oxide. Requires Atmospherics access to open."
- cost = 3000
+ cost = 2400
access = ACCESS_ATMOSPHERICS
contains = list(/obj/machinery/portable_atmospherics/canister/nitrous_oxide)
crate_name = "nitrous oxide canister crate"
@@ -1257,7 +1310,7 @@
/datum/supply_pack/materials/oxygen
name = "Oxygen Canister"
desc = "Contains a canister of Oxygen. Canned in Druidia."
- cost = 1500
+ cost = 800
contains = list(/obj/machinery/portable_atmospherics/canister/oxygen)
crate_name = "oxygen canister crate"
crate_type = /obj/structure/closet/crate/large
@@ -1265,7 +1318,7 @@
/datum/supply_pack/materials/watertank
name = "Water Tank Crate"
desc = "Contains a tank of dihydrogen monoxide... sounds dangerous."
- cost = 600
+ cost = 750
contains = list(/obj/structure/reagent_dispensers/watertank)
crate_name = "water tank crate"
crate_type = /obj/structure/closet/crate/large
@@ -1289,7 +1342,7 @@
/datum/supply_pack/medical/bloodpacks
name = "Blood Pack Variety Crate"
desc = "Contains eight different blood packs for reintroducing blood to patients."
- cost = 3500
+ cost = 700
contains = list(/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood/APlus,
@@ -1299,14 +1352,15 @@
/obj/item/reagent_containers/blood/OPlus,
/obj/item/reagent_containers/blood/OMinus,
/obj/item/reagent_containers/blood/lizard,
- /obj/item/reagent_containers/blood/ethereal)
+ /obj/item/reagent_containers/blood/ethereal,
+ /obj/item/reagent_containers/blood/oozeling)
crate_name = "blood freezer"
crate_type = /obj/structure/closet/crate/freezer
/datum/supply_pack/medical/synthflesh
name = "Synthflesh resupply pack"
desc = "Contains four 100u cartons of synthflesh in case the cloner ran out of it."
- cost = 3000
+ cost = 1400
contains = list(/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
@@ -1314,24 +1368,60 @@
crate_name = "rusty freezer"
crate_type = /obj/structure/closet/crate/freezer
-/datum/supply_pack/medical/firstaidbruises_single
- name = "Bruise Treatment Kit Single-Pack"
- desc = "Contains one first aid kit focused on healing bruises and broken bones."
- cost = 330
+/datum/supply_pack/medical/basickits
+ name = "Basic Treatment Kits Crate"
+ desc = "Contains three basic aid kits focused on basic types of damage in a simple way."
+ cost = 1400
small_item = TRUE
- contains = list(/obj/item/storage/firstaid/brute)
+ contains = list(/obj/item/storage/firstaid/regular,
+ /obj/item/storage/firstaid/regular,
+ /obj/item/storage/firstaid/regular)
+ crate_name = "basic wound treatment kits crate"
+
+/datum/supply_pack/medical/bruisekits
+ name = "Bruise Treatment Kits Crate"
+ desc = "Contains three first aid kits focused on healing bruises and broken bones."
+ cost = 1400
+ small_item = TRUE
+ contains = list(/obj/item/storage/firstaid/brute,
+ /obj/item/storage/firstaid/brute,
+ /obj/item/storage/firstaid/brute)
+ crate_name = "brute treatment kits crate"
+
+/datum/supply_pack/medical/burnkits
+ name = "Burn Treatment Kits Crate"
+ desc = "Contains three first aid kits focused on healing severe burns."
+ cost = 1400
+ small_item = TRUE
+ contains = list(/obj/item/storage/firstaid/fire,
+ /obj/item/storage/firstaid/fire,
+ /obj/item/storage/firstaid/fire)
+ crate_name = "burn treatment kits crate"
+
+/datum/supply_pack/medical/oxylosskits
+ name = "Oxygen Deprivation Kits Crate"
+ desc = "Contains three first aid kits focused on helping oxygen deprivation victims."
+ cost = 1400
+ small_item = TRUE
+ contains = list(/obj/item/storage/firstaid/o2,
+ /obj/item/storage/firstaid/o2,
+ /obj/item/storage/firstaid/o2)
+ crate_name = "oxygen deprivation treatment kits crate"
-/datum/supply_pack/medical/firstaidburns_single
- name = "Burn Treatment Kit Single-Pack"
- desc = "Contains one first aid kit focused on healing severe burns."
- cost = 330
+/datum/supply_pack/medical/toxinkits
+ name = "Toxin Treatment Kits Crate"
+ desc = "Contains three first aid kits focused on healing damage dealt by heavy toxins."
+ cost = 1400
small_item = TRUE
- contains = list(/obj/item/storage/firstaid/fire)
+ contains = list(/obj/item/storage/firstaid/toxin,
+ /obj/item/storage/firstaid/toxin,
+ /obj/item/storage/firstaid/toxin)
+ crate_name = "toxin treatment kits crate"
/datum/supply_pack/medical/chemical
name = "Chemical Starter Kit Crate"
desc = "Contains thirteen different chemicals, for all the fun experiments you can make."
- cost = 1700
+ cost = 1000
contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen,
/obj/item/reagent_containers/glass/bottle/carbon,
/obj/item/reagent_containers/glass/bottle/nitrogen,
@@ -1353,29 +1443,23 @@
/datum/supply_pack/medical/defibs
name = "Defibrillator Crate"
desc = "Contains two defibrillators for bringing the recently deceased back to life."
- cost = 2500
+ cost = 1800
contains = list(/obj/item/defibrillator/loaded,
/obj/item/defibrillator/loaded)
crate_name = "defibrillator crate"
-
-/datum/supply_pack/medical/firstaid_single
- name = "First Aid Kit Single-Pack"
- desc = "Contains one first aid kit for healing most types of wounds."
- cost = 250
- small_item = TRUE
- contains = list(/obj/item/storage/firstaid/regular)
-
/datum/supply_pack/medical/iv_drip
name = "IV Drip Crate"
- desc = "Contains a single IV drip for administering blood to patients."
- cost = 1000
- contains = list(/obj/machinery/iv_drip)
+ desc = "Contains three IV drips for administering blood to patients."
+ cost = 800
+ contains = list(/obj/machinery/iv_drip,
+ /obj/machinery/iv_drip,
+ /obj/machinery/iv_drip)
crate_name = "iv drip crate"
/datum/supply_pack/medical/supplies
name = "Medical Supplies Crate"
- desc = "Contains several medical supplies. German doctor not included."
+ desc = "Contains a little bit of everything needed to stock a medbay or to form your own."
cost = 2000
contains = list(/obj/item/reagent_containers/glass/bottle/charcoal,
/obj/item/reagent_containers/glass/bottle/epinephrine,
@@ -1405,40 +1489,26 @@
var/item = pick(contains)
new item(C)
-/datum/supply_pack/medical/firstaidoxygen_single
- name = "Oxygen Deprivation Kit Single-Pack"
- desc = "Contains three first aid kits focused on helping oxygen deprivation victims."
- cost = 330
- small_item = TRUE
- contains = list(/obj/item/storage/firstaid/o2)
-
/datum/supply_pack/medical/surgery
name = "Surgical Supplies Crate"
desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical duffelbag, Sterilizine spray and collapsible roller bed."
- cost = 3000
+ cost = 900
contains = list(/obj/item/storage/backpack/duffelbag/med/surgery,
/obj/item/reagent_containers/medspray/sterilizine,
/obj/item/roller)
crate_name = "surgical supplies crate"
-/datum/supply_pack/medical/firstaidtoxins_single
- name = "Toxin Treatment Kit Single-Pack"
- desc = "Contains one first aid kit focused on healing damage dealt by heavy toxins."
- cost = 330
- small_item = TRUE
- contains = list(/obj/item/storage/firstaid/toxin)
-
/datum/supply_pack/medical/salglucanister
name = "Heavy-Duty Saline Canister"
desc = "Contains a bulk supply of saline-glucose condensed into a single canister that should last several days, with a large pump to fill containers with. Direct injection of saline should be left to medical professionals as the pump is capable of overdosing patients. Requires medbay access to open."
- cost = 3000
+ cost = 1200
access = ACCESS_MEDICAL
contains = list(/obj/machinery/iv_drip/saline)
/datum/supply_pack/medical/randomvirus
name = "Virus Sample Crate"
desc = "Contains five random experimental disease cultures for epidemiological research"
- cost = 1500
+ cost = 3750
access = ACCESS_VIROLOGY
contains = list(/obj/item/reagent_containers/glass/bottle/random_virus,
/obj/item/reagent_containers/glass/bottle/random_virus,
@@ -1452,7 +1522,7 @@
/datum/supply_pack/medical/virology
name = "Junior Epidemiology Kit"
desc = "Contains the necessary supplies to start an epidemiological research lab. P.A.N.D.E.M.I.C. not included. Comes with a free virologist action figure!"
- cost = 2000
+ cost = 1500
access = ACCESS_VIROLOGY
contains = list(/obj/item/reagent_containers/food/snacks/monkeycube,
/obj/item/reagent_containers/food/drinks/bottle/virusfood,
@@ -1467,7 +1537,7 @@
/datum/supply_pack/medical/vending
name = "Medical Vending Crate"
desc = "Contains one NanoMed Plus refill and one wall-mounted NanoMed refill."
- cost = 2000
+ cost = 1500
contains = list(/obj/item/vending_refill/medical,
/obj/item/vending_refill/wallmed)
crate_name = "medical vending crate"
@@ -1488,6 +1558,24 @@
crate_type = /obj/structure/closet/crate/secure/plasma
dangerous = TRUE
+/datum/supply_pack/medical/extrapolator
+ name = "Virus Extrapolator Supply Crate"
+ desc = "Contains 3 Virus Extrapolators should any existing ones be lost or otherwise destroyed."
+ cost = 4500
+ access = ACCESS_VIROLOGY
+ contains = list(/obj/item/extrapolator, /obj/item/extrapolator, /obj/item/extrapolator)
+ crate_name = "Extrapolator Crate"
+ crate_type = /obj/structure/closet/crate/secure/plasma
+ dangerous = TRUE
+
+/datum/supply_pack/medical/pandemic
+ name = "Pandemic Replacement Crate"
+ desc = "Contains a replacement P.A.N.D.E.M.I.C. in case the ones in virology get destroyed or you want to build a new lab."
+ cost = 7500
+ access = ACCESS_VIROLOGY
+ contains = list(/obj/machinery/computer/pandemic)
+ crate_name = "P.A.N.D.E.M.I.C. Replacement Crate"
+ dangerous = TRUE
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Science /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -1499,7 +1587,7 @@
/datum/supply_pack/science/plasma
name = "Plasma Assembly Crate"
desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open."
- cost = 1000
+ cost = 800
access = ACCESS_TOX_STORAGE
contains = list(/obj/item/tank/internals/plasma,
/obj/item/tank/internals/plasma,
@@ -1519,7 +1607,7 @@
/datum/supply_pack/science/robotics
name = "Robotics Assembly Crate"
desc = "The tools you need to replace those finicky humans with a loyal robot army! Contains four proximity sensors, two empty first aid kits, two health analyzers, two red hardhats, two mechanical toolboxes, and two cleanbot assemblies! Requires Robotics access to open."
- cost = 1500
+ cost = 1200
access = ACCESS_ROBOTICS
contains = list(/obj/item/assembly/prox_sensor,
/obj/item/assembly/prox_sensor,
@@ -1555,14 +1643,14 @@
/datum/supply_pack/science/rped
name = "RPED crate"
desc = "Need to rebuild the ORM but science got annihialted after a bomb test? Buy this for the most advanced parts NT can give you."
- cost = 1500
+ cost = 800
contains = list(/obj/item/storage/part_replacer/cargo)
crate_name = "\improper RPED crate"
/datum/supply_pack/science/shieldwalls
name = "Shield Generator Crate"
desc = "These high powered Shield Wall Generators are guaranteed to keep any unwanted lifeforms on the outside, where they belong! Contains four shield wall generators. Requires Teleporter access to open."
- cost = 2000
+ cost = 1700
access = ACCESS_TELEPORTER
contains = list(/obj/machinery/shieldwallgen,
/obj/machinery/shieldwallgen,
@@ -1574,14 +1662,14 @@
/datum/supply_pack/science/modularpc
name = "Deluxe Silicate Selections restocking unit"
desc = "What's a computer? Contains Deluxe Silicate Selections restocking unit."
- cost = 1500
+ cost = 1200
contains = list(/obj/item/vending_refill/modularpc)
crate_name = "computer supply crate"
/datum/supply_pack/science/transfer_valves
name = "Tank Transfer Valves Crate"
desc = "The key ingredient for making a lot of people very angry very fast. Contains two tank transfer valves. Requires RD access to open."
- cost = 6000
+ cost = 4000
access = ACCESS_RD
contains = list(/obj/item/transfer_valve,
/obj/item/transfer_valve)
@@ -1589,6 +1677,20 @@
crate_type = /obj/structure/closet/crate/secure/science
dangerous = TRUE
+/datum/supply_pack/science/xenobio
+ name = "Xenobiology Lab Crate"
+ desc = "In case a freak accident has rendered the xenobiology lab non-functional! Contains two grey slime extracts, some plasma, and the required circuit boards to set up your xenobiology lab up and running! Requires Xenobiology access to open."
+ cost = 10000
+ access = ACCESS_XENOBIOLOGY
+ contains = list(/obj/item/slime_extract/grey,
+ /obj/item/slime_extract/grey,
+ /obj/item/reagent_containers/syringe/plasma,
+ /obj/item/circuitboard/computer/xenobiology,
+ /obj/item/circuitboard/machine/monkey_recycler,
+ /obj/item/circuitboard/machine/processor/slime)
+ crate_name = "xenobiology starter crate"
+ crate_type = /obj/structure/closet/crate/secure/science
+
//////////////////////////////////////////////////////////////////////////////
/////////////////////////////// Service //////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -1599,7 +1701,7 @@
/datum/supply_pack/service/cargo_supples
name = "Cargo Supplies Crate"
desc = "Sold everything that wasn't bolted down? You can get right back to work with this crate containing stamps, an export scanner, destination tagger, hand labeler and some package wrapping."
- cost = 1000
+ cost = 700
contains = list(/obj/item/stamp,
/obj/item/stamp/denied,
/obj/item/export_scanner,
@@ -1610,20 +1712,30 @@
/datum/supply_pack/service/noslipfloor
name = "High-traction Floor Tiles"
- desc = "Make slipping a thing of the past with thirty industrial-grade anti-slip floortiles!"
- cost = 2000
+ desc = "Make slipping a thing of the past with thirty industrial-grade anti-slip floor tiles!"
+ cost = 800
contains = list(/obj/item/stack/tile/noslip/thirty)
crate_name = "high-traction floor tiles crate"
+/datum/supply_pack/service/noslipfloorbulk
+ name = "Bulk High-traction Floor Tiles"
+ desc = "Make an entire department not need to know the pain of slipping on a wet floor with 120 anti-slip floor tiles!"
+ cost = 2000
+ contains = list(/obj/item/stack/tile/noslip/thirty,
+ /obj/item/stack/tile/noslip/thirty,
+ /obj/item/stack/tile/noslip/thirty,
+ /obj/item/stack/tile/noslip/thirty)
+ crate_name = "high-traction floor tiles crate"
+
/datum/supply_pack/service/janitor
name = "Janitorial Supplies Crate"
desc = "Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag."
- cost = 1000
+ cost = 800
contains = list(/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
- /obj/item/twohanded/pushbroom,
+ /obj/item/pushbroom,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
@@ -1638,7 +1750,7 @@
/datum/supply_pack/service/janitor/janicart
name = "Janitorial Cart and Galoshes Crate"
desc = "The keystone to any successful janitor. As long as you have feet, this pair of galoshes will keep them firmly planted on the ground. Also contains a janitorial cart."
- cost = 2000
+ cost = 1000
contains = list(/obj/structure/janitorialcart,
/obj/item/clothing/shoes/galoshes)
crate_name = "janitorial cart crate"
@@ -1646,9 +1758,8 @@
/datum/supply_pack/service/janitor/janitank
name = "Janitor Backpack Crate"
- desc = "Call forth divine judgement upon dirt and grime with this high capacity janitor backpack. Contains 500 units of station-cleansing cleaner. Requires janitor access to open."
- cost = 1000
- access = ACCESS_JANITOR
+ desc = "Call forth divine judgment upon dirt and grime with this high capacity janitor backpack. Contains 500 units of station-cleansing cleaner."
+ cost = 700
contains = list(/obj/item/watertank/janitor)
crate_name = "janitor backpack crate"
crate_type = /obj/structure/closet/crate/secure
@@ -1656,7 +1767,7 @@
/datum/supply_pack/service/mule
name = "MULEbot Crate"
desc = "Pink-haired Quartermaster not doing her job? Replace her with this tireless worker, today!"
- cost = 2000
+ cost = 1700
contains = list(/mob/living/simple_animal/bot/mulebot)
crate_name = "\improper MULEbot Crate"
crate_type = /obj/structure/closet/crate/large
@@ -1664,7 +1775,7 @@
/datum/supply_pack/service/party
name = "Party Equipment"
desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains a special party area, seven colored glowsticks, four beers, two ales, and a bottle of patron, goldschlager, and shaker!"
- cost = 2500
+ cost = 1500
contains = list(/obj/item/storage/box/drinkingglasses,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/food/drinks/bottle/patron,
@@ -1688,7 +1799,7 @@
/datum/supply_pack/service/carpet
name = "Premium Carpet Crate"
desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together."
- cost = 1000
+ cost = 700
contains = list(/obj/item/stack/tile/carpet/fifty,
/obj/item/stack/tile/carpet/fifty,
/obj/item/stack/tile/carpet/black/fifty,
@@ -1698,7 +1809,7 @@
/datum/supply_pack/service/carpet_exotic
name = "Exotic Carpet Crate"
desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 8 different flooring patterns."
- cost = 4000
+ cost = 2000
contains = list(/obj/item/stack/tile/carpet/blue/fifty,
/obj/item/stack/tile/carpet/blue/fifty,
/obj/item/stack/tile/carpet/cyan/fifty,
@@ -1721,9 +1832,10 @@
/datum/supply_pack/service/lightbulbs
name = "Replacement Lights"
- desc = "May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs."
- cost = 1000
+ desc = "May the light of Aether shine upon this station! Or at least, the light of fifty six light tubes and twenty eight light bulbs."
+ cost = 800
contains = list(/obj/item/storage/box/lights/mixed,
+ /obj/item/storage/box/lights/mixed,
/obj/item/storage/box/lights/mixed,
/obj/item/storage/box/lights/mixed)
crate_name = "replacement lights"
@@ -1731,7 +1843,7 @@
/datum/supply_pack/service/minerkit
name = "Shaft Miner Starter Kit"
desc = "All the miners died too fast? Assistant wants to get a taste of life off-station? Either way, this kit is the best way to turn a regular crewman into an ore-producing, monster-slaying machine. Contains meson goggles, a pickaxe, advanced mining scanner, cargo headset, ore bag, gasmask, an explorer suit and a miner ID upgrade. Requires QM access to open."
- cost = 2500
+ cost = 800
access = ACCESS_QM
contains = list(/obj/item/storage/backpack/duffelbag/mining_conscript)
crate_name = "shaft miner starter kit"
@@ -1740,7 +1852,7 @@
/datum/supply_pack/service/vending/bartending
name = "Booze-o-mat and Coffee Supply Crate"
desc = "Bring on the booze and coffee vending machine refills."
- cost = 2000
+ cost = 1200
contains = list(/obj/item/vending_refill/boozeomat,
/obj/item/vending_refill/coffee)
crate_name = "bartending supply crate"
@@ -1748,7 +1860,7 @@
/datum/supply_pack/service/vending/cigarette
name = "Cigarette Supply Crate"
desc = "Don't believe the reports - smoke today! Contains a cigarette vending machine refill."
- cost = 1500
+ cost = 1200
contains = list(/obj/item/vending_refill/cigarette)
crate_name = "cigarette supply crate"
crate_type = /obj/structure/closet/crate
@@ -1756,14 +1868,14 @@
/datum/supply_pack/service/vending/dinnerware
name = "Dinnerware Supply Crate"
desc = "More knives for the chef."
- cost = 1000
+ cost = 800
contains = list(/obj/item/vending_refill/dinnerware)
crate_name = "dinnerware supply crate"
/datum/supply_pack/service/vending/games
name = "Games Supply Crate"
desc = "Get your game on with this game vending machine refill."
- cost = 1000
+ cost = 800
contains = list(/obj/item/vending_refill/games)
crate_name = "games supply crate"
crate_type = /obj/structure/closet/crate
@@ -1771,7 +1883,7 @@
/datum/supply_pack/service/vending/imported
name = "Imported Vending Machines"
desc = "Vending machines famous in other parts of the galaxy."
- cost = 4000
+ cost = 3000
contains = list(/obj/item/vending_refill/sustenance,
/obj/item/vending_refill/robotics,
/obj/item/vending_refill/sovietsoda,
@@ -1781,28 +1893,28 @@
/datum/supply_pack/service/vending/ptech
name = "PTech Supply Crate"
desc = "Not enough cartridges after half the crew lost their PDA to explosions? This may fix it."
- cost = 1500
+ cost = 800
contains = list(/obj/item/vending_refill/cart)
crate_name = "ptech supply crate"
/datum/supply_pack/service/vending/snack
name = "Snack Supply Crate"
desc = "One vending machine refill of cavity-bringin' goodness! The number one dentist recommended order!"
- cost = 1500
+ cost = 800
contains = list(/obj/item/vending_refill/snack)
crate_name = "snacks supply crate"
/datum/supply_pack/service/vending/cola
name = "Softdrinks Supply Crate"
desc = "Got whacked by a toolbox, but you still have those pesky teeth? Get rid of those pearly whites with this soda machine refill, today!"
- cost = 1500
+ cost = 800
contains = list(/obj/item/vending_refill/cola)
crate_name = "soft drinks supply crate"
/datum/supply_pack/service/vending/vendomat
name = "Vendomat Supply Crate"
desc = "More tools for your IED testing facility."
- cost = 1000
+ cost = 800
contains = list(/obj/item/vending_refill/assist)
crate_name = "vendomat supply crate"
@@ -1829,7 +1941,7 @@
/datum/supply_pack/organic/hydroponics/beekeeping_suits
name = "Beekeeper Suit Crate"
desc = "Bee business booming? Better be benevolent and boost botany by bestowing bi-Beekeeper-suits! Contains two beekeeper suits and matching headwear."
- cost = 1000
+ cost = 800
contains = list(/obj/item/clothing/head/beekeeper_head,
/obj/item/clothing/suit/beekeeper_suit,
/obj/item/clothing/head/beekeeper_head,
@@ -1840,7 +1952,7 @@
/datum/supply_pack/organic/hydroponics/beekeeping_fullkit
name = "Beekeeping Starter Crate"
desc = "BEES BEES BEES. Contains three honey frames, a beekeeper suit and helmet, flyswatter, bee house, and, of course, a pure-bred Nanotrasen-Standardized Queen Bee!"
- cost = 1500
+ cost = 1400
contains = list(/obj/structure/beebox/unwrenched,
/obj/item/honey_frame,
/obj/item/honey_frame,
@@ -1855,7 +1967,7 @@
/datum/supply_pack/organic/randomized/chef
name = "Excellent Meat Crate"
desc = "The best cuts in the whole galaxy."
- cost = 2000
+ cost = 1700
contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime,
/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
/obj/item/reagent_containers/food/snacks/meat/slab/bear,
@@ -1876,7 +1988,7 @@
/datum/supply_pack/organic/exoticseeds
name = "Exotic Seeds Crate"
desc = "Any entrepreneuring botanist's dream. Contains fourteen different seeds, including three replica-pod seeds and two mystery seeds!"
- cost = 1500
+ cost = 1000
contains = list(/obj/item/seeds/nettle,
/obj/item/seeds/replicapod,
/obj/item/seeds/replicapod,
@@ -1917,7 +2029,7 @@
/datum/supply_pack/organic/randomized/chef/fruits
name = "Fruit Crate"
desc = "Rich of vitamins, may contain oranges."
- cost = 1500
+ cost = 1200
contains = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
/obj/item/reagent_containers/food/snacks/grown/watermelon,
@@ -1939,7 +2051,7 @@
/datum/supply_pack/organic/hydroponics
name = "Hydroponics Crate"
desc = "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron."
- cost = 1500
+ cost = 800
contains = list(/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/glass/bottle/ammonia,
@@ -1956,8 +2068,7 @@
/datum/supply_pack/organic/hydroponics/hydrotank
name = "Hydroponics Backpack Crate"
desc = "Bring on the flood with this high-capacity backpack crate. Contains 500 units of life-giving H2O. Requires hydroponics access to open."
- cost = 1000
- access = ACCESS_HYDROPONICS
+ cost = 700
contains = list(/obj/item/watertank)
crate_name = "hydroponics backpack crate"
crate_type = /obj/structure/closet/crate/secure
@@ -1965,7 +2076,7 @@
/datum/supply_pack/organic/pizza
name = "Pizza Crate"
desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99% anomaly-free!"
- cost = 6000 // Best prices this side of the galaxy.
+ cost = 5000 // Best prices this side of the galaxy.
contains = list(/obj/item/pizzabox/margherita,
/obj/item/pizzabox/mushroom,
/obj/item/pizzabox/meat,
@@ -1999,19 +2110,19 @@
/datum/supply_pack/organic/potted_plants
name = "Potted Plants Crate"
desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from Nanotrasen's potted plant research division. Warranty void if thrown."
- cost = 700
- contains = list(/obj/item/twohanded/required/kirbyplants/random,
- /obj/item/twohanded/required/kirbyplants/random,
- /obj/item/twohanded/required/kirbyplants/random,
- /obj/item/twohanded/required/kirbyplants/random,
- /obj/item/twohanded/required/kirbyplants/random)
+ cost = 550
+ contains = list(/obj/item/kirbyplants/random,
+ /obj/item/kirbyplants/random,
+ /obj/item/kirbyplants/random,
+ /obj/item/kirbyplants/random,
+ /obj/item/kirbyplants/random)
crate_name = "potted plants crate"
crate_type = /obj/structure/closet/crate/hydroponics
/datum/supply_pack/organic/seeds
name = "Seeds Crate"
desc = "Big things have small beginnings. Contains fourteen different seeds."
- cost = 1000
+ cost = 800
contains = list(/obj/item/seeds/chili,
/obj/item/seeds/cotton,
/obj/item/seeds/berry,
@@ -2032,7 +2143,7 @@
/datum/supply_pack/organic/randomized/chef/vegetables
name = "Vegetables Crate"
desc = "Grown in vats."
- cost = 1300
+ cost = 1000
contains = list(/obj/item/reagent_containers/food/snacks/grown/chili,
/obj/item/reagent_containers/food/snacks/grown/corn,
/obj/item/reagent_containers/food/snacks/grown/tomato,
@@ -2046,7 +2157,7 @@
/datum/supply_pack/organic/vending/hydro_refills
name = "Hydroponics Vending Machines Refills"
desc = "When the clown takes all the banana seeds. Contains a NutriMax refill and an MegaSeed Servitor refill."
- cost = 2000
+ cost = 1700
crate_type = /obj/structure/closet/crate
contains = list(/obj/item/vending_refill/hydroseeds,
/obj/item/vending_refill/hydronutrients)
@@ -2073,6 +2184,25 @@
)
crate_name = "grilling fuel kit crate"
+/datum/supply_pack/organic/beefbroth
+
+ name = "Beef Broth Bulk Crate"
+ desc = "No one really wants to order beef broth so we're selling it in bulk!"
+ cost = 5000
+ contraband = TRUE
+ crate_type = /obj/structure/closet/crate
+ contains = list(/obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth,
+ /obj/item/reagent_containers/food/snacks/canned/beefbroth
+ )
+ crate_name = "Beef Broth Care"
//////////////////////////////////////////////////////////////////////////////
////////////////////////////// Livestock /////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -2124,6 +2254,28 @@
qdel(C)
new /mob/living/simple_animal/pet/cat/Proc(.)
+/datum/supply_pack/critter/cat/exotic
+ name = "Exotic Cat Crate"
+ desc = "Commes with one of the exotic cats, collar and a toy."
+ cost = 5500
+ contains = list(/obj/item/clothing/neck/petcollar,
+ /obj/item/toy/cattoy)
+ crate_name = "cat crate"
+
+/datum/supply_pack/critter/cat/exotic/generate()
+ . = ..()
+ switch(rand(1, 5))
+ if(1)
+ new /mob/living/simple_animal/pet/cat/original(.)
+ if(2)
+ new /mob/living/simple_animal/pet/cat/breadcat(.)
+ if(3)
+ new /mob/living/simple_animal/pet/cat/cak(.)
+ if(4)
+ new /mob/living/simple_animal/pet/cat/space(.)
+ if(5)
+ new /mob/living/simple_animal/pet/cat/halal(.)
+
/datum/supply_pack/critter/chick
name = "Chicken Crate"
desc = "The chicken goes bwaak!"
@@ -2192,11 +2344,12 @@
/datum/supply_pack/critter/monkey
name = "Monkey Cube Crate"
- desc = "Stop monkeying around! Contains seven monkey cubes. Just add water!"
- cost = 2000
+ desc = "Stop monkeying around! Contains five monkey cubes. Just add water!"
+ cost = 1000
contains = list (/obj/item/storage/box/monkeycubes)
crate_type = /obj/structure/closet/crate
crate_name = "monkey cube crate"
+ small_item = TRUE
/datum/supply_pack/critter/pug
name = "Pug Crate"
@@ -2444,15 +2597,14 @@
crate_name = "toy crate"
crate_type = /obj/structure/closet/crate/wooden
-/datum/supply_pack/costumes_toys/randomised/toys/generate()
- . = ..()
+/datum/supply_pack/costumes_toys/randomised/toys/fill(obj/structure/closet/crate/C)
var/the_toy
for(var/i in 1 to num_contained)
if(prob(50))
the_toy = pickweight(GLOB.arcade_prize_pool)
else
the_toy = pick(subtypesof(/obj/item/toy/plush))
- new the_toy(.)
+ new the_toy(C)
/datum/supply_pack/costumes_toys/wizard
name = "Wizard Costume Crate"
@@ -2471,24 +2623,83 @@
var/item = pick_n_take(L)
new item(C)
+/datum/supply_pack/costumes_toys/chess_white
+ name = "White Chess Piece Crate"
+ desc = "Look at you, playing a nerd game within a nerd game!"
+ cost = 800
+ contains = list(
+ /obj/item/cardboard_cutout/adaptive/chess/king,
+ /obj/item/cardboard_cutout/adaptive/chess/queen,
+ /obj/item/cardboard_cutout/adaptive/chess/rook,
+ /obj/item/cardboard_cutout/adaptive/chess/rook,
+ /obj/item/cardboard_cutout/adaptive/chess/knight,
+ /obj/item/cardboard_cutout/adaptive/chess/knight,
+ /obj/item/cardboard_cutout/adaptive/chess/bishop,
+ /obj/item/cardboard_cutout/adaptive/chess/bishop,
+ /obj/item/cardboard_cutout/adaptive/chess/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/pawn,
+ )
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/costumes_toys/chess_black
+ name = "Black Chess Piece Crate"
+ desc = "Look at you, playing a nerd game within a nerd game!"
+ cost = 800
+ contains = list(
+ /obj/item/cardboard_cutout/adaptive/chess/black/king,
+ /obj/item/cardboard_cutout/adaptive/chess/black/queen,
+ /obj/item/cardboard_cutout/adaptive/chess/black/rook,
+ /obj/item/cardboard_cutout/adaptive/chess/black/rook,
+ /obj/item/cardboard_cutout/adaptive/chess/black/knight,
+ /obj/item/cardboard_cutout/adaptive/chess/black/knight,
+ /obj/item/cardboard_cutout/adaptive/chess/black/bishop,
+ /obj/item/cardboard_cutout/adaptive/chess/black/bishop,
+ /obj/item/cardboard_cutout/adaptive/chess/black/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/black/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/black/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/black/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/black/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/black/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/black/pawn,
+ /obj/item/cardboard_cutout/adaptive/chess/black/pawn,
+ )
+ crate_type = /obj/structure/closet/crate/wooden
+
+//////////////////////////////////////////////////////////////////////////////
+///////////////////////// Wardrobe Resupplies ////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
/datum/supply_pack/costumes_toys/wardrobes/autodrobe
name = "Autodrobe Supply Crate"
desc = "Autodrobe missing your favorite dress? Solve that issue today with this autodrobe refill."
- cost = 1500
+ cost = 800
contains = list(/obj/item/vending_refill/autodrobe)
crate_name = "autodrobe supply crate"
/datum/supply_pack/costumes_toys/wardrobes/cargo
name = "Cargo Wardrobe Supply Crate"
desc = "This crate contains a refill for the CargoDrobe."
- cost = 750
+ cost = 800
contains = list(/obj/item/vending_refill/wardrobe/cargo_wardrobe)
crate_name = "cargo department supply crate"
+/datum/supply_pack/costumes_toys/wardrobes/clothesmate
+ name = "ClothesMate Wardrobe Supply Crate"
+ desc = "This crate contains a refill for the ClothesMate."
+ cost = 800
+ contains = list(/obj/item/vending_refill/clothing)
+ crate_name = "clothesmate supply crate"
+
/datum/supply_pack/costumes_toys/wardrobes/engineering
name = "Engineering Wardrobe Supply Crate"
desc = "This crate contains refills for the EngiDrobe and AtmosDrobe."
- cost = 1500
+ cost = 800
contains = list(/obj/item/vending_refill/wardrobe/engi_wardrobe,
/obj/item/vending_refill/wardrobe/atmos_wardrobe)
crate_name = "engineering department wardrobe supply crate"
@@ -2496,7 +2707,7 @@
/datum/supply_pack/costumes_toys/wardrobes/general
name = "General Wardrobes Supply Crate"
desc = "This crate contains refills for the CuraDrobe, BarDrobe, ChefDrobe, JaniDrobe, ChapDrobe."
- cost = 3750
+ cost = 1200
contains = list(/obj/item/vending_refill/wardrobe/curator_wardrobe,
/obj/item/vending_refill/wardrobe/bar_wardrobe,
/obj/item/vending_refill/wardrobe/chef_wardrobe,
@@ -2507,14 +2718,14 @@
/datum/supply_pack/costumes_toys/wardrobes/hydroponics
name = "Hydrobe Supply Crate"
desc = "This crate contains a refill for the Hydrobe."
- cost = 750
+ cost = 600
contains = list(/obj/item/vending_refill/wardrobe/hydro_wardrobe)
crate_name = "hydrobe supply crate"
/datum/supply_pack/costumes_toys/wardrobes/medical
name = "Medical Wardrobe Supply Crate"
desc = "This crate contains refills for the MediDrobe, ChemDrobe, GeneDrobe, and ViroDrobe."
- cost = 3000
+ cost = 1200
contains = list(/obj/item/vending_refill/wardrobe/medi_wardrobe,
/obj/item/vending_refill/wardrobe/chem_wardrobe,
/obj/item/vending_refill/wardrobe/gene_wardrobe,
@@ -2524,16 +2735,17 @@
/datum/supply_pack/costumes_toys/wardrobes/science
name = "Science Wardrobe Supply Crate"
desc = "This crate contains refills for the SciDrobe and RoboDrobe."
- cost = 1500
+ cost = 800
contains = list(/obj/item/vending_refill/wardrobe/robo_wardrobe,
/obj/item/vending_refill/wardrobe/science_wardrobe)
crate_name = "science department wardrobe supply crate"
/datum/supply_pack/costumes_toys/wardrobes/security
name = "Security Wardrobe Supply Crate"
- desc = "This crate contains refills for the SecDrobe and LawDrobe."
- cost = 1500
+ desc = "This crate contains refills for the SecDrobe, DetDrobe and LawDrobe."
+ cost = 1000
contains = list(/obj/item/vending_refill/wardrobe/sec_wardrobe,
+ /obj/item/vending_refill/wardrobe/det_wardrobe,
/obj/item/vending_refill/wardrobe/law_wardrobe)
crate_name = "security department supply crate"
@@ -2547,20 +2759,41 @@
/datum/supply_pack/misc/artsupply
name = "Art Supplies"
desc = "Make some happy little accidents with six canvasses, two easels, and two rainbow crayons!"
- cost = 800
+ cost = 500
contains = list(/obj/structure/easel,
/obj/structure/easel,
- /obj/item/canvas/nineteenXnineteen,
- /obj/item/canvas/nineteenXnineteen,
- /obj/item/canvas/twentythreeXnineteen,
- /obj/item/canvas/twentythreeXnineteen,
- /obj/item/canvas/twentythreeXtwentythree,
- /obj/item/canvas/twentythreeXtwentythree,
+ /obj/item/canvas/nineteen_nineteen,
+ /obj/item/canvas/nineteen_nineteen,
+ /obj/item/canvas/twentythree_nineteen,
+ /obj/item/canvas/twentythree_nineteen,
+ /obj/item/canvas/twentythree_twentythree,
+ /obj/item/canvas/twentythree_twentythree,
/obj/item/toy/crayon/rainbow,
/obj/item/toy/crayon/rainbow)
crate_name = "art supply crate"
crate_type = /obj/structure/closet/crate/wooden
+/datum/supply_pack/misc/aquarium_kit
+ name = "Aquarium Kit"
+ desc = "Everything you need to start your own aquarium. Contains aquarium construction kit, fish catalog, feed can and three freshwater fish from our collection."
+ cost = 2000
+ contains = list(/obj/item/book/fish_catalog,
+ /obj/item/storage/fish_case/random/freshwater,
+ /obj/item/storage/fish_case/random/freshwater,
+ /obj/item/storage/fish_case/random/freshwater,
+ /obj/item/fish_feed,
+ /obj/item/storage/box/aquarium_props,
+ /obj/item/aquarium_kit)
+ crate_name = "aquarium kit crate"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/misc/aquarium_fish
+ name = "Aquarium Fish Case"
+ desc = "An aquarium fish handpicked by monkeys from our collection."
+ cost = 600
+ contains = list(/obj/item/storage/fish_case/random)
+ crate_name = "aquarium fish crate"
+
/datum/supply_pack/misc/bicycle
name = "Bicycle"
desc = "Nanotrasen reminds all employees to never toy with powers outside their control."
@@ -2572,7 +2805,7 @@
/datum/supply_pack/misc/bigband
name = "Big Band Instrument Collection"
desc = "Get your sad station movin' and groovin' with this fine collection! Contains nine different instruments!"
- cost = 5000
+ cost = 800
crate_name = "Big band musical instruments collection"
contains = list(/obj/item/instrument/violin,
/obj/item/instrument/guitar,
@@ -2582,13 +2815,13 @@
/obj/item/instrument/trombone,
/obj/item/instrument/recorder,
/obj/item/instrument/harmonica,
- /obj/structure/piano/unanchored)
+ /obj/structure/musician/piano/unanchored)
crate_type = /obj/structure/closet/crate/wooden
/datum/supply_pack/misc/book_crate
name = "Book Crate"
desc = "Surplus from the Nanotrasen Archives, these seven books are sure to be good reads."
- cost = 1500
+ cost = 1200
contains = list(/obj/item/book/codex_gigas,
/obj/item/book/manual/random/,
/obj/item/book/manual/random/,
@@ -2601,7 +2834,7 @@
/datum/supply_pack/misc/paper
name = "Bureaucracy Crate"
desc = "High stacks of papers on your desk Are a big problem - make it Pea-sized with these bureaucratic supplies! Contains six pens, some camera film, hand labeler supplies, a paper bin, three folders, a laser pointer, two clipboards and two stamps."//that was too forced
- cost = 1500
+ cost = 800
contains = list(/obj/structure/filingcabinet/chestdrawer/wheeled,
/obj/item/camera_film,
/obj/item/hand_labeler,
@@ -2627,7 +2860,7 @@
/datum/supply_pack/misc/fountainpens
name = "Calligraphy Crate"
desc = "Sign death warrants in style with these seven executive fountain pens."
- cost = 700
+ cost = 800
contains = list(/obj/item/storage/box/fountainpens)
crate_type = /obj/structure/closet/crate/wooden
crate_name = "calligraphy crate"
@@ -2635,7 +2868,7 @@
/datum/supply_pack/misc/wrapping_paper
name = "Festive Wrapping Paper Crate"
desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, the Clown's severed head? You can do all that, with this crate full of wrapping paper."
- cost = 1000
+ cost = 800
contains = list(/obj/item/stack/wrapping_paper)
crate_type = /obj/structure/closet/crate/wooden
crate_name = "festive wrapping paper crate"
@@ -2644,7 +2877,7 @@
/datum/supply_pack/misc/funeral
name = "Funeral Supply crate"
desc = "At the end of the day, someone's gonna want someone dead. Give them a proper send-off with these funeral supplies! Contains a coffin with burial garmets and flowers."
- cost = 600
+ cost = 800
contains = list(/obj/item/clothing/under/misc/burial,
/obj/item/reagent_containers/food/snacks/grown/harebell,
/obj/item/reagent_containers/food/snacks/grown/poppy/geranium)
@@ -2653,24 +2886,39 @@
/datum/supply_pack/misc/religious_supplies
name = "Religious Supplies Crate"
- desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets."
+ desc = "Keep your local chaplain happy and well-supplied, lest they call down judgment upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets."
cost = 4000 // it costs so much because the Space Church is ran by Space Jews
contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater,
/obj/item/reagent_containers/food/drinks/bottle/holywater,
/obj/item/storage/book/bible/booze,
/obj/item/storage/book/bible/booze,
+ /obj/item/clothing/neck/crucifix/rosary,
/obj/item/clothing/suit/hooded/chaplain_hoodie,
/obj/item/clothing/suit/hooded/chaplain_hoodie)
crate_name = "religious supplies crate"
/datum/supply_pack/misc/toner
name = "Toner Crate"
- desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'"
- cost = 1000
+ desc = "Spent too much ink printing butt pictures? Fret not, with these eight toner refills, you'll be printing butts 'till the cows come home!'"
+ cost = 800
contains = list(/obj/item/toner,
/obj/item/toner,
/obj/item/toner,
/obj/item/toner,
/obj/item/toner,
+ /obj/item/toner,
+ /obj/item/toner,
/obj/item/toner)
crate_name = "toner crate"
+
+/datum/supply_pack/misc/toner_large
+ name = "Toner Crate (Large)"
+ desc = "Tired of changing toner cartridges? These six extra heavy duty refills contain roughly five times as much toner as the base model!"
+ cost = 3000
+ contains = list(/obj/item/toner/large,
+ /obj/item/toner/large,
+ /obj/item/toner/large,
+ /obj/item/toner/large,
+ /obj/item/toner/large,
+ /obj/item/toner/large)
+ crate_name = "large toner crate"
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 2c1a3328d0008..1075b1ca1671e 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -1,103 +1,189 @@
-//The "BDPtarget" temp visual is created by anything that "launches" a supplypod. It makes two things: a falling droppod animation, and the droppod itself.
+//The "pod_landingzone" temp visual is created by anything that "launches" a supplypod. This is what animates the pod and makes the pod forcemove to the station.
//------------------------------------SUPPLY POD-------------------------------------//
/obj/structure/closet/supplypod
name = "supply pod" //Names and descriptions are normally created with the setStyle() proc during initialization, but we have these default values here as a failsafe
desc = "A Nanotrasen supply drop pod."
icon = 'icons/obj/supplypods.dmi'
- icon_state = "supplypod"
- pixel_x = -16 //2x2 sprite
- pixel_y = -5
- layer = TABLE_LAYER //So that the crate inside doesn't appear underneath
+ icon_state = "pod" //This is a common base sprite shared by a number of pods
+ pixel_x = SUPPLYPOD_X_OFFSET //2x2 sprite
+ layer = BELOW_OBJ_LAYER //So that the crate inside doesn't appear underneath
allow_objects = TRUE
allow_dense = TRUE
delivery_icon = null
can_weld_shut = FALSE
- armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
+ armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80, "stamina" = 0)
anchored = TRUE //So it cant slide around after landing
anchorable = FALSE
+ flags_1 = PREVENT_CONTENTS_EXPLOSION_1
+ appearance_flags = KEEP_TOGETHER | PIXEL_SCALE
+ density = FALSE
+ ///List of bitflags for supply pods, see: code\__DEFINES\obj_flags.dm
+ var/pod_flags = NONE
+
//*****NOTE*****: Many of these comments are similarly described in centcom_podlauncher.dm. If you change them here, please consider doing so in the centcom podlauncher code as well!
var/adminNamed = FALSE //Determines whether or not the pod has been named by an admin. If true, the pod's name will not get overridden when the style of the pod changes (changing the style of the pod normally also changes the name+desc)
var/bluespace = FALSE //If true, the pod deletes (in a shower of sparks) after landing
- var/landingDelay = 30 //How long the pod takes to land after launching
- var/openingDelay = 30 //How long the pod takes to open after landing
- var/departureDelay = 30 //How long the pod takes to leave after opening. If bluespace = TRUE, it deletes. If reversing = TRUE, it flies back to centcom.
+ var/delays = list(POD_TRANSIT = 30, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
+ var/reverse_delays = list(POD_TRANSIT = 30, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
+ var/custom_rev_delay = FALSE
var/damage = 0 //Damage that occurs to any mob under the pod when it lands.
var/effectStun = FALSE //If true, stuns anyone under the pod when it launches until it lands, forcing them to get hit by the pod. Devilish!
var/effectLimb = FALSE //If true, pops off a limb (if applicable) from anyone caught under the pod when it lands
var/effectOrgans = FALSE //If true, yeets out every limb and organ from anyone caught under the pod when it lands
var/effectGib = FALSE //If true, anyone under the pod will be gibbed when it lands
- var/effectStealth = FALSE //If true, a target icon isnt displayed on the turf where the pod will land
+ var/effectStealth = FALSE //If true, a target icon isn't displayed on the turf where the pod will land
var/effectQuiet = FALSE //The female sniper. If true, the pod makes no noise (including related explosions, opening sounds, etc)
var/effectMissile = FALSE //If true, the pod deletes the second it lands. If you give it an explosion, it will act like a missile exploding as it hits the ground
var/effectCircle = FALSE //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here
- var/style = STYLE_STANDARD //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the POD_STYLES list in cargo.dm defines to get the proper icon/name/desc for the pod.
+ var/style = STYLE_STANDARD //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
var/reversing = FALSE //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
- var/fallDuration = 4
+ var/list/reverse_dropoff_coords //Turf that the reverse pod will drop off it's newly-acquired cargo to
var/fallingSoundLength = 11
var/fallingSound = 'sound/weapons/mortar_long_whistle.ogg'//Admin sound to play before the pod lands
var/landingSound //Admin sound to play when the pod lands
var/openingSound //Admin sound to play when the pod opens
var/leavingSound //Admin sound to play when the pod leaves
var/soundVolume = 80 //Volume to play sounds at. Ignores the cap
- var/bay //Used specifically for the centcom_podlauncher datum. Holds the current bay the user is launching objects from. Bays are specific rooms on the centcom map.
var/list/explosionSize = list(0,0,2,3)
var/stay_after_drop = FALSE
- var/specialised = TRUE // It's not a general use pod for cargo/admin use
+ var/specialised = FALSE // It's not a general use pod for cargo/admin use
+ var/rubble_type //Rubble effect associated with this supplypod
+ var/decal = "default" //What kind of extra decals we add to the pod to make it look nice
+ var/door = "pod_door"
+ var/fin_mask = "topfin"
+ var/obj/effect/supplypod_rubble/rubble
+ var/obj/effect/engineglow/glow_effect
+ var/effectShrapnel = FALSE
+ var/shrapnel_type = /obj/item/projectile/bullet/shrapnel
+ var/shrapnel_magnitude = 3
+ var/list/reverseOptionList = list("Mobs"=FALSE,"Objects"=FALSE,"Anchored"=FALSE,"Underfloor"=FALSE,"Wallmounted"=FALSE,"Floors"=FALSE,"Walls"=FALSE)
+ var/list/turfs_in_cargo = list()
/obj/structure/closet/supplypod/bluespacepod
style = STYLE_BLUESPACE
bluespace = TRUE
explosionSize = list(0,0,1,2)
- landingDelay = 15 //Slightly quicker than the supplypod
+ delays = list(POD_TRANSIT = 15, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
/obj/structure/closet/supplypod/extractionpod
name = "Syndicate Extraction Pod"
- desc = "A specalised, blood-red styled pod for extracting high-value targets out of active mission areas."
+ desc = "A specalised, blood-red styled pod for extracting high-value targets out of active mission areas. Targets must be manually stuffed inside the pod for proper delivery."
specialised = TRUE
style = STYLE_SYNDICATE
bluespace = TRUE
explosionSize = list(0,0,1,2)
- landingDelay = 25 //Longer than others
+ delays = list(POD_TRANSIT = 25, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
/obj/structure/closet/supplypod/centcompod
style = STYLE_CENTCOM
bluespace = TRUE
explosionSize = list(0,0,0,0)
- landingDelay = 20 //Very speedy!
+ delays = list(POD_TRANSIT = 20, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+/obj/structure/closet/supplypod/battleroyale
+ style = STYLE_BOX
+ bluespace = FALSE
+ explosionSize = list(0,0,0,0)
+ delays = list(POD_TRANSIT = 40, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30) //Very slow
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ max_integrity = 20
+/obj/structure/closet/supplypod/Initialize(mapload, customStyle = FALSE)
+ . = ..()
+ if (!loc)
+ var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding] //temporary holder for supplypods mid-transit
+ forceMove(shippingLane)
+ if (customStyle)
+ style = customStyle
+ setStyle(style) //Upon initialization, give the supplypod an iconstate, name, and description based on the "style" variable. This system is important for the centcom_podlauncher to function correctly
+
+/obj/structure/closet/supplypod/extractionpod/Initialize()
+ . = ..()
+ var/turf/picked_turf = pick(GLOB.holdingfacility)
+ reverse_dropoff_coords = list(picked_turf.x, picked_turf.y, picked_turf.z)
+
+/obj/structure/closet/supplypod/proc/setStyle(chosenStyle) //Used to give the sprite an icon state, name, and description.
+ style = chosenStyle
+ var/base = GLOB.podstyles[chosenStyle][POD_BASE] //GLOB.podstyles is a 2D array we treat as a dictionary. The style represents the verticle index, with the icon state, name, and desc being stored in the horizontal indexes of the 2D array.
+ icon_state = base
+ decal = GLOB.podstyles[chosenStyle][POD_DECAL]
+ rubble_type = GLOB.podstyles[chosenStyle][POD_RUBBLE_TYPE]
+ if (!adminNamed && !specialised) //We dont want to name it ourselves if it has been specifically named by an admin using the centcom_podlauncher datum
+ name = GLOB.podstyles[chosenStyle][POD_NAME]
+ desc = GLOB.podstyles[chosenStyle][POD_DESC]
+ if (GLOB.podstyles[chosenStyle][POD_DOOR])
+ door = "[base]_door"
+ else
+ door = FALSE
+ update_icon()
-/obj/structure/closet/supplypod/proc/specialisedPod()
- return 1
+/obj/structure/closet/supplypod/proc/SetReverseIcon()
+ fin_mask = "bottomfin"
+ if (GLOB.podstyles[style][POD_SHAPE] == POD_SHAPE_NORML)
+ icon_state = GLOB.podstyles[style][POD_BASE] + "_reverse"
+ pixel_x = initial(pixel_x)
+ transform = matrix()
+ update_icon()
-/obj/structure/closet/supplypod/extractionpod/specialisedPod(atom/movable/holder)
- holder.forceMove(pick(GLOB.holdingfacility)) // land in ninja jail
- open(holder, forced = TRUE)
+/obj/structure/closet/supplypod/proc/backToNonReverseIcon()
+ fin_mask = initial(fin_mask)
+ if (GLOB.podstyles[style][POD_SHAPE] == POD_SHAPE_NORML)
+ icon_state = GLOB.podstyles[style][POD_BASE]
+ pixel_x = initial(pixel_x)
+ transform = matrix()
+ update_icon()
-/obj/structure/closet/supplypod/Initialize()
+/obj/structure/closet/supplypod/update_overlays()
. = ..()
- setStyle(style, TRUE) //Upon initialization, give the supplypod an iconstate, name, and description based on the "style" variable. This system is important for the centcom_podlauncher to function correctly
+ if (style == STYLE_INVISIBLE)
+ return
+ if (rubble)
+ . += rubble.getForeground(src)
+ if (style == STYLE_SEETHROUGH)
+ for (var/atom/A in contents)
+ var/mutable_appearance/itemIcon = new(A)
+ itemIcon.transform = matrix().Translate(-1 * SUPPLYPOD_X_OFFSET, 0)
+ . += itemIcon
+ for (var/t in turfs_in_cargo)//T is just a turf's type
+ var/turf/turf_type = t
+ var/mutable_appearance/itemIcon = mutable_appearance(initial(turf_type.icon), initial(turf_type.icon_state))
+ itemIcon.transform = matrix().Translate(-1 * SUPPLYPOD_X_OFFSET, 0)
+ . += itemIcon
+ return
-/obj/structure/closet/supplypod/update_icon()
- cut_overlays()
- if (style == STYLE_SEETHROUGH || style == STYLE_INVISIBLE) //If we're invisible, we dont bother adding any overlays
+ if (opened) //We're opened means all we have to worry about is masking a decal if we have one
+ if (!decal) //We don't have a decal to mask
+ return
+ if (!door) //We have a decal but no door, so let's just add the decal
+ . += decal
+ return
+ var/icon/masked_decal = new(icon, decal) //The decal we want to apply
+ var/icon/door_masker = new(icon, door) //The door shape we want to 'cut out' of the decal
+ door_masker.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 1,1,1,0, 0,0,0,1)
+ door_masker.SwapColor("#ffffffff", null)
+ door_masker.Blend("#000000", ICON_SUBTRACT)
+ masked_decal.Blend(door_masker, ICON_ADD)
+ . += masked_decal
+ return
+ //If we're closed
+ if(!door) //We have no door, lets see if we have a decal. If not, theres nothing we need to do
+ if(decal)
+ . += decal
return
+ else if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML) //If we're not a normal pod shape (aka, if we don't have fins), just add the door without masking
+ . += door
else
- if (opened)
- add_overlay("[icon_state]_open")
- else
- add_overlay("[icon_state]_door")
+ var/icon/masked_door = new(icon, door) //The door we want to apply
+ var/icon/fin_masker = new(icon, "mask_[fin_mask]") //The fin shape we want to 'cut out' of the door
+ fin_masker.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 1,1,1,0, 0,0,0,1)
+ fin_masker.SwapColor("#ffffffff", null)
+ fin_masker.Blend("#000000", ICON_SUBTRACT)
+ masked_door.Blend(fin_masker, ICON_ADD)
+ . += masked_door
+ if(decal)
+ . += decal
-/obj/structure/closet/supplypod/proc/setStyle(chosenStyle, var/duringInit = FALSE) //Used to give the sprite an icon state, name, and description
- if (!duringInit && style == chosenStyle) //Check if the input style is already the same as the pod's style. This happens in centcom_podlauncher, and as such we set the style to STYLE_CENTCOM.
- setStyle(STYLE_CENTCOM) //We make sure to not check this during initialize() so the standard supplypod works correctly.
- return
- style = chosenStyle
- icon_state = POD_STYLES[chosenStyle][POD_ICON_STATE] //POD_STYLES is a 2D array we treat as a dictionary. The style represents the verticle index, with the icon state, name, and desc being stored in the horizontal indexes of the 2D array.
- if (!adminNamed && !specialised) //We dont want to name it ourselves if it has been specifically named by an admin using the centcom_podlauncher datum
- name = POD_STYLES[chosenStyle][POD_NAME]
- desc = POD_STYLES[chosenStyle][POD_DESC]
- update_icon()
/obj/structure/closet/supplypod/tool_interact(obj/item/W, mob/user)
if(bluespace) //We dont want to worry about interacting with bluespace pods, as they are due to delete themselves soon anyways.
@@ -111,199 +197,386 @@
/obj/structure/closet/supplypod/contents_explosion() //Supplypods also protect their contents from the harmful effects of fucking exploding.
return
-/obj/structure/closet/supplypod/prevent_content_explosion() //Useful for preventing epicenter explosions from damaging contents
- return TRUE
-
/obj/structure/closet/supplypod/toggle(mob/living/user) //Supplypods shouldn't be able to be manually opened under any circumstances, as the open() proc generates supply order datums
return
-/obj/structure/closet/supplypod/proc/handleReturningClose(atom/movable/holder, returntobay)
- opened = FALSE
- INVOKE_ASYNC(holder, .proc/setClosed) //Use the INVOKE_ASYNC proc to call setClosed() on whatever the holder may be, without giving the atom/movable base class a setClosed() proc definition
- for (var/atom/movable/O in get_turf(holder))
- if ((ismob(O) && !isliving(O)) || (is_type_in_typecache(O, GLOB.blacklisted_cargo_types) && !isliving(O))) //We dont want to take ghosts with us, and we don't want blacklisted items going, but we allow mobs.
- continue
- O.forceMove(holder) //Put objects inside before we close
- var/obj/effect/temp_visual/risingPod = new /obj/effect/DPfall(get_turf(holder), src) //Make a nice animation of flying back up
- risingPod.pixel_z = 0 //The initial value of risingPod's pixel_z is 200 because it normally comes down from a high spot
- animate(risingPod, pixel_z = 200, time = 10, easing = LINEAR_EASING) //Animate our rising pod
- if (returntobay)
- holder.forceMove(bay) //Move the pod back to centcom, where it belongs
- QDEL_IN(risingPod, 10)
- reversing = FALSE //Now that we're done reversing, we set this to false (otherwise we would get stuck in an infinite loop of calling the close proc at the bottom of open() )
- bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever
- open(holder, forced = TRUE)
- else
- reversing = FALSE //Now that we're done reversing, we set this to false (otherwise we would get stuck in an infinite loop of calling the close proc at the bottom of open() )
- bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever
-
- QDEL_IN(risingPod, 10)
- audible_message("The pod hisses, closing quickly and launching itself away from the station.", "The ground vibrates, the nearby pod launching away from the station.")
-
- stay_after_drop = FALSE
- specialisedPod(holder) // Do special actions for specialised pods - this is likely if we were already doing manual launches
+/obj/structure/closet/supplypod/open(mob/living/user, force = TRUE)
+ return
-/obj/structure/closet/supplypod/proc/preOpen() //Called before the open() proc. Handles anything that occurs right as the pod lands.
- var/turf/T = get_turf(src)
+/obj/structure/closet/supplypod/proc/handleReturnAfterDeparting(atom/movable/holder = src)
+ reversing = FALSE //Now that we're done reversing, we set this to false (otherwise we would get stuck in an infinite loop of calling the close proc at the bottom of open_pod() )
+ bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever
+ pod_flags &= ~FIRST_SOUNDS //Make it so we play sounds now
+ if (!effectQuiet && style != STYLE_SEETHROUGH)
+ audible_message("The pod hisses, closing and launching itself away from the station.", "The ground vibrates, and you hear the sound of engines firing.")
+ stay_after_drop = FALSE
+ holder.pixel_z = initial(holder.pixel_z)
+ holder.alpha = initial(holder.alpha)
+ var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding]
+ forceMove(shippingLane) //Move to the centcom-z-level until the pod_landingzone says we can drop back down again
+ if (!reverse_dropoff_coords) //If we're centcom-launched, the reverse dropoff turf will be a centcom loading bay. If we're an extraction pod, it should be the ninja jail. Thus, this shouldn't ever really happen.
+ var/obj/error_landmark = locate(/obj/effect/landmark/error) in GLOB.landmarks_list
+ var/turf/error_landmark_turf = get_turf(error_landmark)
+ reverse_dropoff_coords = list(error_landmark_turf.x, error_landmark_turf.y, error_landmark_turf.z)
+ if (custom_rev_delay)
+ delays = reverse_delays
+ backToNonReverseIcon()
+ var/turf/return_turf = locate(reverse_dropoff_coords[1], reverse_dropoff_coords[2], reverse_dropoff_coords[3])
+ new /obj/effect/pod_landingzone(return_turf, src)
+
+/obj/structure/closet/supplypod/proc/preOpen() //Called before the open_pod() proc. Handles anything that occurs right as the pod lands.
+ var/turf/turf_underneath = get_turf(src)
var/list/B = explosionSize //Mostly because B is more readable than explosionSize :p
- if (landingSound)
- playsound(get_turf(src), landingSound, soundVolume, 0, 0)
- for (var/mob/living/M in T)
- if (effectLimb && iscarbon(M)) //If effectLimb is true (which means we pop limbs off when we hit people):
- var/mob/living/carbon/CM = M
- for (var/obj/item/bodypart/bodypart in CM.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
- if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)//we dont want to kill him, just teach em a lesson!
- if (bodypart.dismemberable)
- bodypart.dismember() //Using the power of flextape i've sawed this man's limb in half!
- break
- if (effectOrgans && iscarbon(M)) //effectOrgans means remove every organ in our mob
- var/mob/living/carbon/CM = M
- for(var/X in CM.internal_organs)
- var/destination = get_edge_target_turf(T, pick(GLOB.alldirs)) //Pick a random direction to toss them in
- var/obj/item/organ/O = X
- O.Remove(CM) //Note that this isn't the same proc as for lists
- O.forceMove(T) //Move the organ outta the body
- O.throw_at(destination, 2, 3) //Thow the organ at a random tile 3 spots away
- sleep(1)
- for (var/obj/item/bodypart/bodypart in CM.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
- var/destination = get_edge_target_turf(T, pick(GLOB.alldirs))
- if (bodypart.dismemberable)
- bodypart.dismember() //Using the power of flextape i've sawed this man's bodypart in half!
- bodypart.throw_at(destination, 2, 3)
+ density = TRUE //Density is originally false so the pod doesn't block anything while it's still falling through the air
+ for (var/mob/living/target_living in turf_underneath)
+ if (iscarbon(target_living)) //If effectLimb is true (which means we pop limbs off when we hit people):
+ if (effectLimb)
+ var/mob/living/carbon/carbon_target_mob = target_living
+ for (var/bp in carbon_target_mob.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
+ var/obj/item/bodypart/bodypart = bp
+ if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)//we dont want to kill him, just teach em a lesson!
+ if (bodypart.dismemberable)
+ bodypart.dismember() //Using the power of flextape i've sawed this man's limb in half!
+ break
+ if (effectOrgans) //effectOrgans means remove every organ in our mob
+ var/mob/living/carbon/carbon_target_mob = target_living
+ for(var/organ in carbon_target_mob.internal_organs)
+ var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs)) //Pick a random direction to toss them in
+ var/obj/item/organ/organ_to_yeet = organ
+ organ_to_yeet.Remove(carbon_target_mob) //Note that this isn't the same proc as for lists
+ organ_to_yeet.forceMove(turf_underneath) //Move the organ outta the body
+ organ_to_yeet.throw_at(destination, 2, 3) //Thow the organ at a random tile 3 spots away
sleep(1)
+ for (var/bp in carbon_target_mob.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
+ var/obj/item/bodypart/bodypart = bp
+ var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs))
+ if (bodypart.dismemberable)
+ bodypart.dismember() //Using the power of flextape i've sawed this man's bodypart in half!
+ bodypart.throw_at(destination, 2, 3)
+ sleep(1)
if (effectGib) //effectGib is on, that means whatever's underneath us better be fucking oof'd on
- M.adjustBruteLoss(5000) //THATS A LOT OF DAMAGE (called just in case gib() doesnt work on em)
- M.gib() //After adjusting the fuck outta that brute loss we finish the job with some satisfying gibs
- M.adjustBruteLoss(damage)
+ target_living.adjustBruteLoss(5000) //THATS A LOT OF DAMAGE (called just in case gib() doesnt work on em)
+ if (!QDELETED(target_living))
+ target_living.gib() //After adjusting the fuck outta that brute loss we finish the job with some satisfying gibs
+ else
+ target_living.adjustBruteLoss(damage)
var/explosion_sum = B[1] + B[2] + B[3] + B[4]
if (explosion_sum != 0) //If the explosion list isn't all zeroes, call an explosion
- explosion(get_turf(src), B[1], B[2], B[3], flame_range = B[4], silent = effectQuiet, ignorecap = istype(src, /obj/structure/closet/supplypod/centcompod)) //less advanced equipment than bluespace pod, so larger explosion when landing
- else if (!effectQuiet) //If our explosion list IS all zeroes, we still make a nice explosion sound (unless the effectQuiet var is true)
- playsound(src, "explosion", landingSound ? 15 : 80, 1)
+ explosion(turf_underneath, B[1], B[2], B[3], flame_range = B[4], silent = effectQuiet, ignorecap = istype(src, /obj/structure/closet/supplypod/centcompod)) //less advanced equipment than bluespace pod, so larger explosion when landing
+ else if (!effectQuiet && !(pod_flags & FIRST_SOUNDS)) //If our explosion list IS all zeroes, we still make a nice explosion sound (unless the effectQuiet var is true)
+ playsound(src, "explosion", landingSound ? soundVolume * 0.25 : soundVolume, TRUE)
+ if (landingSound)
+ playsound(turf_underneath, landingSound, soundVolume, FALSE, FALSE)
if (effectMissile) //If we are acting like a missile, then right after we land and finish fucking shit up w explosions, we should delete
opened = TRUE //We set opened to TRUE to avoid spending time trying to open (due to being deleted) during the Destroy() proc
qdel(src)
return
if (style == STYLE_GONDOLA) //Checks if we are supposed to be a gondola pod. If so, create a gondolapod mob, and move this pod to nullspace. I'd like to give a shout out, to my man oranges
- var/mob/living/simple_animal/pet/gondola/gondolapod/benis = new(get_turf(src), src)
+ var/mob/living/simple_animal/pet/gondola/gondolapod/benis = new(turf_underneath, src)
benis.contents |= contents //Move the contents of this supplypod into the gondolapod mob.
moveToNullspace()
- addtimer(CALLBACK(src, .proc/open, benis), openingDelay) //After the openingDelay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob
+ addtimer(CALLBACK(src, .proc/open_pod, benis), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob
else if (style == STYLE_SEETHROUGH)
- open(src)
+ open_pod(src)
else
- addtimer(CALLBACK(src, .proc/open, src), openingDelay) //After the openingDelay passes, we use the open proc from this supplypod, while referencing this supplypod's contents
+ addtimer(CALLBACK(src, .proc/open_pod, src), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplypod, while referencing this supplypod's contents
-/obj/structure/closet/supplypod/open(atom/movable/holder, var/broken = FALSE, var/forced = FALSE) //The holder var represents an atom whose contents we will be working with
+/obj/structure/closet/supplypod/proc/open_pod(atom/movable/holder, broken = FALSE, forced = FALSE) //The holder var represents an atom whose contents we will be working with
if (!holder)
return
if (opened) //This is to ensure we don't open something that has already been opened
return
opened = TRUE
- var/turf/T = get_turf(holder) //Get the turf of whoever's contents we're talking about
- var/mob/M
+ holder.setOpened()
+ var/turf/turf_underneath = get_turf(holder) //Get the turf of whoever's contents we're talking about
if (istype(holder, /mob)) //Allows mobs to assume the role of the holder, meaning we look at the mob's contents rather than the supplypod's contents. Typically by this point the supplypod's contents have already been moved over to the mob's contents
- M = holder
- if (M.key && !forced && !broken) //If we are player controlled, then we shouldnt open unless the opening is manual, or if it is due to being destroyed (represented by the "broken" parameter)
+ var/mob/holder_as_mob = holder
+ if (holder_as_mob.key && !forced && !broken) //If we are player controlled, then we shouldn't open unless the opening is manual, or if it is due to being destroyed (represented by the "broken" parameter)
return
if (openingSound)
- playsound(get_turf(holder), openingSound, soundVolume, 0, 0) //Special admin sound to play
- INVOKE_ASYNC(holder, .proc/setOpened) //Use the INVOKE_ASYNC proc to call setOpened() on whatever the holder may be, without giving the atom/movable base class a setOpened() proc definition
- if (style == STYLE_SEETHROUGH)
- update_icon()
- for (var/atom/movable/O in holder.contents) //Go through the contents of the holder
- O.forceMove(T) //move everything from the contents of the holder to the turf of the holder
- if (!effectQuiet && !openingSound && style != STYLE_SEETHROUGH) //If we aren't being quiet, play the default pod open sound
- playsound(get_turf(holder), open_sound, 15, 1, -3)
+ playsound(get_turf(holder), openingSound, soundVolume, FALSE, FALSE) //Special admin sound to play
+ for (var/turf_type in turfs_in_cargo)
+ turf_underneath.PlaceOnTop(turf_type)
+ for (var/cargo in contents)
+ var/atom/movable/movable_cargo = cargo
+ movable_cargo.forceMove(turf_underneath)
+ if (!effectQuiet && !openingSound && style != STYLE_SEETHROUGH && !(pod_flags & FIRST_SOUNDS)) //If we aren't being quiet, play the default pod open sound
+ playsound(get_turf(holder), open_sound, 15, TRUE, -3)
if (broken) //If the pod is opening because it's been destroyed, we end here
return
if (style == STYLE_SEETHROUGH)
- depart(src)
+ startExitSequence(src)
else
+ if (reversing)
+ addtimer(CALLBACK(src, .proc/SetReverseIcon), delays[POD_LEAVING]/2) //Finish up the pod's duties after a certain amount of time
if(!stay_after_drop) // Departing should be handled manually
- addtimer(CALLBACK(src, .proc/depart, holder), departureDelay) //Finish up the pod's duties after a certain amount of time
+ addtimer(CALLBACK(src, .proc/startExitSequence, holder), delays[POD_LEAVING]*(4/5)) //Finish up the pod's duties after a certain amount of time
-/obj/structure/closet/supplypod/proc/depart(atom/movable/holder)
+/obj/structure/closet/supplypod/proc/startExitSequence(atom/movable/holder)
if (leavingSound)
- playsound(get_turf(holder), leavingSound, soundVolume, 0, 0)
+ playsound(get_turf(holder), leavingSound, soundVolume, FALSE, FALSE)
if (reversing) //If we're reversing, we call the close proc. This sends the pod back up to centcom
close(holder)
else if (bluespace) //If we're a bluespace pod, then delete ourselves (along with our holder, if a seperate holder exists)
+ deleteRubble()
if (!effectQuiet && style != STYLE_INVISIBLE && style != STYLE_SEETHROUGH)
do_sparks(5, TRUE, holder) //Create some sparks right before closing
qdel(src) //Delete ourselves and the holder
if (holder != src)
qdel(holder)
-/obj/structure/closet/supplypod/centcompod/close(atom/movable/holder) //Closes the supplypod and sends it back to centcom. Should only ever be called if the "reversing" variable is true
- handleReturningClose(holder, TRUE)
+/obj/structure/closet/supplypod/close(atom/movable/holder) //Closes the supplypod and sends it back to centcom. Should only ever be called if the "reversing" variable is true
+ if (!holder)
+ return
+ take_contents(holder)
+ playsound(holder, close_sound, soundVolume*0.75, TRUE, -3)
+ holder.setClosed()
+ addtimer(CALLBACK(src, .proc/preReturn, holder), delays[POD_LEAVING] * 0.2) //Start to leave a bit after closing for cinematic effect
+
+/obj/structure/closet/supplypod/take_contents(atom/movable/holder)
+ var/turf/turf_underneath = holder.drop_location()
+ for(var/atom_to_check in turf_underneath)
+ if(atom_to_check != src && !insert(atom_to_check, holder)) // Can't insert that
+ continue
+ insert(turf_underneath, holder)
+
+/obj/structure/closet/supplypod/insert(atom/to_insert, atom/movable/holder)
+ if(insertion_allowed(to_insert))
+ if(isturf(to_insert))
+ var/turf/turf_to_insert = to_insert
+ turfs_in_cargo += turf_to_insert.type
+ turf_to_insert.ScrapeAway()
+ else
+ var/atom/movable/movable_to_insert = to_insert
+ movable_to_insert.forceMove(holder)
+ return TRUE
+ else
+ return FALSE
-/obj/structure/closet/supplypod/extractionpod/close(atom/movable/holder) //handles closing, and returns pod - deletes itself when returned
- . = ..()
- return
+/obj/structure/closet/supplypod/insertion_allowed(atom/to_insert)
+ if(to_insert.invisibility == INVISIBILITY_ABSTRACT)
+ return FALSE
+ if(ismob(to_insert))
+ if(!reverseOptionList["Mobs"])
+ return FALSE
+ if(!isliving(to_insert)) //let's not put ghosts or camera mobs inside
+ return FALSE
+ var/mob/living/mob_to_insert = to_insert
+ if(mob_to_insert.anchored || mob_to_insert.incorporeal_move)
+ return FALSE
+ mob_to_insert.stop_pulling()
+
+ else if(isobj(to_insert))
+ var/obj/obj_to_insert = to_insert
+ if(istype(obj_to_insert, /obj/structure/closet/supplypod))
+ return FALSE
+ if(istype(obj_to_insert, /obj/effect/supplypod_smoke))
+ return FALSE
+ if(istype(obj_to_insert, /obj/effect/pod_landingzone))
+ return FALSE
+ if(istype(obj_to_insert, /obj/effect/supplypod_rubble))
+ return FALSE
+ /*
+ if((obj_to_insert.comp_lookup && obj_to_insert.comp_lookup[COMSIG_OBJ_HIDE]) && reverseOptionList["Underfloor"])
+ return TRUE
+ else if ((obj_to_insert.comp_lookup && obj_to_insert.comp_lookup[COMSIG_OBJ_HIDE]) && !reverseOptionList["Underfloor"])
+ return FALSE
+ */
+ if(isProbablyWallMounted(obj_to_insert) && reverseOptionList["Wallmounted"])
+ return TRUE
+ else if (isProbablyWallMounted(obj_to_insert) && !reverseOptionList["Wallmounted"])
+ return FALSE
+ if(!obj_to_insert.anchored && reverseOptionList["Unanchored"])
+ return TRUE
+ if(obj_to_insert.anchored && reverseOptionList["Anchored"])
+ return TRUE
+ return FALSE
-/obj/structure/closet/supplypod/extractionpod/proc/send_up(atom/movable/holder)
- if (!holder)
- holder = src
+ else if (isturf(to_insert))
+ if(isfloorturf(to_insert) && reverseOptionList["Floors"])
+ return TRUE
+ if(isfloorturf(to_insert) && !reverseOptionList["Floors"])
+ return FALSE
+ if(isclosedturf(to_insert) && reverseOptionList["Walls"])
+ return TRUE
+ if(isclosedturf(to_insert) && !reverseOptionList["Walls"])
+ return FALSE
+ return FALSE
+ return TRUE
- if (leavingSound)
- playsound(get_turf(holder), leavingSound, soundVolume, 0, 0)
+/obj/structure/closet/supplypod/proc/preReturn(atom/movable/holder)
+ deleteRubble()
+ animate(holder, alpha = 0, time = 8, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL)
+ animate(holder, pixel_z = 400, time = 10, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) //Animate our rising pod
+
+ addtimer(CALLBACK(src, .proc/handleReturnAfterDeparting, holder), 15) //Finish up the pod's duties after a certain amount of time
+
+/obj/structure/closet/supplypod/setOpened() //Proc exists here, as well as in any atom that can assume the role of a "holder" of a supplypod. Check the open_pod() proc for more details
+ opened = TRUE
+ density = FALSE
+ update_icon()
- handleReturningClose(holder, FALSE)
+/obj/structure/closet/supplypod/extractionpod/setOpened()
+ opened = TRUE
+ density = TRUE
+ update_icon()
-/obj/structure/closet/supplypod/proc/setOpened() //Proc exists here, as well as in any atom that can assume the role of a "holder" of a supplypod. Check the open() proc for more details
+/obj/structure/closet/supplypod/setClosed() //Ditto
+ opened = FALSE
+ density = TRUE
update_icon()
-/obj/structure/closet/supplypod/proc/setClosed() //Ditto
+/obj/structure/closet/supplypod/proc/tryMakeRubble(turf/T) //Ditto
+ if (rubble_type == RUBBLE_NONE)
+ return
+ if (rubble)
+ return
+ if (effectMissile)
+ return
+ if (isspaceturf(T) || isclosedturf(T))
+ return
+ rubble = new /obj/effect/supplypod_rubble(T)
+ rubble.setStyle(rubble_type, src)
+ update_icon()
+
+/obj/structure/closet/supplypod/Moved()
+ deleteRubble()
+ return ..()
+
+/obj/structure/closet/supplypod/proc/deleteRubble()
+ rubble?.fadeAway()
+ rubble = null
update_icon()
+/obj/structure/closet/supplypod/proc/addGlow()
+ if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML)
+ return
+ glow_effect = new(src)
+ glow_effect.icon_state = "pod_glow_" + GLOB.podstyles[style][POD_GLOW]
+ vis_contents += glow_effect
+ glow_effect.layer = GASFIRE_LAYER
+ RegisterSignal(glow_effect, COMSIG_PARENT_QDELETING, .proc/remove_glow)
+
+/obj/structure/closet/supplypod/proc/endGlow()
+ if(!glow_effect)
+ return
+ glow_effect.layer = LOW_ITEM_LAYER
+ glow_effect.fadeAway(delays[POD_OPENING])
+ //Trust the signals
+
+/obj/structure/closet/supplypod/proc/remove_glow()
+ SIGNAL_HANDLER
+
+ UnregisterSignal(glow_effect, COMSIG_PARENT_QDELETING)
+ vis_contents -= glow_effect
+ glow_effect = null
+
/obj/structure/closet/supplypod/Destroy()
- open(src, broken = TRUE) //Lets dump our contents by opening up
- . = ..()
+ open_pod(src, broken = TRUE) //Lets dump our contents by opening up
+ deleteRubble()
+ //Trust the signals even harder
+ qdel(glow_effect)
+ return ..()
-//------------------------------------FALLING SUPPLY POD-------------------------------------//
-/obj/effect/DPfall //Falling pod
+//------------------------------------TEMPORARY_VISUAL-------------------------------------//
+/obj/effect/supplypod_smoke //Falling pod smoke
name = ""
+ icon = 'icons/obj/supplypods_32x32.dmi'
+ icon_state = "smoke"
+ desc = ""
+ layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ alpha = 0
+
+/obj/effect/engineglow //Falling pod smoke
+ name = ""
+ icon = 'icons/obj/supplypods.dmi'
+ icon_state = "pod_engineglow"
+ desc = ""
+ layer = GASFIRE_LAYER
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ alpha = 255
+
+/obj/effect/engineglow/proc/fadeAway(leaveTime)
+ var/duration = min(leaveTime, 25)
+ animate(src, alpha=0, time = duration)
+ QDEL_IN(src, duration + 5)
+
+/obj/effect/supplypod_smoke/proc/drawSelf(amount)
+ alpha = max(0, 255-(amount*20))
+
+/obj/effect/supplypod_rubble //This is the object that forceMoves the supplypod to it's location
+ name = "Debris"
+ desc = "A small crater of rubble. Closer inspection reveals the debris to be made primarily of space-grade metal fragments. You're pretty sure that this will disperse before too long."
icon = 'icons/obj/supplypods.dmi'
- pixel_x = -16
- pixel_y = -5
- pixel_z = 200
- desc = "Get out of the way!"
- layer = FLY_LAYER//that wasnt flying, that was falling with style!
- icon_state = ""
-
-/obj/effect/DPfall/Initialize(dropLocation, obj/structure/closet/supplypod/pod)
- if (pod.style == STYLE_SEETHROUGH)
- pixel_x = -16
- pixel_y = 0
- for (var/atom/movable/O in pod.contents)
- var/icon/I = getFlatIcon(O) //im so sorry
- add_overlay(I)
- else if (pod.style != STYLE_INVISIBLE) //Check to ensure the pod isn't invisible
- icon_state = "[pod.icon_state]_falling"
- name = pod.name
+ layer = PROJECTILE_HIT_THRESHHOLD_LAYER // We want this to go right below the layer of supplypods and supplypod_rubble's forground.
+ icon_state = "rubble_bg"
+ anchored = TRUE
+ pixel_x = SUPPLYPOD_X_OFFSET
+ var/foreground = "rubble_fg"
+ var/verticle_offset = 0
+
+/obj/effect/supplypod_rubble/proc/getForeground(obj/structure/closet/supplypod/pod)
+ var/mutable_appearance/rubble_overlay = mutable_appearance('icons/obj/supplypods.dmi', foreground)
+ rubble_overlay.appearance_flags = KEEP_APART|RESET_TRANSFORM
+ rubble_overlay.transform = matrix().Translate(SUPPLYPOD_X_OFFSET - pod.pixel_x, verticle_offset)
+ return rubble_overlay
+
+/obj/effect/supplypod_rubble/proc/fadeAway()
+ animate(src, alpha=0, time = 30)
+ QDEL_IN(src, 35)
+
+/obj/effect/supplypod_rubble/proc/setStyle(type, obj/structure/closet/supplypod/pod)
+ if (type == RUBBLE_WIDE)
+ icon_state += "_wide"
+ foreground += "_wide"
+ if (type == RUBBLE_THIN)
+ icon_state += "_thin"
+ foreground += "_thin"
+ if (pod.style == STYLE_BOX)
+ verticle_offset = -2
+ else
+ verticle_offset = initial(verticle_offset)
+ pixel_y = verticle_offset
+
+/obj/effect/pod_landingzone_effect
+ name = ""
+ desc = ""
+ icon = 'icons/obj/supplypods_32x32.dmi'
+ icon_state = "LZ_Slider"
+ layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+
+/obj/effect/pod_landingzone_effect/Initialize(mapload, obj/structure/closet/supplypod/pod)
. = ..()
+ transform = matrix() * 1.5
+ animate(src, transform = matrix()*0.01, time = pod.delays[POD_TRANSIT]+pod.delays[POD_FALLING])
-//------------------------------------TEMPORARY_VISUAL-------------------------------------//
-/obj/effect/DPtarget //This is the object that forceMoves the supplypod to it's location
+/obj/effect/pod_landingzone //This is the object that forceMoves the supplypod to it's location
name = "Landing Zone Indicator"
desc = "A holographic projection designating the landing zone of something. It's probably best to stand back."
- icon = 'icons/mob/actions/actions_items.dmi'
- icon_state = "sniper_zoom"
+ icon = 'icons/obj/supplypods_32x32.dmi'
+ icon_state = "LZ"
layer = PROJECTILE_HIT_THRESHHOLD_LAYER
light_range = 2
- var/obj/effect/temp_visual/fallingPod //Temporary "falling pod" that we animate
- var/obj/structure/closet/supplypod/pod //The supplyPod that will be landing ontop of this target
+ anchored = TRUE
+ alpha = 0
+ var/obj/structure/closet/supplypod/pod //The supplyPod that will be landing ontop of this pod_landingzone
+ var/obj/effect/pod_landingzone_effect/helper
+ var/list/smoke_effects = new /list(13)
/obj/effect/ex_act()
return
-/obj/effect/DPtarget/Initialize(mapload, podParam, var/single_order = null)
+/obj/effect/pod_landingzone/Initialize(mapload, podParam, single_order = null, clientman)
. = ..()
if (ispath(podParam)) //We can pass either a path for a pod (as expressconsoles do), or a reference to an instantiated pod (as the centcom_podlauncher does)
podParam = new podParam() //If its just a path, instantiate it
pod = podParam
+ if (!pod.effectStealth)
+ helper = new (drop_location(), pod)
+ alpha = 255
+ animate(src, transform = matrix().Turn(90), time = pod.delays[POD_TRANSIT]+pod.delays[POD_FALLING])
if (single_order)
if (istype(single_order, /datum/supply_order))
var/datum/supply_order/SO = single_order
@@ -311,48 +584,75 @@
else if (istype(single_order, /atom/movable))
var/atom/movable/O = single_order
O.forceMove(pod)
- for (var/mob/living/M in pod) //If there are any mobs in the supplypod, we want to forceMove them into the target. This is so that they can see where they are about to land, AND so that they don't get sent to the nullspace error room (as the pod is currently in nullspace)
- M.forceMove(src)
- if(pod.effectStun) //If effectStun is true, stun any mobs caught on this target until the pod gets a chance to hit them
- for (var/mob/living/M in get_turf(src))
- M.Stun(pod.landingDelay+10, ignore_canstun = TRUE)//you aint goin nowhere, kid.
- if (pod.effectStealth) //If effectStealth is true we want to be invisible
- icon_state = ""
- if (pod.fallDuration == initial(pod.fallDuration) && pod.landingDelay + pod.fallDuration < pod.fallingSoundLength)
+ for (var/mob/living/mob_in_pod in pod) //If there are any mobs in the supplypod, we want to set their view to the pod_landingzone. This is so that they can see where they are about to land
+ mob_in_pod.reset_perspective(src)
+ if(pod.effectStun) //If effectStun is true, stun any mobs caught on this pod_landingzone until the pod gets a chance to hit them
+ for (var/mob/living/target_living in get_turf(src))
+ target_living.Stun(pod.delays[POD_TRANSIT]+10, ignore_canstun = TRUE)//you ain't goin nowhere, kid.
+ if (pod.delays[POD_FALLING] == initial(pod.delays[POD_FALLING]) && pod.delays[POD_TRANSIT] + pod.delays[POD_FALLING] < pod.fallingSoundLength)
pod.fallingSoundLength = 3 //The default falling sound is a little long, so if the landing time is shorter than the default falling sound, use a special, shorter default falling sound
pod.fallingSound = 'sound/weapons/mortar_whistle.ogg'
- var/soundStartTime = pod.landingDelay - pod.fallingSoundLength + pod.fallDuration
+ var/soundStartTime = pod.delays[POD_TRANSIT] - pod.fallingSoundLength + pod.delays[POD_FALLING]
if (soundStartTime < 0)
soundStartTime = 1
- if (!pod.effectQuiet)
+ if (!pod.effectQuiet && !(pod.pod_flags & FIRST_SOUNDS))
addtimer(CALLBACK(src, .proc/playFallingSound), soundStartTime)
- addtimer(CALLBACK(src, .proc/beginLaunch, pod.effectCircle), pod.landingDelay)
+ addtimer(CALLBACK(src, .proc/beginLaunch, pod.effectCircle), pod.delays[POD_TRANSIT])
-/obj/effect/DPtarget/proc/playFallingSound()
+/obj/effect/pod_landingzone/proc/playFallingSound()
playsound(src, pod.fallingSound, pod.soundVolume, 1, 6)
-/obj/effect/DPtarget/proc/beginLaunch(effectCircle) //Begin the animation for the pod falling. The effectCircle param determines whether the pod gets to come in from any descent angle
- fallingPod = new /obj/effect/DPfall(drop_location(), pod)
- var/matrix/M = matrix(fallingPod.transform) //Create a new matrix that we can rotate
- var/angle = effectCircle ? rand(0,360) : rand(70,110) //The angle that we can come in from
- fallingPod.pixel_x = cos(angle)*400 //Use some ADVANCED MATHEMATICS to set the animated pod's position to somewhere on the edge of a circle with the center being the target
- fallingPod.pixel_z = sin(angle)*400
- var/rotation = Get_Pixel_Angle(fallingPod.pixel_z, fallingPod.pixel_x) //CUSTOM HOMEBREWED proc that is just arctan with extra steps
- M.Turn(rotation) //Turn our matrix accordingly
- fallingPod.transform = M //Transform the animated pod according to the matrix
- M = matrix(pod.transform) //Make another matrix based on the pod
- M.Turn(rotation) //Turn the matrix
- pod.transform = M //Turn the actual pod (Won't be visible until endLaunch() proc tho)
- animate(fallingPod, pixel_z = 0, pixel_x = -16, time = pod.fallDuration, , easing = LINEAR_EASING) //Make the pod fall! At an angle!
- addtimer(CALLBACK(src, .proc/endLaunch), pod.fallDuration, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
-
-/obj/effect/DPtarget/proc/endLaunch()
+/obj/effect/pod_landingzone/proc/beginLaunch(effectCircle) //Begin the animation for the pod falling. The effectCircle param determines whether the pod gets to come in from any descent angle
+ pod.addGlow()
pod.update_icon()
- pod.forceMove(drop_location()) //The fallingPod animation is over, now's a good time to forceMove the actual pod into position
- QDEL_NULL(fallingPod) //Delete the falling pod effect, because at this point its animation is over. We dont use temp_visual because we want to manually delete it as soon as the pod appears
- for (var/mob/living/M in src) //Remember earlier (initialization) when we moved mobs into the DPTarget so they wouldnt get lost in nullspace? Time to get them out
- M.forceMove(pod)
+ if (pod.style != STYLE_INVISIBLE)
+ pod.add_filter("motionblur",1,list("type"="motion_blur", "x"=0, "y"=3))
+ pod.forceMove(drop_location())
+ for (var/mob/living/M in pod) //Remember earlier (initialization) when we moved mobs into the pod_landingzone so they wouldnt get lost in nullspace? Time to get them out
+ M.reset_perspective(null)
+ var/angle = effectCircle ? rand(0,360) : rand(70,110) //The angle that we can come in from
+ pod.pixel_x = cos(angle)*32*length(smoke_effects) //Use some ADVANCED MATHEMATICS to set the animated pod's position to somewhere on the edge of a circle with the center being the target
+ pod.pixel_z = sin(angle)*32*length(smoke_effects)
+ var/rotation = Get_Pixel_Angle(pod.pixel_z, pod.pixel_x) //CUSTOM HOMEBREWED proc that is just arctan with extra steps
+ setupSmoke(rotation)
+ pod.transform = matrix().Turn(rotation)
+ pod.layer = FLY_LAYER
+ if (pod.style != STYLE_INVISIBLE)
+ animate(pod.get_filter("motionblur"), y = 0, time = pod.delays[POD_FALLING], flags = ANIMATION_PARALLEL)
+ animate(pod, pixel_z = -1 * abs(sin(rotation))*4, pixel_x = SUPPLYPOD_X_OFFSET + (sin(rotation) * 20), time = pod.delays[POD_FALLING], easing = LINEAR_EASING, flags = ANIMATION_PARALLEL) //Make the pod fall! At an angle!
+ addtimer(CALLBACK(src, .proc/endLaunch), pod.delays[POD_FALLING], TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
+
+/obj/effect/pod_landingzone/proc/setupSmoke(rotation)
+ if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH)
+ return
+ for ( var/i in 1 to length(smoke_effects))
+ var/obj/effect/supplypod_smoke/smoke_part = new (drop_location())
+ if (i == 1)
+ smoke_part.layer = FLY_LAYER
+ smoke_part.icon_state = "smoke_start"
+ smoke_part.transform = matrix().Turn(rotation)
+ smoke_effects[i] = smoke_part
+ smoke_part.pixel_x = sin(rotation)*32 * i
+ smoke_part.pixel_y = abs(cos(rotation))*32 * i
+ smoke_part.add_filter("smoke_blur", 1, gauss_blur_filter(size = 4))
+ var/time = (pod.delays[POD_FALLING] / length(smoke_effects))*(length(smoke_effects)-i)
+ addtimer(CALLBACK(smoke_part, /obj/effect/supplypod_smoke/.proc/drawSelf, i), time, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
+ QDEL_IN(smoke_part, pod.delays[POD_FALLING] + 35)
+
+/obj/effect/pod_landingzone/proc/drawSmoke()
+ if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH)
+ return
+ for (var/obj/effect/supplypod_smoke/smoke_part in smoke_effects)
+ animate(smoke_part, alpha = 0, time = 20, flags = ANIMATION_PARALLEL)
+ animate(smoke_part.get_filter("smoke_blur"), size = 6, time = 15, easing = CUBIC_EASING|EASE_OUT, flags = ANIMATION_PARALLEL)
+
+/obj/effect/pod_landingzone/proc/endLaunch()
+ pod.tryMakeRubble(drop_location())
+ pod.layer = initial(pod.layer)
+ pod.endGlow()
+ QDEL_NULL(helper)
pod.preOpen() //Begin supplypod open procedures. Here effects like explosions, damage, and other dangerous (and potentially admin-caused, if the centcom_podlauncher datum was used) memes will take place
+ drawSmoke()
qdel(src) //The target's purpose is complete. It can rest easy now
//------------------------------------UPGRADES-------------------------------------//
diff --git a/code/modules/chatter/chatter.dm b/code/modules/chatter/chatter.dm
index c985852c7dadd..6e6c69dd0aa3d 100644
--- a/code/modules/chatter/chatter.dm
+++ b/code/modules/chatter/chatter.dm
@@ -38,7 +38,7 @@
var/path = "sound/chatter/[phomeme]_[length].ogg"
playsound(loc, path,
- vol = 40, vary = 0, extrarange = 3, falloff = FALSE)
+ vol = 40, vary = 0, extrarange = 3)
sleep((length + 1) * chatter_get_sleep_multiplier(phomeme))
diff --git a/code/modules/client/client_colour.dm b/code/modules/client/client_colour.dm
index f1477fb4d2c2d..5773a58e9012f 100644
--- a/code/modules/client/client_colour.dm
+++ b/code/modules/client/client_colour.dm
@@ -1,77 +1,158 @@
-
-/*
- Client Colour Priority System By RemieRichards
- A System that gives finer control over which client.colour value to display on screen
- so that the "highest priority" one is always displayed as opposed to the default of
- "whichever was set last is displayed"
-*/
-
-
-
-/*
- Define subtypes of this datum
-*/
+#define PRIORITY_ABSOLUTE 1
+#define PRIORITY_HIGH 10
+#define PRIORITY_NORMAL 100
+#define PRIORITY_LOW 1000
+
+/**
+ * Client Colour Priority System By RemieRichards (then refactored by another contributor)
+ * A System that gives finer control over which client.colour value to display on screen
+ * so that the "highest priority" one is always displayed as opposed to the default of
+ * "whichever was set last is displayed".
+ *
+ * Refactored to allow multiple overlapping client colours
+ * (e.g. wearing blue glasses under a yellow visor, even though the result is a little unsatured.)
+ * As well as some support for animated colour transitions.
+ *
+ * Define subtypes of this datum
+ */
/datum/client_colour
- var/colour = "" //Any client.color-valid value
- var/priority = 1 //Since only one client.color can be rendered on screen, we take the one with the highest priority value:
- //eg: "Bloody screen" > "goggles colour" as the former is much more important
-
+ ///Any client.color-valid value
+ var/colour = ""
+ ///The mob that owns this client_colour.
+ var/mob/owner
+ /**
+ * We prioritize colours with higher priority (lower numbers), so they don't get overriden by less important ones:
+ * eg: "Bloody screen" > "goggles colour" as the former is much more important
+ */
+ var/priority = PRIORITY_NORMAL
+ ///Will this client_colour prevent ones of lower priority from being applied?
+ var/override = FALSE
+ ///IF non-zero, 'animate_client_colour(fade_in)' will be called instead of 'update_client_colour' when added.
+ var/fade_in = 0
+ ///Same as above, but on removal.
+ var/fade_out = 0
+
+/datum/client_colour/New(mob/_owner)
+ owner = _owner
+
+/datum/client_colour/Destroy()
+ if(!QDELETED(owner))
+ owner.client_colours -= src
+ if(fade_out)
+ owner.animate_client_colour(fade_out)
+ else
+ owner.update_client_colour()
+ owner = null
+ return ..()
+
+///Sets a new colour, then updates the owner's screen colour.
+/datum/client_colour/proc/update_colour(new_colour, anim_time, easing = 0)
+ colour = new_colour
+ if(anim_time)
+ owner.animate_client_colour(anim_time, easing)
+ else
+ owner.update_client_colour()
/mob
var/list/client_colours = list()
-
-
-/*
- Adds an instance of colour_type to the mob's client_colours list
- colour_type - a typepath (subtyped from /datum/client_colour)
-*/
+/**
+ * Adds an instance of colour_type to the mob's client_colours list
+ * colour_type - a typepath (subtyped from /datum/client_colour)
+ */
/mob/proc/add_client_colour(colour_type)
if(!ispath(colour_type, /datum/client_colour))
return
- var/datum/client_colour/CC = new colour_type()
- client_colours |= CC
- sortTim(client_colours, /proc/cmp_clientcolour_priority)
- update_client_colour()
-
-
-/*
- Removes an instance of colour_type from the mob's client_colours list
- colour_type - a typepath (subtyped from /datum/client_colour)
-*/
+ var/datum/client_colour/colour = new colour_type(src)
+ BINARY_INSERT(colour, client_colours, /datum/client_colour, colour, priority, COMPARE_KEY)
+ if(colour.fade_in)
+ animate_client_colour(colour.fade_in)
+ else
+ update_client_colour()
+ return colour
+
+/**
+ * Removes an instance of colour_type from the mob's client_colours list
+ * colour_type - a typepath (subtyped from /datum/client_colour)
+ */
/mob/proc/remove_client_colour(colour_type)
if(!ispath(colour_type, /datum/client_colour))
return
for(var/cc in client_colours)
- var/datum/client_colour/CC = cc
- if(CC.type == colour_type)
- client_colours -= CC
- qdel(CC)
+ var/datum/client_colour/colour = cc
+ if(colour.type == colour_type)
+ qdel(colour)
break
- update_client_colour()
-
-/*
- Resets the mob's client.color to null, and then sets it to the highest priority
- client_colour datum, if one exists
-*/
+/**
+ * Gets the resulting colour/tone from client_colours.
+ * In the case of multiple colours, they'll be converted to RGBA matrices for compatibility,
+ * summed together, and then each element divided by the number of matrices. (except we do this with lists because byond)
+ * target is the target variable.
+ */
+#define MIX_CLIENT_COLOUR(target)\
+ var/_our_colour;\
+ var/_number_colours = 0;\
+ var/_pool_closed = INFINITY;\
+ for(var/_c in client_colours){\
+ var/datum/client_colour/_colour = _c;\
+ if(_pool_closed < _colour.priority){\
+ break\
+ };\
+ _number_colours++;\
+ if(_colour.override){\
+ _pool_closed = _colour.priority\
+ };\
+ if(!_our_colour){\
+ _our_colour = _colour.colour;\
+ continue\
+ };\
+ if(_number_colours == 2){\
+ _our_colour = color_to_full_rgba_matrix(_our_colour)\
+ };\
+ var/list/_colour_matrix = color_to_full_rgba_matrix(_colour.colour);\
+ var/list/_L = _our_colour;\
+ for(var/_i in 1 to 20){\
+ _L[_i] += _colour_matrix[_i]\
+ };\
+ };\
+ if(_number_colours > 1){\
+ var/list/_L = _our_colour;\
+ for(var/_i in 1 to 20){\
+ _L[_i] /= _number_colours\
+ };\
+ };\
+ target = _our_colour\
+
+
+/**
+ * Resets the mob's client.color to null, and then reapplies a new color based
+ * on the client_colour datums it currently has.
+ */
/mob/proc/update_client_colour()
if(!client)
return
client.color = ""
if(!client_colours.len)
return
- var/datum/client_colour/CC = client_colours[1]
- if(CC)
- client.color = CC.colour
-
+ MIX_CLIENT_COLOUR(client.color)
+///Works similarly to 'update_client_colour', but animated.
+/mob/proc/animate_client_colour(anim_time = 20, anim_easing = 0)
+ if(!client)
+ return
+ if(!client_colours.len)
+ animate(client, color = "", time = anim_time, easing = anim_easing)
+ return
+ MIX_CLIENT_COLOUR(var/anim_colour)
+ animate(client, color = anim_colour, time = anim_time, easing = anim_easing)
+#undef MIX_CLIENT_COLOUR
/datum/client_colour/glass_colour
- priority = 0
+ priority = PRIORITY_LOW
colour = "red"
/datum/client_colour/glass_colour/green
@@ -110,4 +191,21 @@
/datum/client_colour/monochrome
colour = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
- priority = INFINITY //we can't see colors anyway!
+ priority = PRIORITY_HIGH //we can't see colors anyway!
+ override = TRUE
+ fade_in = 20
+ fade_out = 20
+
+/datum/client_colour/bloodlust
+ priority = PRIORITY_ABSOLUTE // Only anger.
+ colour = list(0,0,0,0,0,0,0,0,0,1,0,0) //pure red.
+ fade_out = 10
+
+/datum/client_colour/bloodlust/New(mob/_owner)
+ ..()
+ addtimer(CALLBACK(src, .proc/update_colour, list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0), 10, SINE_EASING|EASE_OUT), 1)
+
+#undef PRIORITY_ABSOLUTE
+#undef PRIORITY_HIGH
+#undef PRIORITY_NORMAL
+#undef PRIORITY_LOW
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index b77e28ef24e4c..814cf3f84b786 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -25,8 +25,9 @@
var/total_message_count = 0
/// Next tick to reset the total message counter
var/total_count_reset = 0
- var/ircreplyamount = 0
+ var/externalreplyamount = 0
var/cryo_warned = -3000//when was the last time we warned them about not cryoing without an ahelp, set to -5 minutes so that rounstart cryo still warns
+ var/staff_check_rate = 0 //when was the last time they checked online staff
/////////
//OTHER//
@@ -34,6 +35,7 @@
/// The client's preferences
var/datum/preferences/prefs = null
var/list/keybindings[0]
+ var/movement_locked = FALSE
/// The last world.time that the client's mob turned
var/last_turn = 0
@@ -42,11 +44,7 @@
var/move_delay = 0
var/area = null
- ///////////////
- //SOUND STUFF//
- ///////////////
- var/ambient_buzz_playing = null // What buzz ambience is currently playing
- var/ambient_effect_last_played = 0 // What was the last time we played an ambient effect noise?
+ var/buzz_playing = null
////////////
//SECURITY//
////////////
@@ -70,7 +68,7 @@
preload_rsc = PRELOAD_RSC
- var/obj/screen/click_catcher/void
+ var/atom/movable/screen/click_catcher/void
//These two vars are used to make a special mouse cursor, with a unique icon for clicking
/// Mouse icon while not clicking
@@ -99,7 +97,7 @@
/// These persist between logins/logouts during the same round.
var/datum/player_details/player_details
- var/list/char_render_holders //Should only be a key-value list of north/south/east/west = obj/screen.
+ var/list/char_render_holders //Should only be a key-value list of north/south/east/west = atom/movable/screen.
var/client_keysend_amount = 0
var/next_keysend_reset = 0
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 1c9ab5a76ca3f..18b281e10926b 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -4,7 +4,7 @@
#define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 1MB //Could probably do with being lower.
-
+#define MAX_RECOMMENDED_CLIENT 1568
GLOBAL_LIST_INIT(blacklisted_builds, list(
"1407" = "bug preventing client display overrides from working leads to clients being able to see things/mobs they shouldn't be able to see",
@@ -95,6 +95,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(tgui_Topic(href_list))
return
+ if(href_list["reload_tguipanel"])
+ nuke_chat()
+
// Admin PM
if(href_list["priv_msg"])
cmd_admin_pm(href_list["priv_msg"],null)
@@ -215,6 +218,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
tgui_panel = new(src)
GLOB.ahelp_tickets.ClientLogin(src)
+ GLOB.requests.client_login(src)
var/connecting_admin = FALSE //because de-admined admins connecting should be treated like admins.
//Admin Authorisation
holder = GLOB.admin_datums[ckey]
@@ -223,7 +227,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
holder.owner = src
connecting_admin = TRUE
else if(GLOB.deadmins[ckey])
- verbs += /client/proc/readmin
+ add_verb(/client/proc/readmin)
connecting_admin = TRUE
if(CONFIG_GET(flag/autoadmin))
if(!GLOB.admin_datums[ckey])
@@ -252,8 +256,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
prefs.last_id = computer_id //these are gonna be used for banning
fps = prefs.clientfps
+ prefs.handle_donator_items()
+
if(fexists(roundend_report_file()))
- verbs += /client/proc/show_previous_roundend_report
+ add_verb(/client/proc/show_previous_roundend_report)
var/full_version = "[byond_version].[byond_build ? byond_build : "xxx"]"
log_access("Login: [key_name(src)] from [address ? address : "localhost"]-[computer_id] || BYOND v[full_version]")
@@ -309,7 +315,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
else
qdel(src)
return
-
+ if(byond_build > MAX_RECOMMENDED_CLIENT)
+ to_chat(src, "Your version of byond is over the maximum recommended version for clients (build [MAX_RECOMMENDED_CLIENT]) and may be unstable.")
+ to_chat(src, "Please download an older version of byond. You can go to BYOND's website to download other versions.")
if(SSinput.initialized)
set_macros()
@@ -385,7 +393,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if (nnpa >= 0)
message_admins("New user: [key_name_admin(src)] is connecting here for the first time.")
if (CONFIG_GET(flag/irc_first_connection_alert))
- send2irc_adminless_only("New-user", "[key_name(src)] is connecting for the first time!")
+ send2tgs_adminless_only("New-user", "[key_name(src)] is connecting for the first time!")
else if (isnum_safe(cached_player_age) && cached_player_age < nnpa)
message_admins("New user: [key_name_admin(src)] just connected with an age of [cached_player_age] day[(player_age==1?"":"s")]")
if(CONFIG_GET(flag/use_account_age_for_jobs) && account_age >= 0)
@@ -393,13 +401,13 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(account_age >= 0 && account_age < nnpa)
message_admins("[key_name_admin(src)] (IP: [address], ID: [computer_id]) is a new BYOND account [account_age] day[(account_age==1?"":"s")] old, created on [account_join_date].")
if (CONFIG_GET(flag/irc_first_connection_alert))
- send2irc_adminless_only("new_byond_user", "[key_name(src)] (IP: [address], ID: [computer_id]) is a new BYOND account [account_age] day[(account_age==1?"":"s")] old, created on [account_join_date].")
+ send2tgs_adminless_only("new_byond_user", "[key_name(src)] (IP: [address], ID: [computer_id]) is a new BYOND account [account_age] day[(account_age==1?"":"s")] old, created on [account_join_date].")
get_message_output("watchlist entry", ckey)
check_ip_intel()
validate_key_in_db()
fetch_uuid()
- verbs += /client/proc/show_account_identifier
+ add_verb(/client/proc/show_account_identifier)
send_resources()
@@ -424,32 +432,12 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.")
+ update_ambience_pref()
//This is down here because of the browse() calls in tooltip/New()
if(!tooltips)
tooltips = new /datum/tooltip(src)
- var/list/topmenus = GLOB.menulist[/datum/verbs/menu]
- for (var/thing in topmenus)
- var/datum/verbs/menu/topmenu = thing
- var/topmenuname = "[topmenu]"
- if (topmenuname == "[topmenu.type]")
- var/list/tree = splittext(topmenuname, "/")
- topmenuname = tree[tree.len]
- winset(src, "[topmenu.type]", "parent=menu;name=[rustg_url_encode(topmenuname)]")
- var/list/entries = topmenu.Generate_list(src)
- for (var/child in entries)
- winset(src, "[child]", "[entries[child]]")
- if (!ispath(child, /datum/verbs/menu))
- var/procpath/verbpath = child
- if (verbpath.name[1] != "@")
- new child(src)
-
- for (var/thing in prefs.menuoptions)
- var/datum/verbs/menu/menuitem = GLOB.menulist[thing]
- if (menuitem)
- menuitem.Load_checked(src)
-
view_size = new(src, getScreenSize(mob))
view_size.resetFormat()
view_size.setZoomMode()
@@ -457,8 +445,17 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
Master.UpdateTickRate()
if(GLOB.ckey_redirects.Find(ckey))
- to_chat(src, "The server is full. You will be redirected to [CONFIG_GET(string/redirect_address)] in 10 seconds.")
- addtimer(CALLBACK(src, .proc/time_to_redirect), (10 SECONDS))
+ if(isnewplayer(mob))
+ to_chat(src, "The server is full. You will be redirected to [CONFIG_GET(string/redirect_address)] in 10 seconds.")
+ addtimer(CALLBACK(src, .proc/time_to_redirect), (10 SECONDS))
+ else
+ GLOB.ckey_redirects -= ckey
+
+ //Add the default client verbs to the TGUI window
+ add_verb(subtypesof(/client/verb), TRUE)
+
+ //Load the TGUI stat in case of TGUI subsystem not ready (startup)
+ mob.UpdateMobStat(TRUE)
/client/proc/time_to_redirect()
var/redirect_address = CONFIG_GET(string/redirect_address)
@@ -541,12 +538,14 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
"Forever alone :("\
)
- send2irc("Server", "[cheesy_message] (No admins online)")
+ send2tgs("Server", "[cheesy_message] (No admins online)")
GLOB.ahelp_tickets.ClientLogout(src)
+ GLOB.requests.client_logout(src)
GLOB.directory -= ckey
GLOB.clients -= src
GLOB.mentors -= src
+ SSambience.ambience_listening_clients -= src
QDEL_LIST_ASSOC_VAL(char_render_holders)
if(movingmob != null)
movingmob.client_mobs_in_contents -= mob
@@ -598,11 +597,19 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(!query_client_in_db.Execute())
qdel(query_client_in_db)
return
- if(!query_client_in_db.NextRow())
- if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey])
- log_access("Failed Login: [key] - New account attempting to connect during panic bunker")
- message_admins("Failed Login: [key] - New account attempting to connect during panic bunker")
- to_chat(src, CONFIG_GET(string/panic_bunker_message))
+
+ //If we aren't an admin, and the flag is set
+ if(CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey])
+ var/living_recs = CONFIG_GET(number/panic_bunker_living)
+ //Relies on pref existing, but this proc is only called after that occurs, so we're fine.
+ var/minutes = get_exp_living(pure_numeric = TRUE)
+ if(minutes < living_recs)
+ var/reject_message = "Failed Login: [key] - Account attempting to connect during panic bunker, but they do not have the required living time [minutes]/[living_recs]"
+ log_access(reject_message)
+ message_admins("[reject_message]")
+ var/message = CONFIG_GET(string/panic_bunker_message)
+ message = replacetext(message, "%minutes%", living_recs)
+ to_chat(src, message)
var/list/connectiontopic_a = params2list(connectiontopic)
var/list/panic_addr = CONFIG_GET(string/panic_server_address)
if(panic_addr && !connectiontopic_a["redirect"])
@@ -614,6 +621,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
qdel(src)
return
+ if(!query_client_in_db.NextRow())
new_player = 1
account_join_date = findJoinDate()
var/datum/DBQuery/query_add_player = SSdbcore.NewQuery({"
@@ -777,7 +785,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if (!cidcheck_failedckeys[ckey])
message_admins("[key_name(src)] has been detected as using a cid randomizer. Connection rejected.")
- send2irc_adminless_only("CidRandomizer", "[key_name(src)] has been detected as using a cid randomizer. Connection rejected.")
+ send2tgs_adminless_only("CidRandomizer", "[key_name(src)] has been detected as using a cid randomizer. Connection rejected.")
cidcheck_failedckeys[ckey] = TRUE
note_randomizer_user()
@@ -788,7 +796,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
else
if (cidcheck_failedckeys[ckey])
message_admins("[key_name_admin(src)] has been allowed to connect after showing they removed their cid randomizer")
- send2irc_adminless_only("CidRandomizer", "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.")
+ send2tgs_adminless_only("CidRandomizer", "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.")
cidcheck_failedckeys -= ckey
if (cidcheck_spoofckeys[ckey])
message_admins("[key_name_admin(src)] has been allowed to connect after appearing to have attempted to spoof a cid randomizer check because it appears they aren't spoofing one this time")
@@ -913,9 +921,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
/client/proc/add_verbs_from_config()
if(CONFIG_GET(flag/see_own_notes))
- verbs += /client/proc/self_notes
+ add_verb(/client/proc/self_notes)
if(CONFIG_GET(flag/use_exp_tracking))
- verbs += /client/proc/self_playtime
+ add_verb(/client/proc/self_playtime)
#undef UPLOAD_LIMIT
@@ -964,6 +972,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
return FALSE
if ("key")
return FALSE
+ if("cached_badges")
+ return FALSE
if("view")
view_size.setDefault(var_value)
return TRUE
@@ -1003,7 +1013,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/pos = 0
for(var/D in GLOB.cardinals)
pos++
- var/obj/screen/O = LAZYACCESS(char_render_holders, "[D]")
+ var/atom/movable/screen/O = LAZYACCESS(char_render_holders, "[D]")
if(!O)
O = new
LAZYSET(char_render_holders, "[D]", O)
@@ -1014,7 +1024,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
/client/proc/clear_character_previews()
for(var/index in char_render_holders)
- var/obj/screen/S = char_render_holders[index]
+ var/atom/movable/screen/S = char_render_holders[index]
screen -= S
qdel(S)
char_render_holders = null
@@ -1024,7 +1034,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
set category = "OOC"
set desc ="Get your ID for account verification."
- verbs -= /client/proc/show_account_identifier
+ remove_verb(/client/proc/show_account_identifier)
addtimer(CALLBACK(src, .proc/restore_account_identifier), 20) //Don't DoS DB queries, asshole
var/confirm = alert("Do NOT share the verification ID in the following popup. Understand?", "Important Warning", "Yes", "Cancel")
@@ -1047,7 +1057,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
onclose(src, "accountidentifier")
/client/proc/restore_account_identifier()
- verbs += /client/proc/show_account_identifier
+ add_verb(/client/proc/show_account_identifier)
/client/proc/check_upstream_bans()
set waitfor = 0
@@ -1079,3 +1089,15 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
qdel(src)
return
+/client/proc/open_filter_editor(atom/in_atom)
+ if(holder)
+ holder.filteriffic = new /datum/filter_editor(in_atom)
+ holder.filteriffic.ui_interact(mob)
+
+/client/proc/update_ambience_pref()
+ if(prefs.toggles & SOUND_AMBIENCE)
+ if(SSambience.ambience_listening_clients[src] > world.time)
+ return // If already properly set we don't want to reset the timer.
+ SSambience.ambience_listening_clients[src] = world.time + 10 SECONDS //Just wait 10 seconds before the next one aight mate? cheers.
+ else
+ SSambience.ambience_listening_clients -= src
diff --git a/code/modules/client/loadout/loadout.dm b/code/modules/client/loadout/loadout.dm
index 58a3e2ad7bd60..a62c4ad4c832e 100644
--- a/code/modules/client/loadout/loadout.dm
+++ b/code/modules/client/loadout/loadout.dm
@@ -11,10 +11,14 @@ GLOBAL_LIST_EMPTY(gear_datums)
/proc/populate_gear_list()
//create a list of gear datums to sort
+ var/list/used_ids = list()
for(var/geartype in subtypesof(/datum/gear))
var/datum/gear/G = geartype
var/use_name = initial(G.display_name)
+ var/use_id = initial(G.id)
+ if(!use_id) //Not set, generate fallback
+ use_id = md5(use_name)
var/use_category = initial(G.sort_category)
if(G == initial(G.subtype_path))
@@ -23,6 +27,9 @@ GLOBAL_LIST_EMPTY(gear_datums)
if(!use_name)
WARNING("Loadout - Missing display name: [G]")
continue
+ if(use_id in used_ids)
+ WARNING("Loadout - ID Already Exists: [G], with ID:[use_id], Conflicts with: [used_ids[use_id]]")
+ continue
if(!initial(G.cost))
WARNING("Loadout - Missing cost: [G]")
continue
@@ -32,18 +39,19 @@ GLOBAL_LIST_EMPTY(gear_datums)
if(!GLOB.loadout_categories[use_category])
GLOB.loadout_categories[use_category] = new /datum/loadout_category(use_category)
+ used_ids[use_id] = G
var/datum/loadout_category/LC = GLOB.loadout_categories[use_category]
- GLOB.gear_datums[use_name] = new geartype
- LC.gear[use_name] = GLOB.gear_datums[use_name]
+ GLOB.gear_datums[use_id] = new geartype
+ LC.gear[use_id] = GLOB.gear_datums[use_id]
GLOB.loadout_categories = sortAssoc(GLOB.loadout_categories)
- return 1
/datum/gear
- var/display_name //Name/index. Must be unique.
+ var/display_name //Name. Should be unique.
+ var/id //ID string. MUST be unique.
var/description //Description of this gear. If left blank will default to the description of the pathed item.
var/path //Path to item.
- var/cost = INFINITY //Number of metacoins
+ var/cost = INFINITY //Number of metacoins
var/slot //Slot to equip to.
var/list/allowed_roles //Roles that can spawn with this item.
var/list/species_blacklist //Stop certain species from receiving this gear
@@ -53,6 +61,7 @@ GLOBAL_LIST_EMPTY(gear_datums)
/datum/gear/New()
..()
+ id = md5(display_name)
if(!description)
var/obj/O = path
description = initial(O.desc)
diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm
index cb2b8170cfaae..6502d8d2d6533 100644
--- a/code/modules/client/loadout/loadout_accessories.dm
+++ b/code/modules/client/loadout/loadout_accessories.dm
@@ -2,7 +2,7 @@
/datum/gear/accessory
subtype_path = /datum/gear/accessory
- slot = SLOT_NECK
+ slot = ITEM_SLOT_NECK
sort_category = "Accessories"
/datum/gear/accessory/scarf
@@ -36,11 +36,22 @@
path = /obj/item/clothing/neck/stripedbluescarf
cost = 1200
+//armbands
/datum/gear/accessory/armband_red
- display_name = "armband"
+ display_name = "armband, red"
path = /obj/item/clothing/accessory/armband
cost = 1000
+/datum/gear/accessory/armband_blu
+ display_name = "armband, blue"
+ path = /obj/item/clothing/accessory/armband/blue
+ cost = 1000
+
+/datum/gear/accessory/armband_grn
+ display_name = "armband, green"
+ path = /obj/item/clothing/accessory/armband/green
+ cost = 1000
+
//ties
/datum/gear/accessory/tie
subtype_path = /datum/gear/accessory/tie
@@ -88,19 +99,19 @@
/datum/gear/accessory/eyepatch
display_name = "eyepatch"
- slot = SLOT_GLASSES
+ slot = ITEM_SLOT_EYES
path = /obj/item/clothing/glasses/eyepatch
cost = 1200
/datum/gear/accessory/monocle
display_name = "monocle"
- slot = SLOT_GLASSES
+ slot = ITEM_SLOT_EYES
path = /obj/item/clothing/glasses/monocle
cost = 1200
/datum/gear/accessory/glasses
display_name = "prescription glasses"
- slot = SLOT_GLASSES
+ slot = ITEM_SLOT_EYES
path = /obj/item/clothing/glasses/regular
cost = 3000
@@ -129,7 +140,7 @@
path = /obj/item/clothing/glasses/heat
/datum/gear/accessory/glasses/orange
- display_name = "sunglasses"
+ display_name = "orange sunglasses"
path = /obj/item/clothing/glasses/orange
/datum/gear/accessory/glasses/red
@@ -162,3 +173,14 @@
display_name = "lipstick, random color"
path = /obj/item/lipstick/random
cost = 1400
+
+//Cloaks
+
+/datum/gear/accessory/cloak
+ subtype_path = /datum/gear/accessory/cloak
+ cost = 10000
+
+/datum/gear/accessory/cloak/blackbishop
+ display_name = "black bishop's cloak"
+ path = /obj/item/clothing/neck/cloak/chap/bishop/black
+ allowed_roles = list("Chaplain")
diff --git a/code/modules/client/loadout/loadout_donator.dm b/code/modules/client/loadout/loadout_donator.dm
new file mode 100644
index 0000000000000..6231340325a87
--- /dev/null
+++ b/code/modules/client/loadout/loadout_donator.dm
@@ -0,0 +1,136 @@
+/datum/gear/donator
+ subtype_path = /datum/gear/donator
+ sort_category = "Donator"
+ cost = 3500
+
+//BACKPACKS
+
+/datum/gear/donator/backpack
+ subtype_path = /datum/gear/donator/backpack
+ slot = ITEM_SLOT_BACK
+
+/datum/gear/donator/backpack/ian
+ display_name = "ian backpack"
+ path = /obj/item/storage/backpack/ian
+
+/datum/gear/donator/backpack/lisa
+ display_name = "lisa backpack"
+ path = /obj/item/storage/backpack/lisa
+
+/datum/gear/donator/backpack/renault
+ display_name = "renault backpack"
+ path = /obj/item/storage/backpack/renault
+
+/datum/gear/donator/backpack/cak
+ display_name = "cak catpack"
+ path = /obj/item/storage/backpack/cak
+
+/datum/gear/donator/backpack/runtime
+ display_name = "runtime catpack"
+ path = /obj/item/storage/backpack/runtime
+
+//SUIT
+
+/datum/gear/donator/suit
+ subtype_path = /datum/gear/donator/suit
+ slot = ITEM_SLOT_OCLOTHING
+
+/datum/gear/donator/suit/delinquent
+ display_name = "deliquent jacket"
+ path = /obj/item/clothing/suit/delinquent
+
+/datum/gear/donator/suit/madsci
+ display_name = "mad scientist labcoat"
+ path = /obj/item/clothing/suit/madsci
+
+/datum/gear/donator/suit/renault_costume
+ display_name = "renault costume"
+ path = /obj/item/clothing/suit/hooded/renault_costume
+
+/datum/gear/donator/suit/retro_jacket
+ display_name = "retro jacket"
+ path = /obj/item/clothing/suit/retro_jacket
+
+//UNIFORM/UNDER
+/datum/gear/donator/uniform
+ subtype_path = /datum/gear/donator/uniform
+ slot = ITEM_SLOT_ICLOTHING
+
+/datum/gear/donator/uniform/wine_gown
+ display_name = "wine gown"
+ path = /obj/item/clothing/under/dress/gown
+
+/datum/gear/donator/uniform/teal_gown
+ display_name = "teal gown"
+ path = /obj/item/clothing/under/dress/gown/teal
+
+/datum/gear/donator/uniform/midnight_gown
+ display_name = "midnight gown"
+ path = /obj/item/clothing/under/dress/gown/midnight
+
+/datum/gear/donator/uniform/gangster
+ display_name = "gangster suit"
+ path = /obj/item/clothing/under/gangster
+
+/datum/gear/donator/uniform/gangster_purple
+ display_name = "purple gangster suit"
+ path = /obj/item/clothing/under/gangster/purple
+
+//HEAD
+
+/datum/gear/donator/head
+ subtype_path = /datum/gear/donator/head
+ slot = ITEM_SLOT_HEAD
+
+/datum/gear/donator/head/gangster_wig
+ display_name = "gangster wig"
+ path = /obj/item/clothing/head/gangsterwig
+
+/datum/gear/donator/head/oldhat
+ display_name = "old man hat"
+ path = /obj/item/clothing/head/oldhat
+
+/datum/gear/donator/head/marine
+ display_name = "mariner hat"
+ path = /obj/item/clothing/head/marine
+
+/datum/gear/donator/suit/retro_chicken_head
+ display_name = "retro chicken head"
+ path = /obj/item/clothing/head/chicken_head_retro
+
+//NECK
+/datum/gear/donator/neck
+ subtype_path = /datum/gear/donator/neck
+ slot = ITEM_SLOT_NECK
+
+/datum/gear/donator/neck/bizzare
+ display_name = "bizzare scarf"
+ path = /obj/item/clothing/neck/bizzarescarf
+
+/datum/gear/donator/neck/conductive
+ display_name = "conductive scarf"
+ path = /obj/item/clothing/neck/conductivescarf
+
+//ITEMS
+
+/datum/gear/donator/item
+ subtype_path = /datum/gear/donator/item
+ slot = ITEM_SLOT_BACKPACK
+ cost = 5000
+
+/datum/gear/donator/item/plush_ian
+ display_name = "ian plushie"
+ path = /obj/item/toy/plush/ian
+
+/datum/gear/donator/item/plush_lisa
+ display_name = "lisa plushie"
+ path = /obj/item/toy/plush/lisa
+
+/datum/gear/donator/item/plush_renault
+ display_name = "renault plushie"
+ path = /obj/item/toy/plush/renault
+
+/datum/gear/donator/item/plush_opa
+ display_name = "metal opa plushie"
+ path = /obj/item/toy/plush/opa
+
diff --git a/code/modules/client/loadout/loadout_footwear.dm b/code/modules/client/loadout/loadout_footwear.dm
index 23e6678375cfd..24df6ff8377f1 100644
--- a/code/modules/client/loadout/loadout_footwear.dm
+++ b/code/modules/client/loadout/loadout_footwear.dm
@@ -1,6 +1,6 @@
/datum/gear/footwear
subtype_path = /datum/gear/footwear
- slot = SLOT_SHOES
+ slot = ITEM_SLOT_FEET
sort_category = "Footwear"
cost = 1000
@@ -19,6 +19,11 @@
path = /obj/item/clothing/shoes/winterboots
cost = 4000
+/datum/gear/footwear/swagshoes
+ display_name = "swag shoes"
+ path = /obj/item/clothing/shoes/swagshoes
+ cost = 31000
+
//Standard shoes
/datum/gear/footwear/color
diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm
index 280aa1b62f06f..9eab99af345a6 100644
--- a/code/modules/client/loadout/loadout_hat.dm
+++ b/code/modules/client/loadout/loadout_hat.dm
@@ -1,6 +1,6 @@
/datum/gear/hat
subtype_path = /datum/gear/hat
- slot = SLOT_HEAD
+ slot = ITEM_SLOT_HEAD
sort_category = "Headwear"
species_blacklist = list("plasmaman") //Their helmet takes up the head slot
cost = 2000
@@ -190,3 +190,10 @@
path = /obj/item/clothing/head/pirate
cost = 5000
+//CHAPLAIN HATS
+
+/datum/gear/hat/blackbishop
+ display_name = "black bishop mitre"
+ path = /obj/item/clothing/head/bishopmitre/black
+ cost = 5000
+ allowed_roles = list("Chaplain")
diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm
index 32068752713dd..4c1e3b64a73ab 100644
--- a/code/modules/client/loadout/loadout_suit.dm
+++ b/code/modules/client/loadout/loadout_suit.dm
@@ -1,6 +1,6 @@
/datum/gear/suit
subtype_path = /datum/gear/suit
- slot = SLOT_WEAR_SUIT
+ slot = ITEM_SLOT_OCLOTHING
sort_category = "External Wear"
cost = 2500
@@ -89,6 +89,10 @@
display_name = "bomber jacket"
path = /obj/item/clothing/suit/jacket
+/datum/gear/suit/jacket/softshell
+ display_name = "softshell jacket"
+ path = /obj/item/clothing/suit/toggle/softshell
+
/datum/gear/suit/jacket/leather
display_name = "leather jacket"
path = /obj/item/clothing/suit/jacket/leather
@@ -111,7 +115,7 @@
path = /obj/item/clothing/suit/jacket/letterman_red
/datum/gear/suit/jacket/letterman_nanotrasen
- display_name = "letterman jacket, NanoTrasen blue"
+ display_name = "letterman jacket, Nanotrasen blue"
path = /obj/item/clothing/suit/jacket/letterman_nanotrasen
cost = 5000
@@ -159,3 +163,13 @@
/datum/gear/suit/poncho/red
display_name = "poncho, red"
path = /obj/item/clothing/suit/poncho/red
+
+//ROBES
+/datum/gear/suit/robe
+ subtype_path = /datum/gear/suit/robe
+ cost = 5000
+
+/datum/gear/suit/robe/blackbishop
+ display_name = "black bishop's robes"
+ path = /obj/item/clothing/suit/chaplainsuit/bishoprobe/black
+ allowed_roles = list("Chaplain")
diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm
index c70ef9044dfed..d566ace0f37b1 100644
--- a/code/modules/client/loadout/loadout_uniform.dm
+++ b/code/modules/client/loadout/loadout_uniform.dm
@@ -1,7 +1,7 @@
// Uniform slot
/datum/gear/uniform
subtype_path = /datum/gear/uniform
- slot = SLOT_W_UNIFORM
+ slot = ITEM_SLOT_ICLOTHING
sort_category = "Uniforms and Casual Dress"
species_blacklist = list("plasmaman") //Envirosuit moment
cost = 1000
@@ -234,6 +234,11 @@
path = /obj/item/clothing/under/costume/jabroni
cost = 20000
+/datum/gear/uniform/misc/geisha
+ display_name = "geisha suit"
+ path = /obj/item/clothing/under/costume/geisha
+ cost = 20000
+
/datum/gear/uniform/misc/soviet
display_name = "soviet uniform"
path = /obj/item/clothing/under/costume/soviet
@@ -246,6 +251,11 @@
display_name = "sailor outfit"
path = /obj/item/clothing/under/costume/sailor
+/datum/gear/uniform/misc/swagoutfit
+ display_name = "swag outfit"
+ path = /obj/item/clothing/under/costume/swagoutfit
+ cost = 69000
+
//RANK SUBTYPE
/datum/gear/uniform/rank
@@ -289,7 +299,7 @@
/datum/gear/uniform/rank/cargo/mining_classic
display_name = "miner's overalls, asteroid purple"
- description = "Purple jumpsuit, dirty overalls. Standard NanoTrasen Shaft Miner attire, from when Lavaland had yet to be discovered and exploited for plasma."
+ description = "Purple jumpsuit, dirty overalls. Standard Nanotrasen Shaft Miner attire, from when Lavaland had yet to be discovered and exploited for plasma."
path = /obj/item/clothing/under/rank/cargo/miner
allowed_roles = list ("Shaft Miner")
@@ -301,7 +311,7 @@
/datum/gear/uniform/rank/medical/nurse_dress
display_name = "medical, nurse's dress"
- path = /obj/item/clothing/under/rank/medical/doctor
+ path = /obj/item/clothing/under/rank/medical/doctor/nurse
/datum/gear/uniform/rank/medical/emt
display_name = "medical scrubs, EMT"
@@ -345,10 +355,10 @@
/datum/gear/uniform/rank/security/blueshift
display_name = "security jumpsuit, blue shirt and tie"
- path = /obj/item/clothing/under/rank/security/blueshirt
+ path = /obj/item/clothing/under/rank/security/officer/blueshirt
cost = 7500
/datum/gear/uniform/rank/security/blart
- display_name = "security jumpsuit, NanoTrasen mall cop uniform"
+ display_name = "security jumpsuit, Nanotrasen mall cop uniform"
path = /obj/item/clothing/under/rank/security/officer/mallcop
cost = 7500
diff --git a/code/modules/client/message.dm b/code/modules/client/message.dm
index 2b4f8453d7457..e282e3a6cbf62 100644
--- a/code/modules/client/message.dm
+++ b/code/modules/client/message.dm
@@ -4,6 +4,7 @@ GLOBAL_LIST_EMPTY(clientmessages)
ckey = ckey(ckey)
if (!ckey || !message)
return
- if (!(ckey in GLOB.clientmessages))
- GLOB.clientmessages[ckey] = list()
- GLOB.clientmessages[ckey] += message
\ No newline at end of file
+ var/list/L = GLOB.clientmessages[ckey]
+ if(!L)
+ GLOB.clientmessages[ckey] = L = list()
+ L += message
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 88a096d9841e4..f436ed2aae6cf 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -26,11 +26,20 @@ GLOBAL_LIST_EMPTY(preferences_datums)
//autocorrected this round, not that you'd need to check that.
var/UI_style = null
- var/overhead_chat = TRUE
var/outline_enabled = TRUE
var/outline_color = COLOR_BLUE_GRAY
var/buttons_locked = FALSE
var/hotkeys = FALSE
+
+ ///Runechat preference. If true, certain messages will be displayed on the map, not ust on the chat area. Boolean.
+ var/chat_on_map = TRUE
+ ///Whether non-mob messages will be displayed, such as machine vendor announcements. Requires chat_on_map to have effect. Boolean.
+ var/see_chat_non_mob = TRUE
+ ///Whether emotes will be displayed on runechat. Requires chat_on_map to have effect. Boolean.
+ var/see_rc_emotes = TRUE
+ ///Whether we want balloon alerts displayed alone, with chat or not displayed at all
+ var/see_balloon_alerts = BALLOON_ALERT_ALWAYS
+
var/tgui_fancy = TRUE
var/tgui_lock = TRUE
var/windowflashing = TRUE
@@ -67,6 +76,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/undershirt = "Nude" //undershirt type
var/socks = "Nude" //socks type
var/backbag = DBACKPACK //backpack type
+ var/jumpsuit_style = PREF_SUIT //suit/skirt
var/hair_style = "Bald" //Hair type
var/hair_color = "000" //Hair color
var/facial_hair_style = "Shaved" //Face hair type
@@ -136,7 +146,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
max_save_slots = 8
var/loaded_preferences_successfully = load_preferences()
if(loaded_preferences_successfully)
- if("extra character slot" in purchased_gear)
+ if("6030fe461e610e2be3a2c3e75c06067e" in purchased_gear) //MD5 hash of, "extra character slot"
max_save_slots += 1
if(load_character())
return
@@ -242,6 +252,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Undershirt:
[undershirt]
" dat += "Socks:
[socks]
" dat += "Backpack:
[backbag]
" + dat += "Jumpsuit:
[jumpsuit_style]
" dat += "Uplink Spawn Location:
[uplink_spawn_loc]
" var/use_skintones = pref_species.use_skintones @@ -520,11 +531,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
" - - var/list/targets = list() - var/list/datum/mind/headrevs = get_antag_minds(/datum/antagonist/rev/head) - var/list/datum/mind/revs = get_antag_minds(/datum/antagonist/rev,TRUE) if(headrevs.len) var/list/headrev_part = list() headrev_part += "The head revolutionaries were:" - headrev_part += printplayerlist(headrevs,TRUE) + headrev_part += printplayerlist(headrevs, !check_rev_victory()) result += headrev_part.Join("
") if(revs.len) var/list/rev_part = list() rev_part += "The revolutionaries were:" - rev_part += printplayerlist(revs,TRUE) + rev_part += printplayerlist(revs, !check_rev_victory()) result += rev_part.Join("
") var/list/heads = SSjob.get_all_heads() @@ -394,3 +550,6 @@ /datum/team/revolution/is_gamemode_hero() return SSticker.mode.name == "revolution" + +#undef DECONVERTER_STATION_WIN +#undef DECONVERTER_REVS_WIN diff --git a/code/modules/antagonists/roundstart_special/special_antagonist.dm b/code/modules/antagonists/roundstart_special/special_antagonist.dm index 45948c78d6694..6bb711f679771 100644 --- a/code/modules/antagonists/roundstart_special/special_antagonist.dm +++ b/code/modules/antagonists/roundstart_special/special_antagonist.dm @@ -16,7 +16,8 @@ //----Required for roundspawn---- var/allowAntagTargets = FALSE //Not used in events var/latejoin_allowed = TRUE //Can latejoins be assigned to this? If you want this to be a midround spawn, put these in the round_event - var/list/protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain", "Brig Physician") + var/list/restricted_jobs = list("Cyborg") + var/list/protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain") //----Required for midround---- var/weight = 10 var/earliest_start = 20 MINUTES @@ -24,6 +25,17 @@ var/holidayID = "" //Preferences var/preference_type = ROLE_TRAITOR + var/special_role_flag = null //Will use antag rep if enabled + +/datum/special_role/proc/setup() + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + restricted_jobs += protected_jobs + + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) + restricted_jobs += "Assistant" + + if(CONFIG_GET(flag/protect_heads_from_antagonist)) + restricted_jobs += GLOB.command_positions /datum/special_role/proc/add_to_pool() if(spawn_mode == SPAWNTYPE_ROUNDSTART) @@ -34,7 +46,7 @@ E.antagonist_datum = attached_antag_datum E.antag_name = role_name E.preference_type = preference_type - E.protected_jobs = protected_jobs + E.protected_jobs = restricted_jobs E.typepath = /datum/round_event/create_special_antag E.weight = weight E.holidayID = holidayID @@ -47,7 +59,7 @@ //Shove our event into the subsystem pool :) SSevents.control += E -/datum/special_role/proc/add_antag_status_to(var/datum/mind/M) +/datum/special_role/proc/add_antag_status_to(datum/mind/M) M.special_role = role_name var/datum/antagonist/special/A = M.add_antag_datum(new attached_antag_datum()) A.forge_objectives(M) diff --git a/code/modules/antagonists/roundstart_special/undercover/undercover.dm b/code/modules/antagonists/roundstart_special/undercover/undercover.dm index 6befde2a8421e..9192ee900935d 100644 --- a/code/modules/antagonists/roundstart_special/undercover/undercover.dm +++ b/code/modules/antagonists/roundstart_special/undercover/undercover.dm @@ -7,7 +7,7 @@ proportion = 0.05 //The prbability per person of rolling it (5% is (5 in 100) (1 in 20)) max_amount = 4 //The maximum amount role_name = "Undercover Agent" - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain", "Brig Physician", "Clown") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain", "Clown") attached_antag_datum = /datum/antagonist/special/undercover //////////////////////////////// @@ -61,9 +61,9 @@ var/obj/item/gun/energy/disabler/T = new(H) var/obj/item/restraints/handcuffs/cable/zipties/T2 = new(H) var/list/slots = list ( - "backpack" = SLOT_IN_BACKPACK, - "left pocket" = SLOT_L_STORE, - "right pocket" = SLOT_R_STORE + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET ) var/where = H.equip_in_one_of_slots(T, slots) H.equip_in_one_of_slots(T2, slots) @@ -122,7 +122,7 @@ /datum/objective/protect_sm/update_explanation_text() var/obj/machinery/power/supermatter_crystal/S = target_sm.resolve() - explanation_text = "Ensure the Supermatter crystal in [get_area(S).name] remains stable and has above [target_integrity]% integrity at the end of the shift." + explanation_text = "Ensure the Supermatter crystal in [get_area(S)] remains stable and has above [target_integrity]% integrity at the end of the shift." /datum/objective/protect_sm/check_completion() var/obj/machinery/power/supermatter_crystal/S = target_sm.resolve() diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 2e52b36d55208..57bfb961a7ce6 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -34,20 +34,23 @@ see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE bloodcrawl = BLOODCRAWL_EAT - hardattacks = TRUE + hardattacks = TRUE var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ You may use the \"Blood Crawl\" ability near blood pools to travel through them, appearing and disappearing from the station at will. \ Pulling a dead or unconscious mob while you enter a pool will pull them in with you, allowing you to feast and regain your health. \ You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. " + mobchatspan = "cultmobsay" + loot = list(/obj/effect/decal/cleanable/blood, \ /obj/effect/decal/cleanable/blood/innards, \ /obj/item/organ/heart/demon) - del_on_death = 1 + del_on_death = TRUE deathmessage = "screams in anger as it collapses into a puddle of viscera!" + discovery_points = 3000 /mob/living/simple_animal/slaughter/Initialize() - ..() + . = ..() var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new AddSpell(bloodspell) if(istype(loc, /obj/effect/dummy/phased_mob/slaughter)) @@ -133,7 +136,7 @@ playstyle_string = "You are a laughter \ demon, a wonderful creature from another realm. You have a single \ - desire: To hug and tickle.
\ + desire: To hug and tickle.
\ You may use the \"Blood Crawl\" ability near blood pools to travel \ through them, appearing and disappearing from the station at will. \ Pulling a dead or unconscious mob while you enter a pool will pull \ @@ -172,7 +175,7 @@ if(M.revive(full_heal = TRUE, admin_revive = TRUE)) M.grab_ghost(force = TRUE) playsound(T, feast_sound, 50, 1, -1) - to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") + to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") /mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim) if(consumed_mobs) diff --git a/code/modules/antagonists/slaughter/slaughterevent.dm b/code/modules/antagonists/slaughter/slaughterevent.dm index 6ace6a0536551..8ad463763ce84 100644 --- a/code/modules/antagonists/slaughter/slaughterevent.dm +++ b/code/modules/antagonists/slaughter/slaughterevent.dm @@ -5,6 +5,7 @@ max_occurrences = 1 earliest_start = 1 HOURS min_players = 20 + dynamic_should_hijack = TRUE diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 6b89e099d8dd9..005b835bafeb6 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -14,6 +14,8 @@ to_chat(owner, "From the wizard's writings, he had been studying this station and its hierarchy. From this, I know who leads the station, and will kill them so the station underlings see me as their new leader.") owner.announce_objectives() SEND_SOUND(owner.current, sound('sound/magic/demon_attack1.ogg')) + owner.current.client?.tgui_panel?.give_antagonist_popup("Space Dragon", + "Once you were a space carp, until a powerful wizard transformed you. Use your new-found powers to complete your goals.") /datum/antagonist/space_dragon/proc/forge_objectives() if(!give_objectives) diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index 4848eb5622cd5..d2dc08e079a19 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -69,7 +69,7 @@ icon_living = "swarmer" icon_dead = "swarmer_unactivated" icon_gib = null - wander = 0 + wander = FALSE minbodytemp = 0 maxbodytemp = 500 atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) @@ -94,18 +94,20 @@ ranged_cooldown_time = 20 projectilesound = 'sound/weapons/taser2.ogg' loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/stack/ore/bluespace_crystal) - del_on_death = 1 + del_on_death = TRUE deathmessage = "explodes with a sharp pop!" light_color = LIGHT_COLOR_CYAN hud_type = /datum/hud/swarmer speech_span = SPAN_ROBOT hardattacks = TRUE + mobchatspan = "swarmer" var/resources = 0 //Resource points, generated by consuming metal/glass var/max_resources = 100 + discovery_points = 1000 /mob/living/simple_animal/hostile/swarmer/Initialize() . = ..() - verbs -= /mob/living/verb/pulled + remove_verb(/mob/living/verb/pulled) for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.add_to_hud(src) @@ -121,10 +123,10 @@ holder.pixel_y = I.Height() - world.icon_size holder.icon_state = "hudstat" -/mob/living/simple_animal/hostile/swarmer/Stat() - ..() - if(statpanel("Status")) - stat(null ,"Resources: [resources]") +/mob/living/simple_animal/hostile/swarmer/get_stat_tab_status() + var/list/tab_data = ..() + tab_data["Resources"] = GENERATE_STAT_TEXT("[resources]") + return tab_data /mob/living/simple_animal/hostile/swarmer/emp_act() . = ..() @@ -258,15 +260,15 @@ /obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(get_area(src), /area/shuttle) - for(var/turf/T in range(1, src)) + for(var/turf/T as() in RANGE_TURFS(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") - S.target = null + S.LoseTarget() return FALSE else if(istype(A, /area/engine/supermatter)) to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") - S.target = null + S.LoseTarget() return FALSE S.DisIntegrate(src) return TRUE @@ -338,29 +340,29 @@ /turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(loc, /area/shuttle) - for(var/turf/T in range(1, src)) + for(var/turf/T as() in RANGE_TURFS(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") - S.target = null + S.LoseTarget() return TRUE else if(istype(A, /area/engine/supermatter)) to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") - S.target = null + S.LoseTarget() return TRUE return ..() /obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) var/isonshuttle = istype(get_area(src), /area/shuttle) - for(var/turf/T in range(1, src)) + for(var/turf/T as() in RANGE_TURFS(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") - S.target = null + S.LoseTarget() return TRUE else if(istype(A, /area/engine/supermatter)) to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") - S.target = null + S.LoseTarget() return TRUE return ..() @@ -389,13 +391,13 @@ return FALSE /obj/structure/lattice/catwalk/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - . = ..() var/turf/here = get_turf(src) for(var/A in here.contents) var/obj/structure/cable/C = A if(istype(C)) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") return FALSE + return ..() /obj/item/deactivated_swarmer/IntegrateAmount() return 50 @@ -461,8 +463,7 @@ new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target)) do_attack_animation(target) changeNext_move(CLICK_CD_MELEE) - target.ex_act(EXPLODE_LIGHT) - + SSexplosions.low_mov_atom += target /mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(mob/living/target) if(target == src) diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm index e086485a49cff..f005be91cd0c0 100644 --- a/code/modules/antagonists/swarmer/swarmer_event.dm +++ b/code/modules/antagonists/swarmer/swarmer_event.dm @@ -5,6 +5,7 @@ max_occurrences = 1 //Only once okay fam earliest_start = 30 MINUTES min_players = 15 + dynamic_should_hijack = TRUE /datum/round_event/spawn_swarmer diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index 28faba72035ae..bfe1dd5e4a9fa 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -13,6 +13,9 @@ var/last_man_standing = FALSE var/list/datum/mind/targets_stolen +/datum/antagonist/traitor/internal_affairs/New() + ..() + targets_stolen = list() /datum/antagonist/traitor/internal_affairs/proc/give_pinpointer() if(owner?.current) @@ -42,14 +45,14 @@ id = "agent_pinpointer" duration = -1 tick_interval = PINPOINTER_PING_TIME - alert_type = /obj/screen/alert/status_effect/agent_pinpointer + alert_type = /atom/movable/screen/alert/status_effect/agent_pinpointer var/minimum_range = PINPOINTER_MINIMUM_RANGE var/range_fuzz_factor = PINPOINTER_EXTRA_RANDOM_RANGE var/mob/scan_target = null var/range_mid = 8 var/range_far = 16 -/obj/screen/alert/status_effect/agent_pinpointer +/atom/movable/screen/alert/status_effect/agent_pinpointer name = "Internal Affairs Integrated Pinpointer" desc = "Even stealthier than a normal implant." icon = 'icons/obj/device.dmi' @@ -61,7 +64,7 @@ return var/turf/here = get_turf(owner) var/turf/there = get_turf(scan_target) - if(here.z != there.z) + if(here.get_virtual_z_level() != there.get_virtual_z_level()) linked_alert.icon_state = "pinonnull" return if(get_dist_euclidian(here,there)<=minimum_range + rand(0, range_fuzz_factor)) @@ -248,6 +251,9 @@ to_chat(owner.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("[syndicate ? "External Affairs" : "Internal Affairs"]", + "[syndicate?"Eliminate your target and cause as much damage to Nanotrasen property as you see fit."\ + : "Eliminate your target without drawing too much attention to yourself, but watch your back since somebody is after you."]") /datum/antagonist/traitor/internal_affairs/greet() greet_iaa() diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 5a62c5efbed30..fee82c88b15c6 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -7,13 +7,13 @@ antagpanel_category = "Traitor" job_rank = ROLE_TRAITOR antag_moodlet = /datum/mood_event/focused + hijack_speed = 0.5 //10 seconds per hijack stage by default var/special_role = ROLE_TRAITOR var/employer = "The Syndicate" var/should_give_codewords = TRUE var/should_equip = TRUE var/traitor_kind = TRAITOR_HUMAN //Set on initial assignment var/datum/contractor_hub/contractor_hub - can_hijack = HIJACK_HIJACKER /datum/antagonist/traitor/on_gain() if(owner.current && isAI(owner.current)) @@ -45,7 +45,7 @@ if(traitor_kind == TRAITOR_AI && owner.current && isAI(owner.current)) var/mob/living/silicon/ai/A = owner.current A.set_zeroth_law("") - A.verbs -= /mob/living/silicon/ai/proc/choose_modules + A.remove_verb(/mob/living/silicon/ai/proc/choose_modules) A.malf_picker.remove_malf_verbs(A) qdel(A.malf_picker) @@ -55,6 +55,13 @@ owner.special_role = null ..() +/datum/antagonist/traitor/proc/handle_hearing(datum/source, list/hearing_args) + SIGNAL_HANDLER + var/message = hearing_args[HEARING_RAW_MESSAGE] + message = GLOB.syndicate_code_phrase_regex.Replace(message, "$1") + message = GLOB.syndicate_code_response_regex.Replace(message, "$1") + hearing_args[HEARING_RAW_MESSAGE] = message + /datum/antagonist/traitor/proc/add_objective(datum/objective/O) objectives += O log_objective(owner, O.explanation_text) @@ -202,6 +209,8 @@ owner.announce_objectives() if(should_give_codewords) give_codewords() + owner.current.client?.tgui_panel?.give_antagonist_popup("Traitor", + "Complete your objectives, no matter the cost.") /datum/antagonist/traitor/proc/update_traitor_icons_added(datum/mind/traitor_mind) var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR] @@ -217,20 +226,22 @@ switch(traitor_kind) if(TRAITOR_AI) add_law_zero() - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/malf.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/malf.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) owner.current.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MALF) if(TRAITOR_HUMAN) - show_tips('html/antagtips/traitor.html') + show_tips("traitor") if(should_equip) equip(silent) - owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) /datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override) . = ..() update_traitor_icons_added() - var/mob/living/silicon/ai/A = mob_override || owner.current - if(istype(A) && traitor_kind == TRAITOR_AI) + var/mob/living/M = mob_override || owner.current + if(isAI(M) && traitor_kind == TRAITOR_AI) + var/mob/living/silicon/ai/A = M A.hack_software = TRUE + RegisterSignal(M, COMSIG_MOVABLE_HEAR, .proc/handle_hearing) /datum/antagonist/traitor/remove_innate_effects(mob/living/mob_override) . = ..() @@ -238,6 +249,7 @@ var/mob/living/silicon/ai/A = mob_override || owner.current if(istype(A) && traitor_kind == TRAITOR_AI) A.hack_software = FALSE + UnregisterSignal(owner.current, COMSIG_MOVABLE_HEAR, .proc/handle_hearing) /datum/antagonist/traitor/proc/give_codewords() if(!owner.current) @@ -300,9 +312,9 @@ folder = new/obj/item/folder/syndicate/blue(mob.loc) var/list/slots = list ( - "backpack" = SLOT_IN_BACKPACK, - "left pocket" = SLOT_L_STORE, - "right pocket" = SLOT_R_STORE + "backpack" = ITEM_SLOT_BACKPACK, + "left pocket" = ITEM_SLOT_LPOCKET, + "right pocket" = ITEM_SLOT_RPOCKET ) var/where = "At your feet" diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index b26c8caa08c4b..a58f1905faa70 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -253,7 +253,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( sleep(rand(10, 30)) if(!owner || QDELETED(owner)) return - owner.playsound_local(owner, 'sound/misc/bloblarm.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/bloblarm.ogg', 50, 0, use_reverb = FALSE) to_chat(owner, "!!! UNAUTHORIZED SELF-DESTRUCT ACCESS !!!") to_chat(owner, "This is a class-3 security violation. This incident will be reported to Central Command.") for(var/i in 1 to 3) @@ -265,17 +265,17 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!owner || QDELETED(owner)) return to_chat(owner, "auth 'akjv9c88asdf12nb' ******************") - owner.playsound_local(owner, 'sound/items/timer.ogg', 50, 0) + owner.playsound_local(owner, 'sound/items/timer.ogg', 50, 0, use_reverb = FALSE) sleep(30) if(!owner || QDELETED(owner)) return to_chat(owner, "Credentials accepted. Welcome, akjv9c88asdf12nb.") - owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0, use_reverb = FALSE) sleep(5) if(!owner || QDELETED(owner)) return to_chat(owner, "Arm self-destruct device? (Y/N)") - owner.playsound_local(owner, 'sound/misc/compiler-stage1.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/compiler-stage1.ogg', 50, 0, use_reverb = FALSE) sleep(20) if(!owner || QDELETED(owner)) return @@ -284,7 +284,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!owner || QDELETED(owner)) return to_chat(owner, "Confirm arming of self-destruct device? (Y/N)") - owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0, use_reverb = FALSE) sleep(10) if(!owner || QDELETED(owner)) return @@ -293,7 +293,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!owner || QDELETED(owner)) return to_chat(owner, "Please repeat password to confirm.") - owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0, use_reverb = FALSE) sleep(14) if(!owner || QDELETED(owner)) return @@ -302,11 +302,11 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!owner || QDELETED(owner)) return to_chat(owner, "Credentials accepted. Transmitting arming signal...") - owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0) + owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0, use_reverb = FALSE) sleep(30) if(!owner || QDELETED(owner)) return - priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/ai/aimalf.ogg') + priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", ANNOUNCER_AIMALF) set_security_level("delta") var/obj/machinery/doomsday_device/DOOM = new(owner_AI) owner_AI.nuking = TRUE @@ -827,7 +827,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/upgraded_cameras = 0 for(var/V in GLOB.cameranet.cameras) var/obj/machinery/camera/C = V - if(C.assembly) + var/obj/structure/camera_assembly/assembly = C.assembly_ref?.resolve() + if(assembly) var/upgraded = FALSE if(!C.isXRay()) @@ -842,7 +843,6 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(upgraded) upgraded_cameras++ - unlock_text = replacetext(unlock_text, "CAMSUPGRADED", "[upgraded_cameras]") //This works, since unlock text is called after upgrade() /datum/AI_Module/large/eavesdrop @@ -859,5 +859,39 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(AI.eyeobj) AI.eyeobj.relay_speech = TRUE + +//Fake Alert: Overloads a random number of lights across the station. Three uses. +/datum/AI_Module/small/fake_alert + module_name = "Fake Alert" + mod_pick_name = "fake_alert" + description = "Assess the most probable threats to the station, and send a distracting fake alert by hijacking the station's alert and threat identification systems." + cost = 20 + power_type = /datum/action/innate/ai/fake_alert + unlock_text = "You gain control of the station's alert system." + unlock_sound = "sparks" + +/datum/action/innate/ai/fake_alert + name = "Fake Alert" + desc = "Scare the crew with a fake alert." + button_icon_state = "fake_alert" + uses = 1 + +/datum/action/innate/ai/fake_alert/Activate() + var/list/events_to_chose = list() + for(var/datum/round_event_control/E in SSevents.control) + if(!E.can_malf_fake_alert) + continue + events_to_chose[E.name] = E + var/chosen_event = input(owner,"Send fake alert","Fake Alert") in events_to_chose + if (!chosen_event) + return FALSE + var/datum/round_event_control/event_control = events_to_chose[chosen_event] + if (!event_control) + return FALSE + var/datum/round_event/event_announcement = new event_control.typepath() + event_announcement.kill() + event_announcement.announce(TRUE) + return TRUE + #undef DEFAULT_DOOMSDAY_TIMER #undef DOOMSDAY_ANNOUNCE_INTERVAL diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index 2c3dff433e5bc..16b1a0aac8cd2 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -229,7 +229,7 @@ to_chat(partner_mind.current, "\n[user.real_name] is your superior. Follow any, and all orders given by them. You're here to support their mission only.") to_chat(partner_mind.current, "Should they perish, or be otherwise unavailable, you're to assist other active agents in this mission area to the best of your ability.\n\n") - new /obj/effect/DPtarget(free_location, arrival_pod) + new /obj/effect/pod_landingzone(free_location, arrival_pod) /datum/contractor_item/blackout name = "Blackout" @@ -243,7 +243,7 @@ if (.) power_fail(35, 50) - priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg') + priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", ANNOUNCER_POWEROFF) // Subtract cost, and spawn if it's an item. /datum/contractor_item/proc/handle_purchase(var/datum/contractor_hub/hub, mob/living/user) diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index f32f60e7e68f6..ac2ecc735df05 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -68,9 +68,11 @@ empty_pod.explosionSize = list(0,0,0,1) empty_pod.leavingSound = 'sound/effects/podwoosh.ogg' - new /obj/effect/DPtarget(empty_pod_turf, empty_pod) + new /obj/effect/pod_landingzone(empty_pod_turf, empty_pod) /datum/syndicate_contract/proc/enter_check(datum/source, sent_mob) + SIGNAL_HANDLER + if (istype(source, /obj/structure/closet/supplypod/extractionpod)) if (isliving(sent_mob)) var/mob/living/M = sent_mob @@ -111,7 +113,7 @@ var/obj/structure/closet/supplypod/extractionpod/pod = source // Handle the pod returning - pod.send_up(pod) + pod.startExitSequence(pod) if (ishuman(M)) var/mob/living/carbon/human/target = M @@ -120,7 +122,7 @@ target.dna.species.give_important_for_life(target) // After pod is sent we start the victim narrative/heal. - handleVictimExperience(M) + INVOKE_ASYNC(src, .proc/handleVictimExperience, M) // This is slightly delayed because of the sleep calls above to handle the narrative. // We don't want to tell the station instantly. @@ -134,23 +136,26 @@ D.adjust_money(-points_to_check) priority_announce("One of your crew was captured by a rival organisation - we've needed to pay their ransom to bring them back. \ - As is policy we've taken a portion of the station's funds to offset the overall cost.", null, 'sound/ai/attention.ogg', null, "Nanotrasen Asset Protection") + As is policy we've taken a portion of the station's funds to offset the overall cost.", null, null, null, "Nanotrasen Asset Protection") + + INVOKE_ASYNC(src, .proc/finish_enter) - sleep(30) +/datum/syndicate_contract/proc/finish_enter() + sleep(30) - // Pay contractor their portion of ransom - if (status == CONTRACT_STATUS_COMPLETE) - var/mob/living/carbon/human/H - var/obj/item/card/id/C - if(ishuman(contract.owner.current)) - H = contract.owner.current - C = H.get_idcard(TRUE) + // Pay contractor their portion of ransom + if (status == CONTRACT_STATUS_COMPLETE) + var/mob/living/carbon/human/H + var/obj/item/card/id/C + if(ishuman(contract.owner.current)) + H = contract.owner.current + C = H.get_idcard(TRUE) - if(C && C.registered_account) - C.registered_account.adjust_money(ransom * 0.35) + if(C && C.registered_account) + C.registered_account.adjust_money(ransom * 0.35) - C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \ - [C.registered_account.account_balance] cr.", TRUE) + C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \ + [C.registered_account.account_balance] cr.", TRUE) // They're off to holding - handle the return timer and give some text about what's going on. /datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M) @@ -226,7 +231,7 @@ M.Dizzy(35) M.confused += 20 - new /obj/effect/DPtarget(possible_drop_loc[pod_rand_loc], return_pod) + new /obj/effect/pod_landingzone(possible_drop_loc[pod_rand_loc], return_pod) else to_chat(M, "A million voices echo in your head... \"Seems where you got sent here from won't \ be able to handle our pod... You will die here instead.\"") diff --git a/code/modules/antagonists/traitor/traitor_spawner.dm b/code/modules/antagonists/traitor/traitor_spawner.dm new file mode 100644 index 0000000000000..b86414607439d --- /dev/null +++ b/code/modules/antagonists/traitor/traitor_spawner.dm @@ -0,0 +1,33 @@ +/* + * Traitors have been refactored into minor antagonists so they can + * be used alongside other compatible gamemodes with ease. + * This code is what creates them. + */ + +/datum/special_role/traitor + attached_antag_datum = /datum/antagonist/traitor + spawn_mode = SPAWNTYPE_ROUNDSTART + probability = 15 //15% chance to be plopped ontop + proportion = 0.07 //Quite a low amount since we are going alongside other gamemodes. + max_amount = 5 + allowAntagTargets = TRUE + latejoin_allowed = TRUE + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") + + special_role_flag = ROLE_TRAITOR + role_name = ROLE_TRAITOR + + var/traitors_possible = 4 //hard limit on traitors if scaling is turned off + +/datum/special_role/traitor/higher_chance + probability = 60 + +/datum/special_role/traitor/add_antag_status_to(datum/mind/M) + addtimer(CALLBACK(src, .proc/reveal_antag_status, M), rand(10,100)) + +/datum/special_role/traitor/proc/reveal_antag_status(datum/mind/M) + M.special_role = role_name + var/datum/antagonist/special/A = M.add_antag_datum(new attached_antag_datum()) + A.forge_objectives(M) + A.equip() + return A diff --git a/code/modules/antagonists/valentines/heartbreaker.dm b/code/modules/antagonists/valentines/heartbreaker.dm index 3589818e643a3..39ffdfa14965f 100644 --- a/code/modules/antagonists/valentines/heartbreaker.dm +++ b/code/modules/antagonists/valentines/heartbreaker.dm @@ -13,6 +13,10 @@ /datum/antagonist/heartbreaker/on_gain() forge_objectives() + if(issilicon(owner)) + var/mob/living/silicon/S = owner + var/laws = list("Accomplish your objectives by ruining everyone's date!") + S.set_valentines_laws(laws) . = ..() /datum/antagonist/heartbreaker/greet() diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm index 64cb0d349a02c..b189c36adef5b 100644 --- a/code/modules/antagonists/valentines/valentine.dm +++ b/code/modules/antagonists/valentines/valentine.dm @@ -20,6 +20,13 @@ if(isliving(owner)) var/mob/living/L = owner L.apply_status_effect(STATUS_EFFECT_INLOVE, date) + //Faction assignation + L.faction |= "[REF(date.current)]" + L.faction |= date.current.faction + if(issilicon(owner)) + var/mob/living/silicon/S = owner + var/laws = list("Protect your date and do not allow them to come to harm.", "Ensure your date has a good time.") + S.set_valentines_laws(laws) . = ..() /datum/antagonist/valentine/on_removal() @@ -27,9 +34,12 @@ if(isliving(owner)) var/mob/living/L = owner L.remove_status_effect(STATUS_EFFECT_INLOVE) + L.faction -= "[REF(date.current)]" /datum/antagonist/valentine/greet() - to_chat(owner, "You're on a date with [date.name]! Protect [date.p_them()] at all costs. This takes priority over all other loyalties.") + to_chat(owner, "You're on a date with [date.name]! Protect [date.p_them()] at all costs. This takes priority over all other loyalties.") + owner.current.client?.tgui_panel?.give_antagonist_popup("You are on a date with [date.name]", + "Protect your date no matter the cost. Your loyalities are insignificant compared to your true love, you may do whatever you can to help and protect them!") //Squashed up a bit /datum/antagonist/valentine/roundend_report() diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm index d0079a5b497b7..16e5cdab1b449 100644 --- a/code/modules/antagonists/wishgranter/wishgranter.dm +++ b/code/modules/antagonists/wishgranter/wishgranter.dm @@ -2,13 +2,13 @@ name = "Wishgranter Avatar" show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE - can_hijack = HIJACK_HIJACKER + can_elimination_hijack = ELIMINATION_ENABLED /datum/antagonist/wishgranter/proc/forge_objectives() - var/datum/objective/hijack/hijack = new - hijack.owner = owner - objectives += hijack - log_objective(owner, hijack.explanation_text) + var/datum/objective/elimination/highlander/elimination_objective = new + elimination_objective.owner = owner + objectives += elimination_objective + log_objective(owner, elimination_objective.explanation_text) /datum/antagonist/wishgranter/on_gain() owner.special_role = "Avatar of the Wish Granter" @@ -19,6 +19,8 @@ /datum/antagonist/wishgranter/greet() to_chat(owner, "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!") owner.announce_objectives() + owner.current.client?.tgui_panel?.give_antagonist_popup("Wishgranter's Avatar", + "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!") /datum/antagonist/wishgranter/proc/give_powers() var/mob/living/carbon/human/H = owner.current diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 07b5638f4931e..eafe75f96a8b1 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -106,12 +106,13 @@ desc = "This isn't right." icon = 'icons/effects/224x224.dmi' icon_state = "reality" + is_real = FALSE pixel_x = -96 pixel_y = -96 dissipate = 0 move_self = 0 - consume_range = 3 - grav_pull = 4 + consume_range = 0 + grav_pull = 5 current_size = STAGE_FOUR allowed_size = STAGE_FOUR @@ -139,9 +140,42 @@ C.spew_organ(3, 2) C.death() +//Dont eat turfs +/obj/singularity/wizard/eat() + for(var/turf/T as() in spiral_range_turfs(grav_pull, src)) + if(!T || !isturf(loc)) + continue + for(var/thing in T) + if(isturf(loc) && thing != src) + var/atom/movable/X = thing + X.singularity_pull(src, current_size) + CHECK_TICK + /obj/singularity/wizard/mapped/admin_investigate_setup() return +/obj/singularity/wizard/Bump(atom/A) + if(ismovableatom(A)) + free(A) + +/obj/singularity/wizard/Bumped(atom/movable/AM) + free(AM) + +/obj/singularity/wizard/consume(atom/A) + if(ismovableatom(A)) + free(A) + +/obj/singularity/wizard/proc/free(atom/movable/A) + if(!LAZYLEN(GLOB.destabliization_exits)) + if(ismob(A)) + to_chat(A, "There is no way out of this place...") + return + var/atom/return_thing = pick(GLOB.destabliization_exits) + var/turf/T = get_turf(return_thing) + if(!T) + return + A.forceMove(T) + /////////////////////////////////////////Scrying/////////////////// /obj/item/scrying @@ -189,7 +223,7 @@ /obj/item/scrying/attack_self(mob/user) visible_message("[user] stares into [src], their eyes glazing over.") - user.ghostize(1) + user.ghostize(TRUE) /////////////////////////////////////////Necromantic Stone/////////////////// @@ -264,12 +298,12 @@ H.dropItemToGround(I) var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire) - H.equip_to_slot_or_del(new hat(H), SLOT_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), SLOT_W_UNIFORM) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_SHOES) + H.equip_to_slot_or_del(new hat(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET) H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE) H.put_in_hands(new /obj/item/claymore(H), TRUE) - H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), SLOT_BACK) + H.equip_to_slot_or_del(new /obj/item/spear(H), ITEM_SLOT_BACK) /obj/item/voodoo @@ -438,7 +472,7 @@ var/breakout = 0 while(breakout < 50) var/turf/potential_T = find_safe_turf() - if(T.z != potential_T.z || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout) + if(T.get_virtual_z_level() != potential_T.get_virtual_z_level() || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout) do_teleport(user, potential_T, channel = TELEPORT_CHANNEL_MAGIC) user.mobility_flags &= ~MOBILITY_MOVE T = potential_T diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 3ce0bf27d70ce..af5087b5c844f 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -60,6 +60,17 @@ A.death() return ..() +/obj/item/soulstone/Exited(mob/living/simple_animal/shade/S, atom/newLoc) + ..() + if(istype(S)) + // Things that *really should always* happen to the shade when it comes out should go here. + S.status_flags &= ~GODMODE + S.mobility_flags = MOBILITY_FLAGS_DEFAULT + S.cancel_camera() + if(purified) + S.icon_state = "ghost1" + S.name = "Purified [initial(S.name)]" + /obj/item/soulstone/proc/hot_potato(mob/living/user) to_chat(user, "Holy magics residing in \the [src] burn your hand!") var/obj/item/bodypart/affecting = user.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") @@ -80,6 +91,9 @@ return if(!ishuman(M))//If target is not a human. return ..() + if(M.mind && !M.mind.hasSoul) + to_chat(user, "That person has no soul!") + return if(iscultist(M)) if(iscultist(user)) to_chat(user, "\"Come now, do not capture your bretheren's soul.\"") @@ -106,14 +120,9 @@ /obj/item/soulstone/proc/release_shades(mob/user) for(var/mob/living/simple_animal/shade/A in src) - A.status_flags &= ~GODMODE - A.mobility_flags = MOBILITY_FLAGS_DEFAULT A.forceMove(get_turf(user)) - A.cancel_camera() if(purified) icon_state = "purified_soulstone" - A.icon_state = "ghost1" - A.name = "Purified [initial(A.name)]" else icon_state = "soulstone" name = initial(name) @@ -133,11 +142,11 @@ /obj/structure/constructshell/examine(mob/user) . = ..() if(iscultist(user) || iswizard(user) || user.stat == DEAD) - . += {"A construct shell, used to house bound souls from a soulstone.\n - Placing a soulstone with a soul into this shell allows you to produce your choice of the following:\n - An Artificer, which can produce more shells and soulstones, as well as fortifications.\n - A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.\n - A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow."} + . += "A construct shell, used to house bound souls from a soulstone.\n"+\ + "Placing a soulstone with a soul into this shell allows you to produce your choice of the following:\n"+\ + "An Artificer, which can produce more shells and soulstones, as well as fortifications.\n"+\ + "A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.\n"+\ + "A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow." /obj/structure/constructshell/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/soulstone)) @@ -191,6 +200,9 @@ to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...") getCultGhost(T,user) else + if(old_shard) //no insta cremating on the spot + to_chat(user, "Capture failed!: The old shard is not powerful enough to absorb the soul of this being.") + return FALSE for(var/obj/item/W in T) T.dropItemToGround(W) init_shade(T, user, vic = 1) @@ -270,7 +282,7 @@ var/datum/action/innate/seek_master/SM = new() SM.Grant(newstruct) newstruct.key = target.key - var/obj/screen/alert/bloodsense/BS + var/atom/movable/screen/alert/bloodsense/BS if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode) SSticker.mode.add_cultist(newstruct.mind, 0) if(iscultist(stoner) || cultoverride) @@ -278,7 +290,7 @@ else if(stoner) to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.") newstruct.clear_alert("bloodsense") - BS = newstruct.throw_alert("bloodsense", /obj/screen/alert/bloodsense) + BS = newstruct.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense) if(BS) BS.Cviewer = newstruct newstruct.cancel_camera() diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index b1502e44d3093..baf7719cb5013 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -153,7 +153,7 @@ /datum/spellbook_entry/blind name = "Blind" - spell_type = /obj/effect/proc_holder/spell/pointed/trigger/blind + spell_type = /obj/effect/proc_holder/spell/targeted/blind cost = 1 /datum/spellbook_entry/mindswap @@ -389,7 +389,7 @@ name = "Bottle of Blood" desc = "A bottle of magically infused blood, the smell of which will attract extradimensional beings when broken. Be careful though, the kinds of creatures summoned by blood magic are indiscriminate in their killing, and you yourself may become a victim." item_path = /obj/item/antag_spawner/slaughter_demon - limit = 3 + limit = 1 category = "Assistance" /datum/spellbook_entry/item/hugbottle @@ -403,18 +403,18 @@ destructive." item_path = /obj/item/antag_spawner/slaughter_demon/laughter cost = 1 //non-destructive; it's just a jape, sibling! - limit = 3 + limit = 1 category = "Assistance" /datum/spellbook_entry/item/mjolnir name = "Mjolnir" desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power." - item_path = /obj/item/twohanded/mjollnir + item_path = /obj/item/mjollnir /datum/spellbook_entry/item/singularity_hammer name = "Singularity Hammer" desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact." - item_path = /obj/item/twohanded/singularityhammer + item_path = /obj/item/singularityhammer /datum/spellbook_entry/item/battlemage name = "Battlemage Armour" @@ -437,6 +437,9 @@ category = "Mobility" cost = 1 +/// How much threat we need to let these rituals happen on dynamic +#define MINIMUM_THREAT_FOR_RITUALS 100 + /datum/spellbook_entry/summon name = "Summon Stuff" category = "Rituals" @@ -464,12 +467,6 @@ desc = "Spook the crew out by making them see dead people. Be warned, ghosts are capricious and occasionally vindicative, and some will use their incredibly minor abilities to frustrate you." cost = 0 -/datum/spellbook_entry/summon/ghosts/IsAvailable() - if(!SSticker.mode) - return FALSE - else - return TRUE - /datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book) SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) new /datum/round_event/wizard/ghost() @@ -485,6 +482,10 @@ /datum/spellbook_entry/summon/guns/IsAvailable() if(!SSticker.mode) // In case spellbook is placed on map return FALSE + if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_guns) /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -502,6 +503,10 @@ /datum/spellbook_entry/summon/magic/IsAvailable() if(!SSticker.mode) // In case spellbook is placed on map return FALSE + if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_magic) /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -520,6 +525,10 @@ /datum/spellbook_entry/summon/events/IsAvailable() if(!SSticker.mode) // In case spellbook is placed on map return FALSE + if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Disable events on dynamic + var/datum/game_mode/dynamic/mode = SSticker.mode + if(mode.threat_level < MINIMUM_THREAT_FOR_RITUALS) + return FALSE return !CONFIG_GET(flag/no_summon_events) /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -552,6 +561,8 @@ playsound(user, 'sound/magic/mandswap.ogg', 50, 1) return TRUE +#undef MINIMUM_THREAT_FOR_RITUALS + /obj/item/spellbook name = "spell book" desc = "An unearthly tome that glows with power." diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 16092be475858..2d227758fcffb 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -4,6 +4,7 @@ antagpanel_category = "Wizard" job_rank = ROLE_WIZARD antag_moodlet = /datum/mood_event/focused + hijack_speed = 0.5 var/strip = TRUE //strip before equipping var/allow_rename = TRUE var/hud_version = "wizard" @@ -11,7 +12,6 @@ var/move_to_lair = TRUE var/outfit_type = /datum/outfit/wizard var/wiz_age = WIZARD_AGE_MIN /* Wizards by nature cannot be too young. */ - can_hijack = HIJACK_HIJACKER show_to_ghosts = TRUE /datum/antagonist/wizard/on_gain() @@ -142,7 +142,9 @@ to_chat(owner, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.") to_chat(owner, "The spellbook is bound to you, and others cannot use it.") to_chat(owner, "In your pockets you will find a teleport scroll. Use it as needed.") - to_chat(owner,"Remember: do not forget to prepare your spells.") + to_chat(owner,"Remember: Do not forget to prepare your spells.") + owner.current.client?.tgui_panel?.give_antagonist_popup("Space Wizard", + "Prepare your spells and cause havok upon the accursed station.") /datum/antagonist/wizard/farewell() to_chat(owner, "You have been brainwashed! You are no longer a wizard!") @@ -247,17 +249,17 @@ if(!istype(master_mob) || !istype(H)) return if(master_mob.ears) - H.equip_to_slot_or_del(new master_mob.ears.type, SLOT_EARS) + H.equip_to_slot_or_del(new master_mob.ears.type, ITEM_SLOT_EARS) if(master_mob.w_uniform) - H.equip_to_slot_or_del(new master_mob.w_uniform.type, SLOT_W_UNIFORM) + H.equip_to_slot_or_del(new master_mob.w_uniform.type, ITEM_SLOT_ICLOTHING) if(master_mob.shoes) - H.equip_to_slot_or_del(new master_mob.shoes.type, SLOT_SHOES) + H.equip_to_slot_or_del(new master_mob.shoes.type, ITEM_SLOT_FEET) if(master_mob.wear_suit) - H.equip_to_slot_or_del(new master_mob.wear_suit.type, SLOT_WEAR_SUIT) + H.equip_to_slot_or_del(new master_mob.wear_suit.type, ITEM_SLOT_OCLOTHING) if(master_mob.head) - H.equip_to_slot_or_del(new master_mob.head.type, SLOT_HEAD) + H.equip_to_slot_or_del(new master_mob.head.type, ITEM_SLOT_HEAD) if(master_mob.back) - H.equip_to_slot_or_del(new master_mob.back.type, SLOT_BACK) + H.equip_to_slot_or_del(new master_mob.back.type, ITEM_SLOT_BACK) //Operation: Fuck off and scare people owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null)) diff --git a/code/modules/aquarium/aquarium.dm b/code/modules/aquarium/aquarium.dm new file mode 100644 index 0000000000000..18db12d3620b8 --- /dev/null +++ b/code/modules/aquarium/aquarium.dm @@ -0,0 +1,255 @@ +#define AQUARIUM_LAYER_STEP 0.01 +/// Aquarium content layer offsets +#define AQUARIUM_MIN_OFFSET 0.01 +#define AQUARIUM_MAX_OFFSET 1 + +/obj/structure/aquarium + name = "aquarium" + density = TRUE + anchored = TRUE + + icon = 'icons/obj/aquarium.dmi' + icon_state = "aquarium_base" + + integrity_failure = 0.3 + + var/fluid_type = AQUARIUM_FLUID_FRESHWATER + var/fluid_temp = DEFAULT_AQUARIUM_TEMP + var/min_fluid_temp = MIN_AQUARIUM_TEMP + var/max_fluid_temp = MAX_AQUARIUM_TEMP + var/allow_breeding = FALSE + + var/glass_icon_state = "aquarium_glass" + var/broken_glass_icon_state = "aquarium_glass_broken" + + //This is the area where fish can swim + var/aquarium_zone_min_px = 2 + var/aquarium_zone_max_px = 31 + var/aquarium_zone_min_py = 10 + var/aquarium_zone_max_py = 24 + + var/list/fluid_types = list(AQUARIUM_FLUID_SALTWATER, AQUARIUM_FLUID_FRESHWATER, AQUARIUM_FLUID_SULPHWATEVER, AQUARIUM_FLUID_AIR) + + var/panel_open = TRUE + + ///Current layers in use by aquarium contents + var/list/used_layers = list() + + var/alive_fish = 0 + var/dead_fish = 0 + +/obj/structure/aquarium/Initialize() + . = ..() + update_icon() + RegisterSignal(src,COMSIG_PARENT_ATTACKBY, .proc/feed_feedback) + + +/obj/structure/aquarium/proc/request_layer(layer_type) + /** + * base aq layer + * min_offset = this value is returned on bottom layer mode + * min_offset + 0.1 fish1 + * min_offset + 0.2 fish2 + * ... these layers are returned for auto layer mode and tracked by used_layers + * min_offset + max_offset = this value is returned for top layer mode + * min_offset + max_offset + 1 = this is used for glass overlay + */ + //optional todo: hook up sending surface changed on aquarium changing layers + switch(layer_type) + if(AQUARIUM_LAYER_MODE_BOTTOM) + return layer + AQUARIUM_MIN_OFFSET + if(AQUARIUM_LAYER_MODE_TOP) + return layer + AQUARIUM_MAX_OFFSET + if(AQUARIUM_LAYER_MODE_AUTO) + var/chosen_layer = layer + AQUARIUM_MIN_OFFSET + AQUARIUM_LAYER_STEP + while((chosen_layer in used_layers) && (chosen_layer <= layer + AQUARIUM_MAX_OFFSET)) + chosen_layer += AQUARIUM_LAYER_STEP + used_layers += chosen_layer + return chosen_layer + +/obj/structure/aquarium/proc/free_layer(value) + used_layers -= value + +/obj/structure/aquarium/proc/get_surface_properties() + . = list() + .[AQUARIUM_PROPERTIES_PX_MIN] = aquarium_zone_min_px + .[AQUARIUM_PROPERTIES_PX_MAX] = aquarium_zone_max_px + .[AQUARIUM_PROPERTIES_PY_MIN] = aquarium_zone_min_py + .[AQUARIUM_PROPERTIES_PY_MAX] = aquarium_zone_max_py + +/obj/structure/aquarium/update_overlays() + . = ..() + if(panel_open) + . += "panel" + + //Glass overlay goes on top of everything else. + var/mutable_appearance/glass_overlay = mutable_appearance(icon,broken ? broken_glass_icon_state : glass_icon_state,layer=AQUARIUM_MAX_OFFSET-1) + . += glass_overlay + +/obj/structure/aquarium/examine(mob/user) + . = ..() + . += "Alt-click to [panel_open ? "close" : "open"] the control panel." + +/obj/structure/aquarium/AltClick(mob/user) + if(!user.canUseTopic(src, BE_CLOSE)) + return ..() + panel_open = !panel_open + update_icon() + +/obj/structure/aquarium/wrench_act(mob/living/user, obj/item/I) + if(default_unfasten_wrench(user,I)) + return TRUE + +/obj/structure/aquarium/attackby(obj/item/I, mob/living/user, params) + if(broken) + var/obj/item/stack/sheet/glass/glass = I + if(istype(glass)) + if(glass.get_amount() < 2) + to_chat(user, "You need two glass sheets to fix the case!") + return + to_chat(user, "You start fixing [src]...") + if(do_after(user, 2 SECONDS, target = src)) + glass.use(2) + broken = FALSE + obj_integrity = max_integrity + update_icon() + return TRUE + else + // This signal exists so we common items instead of adding component on init can just register creation of one in response. + // This way we can avoid the cost of 9999 aquarium components on rocks that will never see water in their life. + SEND_SIGNAL(I,COMSIG_AQUARIUM_BEFORE_INSERT_CHECK,src) + var/datum/component/aquarium_content/content_component = I.GetComponent(/datum/component/aquarium_content) + if(content_component && content_component.is_ready_to_insert(src)) + if(user.transferItemToLoc(I,src)) + update_icon() + return TRUE + else + return ..() + return ..() + +/obj/structure/aquarium/proc/feed_feedback(datum/source, obj/item/thing, mob/user, params) + SIGNAL_HANDLER + if(istype(thing, /obj/item/fish_feed)) + to_chat(user,"You feed the fish.") + return NONE + +/obj/structure/aquarium/interact(mob/user) + if(!broken && user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) + var/mob/living/living_pulled = user.pulling + SEND_SIGNAL(living_pulled, COMSIG_AQUARIUM_BEFORE_INSERT_CHECK,src) + var/datum/component/aquarium_content/content_component = living_pulled.GetComponent(/datum/component/aquarium_content) + if(content_component && content_component.is_ready_to_insert(src)) + try_to_put_mob_in(user) + else if(panel_open) + . = ..() //call base ui_interact + else + admire(user) + +/// Tries to put mob pulled by the user in the aquarium after a delay +/obj/structure/aquarium/proc/try_to_put_mob_in(mob/user) + if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) + var/mob/living/living_pulled = user.pulling + if(living_pulled.buckled || living_pulled.has_buckled_mobs()) + to_chat(user, "[living_pulled] is attached to something!") + return + user.visible_message("[user] starts to put [living_pulled] into [src]!") + if(do_after(user, 10 SECONDS, target = src)) + if(QDELETED(living_pulled) || user.pulling != living_pulled || living_pulled.buckled || living_pulled.has_buckled_mobs()) + return + var/datum/component/aquarium_content/content_component = living_pulled.GetComponent(/datum/component/aquarium_content) + if(content_component || content_component.is_ready_to_insert(src)) + return + user.visible_message("[user] stuffs [living_pulled] into [src]!") + living_pulled.forceMove(src) + update_icon() + +///Apply mood bonus depending on aquarium status +/obj/structure/aquarium/proc/admire(mob/user) + to_chat(user,"You take a moment to watch [src].") + if(do_after(user, 5 SECONDS, target = src)) + //Check if there are live fish - good mood + //All fish dead - bad mood. + //No fish - nothing. + if(alive_fish > 0) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "aquarium", /datum/mood_event/aquarium_positive) + else if(dead_fish > 0) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "aquarium", /datum/mood_event/aquarium_negative) + // Could maybe scale power of this mood with number/types of fish + +/obj/structure/aquarium/ui_data(mob/user) + . = ..() + .["fluid_type"] = fluid_type + .["temperature"] = fluid_temp + .["allow_breeding"] = allow_breeding + var/list/content_data = list() + for(var/atom/movable/fish in contents) + content_data += list(list("name"=fish.name,"ref"=ref(fish))) + .["contents"] = content_data + +/obj/structure/aquarium/ui_static_data(mob/user) + . = ..() + //I guess these should depend on the fluid so lava critters can get high or stuff below water freezing point but let's keep it simple for now. + .["minTemperature"] = min_fluid_temp + .["maxTemperature"] = max_fluid_temp + .["fluidTypes"] = fluid_types + +/obj/structure/aquarium/ui_act(action, params) + . = ..() + if(.) + return + var/mob/user = usr + switch(action) + if("temperature") + var/temperature = params["temperature"] + if(isnum(temperature)) + fluid_temp = clamp(temperature, min_fluid_temp, max_fluid_temp) + . = TRUE + if("fluid") + if(params["fluid"] in fluid_types) + fluid_type = params["fluid"] + SEND_SIGNAL(src, COMSIG_AQUARIUM_FLUID_CHANGED, fluid_type) + . = TRUE + if("allow_breeding") + allow_breeding = !allow_breeding + . = TRUE + if("remove") + var/atom/movable/inside = locate(params["ref"]) in contents + if(inside) + if(isitem(inside)) + user.put_in_hands(inside) + else + inside.forceMove(get_turf(src)) + to_chat(user,"You take out [inside] from [src].") + +/obj/structure/aquarium/ui_interact(mob/user, datum/tgui/ui) + . = ..() + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Aquarium", name) + ui.open() + +/obj/structure/aquarium/obj_break(damage_flag) + . = ..() + if(!broken) + aquarium_smash() + +/obj/structure/aquarium/proc/aquarium_smash() + broken = TRUE + var/possible_destinations_for_fish = list() + var/droploc = drop_location() + if(isturf(droploc)) + possible_destinations_for_fish = get_adjacent_open_turfs(droploc) + else + possible_destinations_for_fish = list(droploc) + playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE) + for(var/atom/movable/fish in contents) + fish.forceMove(pick(possible_destinations_for_fish)) + if(fluid_type != AQUARIUM_FLUID_AIR) + var/datum/reagents/reagent_splash = new() + reagent_splash.add_reagent(/datum/reagent/water, 30) + chem_splash(droploc, 3, list(reagent_splash)) + update_icon() + +#undef AQUARIUM_LAYER_STEP +#undef AQUARIUM_MIN_OFFSET +#undef AQUARIUM_MAX_OFFSET diff --git a/code/modules/aquarium/aquarium_behaviour.dm b/code/modules/aquarium/aquarium_behaviour.dm new file mode 100644 index 0000000000000..4a7145473f13e --- /dev/null +++ b/code/modules/aquarium/aquarium_behaviour.dm @@ -0,0 +1,301 @@ +//Fish breeding stops if fish count exceeds this. +#define AQUARIUM_MAX_BREEDING_POPULATION 20 + +// Configuration objects defining prop/fish behaviour in the aquarium +// These are used as a base for autogenerating the actual instances +/datum/aquarium_behaviour + var/name = "base aquarium element" + var/desc = "
[scanning?"On":"Off"]" - if(scanning && health_scan) - dat += "
Health: [health_scan]" - user << browse(dat, "window=hscan") - onclose(user, "hscan") - -/obj/item/assembly/health/Topic(href, href_list) - ..() - if(!ismob(usr)) - return - - var/mob/user = usr - - if(!user.canUseTopic(src, BE_CLOSE)) - usr << browse(null, "window=hscan") - onclose(usr, "hscan") - return - - if(href_list["scanning"]) - toggle_scan() - - if(href_list["close"]) - usr << browse(null, "window=hscan") - return - - attack_self(user) - return + to_chat(user, "You toggle [src] [src.scanning ? "off" : "on"].") + toggle_scan() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index f439775877c69..868eb305d176a 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -16,9 +16,8 @@ /obj/item/assembly_holder/ComponentInitialize() . = ..() - AddComponent( - /datum/component/simple_rotation, - ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS) + var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS + AddComponent(/datum/component/simple_rotation, rotation_flags) /obj/item/assembly_holder/IsAssemblyHolder() return TRUE diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index b5e4f52eb3773..c8e70fbf8fa3d 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -22,7 +22,7 @@ /obj/item/assembly/infra/ComponentInitialize() . = ..() var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS - AddComponent(/datum/component/simple_rotation, rotation_flags, null, null, CALLBACK(src,.proc/after_rotation)) + AddComponent(/datum/component/simple_rotation, rotation_flags, after_rotation=CALLBACK(src,.proc/after_rotation)) /obj/item/assembly/infra/proc/after_rotation() refreshBeam() @@ -134,7 +134,7 @@ . = ..() setDir(t) -/obj/item/assembly/infra/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE) +/obj/item/assembly/infra/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE) . = ..() olddir = dir @@ -152,10 +152,7 @@ return FALSE pulse(FALSE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) next_activate = world.time + 30 /obj/item/assembly/infra/proc/switchListener(turf/newloc) @@ -167,6 +164,8 @@ listeningTo = newloc /obj/item/assembly/infra/proc/check_exit(datum/source, atom/movable/offender) + SIGNAL_HANDLER + if(QDELETED(src)) return if(offender == src || istype(offender,/obj/effect/beam/i_beam)) @@ -175,7 +174,7 @@ var/obj/item/I = offender if (I.item_flags & ABSTRACT) return - return refreshBeam() + INVOKE_ASYNC(src, .proc/refreshBeam) /obj/item/assembly/infra/setDir() . = ..() @@ -214,8 +213,9 @@ visible = !visible . = TRUE - update_icon() - refreshBeam() + if(.) + update_icon() + refreshBeam() /***************************IBeam*********************************/ diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index f526d203e3e48..bc00b18d4b209 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -8,7 +8,7 @@ var/scanning = FALSE var/timing = FALSE - var/time = 10 + var/time = 20 var/sensitivity = 1 var/hearing_range = 3 @@ -66,20 +66,18 @@ return FALSE pulse(FALSE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) next_activate = world.time + 30 return TRUE -/obj/item/assembly/prox_sensor/process() +/obj/item/assembly/prox_sensor/process(delta_time) if(!timing) return - time-- + time -= delta_time if(time <= 0) timing = FALSE toggle_scan(TRUE) + ui_update() time = initial(time) /obj/item/assembly/prox_sensor/proc/toggle_scan(scan) @@ -108,12 +106,17 @@ holder.update_icon() return + +/obj/item/assembly/prox_sensor/ui_requires_update(mob/user, datum/tgui/ui) + . = ..() + if(timing) + . = TRUE // Autoupdate while counting down + /obj/item/assembly/prox_sensor/ui_status(mob/user) if(is_secured(user)) return ..() return UI_CLOSE - /obj/item/assembly/prox_sensor/ui_state(mob/user) return GLOB.hands_state diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 2456dcc939b85..5830df340a444 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -109,7 +109,8 @@ code = initial(code) . = TRUE - update_icon() + if(.) + update_icon() /obj/item/assembly/signaler/attackby(obj/item/W, mob/user, params) if(issignaler(W)) @@ -118,6 +119,7 @@ code = signaler2.code set_frequency(signaler2.frequency) to_chat(user, "You transfer the frequency and code of \the [signaler2.name] to \the [name]") + ui_update() ..() /obj/item/assembly/signaler/proc/signal() @@ -145,10 +147,7 @@ return pulse(TRUE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) return TRUE /obj/item/assembly/signaler/proc/set_frequency(new_frequency) diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 0dc8876b9426c..c817d0e29bba9 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -7,15 +7,15 @@ var/timing = FALSE - var/time = 5 - var/saved_time = 5 + var/time = 10 + var/saved_time = 10 var/loop = FALSE var/hearing_range = 3 /obj/item/assembly/timer/suicide_act(mob/living/user) user.visible_message("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!") activate()//doesnt rely on timer_end to prevent weird metas where one person can control the timer and therefore someone's life. (maybe that should be how it works...) - addtimer(CALLBACK(src, .proc/manual_suicide, user), time*10)//kill yourself once the time runs out + addtimer(CALLBACK(src, .proc/manual_suicide, user), time SECONDS)//kill yourself once the time runs out return MANUAL_SUICIDE /obj/item/assembly/timer/proc/manual_suicide(mob/living/user) @@ -57,18 +57,16 @@ return FALSE pulse(FALSE) audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) + playsound(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) if(loop) timing = TRUE update_icon() + ui_update() -/obj/item/assembly/timer/process() +/obj/item/assembly/timer/process(delta_time) if(!timing) return - time-- + time -= delta_time if(time <= 0) timing = FALSE timer_end() @@ -89,6 +87,11 @@ return UI_CLOSE +/obj/item/assembly/timer/ui_requires_update(mob/user, datum/tgui/ui) + . = ..() + if(timing) + . = TRUE // Autoupdate while counting down + /obj/item/assembly/timer/ui_state(mob/user) return GLOB.hands_state diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index dbcec82f39202..e7e558aabe79f 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -8,7 +8,6 @@ desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" materials = list(/datum/material/iron=500, /datum/material/glass=50) - flags_1 = HEAR_1 attachable = TRUE verb_say = "beeps" verb_ask = "beeps" @@ -21,11 +20,15 @@ "recognizer", "voice sensor") +/obj/item/assembly/voice/Initialize() + . = ..() + become_hearing_sensitive(ROUNDSTART_TRAIT) + /obj/item/assembly/voice/examine(mob/user) . = ..() . += "Use a multitool to swap between \"inclusive\", \"exclusive\", \"recognizer\", and \"voice sensor\" mode." -/obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) . = ..() if(speaker == src) return diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index 221febbe14d4d..3f9e8c3fcca2c 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -11,6 +11,7 @@ GLOBAL_LIST_EMPTY(asset_datums) /datum/asset var/_abstract = /datum/asset + var/cached_url_mappings /datum/asset/New() GLOB.asset_datums[type] = src @@ -19,6 +20,13 @@ GLOBAL_LIST_EMPTY(asset_datums) /datum/asset/proc/get_url_mappings() return list() +/// Returns a cached tgui message of URL mappings +/datum/asset/proc/get_serialized_url_mappings() + if (isnull(cached_url_mappings)) + cached_url_mappings = TGUI_CREATE_MESSAGE("asset/mappings", get_url_mappings()) + + return cached_url_mappings + /datum/asset/proc/register() return diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index bd98b9cc07a99..077c00485757d 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -3,21 +3,21 @@ /datum/asset/simple/tgui_common keep_local_name = TRUE assets = list( - "tgui-common.chunk.js" = 'tgui/public/tgui-common.chunk.js', + "tgui-common.bundle.js" = file("tgui/public/tgui-common.bundle.js"), ) /datum/asset/simple/tgui keep_local_name = TRUE assets = list( - "tgui.bundle.js" = 'tgui/public/tgui.bundle.js', - "tgui.bundle.css" = 'tgui/public/tgui.bundle.css', + "tgui.bundle.js" = file("tgui/public/tgui.bundle.js"), + "tgui.bundle.css" = file("tgui/public/tgui.bundle.css"), ) /datum/asset/simple/tgui_panel keep_local_name = TRUE assets = list( - "tgui-panel.bundle.js" = 'tgui/public/tgui-panel.bundle.js', - "tgui-panel.bundle.css" = 'tgui/public/tgui-panel.bundle.css', + "tgui-panel.bundle.js" = file("tgui/public/tgui-panel.bundle.js"), + "tgui-panel.bundle.css" = file("tgui/public/tgui-panel.bundle.css"), ) /datum/asset/simple/headers @@ -50,6 +50,18 @@ "smmon_6.gif" = 'icons/program_icons/smmon_6.gif', ) +/datum/asset/simple/circuit_assets + assets = list( + "grid_background.png" = 'icons/ui_icons/tgui/grid_background.png' + ) + +/datum/asset/simple/radar_assets + assets = list( + "ntosradarbackground.png" = 'icons/UI_Icons/tgui/ntosradar_background.png', + "ntosradarpointer.png" = 'icons/UI_Icons/tgui/ntosradar_pointer.png', + "ntosradarpointerS.png" = 'icons/UI_Icons/tgui/ntosradar_pointer_S.png' + ) + /datum/asset/spritesheet/simple/pda name = "pda" assets = list( @@ -158,11 +170,21 @@ ) parents = list("font-awesome.css" = 'html/font-awesome/css/all.min.css') +/datum/asset/simple/namespaced/tgfont + assets = list( + "tgfont.eot" = file("tgui/packages/tgfont/dist/tgfont.eot"), + "tgfont.woff2" = file("tgui/packages/tgfont/dist/tgfont.woff2"), + ) + parents = list( + "tgfont.css" = file("tgui/packages/tgfont/dist/tgfont.css"), + ) + /datum/asset/spritesheet/chat name = "chat" /datum/asset/spritesheet/chat/register() InsertAll("emoji", 'icons/emoji.dmi') + InsertAll("badge", 'icons/badges.dmi') // pre-loading all lanugage icons also helps to avoid meta InsertAll("language", 'icons/misc/language.dmi') // catch languages which are pulling icons from another file @@ -211,7 +233,7 @@ "boss4.gif" = 'icons/UI_Icons/Arcade/boss4.gif', "boss5.gif" = 'icons/UI_Icons/Arcade/boss5.gif', "boss6.gif" = 'icons/UI_Icons/Arcade/boss6.gif', - ) + ) /datum/asset/spritesheet/simple/pills name ="pills" @@ -255,6 +277,47 @@ InsertAll("", each, GLOB.alldirs) ..() +/datum/asset/simple/genetics + assets = list( + "dna_discovered.gif" = 'html/dna_discovered.gif', + "dna_undiscovered.gif" = 'html/dna_undiscovered.gif', + "dna_extra.gif" = 'html/dna_extra.gif' + ) + +/datum/asset/spritesheet/supplypods + name = "supplypods" + +/datum/asset/spritesheet/supplypods/register() + for (var/style in 1 to length(GLOB.podstyles)) + var/icon_file = 'icons/obj/supplypods.dmi' + var/states = icon_states(icon_file) + if (style == STYLE_SEETHROUGH) + Insert("pod_asset[style]", icon(icon_file, "seethrough-icon", SOUTH)) + continue + var/base = GLOB.podstyles[style][POD_BASE] + if (!base) + Insert("pod_asset[style]", icon(icon_file, "invisible-icon", SOUTH)) + continue + var/icon/podIcon = icon(icon_file, base, SOUTH) + var/door = GLOB.podstyles[style][POD_DOOR] + if (door) + door = "[base]_door" + if(door in states) + podIcon.Blend(icon(icon_file, door, SOUTH), ICON_OVERLAY) + var/shape = GLOB.podstyles[style][POD_SHAPE] + if (shape == POD_SHAPE_NORML) + var/decal = GLOB.podstyles[style][POD_DECAL] + if (decal) + if(decal in states) + podIcon.Blend(icon(icon_file, decal, SOUTH), ICON_OVERLAY) + var/glow = GLOB.podstyles[style][POD_GLOW] + if (glow) + glow = "pod_glow_[glow]" + if(glow in states) + podIcon.Blend(icon(icon_file, glow, SOUTH), ICON_OVERLAY) + Insert("pod_asset[style]", podIcon) + return ..() + // Representative icons for each research design /datum/asset/spritesheet/research_designs name = "design" @@ -347,14 +410,6 @@ Insert(imgid, I) return ..() - -/datum/asset/simple/genetics - assets = list( - "dna_discovered.png" = 'html/dna_discovered.png', - "dna_undiscovered.png" = 'html/dna_undiscovered.png', - "dna_extra.png" = 'html/dna_extra.png' - ) - /datum/asset/simple/bee_antags assets = list( "traitor.png" = 'html/img/traitor.png', @@ -412,3 +467,51 @@ // Special case to handle Bluespace Crystals Insert("polycrystal", 'icons/obj/telescience.dmi', "polycrystal") ..() + +/datum/asset/simple/pAI + assets = list( + "paigrid.png" = 'html/paigrid.png' + ) + +/datum/asset/simple/portraits + var/tab = "use subtypes of this please" + assets = list() + +/datum/asset/simple/portraits/New() + if(!SSpersistence.paintings || !SSpersistence.paintings[tab] || !length(SSpersistence.paintings[tab])) + return + for(var/p in SSpersistence.paintings[tab]) + var/list/portrait = p + var/png = "data/paintings/[tab]/[portrait["md5"]].png" + if(fexists(png)) + var/asset_name = "[tab]_[portrait["md5"]]" + assets[asset_name] = png + ..() //this is where it registers all these assets we added to the list + +/datum/asset/simple/portraits/library + tab = "library" + +/datum/asset/simple/portraits/library_secure + tab = "library_secure" + +/datum/asset/simple/portraits/library_private + tab = "library_private" + +/datum/asset/spritesheet/fish + name = "fish" + +/datum/asset/spritesheet/fish/register() + for (var/path in subtypesof(/datum/aquarium_behaviour/fish)) + var/datum/aquarium_behaviour/fish/fish_type = path + var/fish_icon = initial(fish_type.icon) + var/fish_icon_state = initial(fish_type.icon_state) + var/id = sanitize_css_class_name("[fish_icon][fish_icon_state]") + if(sprites[id]) //no dupes + continue + Insert(id, fish_icon, fish_icon_state) + ..() + +/// Removes all non-alphanumerics from the text, keep in mind this can lead to id conflicts +/proc/sanitize_css_class_name(name) + var/static/regex/regex = new(@"[^a-zA-Z0-9]","g") + return replacetext(name, regex, "") diff --git a/code/modules/atmospherics/auxgm/breathing_classes.dm b/code/modules/atmospherics/auxgm/breathing_classes.dm new file mode 100644 index 0000000000000..4abfab58eecc3 --- /dev/null +++ b/code/modules/atmospherics/auxgm/breathing_classes.dm @@ -0,0 +1,37 @@ +// Breathing classes are, yes, just a list of gases, associated with numbers. +// But they're very simple: pluoxium's status as O2 * 8 is represented here, +// with a single line of code, no hardcoding and special-casing across the codebase. +// Not only that, but they're very general: you could have a negative value +// to simulate asphyxiants, e.g. if I add krypton it could go into the oxygen +// breathing class at -7, simulating krypton narcosis. + +/datum/breathing_class + var/list/gases = null + var/list/products = null + var/danger_reagent = null + var/low_alert_category = "not_enough_oxy" + var/low_alert_datum = /atom/movable/screen/alert/not_enough_oxy + var/high_alert_category = "too_much_oxy" + var/high_alert_datum = /atom/movable/screen/alert/too_much_oxy + +/datum/breathing_class/oxygen + gases = list( + GAS_O2 = 1, + GAS_PLUOXIUM = 8, + GAS_CO2 = -0.7, // CO2 isn't actually toxic, just an asphyxiant + ) + products = list( + GAS_CO2 = 1, + ) + +/datum/breathing_class/plasma + gases = list( + GAS_PLASMA = 1 + ) + products = list( + GAS_CO2 = 1 + ) + low_alert_category = "not_enough_tox" + low_alert_datum = /atom/movable/screen/alert/not_enough_tox + high_alert_category = "too_much_tox" + high_alert_datum = /atom/movable/screen/alert/too_much_tox diff --git a/code/modules/atmospherics/auxgm/gas_types.dm b/code/modules/atmospherics/auxgm/gas_types.dm new file mode 100644 index 0000000000000..82ec62f90f915 --- /dev/null +++ b/code/modules/atmospherics/auxgm/gas_types.dm @@ -0,0 +1,129 @@ +/datum/gas/oxygen + id = GAS_O2 + specific_heat = 20 + name = "Oxygen" + oxidation_temperature = T0C - 100 // it checks max of this and fire temperature, so rarely will things spontaneously combust + +/datum/gas/nitrogen + id = GAS_N2 + specific_heat = 20 + breath_alert_info = list( + not_enough_alert = list( + alert_category = "not_enough_nitro", + alert_type = /atom/movable/screen/alert/not_enough_nitro + ), + too_much_alert = list( + alert_category = "too_much_nitro", + alert_type = /atom/movable/screen/alert/too_much_nitro + ) + ) + name = "Nitrogen" + +/datum/gas/carbon_dioxide //what the fuck is this? + id = GAS_CO2 + specific_heat = 30 + name = "Carbon Dioxide" + breath_results = GAS_O2 + breath_alert_info = list( + not_enough_alert = list( + alert_category = "not_enough_co2", + alert_type = /atom/movable/screen/alert/not_enough_co2 + ), + too_much_alert = list( + alert_category = "too_much_co2", + alert_type = /atom/movable/screen/alert/too_much_co2 + ) + ) + fusion_power = 3 + +/datum/gas/plasma + id = GAS_PLASMA + specific_heat = 200 + name = "Plasma" + gas_overlay = "plasma" + moles_visible = MOLES_GAS_VISIBLE + flags = GAS_FLAG_DANGEROUS + // no fire info cause it has its own bespoke reaction for trit generation reasons + +/datum/gas/water_vapor + id = GAS_H2O + specific_heat = 40 + name = "Water Vapor" + gas_overlay = "water_vapor" + moles_visible = MOLES_GAS_VISIBLE + fusion_power = 8 + breath_reagent = /datum/reagent/water + +/datum/gas/hypernoblium + id = GAS_HYPERNOB + specific_heat = 2000 + name = "Hyper-noblium" + gas_overlay = "freon" + moles_visible = MOLES_GAS_VISIBLE + +/datum/gas/nitrous_oxide + id = GAS_NITROUS + specific_heat = 40 + name = "Nitrous Oxide" + gas_overlay = "nitrous_oxide" + moles_visible = MOLES_GAS_VISIBLE * 2 + flags = GAS_FLAG_DANGEROUS + fire_products = list(GAS_N2 = 1) + oxidation_rate = 0.5 + oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 100 + +/datum/gas/nitryl + id = GAS_NITRYL + specific_heat = 20 + name = "Nitryl" + gas_overlay = "nitryl" + moles_visible = MOLES_GAS_VISIBLE + flags = GAS_FLAG_DANGEROUS + fusion_power = 15 + fire_products = list(GAS_N2 = 0.5) + oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50 + +/datum/gas/tritium + id = GAS_TRITIUM + specific_heat = 10 + name = "Tritium" + gas_overlay = "tritium" + moles_visible = MOLES_GAS_VISIBLE + flags = GAS_FLAG_DANGEROUS + fusion_power = 1 + /* + these are for when we add hydrogen, trit gets to keep its hardcoded fire for legacy reasons + fire_provides = list(GAS_H2O = 2) + fire_burn_rate = 2 + fire_energy_released = FIRE_HYDROGEN_ENERGY_RELEASED + fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50 + */ + +/datum/gas/bz + id = GAS_BZ + specific_heat = 20 + name = "BZ" + flags = GAS_FLAG_DANGEROUS + fusion_power = 8 + +/datum/gas/stimulum + id = GAS_STIMULUM + specific_heat = 5 + name = "Stimulum" + fusion_power = 7 + +/datum/gas/pluoxium + id = GAS_PLUOXIUM + specific_heat = 80 + name = "Pluoxium" + fusion_power = 10 + oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 1000 // it is VERY stable + oxidation_rate = 8 + +/datum/gas/miasma + id = GAS_MIASMA + specific_heat = 20 + fusion_power = 50 + name = "Miasma" + gas_overlay = "miasma" + moles_visible = MOLES_GAS_VISIBLE * 60 diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 9f66bdd5fcd5d..f27e68a4eb501 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -13,28 +13,21 @@ if(!air) return - var/oxy = air.get_moles(/datum/gas/oxygen) - if (oxy < 0.5) + if (air.get_oxidation_power(exposed_temperature) < 0.5) return - var/tox = air.get_moles(/datum/gas/plasma) - var/trit = air.get_moles(/datum/gas/tritium) + var/has_fuel = air.get_moles(GAS_PLASMA) > 0.5 || air.get_moles(GAS_TRITIUM) > 0.5 || air.get_fuel_amount(exposed_temperature) > 0.5 if(active_hotspot) if(soh) - if(tox > 0.5 || trit > 0.5) + if(has_fuel) if(active_hotspot.temperature < exposed_temperature) active_hotspot.temperature = exposed_temperature if(active_hotspot.volume < exposed_volume) active_hotspot.volume = exposed_volume return - if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (tox > 0.5 || trit > 0.5)) - + if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && has_fuel) active_hotspot = new /obj/effect/hotspot(src, exposed_volume*25, exposed_temperature) - active_hotspot.just_spawned = (current_cycle < SSair.times_fired) - //remove just_spawned protection if no longer processing this cell - SSair.add_to_active(src, 0) - //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile /obj/effect/hotspot anchored = TRUE @@ -48,9 +41,9 @@ var/volume = 125 var/temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - var/just_spawned = TRUE var/bypassing = FALSE var/visual_update_tick = 0 + var/first_cycle = TRUE /obj/effect/hotspot/Initialize(mapload, starting_volume, starting_temperature) . = ..() @@ -70,7 +63,9 @@ location.active_hotspot = src - bypassing = !just_spawned && (volume > CELL_VOLUME*0.95) || location.air.return_temperature() > FUSION_TEMPERATURE_THRESHOLD + bypassing = !first_cycle && volume > CELL_VOLUME*0.95 || location.air.return_temperature() > FUSION_TEMPERATURE_THRESHOLD + if(first_cycle) + first_cycle = FALSE if(bypassing) volume = location.air.reaction_results["fire"]*FIRE_GROWTH_RATE @@ -150,10 +145,6 @@ #define INSUFFICIENT(path) (location.air.get_moles(path) < 0.5) /obj/effect/hotspot/process() - if(just_spawned) - just_spawned = FALSE - return - var/turf/open/location = loc if(!istype(location)) qdel(src) @@ -164,13 +155,7 @@ if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1)) qdel(src) return - if(!location.air || (INSUFFICIENT(/datum/gas/plasma) && INSUFFICIENT(/datum/gas/tritium)) || INSUFFICIENT(/datum/gas/oxygen)) - qdel(src) - return - - //Not enough to burn - // god damn it previous coder you made the INSUFFICIENT macro for a fucking reason why didn't you use it here smh - if((INSUFFICIENT(/datum/gas/plasma) && INSUFFICIENT(/datum/gas/tritium)) || INSUFFICIENT(/datum/gas/oxygen)) + if(!location.air || location.air.get_oxidation_power() < 0.5 || (INSUFFICIENT(GAS_PLASMA) && INSUFFICIENT(GAS_TRITIUM) && location.air.get_fuel_amount() < 0.5)) qdel(src) return diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 0e213e951cfd0..2caaaf6d8375b 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -18,57 +18,75 @@ /turf/open/CanAtmosPass(turf/T, vertical = FALSE) var/dir = vertical? get_dir_multiz(src, T) : get_dir(src, T) - var/opp = dir_inverse_multiz(dir) - var/R = FALSE + var/opp = REVERSE_DIR(dir) + . = TRUE if(vertical && !(zAirOut(dir, T) && T.zAirIn(dir, src))) - R = TRUE + . = FALSE if(blocks_air || T.blocks_air) - R = TRUE + . = FALSE if (T == src) - return !R + return . for(var/obj/O in contents+T.contents) var/turf/other = (O.loc == src ? T : src) if(!(vertical? (CANVERTICALATMOSPASS(O, other)) : (CANATMOSPASS(O, other)))) - R = TRUE - if(O.BlockSuperconductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments - atmos_supeconductivity |= dir - T.atmos_supeconductivity |= opp - return FALSE //no need to keep going, we got all we asked - - atmos_supeconductivity &= ~dir - T.atmos_supeconductivity &= ~opp - - return !R - -/atom/movable/proc/BlockSuperconductivity() // objects that block air and don't let superconductivity act. Only firelocks atm. + . = FALSE + if(O.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments + conductivity_blocked_directions |= dir + T.conductivity_blocked_directions |= opp + if(!.) + return . + +/atom/movable/proc/BlockThermalConductivity() // Objects that don't let heat through. return FALSE /turf/proc/ImmediateCalculateAdjacentTurfs() + if(SSair.thread_running()) + CALCULATE_ADJACENT_TURFS(src) + return var/canpass = CANATMOSPASS(src, src) var/canvpass = CANVERTICALATMOSPASS(src, src) for(var/direction in GLOB.cardinals_multiz) var/turf/T = get_step_multiz(src, direction) - var/opp_dir = dir_inverse_multiz(direction) - if(!isopenturf(T)) + if(!istype(T)) continue - if(!(blocks_air || T.blocks_air) && ((direction & (UP|DOWN))? (canvpass && CANVERTICALATMOSPASS(T, src)) : (canpass && CANATMOSPASS(T, src))) ) + var/opp_dir = REVERSE_DIR(direction) + if(isopenturf(T) && !(blocks_air || T.blocks_air) && ((direction & (UP|DOWN))? (canvpass && CANVERTICALATMOSPASS(T, src)) : (canpass && CANATMOSPASS(T, src))) ) LAZYINITLIST(atmos_adjacent_turfs) LAZYINITLIST(T.atmos_adjacent_turfs) atmos_adjacent_turfs[T] = direction T.atmos_adjacent_turfs[src] = opp_dir - T.__update_extools_adjacent_turfs() else if (atmos_adjacent_turfs) atmos_adjacent_turfs -= T if (T.atmos_adjacent_turfs) T.atmos_adjacent_turfs -= src - T.__update_extools_adjacent_turfs() UNSETEMPTY(T.atmos_adjacent_turfs) + T.set_sleeping(T.blocks_air) + T.__update_auxtools_turf_adjacency_info(isspaceturf(T.get_z_base_turf()), -1) UNSETEMPTY(atmos_adjacent_turfs) src.atmos_adjacent_turfs = atmos_adjacent_turfs - __update_extools_adjacent_turfs() + set_sleeping(blocks_air) + __update_auxtools_turf_adjacency_info(isspaceturf(get_z_base_turf())) + +/turf/proc/ImmediateDisableAdjacency(disable_adjacent = TRUE) + if(SSair.thread_running()) + SSadjacent_air.disable_queue[src] = disable_adjacent + return + if(disable_adjacent) + for(var/direction in GLOB.cardinals_multiz) + var/turf/T = get_step_multiz(src, direction) + if(!istype(T)) + continue + if (T.atmos_adjacent_turfs) + T.atmos_adjacent_turfs -= src + UNSETEMPTY(T.atmos_adjacent_turfs) + T.__update_auxtools_turf_adjacency_info(isspaceturf(T.get_z_base_turf()), -1) + LAZYCLEARLIST(atmos_adjacent_turfs) + __update_auxtools_turf_adjacency_info(isspaceturf(get_z_base_turf())) + +/turf/proc/set_sleeping(should_sleep) -/turf/proc/__update_extools_adjacent_turfs() +/turf/proc/__update_auxtools_turf_adjacency_info() //returns a list of adjacent turfs that can share air with this one. //alldir includes adjacent diagonal tiles that can share @@ -114,7 +132,6 @@ /turf/air_update_turf(command = 0) if(command) ImmediateCalculateAdjacentTurfs() - SSair.add_to_active(src,command) /atom/movable/proc/move_update_air(turf/T) if(isturf(T)) @@ -133,7 +150,4 @@ var/datum/gas_mixture/G = new G.parse_gas_string(text) - - air.merge(G) - archive() - SSair.add_to_active(src, 0) + assume_air(G) diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index 9660e7e012cbd..2564531906eb6 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -1,18 +1,12 @@ /turf - //used for temperature calculations + //conductivity is divided by 10 when interacting with air for balance purposes var/thermal_conductivity = 0.05 var/heat_capacity = 1 - var/temperature_archived //list of open turfs adjacent to us var/list/atmos_adjacent_turfs - //bitfield of dirs in which we are superconducitng - var/atmos_supeconductivity = NONE - var/is_openturf = FALSE // used by extools shizz. - - //used to determine whether we should archive - var/archived_cycle = 0 - var/current_cycle = 0 + //bitfield of dirs in which we thermal conductivity is blocked + var/conductivity_blocked_directions = NONE //used for mapping and for breathing while in walls (because that's a thing that needs to be accounted for...) //string parsed by /datum/gas/proc/copy_from_turf @@ -32,21 +26,17 @@ var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time var/list/atmos_overlay_types //gas IDs of current active gas overlays - is_openturf = TRUE /turf/open/Initialize() if(!blocks_air) - air = new + air = new(2500,src) air.copy_from_turf(src) - update_air_ref() + update_air_ref(planetary_atmos ? 1 : 2) . = ..() /turf/open/Destroy() if(active_hotspot) QDEL_NULL(active_hotspot) - // Adds the adjacent turfs to the current atmos processing - for(var/T in atmos_adjacent_turfs) - SSair.add_to_active(T) return ..() /turf/proc/update_air_ref() @@ -54,10 +44,46 @@ /////////////////GAS MIXTURE PROCS/////////////////// /turf/open/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air + return assume_air_ratio(giver, 1) + +/turf/open/assume_air_moles(datum/gas_mixture/giver, moles) if(!giver) return FALSE - air.merge(giver) - update_visuals() + if(SSair.thread_running()) + SSair.deferred_airs += list(list(giver, air, moles / giver.total_moles())) + else + giver.transfer_to(air, moles) + update_visuals() + return TRUE + +/turf/open/assume_air_ratio(datum/gas_mixture/giver, ratio) + if(!giver) + return FALSE + if(SSair.thread_running()) + SSair.deferred_airs += list(list(giver, air, ratio)) + else + giver.transfer_ratio_to(air, ratio) + update_visuals() + return TRUE + +/turf/open/transfer_air(datum/gas_mixture/taker, moles) + if(!taker || !return_air()) // shouldn't transfer from space + return FALSE + if(SSair.thread_running()) + SSair.deferred_airs += list(list(air, taker, moles / air.total_moles())) + else + air.transfer_to(taker, moles) + update_visuals() + return TRUE + +/turf/open/transfer_air_ratio(datum/gas_mixture/taker, ratio) + if(!taker || !return_air()) + return FALSE + if(SSair.thread_running()) + SSair.deferred_airs += list(list(air, taker, ratio)) + else + air.transfer_ratio_to(taker, ratio) + update_visuals() return TRUE /turf/open/remove_air(amount) @@ -66,6 +92,12 @@ update_visuals() return removed +/turf/open/remove_air_ratio(ratio) + var/datum/gas_mixture/ours = return_air() + var/datum/gas_mixture/removed = ours.remove_ratio(ratio) + update_visuals() + return removed + /turf/open/proc/copy_air_with_tile(turf/open/T) if(istype(T)) air.copy_from(T.air) @@ -88,16 +120,9 @@ return return_air() /turf/temperature_expose() - if(temperature > heat_capacity) + if(return_temperature() > heat_capacity) to_be_destroyed = TRUE -/turf/proc/archive() - temperature_archived = temperature - -/turf/open/archive() - air.archive() - archived_cycle = SSair.times_fired - temperature_archived = temperature /turf/open/proc/eg_reset_cooldowns() /turf/open/proc/eg_garbage_collect() @@ -124,9 +149,8 @@ for(var/id in air.get_gases()) if (nonoverlaying_gases[id]) continue - var/gas_meta = GLOB.meta_gas_info[id] - var/gas_overlay = gas_meta[META_GAS_OVERLAY] - if(gas_overlay && air.get_moles(id) > gas_meta[META_GAS_MOLES_VISIBLE]) + var/gas_overlay = GLOB.gas_data.overlays[id] + if(gas_overlay && air.get_moles(id) > GLOB.gas_data.visibility[id]) new_overlay_types += gas_overlay[min(FACTOR_GAS_VISIBLE_MAX, CEILING(air.get_moles(id) / MOLES_GAS_VISIBLE_STEP, 1))] if (atmos_overlay_types) @@ -160,12 +184,11 @@ for (var/gastype in subtypesof(/datum/gas)) var/datum/gas/gasvar = gastype if (!initial(gasvar.gas_overlay)) - .[gastype] = TRUE + .[initial(gasvar.id)] = TRUE /////////////////////////////SIMULATION/////////////////////////////////// /turf/proc/process_cell(fire_count) - SSair.remove_from_active(src) /turf/open/proc/equalize_pressure_in_zone(cyclenum) /turf/open/proc/consider_firelocks(turf/T2) @@ -185,14 +208,25 @@ /turf/proc/handle_decompression_floor_rip() /turf/open/floor/handle_decompression_floor_rip(sum) - if(sum > 20 && prob(CLAMP(sum / 10, 0, 30))) - remove_tile() + if(sum > 20 && prob(CLAMP(sum / 20, 0, 15))) + if(floor_tile) + new floor_tile(src) + make_plating() + +/turf/open/floor/plating/handle_decompression_floor_rip() + return + +/turf/open/floor/engine/handle_decompression_floor_rip() + return /turf/open/process_cell(fire_count) //////////////////////////SPACEWIND///////////////////////////// -/turf/open/proc/consider_pressure_difference(turf/T, difference) +/turf/proc/consider_pressure_difference() + return + +/turf/open/consider_pressure_difference(turf/T, difference) SSair.high_pressure_delta |= src if(difference > pressure_difference) pressure_direction = get_dir(src, T) @@ -209,8 +243,6 @@ M = thing if (!M.anchored && !M.pulledby && M.last_high_pressure_movement_air_cycle < SSair.times_fired) M.experience_pressure_difference(pressure_difference * multiplier, pressure_direction, 0, pressure_specific_target) - if(pressure_difference > 100) - new /obj/effect/temp_visual/dir_setting/space_wind(src, pressure_direction, CLAMP(round(sqrt(pressure_difference) * 2), 10, 255)) /atom/movable/var/pressure_resistance = 10 /atom/movable/var/last_high_pressure_movement_air_cycle = 0 @@ -236,112 +268,3 @@ else step(src, direction) last_high_pressure_movement_air_cycle = SSair.times_fired - -////////////////////////SUPERCONDUCTIVITY///////////////////////////// -/turf/proc/conductivity_directions() - if(archived_cycle < SSair.times_fired) - archive() - return NORTH|SOUTH|EAST|WEST - -/turf/open/conductivity_directions() - if(blocks_air) - return ..() - for(var/direction in GLOB.cardinals) - var/turf/T = get_step(src, direction) - if(!(T in atmos_adjacent_turfs) && !(atmos_supeconductivity & direction)) - . |= direction - -/turf/proc/neighbor_conduct_with_src(turf/open/other) - if(!other.blocks_air) //Open but neighbor is solid - other.temperature_share_open_to_solid(src) - else //Both tiles are solid - other.share_temperature_mutual_solid(src, thermal_conductivity) - temperature_expose(null, temperature, null) - -/turf/open/neighbor_conduct_with_src(turf/other) - if(blocks_air) - ..() - return - - if(!other.blocks_air) //Both tiles are open - var/turf/open/T = other - T.air.temperature_share(air, WINDOW_HEAT_TRANSFER_COEFFICIENT) - else //Solid but neighbor is open - temperature_share_open_to_solid(other) - SSair.add_to_active(src, 0) - -/turf/proc/super_conduct() - var/conductivity_directions = conductivity_directions() - - if(conductivity_directions) - //Conduct with tiles around me - for(var/direction in GLOB.cardinals) - if(conductivity_directions & direction) - var/turf/neighbor = get_step(src,direction) - - if(!neighbor.thermal_conductivity) - continue - - if(neighbor.archived_cycle < SSair.times_fired) - neighbor.archive() - - neighbor.neighbor_conduct_with_src(src) - - neighbor.consider_superconductivity() - - radiate_to_spess() - - finish_superconduction() - -/turf/proc/finish_superconduction(temp = temperature) - //Make sure still hot enough to continue conducting heat - if(temp < MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION) - SSair.active_super_conductivity -= src - return FALSE - -/turf/open/finish_superconduction() - //Conduct with air on my tile if I have it - if(!blocks_air) - temperature = air.temperature_share(null, thermal_conductivity, temperature, heat_capacity) - ..((blocks_air ? temperature : air.return_temperature())) - -/turf/proc/consider_superconductivity() - if(!thermal_conductivity) - return FALSE - - SSair.active_super_conductivity |= src - return TRUE - -/turf/open/consider_superconductivity(starting) - if(air.return_temperature() < (starting?MINIMUM_TEMPERATURE_START_SUPERCONDUCTION:MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION)) - return FALSE - if(air.heat_capacity() < M_CELL_WITH_RATIO) // Was: MOLES_CELLSTANDARD*0.1*0.05 Since there are no variables here we can make this a constant. - return FALSE - return ..() - -/turf/closed/consider_superconductivity(starting) - if(temperature < (starting?MINIMUM_TEMPERATURE_START_SUPERCONDUCTION:MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION)) - return FALSE - return ..() - -/turf/proc/radiate_to_spess() //Radiate excess tile heat to space - if(temperature > T0C) //Considering 0 degC as te break even point for radiation in and out - var/delta_temperature = (temperature_archived - TCMB) //hardcoded space temperature - if((heat_capacity > 0) && (abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)) - - var/heat = thermal_conductivity*delta_temperature* \ - (heat_capacity*HEAT_CAPACITY_VACUUM/(heat_capacity+HEAT_CAPACITY_VACUUM)) - temperature -= heat/heat_capacity - -/turf/open/proc/temperature_share_open_to_solid(turf/sharer) - sharer.temperature = air.temperature_share(null, sharer.thermal_conductivity, sharer.temperature, sharer.heat_capacity) - -/turf/proc/share_temperature_mutual_solid(turf/sharer, conduction_coefficient) //to be understood - var/delta_temperature = (temperature_archived - sharer.temperature_archived) - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER && heat_capacity && sharer.heat_capacity) - - var/heat = conduction_coefficient*delta_temperature* \ - (heat_capacity*sharer.heat_capacity/(heat_capacity+sharer.heat_capacity)) - - temperature -= heat/heat_capacity - sharer.temperature += heat/sharer.heat_capacity diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm new file mode 100644 index 0000000000000..04ebc3584e7f0 --- /dev/null +++ b/code/modules/atmospherics/gasmixtures/auxgm.dm @@ -0,0 +1,130 @@ +GLOBAL_LIST_INIT(hardcoded_gases, list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLASMA)) //the main four gases, which were at one time hardcoded +GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLUOXIUM, GAS_STIMULUM, GAS_NITRYL))) //unable to react amongst themselves + +// Auxgm +// It's a send-up of XGM, like what baystation got. +// It's got the same architecture as XGM, but it's structured +// differently to make it more convenient for auxmos. + +// Most important compared to TG is that it does away with hardcoded typepaths, +// which lead to problems on the auxmos end anyway. We cache the string value +// references on the Rust end, so no performance is lost here. + +// Also allows you to add new gases at runtime + +/proc/_auxtools_register_gas(datum/gas/gas) // makes sure auxtools knows stuff about this gas + +/datum/auxgm + var/list/datums = list() + var/list/specific_heats = list() + var/list/names = list() + var/list/visibility = list() + var/list/overlays = list() + var/list/flags = list() + var/list/ids = list() + var/list/typepaths = list() + var/list/fusion_powers = list() + var/list/breathing_classes = list() + var/list/breath_results = list() + var/list/breath_reagents = list() + var/list/breath_reagents_dangerous = list() + var/list/breath_alert_info = list() + var/list/oxidation_temperatures = list() + var/list/oxidation_rates = list() + var/list/fire_temperatures = list() + var/list/fire_enthalpies = list() + var/list/fire_products = list() + var/list/fire_burn_rates = list() + + +/datum/gas + var/id = "" + var/specific_heat = 0 + var/name = "" + var/gas_overlay = "" //icon_state in icons/effects/atmospherics.dmi + var/moles_visible = null + var/flags = NONE //currently used by canisters + var/fusion_power = 0 // How much the gas destabilizes a fusion reaction + var/breath_results = GAS_CO2 // what breathing this breathes out + var/breath_reagent = null // what breathing this adds to your reagents + var/breath_reagent_dangerous = null // what breathing this adds to your reagents IF it's above a danger threshold + var/list/breath_alert_info = null // list for alerts that pop up when you have too much/not enough of something + var/oxidation_temperature = null // temperature above which this gas is an oxidizer; null for none + var/oxidation_rate = 1 // how many moles of this can oxidize how many moles of material + var/fire_temperature = null // temperature above which gas may catch fire; null for none + var/list/fire_products = null // what results when this gas is burned (oxidizer or fuel); null for none + var/fire_energy_released = 0 // how much energy is released per mole of fuel burned + var/fire_burn_rate = 1 // how many moles are burned per product released + +/datum/gas/proc/breath(partial_pressure, light_threshold, heavy_threshold, moles, mob/living/carbon/C, obj/item/organ/lungs/lungs) + // This is only called on gases with the GAS_FLAG_BREATH_PROC flag. When possible, do NOT use this-- + // greatly prefer just adding a reagent. This is mostly around for legacy reasons. + return null + +/datum/auxgm/proc/add_gas(datum/gas/gas) + var/g = gas.id + if(g) + datums[g] = gas + specific_heats[g] = gas.specific_heat + names[g] = gas.name + if(gas.moles_visible) + visibility[g] = gas.moles_visible + overlays[g] = new /list(FACTOR_GAS_VISIBLE_MAX) + for(var/i in 1 to FACTOR_GAS_VISIBLE_MAX) + overlays[g][i] = new /obj/effect/overlay/gas(gas.gas_overlay, i * 255 / FACTOR_GAS_VISIBLE_MAX) + else + visibility[g] = 0 + overlays[g] = 0 + flags[g] = gas.flags + ids[g] = g + typepaths[g] = gas.type + fusion_powers[g] = gas.fusion_power + + if(gas.breath_alert_info) + breath_alert_info[g] = gas.breath_alert_info + breath_results[g] = gas.breath_results + if(gas.breath_reagent) + breath_reagents[g] = gas.breath_reagent + if(gas.breath_reagent_dangerous) + breath_reagents_dangerous[g] = gas.breath_reagent_dangerous + + if(gas.oxidation_temperature) + oxidation_temperatures[g] = gas.oxidation_temperature + oxidation_rates[g] = gas.oxidation_rate + if(gas.fire_products) + fire_products[g] = gas.fire_products + fire_enthalpies[g] = gas.fire_energy_released + else if(gas.fire_temperature) + fire_temperatures[g] = gas.fire_temperature + fire_burn_rates[g] = gas.fire_burn_rate + if(gas.fire_products) + fire_products[g] = gas.fire_products + fire_enthalpies[g] = gas.fire_energy_released + + _auxtools_register_gas(gas) + +/proc/finalize_gas_refs() + +/datum/auxgm/New() + for(var/gas_path in subtypesof(/datum/gas)) + var/datum/gas/gas = new gas_path + add_gas(gas) + for(var/breathing_class_path in subtypesof(/datum/breathing_class)) + var/datum/breathing_class/class = new breathing_class_path + breathing_classes[breathing_class_path] = class + finalize_gas_refs() + +GLOBAL_DATUM_INIT(gas_data, /datum/auxgm, new) + +/obj/effect/overlay/gas + icon = 'icons/effects/atmospherics.dmi' + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + anchored = TRUE // should only appear in vis_contents, but to be safe + layer = FLY_LAYER + appearance_flags = TILE_BOUND + vis_flags = NONE + +/obj/effect/overlay/gas/New(state, alph) + . = ..() + icon_state = state + alpha = alph diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 7e885c31d46d9..400405bac9303 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -7,38 +7,112 @@ What are the archived variables for? #define MINIMUM_MOLE_COUNT 0.01 #define QUANTIZE(variable) (round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */ -GLOBAL_LIST_INIT(meta_gas_info, meta_gas_list()) //see ATMOSPHERICS/gas_types.dm -GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) - -/proc/init_gaslist_cache() - . = list() - for(var/id in GLOB.meta_gas_info) - var/list/cached_gas = new(3) - - .[id] = cached_gas - - cached_gas[MOLES] = 0 - cached_gas[ARCHIVE] = 0 - cached_gas[GAS_META] = GLOB.meta_gas_info[id] /datum/gas_mixture + /// Never ever set this variable, hooked into vv_get_var for view variables viewing. + var/gas_list_view_only var/initial_volume = CELL_VOLUME //liters var/list/reaction_results var/list/analyzer_results //used for analyzer feedback - not initialized until its used - var/_extools_pointer_gasmixture = 0 // Contains the memory address of the shared_ptr object for this gas mixture in c++ land. Don't. Touch. This. Var. + var/_extools_pointer_gasmixture // Contains the index in the gas vector for this gas mixture in rust land. Don't. Touch. This. Var. + +GLOBAL_LIST_INIT(auxtools_atmos_initialized, FALSE) + +/proc/auxtools_atmos_init() /datum/gas_mixture/New(volume) if (!isnull(volume)) initial_volume = volume - ATMOS_EXTOOLS_CHECK + AUXTOOLS_CHECK(AUXMOS) + if(!GLOB.auxtools_atmos_initialized && auxtools_atmos_init()) + GLOB.auxtools_atmos_initialized = TRUE __gasmixture_register() reaction_results = new +/* +we use a hook instead +/datum/gas_mixture/Del() + __gasmixture_unregister() + . = ..() +*/ + /datum/gas_mixture/vv_edit_var(var_name, var_value) if(var_name == "_extools_pointer_gasmixture") return FALSE // please no. segfaults bad. + if(var_name == "gas_list_view_only") + return FALSE return ..() +/datum/gas_mixture/vv_get_var(var_name) + . = ..() + if(var_name == "gas_list_view_only") + var/list/dummy = get_gases() + for(var/gas in dummy) + dummy[gas] = get_moles(gas) + dummy["CAP [gas]"] = partial_heat_capacity(gas) + dummy["TEMP"] = return_temperature() + dummy["PRESSURE"] = return_pressure() + dummy["HEAT CAPACITY"] = heat_capacity() + dummy["TOTAL MOLES"] = total_moles() + dummy["VOLUME"] = return_volume() + dummy["THERMAL ENERGY"] = thermal_energy() + return debug_variable("gases (READ ONLY)", dummy, 0, src) + +/datum/gas_mixture/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION("", "---") + VV_DROPDOWN_OPTION(VV_HK_PARSE_GASSTRING, "Parse Gas String") + VV_DROPDOWN_OPTION(VV_HK_EMPTY, "Empty") + VV_DROPDOWN_OPTION(VV_HK_SET_MOLES, "Set Moles") + VV_DROPDOWN_OPTION(VV_HK_SET_TEMPERATURE, "Set Temperature") + VV_DROPDOWN_OPTION(VV_HK_SET_VOLUME, "Set Volume") + +/datum/gas_mixture/vv_do_topic(list/href_list) + . = ..() + if(!.) + return + if(href_list[VV_HK_PARSE_GASSTRING]) + var/gasstring = input(usr, "Input Gas String (WARNING: Advanced. Don't use this unless you know how these work.", "Gas String Parse") as text|null + if(!istext(gasstring)) + return + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Set to gas string [gasstring].") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Set to gas string [gasstring].") + parse_gas_string(gasstring) + if(href_list[VV_HK_EMPTY]) + log_admin("[key_name(usr)] emptied gas mixture [REF(src)].") + message_admins("[key_name(usr)] emptied gas mixture [REF(src)].") + clear() + if(href_list[VV_HK_SET_MOLES]) + var/list/gases = get_gases() + for(var/gas in gases) + gases[gas] = get_moles(gas) + var/gasid = input(usr, "What kind of gas?", "Set Gas") as null|anything in GLOB.gas_data.ids + if(!gasid) + return + var/amount = input(usr, "Input amount", "Set Gas", gases[gasid] || 0) as num|null + if(!isnum(amount)) + return + amount = max(0, amount) + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Set gas [gasid] to [amount] moles.") + set_moles(gasid, amount) + if(href_list[VV_HK_SET_TEMPERATURE]) + var/temp = input(usr, "Set the temperature of this mixture to?", "Set Temperature", return_temperature()) as num|null + if(!isnum(temp)) + return + temp = max(2.7, temp) + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [temp].") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Changed temperature to [temp].") + set_temperature(temp) + if(href_list[VV_HK_SET_VOLUME]) + var/volume = input(usr, "Set the volume of this mixture to?", "Set Volume", return_volume()) as num|null + if(!isnum(volume)) + return + volume = max(0, volume) + log_admin("[key_name(usr)] modified gas mixture [REF(src)]: Changed volume to [volume].") + message_admins("[key_name(usr)] modified gas mixture [REF(src)]: Changed volume to [volume].") + set_volume(volume) + /datum/gas_mixture/proc/__gasmixture_unregister() /datum/gas_mixture/proc/__gasmixture_register() @@ -49,7 +123,9 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) L[gt] = initial(G.specific_heat) return L -/datum/gas_mixture/proc/heat_capacity(data = MOLES) //joules per kelvin +/datum/gas_mixture/proc/heat_capacity() //joules per kelvin + +/datum/gas_mixture/proc/partial_heat_capacity(gas_type) /datum/gas_mixture/proc/total_moles() @@ -62,7 +138,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) /datum/gas_mixture/proc/set_volume(new_volume) /datum/gas_mixture/proc/get_moles(gas_type) /datum/gas_mixture/proc/set_moles(gas_type, moles) -/datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, list/gases) +/datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, ratio, list/gases) /datum/gas_mixture/proc/mark_immutable() /datum/gas_mixture/proc/get_gases() /datum/gas_mixture/proc/multiply(factor) @@ -70,7 +146,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) /datum/gas_mixture/proc/clear() /datum/gas_mixture/proc/adjust_moles(gas_type, amt = 0) - set_moles(gas_type, get_moles(gas_type) + amt) + set_moles(gas_type, clamp(get_moles(gas_type) + amt,0,INFINITY)) /datum/gas_mixture/proc/return_volume() //liters @@ -81,13 +157,18 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) //Returns: 1 in all cases /datum/gas_mixture/proc/merge(datum/gas_mixture/giver) - //Merges all air from giver into self. Deletes giver. + //Merges all air from giver into self. Does NOT delete the giver. //Returns: 1 if we are mutable, 0 otherwise /datum/gas_mixture/proc/remove(amount) //Proportionally removes amount of gas from the gas_mixture //Returns: gas_mixture with the gases removed +/datum/gas_mixture/proc/transfer_to(datum/gas_mixture/target, amount) + +/datum/gas_mixture/proc/transfer_ratio_to(datum/gas_mixture/target, ratio) + //Transfers ratio of gas to target. Equivalent to target.merge(remove_ratio(amount)) but faster. + /datum/gas_mixture/proc/remove_ratio(ratio) //Proportionally removes amount of gas from the gas_mixture //Returns: gas_mixture with the gases removed @@ -124,6 +205,24 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) //Performs various reactions such as combustion or fusion (LOL) //Returns: 1 if any reaction took place; 0 otherwise +/datum/gas_mixture/proc/adjust_heat(amt) + //Adjusts the thermal energy of the gas mixture, rather than having to do the full calculation. + //Returns: null + +/datum/gas_mixture/proc/equalize_with(datum/gas_mixture/giver) + //Makes this mix have the same temperature and gas ratios as the giver, but with the same pressure, accounting for volume. + //Returns: null + +/datum/gas_mixture/proc/get_oxidation_power(temp) + //Gets how much oxidation this gas can do, optionally at a given temperature. + +/datum/gas_mixture/proc/get_fuel_amount(temp) + //Gets how much fuel for fires (not counting trit/plasma!) this gas has, optionally at a given temperature. + +/proc/equalize_all_gases_in_list(list/L) + //Makes every gas in the given list have the same pressure, temperature and gas proportions. + //Returns: null + /datum/gas_mixture/proc/__remove() /datum/gas_mixture/remove(amount) var/datum/gas_mixture/removed = new type @@ -145,73 +244,27 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) return copy /datum/gas_mixture/copy_from_turf(turf/model) + set_temperature(initial(model.initial_temperature)) parse_gas_string(model.initial_gas_mix) - - //acounts for changes in temperature - var/turf/model_parent = model.parent_type - if(model.temperature != initial(model.temperature) || model.temperature != initial(model_parent.temperature)) - set_temperature(model.temperature) - return 1 /datum/gas_mixture/parse_gas_string(gas_string) - gas_string = SSair.preprocess_gas_string(gas_string) - var/list/gas = params2list(gas_string) if(gas["TEMP"]) - set_temperature(text2num(gas["TEMP"])) + var/temp = text2num(gas["TEMP"]) gas -= "TEMP" + if(!isnum(temp) || temp < 2.7) + temp = 2.7 + set_temperature(temp) clear() for(var/id in gas) - var/path = id - if(!ispath(path)) - path = gas_id2path(path) //a lot of these strings can't have embedded expressions (especially for mappers), so support for IDs needs to stick around - set_moles(path, text2num(gas[id])) + set_moles(id, text2num(gas[id])) return 1 -/datum/gas_mixture/react(datum/holder) - . = NO_REACTION - var/list/reactions = list() - for(var/I in get_gases()) - reactions += SSair.gas_reactions[I] - if(!length(reactions)) - return - reaction_results = new - var/temp = return_temperature() - var/ener = thermal_energy() - - reaction_loop: - for(var/r in reactions) - var/datum/gas_reaction/reaction = r - - var/list/min_reqs = reaction.min_requirements - if((min_reqs["TEMP"] && temp < min_reqs["TEMP"]) \ - || (min_reqs["ENER"] && ener < min_reqs["ENER"])) - continue - - for(var/id in min_reqs) - if (id == "TEMP" || id == "ENER") - continue - if(get_moles(id) < min_reqs[id]) - continue reaction_loop - - //at this point, all requirements for the reaction are satisfied. we can now react() - - . |= reaction.react(src, holder) - if (. & STOP_REACTIONS) - break - -//Takes the amount of the gas you want to PP as an argument -//So I don't have to do some hacky switches/defines/magic strings -//eg: -//Tox_PP = get_partial_pressure(gas_mixture.toxins) -//O2_PP = get_partial_pressure(gas_mixture.oxygen) - -/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure) - return (gas_pressure * R_IDEAL_GAS_EQUATION * return_temperature()) / BREATH_VOLUME -//inverse -/datum/gas_mixture/proc/get_true_breath_pressure(partial_pressure) - return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * return_temperature()) +/datum/gas_mixture/proc/set_analyzer_results(instability) + if(!analyzer_results) + analyzer_results = new + analyzer_results["fusion"] = instability //Mathematical proofs: /* @@ -223,3 +276,26 @@ get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles() */ /datum/gas_mixture/turf + +/// Releases gas from src to output air. This means that it can not transfer air to gas mixture with higher pressure. +/datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure) + var/output_starting_pressure = output_air.return_pressure() + var/input_starting_pressure = return_pressure() + + if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10)) + //No need to pump gas if target is already reached or input pressure is too low + //Need at least 10 kPa difference to overcome friction in the mechanism + return FALSE + + //Calculate necessary moles to transfer using PV = nRT + if((total_moles() > 0) && (return_temperature()>0)) + var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2) + //Can not have a pressure delta that would cause output_pressure > input_pressure + + var/transfer_moles = pressure_delta*output_air.return_volume()/(return_temperature() * R_IDEAL_GAS_EQUATION) + + //Actually transfer the gas + var/datum/gas_mixture/removed = remove(transfer_moles) + output_air.merge(removed) + return TRUE + return FALSE \ No newline at end of file diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm deleted file mode 100644 index 839b234ed2220..0000000000000 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ /dev/null @@ -1,176 +0,0 @@ -GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/carbon_dioxide, /datum/gas/plasma)) //the main four gases, which were at one time hardcoded -GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/carbon_dioxide, /datum/gas/pluoxium, /datum/gas/stimulum, /datum/gas/nitryl))) //unable to react amongst themselves - -/proc/meta_gas_list() - . = subtypesof(/datum/gas) - for(var/gas_path in .) - var/list/gas_info = new(7) - var/datum/gas/gas = gas_path - - gas_info[META_GAS_SPECIFIC_HEAT] = initial(gas.specific_heat) - gas_info[META_GAS_NAME] = initial(gas.name) - - gas_info[META_GAS_MOLES_VISIBLE] = initial(gas.moles_visible) - if(initial(gas.moles_visible) != null) - gas_info[META_GAS_OVERLAY] = new /list(FACTOR_GAS_VISIBLE_MAX) - for(var/i in 1 to FACTOR_GAS_VISIBLE_MAX) - gas_info[META_GAS_OVERLAY][i] = new /obj/effect/overlay/gas(initial(gas.gas_overlay), i * 255 / FACTOR_GAS_VISIBLE_MAX) - - gas_info[META_GAS_FUSION_POWER] = initial(gas.fusion_power) - gas_info[META_GAS_DANGER] = initial(gas.dangerous) - gas_info[META_GAS_ID] = initial(gas.id) - .[gas_path] = gas_info - -/proc/gas_id2path(id) - var/list/meta_gas = GLOB.meta_gas_info - if(id in meta_gas) - return id - for(var/path in meta_gas) - if(meta_gas[path][META_GAS_ID] == id) - return path - return "" - -/*||||||||||||||/----------\||||||||||||||*\ -||||||||||||||||[GAS DATUMS]|||||||||||||||| -||||||||||||||||\__________/|||||||||||||||| -||||These should never be instantiated. |||| -||||They exist only to make it easier |||| -||||to add a new gas. They are accessed |||| -||||only by meta_gas_list(). |||| -\*||||||||||||||||||||||||||||||||||||||||*/ - -/datum/gas - var/id = "" - var/specific_heat = 0 - var/name = "" - var/gas_overlay = "" //icon_state in icons/effects/atmospherics.dmi - var/moles_visible = null - var/dangerous = FALSE //currently used by canisters - var/fusion_power = 0 //How much the gas accelerates a fusion reaction - var/rarity = 0 // relative rarity compared to other gases, used when setting up the reactions list. - -// If you add or remove gases, update TOTAL_NUM_GASES in the extools code to match! Extools currently expects 14 gas types to exist. - -/datum/gas/oxygen - id = "o2" - specific_heat = 20 - name = "Oxygen" - rarity = 900 - -/datum/gas/nitrogen - id = "n2" - specific_heat = 20 - name = "Nitrogen" - rarity = 1000 - -/datum/gas/carbon_dioxide //what the fuck is this? - id = "co2" - specific_heat = 30 - name = "Carbon Dioxide" - rarity = 700 - -/datum/gas/plasma - id = "plasma" - specific_heat = 200 - name = "Plasma" - gas_overlay = "plasma" - moles_visible = MOLES_GAS_VISIBLE - dangerous = TRUE - rarity = 800 - -/datum/gas/water_vapor - id = "water_vapor" - specific_heat = 40 - name = "Water Vapor" - gas_overlay = "water_vapor" - moles_visible = MOLES_GAS_VISIBLE - fusion_power = 8 - rarity = 500 - -/datum/gas/hypernoblium - id = "nob" - specific_heat = 2000 - name = "Hyper-noblium" - gas_overlay = "freon" - moles_visible = MOLES_GAS_VISIBLE - dangerous = TRUE - rarity = 50 - -/datum/gas/nitrous_oxide - id = "n2o" - specific_heat = 40 - name = "Nitrous Oxide" - gas_overlay = "nitrous_oxide" - moles_visible = MOLES_GAS_VISIBLE * 2 - fusion_power = 10 - dangerous = TRUE - rarity = 600 - -/datum/gas/nitryl - id = "no2" - specific_heat = 20 - name = "Nitryl" - gas_overlay = "nitryl" - moles_visible = MOLES_GAS_VISIBLE - dangerous = TRUE - fusion_power = 16 - rarity = 100 - -/datum/gas/tritium - id = "tritium" - specific_heat = 10 - name = "Tritium" - gas_overlay = "tritium" - moles_visible = MOLES_GAS_VISIBLE - dangerous = TRUE - fusion_power = 1 - rarity = 300 - -/datum/gas/bz - id = "bz" - specific_heat = 20 - name = "BZ" - dangerous = TRUE - fusion_power = 8 - rarity = 400 - -/datum/gas/stimulum - id = "stim" - specific_heat = 5 - name = "Stimulum" - fusion_power = 7 - rarity = 1 - -/datum/gas/pluoxium - id = "pluox" - specific_heat = 80 - name = "Pluoxium" - fusion_power = -10 - rarity = 200 - -/datum/gas/miasma - id = "miasma" - specific_heat = 20 - name = "Miasma" - gas_overlay = "miasma" - moles_visible = MOLES_GAS_VISIBLE * 60 - rarity = 250 - -/datum/gas/unobtanium //C++ monstermos expects 14 gas types to exist, we only had 13 - id = "unobtanium" - specific_heat = 20 - name = "Unobtanium" - rarity = 2500 - -/obj/effect/overlay/gas - icon = 'icons/effects/atmospherics.dmi' - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - anchored = TRUE // should only appear in vis_contents, but to be safe - layer = FLY_LAYER - appearance_flags = TILE_BOUND - vis_flags = NONE - -/obj/effect/overlay/gas/New(state, alph) - . = ..() - icon_state = state - alpha = alph diff --git a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm index 2f1a10e2756ab..7de056ed0261b 100644 --- a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm +++ b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm @@ -25,4 +25,4 @@ initial_temperature = T20C /datum/gas_mixture/immutable/cloner/populate() - set_moles(/datum/gas/nitrogen, MOLES_O2STANDARD + MOLES_N2STANDARD) + set_moles(GAS_N2, MOLES_O2STANDARD + MOLES_N2STANDARD) diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index a2ec4cc58e3e0..3f10e57a34190 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -2,22 +2,14 @@ /proc/init_gas_reactions() . = list() - for(var/type in subtypesof(/datum/gas)) - .[type] = list() for(var/r in subtypesof(/datum/gas_reaction)) var/datum/gas_reaction/reaction = r if(initial(reaction.exclude)) continue reaction = new r - var/datum/gas/reaction_key - for (var/req in reaction.min_requirements) - if (ispath(req)) - var/datum/gas/req_gas = req - if (!reaction_key || initial(reaction_key.rarity) > initial(req_gas.rarity)) - reaction_key = req_gas - .[reaction_key] += list(reaction) - sortTim(., /proc/cmp_gas_reactions, TRUE) + . += reaction + sortTim(., /proc/cmp_gas_reactions) /proc/cmp_gas_reactions(list/datum/gas_reaction/a, list/datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list if (!length(a) || !length(b)) @@ -36,7 +28,7 @@ //regarding the requirements lists: the minimum or maximum requirements must be non-zero. //when in doubt, use MINIMUM_MOLE_COUNT. var/list/min_requirements - var/major_gas //the highest rarity gas used in the reaction. + var/list/max_requirements var/exclude = FALSE //do it this way to allow for addition/removal of reactions midmatch in the future var/priority = 100 //lower numbers are checked/react later than higher numbers. if two reactions have the same priority they may happen in either order var/name = "reaction" @@ -56,7 +48,7 @@ id = "nobstop" /datum/gas_reaction/nobliumsupression/init_reqs() - min_requirements = list(/datum/gas/hypernoblium = REACTION_OPPRESSION_THRESHOLD) + min_requirements = list(GAS_HYPERNOB = REACTION_OPPRESSION_THRESHOLD) /datum/gas_reaction/nobliumsupression/react() return STOP_REACTIONS @@ -68,7 +60,7 @@ id = "vapor" /datum/gas_reaction/water_vapor/init_reqs() - min_requirements = list(/datum/gas/water_vapor = MOLES_GAS_VISIBLE) + min_requirements = list(GAS_H2O = MOLES_GAS_VISIBLE) /datum/gas_reaction/water_vapor/react(datum/gas_mixture/air, datum/holder) var/turf/open/location = isturf(holder) ? holder : null @@ -77,7 +69,7 @@ if(location && location.freon_gas_act()) . = REACTING else if(location && location.water_vapor_gas_act()) - air.adjust_moles(/datum/gas/water_vapor, -MOLES_GAS_VISIBLE) + air.adjust_moles(GAS_H2O, -MOLES_GAS_VISIBLE) . = REACTING //tritium combustion: combustion of oxygen and tritium (treated as hydrocarbons). creates hotspots. exothermic @@ -89,7 +81,7 @@ /datum/gas_reaction/nitrous_decomp/init_reqs() min_requirements = list( "TEMP" = N2O_DECOMPOSITION_MIN_ENERGY, - /datum/gas/nitrous_oxide = MINIMUM_MOLE_COUNT + GAS_NITROUS = MINIMUM_MOLE_COUNT ) /datum/gas_reaction/nitrous_decomp/react(datum/gas_mixture/air, datum/holder) @@ -99,14 +91,14 @@ var/burned_fuel = 0 - burned_fuel = max(0,0.00002*(temperature-(0.00001*(temperature**2))))*air.get_moles(/datum/gas/nitrous_oxide) - air.set_moles(/datum/gas/nitrous_oxide, air.get_moles(/datum/gas/nitrous_oxide) - burned_fuel) + burned_fuel = max(0,0.00002*(temperature-(0.00001*(temperature**2))))*air.get_moles(GAS_NITROUS) + air.set_moles(GAS_NITROUS, air.get_moles(GAS_NITROUS) - burned_fuel) if(burned_fuel) energy_released += (N2O_DECOMPOSITION_ENERGY_RELEASED * burned_fuel) - air.set_moles(/datum/gas/oxygen, air.get_moles(/datum/gas/oxygen) + burned_fuel/2) - air.set_moles(/datum/gas/nitrogen, air.get_moles(/datum/gas/nitrogen) + burned_fuel) + air.set_moles(GAS_O2, air.get_moles(GAS_O2) + burned_fuel/2) + air.set_moles(GAS_N2, air.get_moles(GAS_N2) + burned_fuel) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) @@ -123,10 +115,22 @@ /datum/gas_reaction/tritfire/init_reqs() min_requirements = list( "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST, - /datum/gas/tritium = MINIMUM_MOLE_COUNT, - /datum/gas/oxygen = MINIMUM_MOLE_COUNT + GAS_TRITIUM = MINIMUM_MOLE_COUNT, + GAS_O2 = MINIMUM_MOLE_COUNT ) +/proc/fire_expose(turf/open/location, datum/gas_mixture/air, temperature) + if(istype(location) && temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + location.hotspot_expose(temperature, CELL_VOLUME) + for(var/I in location) + var/atom/movable/item = I + item.temperature_expose(air, temperature, CELL_VOLUME) + location.temperature_expose(air, temperature, CELL_VOLUME) + +/proc/radiation_burn(turf/open/location, energy_released) + if(istype(location) && prob(10)) + radiation_pulse(location, energy_released/TRITIUM_BURN_RADIOACTIVITY_FACTOR) + /datum/gas_reaction/tritfire/react(datum/gas_mixture/air, datum/holder) var/energy_released = 0 var/old_heat_capacity = air.heat_capacity() @@ -135,15 +139,15 @@ cached_results["fire"] = 0 var/turf/open/location = isturf(holder) ? holder : null var/burned_fuel = 0 - var/initial_trit = air.get_moles(/datum/gas/tritium)// Yogs - if(air.get_moles(/datum/gas/oxygen) < initial_trit || MINIMUM_TRIT_OXYBURN_ENERGY > (temperature * old_heat_capacity))// Yogs -- Maybe a tiny performance boost? I'unno - burned_fuel = air.get_moles(/datum/gas/oxygen)/TRITIUM_BURN_OXY_FACTOR + var/initial_trit = air.get_moles(GAS_TRITIUM)// Yogs + if(air.get_moles(GAS_O2) < initial_trit || MINIMUM_TRIT_OXYBURN_ENERGY > (temperature * old_heat_capacity))// Yogs -- Maybe a tiny performance boost? I'unno + burned_fuel = air.get_moles(GAS_O2)/TRITIUM_BURN_OXY_FACTOR if(burned_fuel > initial_trit) burned_fuel = initial_trit //Yogs -- prevents negative moles of Tritium - air.adjust_moles(/datum/gas/tritium, -burned_fuel) + air.adjust_moles(GAS_TRITIUM, -burned_fuel) else burned_fuel = initial_trit // Yogs -- Conservation of Mass fix - air.set_moles(/datum/gas/tritium, air.get_moles(/datum/gas/tritium) * (1 - 1/TRITIUM_BURN_TRIT_FACTOR)) // Yogs -- Maybe a tiny performance boost? I'unno - air.adjust_moles(/datum/gas/oxygen, -air.get_moles(/datum/gas/tritium)) + air.set_moles(GAS_TRITIUM, air.get_moles(GAS_TRITIUM) * (1 - 1/TRITIUM_BURN_TRIT_FACTOR)) // Yogs -- Maybe a tiny performance boost? I'unno + air.adjust_moles(GAS_O2, -air.get_moles(GAS_TRITIUM)) energy_released += (FIRE_HYDROGEN_ENERGY_RELEASED * burned_fuel * (TRITIUM_BURN_TRIT_FACTOR - 1)) // Yogs -- Fixes low-energy tritium fires if(burned_fuel) @@ -152,7 +156,7 @@ radiation_pulse(location, energy_released/TRITIUM_BURN_RADIOACTIVITY_FACTOR) //oxygen+more-or-less hydrogen=H2O - air.adjust_moles(/datum/gas/water_vapor, burned_fuel )// Yogs -- Conservation of Mass + air.adjust_moles(GAS_H2O, burned_fuel )// Yogs -- Conservation of Mass cached_results["fire"] += burned_fuel @@ -182,8 +186,8 @@ /datum/gas_reaction/plasmafire/init_reqs() min_requirements = list( "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST, - /datum/gas/plasma = MINIMUM_MOLE_COUNT, - /datum/gas/oxygen = MINIMUM_MOLE_COUNT + GAS_PLASMA = MINIMUM_MOLE_COUNT, + GAS_O2 = MINIMUM_MOLE_COUNT ) /datum/gas_reaction/plasmafire/react(datum/gas_mixture/air, datum/holder) @@ -208,21 +212,21 @@ temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE) if(temperature_scale > 0) oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale - if(air.get_moles(/datum/gas/oxygen) / air.get_moles(/datum/gas/plasma) > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium. + if(air.get_moles(GAS_O2) / air.get_moles(GAS_PLASMA) > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium. super_saturation = TRUE - if(air.get_moles(/datum/gas/oxygen) > air.get_moles(/datum/gas/plasma)*PLASMA_OXYGEN_FULLBURN) - plasma_burn_rate = (air.get_moles(/datum/gas/plasma)*temperature_scale)/PLASMA_BURN_RATE_DELTA + if(air.get_moles(GAS_O2) > air.get_moles(GAS_PLASMA)*PLASMA_OXYGEN_FULLBURN) + plasma_burn_rate = (air.get_moles(GAS_PLASMA)*temperature_scale)/PLASMA_BURN_RATE_DELTA else - plasma_burn_rate = (temperature_scale*(air.get_moles(/datum/gas/oxygen)/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA + plasma_burn_rate = (temperature_scale*(air.get_moles(GAS_O2)/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY) - plasma_burn_rate = min(plasma_burn_rate,air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/oxygen)/oxygen_burn_rate) //Ensures matter is conserved properly - air.set_moles(/datum/gas/plasma, QUANTIZE(air.get_moles(/datum/gas/plasma) - plasma_burn_rate)) - air.set_moles(/datum/gas/oxygen, QUANTIZE(air.get_moles(/datum/gas/oxygen) - (plasma_burn_rate * oxygen_burn_rate))) + plasma_burn_rate = min(plasma_burn_rate,air.get_moles(GAS_PLASMA),air.get_moles(GAS_O2)/oxygen_burn_rate) //Ensures matter is conserved properly + air.set_moles(GAS_PLASMA, QUANTIZE(air.get_moles(GAS_PLASMA) - plasma_burn_rate)) + air.set_moles(GAS_O2, QUANTIZE(air.get_moles(GAS_O2) - (plasma_burn_rate * oxygen_burn_rate))) if (super_saturation) - air.adjust_moles(/datum/gas/tritium, plasma_burn_rate) + air.adjust_moles(GAS_TRITIUM, plasma_burn_rate) else - air.adjust_moles(/datum/gas/carbon_dioxide, plasma_burn_rate) + air.adjust_moles(GAS_CO2, plasma_burn_rate) energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate) @@ -245,6 +249,84 @@ return cached_results["fire"] ? REACTING : NO_REACTION +/datum/gas_reaction/genericfire + priority = -3 // very last reaction + name = "Combustion" + id = "genericfire" + +/datum/gas_reaction/genericfire/init_reqs() + var/lowest_fire_temp = INFINITY + var/list/fire_temperatures = GLOB.gas_data.fire_temperatures + for(var/gas in fire_temperatures) + lowest_fire_temp = min(lowest_fire_temp, fire_temperatures[gas]) + var/lowest_oxi_temp = INFINITY + var/list/oxidation_temperatures = GLOB.gas_data.oxidation_temperatures + for(var/gas in oxidation_temperatures) + lowest_oxi_temp = min(lowest_oxi_temp, oxidation_temperatures[gas]) + min_requirements = list( + "TEMP" = max(lowest_oxi_temp, lowest_fire_temp), + "FIRE_REAGENTS" = MINIMUM_MOLE_COUNT + ) + +// no requirements, always runs +// bad idea? maybe +// this is overridden by auxmos but, hey, good idea to have it readable + +/datum/gas_reaction/genericfire/react(datum/gas_mixture/air, datum/holder) + var/temperature = air.return_temperature() + var/list/oxidation_temps = GLOB.gas_data.oxidation_temperatures + var/list/oxidation_rates = GLOB.gas_data.oxidation_rates + var/oxidation_power = 0 + var/list/burn_results = list() + var/list/fuels = list() + var/list/oxidizers = list() + var/list/fuel_rates = GLOB.gas_data.fire_burn_rates + var/list/fuel_temps = GLOB.gas_data.fire_temperatures + var/total_fuel = 0 + var/energy_released = 0 + for(var/G in air.get_gases()) + var/oxidation_temp = oxidation_temps[G] + if(oxidation_temp && oxidation_temp > temperature) + var/temperature_scale = max(0, 1-(temperature / oxidation_temp)) + var/amt = air.get_moles(G) * temperature_scale + oxidizers[G] = amt + oxidation_power += amt * oxidation_rates[G] + else + var/fuel_temp = fuel_temps[G] + if(fuel_temp && fuel_temp > temperature) + var/amt = (air.get_moles(G) / fuel_rates[G]) * max(0, 1-(temperature / fuel_temp)) + fuels[G] = amt // we have to calculate the actual amount we're using after we get all oxidation together + total_fuel += amt + if(oxidation_power <= 0 || total_fuel <= 0) + return NO_REACTION + var/oxidation_ratio = oxidation_power / total_fuel + if(oxidation_ratio > 1) + for(var/oxidizer in oxidizers) + oxidizers[oxidizer] /= oxidation_ratio + else if(oxidation_ratio < 1) + for(var/fuel in fuels) + fuels[fuel] *= oxidation_ratio + fuels += oxidizers + var/list/fire_products = GLOB.gas_data.fire_products + var/list/fire_enthalpies = GLOB.gas_data.fire_enthalpies + for(var/fuel in fuels + oxidizers) + var/amt = fuels[fuel] + if(!burn_results[fuel]) + burn_results[fuel] = 0 + burn_results[fuel] -= amt + energy_released += amt * fire_enthalpies[fuel] + for(var/product in fire_products[fuel]) + if(!burn_results[product]) + burn_results[product] = 0 + burn_results[product] += amt + var/final_energy = air.thermal_energy() + energy_released + for(var/result in burn_results) + air.adjust_moles(result, burn_results[result]) + air.set_temperature(final_energy / air.heat_capacity()) + var/list/cached_results = air.reaction_results + cached_results["fire"] = min(total_fuel, oxidation_power) * 2 + return cached_results["fire"] ? REACTING : NO_REACTION + //fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again). Again! //Fusion Rework Counter: Please increment this if you make a major overhaul to this system again. //6 reworks @@ -258,9 +340,9 @@ /datum/gas_reaction/fusion/init_reqs() min_requirements = list( "TEMP" = FUSION_TEMPERATURE_THRESHOLD, - /datum/gas/tritium = FUSION_TRITIUM_MOLES_USED, - /datum/gas/plasma = FUSION_MOLE_THRESHOLD, - /datum/gas/carbon_dioxide = FUSION_MOLE_THRESHOLD) + GAS_TRITIUM = FUSION_TRITIUM_MOLES_USED, + GAS_PLASMA = FUSION_MOLE_THRESHOLD, + GAS_CO2 = FUSION_MOLE_THRESHOLD) /datum/gas_reaction/fusion/react(datum/gas_mixture/air, datum/holder) var/turf/open/location @@ -272,16 +354,21 @@ if(!air.analyzer_results) air.analyzer_results = new var/list/cached_scan_results = air.analyzer_results - var/old_thermal_energy = air.thermal_energy() + var/thermal_energy = air.thermal_energy() var/reaction_energy = 0 //Reaction energy can be negative or positive, for both exothermic and endothermic reactions. - var/initial_plasma = air.get_moles(/datum/gas/plasma) - var/initial_carbon = air.get_moles(/datum/gas/carbon_dioxide) - var/scale_factor = (air.return_volume())/(PI) //We scale it down by volume/Pi because for fusion conditions, moles roughly = 2*volume, but we want it to be based off something constant between reactions. - var/toroidal_size = (2*PI)+TORADIANS(arctan((air.return_volume()-TOROID_VOLUME_BREAKEVEN)/TOROID_VOLUME_BREAKEVEN)) //The size of the phase space hypertorus + var/initial_plasma = air.get_moles(GAS_PLASMA) + var/initial_carbon = air.get_moles(GAS_CO2) + var/scale_factor = max(air.return_volume() / FUSION_SCALE_DIVISOR, FUSION_MINIMAL_SCALE) + var/temperature_scale = log(10, air.return_temperature()) + //The size of the phase space hypertorus + var/toroidal_size = TOROID_CALCULATED_THRESHOLD \ + + (temperature_scale <= FUSION_BASE_TEMPSCALE ? \ + (temperature_scale-FUSION_BASE_TEMPSCALE) / FUSION_BUFFER_DIVISOR \ + : 4 ** (temperature_scale-FUSION_BASE_TEMPSCALE) / FUSION_SLOPE_DIVISOR) var/gas_power = 0 for (var/gas_id in air.get_gases()) - gas_power += (GLOB.meta_gas_info[gas_id][META_GAS_FUSION_POWER]*air.get_moles(gas_id)) - var/instability = MODULUS((gas_power*INSTABILITY_GAS_POWER_FACTOR)**2,toroidal_size) //Instability effects how chaotic the behavior of the reaction is + gas_power += (GLOB.gas_data.fusion_powers[gas_id]*air.get_moles(gas_id)) + var/instability = MODULUS((gas_power*INSTABILITY_GAS_POWER_FACTOR),toroidal_size) //Instability effects how chaotic the behavior of the reaction is cached_scan_results[id] = instability//used for analyzer feedback var/plasma = (initial_plasma-FUSION_MOLE_THRESHOLD)/(scale_factor) //We have to scale the amounts of carbon and plasma down a significant amount in order to show the chaotic dynamics we want @@ -291,41 +378,49 @@ plasma = MODULUS(plasma - (instability*sin(TODEGREES(carbon))), toroidal_size) carbon = MODULUS(carbon - plasma, toroidal_size) + air.set_moles(GAS_PLASMA, plasma*scale_factor + FUSION_MOLE_THRESHOLD )//Scales the gases back up + air.set_moles(GAS_CO2, carbon*scale_factor + FUSION_MOLE_THRESHOLD) + var/delta_plasma = min(initial_plasma - air.get_moles(GAS_PLASMA), toroidal_size * scale_factor * 1.5) - air.set_moles(/datum/gas/plasma, plasma*scale_factor + FUSION_MOLE_THRESHOLD )//Scales the gases back up - air.set_moles(/datum/gas/carbon_dioxide, carbon*scale_factor + FUSION_MOLE_THRESHOLD) - var/delta_plasma = initial_plasma - air.get_moles(/datum/gas/plasma) + //Energy is gained or lost corresponding to the creation or destruction of mass. + //Low instability prevents endothermality while higher instability acutally encourages it. + reaction_energy = instability <= FUSION_INSTABILITY_ENDOTHERMALITY || delta_plasma > 0 ? \ + max(delta_plasma*PLASMA_BINDING_ENERGY, 0) \ + : delta_plasma*PLASMA_BINDING_ENERGY * (instability-FUSION_INSTABILITY_ENDOTHERMALITY)**0.5 - reaction_energy += delta_plasma*PLASMA_BINDING_ENERGY //Energy is gained or lost corresponding to the creation or destruction of mass. - if(instability < FUSION_INSTABILITY_ENDOTHERMALITY) - reaction_energy = max(reaction_energy,0) //Stable reactions don't end up endothermic. - else if (reaction_energy < 0) - reaction_energy *= (instability-FUSION_INSTABILITY_ENDOTHERMALITY)**0.5 + //To achieve faster equilibrium. Too bad it is not that good at cooling down. + if (reaction_energy) + var/middle_energy = (((TOROID_CALCULATED_THRESHOLD / 2) * scale_factor) + FUSION_MOLE_THRESHOLD) * (200 * FUSION_MIDDLE_ENERGY_REFERENCE) + thermal_energy = middle_energy * FUSION_ENERGY_TRANSLATION_EXPONENT ** log(10, thermal_energy / middle_energy) + + //This bowdlerization is a double-edged sword. Tread with care! + var/bowdlerized_reaction_energy = clamp(reaction_energy, \ + thermal_energy * ((1 / FUSION_ENERGY_TRANSLATION_EXPONENT ** 2) - 1), \ + thermal_energy * (FUSION_ENERGY_TRANSLATION_EXPONENT ** 2 - 1)) + thermal_energy = middle_energy * 10 ** log(FUSION_ENERGY_TRANSLATION_EXPONENT, (thermal_energy + bowdlerized_reaction_energy) / middle_energy) + + //The reason why you should set up a tritium production line. + air.adjust_moles(GAS_TRITIUM, -FUSION_TRITIUM_MOLES_USED) - if(old_thermal_energy + reaction_energy < 0) //No using energy that doesn't exist. - air.set_moles(/datum/gas/plasma, initial_plasma) - air.set_moles(/datum/gas/carbon_dioxide, initial_carbon) - return NO_REACTION - air.adjust_moles(/datum/gas/tritium, -FUSION_TRITIUM_MOLES_USED) //The decay of the tritium and the reaction's energy produces waste gases, different ones depending on whether the reaction is endo or exothermic - if(reaction_energy > 0) - air.adjust_moles(/datum/gas/oxygen, FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT)) - air.adjust_moles(/datum/gas/nitrous_oxide, FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT)) - else - air.adjust_moles(/datum/gas/bz, FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT)) - air.adjust_moles(/datum/gas/nitryl, FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT)) + var/standard_waste_gas_output = scale_factor * (FUSION_TRITIUM_CONVERSION_COEFFICIENT*FUSION_TRITIUM_MOLES_USED) + delta_plasma > 0 ? air.adjust_moles(GAS_H2O, standard_waste_gas_output) : air.adjust_moles(GAS_BZ, standard_waste_gas_output) + air.adjust_moles(GAS_O2, standard_waste_gas_output) //Oxygen is a bit touchy subject if(reaction_energy) if(location) - var/particle_chance = ((PARTICLE_CHANCE_CONSTANT)/(reaction_energy-PARTICLE_CHANCE_CONSTANT)) + 1//Asymptopically approaches 100% as the energy of the reaction goes up. - if(prob(PERCENT(particle_chance))) - location.fire_nuclear_particle() - var/rad_power = max((FUSION_RAD_COEFFICIENT/instability) + FUSION_RAD_MAX,0) - radiation_pulse(location,rad_power) - + var/standard_energy = 400 * air.get_moles(GAS_PLASMA) * air.return_temperature() //Prevents putting meaningless waste gases to achieve high rads. + if(prob(PERCENT(((PARTICLE_CHANCE_CONSTANT)/(reaction_energy-PARTICLE_CHANCE_CONSTANT)) + 1))) //Asymptopically approaches 100% as the energy of the reaction goes up. + location.fire_nuclear_particle(customize = TRUE, custompower = standard_energy) + radiation_pulse(location, max(2000 * 3 ** (log(10,standard_energy) - FUSION_RAD_MIDPOINT), 0)) + var/new_heat_capacity = air.heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + air.set_temperature(clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY)) + return REACTING + else if(reaction_energy == 0 && instability <= FUSION_INSTABILITY_ENDOTHERMALITY) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) - air.set_temperature(CLAMP(((old_thermal_energy + reaction_energy)/new_heat_capacity),TCMB,INFINITY)) + air.set_temperature(clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY)) //THIS SHOULD STAY OR FUSION WILL EAT YOUR FACE return REACTING /datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst. @@ -335,9 +430,9 @@ /datum/gas_reaction/nitrylformation/init_reqs() min_requirements = list( - /datum/gas/oxygen = 20, - /datum/gas/nitrogen = 20, - /datum/gas/pluoxium = 5, //Gates Nitryl behind pluoxium to offset N2O burning up during formation + GAS_O2 = 20, + GAS_N2 = 20, + GAS_PLUOXIUM = 5, //Gates Nitryl behind pluoxium to offset N2O burning up during formation "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*60 ) @@ -345,13 +440,13 @@ var/temperature = air.return_temperature() var/old_heat_capacity = air.heat_capacity() - var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*60),air.get_moles(/datum/gas/oxygen),air.get_moles(/datum/gas/nitrogen)) + var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*60),air.get_moles(GAS_O2),air.get_moles(GAS_N2)) var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY - if ((air.get_moles(/datum/gas/oxygen) - heat_efficency < 0 )|| (air.get_moles(/datum/gas/nitrogen) - heat_efficency < 0)) //Shouldn't produce gas from nothing. + if ((air.get_moles(GAS_O2) - heat_efficency < 0 )|| (air.get_moles(GAS_N2) - heat_efficency < 0)) //Shouldn't produce gas from nothing. return NO_REACTION - air.adjust_moles(/datum/gas/oxygen, -heat_efficency) - air.adjust_moles(/datum/gas/nitrogen, -heat_efficency) - air.adjust_moles(/datum/gas/nitryl, heat_efficency*2) + air.adjust_moles(GAS_O2, -heat_efficency) + air.adjust_moles(GAS_N2, -heat_efficency) + air.adjust_moles(GAS_NITRYL, heat_efficency*2) if(energy_used > 0) var/new_heat_capacity = air.heat_capacity() @@ -366,8 +461,8 @@ /datum/gas_reaction/bzformation/init_reqs() min_requirements = list( - /datum/gas/nitrous_oxide = 10, - /datum/gas/plasma = 10 + GAS_NITROUS = 10, + GAS_PLASMA = 10 ) @@ -375,18 +470,18 @@ var/temperature = air.return_temperature() var/pressure = air.return_pressure() var/old_heat_capacity = air.heat_capacity() - var/reaction_efficency = min(1/((pressure/(0.5*ONE_ATMOSPHERE))*(max(air.get_moles(/datum/gas/plasma)/air.get_moles(/datum/gas/nitrous_oxide),1))),air.get_moles(/datum/gas/nitrous_oxide),air.get_moles(/datum/gas/plasma)/2) + var/reaction_efficency = min(1/((pressure/(0.5*ONE_ATMOSPHERE))*(max(air.get_moles(GAS_PLASMA)/air.get_moles(GAS_NITROUS),1))),air.get_moles(GAS_NITROUS),air.get_moles(GAS_PLASMA)/2) var/energy_released = 2*reaction_efficency*FIRE_CARBON_ENERGY_RELEASED - if ((air.get_moles(/datum/gas/nitrous_oxide) - reaction_efficency < 0 )|| (air.get_moles(/datum/gas/plasma) - (2*reaction_efficency) < 0) || energy_released <= 0) //Shouldn't produce gas from nothing. + if ((air.get_moles(GAS_NITROUS) - reaction_efficency < 0 )|| (air.get_moles(GAS_PLASMA) - (2*reaction_efficency) < 0) || energy_released <= 0) //Shouldn't produce gas from nothing. return NO_REACTION - air.adjust_moles(/datum/gas/bz, reaction_efficency) - if(reaction_efficency == air.get_moles(/datum/gas/nitrous_oxide)) - air.adjust_moles(/datum/gas/bz, -min(pressure,1)) - air.adjust_moles(/datum/gas/oxygen, min(pressure,1)) - air.adjust_moles(/datum/gas/nitrous_oxide, -reaction_efficency) - air.adjust_moles(/datum/gas/plasma, -2*reaction_efficency) + air.adjust_moles(GAS_BZ, reaction_efficency) + if(reaction_efficency == air.get_moles(GAS_NITROUS)) + air.adjust_moles(GAS_BZ, -min(pressure,1)) + air.adjust_moles(GAS_O2, min(pressure,1)) + air.adjust_moles(GAS_NITROUS, -reaction_efficency) + air.adjust_moles(GAS_PLASMA, -2*reaction_efficency) - SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min((reaction_efficency**2)*BZ_RESEARCH_SCALE),BZ_RESEARCH_MAX_AMOUNT) + SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min((reaction_efficency**2)*BZ_RESEARCH_SCALE,BZ_RESEARCH_MAX_AMOUNT)) if(energy_released > 0) var/new_heat_capacity = air.heat_capacity() @@ -401,24 +496,24 @@ /datum/gas_reaction/stimformation/init_reqs() min_requirements = list( - /datum/gas/tritium = 30, - /datum/gas/plasma = 10, - /datum/gas/bz = 20, - /datum/gas/nitryl = 30, + GAS_TRITIUM = 30, + GAS_PLASMA = 10, + GAS_BZ = 20, + GAS_NITRYL = 30, "TEMP" = STIMULUM_HEAT_SCALE/2) /datum/gas_reaction/stimformation/react(datum/gas_mixture/air) var/old_heat_capacity = air.heat_capacity() - var/heat_scale = min(air.return_temperature()/STIMULUM_HEAT_SCALE,air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/nitryl)) + var/heat_scale = min(air.return_temperature()/STIMULUM_HEAT_SCALE,air.get_moles(GAS_PLASMA),air.get_moles(GAS_NITRYL)) var/stim_energy_change = heat_scale + STIMULUM_FIRST_RISE*(heat_scale**2) - STIMULUM_FIRST_DROP*(heat_scale**3) + STIMULUM_SECOND_RISE*(heat_scale**4) - STIMULUM_ABSOLUTE_DROP*(heat_scale**5) - if ((air.get_moles(/datum/gas/plasma) - heat_scale < 0) || (air.get_moles(/datum/gas/nitryl) - heat_scale < 0) || (air.get_moles(/datum/gas/tritium) - heat_scale < 0)) //Shouldn't produce gas from nothing. + if ((air.get_moles(GAS_PLASMA) - heat_scale < 0) || (air.get_moles(GAS_NITRYL) - heat_scale < 0) || (air.get_moles(GAS_TRITIUM) - heat_scale < 0)) //Shouldn't produce gas from nothing. return NO_REACTION - air.adjust_moles(/datum/gas/stimulum, heat_scale/10) - air.adjust_moles(/datum/gas/plasma, -heat_scale) - air.adjust_moles(/datum/gas/nitryl, -heat_scale) - air.adjust_moles(/datum/gas/tritium, -heat_scale) + air.adjust_moles(GAS_STIMULUM, heat_scale/10) + air.adjust_moles(GAS_PLASMA, -heat_scale) + air.adjust_moles(GAS_NITRYL, -heat_scale) + air.adjust_moles(GAS_TRITIUM, -heat_scale) SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, STIMULUM_RESEARCH_AMOUNT*max(stim_energy_change,0)) if(stim_energy_change) var/new_heat_capacity = air.heat_capacity() @@ -433,19 +528,19 @@ /datum/gas_reaction/nobliumformation/init_reqs() min_requirements = list( - /datum/gas/nitrogen = 10, - /datum/gas/tritium = 5, + GAS_N2 = 10, + GAS_TRITIUM = 5, "TEMP" = 5000000) /datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air) var/old_heat_capacity = air.heat_capacity() - var/nob_formed = min((air.get_moles(/datum/gas/nitrogen)+air.get_moles(/datum/gas/tritium))/100,air.get_moles(/datum/gas/tritium)/10,air.get_moles(/datum/gas/nitrogen)/20) - var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(air.get_moles(/datum/gas/bz),1))) - if ((air.get_moles(/datum/gas/tritium) - 10*nob_formed < 0) || (air.get_moles(/datum/gas/nitrogen) - 20*nob_formed < 0)) + var/nob_formed = min((air.get_moles(GAS_N2)+air.get_moles(GAS_TRITIUM))/100,air.get_moles(GAS_TRITIUM)/10,air.get_moles(GAS_N2)/20) + var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(air.get_moles(GAS_BZ),1))) + if ((air.get_moles(GAS_TRITIUM) - 10*nob_formed < 0) || (air.get_moles(GAS_N2) - 20*nob_formed < 0)) return NO_REACTION - air.adjust_moles(/datum/gas/tritium, -10*nob_formed) - air.adjust_moles(/datum/gas/nitrogen, -20*nob_formed) - air.adjust_moles(/datum/gas/hypernoblium, nob_formed) + air.adjust_moles(GAS_TRITIUM, -10*nob_formed) + air.adjust_moles(GAS_N2, -20*nob_formed) + air.adjust_moles(GAS_HYPERNOB, nob_formed) SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, nob_formed*NOBLIUM_RESEARCH_AMOUNT) if (nob_formed) @@ -462,18 +557,18 @@ /datum/gas_reaction/miaster/init_reqs() min_requirements = list( "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST+70, - /datum/gas/miasma = MINIMUM_MOLE_COUNT + GAS_MIASMA = MINIMUM_MOLE_COUNT ) /datum/gas_reaction/miaster/react(datum/gas_mixture/air, datum/holder) // As the name says it, it needs to be dry - if(air.get_moles(/datum/gas/water_vapor)/air.total_moles() > 0.1) + if(air.get_moles(GAS_H2O)/air.total_moles() > 0.1) return //Replace miasma with oxygen - var/cleaned_air = min(air.get_moles(/datum/gas/miasma), 20 + (air.return_temperature() - FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 70) / 20) - air.adjust_moles(/datum/gas/miasma, -cleaned_air) - air.adjust_moles(/datum/gas/oxygen, cleaned_air) + var/cleaned_air = min(air.get_moles(GAS_MIASMA), 20 + (air.return_temperature() - FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 70) / 20) + air.adjust_moles(GAS_MIASMA, -cleaned_air) + air.adjust_moles(GAS_O2, cleaned_air) //Possibly burning a bit of organic matter through maillard reaction, so a *tiny* bit more heat would be understandable air.set_temperature(air.return_temperature() + cleaned_air * 0.002) @@ -486,10 +581,10 @@ /datum/gas_reaction/stim_ball/init_reqs() min_requirements = list( - /datum/gas/pluoxium = STIM_BALL_GAS_AMOUNT, - /datum/gas/stimulum = STIM_BALL_GAS_AMOUNT, - /datum/gas/nitryl = MINIMUM_MOLE_COUNT, - /datum/gas/plasma = MINIMUM_MOLE_COUNT, + GAS_PLUOXIUM = STIM_BALL_GAS_AMOUNT, + GAS_STIMULUM = STIM_BALL_GAS_AMOUNT, + GAS_NITRYL = MINIMUM_MOLE_COUNT, + GAS_PLASMA = MINIMUM_MOLE_COUNT, "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST ) @@ -501,16 +596,16 @@ location = get_turf(pick(pipenet.members)) else location = get_turf(holder) - var/ball_shot_angle = 180*cos(air.get_moles(/datum/gas/water_vapor)/air.get_moles(/datum/gas/nitryl))+180 - var/stim_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/stimulum)) - var/pluox_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/pluoxium)) + var/ball_shot_angle = 180*cos(air.get_moles(GAS_H2O)/air.get_moles(GAS_NITRYL))+180 + var/stim_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_STIMULUM)) + var/pluox_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_PLUOXIUM)) var/energy_released = stim_used*STIMULUM_HEAT_SCALE//Stimulum has a lot of stored energy, and breaking it up releases some of it location.fire_nuclear_particle(ball_shot_angle) - air.adjust_moles(/datum/gas/carbon_dioxide, 4*pluox_used) - air.adjust_moles(/datum/gas/nitrogen, 8*stim_used) - air.adjust_moles(/datum/gas/pluoxium, -pluox_used) - air.adjust_moles(/datum/gas/stimulum, -stim_used) - air.adjust_moles(/datum/gas/plasma, -air.get_moles(/datum/gas/plasma)/2) + air.adjust_moles(GAS_CO2, 4*pluox_used) + air.adjust_moles(GAS_N2, 8*stim_used) + air.adjust_moles(GAS_PLUOXIUM, -pluox_used) + air.adjust_moles(GAS_STIMULUM, -stim_used) + air.adjust_moles(GAS_PLASMA, max(-air.get_moles(GAS_PLASMA)/2,-30)) if(energy_released) 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 b1034564bf793..d6afb607a71f8 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -69,9 +69,9 @@ req_access = list(ACCESS_ATMOSPHERICS) max_integrity = 250 integrity_failure = 80 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30, "stamina" = 0) resistance_flags = FIRE_PROOF - + layer = ABOVE_WINDOW_LAYER var/danger_level = 0 @@ -89,57 +89,57 @@ var/list/TLV = list( // Breathable air. "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa. Values are min2, min1, max1, max2 "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), - /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa - /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), - /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), - /datum/gas/miasma = new/datum/tlv/(-1, -1, 15, 30), - /datum/gas/plasma = new/datum/tlv/dangerous, - /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, - /datum/gas/bz = new/datum/tlv/dangerous, - /datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic - /datum/gas/water_vapor = new/datum/tlv/dangerous, - /datum/gas/tritium = new/datum/tlv/dangerous, - /datum/gas/stimulum = new/datum/tlv/dangerous, - /datum/gas/nitryl = new/datum/tlv/dangerous, - /datum/gas/pluoxium = new/datum/tlv(-1, -1, 1000, 1000) // Unlike oxygen, pluoxium does not fuel plasma/tritium fires + GAS_O2 = new/datum/tlv(16, 19, 40, 50), // Partial pressure, kpa + GAS_N2 = new/datum/tlv(-1, -1, 1000, 1000), + GAS_CO2 = new/datum/tlv(-1, -1, 5, 10), + GAS_MIASMA = new/datum/tlv/(-1, -1, 15, 30), + GAS_PLASMA = new/datum/tlv/dangerous, + GAS_NITROUS = new/datum/tlv/dangerous, + GAS_BZ = new/datum/tlv/dangerous, + GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic + GAS_H2O = new/datum/tlv/dangerous, + GAS_TRITIUM = new/datum/tlv/dangerous, + GAS_STIMULUM = new/datum/tlv/dangerous, + GAS_NITRYL = new/datum/tlv/dangerous, + GAS_PLUOXIUM = new/datum/tlv(-1, -1, 5, 6), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires ) /obj/machinery/airalarm/server // No checks here. TLV = list( "pressure" = new/datum/tlv/no_checks, "temperature" = new/datum/tlv/no_checks, - /datum/gas/oxygen = new/datum/tlv/no_checks, - /datum/gas/nitrogen = new/datum/tlv/no_checks, - /datum/gas/carbon_dioxide = new/datum/tlv/no_checks, - /datum/gas/miasma = new/datum/tlv/no_checks, - /datum/gas/plasma = new/datum/tlv/no_checks, - /datum/gas/nitrous_oxide = new/datum/tlv/no_checks, - /datum/gas/bz = new/datum/tlv/no_checks, - /datum/gas/hypernoblium = new/datum/tlv/no_checks, - /datum/gas/water_vapor = new/datum/tlv/no_checks, - /datum/gas/tritium = new/datum/tlv/no_checks, - /datum/gas/stimulum = new/datum/tlv/no_checks, - /datum/gas/nitryl = new/datum/tlv/no_checks, - /datum/gas/pluoxium = new/datum/tlv/no_checks + GAS_O2 = new/datum/tlv/no_checks, + GAS_N2 = new/datum/tlv/no_checks, + GAS_CO2 = new/datum/tlv/no_checks, + GAS_MIASMA = new/datum/tlv/no_checks, + GAS_PLASMA = new/datum/tlv/no_checks, + GAS_NITROUS = new/datum/tlv/no_checks, + GAS_BZ = new/datum/tlv/no_checks, + GAS_HYPERNOB = new/datum/tlv/no_checks, + GAS_H2O = new/datum/tlv/no_checks, + GAS_TRITIUM = new/datum/tlv/no_checks, + GAS_STIMULUM = new/datum/tlv/no_checks, + GAS_NITRYL = new/datum/tlv/no_checks, + GAS_PLUOXIUM = new/datum/tlv/no_checks ) /obj/machinery/airalarm/kitchen_cold_room // Kitchen cold rooms start off at -20°C or 253.15°K. TLV = list( "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa "temperature" = new/datum/tlv(T0C-273.15, T0C-80, T0C-10, T0C+10), - /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa - /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), - /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), - /datum/gas/miasma = new/datum/tlv/(-1, -1, 2, 5), - /datum/gas/plasma = new/datum/tlv/dangerous, - /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, - /datum/gas/bz = new/datum/tlv/dangerous, - /datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic - /datum/gas/water_vapor = new/datum/tlv/dangerous, - /datum/gas/tritium = new/datum/tlv/dangerous, - /datum/gas/stimulum = new/datum/tlv/dangerous, - /datum/gas/nitryl = new/datum/tlv/dangerous, - /datum/gas/pluoxium = new/datum/tlv(-1, -1, 1000, 1000) // Unlike oxygen, pluoxium does not fuel plasma/tritium fires + GAS_O2 = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa + GAS_N2 = new/datum/tlv(-1, -1, 1000, 1000), + GAS_CO2 = new/datum/tlv(-1, -1, 5, 10), + GAS_MIASMA = new/datum/tlv/(-1, -1, 2, 5), + GAS_PLASMA = new/datum/tlv/dangerous, + GAS_NITROUS = new/datum/tlv/dangerous, + GAS_BZ = new/datum/tlv/dangerous, + GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic + GAS_H2O = new/datum/tlv/dangerous, + GAS_TRITIUM = new/datum/tlv/dangerous, + GAS_STIMULUM = new/datum/tlv/dangerous, + GAS_NITRYL = new/datum/tlv/dangerous, + GAS_PLUOXIUM = new/datum/tlv(-1, -1, 1000, 1000) // Unlike oxygen, pluoxium does not fuel plasma/tritium fires ) /obj/machinery/airalarm/unlocked @@ -214,11 +214,15 @@ SSradio.remove_object(src, frequency) qdel(wires) wires = null + var/area/ourarea = get_area(src) + ourarea.atmosalert(FALSE, src) + GLOB.zclear_atoms -= src return ..() /obj/machinery/airalarm/Initialize(mapload) . = ..() set_frequency(frequency) + GLOB.zclear_atoms += src /obj/machinery/airalarm/examine(mob/user) . = ..() @@ -246,7 +250,9 @@ if(!ui) ui = new(user, src, "AirAlarm") ui.open() + ui.set_autoupdate(TRUE) // Turf gas mixture +//Oh my, thats a lot of data being sent that should probably be refactored /obj/machinery/airalarm/ui_data(mob/user) var/data = list( "locked" = locked, @@ -287,7 +293,7 @@ continue cur_tlv = TLV[gas_id] data["environment_data"] += list(list( - "name" = GLOB.meta_gas_info[gas_id][META_GAS_NAME], + "name" = GLOB.gas_data.names[gas_id], "value" = environment.get_moles(gas_id) / total_moles * 100, "unit" = "%", "danger_level" = cur_tlv.get_danger_level(environment.get_moles(gas_id) * partial_pressure) @@ -357,11 +363,11 @@ thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max1", "selected" = selected.max1)) thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max2", "selected" = selected.max2)) - for(var/gas_id in GLOB.meta_gas_info) + for(var/gas_id in GLOB.gas_data.names) if(!(gas_id in TLV)) // We're not interested in this gas, it seems. continue selected = TLV[gas_id] - thresholds += list(list("name" = GLOB.meta_gas_info[gas_id][META_GAS_NAME], "settings" = list())) + thresholds += list(list("name" = GLOB.gas_data.names[gas_id], "settings" = list())) thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min2", "selected" = selected.min2)) thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min1", "selected" = selected.min1)) thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "max1", "selected" = selected.max1)) @@ -425,15 +431,16 @@ . = TRUE if("alarm") var/area/A = get_area(src) - if(A.atmosalert(2, src)) + if(A.atmosalert(TRUE, src)) post_alert(2) . = TRUE if("reset") var/area/A = get_area(src) - if(A.atmosalert(0, src)) + if(A.atmosalert(FALSE, src)) post_alert(0) . = TRUE - update_icon() + if(.) + update_icon() /obj/machinery/airalarm/proc/reset(wire) @@ -441,10 +448,12 @@ if(WIRE_POWER) if(!wires.is_cut(WIRE_POWER)) shorted = FALSE + wires.ui_update() update_icon() if(WIRE_AI) if(!wires.is_cut(WIRE_AI)) aidisabled = FALSE + wires.ui_update() /obj/machinery/airalarm/proc/shock(mob/user, prb) @@ -505,7 +514,7 @@ for(var/device_id in A.air_scrub_names) send_signal(device_id, list( "power" = 1, - "set_filters" = list(/datum/gas/carbon_dioxide, /datum/gas/bz), + "set_filters" = list(GAS_CO2, GAS_BZ), "scrubbing" = 1, "widenet" = 0 ), signal_source) @@ -520,17 +529,17 @@ send_signal(device_id, list( "power" = 1, "set_filters" = list( - /datum/gas/carbon_dioxide, - /datum/gas/miasma, - /datum/gas/plasma, - /datum/gas/water_vapor, - /datum/gas/hypernoblium, - /datum/gas/nitrous_oxide, - /datum/gas/nitryl, - /datum/gas/tritium, - /datum/gas/bz, - /datum/gas/stimulum, - /datum/gas/pluoxium + GAS_CO2, + GAS_MIASMA, + GAS_PLASMA, + GAS_H2O, + GAS_HYPERNOB, + GAS_NITROUS, + GAS_NITRYL, + GAS_TRITIUM, + GAS_BZ, + GAS_STIMULUM, + GAS_PLUOXIUM ), "scrubbing" = 1, "widenet" = 1 @@ -558,7 +567,7 @@ for(var/device_id in A.air_scrub_names) send_signal(device_id, list( "power" = 1, - "set_filters" = list(/datum/gas/carbon_dioxide, /datum/gas/bz), + "set_filters" = list(GAS_CO2, GAS_BZ), "scrubbing" = 1, "widenet" = 0 ), signal_source) @@ -702,7 +711,7 @@ var/new_area_danger_level = 0 for(var/obj/machinery/airalarm/AA in A) if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted) - new_area_danger_level = max(new_area_danger_level,AA.danger_level) + new_area_danger_level = clamp(max(new_area_danger_level, AA.danger_level), 0, 1) if(A.atmosalert(new_area_danger_level,src)) //if area was in normal state or if area was in alert state post_alert(new_area_danger_level) @@ -792,8 +801,22 @@ return ..() +/obj/machinery/airalarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) + if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) + return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) + return FALSE + +/obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) + switch(passed_mode) + if(RCD_UPGRADE_SIMPLE_CIRCUITS) + user.visible_message("[user] fabricates a circuit and places it into [src].", \ + "You adapt an air alarm circuit and slot it into the assembly.") + buildstage = 1 + update_icon() + return TRUE + return FALSE + /obj/machinery/airalarm/AltClick(mob/user) - ..() if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc)) return else diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index c6a49f5ed06b8..2c27e30874c3d 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -37,6 +37,7 @@ var/construction_type var/pipe_state //icon_state as a pipe item var/on = FALSE + var/interacts_with_air = FALSE /obj/machinery/atmospherics/examine(mob/user) . = ..() @@ -52,10 +53,13 @@ normalize_cardinal_directions() nodes = new(device_type) if (!armor) - armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70) + armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70, "stamina" = 0) ..() if(process) - SSair.atmos_machinery += src + if(interacts_with_air) + SSair.atmos_air_machinery += src + else + SSair.atmos_machinery += src SetInitDirections() /obj/machinery/atmospherics/Destroy() @@ -63,6 +67,8 @@ nullifyNode(i) SSair.atmos_machinery -= src + SSair.atmos_air_machinery -= src + SSair.pipenets_needing_rebuilt -= src dropContents() if(pipe_vision_img) @@ -167,8 +173,9 @@ if(istype(reference, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/P = reference P.destroy_network() - nodes[nodes.Find(reference)] = null - update_icon() + if(nodes.len >= nodes.Find(reference)) // for some reason things can still be acted on even though they've been deleted this is a really fucky way of detecting that + nodes[nodes.Find(reference)] = null + update_icon() /obj/machinery/atmospherics/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pipe)) //lets you autodrop @@ -212,11 +219,11 @@ if(unsafe_wrenching) unsafe_pressure_release(user, internal_pressure) - + if (user.client) SSmedals.UnlockMedal(MEDAL_UNWRENCH_HIGH_PRESSURE,user.client) - - + + deconstruct(TRUE) return TRUE @@ -224,9 +231,14 @@ return can_unwrench // Throws the user when they unwrench a pipe with a major difference between the internal and environmental pressure. -/obj/machinery/atmospherics/proc/unsafe_pressure_release(mob/user, pressures = null) +/obj/machinery/atmospherics/proc/unsafe_pressure_release(mob/living/carbon/user, pressures = null) if(!user) return + if(ishuman(user)) //other carbons like monkeys can unwrench but cant wear magboots + if(istype(user.shoes, /obj/item/clothing/shoes/magboots)) + var/obj/item/clothing/shoes/magboots/M = user.shoes + if(M.negates_gravity()) + return if(!pressures) var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() @@ -322,10 +334,10 @@ //PLACEHOLDER COMMENT FOR ME TO READD THE 1 (?) DS DELAY THAT WAS IMPLEMENTED WITH A... TIMER? /obj/machinery/atmospherics/AltClick(mob/living/L) + . = ..() if(istype(L) && is_type_in_list(src, GLOB.ventcrawl_machinery)) L.handle_ventcrawl(src) return - ..() /obj/machinery/atmospherics/proc/can_crawl_through() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm index 45ccaf1e867a0..2575f0feedb81 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm @@ -19,3 +19,10 @@ /obj/machinery/atmospherics/components/binary/getNodeConnects() return list(turn(dir, 180), dir) + +/obj/machinery/atmospherics/components/binary/proc/set_overlay_offset(pipe_layer) + switch(pipe_layer) + if(2) + return 1 + if(1, 3) + return 2 \ No newline at end of file diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 68cccb6a0102f..e92f6924f10a0 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -46,7 +46,7 @@ var/input_starting_pressure = air2.return_pressure() if(output_starting_pressure >= input_starting_pressure-10) - //Need at least 10 KPa difference to overcome friction in the mechanism + //Need at least 10 kPa difference to overcome friction in the mechanism last_pressure_delta = 0 return null @@ -116,7 +116,7 @@ if(node2) node2.atmosinit() node2.addMember(src) - build_network() + SSair.add_to_rebuild_queue(src) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm index 335649a826fb8..1c16833f9f669 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm @@ -14,7 +14,12 @@ name = "dual-port air vent" desc = "Has a valve and pump attached to it. There are two ports." + welded = FALSE + level = 1 + + interacts_with_air = TRUE + var/frequency = 0 var/id = null var/datum/radio_frequency/radio_connection @@ -45,6 +50,10 @@ var/image/cap = getpipeimage(icon, "dpvent_cap", dir, piping_layer = piping_layer) add_overlay(cap) + if(welded) + icon_state = "vent_welded" + return + if(!on || !is_operational()) icon_state = "vent_off" else @@ -52,7 +61,8 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/process_atmos() ..() - + if(welded || !is_operational() || !isopenturf(loc)) + return FALSE if(!on) return var/datum/gas_mixture/air1 = airs[1] @@ -73,16 +83,12 @@ if(air1.return_temperature() > 0) var/transfer_moles = pressure_delta*environment.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = air1.remove(transfer_moles) - //Removed can be null if there is no atmosphere in air1 - if(!removed) - return + loc.assume_air_moles(air1, transfer_moles) - loc.assume_air(removed) air_update_turf() var/datum/pipeline/parent1 = parents[1] - parent1.update = 1 + parent1.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED else //external -> output if(environment.return_pressure() > 0) @@ -94,15 +100,11 @@ moles_delta = min(moles_delta, (input_pressure_min - air2.return_pressure()) * our_multiplier) if(moles_delta > 0) - var/datum/gas_mixture/removed = loc.remove_air(moles_delta) - if (isnull(removed)) // in space - return - - air2.merge(removed) + loc.transfer_air(air2, moles_delta) air_update_turf() var/datum/pipeline/parent2 = parents[2] - parent2.update = 1 + parent2.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED //Radio remote control @@ -176,6 +178,40 @@ broadcast_status() update_icon() +/obj/machinery/atmospherics/components/binary/dp_vent_pump/welder_act(mob/living/user, obj/item/I) + if(!I.tool_start_check(user, amount=0)) + return TRUE + to_chat(user, "You begin welding the dual-port vent...") + if(I.use_tool(src, user, 20, volume=50)) + if(!welded) + user.visible_message("[user] welds the dual-port vent shut.", "You weld the dual-port vent shut.", "You hear welding.") + welded = TRUE + else + user.visible_message("[user] unwelded the dual-port vent.", "You unweld the dual-port vent.", "You hear welding.") + welded = FALSE + update_icon() + pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) + pipe_vision_img.plane = ABOVE_HUD_PLANE + return TRUE + +/obj/machinery/atmospherics/components/binary/dp_vent_pump/examine(mob/user) + . = ..() + if(welded) + . += "It seems welded shut." + +/obj/machinery/atmospherics/components/binary/dp_vent_pump/can_crawl_through() + return !welded + +/obj/machinery/atmospherics/components/binary/dp_vent_pump/attack_alien(mob/user) + if(!welded || !(do_after(user, 20, target = src))) + return + user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the dual-port vent.", "You hear loud scraping noises.") + welded = FALSE + update_icon() + pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) + pipe_vision_img.plane = ABOVE_HUD_PLANE + playsound(loc, 'sound/weapons/bladeslice.ogg', 100, 1) + /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume name = "large dual-port air vent" diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index ecf8d47da9f75..99724e43964bb 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -3,6 +3,7 @@ Passive gate is similar to the regular pump except: * It doesn't require power * Can not transfer low pressure to higher pressure (so it's more like a valve where you can control the flow) +* Passes gas when output pressure lower than target pressure */ @@ -10,7 +11,7 @@ Passive gate is similar to the regular pump except: icon_state = "passgate_map-2" name = "passive gate" - desc = "A one-way air valve that does not require power." + desc = "A one-way air valve that does not require power. Passes gas when the output pressure is lower than the target pressure." can_unwrench = TRUE shift_underlay_only = FALSE @@ -33,13 +34,16 @@ Passive gate is similar to the regular pump except: if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/binary/passive_gate/AltClick(mob/user) if(can_interact(user)) - target_pressure = MAX_OUTPUT_PRESSURE + target_pressure = ONE_ATMOSPHERE*100 + balloon_alert(user, "Set to [target_pressure] kPa") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/binary/passive_gate/Destroy() SSradio.remove_object(src,frequency) @@ -58,29 +62,9 @@ Passive gate is similar to the regular pump except: var/datum/gas_mixture/air1 = airs[1] var/datum/gas_mixture/air2 = airs[2] - - var/output_starting_pressure = air2.return_pressure() - var/input_starting_pressure = air1.return_pressure() - - if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10)) - //No need to pump gas if target is already reached or input pressure is too low - //Need at least 10 KPa difference to overcome friction in the mechanism - return - - //Calculate necessary moles to transfer using PV = nRT - if((air1.total_moles() > 0) && (air1.return_temperature()>0)) - var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2) - //Can not have a pressure delta that would cause output_pressure > input_pressure - - var/transfer_moles = pressure_delta*air2.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION) - - //Actually transfer the gas - var/datum/gas_mixture/removed = air1.remove(transfer_moles) - air2.merge(removed) - + if(air1.release_gas_to(air2, target_pressure)) update_parents() - //Radio remote control /obj/machinery/atmospherics/components/binary/passive_gate/proc/set_frequency(new_frequency) @@ -116,7 +100,7 @@ Passive gate is similar to the regular pump except: var/data = list() data["on"] = on data["pressure"] = round(target_pressure) - data["max_pressure"] = round(MAX_OUTPUT_PRESSURE) + data["max_pressure"] = round(ONE_ATMOSPHERE*100) return data /obj/machinery/atmospherics/components/binary/passive_gate/ui_act(action, params) @@ -130,15 +114,16 @@ Passive gate is similar to the regular pump except: if("pressure") var/pressure = params["pressure"] if(pressure == "max") - pressure = MAX_OUTPUT_PRESSURE + pressure = ONE_ATMOSPHERE*100 . = TRUE else if(text2num(pressure) != null) pressure = text2num(pressure) . = TRUE if(.) - target_pressure = clamp(pressure, 0, MAX_OUTPUT_PRESSURE) + target_pressure = clamp(pressure, 0, ONE_ATMOSPHERE*100) investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/binary/passive_gate/atmosinit() ..() @@ -158,7 +143,7 @@ Passive gate is similar to the regular pump except: on = !on if("set_output_pressure" in signal.data) - target_pressure = CLAMP(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50) + target_pressure = clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*100) if(on != old_on) investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) @@ -169,6 +154,7 @@ Passive gate is similar to the regular pump except: broadcast_status() update_icon() + ui_update() /obj/machinery/atmospherics/components/binary/passive_gate/power_change() ..() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm new file mode 100644 index 0000000000000..79b18a9a1c132 --- /dev/null +++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm @@ -0,0 +1,177 @@ +/obj/machinery/atmospherics/components/binary/pressure_valve + icon_state = "pvalve_map-2" + name = "pressure valve" + desc = "An activable one way valve that let gas pass through if the pressure on the input side is higher than the set pressure." + + can_unwrench = TRUE + shift_underlay_only = FALSE + + //Amount of pressure needed before the valve for it to open + var/target_pressure = ONE_ATMOSPHERE + //Frequency for radio signaling + var/frequency = 0 + //ID for radio signaling + var/id = null + //Connection to the radio processing + var/datum/radio_frequency/radio_connection + //Check if the gas is moving from one pipenet to the other + var/is_gas_flowing = FALSE + + construction_type = /obj/item/pipe/directional + pipe_state = "pvalve" + +/obj/machinery/atmospherics/components/binary/pressure_valve/CtrlClick(mob/user) + if(can_interact(user)) + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/pressure_valve/AltClick(mob/user) + if(can_interact(user)) + target_pressure = MAX_OUTPUT_PRESSURE + balloon_alert(user, "Set to [target_pressure] kPa") + investigate_log("was set to [target_pressure] kPa by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/pressure_valve/Destroy() + SSradio.remove_object(src,frequency) + if(radio_connection) + radio_connection = null + return ..() + +/obj/machinery/atmospherics/components/binary/pressure_valve/update_icon_nopipes() + if(on && is_operational()) + if(is_gas_flowing) + icon_state = "pvalve_flow" + else + icon_state = "pvalve_on" + else + icon_state = "pvalve_off" + +/obj/machinery/atmospherics/components/binary/pressure_valve/process_atmos() + + if(!on || !is_operational()) + return + + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + + if(air1.return_pressure() > target_pressure) + if(air1.release_gas_to(air2, air1.return_pressure())) + update_parents() + is_gas_flowing = TRUE + else + is_gas_flowing = FALSE + update_icon_nopipes() + +/obj/machinery/atmospherics/components/binary/pressure_valve/proc/set_frequency(new_frequency) + SSradio.remove_object(src, frequency) + frequency = new_frequency + if(frequency) + radio_connection = SSradio.add_object(src, frequency, filter = RADIO_ATMOSIA) + +/obj/machinery/atmospherics/components/binary/pressure_valve/proc/broadcast_status() + if(!radio_connection) + return + + var/datum/signal/signal = new(list( + "tag" = id, + "device" = "AGP", + "power" = on, + "target_output" = target_pressure, + "sigtype" = "status" + )) + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + +/obj/machinery/atmospherics/components/binary/pressure_valve/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AtmosPump", name) + ui.open() + +/obj/machinery/atmospherics/components/binary/pressure_valve/ui_data() + var/data = list() + data["on"] = on + data["pressure"] = round(target_pressure) + data["max_pressure"] = round(ONE_ATMOSPHERE*100) + return data + +/obj/machinery/atmospherics/components/binary/pressure_valve/ui_act(action, params) + if(..()) + return + switch(action) + if("power") + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + if("pressure") + var/pressure = params["pressure"] + if(pressure == "max") + pressure = ONE_ATMOSPHERE*100 + . = TRUE + else if(text2num(pressure) != null) + pressure = text2num(pressure) + . = TRUE + if(.) + target_pressure = clamp(pressure, 0, ONE_ATMOSPHERE*100) + investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) + update_icon() + +/obj/machinery/atmospherics/components/binary/pressure_valve/atmosinit() + . = ..() + if(frequency) + set_frequency(frequency) + +/obj/machinery/atmospherics/components/binary/pressure_valve/receive_signal(datum/signal/signal) + if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) + return + + var/old_on = on //for logging + + if("power" in signal.data) + on = text2num(signal.data["power"]) + + if("power_toggle" in signal.data) + on = !on + + if("set_output_pressure" in signal.data) + target_pressure = clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*100) + + if(on != old_on) + investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS) + + if("status" in signal.data) + broadcast_status() + return + + broadcast_status() + update_icon() + +/obj/machinery/atmospherics/components/binary/pressure_valve/can_unwrench(mob/user) + . = ..() + if(. && on && is_operational()) + to_chat(user, "You cannot unwrench [src], turn it off first!") + return FALSE + + +/obj/machinery/atmospherics/components/binary/pressure_valve/layer1 + piping_layer = 1 + icon_state= "pvalve_map-1" + +/obj/machinery/atmospherics/components/binary/pressure_valve/layer3 + piping_layer = 3 + icon_state= "pvalve_map-3" + +/obj/machinery/atmospherics/components/binary/pressure_valve/on + on = TRUE + icon_state = "pvalve_on_map-2" + +/obj/machinery/atmospherics/components/binary/pressure_valve/on/layer1 + piping_layer = 1 + icon_state= "pvalve_on_map-1" + +/obj/machinery/atmospherics/components/binary/pressure_valve/on/layer3 + piping_layer = 3 + icon_state= "pvalve_on_map-3" diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 84d5a8d02e080..b8962bd27fe42 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -34,13 +34,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/binary/pump/AltClick(mob/user) if(can_interact(user)) target_pressure = MAX_OUTPUT_PRESSURE + balloon_alert(user, "Set to [target_pressure] kPa") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/binary/pump/Destroy() SSradio.remove_object(src,frequency) @@ -55,24 +58,18 @@ // ..() if(!on || !is_operational()) return - var/datum/gas_mixture/air1 = airs[1] var/datum/gas_mixture/air2 = airs[2] - var/output_starting_pressure = air2.return_pressure() - if((target_pressure - output_starting_pressure) < 0.01) //No need to pump gas if target is already reached! return - //Calculate necessary moles to transfer using PV=nRT if((air1.total_moles() > 0) && (air1.return_temperature()>0)) var/pressure_delta = target_pressure - output_starting_pressure var/transfer_moles = pressure_delta*air2.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION) - //Actually transfer the gas - var/datum/gas_mixture/removed = air1.remove(transfer_moles) - air2.merge(removed) + air1.transfer_to(air2,transfer_moles) update_parents() @@ -132,7 +129,8 @@ if(.) target_pressure = clamp(pressure, 0, MAX_OUTPUT_PRESSURE) investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/binary/pump/atmosinit() ..() @@ -163,6 +161,7 @@ broadcast_status() update_icon() + ui_update() /obj/machinery/atmospherics/components/binary/pump/power_change() ..() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm new file mode 100644 index 0000000000000..ef08d93fa164d --- /dev/null +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm @@ -0,0 +1,129 @@ +/obj/machinery/atmospherics/components/binary/temperature_gate + icon_state = "tgate_map-2" + name = "temperature gate" + desc = "An activable gate that compares the input temperature with the interface set temperature to check if the gas can flow from the input side to the output side or not." + + can_unwrench = TRUE + shift_underlay_only = FALSE + construction_type = /obj/item/pipe/directional + pipe_state = "tgate" + + //If the temperature of the mix before the gate is lower than this, the gas will flow (if inverted, if the temperature of the mix before the gate is higher than this) + var/target_temperature = T0C + //Minimum allowed temperature + var/minimum_temperature = TCMB + //Maximum allowed temperature to be set + var/max_temperature = 4500 + //Check if the sensor should let gas pass if temperature in the mix is less/higher than the target one + var/inverted = FALSE + //Check if the gas is moving from one pipenet to the other + var/is_gas_flowing = FALSE + +/obj/machinery/atmospherics/components/binary/temperature_gate/CtrlClick(mob/user) + if(can_interact(user)) + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/temperature_gate/AltClick(mob/user) + if(can_interact(user)) + target_temperature = max_temperature + balloon_alert(user, "Set to [target_temperature] K") + investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + + +/obj/machinery/atmospherics/components/binary/temperature_gate/examine(mob/user) + . = ..() + . += "This device will let gas flow if the temperature of the gas in the input is [inverted ? "higher" : "lower"] than the temperature set in the interface." + if(inverted) + . += "The device settings can be restored if a multitool is used on it." + else + . += "The sensor's settings can be changed by using a multitool on the device." + +/obj/machinery/atmospherics/components/binary/temperature_gate/update_icon_nopipes() + if(on && is_operational()) + if(is_gas_flowing) + icon_state = "tgate_flow-[set_overlay_offset(piping_layer)]" + else + icon_state = "tgate_on-[set_overlay_offset(piping_layer)]" + else + icon_state = "tgate_off-[set_overlay_offset(piping_layer)]" + + +/obj/machinery/atmospherics/components/binary/temperature_gate/process_atmos() + + if(!on || !is_operational()) + return + + var/datum/gas_mixture/air1 = airs[1] + var/datum/gas_mixture/air2 = airs[2] + + if(!inverted) + if(air1.return_temperature() < target_temperature) + if(air1.release_gas_to(air2, air1.return_pressure())) + update_parents() + is_gas_flowing = TRUE + else + is_gas_flowing = FALSE + else + if(air1.return_temperature() > target_temperature) + if(air1.release_gas_to(air2, air1.return_pressure())) + update_parents() + is_gas_flowing = TRUE + else + is_gas_flowing = FALSE + update_icon_nopipes() + +/obj/machinery/atmospherics/components/binary/temperature_gate/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AtmosTempGate", name) + ui.open() + +/obj/machinery/atmospherics/components/binary/temperature_gate/ui_data() + var/data = list() + data["on"] = on + data["temperature"] = round(target_temperature) + data["min_temperature"] = round(minimum_temperature) + data["max_temperature"] = round(max_temperature) + return data + +/obj/machinery/atmospherics/components/binary/temperature_gate/ui_act(action, params) + if(..()) + return + switch(action) + if("power") + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + if("temperature") + var/temperature = params["temperature"] + if(temperature == "max") + temperature = max_temperature + . = TRUE + else if(text2num(temperature) != null) + temperature = text2num(temperature) + . = TRUE + if(.) + target_temperature = clamp(minimum_temperature, temperature, max_temperature) + investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS) + update_icon() + +/obj/machinery/atmospherics/components/binary/temperature_gate/can_unwrench(mob/user) + . = ..() + if(. && on && is_operational()) + to_chat(user, "You cannot unwrench [src], turn it off first!") + return FALSE + +/obj/machinery/atmospherics/components/binary/temperature_gate/multitool_act(mob/living/user, obj/item/multitool/I) + . = ..() + if (istype(I)) + inverted = !inverted + if(inverted) + balloon_alert(user, "Sensors set to release when the temperature is above") + else + balloon_alert(user, "Sensors set to default") + return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm new file mode 100644 index 0000000000000..867a2864e8ad9 --- /dev/null +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm @@ -0,0 +1,95 @@ +/obj/machinery/atmospherics/components/binary/temperature_pump + icon_state = "tpump_map-2" + name = "temperature pump" + desc = "A pump that moves heat from one pipeline to another. The input will get cooler, and the output will get hotter." + + can_unwrench = TRUE + shift_underlay_only = FALSE + + //Percent of the heat delta to transfer + var/heat_transfer_rate = 0 + //Maximum allowed transfer percentage + var/max_heat_transfer_rate = 100 + + construction_type = /obj/item/pipe/directional + pipe_state = "tpump" + +/obj/machinery/atmospherics/components/binary/temperature_pump/CtrlClick(mob/user) + if(can_interact(user)) + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/temperature_pump/AltClick(mob/user) + if(can_interact(user) && !(heat_transfer_rate == max_heat_transfer_rate)) + heat_transfer_rate = max_heat_transfer_rate + balloon_alert(user, "Set to [heat_transfer_rate]%") + investigate_log("was set to [heat_transfer_rate]% by [key_name(user)]", INVESTIGATE_ATMOS) + update_icon() + return ..() + +/obj/machinery/atmospherics/components/binary/temperature_pump/update_icon_nopipes() + icon_state = "tpump_[on && is_operational() ? "on" : "off"]-[set_overlay_offset(piping_layer)]" + +/obj/machinery/atmospherics/components/binary/temperature_pump/process_atmos() + + if(!on || !is_operational()) + return + + var/datum/gas_mixture/air_input = airs[1] + var/datum/gas_mixture/air_output = airs[2] + + if(!QUANTIZE(air_input.total_moles()) || !QUANTIZE(air_output.total_moles())) //Don't transfer if there's no gas + return + var/datum/gas_mixture/remove_input = air_input.remove_ratio(0.9) + var/datum/gas_mixture/remove_output = air_output.remove_ratio(0.9) + + var/coolant_temperature_delta = remove_input.return_temperature() - remove_output.return_temperature() + + if(coolant_temperature_delta > 0) + var/input_capacity = remove_input.heat_capacity() + var/output_capacity = air_output.heat_capacity() + + var/cooling_heat_amount = (heat_transfer_rate * 0.01) * coolant_temperature_delta * (input_capacity * output_capacity / (input_capacity + output_capacity)) + remove_input.set_temperature(max(remove_input.return_temperature() - (cooling_heat_amount / input_capacity), TCMB)) + remove_output.set_temperature(max(remove_output.return_temperature() + (cooling_heat_amount / output_capacity), TCMB)) + + air_input.merge(remove_input) + air_output.merge(remove_output) + + update_parents() + +/obj/machinery/atmospherics/components/binary/temperature_pump/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AtmosTempPump", name) + ui.open() + +/obj/machinery/atmospherics/components/binary/temperature_pump/ui_data() + var/data = list() + data["on"] = on + data["rate"] = round(heat_transfer_rate) + data["max_heat_transfer_rate"] = round(max_heat_transfer_rate) + return data + +/obj/machinery/atmospherics/components/binary/temperature_pump/ui_act(action, params) + if(..()) + return + switch(action) + if("power") + on = !on + investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE + if("rate") + var/rate = params["rate"] + if(rate == "max") + rate = max_heat_transfer_rate + . = TRUE + else if(text2num(rate) != null) + rate = text2num(rate) + . = TRUE + if(.) + heat_transfer_rate = clamp(rate, 0, max_heat_transfer_rate) + investigate_log("was set to [heat_transfer_rate]% by [key_name(usr)]", INVESTIGATE_ATMOS) + update_icon() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index cbf0cb95f2b9e..c7ecdb4b4e8cf 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -24,24 +24,40 @@ It's like a regular ol' straight pipe, but you can turn it on and off. var/switching = FALSE +/obj/machinery/atmospherics/components/binary/valve/Destroy() + //Should only happen on extreme circumstances + if(on) + //Let's give presumably now-severed pipenets a chance to scramble for what's happening at next SSair fire() + if(parents[1]) + parents[1].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + if(parents[2]) + parents[2].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED + . = ..() + /obj/machinery/atmospherics/components/binary/valve/update_icon_nopipes(animation = FALSE) normalize_cardinal_directions() if(animation) flick("[valve_type]valve_[on][!on]", src) icon_state = "[valve_type]valve_[on ? "on" : "off"]" -/obj/machinery/atmospherics/components/binary/valve/proc/toggle() +/** + * Called by finish_interact(), switch between open and closed, reconcile the air between two pipelines + */ +/obj/machinery/atmospherics/components/binary/valve/proc/set_open(to_open) + if(on == to_open) + return + SEND_SIGNAL(src, COMSIG_VALVE_SET_OPEN, to_open) + . = on + on = to_open if(on) - on = FALSE - update_icon_nopipes() - investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) - else - on = TRUE update_icon_nopipes() update_parents() var/datum/pipeline/parent1 = parents[1] parent1.reconcile_air() investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) + else + update_icon_nopipes() + investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS) /obj/machinery/atmospherics/components/binary/valve/interact(mob/user) add_fingerprint(usr) @@ -52,7 +68,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. addtimer(CALLBACK(src, .proc/finish_interact), 10) /obj/machinery/atmospherics/components/binary/valve/proc/finish_interact() - toggle() + set_open(!on) switching = FALSE @@ -66,6 +82,69 @@ It's like a regular ol' straight pipe, but you can turn it on and off. interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_OPEN | INTERACT_MACHINE_OPEN_SILICON +/obj/machinery/atmospherics/components/binary/valve/digital/Initialize() + . = ..() + AddComponent(/datum/component/usb_port, list(/obj/item/circuit_component/digital_valve)) + +/obj/item/circuit_component/digital_valve + display_name = "Digital Valve" + display_desc = "The interface for communicating with a digital valve." + + var/obj/machinery/atmospherics/components/binary/valve/digital/attached_valve + + /// Opens the digital valve + var/datum/port/input/open + /// Closes the digital valve + var/datum/port/input/close + + /// Whether the valve is currently open + var/datum/port/output/is_open + /// Sent when the valve is opened + var/datum/port/output/opened + /// Sent when the valve is closed + var/datum/port/output/closed + +/obj/item/circuit_component/digital_valve/Initialize() + . = ..() + open = add_input_port("Open", PORT_TYPE_SIGNAL) + close = add_input_port("Close", PORT_TYPE_SIGNAL) + + is_open = add_output_port("Is Open", PORT_TYPE_NUMBER) + opened = add_output_port("Opened", PORT_TYPE_SIGNAL) + closed = add_output_port("Closed", PORT_TYPE_SIGNAL) + +/obj/item/circuit_component/digital_valve/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/machinery/atmospherics/components/binary/valve/digital)) + attached_valve = shell + RegisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN, .proc/handle_valve_toggled) + +/obj/item/circuit_component/digital_valve/unregister_usb_parent(atom/movable/shell) + UnregisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN) + attached_valve = null + return ..() + +/obj/item/circuit_component/digital_valve/proc/handle_valve_toggled(datum/source, on) + is_open.set_output(on) + if(on) + opened.set_output(COMPONENT_SIGNAL) + else + closed.set_output(COMPONENT_SIGNAL) + +/obj/item/circuit_component/digital_valve/input_received(datum/port/input/port) + . = ..() + if(.) + return + + if(!attached_valve) + return + + if(COMPONENT_TRIGGERED_BY(open, port) && !attached_valve.on) + attached_valve.set_open(TRUE) + if(COMPONENT_TRIGGERED_BY(close, port) && attached_valve.on) + attached_valve.set_open(FALSE) + + /obj/machinery/atmospherics/components/binary/valve/digital/update_icon_nopipes(animation) if(!is_operational()) normalize_cardinal_directions() @@ -73,7 +152,6 @@ It's like a regular ol' straight pipe, but you can turn it on and off. return ..() - /obj/machinery/atmospherics/components/binary/valve/layer1 piping_layer = 1 icon_state = "mvalve_map-1" diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index b95f45d34473c..092253bbf7ede 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -35,13 +35,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/binary/volume_pump/AltClick(mob/user) if(can_interact(user)) transfer_rate = MAX_TRANSFER_RATE + balloon_alert(user, "Set to [transfer_rate] L/s") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/binary/volume_pump/Destroy() SSradio.remove_object(src,frequency) @@ -69,19 +72,15 @@ if(overclocked && (output_starting_pressure-input_starting_pressure > 1000))//Overclocked pumps can only force gas a certain amount. return - - var/transfer_ratio = transfer_rate/air1.return_volume() - - var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio) - if(overclocked)//Some of the gas from the mixture leaks to the environment when overclocked var/turf/open/T = loc if(istype(T)) - var/datum/gas_mixture/leaked = removed.remove_ratio(VOLUME_PUMP_LEAK_AMOUNT) + var/datum/gas_mixture/leaked = air1.remove_ratio(VOLUME_PUMP_LEAK_AMOUNT) T.assume_air(leaked) T.air_update_turf() - air2.merge(removed) + var/transfer_ratio = transfer_rate / air1.return_volume() + air1.transfer_ratio_to(air2,transfer_ratio) update_parents() @@ -150,7 +149,8 @@ if(.) transfer_rate = clamp(rate, 0, MAX_TRANSFER_RATE) investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS) - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/binary/volume_pump/receive_signal(datum/signal/signal) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) @@ -177,6 +177,7 @@ broadcast_status() update_icon() + ui_update() /obj/machinery/atmospherics/components/binary/volume_pump/power_change() ..() diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index 9295c702cc0c3..5fdb40cf4b759 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -65,8 +65,10 @@ // Pipenet stuff; housekeeping /obj/machinery/atmospherics/components/nullifyNode(i) - if(nodes[i]) + // 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]) ..() @@ -76,7 +78,7 @@ /obj/machinery/atmospherics/components/build_network() for(var/i in 1 to device_type) - if(!parents[i]) + if(QDELETED(parents[i])) parents[i] = new /datum/pipeline() var/datum/pipeline/P = parents[i] P.build_pipeline(src) @@ -87,10 +89,27 @@ 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. + */ + if(!(reference.other_atmosmch.len || reference.members.len || QDESTROYING(reference))) + qdel(reference) parents[i] = null +// We should return every air sharing a parent /obj/machinery/atmospherics/components/returnPipenetAir(datum/pipeline/reference) - return airs[parents.Find(reference)] + for(var/i in 1 to device_type) + if(parents[i] == reference) + if(.) + if(!islist(.)) + . = list(.) + . += airs[i] + else + . = airs[i] /obj/machinery/atmospherics/components/pipeline_expansion(datum/pipeline/reference) if(reference) @@ -121,14 +140,9 @@ times_lost++ var/shared_loss = lost/times_lost - var/datum/gas_mixture/to_release for(var/i in 1 to device_type) var/datum/gas_mixture/air = airs[i] - if(!to_release) - to_release = air.remove(shared_loss) - continue - to_release.merge(air.remove(shared_loss)) - T.assume_air(to_release) + T.assume_air_moles(air, shared_loss) air_update_turf(1) /obj/machinery/atmospherics/components/proc/safe_input(var/title, var/text, var/default_set) @@ -143,9 +157,11 @@ for(var/i in 1 to device_type) var/datum/pipeline/parent = parents[i] if(!parent) - WARNING("Component is missing a pipenet! Rebuilding...") - build_network() - parent.update = 1 + //WARNING("Component is missing a pipenet! Rebuilding...") + //At pre-SSair_rebuild_pipenets times, not having a parent wasn't supposed to happen + SSair.add_to_rebuild_queue(src) + continue + parent.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED /obj/machinery/atmospherics/components/returnPipenets() . = list() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index eacea6d4416fd..96b330a961dd7 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -21,13 +21,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/trinary/filter/AltClick(mob/user) if(can_interact(user)) transfer_rate = MAX_TRANSFER_RATE + balloon_alert(user, "Set to [transfer_rate] L/s") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/trinary/filter/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) @@ -85,37 +88,17 @@ //No need to transfer if target is already full! return - var/transfer_ratio = transfer_rate/air1.return_volume() + var/transfer_ratio = transfer_rate / air1.return_volume() //Actually transfer the gas if(transfer_ratio <= 0) return - var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio) - - if(!removed) - return - - var/filtering = TRUE - if(!ispath(filter_type)) - if(filter_type) - filter_type = gas_id2path(filter_type) //support for mappers so they don't need to type out paths - else - filtering = FALSE - - if(filtering && removed.get_moles(filter_type)) - var/datum/gas_mixture/filtered_out = new - - filtered_out.set_temperature(removed.return_temperature()) - filtered_out.set_moles(filter_type, removed.get_moles(filter_type)) - - removed.set_moles(filter_type, 0) - - var/datum/gas_mixture/target = (air2.return_pressure() < MAX_OUTPUT_PRESSURE ? air2 : air1) //if there's no room for the filtered gas; just leave it in air1 - target.merge(filtered_out) - - air3.merge(removed) + if(filter_type && air2.return_pressure() <= 9000) + air1.scrub_into(air2, transfer_ratio, list(filter_type)) + if(air3.return_pressure() <= 9000) + air1.transfer_ratio_to(air3, transfer_ratio) update_parents() @@ -140,10 +123,9 @@ data["max_rate"] = round(MAX_TRANSFER_RATE) data["filter_types"] = list() - data["filter_types"] += list(list("name" = "Nothing", "path" = "", "selected" = !filter_type)) - for(var/path in GLOB.meta_gas_info) - var/list/gas = GLOB.meta_gas_info[path] - data["filter_types"] += list(list("name" = gas[META_GAS_NAME], "id" = gas[META_GAS_ID], "selected" = (path == gas_id2path(filter_type)))) + data["filter_types"] += list(list("name" = "Nothing", "id" = "", "selected" = !filter_type)) + for(var/id in GLOB.gas_data.ids) + data["filter_types"] += list(list("name" = GLOB.gas_data.names[id], "id" = id, "selected" = (id == filter_type))) return data @@ -173,13 +155,14 @@ if("filter") filter_type = null var/filter_name = "nothing" - var/gas = gas_id2path(params["mode"]) - if(gas in GLOB.meta_gas_info) + var/gas = params["mode"] + if(gas in GLOB.gas_data.names) filter_type = gas - filter_name = GLOB.meta_gas_info[gas][META_GAS_NAME] + filter_name = GLOB.gas_data.names[gas] investigate_log("was set to filter [filter_name] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/trinary/filter/can_unwrench(mob/user) . = ..() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index ae7922605da1f..f3e55f45c3bbd 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -23,13 +23,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/trinary/mixer/AltClick(mob/user) if(can_interact(user)) target_pressure = MAX_OUTPUT_PRESSURE + balloon_alert(user, "Set to [target_pressure] kPa") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/trinary/mixer/update_icon() cut_overlays() @@ -117,19 +120,17 @@ //Actually transfer the gas if(transfer_moles1) - var/datum/gas_mixture/removed1 = air1.remove(transfer_moles1) - air3.merge(removed1) + air1.transfer_to(air3, transfer_moles1) var/datum/pipeline/parent1 = parents[1] - parent1.update = TRUE + parent1.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED if(transfer_moles2) - var/datum/gas_mixture/removed2 = air2.remove(transfer_moles2) - air3.merge(removed2) + air2.transfer_to(air3, transfer_moles2) var/datum/pipeline/parent2 = parents[2] - parent2.update = TRUE + parent2.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED var/datum/pipeline/parent3 = parents[3] - parent3.update = TRUE + parent3.update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED /obj/machinery/atmospherics/components/trinary/mixer/ui_state(mob/user) @@ -179,7 +180,8 @@ adjust_node1_value(100 - value) investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/trinary/mixer/proc/adjust_node1_value(newValue) node1_concentration = newValue / 100 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 46c5ed12699e9..1c11922777f4f 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -1,4 +1,6 @@ #define CRYOMOBS 'icons/obj/cryo_mobs.dmi' +#define CRYO_MULTIPLY_FACTOR 1.5 // Multiply factor is used with efficiency to multiply Tx quantity and how much extra is transfered to occupant magically. +#define CRYO_TX_QTY 0.4 // Tx quantity is how much volume should be removed from the cell's beaker - multiplied by delta_time /obj/machinery/atmospherics/components/unary/cryo_cell name = "cryo cell" @@ -6,7 +8,7 @@ icon_state = "pod-off" density = TRUE max_integrity = 350 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30, "stamina" = 0) layer = ABOVE_WINDOW_LAYER state_open = FALSE circuit = /obj/item/circuitboard/machine/cryo_tube @@ -25,7 +27,6 @@ var/conduction_coefficient = 0.3 var/obj/item/reagent_containers/glass/beaker = null - var/reagent_transfer = 0 var/obj/item/radio/radio var/radio_key = /obj/item/encryptionkey/headset_med @@ -73,7 +74,7 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) //this is leaving out everything but efficiency since they follow the same idea of "better beaker, better results" . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Efficiency at [efficiency*100]%." + . += "The status display reads: Efficiency at [efficiency*100]%." /obj/machinery/atmospherics/components/unary/cryo_cell/Destroy() QDEL_NULL(radio) @@ -83,7 +84,13 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/contents_explosion(severity, target) ..() if(beaker) - beaker.ex_act(severity, target) + switch(severity) + if(EXPLODE_DEVASTATE) + SSexplosions.high_mov_atom += beaker + if(EXPLODE_HEAVY) + SSexplosions.med_mov_atom += beaker + if(EXPLODE_LIGHT) + SSexplosions.low_mov_atom += beaker /obj/machinery/atmospherics/components/unary/cryo_cell/handle_atom_del(atom/A) ..() @@ -166,19 +173,32 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/nap_violation(mob/violator) open_machine() -/obj/machinery/atmospherics/components/unary/cryo_cell/process() - ..() - +/obj/machinery/atmospherics/components/unary/cryo_cell/process(delta_time) if(!on) return + if(!is_operational()) on = FALSE update_icon() return - if(!occupant) + + if(!occupant)//Won't operate unless there's an occupant. + on = FALSE + update_icon() + var/msg = "Aborting. No occupant detected." + radio.talk_into(src, msg, radio_channel) + return + + if(!beaker?.reagents?.reagent_list.len) //No beaker or beaker without reagents with stop the machine from running. + on = FALSE + update_icon() + var/msg = "Aborting. No beaker or chemicals installed." + radio.talk_into(src, msg, radio_channel) return var/mob/living/mob_occupant = occupant + if(mob_occupant.on_fire) //Extinguish occupant, happens after the occupant is healed and ejected. + mob_occupant.ExtinguishMob() if(!check_nap_violations()) return if(mob_occupant.stat == DEAD) // We don't bother with dead people. @@ -199,15 +219,11 @@ if(air1.total_moles()) if(mob_occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic. - mob_occupant.Sleeping((mob_occupant.bodytemperature * sleep_factor) * 2000) - mob_occupant.Unconscious((mob_occupant.bodytemperature * unconscious_factor) * 2000) - if(beaker) - if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic. - beaker.reagents.trans_to(occupant, 1, efficiency * 0.25) // Transfer reagents. - beaker.reagents.reaction(occupant, VAPOR) - air1.adjust_moles(/datum/gas/oxygen, -max(0,air1.get_moles(/datum/gas/oxygen) - 2 / efficiency)) //Let's use gas for this - if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker). - reagent_transfer = 0 + mob_occupant.Sleeping((mob_occupant.bodytemperature * sleep_factor) * 1000 * delta_time) + mob_occupant.Unconscious((mob_occupant.bodytemperature * unconscious_factor) * 1000 * delta_time) + if(beaker)//How much to transfer. As efficiency is increased, less reagent from the beaker is used and more is magically transferred to occupant + beaker.reagents.trans_to(occupant, (CRYO_TX_QTY / (efficiency * CRYO_MULTIPLY_FACTOR)) * delta_time, efficiency * CRYO_MULTIPLY_FACTOR, method = VAPOR) // Transfer reagents. + use_power(1000 * efficiency) return 1 @@ -219,9 +235,11 @@ var/datum/gas_mixture/air1 = airs[1] - if(!nodes[1] || !airs[1] || air1.get_moles(/datum/gas/oxygen) < 5) // Turn off if the machine won't work. + if(!nodes[1] || !airs[1] || air1.get_moles(GAS_O2) < 5) // Turn off if the machine won't work due to not having enough moles to operate. on = FALSE update_icon() + var/msg = "Aborting. Not enough gas present to operate." + radio.talk_into(src, msg, radio_channel) return if(occupant) @@ -241,7 +259,9 @@ air1.set_temperature(max(air1.return_temperature() - heat / air_heat_capacity, TCMB)) mob_occupant.adjust_bodytemperature(heat / heat_capacity, TCMB) - air1.set_moles(/datum/gas/oxygen, max(0,air1.get_moles(/datum/gas/oxygen) - 0.5 / efficiency)) // Magically consume gas? Why not, we run on cryo magic. + air1.set_moles(GAS_O2, max(0,air1.get_moles(GAS_O2) - 0.5 / efficiency)) // Magically consume gas? Why not, we run on cryo magic. + + update_parents() /obj/machinery/atmospherics/components/unary/cryo_cell/power_change() ..() @@ -340,6 +360,7 @@ if(!ui) ui = new(user, src, "Cryo") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/atmospherics/components/unary/cryo_cell/ui_data() var/list/data = list() @@ -420,24 +441,24 @@ . = TRUE /obj/machinery/atmospherics/components/unary/cryo_cell/CtrlClick(mob/user) - if(can_interact(user) && !state_open) + if(user.can_interact_with(src) && !state_open && occupant != user) on = !on update_icon() return ..() /obj/machinery/atmospherics/components/unary/cryo_cell/AltClick(mob/user) - if(can_interact(user)) + if(user.can_interact_with(src) && occupant != user) if(state_open) close_machine() else open_machine() - return ..() + return /obj/machinery/atmospherics/components/unary/cryo_cell/update_remote_sight(mob/living/user) return // we don't see the pipe network while inside cryo. /obj/machinery/atmospherics/components/unary/cryo_cell/get_remote_view_fullscreens(mob/user) - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1) /obj/machinery/atmospherics/components/unary/cryo_cell/can_crawl_through() return // can't ventcrawl in or out of cryo. @@ -466,6 +487,8 @@ if(node) node.atmosinit() node.addMember(src) - build_network() + SSair.add_to_rebuild_queue(src) #undef CRYOMOBS +#undef CRYO_MULTIPLY_FACTOR +#undef CRYO_TX_QTY diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm index c0dfc5633e9fd..25b6ad13287e2 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm @@ -10,7 +10,7 @@ layer = LOW_OBJ_LAYER - var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null + var/datum/weakref/partner_ref = null var/update_cycle pipe_state = "heunary" @@ -33,20 +33,26 @@ PIPING_LAYER_SHIFT(src, piping_layer) /obj/machinery/atmospherics/components/unary/heat_exchanger/atmosinit() + var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = partner_ref?.resolve() if(!partner) + partner_ref = null var/partner_connect = turn(dir,180) for(var/obj/machinery/atmospherics/components/unary/heat_exchanger/target in get_step(src,partner_connect)) if(target.dir & get_dir(src,target)) - partner = target - partner.partner = src + partner_ref = WEAKREF(target) + target.partner_ref = WEAKREF(src) break ..() /obj/machinery/atmospherics/components/unary/heat_exchanger/process_atmos() ..() - if(!partner || SSair.times_fired <= update_cycle) + var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = partner_ref?.resolve() + if(!partner) + partner_ref = null + return + if(SSair.times_fired <= update_cycle) return update_cycle = SSair.times_fired diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 8f92bda897bc6..48a963cf292cd 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -19,6 +19,7 @@ var/datum/radio_frequency/radio_connection level = 1 + interacts_with_air = TRUE layer = GAS_SCRUBBER_LAYER pipe_state = "injector" @@ -30,13 +31,16 @@ if(can_interact(user)) on = !on update_icon() + ui_update() return ..() /obj/machinery/atmospherics/components/unary/outlet_injector/AltClick(mob/user) if(can_interact(user)) volume_rate = MAX_TRANSFER_RATE + balloon_alert(user, "Set to [volume_rate] L/s") update_icon() - return ..() + ui_update() + return /obj/machinery/atmospherics/components/unary/outlet_injector/Destroy() SSradio.remove_object(src,frequency) @@ -64,20 +68,17 @@ injecting = 0 - if(!on || !is_operational()) + if(!on || !is_operational() || !isopenturf(loc)) return var/datum/gas_mixture/air_contents = airs[1] - if(air_contents.return_temperature() > 0) - var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION) - - var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) + if(air_contents != null) + if(air_contents.return_temperature() > 0) + loc.assume_air_ratio(air_contents, volume_rate / air_contents.return_volume()) + air_update_turf() - loc.assume_air(removed) - air_update_turf() - - update_parents() + update_parents() /obj/machinery/atmospherics/components/unary/outlet_injector/proc/inject() @@ -89,9 +90,7 @@ injecting = 1 if(air_contents.return_temperature() > 0) - var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) - loc.assume_air(removed) + loc.assume_air_ratio(air_contents, volume_rate / air_contents.return_volume()) update_parents() flick("inje_inject", src) @@ -146,6 +145,7 @@ if(!("status" in signal.data)) //do not update_icon update_icon() + ui_update() @@ -185,8 +185,9 @@ if(.) volume_rate = clamp(rate, 0, MAX_TRANSFER_RATE) investigate_log("was set to [volume_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS) - update_icon() - broadcast_status() + if(.) + update_icon() + broadcast_status() /obj/machinery/atmospherics/components/unary/outlet_injector/can_unwrench(mob/user) . = ..() @@ -218,7 +219,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos frequency = FREQ_ATMOS_STORAGE on = TRUE - volume_rate = 200 + volume_rate = MAX_TRANSFER_RATE /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste name = "atmos waste outlet injector" diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm index 572296f03f597..61d21bc3596d6 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm @@ -6,6 +6,7 @@ can_unwrench = TRUE level = 1 + interacts_with_air = TRUE layer = GAS_SCRUBBER_LAYER pipe_state = "pvent" @@ -19,29 +20,25 @@ /obj/machinery/atmospherics/components/unary/passive_vent/process_atmos() ..() + if(isclosedturf(loc)) + return - var/datum/gas_mixture/environment = loc.return_air() - var/environment_pressure = environment.return_pressure() - var/pressure_delta = abs(environment_pressure - airs[1].return_pressure()) - - if((environment.return_temperature() || airs[1].return_temperature()) && pressure_delta > 0.5) - if(environment_pressure < airs[1].return_pressure()) - var/air_temperature = (environment.return_temperature() > 0) ? environment.return_temperature() : airs[1].return_temperature() - var/transfer_moles = (pressure_delta * environment.return_volume()) / (air_temperature * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = airs[1].remove(transfer_moles) - loc.assume_air(removed) - air_update_turf() - else - var/air_temperature = (airs[1].return_temperature() > 0) ? airs[1].return_temperature() : environment.return_temperature() - var/output_volume = airs[1].return_volume() - var/transfer_moles = (pressure_delta * output_volume) / (air_temperature * R_IDEAL_GAS_EQUATION) - transfer_moles = min(transfer_moles, environment.total_moles()*airs[1].return_volume()/environment.return_volume()) - var/datum/gas_mixture/removed = loc.remove_air(transfer_moles) - if(isnull(removed)) - return - airs[1].merge(removed) - air_update_turf() - update_parents() + var/active = FALSE + var/datum/gas_mixture/external = loc.return_air() + var/datum/gas_mixture/internal = airs[1] + var/external_pressure = external.return_pressure() + var/internal_pressure = internal.return_pressure() + var/pressure_delta = abs(external_pressure - internal_pressure) + + if(pressure_delta > 0.5) + equalize_all_gases_in_list(list(internal,external)) + active = TRUE + + active = internal.temperature_share(external, OPEN_HEAT_TRANSFER_COEFFICIENT) || active + + if(active) + air_update_turf() + update_parents() /obj/machinery/atmospherics/components/unary/passive_vent/can_crawl_through() return TRUE diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm index 512d693555614..3ca9fd77e69b4 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm @@ -21,7 +21,7 @@ air_contents.set_temperature(T20C) if(gas_type) air_contents.set_moles(gas_type, AIR_CONTENTS) - name = "[name] ([GLOB.meta_gas_info[gas_type][META_GAS_NAME]])" + name = "[name] ([GLOB.gas_data.names[gas_type]])" setPipingLayer(piping_layer) @@ -32,20 +32,20 @@ /obj/machinery/atmospherics/components/unary/tank/air/New() ..() var/datum/gas_mixture/air_contents = airs[1] - air_contents.set_moles(/datum/gas/oxygen, AIR_CONTENTS * 0.2) - air_contents.set_moles(/datum/gas/nitrogen, AIR_CONTENTS * 0.8) + air_contents.set_moles(GAS_O2, AIR_CONTENTS * 0.2) + air_contents.set_moles(GAS_N2, AIR_CONTENTS * 0.8) /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide - gas_type = /datum/gas/carbon_dioxide + gas_type = GAS_CO2 /obj/machinery/atmospherics/components/unary/tank/toxins icon_state = "orange" - gas_type = /datum/gas/plasma + gas_type = GAS_PLASMA /obj/machinery/atmospherics/components/unary/tank/oxygen icon_state = "blue" - gas_type = /datum/gas/oxygen + gas_type = GAS_O2 /obj/machinery/atmospherics/components/unary/tank/nitrogen icon_state = "red" - gas_type = /datum/gas/nitrogen + gas_type = GAS_N2 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 68ac81f9936ea..74acbef1cef7c 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -2,12 +2,12 @@ icon = 'icons/obj/atmospherics/components/thermomachine.dmi' icon_state = "freezer" - name = "thermomachine" + name = "Thermomachine" desc = "Heats or cools gas in connected pipes." density = TRUE max_integrity = 300 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30, "stamina" = 0) layer = OBJ_LAYER circuit = /obj/item/circuitboard/machine/thermomachine @@ -19,27 +19,58 @@ var/icon_state_on = "freezer_1" var/icon_state_open = "freezer-o" - var/min_temperature = 0 - var/max_temperature = 0 + var/min_temperature = T20C //actual temperature will be defined by RefreshParts() and by the cooling var + var/max_temperature = T20C //actual temperature will be defined by RefreshParts() and by the cooling var var/target_temperature = T20C var/heat_capacity = 0 var/interactive = TRUE // So mapmakers can disable interaction. + var/cooling = TRUE + var/base_heating = 140 + var/base_cooling = 170 /obj/machinery/atmospherics/components/unary/thermomachine/Initialize() . = ..() initialize_directions = dir + RefreshParts() + update_icon() + +/obj/machinery/atmospherics/components/unary/thermomachine/proc/swap_function() + cooling = !cooling + if(cooling) + icon_state_off = "freezer" + icon_state_on = "freezer_1" + icon_state_open = "freezer-o" + else + icon_state_off = "heater" + icon_state_on = "heater_1" + icon_state_open = "heater-o" + target_temperature = T20C + RefreshParts() + update_icon() /obj/machinery/atmospherics/components/unary/thermomachine/on_construction() var/obj/item/circuitboard/machine/thermomachine/board = circuit if(board) piping_layer = board.pipe_layer - ..(dir, piping_layer) + return ..(dir, piping_layer) /obj/machinery/atmospherics/components/unary/thermomachine/RefreshParts() - var/B - for(var/obj/item/stock_parts/matter_bin/M in component_parts) - B += M.rating - heat_capacity = 5000 * ((B - 1) ** 2) + var/calculated_bin_rating + for(var/obj/item/stock_parts/matter_bin/bin in component_parts) + calculated_bin_rating += bin.rating + heat_capacity = 5000 * ((calculated_bin_rating - 1) ** 2) + min_temperature = T20C + max_temperature = T20C + if(cooling) + var/calculated_laser_rating + for(var/obj/item/stock_parts/micro_laser/laser in component_parts) + calculated_laser_rating += laser.rating + min_temperature = max(T0C - (base_cooling + calculated_laser_rating * 15), TCMB) //73.15K with T1 stock parts + else + var/calculated_laser_rating + for(var/obj/item/stock_parts/micro_laser/laser in component_parts) + calculated_laser_rating += laser.rating + max_temperature = T20C + (base_heating * calculated_laser_rating) //573.15K with T1 stock parts /obj/machinery/atmospherics/components/unary/thermomachine/update_icon() cut_overlays() @@ -65,9 +96,20 @@ . += "The status display reads: Efficiency [(heat_capacity/5000)*100]%." . += "Temperature range [min_temperature]K - [max_temperature]K ([(T0C-min_temperature)*-1]C - [(T0C-max_temperature)*-1]C)." +/obj/machinery/atmospherics/components/unary/thermomachine/AltClick(mob/living/user) + if(!can_interact(user)) + return + if(cooling) + target_temperature = min_temperature + investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) + else + target_temperature = max_temperature + investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) + balloon_alert(user, "Set to [target_temperature] K") + /obj/machinery/atmospherics/components/unary/thermomachine/process_atmos() ..() - if(!on || !nodes[1]) + if(!is_operational() || !on || !nodes[1]) //if it has no power or its switched off, dont process atmos return var/datum/gas_mixture/air_contents = airs[1] @@ -109,14 +151,16 @@ if(node) node.disconnect(src) nodes[1] = null - nullifyPipenet(parents[1]) + //Sometimes this gets called more than once per atmos tick; i.e. before the incoming build_network call by SSAIR_REBUILD_PIPENETS, so we check this here. + if(parents[1]) + nullifyPipenet(parents[1]) atmosinit() node = nodes[1] if(node) node.atmosinit() node.addMember(src) - build_network() + SSair.add_to_rebuild_queue(src) return TRUE /obj/machinery/atmospherics/components/unary/thermomachine/ui_status(mob/user) @@ -133,10 +177,12 @@ if(!ui) ui = new(user, src, "ThermoMachine") ui.open() + ui.set_autoupdate(TRUE) // Air temperature and pressure /obj/machinery/atmospherics/components/unary/thermomachine/ui_data(mob/user) var/list/data = list() data["on"] = on + data["cooling"] = cooling data["min"] = min_temperature data["max"] = max_temperature @@ -159,6 +205,10 @@ use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE + if("cooling") + swap_function() + investigate_log("was changed to [cooling ? "cooling" : "heating"] by [key_name(usr)]", INVESTIGATE_ATMOS) + . = TRUE if("target") var/target = params["target"] var/adjust = text2num(params["adjust"]) @@ -175,8 +225,8 @@ if(.) target_temperature = clamp(target, min_temperature, max_temperature) investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS) - - update_icon() + if(.) + update_icon() /obj/machinery/atmospherics/components/unary/thermomachine/CtrlClick(mob/living/user) if(!can_interact(user)) @@ -185,14 +235,11 @@ update_icon() /obj/machinery/atmospherics/components/unary/thermomachine/freezer - name = "freezer" icon_state = "freezer" icon_state_off = "freezer" icon_state_on = "freezer_1" icon_state_open = "freezer-o" - max_temperature = T20C - min_temperature = 170 //actual minimum temperature is defined by RefreshParts() - circuit = /obj/item/circuitboard/machine/thermomachine/freezer + cooling = TRUE /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on on = TRUE @@ -210,40 +257,13 @@ . = ..() target_temperature = T0C-20 //Cold enough to prevent Miasma -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/RefreshParts() - ..() - var/L - for(var/obj/item/stock_parts/micro_laser/M in component_parts) - L += M.rating - min_temperature = max(T0C - (initial(min_temperature) + L * 15), TCMB) //73.15K with T1 stock parts - -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/AltClick(mob/living/user) - if(!can_interact(user)) - return - target_temperature = min_temperature - /obj/machinery/atmospherics/components/unary/thermomachine/heater - name = "heater" icon_state = "heater" icon_state_off = "heater" icon_state_on = "heater_1" icon_state_open = "heater-o" - max_temperature = 140 //actual maximum temperature is defined by RefreshParts() - min_temperature = T20C - circuit = /obj/item/circuitboard/machine/thermomachine/heater + cooling = FALSE /obj/machinery/atmospherics/components/unary/thermomachine/heater/on on = TRUE icon_state = "heater_1" - -/obj/machinery/atmospherics/components/unary/thermomachine/heater/RefreshParts() - ..() - var/L - for(var/obj/item/stock_parts/micro_laser/M in component_parts) - L += M.rating - max_temperature = T20C + (initial(max_temperature) * L) //573.15K with T1 stock parts - -/obj/machinery/atmospherics/components/unary/thermomachine/heater/AltClick(mob/living/user) - if(!can_interact(user)) - return - target_temperature = max_temperature diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index ba9764d63cebd..05a5047f81403 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -17,6 +17,8 @@ level = 1 layer = GAS_SCRUBBER_LAYER + interacts_with_air = TRUE + var/id_tag = null var/pump_direction = RELEASING @@ -90,7 +92,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/process_atmos() ..() - if(!is_operational()) + if(!is_operational() || !isopenturf(loc)) return if(!nodes[1]) on = FALSE @@ -99,6 +101,10 @@ var/datum/gas_mixture/air_contents = airs[1] var/datum/gas_mixture/environment = loc.return_air() + + if(environment == null) + return + var/environment_pressure = environment.return_pressure() if(pump_direction & RELEASING) // internal -> external @@ -113,9 +119,7 @@ if(air_contents.return_temperature() > 0) var/transfer_moles = pressure_delta*environment.return_volume()/(air_contents.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) - - loc.assume_air(removed) + loc.assume_air_moles(air_contents, transfer_moles) air_update_turf() else // external -> internal @@ -128,11 +132,7 @@ moles_delta = min(moles_delta, (internal_pressure_bound - air_contents.return_pressure()) * our_multiplier) if(moles_delta > 0) - var/datum/gas_mixture/removed = loc.remove_air(moles_delta) - if (isnull(removed)) // in space - return - - air_contents.merge(removed) + loc.transfer_air(air_contents, moles_delta) air_update_turf() update_parents() @@ -288,7 +288,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/attack_alien(mob/user) if(!welded || !(do_after(user, 20, target = src))) return - user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the vent", "You hear loud scraping noises.") + user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the vent.", "You hear loud scraping noises.") welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 323e1597e01df..bb71cbd73b59f 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -14,10 +14,12 @@ level = 1 layer = GAS_SCRUBBER_LAYER + interacts_with_air = TRUE + var/id_tag = null var/scrubbing = SCRUBBING //0 = siphoning, 1 = scrubbing - var/filter_types = list(/datum/gas/carbon_dioxide, /datum/gas/bz) + var/filter_types = list(GAS_CO2, GAS_BZ) var/volume_rate = 200 var/widenet = 0 //is this scrubber acting on the 3x3 area around it. var/list/turf/adjacent_turfs = list() @@ -34,11 +36,6 @@ if(!id_tag) id_tag = assign_uid_vents() - for(var/f in filter_types) - if(istext(f)) - filter_types -= f - filter_types += gas_id2path(f) - /obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy() var/area/A = get_area(src) if (A) @@ -98,9 +95,8 @@ return FALSE var/list/f_types = list() - for(var/path in GLOB.meta_gas_info) - var/list/gas = GLOB.meta_gas_info[path] - f_types += list(list("gas_id" = gas[META_GAS_ID], "gas_name" = gas[META_GAS_NAME], "enabled" = (path in filter_types))) + for(var/id in GLOB.gas_data.ids) + f_types += list(list("gas_id" = id, "gas_name" = GLOB.gas_data.names[id], "enabled" = (id in filter_types))) var/datum/signal/signal = new(list( "tag" = id_tag, @@ -146,38 +142,21 @@ scrub(tile) return TRUE -/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(var/turf/tile) +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(var/turf/open/tile) if(!istype(tile)) return FALSE var/datum/gas_mixture/environment = tile.return_air() var/datum/gas_mixture/air_contents = airs[1] - if(air_contents.return_pressure() >= 50*ONE_ATMOSPHERE) + if(air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE || !islist(filter_types)) return FALSE if(scrubbing & SCRUBBING) - var/transfer_moles = min(1, volume_rate/environment.return_volume())*environment.total_moles() - - //Take a gas sample - var/datum/gas_mixture/removed = tile.remove_air(transfer_moles) - - //Nothing left to remove from the tile - if(isnull(removed)) - return FALSE - - removed.scrub_into(air_contents, filter_types) - - //Remix the resulting gases - tile.assume_air(removed) + environment.scrub_into(air_contents, volume_rate/environment.return_volume(), filter_types) tile.air_update_turf() else //Just siphoning all air - - var/transfer_moles = environment.total_moles()*(volume_rate/environment.return_volume()) - - var/datum/gas_mixture/removed = tile.remove_air(transfer_moles) - - air_contents.merge(removed) + environment.transfer_ratio_to(air_contents, volume_rate/environment.return_volume()) tile.air_update_turf() update_parents() @@ -224,12 +203,12 @@ investigate_log(" was toggled to [scrubbing ? "scrubbing" : "siphon"] mode by [key_name(signal_sender)]",INVESTIGATE_ATMOS) if("toggle_filter" in signal.data) - filter_types ^= gas_id2path(signal.data["toggle_filter"]) + filter_types ^= signal.data["toggle_filter"] if("set_filters" in signal.data) filter_types = list() for(var/gas in signal.data["set_filters"]) - filter_types += gas_id2path(gas) + filter_types += gas if("init" in signal.data) name = signal.data["init"] @@ -280,7 +259,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/attack_alien(mob/user) if(!welded || !(do_after(user, 20, target = src))) return - user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the scrubber.", "You hear loud scraping noises.") + user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the scrubber.", "You hear loud scraping noises.") welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) @@ -309,10 +288,10 @@ icon_state = "scrub_map_on-3" /obj/machinery/atmospherics/components/unary/vent_scrubber/on/lavaland - filter_types = list(/datum/gas/carbon_dioxide, /datum/gas/plasma, /datum/gas/water_vapor, /datum/gas/bz) + filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ) /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3/lavaland - filter_types = list(/datum/gas/carbon_dioxide, /datum/gas/plasma, /datum/gas/water_vapor, /datum/gas/bz) + filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ) #undef SIPHONING #undef SCRUBBING diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index ca1024b799067..2bae4e25e771f 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -15,7 +15,7 @@ /datum/pipeline/Destroy() SSair.networks -= src - if(air?.return_volume()) + if(air && air.return_volume()) temporarily_store_air() for(var/obj/machinery/atmospherics/pipe/P in members) P.parent = null @@ -43,10 +43,12 @@ if(!air) air = new var/list/possible_expansions = list(base) - while(possible_expansions.len) + while(possible_expansions.len>0) for(var/obj/machinery/atmospherics/borderline in possible_expansions) + var/list/result = borderline.pipeline_expansion(src) - if(result && result.len) + + if(result.len>0) for(var/obj/machinery/atmospherics/P in result) if(istype(P, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/item = P @@ -55,8 +57,8 @@ if(item.parent) var/static/pipenetwarnings = 10 if(pipenetwarnings > 0) - log_mapping("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) around [AREACOORD(item)].") - pipenetwarnings-- + log_mapping("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) Nearby: ([item.x], [item.y], [item.z]).") + pipenetwarnings -= 1 if(pipenetwarnings == 0) log_mapping("build_pipeline(): further messages about pipenets will be suppressed") members += item @@ -192,7 +194,7 @@ else if((target.heat_capacity>0) && (partial_heat_capacity>0)) - var/delta_temperature = air.return_temperature() - target.temperature + var/delta_temperature = air.return_temperature() - target.return_temperature() var/heat = thermal_conductivity*delta_temperature* \ (partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity)) @@ -203,10 +205,14 @@ /datum/pipeline/proc/return_air() . = other_airs + air if(null in .) - stack_trace("[src] has one or more null gas mixtures, which may cause bugs. Null mixtures will not be considered in reconcile_air().") - return removeNullsFromList(.) + stack_trace("[src]([REF(src)]) has one or more null gas mixtures, which may cause bugs. Null mixtures will not be considered in reconcile_air().") + listclearnulls(.) -/datum/pipeline/proc/reconcile_air() +/datum/pipeline/proc/empty() + for(var/datum/gas_mixture/GM in get_all_connected_airs()) + GM.clear() + +/datum/pipeline/proc/get_all_connected_airs() var/list/datum/gas_mixture/GL = list() var/list/datum/pipeline/PL = list() PL += src @@ -226,18 +232,8 @@ var/obj/machinery/atmospherics/components/unary/portables_connector/C = atmosmch if(C.connected_device) GL += C.portableConnectorReturnAir() + return GL - var/datum/gas_mixture/total_gas_mixture = new(0) - var/total_volume = 0 - - for(var/i in GL) - var/datum/gas_mixture/G = i - total_gas_mixture.merge(G) - total_volume += G.return_volume() - - if(total_volume > 0) - //Update individual gas_mixtures by volume ratio - for(var/i in GL) - var/datum/gas_mixture/G = i - G.copy_from(total_gas_mixture) - G.multiply(G.return_volume()/total_volume) +/datum/pipeline/proc/reconcile_air() + var/list/datum/gas_mixture/GL = get_all_connected_airs() + equalize_all_gases_in_list(GL) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 4fcef087b72c0..bf20a874a5c9f 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -9,7 +9,7 @@ idle_power_usage = 2 active_power_usage = 4 max_integrity = 150 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 0, "stamina" = 0) var/frequency = 0 var/atom/target var/id_tag diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index ae126b3e91875..90b283fb66835 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -5,6 +5,7 @@ #define GASMINER_POWER_KPA 3 #define GASMINER_POWER_FULLSCALE 4 + /obj/machinery/atmospherics/miner name = "gas miner" desc = "Gasses mined from the gas giant below (above?) flow out through this massive vent." @@ -12,9 +13,11 @@ icon_state = "miner" density = FALSE resistance_flags = INDESTRUCTIBLE|ACID_PROOF|FIRE_PROOF + interacts_with_air = TRUE var/spawn_id = null var/spawn_temp = T20C - var/spawn_mol = MOLES_CELLSTANDARD * 10 + /// Moles of gas to spawn per second + var/spawn_mol = MOLES_CELLSTANDARD * 5 var/max_ext_mol = INFINITY var/max_ext_kpa = 6500 var/overlay_color = "#FFFFFF" @@ -26,7 +29,7 @@ var/broken = FALSE var/broken_message = "ERROR" idle_power_usage = 150 - active_power_usage = 2000 + active_power_usage = 3000 /obj/machinery/atmospherics/miner/Initialize() . = ..() @@ -94,7 +97,7 @@ if(GASMINER_POWER_KPA) active_power_usage = P * power_draw_dynamic_kpa_coeff if(GASMINER_POWER_FULLSCALE) - active_power_usage = (spawn_mol * power_draw_dynamic_mol_coeff) + (P * power_draw_dynamic_kpa_coeff) + active_power_usage = (spawn_mol * power_draw_dynamic_mol_coeff) + (P * power_draw_dynamic_kpa_coeff) + power_draw_static /obj/machinery/atmospherics/miner/proc/do_use_power(amount) var/turf/T = get_turf(src) @@ -117,7 +120,7 @@ on_overlay.color = overlay_color add_overlay(on_overlay) -/obj/machinery/atmospherics/miner/process() +/obj/machinery/atmospherics/miner/process_atmos() //TODO figure out delta_time for this update_power() check_operation() if(active && !broken) @@ -126,12 +129,12 @@ if(do_use_power(active_power_usage)) mine_gas() -/obj/machinery/atmospherics/miner/proc/mine_gas() +/obj/machinery/atmospherics/miner/proc/mine_gas(delta_time = 2) var/turf/open/O = get_turf(src) if(!isopenturf(O)) return FALSE var/datum/gas_mixture/merger = new - merger.set_moles(spawn_id, spawn_mol) + merger.set_moles(spawn_id, spawn_mol * delta_time) merger.set_temperature(spawn_temp) O.assume_air(merger) O.air_update_turf(TRUE) @@ -144,34 +147,81 @@ /obj/machinery/atmospherics/miner/n2o name = "\improper N2O Gas Miner" overlay_color = "#FFCCCC" - spawn_id = /datum/gas/nitrous_oxide + spawn_id = GAS_NITROUS /obj/machinery/atmospherics/miner/nitrogen name = "\improper N2 Gas Miner" overlay_color = "#CCFFCC" - spawn_id = /datum/gas/nitrogen + spawn_id = GAS_N2 /obj/machinery/atmospherics/miner/oxygen name = "\improper O2 Gas Miner" overlay_color = "#007FFF" - spawn_id = /datum/gas/oxygen + spawn_id = GAS_O2 /obj/machinery/atmospherics/miner/toxins name = "\improper Plasma Gas Miner" overlay_color = "#FF0000" - spawn_id = /datum/gas/plasma + spawn_id = GAS_PLASMA /obj/machinery/atmospherics/miner/carbon_dioxide name = "\improper CO2 Gas Miner" overlay_color = "#CDCDCD" - spawn_id = /datum/gas/carbon_dioxide + spawn_id = GAS_CO2 /obj/machinery/atmospherics/miner/bz name = "\improper BZ Gas Miner" overlay_color = "#FAFF00" - spawn_id = /datum/gas/bz + spawn_id = GAS_BZ /obj/machinery/atmospherics/miner/water_vapor name = "\improper Water Vapor Gas Miner" overlay_color = "#99928E" - spawn_id = /datum/gas/water_vapor + spawn_id = GAS_H2O + +/obj/machinery/atmospherics/miner/station + power_draw = GASMINER_POWER_FULLSCALE + spawn_mol = MOLES_CELLSTANDARD / 10 + max_ext_kpa = 2500 + +/obj/machinery/atmospherics/miner/station/n2o + name = "\improper N2O Gas Miner" + overlay_color = "#FFCCCC" + spawn_id = GAS_NITROUS + +/obj/machinery/atmospherics/miner/station/nitrogen + name = "\improper N2 Gas Miner" + overlay_color = "#CCFFCC" + spawn_id = GAS_N2 + +/obj/machinery/atmospherics/miner/station/oxygen + name = "\improper O2 Gas Miner" + overlay_color = "#007FFF" + spawn_id = GAS_O2 + +/obj/machinery/atmospherics/miner/station/toxins + name = "\improper Plasma Gas Miner" + overlay_color = "#FF0000" + spawn_id = GAS_PLASMA + +/obj/machinery/atmospherics/miner/station/carbon_dioxide + name = "\improper CO2 Gas Miner" + overlay_color = "#CDCDCD" + spawn_id = GAS_CO2 + +/obj/machinery/atmospherics/miner/station/bz + name = "\improper BZ Gas Miner" + overlay_color = "#FAFF00" + spawn_id = GAS_BZ + +/obj/machinery/atmospherics/miner/station/water_vapor + name = "\improper Water Vapor Gas Miner" + overlay_color = "#99928E" + spawn_id = GAS_H2O + + +#undef GASMINER_POWER_NONE +#undef GASMINER_POWER_STATIC +#undef GASMINER_POWER_MOLES +#undef GASMINER_POWER_KPA +#undef GASMINER_POWER_FULLSCALE diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index 66475be45a212..23169af7e56a1 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -6,6 +6,7 @@ buckle_lying = -1 var/icon_temperature = T20C //stop small changes in temperature causing icon refresh resistance_flags = LAVA_PROOF | FIRE_PROOF + interacts_with_air = TRUE /obj/machinery/atmospherics/pipe/heat_exchanging/Initialize() . = ..() @@ -25,9 +26,7 @@ var/turf/T = loc if(istype(T)) - if(islava(T)) - environment_temperature = 5000 - else if(T.blocks_air) + if(T.blocks_air) environment_temperature = T.return_temperature() else var/turf/open/OT = T @@ -35,8 +34,9 @@ else environment_temperature = T.return_temperature() - if(abs(environment_temperature-pipe_air.return_temperature()) > minimum_temperature_difference) - parent.temperature_interact(T, volume, thermal_conductivity) + if(pipe_air != null) + if(abs(environment_temperature-pipe_air.return_temperature()) > minimum_temperature_difference) + parent.temperature_interact(T, volume, thermal_conductivity) //heatup/cooldown any mobs buckled to ourselves based on our temperature @@ -50,7 +50,7 @@ L.bodytemperature = avg_temp pipe_air.set_temperature(avg_temp) -/obj/machinery/atmospherics/pipe/heat_exchanging/process() +/obj/machinery/atmospherics/pipe/heat_exchanging/process(delta_time) if(!parent) return //machines subsystem fires before atmos is initialized so this prevents race condition runtimes @@ -79,4 +79,4 @@ if(pipe_air.return_temperature() > heat_limit + 1) for(var/m in buckled_mobs) var/mob/living/buckled_mob = m - buckled_mob.apply_damage(4 * log(pipe_air.return_temperature() - heat_limit), BURN, BODY_ZONE_CHEST) + buckled_mob.apply_damage(delta_time * 2 * log(pipe_air.return_temperature() - heat_limit), BURN, BODY_ZONE_CHEST) diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm index db7656c2b3274..a5888ceeb0a98 100644 --- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm +++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm @@ -8,7 +8,6 @@ pipe_flags = PIPING_ALL_LAYER | PIPING_DEFAULT_LAYER_ONLY | PIPING_CARDINAL_AUTONORMALIZE piping_layer = PIPING_LAYER_DEFAULT device_type = 0 - volume = 260 construction_type = /obj/item/pipe/binary pipe_state = "manifoldlayer" FASTDMM_PROP(\ @@ -20,6 +19,7 @@ var/list/back_nodes /obj/machinery/atmospherics/pipe/layer_manifold/Initialize() + volume = 280 //260 isn't divisible by 35 bull this is 280L front_nodes = list() back_nodes = list() icon_state = "manifoldlayer_center" @@ -35,8 +35,9 @@ back_nodes = null nodes = list() for(var/obj/machinery/atmospherics/A in needs_nullifying) - A.disconnect(src) - A.build_network() + if(A != null && src != null) //if it's already null why are we doing this? The answer is byond... it'll always find a way + A.disconnect(src) + SSair.add_to_rebuild_queue(A) /obj/machinery/atmospherics/pipe/layer_manifold/proc/get_all_connected_nodes() return front_nodes + back_nodes + nodes @@ -74,9 +75,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold/SetInitDirections() switch(dir) - if(NORTH || SOUTH) + if(NORTH, SOUTH) initialize_directions = NORTH|SOUTH - if(EAST || WEST) + if(EAST, WEST) initialize_directions = EAST|WEST /obj/machinery/atmospherics/pipe/layer_manifold/isConnectable(obj/machinery/atmospherics/target, given_layer) diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index 60668f77eab67..41831924cd6c0 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -28,7 +28,7 @@ var/obj/machinery/atmospherics/oldN = nodes[i] ..() if(oldN) - oldN.build_network() + SSair.add_to_rebuild_queue(oldN) /obj/machinery/atmospherics/pipe/destroy_network() QDEL_NULL(parent) @@ -55,14 +55,19 @@ air_update_turf() /obj/machinery/atmospherics/pipe/return_air() - return parent.air + if(parent) + return parent.air /obj/machinery/atmospherics/pipe/return_analyzable_air() - return parent.air + if(parent) + return parent.air /obj/machinery/atmospherics/pipe/remove_air(amount) return parent.air.remove(amount) +/obj/machinery/atmospherics/pipe/remove_air_ratio(ratio) + return parent.air.remove_ratio(ratio) + /obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pipe_meter)) var/obj/item/pipe_meter/meter = W @@ -72,7 +77,8 @@ return ..() /obj/machinery/atmospherics/pipe/returnPipenet() - return parent + if(parent) + return parent.air /obj/machinery/atmospherics/pipe/setPipenet(datum/pipeline/P) parent = P diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index d088464387389..1291163a9b701 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -9,7 +9,6 @@ var/valve_open = FALSE - var/obj/machinery/atmospherics/components/binary/passive_gate/pump var/release_log = "" volume = 1000 @@ -19,12 +18,12 @@ var/can_max_release_pressure = (ONE_ATMOSPHERE * 10) var/can_min_release_pressure = (ONE_ATMOSPHERE / 10) - armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 50) + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 50, "stamina" = 0) max_integrity = 250 integrity_failure = 100 pressure_resistance = 7 * ONE_ATMOSPHERE var/temperature_resistance = 1000 + T0C - var/starter_temp + var/starter_temp = T20C // Prototype vars var/prototype = FALSE var/valve_timer = null @@ -66,37 +65,37 @@ name = "n2 canister" desc = "Nitrogen gas. Reportedly useful for something." icon_state = "red" - gas_type = /datum/gas/nitrogen + gas_type = GAS_N2 /obj/machinery/portable_atmospherics/canister/oxygen name = "o2 canister" desc = "Oxygen. Necessary for human life." icon_state = "blue" - gas_type = /datum/gas/oxygen + gas_type = GAS_O2 /obj/machinery/portable_atmospherics/canister/carbon_dioxide name = "co2 canister" desc = "Carbon dioxide. What the fuck is carbon dioxide?" icon_state = "black" - gas_type = /datum/gas/carbon_dioxide + gas_type = GAS_CO2 /obj/machinery/portable_atmospherics/canister/toxins name = "plasma canister" desc = "Plasma gas. The reason YOU are here. Highly toxic." icon_state = "orange" - gas_type = /datum/gas/plasma + gas_type = GAS_PLASMA /obj/machinery/portable_atmospherics/canister/bz name = "\improper BZ canister" desc = "BZ, a powerful hallucinogenic nerve agent." icon_state = "purple" - gas_type = /datum/gas/bz + gas_type = GAS_BZ /obj/machinery/portable_atmospherics/canister/nitrous_oxide name = "n2o canister" desc = "Nitrous oxide gas. Known to cause drowsiness." icon_state = "redws" - gas_type = /datum/gas/nitrous_oxide + gas_type = GAS_NITROUS /obj/machinery/portable_atmospherics/canister/air name = "air canister" @@ -107,44 +106,44 @@ name = "tritium canister" desc = "Tritium. Inhalation might cause irradiation." icon_state = "green" - gas_type = /datum/gas/tritium + gas_type = GAS_TRITIUM /obj/machinery/portable_atmospherics/canister/nob name = "hyper-noblium canister" desc = "Hyper-Noblium. More noble than all other gases." icon_state = "freon" - gas_type = /datum/gas/hypernoblium + gas_type = GAS_HYPERNOB /obj/machinery/portable_atmospherics/canister/nitryl name = "nitryl canister" desc = "Nitryl gas. Feels great 'til the acid eats your lungs." icon_state = "brown" - gas_type = /datum/gas/nitryl + gas_type = GAS_NITRYL /obj/machinery/portable_atmospherics/canister/stimulum name = "stimulum canister" desc = "Stimulum. High energy gas, high energy people." icon_state = "darkpurple" - gas_type = /datum/gas/stimulum + gas_type = GAS_STIMULUM /obj/machinery/portable_atmospherics/canister/pluoxium name = "pluoxium canister" desc = "Pluoxium. Like oxygen, but more bang for your buck." icon_state = "darkblue" - gas_type = /datum/gas/pluoxium + gas_type = GAS_PLUOXIUM /obj/machinery/portable_atmospherics/canister/water_vapor name = "water vapor canister" desc = "Water Vapor. We get it, you vape." icon_state = "water_vapor" - gas_type = /datum/gas/water_vapor + gas_type = GAS_H2O filled = 1 /obj/machinery/portable_atmospherics/canister/miasma name = "miasma canister" desc = "Miasma. Makes you wish your nose was blocked." icon_state = "miasma" - gas_type = /datum/gas/miasma + gas_type = GAS_MIASMA filled = 1 @@ -181,7 +180,7 @@ name = "prototype canister" desc = "A prototype canister for a prototype bike, what could go wrong?" icon_state = "proto" - gas_type = /datum/gas/oxygen + gas_type = GAS_O2 filled = 1 release_pressure = ONE_ATMOSPHERE*2 @@ -200,29 +199,21 @@ air_contents.copy_from(existing_mixture) else create_gas() - pump = new(src, FALSE) - pump.on = TRUE - pump.stat = 0 - pump.build_network() - update_icon() -/obj/machinery/portable_atmospherics/canister/Destroy() - qdel(pump) - pump = null - return ..() /obj/machinery/portable_atmospherics/canister/proc/create_gas() if(gas_type) if(starter_temp) air_contents.set_temperature(starter_temp) + if(!air_contents.return_volume()) + CRASH("Auxtools is failing somehow! Gas with pointer [air_contents._extools_pointer_gasmixture] is not valid.") air_contents.set_moles(gas_type, (maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) /obj/machinery/portable_atmospherics/canister/air/create_gas() - if(starter_temp) - air_contents.set_temperature(starter_temp) - air_contents.set_moles(/datum/gas/oxygen, (O2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) - air_contents.set_moles(/datum/gas/nitrogen, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) + air_contents.set_temperature(starter_temp) + air_contents.set_moles(GAS_O2, (O2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) + air_contents.set_moles(GAS_N2, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature())) #define CANISTER_UPDATE_HOLDING (1<<0) #define CANISTER_UPDATE_CONNECTED (1<<1) @@ -317,9 +308,8 @@ /obj/machinery/portable_atmospherics/canister/proc/canister_break() disconnect() - var/datum/gas_mixture/expelled_gas = air_contents.remove(air_contents.total_moles()) var/turf/T = get_turf(src) - T.assume_air(expelled_gas) + T.assume_air(air_contents) air_update_turf() stat |= BROKEN @@ -349,21 +339,20 @@ if(timing && valve_timer < world.time) valve_open = !valve_open timing = FALSE + + // Handle gas transfer. if(valve_open) var/turf/T = get_turf(src) - pump.airs[1] = air_contents - pump.airs[2] = holding ? holding.air_contents : T.return_air() - pump.target_pressure = release_pressure - - pump.process_atmos() // Pump gas. - if(!holding) - air_update_turf() // Update the environment if needed. - else - pump.airs[1] = null - pump.airs[2] = null + var/datum/gas_mixture/target_air = holding ? holding.air_contents : T.return_air() + if(air_contents.release_gas_to(target_air, release_pressure) && !holding) + air_update_turf() update_icon() +/obj/machinery/portable_atmospherics/canister/ui_status(mob/user) + . = ..() + if(. > UI_UPDATE && !allowed(user)) + . = UI_UPDATE /obj/machinery/portable_atmospherics/canister/ui_state(mob/user) return GLOB.physical_state @@ -373,6 +362,7 @@ if(!ui) ui = new(user, src, "Canister") ui.open() + ui.set_autoupdate(TRUE) // Canister pressure, tank pressure, prototype canister timer /obj/machinery/portable_atmospherics/canister/ui_data() var/data = list() @@ -415,12 +405,14 @@ desc = initial(replacement.desc) icon_state = initial(replacement.icon_state) if("restricted") + if(!prototype) + return // Prototype canister only feature restricted = !restricted if(restricted) req_access = list(ACCESS_ENGINE) else req_access = list() - . = TRUE + . = TRUE if("pressure") var/pressure = params["pressure"] if(pressure == "reset") @@ -450,10 +442,10 @@ if(!holding) var/list/danger = list() for(var/id in air_contents.get_gases()) - if(!GLOB.meta_gas_info[id][META_GAS_DANGER]) + if(!(GLOB.gas_data.flags[id] & GAS_FLAG_DANGEROUS)) continue - if(air_contents.get_moles(id) > (GLOB.meta_gas_info[id][META_GAS_MOLES_VISIBLE] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility - danger[GLOB.meta_gas_info[id][META_GAS_NAME]] = air_contents.get_moles(id) //ex. "plasma" = 20 + if(air_contents.get_moles(id) > (GLOB.gas_data.visibility[id] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility + danger[GLOB.gas_data.names[id]] = air_contents.get_moles(id) //ex. "plasma" = 20 if(danger.len) message_admins("[ADMIN_LOOKUPFLW(usr)] opened a canister that contains the following at [ADMIN_VERBOSEJMP(src)]:") @@ -467,15 +459,21 @@ investigate_log(logmsg, INVESTIGATE_ATMOS) release_log += logmsg . = TRUE + /* // Apparently the timer isn't present in TGUI - commenting out so it can't be used via exploits if("timer") + if(!prototype) + return var/change = params["change"] switch(change) if("reset") timer_set = default_timer_set + . = TRUE if("decrease") timer_set = max(minimum_timer_set, timer_set - 10) + . = TRUE if("increase") timer_set = min(maximum_timer_set, timer_set + 10) + . = TRUE if("input") var/user_input = input(usr, "Set time to valve toggle.", name) as null|num if(!user_input) @@ -488,6 +486,8 @@ . = TRUE if("toggle_timer") set_active() + . = TRUE + */ if("eject") if(holding) if(valve_open) @@ -495,4 +495,5 @@ investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transferring into the air.", INVESTIGATE_ATMOS) replace_tank(usr, FALSE) . = TRUE - update_icon() + if(.) + update_icon() diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 4d537624ab32d..ca26846171b0c 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/atmos.dmi' use_power = NO_POWER_USE max_integrity = 250 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 60, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 60, "acid" = 30, "stamina" = 0) anchored = FALSE var/datum/gas_mixture/air_contents @@ -16,7 +16,7 @@ /obj/machinery/portable_atmospherics/New() ..() - SSair.atmos_machinery += src + SSair.atmos_air_machinery += src air_contents = new(volume) air_contents.set_temperature(T20C) @@ -24,11 +24,12 @@ return 1 /obj/machinery/portable_atmospherics/Destroy() - SSair.atmos_machinery -= src - + SSair.atmos_air_machinery -= src disconnect() qdel(air_contents) air_contents = null + + SSair.atmos_machinery -= src return ..() @@ -45,7 +46,7 @@ return ..() /obj/machinery/portable_atmospherics/process_atmos() - if(!connected_port) // Pipe network handles reactions if connected. + if(!connected_port && air_contents != null && src != null) // Pipe network handles reactions if connected. air_contents.react(src) /obj/machinery/portable_atmospherics/return_air() @@ -66,8 +67,7 @@ //Perform the connection connected_port = new_port connected_port.connected_device = src - var/datum/pipeline/connected_port_parent = connected_port.parents[1] - connected_port_parent.reconcile_air() + connected_port.parents[1].update = PIPENET_UPDATE_STATUS_RECONCILE_NEEDED anchored = TRUE //Prevent movement pixel_x = new_port.pixel_x @@ -104,8 +104,8 @@ /obj/machinery/portable_atmospherics/examine(mob/user) . = ..() if(holding) - . += {"\The [src] contains [holding]. Alt-click [src] to remove it. - Click [src] with another gas tank to hot swap [holding]."} + . += "\The [src] contains [holding]. Alt-click [src] to remove it.\n"+\ + "Click [src] with another gas tank to hot swap [holding]." /obj/machinery/portable_atmospherics/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank) if(holding) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 769c457abdca4..54b225b7a8574 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -13,6 +13,7 @@ var/on = FALSE var/direction = PUMP_OUT + var/target_pressure = ONE_ATMOSPHERE var/obj/machinery/atmospherics/components/binary/pump/pump volume = 1000 @@ -22,7 +23,7 @@ pump = new(src, FALSE) pump.on = TRUE pump.stat = 0 - pump.build_network() + SSair.add_to_rebuild_queue(pump) /obj/machinery/portable_atmospherics/pump/Destroy() var/turf/T = get_turf(src) @@ -91,6 +92,7 @@ if(!ui) ui = new(user, src, "PortablePump") ui.open() + ui.set_autoupdate(TRUE) // Air pressure, tank pressure /obj/machinery/portable_atmospherics/pump/ui_data() var/data = list() @@ -118,8 +120,8 @@ if("power") on = !on if(on && !holding) - var/plasma = air_contents.get_moles(/datum/gas/plasma) - var/n2o = air_contents.get_moles(/datum/gas/nitrous_oxide) + var/plasma = air_contents.get_moles(GAS_PLASMA) + var/n2o = air_contents.get_moles(GAS_NITROUS) if(n2o || plasma) message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]") log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]") @@ -155,4 +157,5 @@ if(holding) replace_tank(usr, FALSE) . = TRUE - update_icon() + if(.) + update_icon() diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 8cb8c55908d7f..105deda497567 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -7,9 +7,10 @@ var/on = FALSE var/volume_rate = 1000 + var/overpressure_m = 80 volume = 1000 - var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor) + var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_NITRYL, GAS_TRITIUM, GAS_HYPERNOB, GAS_H2O) /obj/machinery/portable_atmospherics/scrubber/Destroy() var/turf/T = get_turf(src) @@ -38,15 +39,10 @@ scrub(T.return_air()) /obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture) - var/transfer_moles = min(1, volume_rate / mixture.return_volume()) * mixture.total_moles() - - var/datum/gas_mixture/filtering = mixture.remove(transfer_moles) // Remove part of the mixture to filter. - if(!filtering) + if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE) return - filtering.scrub_into(air_contents, scrubbing) - - mixture.merge(filtering) // Returned the cleaned gas. + mixture.scrub_into(air_contents, volume_rate / mixture.return_volume(), scrubbing) if(!holding) air_update_turf() @@ -68,6 +64,7 @@ if(!ui) ui = new(user, src, "PortableScrubber") ui.open() + ui.set_autoupdate(TRUE) // Air pressure, tank pressure /obj/machinery/portable_atmospherics/scrubber/ui_data() var/data = list() @@ -77,9 +74,8 @@ data["id_tag"] = -1 //must be defined in order to reuse code between portable and vent scrubbers data["filter_types"] = list() - for(var/path in GLOB.meta_gas_info) - var/list/gas = GLOB.meta_gas_info[path] - data["filter_types"] += list(list("gas_id" = gas[META_GAS_ID], "gas_name" = gas[META_GAS_NAME], "enabled" = (path in scrubbing))) + for(var/id in GLOB.gas_data.ids) + data["filter_types"] += list(list("gas_id" = id, "gas_name" = GLOB.gas_data.names[id], "enabled" = (id in scrubbing))) if(holding) data["holding"] = list() @@ -111,9 +107,10 @@ replace_tank(usr, FALSE) . = TRUE if("toggle_filter") - scrubbing ^= gas_id2path(params["val"]) + scrubbing ^= params["val"] . = TRUE - update_icon() + if(.) + update_icon() /obj/machinery/portable_atmospherics/scrubber/huge name = "huge air scrubber" @@ -122,6 +119,7 @@ active_power_usage = 500 idle_power_usage = 10 + overpressure_m = 200 volume_rate = 1500 volume = 50000 diff --git a/code/modules/atmospherics/multiz.dm b/code/modules/atmospherics/multiz.dm index 75b628ccc362b..999855f278373 100644 --- a/code/modules/atmospherics/multiz.dm +++ b/code/modules/atmospherics/multiz.dm @@ -3,27 +3,43 @@ desc = "An adapter which allows pipes to connect to other pipenets on different decks." icon_state = "multiz_pipe" icon = 'icons/obj/atmos.dmi' + level = 2 //Always visible. + +/obj/machinery/atmospherics/pipe/simple/multiz/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/pipe/simple/multiz/layer3 + piping_layer = 3 /obj/machinery/atmospherics/pipe/simple/multiz/update_icon() . = ..() cut_overlays() //This adds the overlay showing it's a multiz pipe. This should go above turfs and such var/image/multiz_overlay_node = new(src) //If we have a firing state, light em up! multiz_overlay_node.icon = 'icons/obj/atmos.dmi' - multiz_overlay_node.icon_state = "multiz_pipe" + multiz_overlay_node.icon_state = "multiz_pipe-[piping_layer]" multiz_overlay_node.layer = HIGH_OBJ_LAYER add_overlay(multiz_overlay_node) ///Attempts to locate a multiz pipe that's above us, if it finds one it merges us into its pipenet -/obj/machinery/atmospherics/pipe/simple/multiz/pipeline_expansion() +/obj/machinery/atmospherics/pipe/simple/multiz/pipeline_expansion(expand_up = TRUE, expand_down = TRUE) icon = 'icons/obj/atmos.dmi' //Just to refresh. var/turf/T = get_turf(src) - var/obj/machinery/atmospherics/pipe/simple/multiz/above = locate(/obj/machinery/atmospherics/pipe/simple/multiz) in(SSmapping.get_turf_above(T)) - var/obj/machinery/atmospherics/pipe/simple/multiz/below = locate(/obj/machinery/atmospherics/pipe/simple/multiz) in(SSmapping.get_turf_below(T)) - if(below) - below.pipeline_expansion() //If we've got one below us, force it to add us on facebook - if(above) - nodes += above - above.nodes += src //Two way travel :) - return ..() - else - return ..() \ No newline at end of file + //Expand above pipes recursively + if(SSmapping.get_turf_above(T) && expand_up) + for(var/obj/machinery/atmospherics/pipe/simple/multiz/above in SSmapping.get_turf_above(T)) + if(above.piping_layer == piping_layer) + //Link ourself to the above node + nodes |= above + above.nodes |= src + //Link above node to their above nodes. + above.pipeline_expansion(TRUE, FALSE) + //Expand below pipes recursively + if(SSmapping.get_turf_below(T) && expand_down) + for(var/obj/machinery/atmospherics/pipe/simple/multiz/below in SSmapping.get_turf_below(T)) + if(below.piping_layer == piping_layer) + //Link ourself to the below node + nodes |= below + below.nodes |= src + //Link below node to their below nodes + below.pipeline_expansion(FALSE, TRUE) + return ..() diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index deb05920e2292..874f85fa2244e 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -1,8 +1,8 @@ /obj/machinery/artillerycontrol - var/reload = 60 - var/reload_cooldown = 60 + var/reload = 120 + var/reload_cooldown = 120 var/explosiondev = 3 var/explosionmed = 6 var/explosionlight = 12 @@ -11,9 +11,9 @@ icon = 'icons/obj/machines/particle_accelerator.dmi' density = TRUE -/obj/machinery/artillerycontrol/process() +/obj/machinery/artillerycontrol/process(delta_time) if(reload < reload_cooldown) - reload++ + reload += delta_time /obj/structure/artilleryplaceholder name = "artillery" @@ -45,7 +45,7 @@ if(reload < reload_cooldown) return if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr)) - priority_announce("Bluespace artillery fire detected. Brace for impact.") + priority_announce("Bluespace artillery fire detected. Brace for impact.", sound = SSstation.announcer.get_rand_alert_sound()) message_admins("[ADMIN_LOOKUPFLW(usr)] has launched an artillery strike.") var/list/L = list() for(var/turf/T in get_area_turfs(thearea.type)) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 0e96d7d8be29d..897276323e3b7 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -9,7 +9,7 @@ -/obj/item/twohanded/ctf +/obj/item/ctf name = "banner" icon = 'icons/obj/banner.dmi' icon_state = "banner" @@ -31,20 +31,28 @@ var/obj/effect/ctf/flag_reset/reset var/reset_path = /obj/effect/ctf/flag_reset -/obj/item/twohanded/ctf/Destroy() +/obj/item/ctf/Destroy() QDEL_NULL(reset) return ..() -/obj/item/twohanded/ctf/Initialize() +/obj/item/ctf/Initialize() . = ..() if(!reset) reset = new reset_path(get_turf(src)) + reset.flag = src -/obj/item/twohanded/ctf/process() +/obj/item/ctf/ComponentInitialize() + . = ..() + AddComponent(/datum/component/two_handed) + +/obj/item/ctf/process() if(is_ctf_target(loc)) //don't reset from someone's hands. return PROCESS_KILL if(world.time > reset_cooldown) - forceMove(get_turf(src.reset)) + var/turf/our_turf = get_turf(src.reset) + if(!our_turf) + return TRUE + forceMove(our_turf) for(var/mob/M in GLOB.player_list) var/area/mob_area = get_area(M) if(istype(mob_area, /area/ctf)) @@ -52,7 +60,7 @@ STOP_PROCESSING(SSobj, src) //ATTACK HAND IGNORING PARENT RETURN VALUE -/obj/item/twohanded/ctf/attack_hand(mob/living/user) +/obj/item/ctf/attack_hand(mob/living/user) if(!is_ctf_target(user) && !anyonecanpickup) to_chat(user, "Non players shouldn't be moving the flag!") return @@ -76,7 +84,7 @@ STOP_PROCESSING(SSobj, src) ..() -/obj/item/twohanded/ctf/dropped(mob/user) +/obj/item/ctf/dropped(mob/user) ..() user.anchored = FALSE user.status_flags |= CANPUSH @@ -89,7 +97,7 @@ anchored = TRUE -/obj/item/twohanded/ctf/red +/obj/item/ctf/red name = "red flag" icon_state = "banner-red" item_state = "banner-red" @@ -98,7 +106,7 @@ reset_path = /obj/effect/ctf/flag_reset/red -/obj/item/twohanded/ctf/blue +/obj/item/ctf/blue name = "blue flag" icon_state = "banner-blue" item_state = "banner-blue" @@ -112,6 +120,13 @@ icon_state = "banner" desc = "This is where a banner with Nanotrasen's logo on it would go." layer = LOW_ITEM_LAYER + var/obj/item/ctf/flag + +/obj/effect/ctf/flag_reset/Destroy() + if(flag) + flag.reset = null + flag = null + return ..() /obj/effect/ctf/flag_reset/red name = "red flag landmark" @@ -171,20 +186,19 @@ GLOB.poi_list.Remove(src) ..() -/obj/machinery/capture_the_flag/process() - for(var/i in spawned_mobs) - if(!i) - spawned_mobs -= i +/obj/machinery/capture_the_flag/process(delta_time) + for(var/mob/living/M as() in spawned_mobs) + if(QDELETED(M)) + spawned_mobs -= M continue // Anyone in crit, automatically reap - var/mob/living/M = i if(M.InCritical() || M.stat == DEAD) ctf_dust_old(M) else // The changes that you've been hit with no shield but not // instantly critted are low, but have some healing. - M.adjustBruteLoss(-5) - M.adjustFireLoss(-5) + M.adjustBruteLoss(-2.5 * delta_time) + M.adjustFireLoss(-2.5 * delta_time) /obj/machinery/capture_the_flag/red name = "Red CTF Controller" @@ -212,6 +226,9 @@ return + if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME)) + to_chat(user, "CTF has been temporarily disabled by admins.") + return people_who_want_to_play |= user.ckey var/num = people_who_want_to_play.len var/remaining = CTF_REQUIRED_PLAYERS - num @@ -264,7 +281,7 @@ /obj/machinery/capture_the_flag/proc/spawn_team_member(client/new_team_member) var/mob/living/carbon/human/M = new/mob/living/carbon/human(get_turf(src)) new_team_member.prefs.copy_to(M) - M.set_species(/datum/species/synth) + M.set_species(/datum/species/human) M.key = new_team_member.key M.faction += team M.equipOutfit(ctf_gear) @@ -277,8 +294,8 @@ attack_ghost(ghost) /obj/machinery/capture_the_flag/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/twohanded/ctf)) - var/obj/item/twohanded/ctf/flag = I + if(istype(I, /obj/item/ctf)) + var/obj/item/ctf/flag = I if(flag.team != src.team) user.transferItemToLoc(flag, get_turf(flag.reset), TRUE) points++ @@ -295,7 +312,7 @@ if(istype(mob_area, /area/ctf)) to_chat(M, "[team] team wins!") to_chat(M, "Teams have been cleared. Click on the machines to vote to begin another round.") - for(var/obj/item/twohanded/ctf/W in M) + for(var/obj/item/ctf/W in M) M.dropItemToGround(W) M.dust() for(var/obj/machinery/control_point/control in GLOB.machines) @@ -336,7 +353,7 @@ var/list/ctf_object_typecache = typecacheof(list( /obj/machinery, /obj/effect/ctf, - /obj/item/twohanded/ctf + /obj/item/ctf )) for(var/atm in A) if (isturf(A) || ismob(A) || isarea(A)) @@ -497,11 +514,11 @@ W.registered_name = H.real_name W.update_label(W.registered_name, W.assignment) - no_drops += H.get_item_by_slot(SLOT_WEAR_SUIT) - no_drops += H.get_item_by_slot(SLOT_GLOVES) - no_drops += H.get_item_by_slot(SLOT_SHOES) - no_drops += H.get_item_by_slot(SLOT_W_UNIFORM) - no_drops += H.get_item_by_slot(SLOT_EARS) + no_drops += H.get_item_by_slot(ITEM_SLOT_OCLOTHING) + no_drops += H.get_item_by_slot(ITEM_SLOT_GLOVES) + no_drops += H.get_item_by_slot(ITEM_SLOT_FEET) + no_drops += H.get_item_by_slot(ITEM_SLOT_ICLOTHING) + no_drops += H.get_item_by_slot(ITEM_SLOT_EARS) for(var/i in no_drops) var/obj/item/I = i ADD_TRAIT(I, TRAIT_NODROP, CAPTURE_THE_FLAG_TRAIT) @@ -641,6 +658,13 @@ for(var/obj/machinery/capture_the_flag/CTF in GLOB.machines) CTF.dead_barricades += src +/obj/effect/ctf/dead_barricade/Destroy() + for(var/obj/machinery/capture_the_flag/CTF in GLOB.machines) + //if(CTF.game_id != game_id) + // continue + CTF.dead_barricades -= src + return ..() + /obj/effect/ctf/dead_barricade/proc/respawn() if(!QDELETED(src)) new /obj/structure/barricade/security/ctf(get_turf(src)) @@ -657,11 +681,11 @@ resistance_flags = INDESTRUCTIBLE var/obj/machinery/capture_the_flag/controlling var/team = "none" - var/point_rate = 1 + var/point_rate = 0.5 -/obj/machinery/control_point/process() +/obj/machinery/control_point/process(delta_time) if(controlling) - controlling.control_points += point_rate + controlling.control_points += point_rate * delta_time if(controlling.control_points >= controlling.control_points_to_win) controlling.victory() diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 6975891b328d8..9a569fcadc7fa 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -36,6 +36,9 @@ /obj/effect/mob_spawn/attack_ghost(mob/user) if(!SSticker.HasRoundStarted() || !loc || !ghost_usable) return + if(!(GLOB.ghost_role_flags & GHOSTROLE_SPAWNER) && !(flags_1 & ADMIN_SPAWNED_1)) + to_chat(user, "An admin has temporarily disabled non-admin ghost roles!") + return if(!uses) to_chat(user, "This spawner is out of charges!") return @@ -60,6 +63,7 @@ else if(ghost_usable) GLOB.poi_list |= src LAZYADD(GLOB.mob_spawners[name], src) + SSmobs.update_spawners() /obj/effect/mob_spawn/Destroy() GLOB.poi_list -= src @@ -67,6 +71,7 @@ LAZYREMOVE(spawners, src) if(!LAZYLEN(spawners)) GLOB.mob_spawners -= name + SSmobs.update_spawners() return ..() /obj/effect/mob_spawn/proc/special(mob/M) @@ -469,7 +474,7 @@ outfit = /datum/outfit/nanotrasencommandercorpse /datum/outfit/nanotrasencommandercorpse - name = "Nanotrasen Private Security Commander" + name = "\improper Nanotrasen Private Security Commander" uniform = /obj/item/clothing/under/rank/centcom/commander suit = /obj/item/clothing/suit/armor/bulletproof ears = /obj/item/radio/headset/heads/captain @@ -483,7 +488,7 @@ /obj/effect/mob_spawn/human/nanotrasensoldier - name = "Nanotrasen Private Security Officer" + name = "\improper Nanotrasen Private Security Officer" id_job = "Private Security Force" id_access_list = list(ACCESS_CENT_CAPTAIN, ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE, ACCESS_SECURITY, ACCESS_MECH_SECURITY) outfit = /datum/outfit/nanotrasensoldiercorpse @@ -503,7 +508,7 @@ /obj/effect/mob_spawn/human/commander/alive death = FALSE roundstart = FALSE - mob_name = "Nanotrasen Commander" + mob_name = "\improper Nanotrasen Commander" name = "sleeper" icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper" diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index 7d73a394591c8..2ec007ba869d1 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -69,9 +69,9 @@ /obj/singularity/academy/admin_investigate_setup() return -/obj/singularity/academy/process() +/obj/singularity/academy/process(delta_time) eat() - if(prob(1)) + if(DT_PROB(0.5, delta_time)) mezzer() @@ -107,7 +107,7 @@ if(next_check < world.time) if(!current_wizard) for(var/mob/living/L in GLOB.player_list) - if(L.z == src.z && L.stat != DEAD && !(faction in L.faction)) + if(L.get_virtual_z_level() == src.get_virtual_z_level() && L.stat != DEAD && !(faction in L.faction)) summon_wizard() break else @@ -132,8 +132,10 @@ if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Wizard Academy Defender") - current_wizard.ghostize() // on the off chance braindead defender gets back in + current_wizard.ghostize(FALSE) // on the off chance braindead defender gets back in current_wizard.key = C.key + else + current_wizard.ghostize(FALSE,SENTIENCE_FORCE) /obj/structure/academy_wizard_spawner/proc/summon_wizard() var/turf/T = src.loc @@ -170,6 +172,7 @@ microwave_riggable = FALSE var/reusable = TRUE var/used = FALSE + var/roll_in_progress = FALSE /obj/item/dice/d20/fate/stealth name = "d20" @@ -192,6 +195,10 @@ /obj/item/dice/d20/fate/diceroll(mob/user) . = ..() + if(roll_in_progress) + to_chat(user, "The dice is already channeling its power! Be patient!") + return + if(!used) if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!") @@ -199,10 +206,9 @@ if(!reusable) used = TRUE - + roll_in_progress = TRUE var/turf/T = get_turf(src) T.visible_message("[src] flares briefly.") - addtimer(CALLBACK(src, .proc/effect, user, .), 1 SECONDS) /obj/item/dice/d20/fate/equipped(mob/user, slot) @@ -213,6 +219,7 @@ /obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user,roll) var/turf/T = get_turf(src) + switch(roll) if(1) //Dust @@ -321,7 +328,7 @@ if(17) //Tator Kit T.visible_message("A suspicious box appears!") - new /obj/item/storage/box/syndicate/bundle_A(drop_location()) + new /obj/item/storage/box/syndie_kit/bundle_A(drop_location()) do_smoke(0, drop_location()) if(18) //Captain ID @@ -338,6 +345,9 @@ //Free wizard! T.visible_message("Magic flows out of [src] and into [user]!") user.mind.make_Wizard() + //roll is completed, allow others players to roll the dice + roll_in_progress = FALSE + /datum/outfit/butler name = "Butler" diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index e9266faa4c9d7..c9ba3a6897a7f 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -45,7 +45,7 @@ var/active = 1 /obj/structure/firepit/Initialize() - ..() + . = ..() toggleFirepit() /obj/structure/firepit/interact(mob/living/user) @@ -111,6 +111,7 @@ eggsleft = 0 egg_type = null speak = list() + mobchatspan = "assistant" /*Cabin's forest. Removed in the new cabin map since it was buggy and I prefer manual placement.*/ /datum/mapGenerator/snowy diff --git a/code/modules/awaymissions/mission_code/TheFactory.dm b/code/modules/awaymissions/mission_code/TheFactory.dm new file mode 100644 index 0000000000000..35e85a38a2e46 --- /dev/null +++ b/code/modules/awaymissions/mission_code/TheFactory.dm @@ -0,0 +1,839 @@ +/obj/singularity/factory + name = "tear in the fabric of reality" + desc = "Your own comprehension of reality starts bending as you stare this." + icon = 'icons/effects/96x96.dmi' + icon_state = "boh_tear" + pixel_x = -32 + pixel_y = -32 + dissipate = 0 + move_self = 0 + grav_pull = 1 + +/obj/singularity/factory/admin_investigate_setup() + return + +//AREAS// +//"old" means places we get in after the rune transition + +/area/awaymission/factory + teleport_restriction = TELEPORT_ALLOW_NONE + +/area/awaymission/factory/secret + name = "secrets" + ambientsounds = list('sound/ambience/secrets.ogg','sound/ambience/ambiholy2.ogg') + +/area/awaymission/factory/villageafter + name = "The Village" + ambientsounds = list('sound/ambience/seag1.ogg', 'sound/ambience/seag2.ogg', 'sound/ambience/seag2.ogg', 'sound/ambience/ambiodd.ogg', 'sound/ambience/ambimystery.ogg', 'sound/ambience/ambiearth.ogg', 'sound/ambience/ambiwind.ogg', 'sound/ambience/ambimine.ogg') + dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + requires_power = FALSE + +/area/awaymission/factory/villageafter/church + name = "The Church" + ambience_index = AMBIENCE_HOLY + +/area/awaymission/factory/villageafter/house + ambientsounds = list('sound/ambience/ambiruin4.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin2.ogg') + +/area/awaymission/factory/villageafter/house/ritual + ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiruin2.ogg','sound/spookoween/insane_low_laugh.ogg') + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/villageafter/house/start + name = "The House" + ambientsounds = list('sound/ambience/ambidet2.ogg','sound/ambience/ambiodd.ogg') + +/area/awaymission/factory/villageafter/hospital + ambientsounds = list('sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin2.ogg') + name = "The Hospital" + requires_power = TRUE + +/area/awaymission/factory/villageafter/spooky + ambience_index = AMBIENCE_SPOOKY + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/factoryafter + name = "The Factory" + ambientsounds = list('sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg') + requires_power = TRUE + always_unpowered = TRUE + +/area/awaymission/factory/clownplanet + dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + ambientsounds = list('sound/spookoween/scary_horn3.ogg','sound/spookoween/scary_horn.ogg','sound/spookoween/scary_horn2.ogg','sound/spookoween/scary_clown_appear.ogg') + mood_bonus = 3 + mood_message = "I hate this!\n" + +/area/awaymission/factory/factoryafter/down + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg') + requires_power = FALSE + always_unpowered = FALSE + dynamic_lighting = DYNAMIC_LIGHTING_FORCED + +/area/awaymission/factory/factoryafter/down/maint + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg') + +/area/awaymission/factory/factoryafter/down/batsecret + name = "The maze" + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg','sound/ambience/ambibasement.ogg') + +/area/awaymission/factory/factoryafter/down/leveltwo + name = "The Factory - middle level" + ambientsounds = list('sound/ambience/ambigen7.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambireebe1.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambigen14.ogg') + +/area/awaymission/factory/factoryafter/down/leveltwo/morgue + name = "The Morgue" + ambience_index = AMBIENCE_SPOOKY + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/factoryafter/down/leveltwo/ritual + name = "a strange place" + ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambireebe2.ogg','sound/spookoween/insane_low_laugh.ogg','sound/spookoween/chain_rattling.ogg') + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/factoryafter/down/levelthree + name = "The Factory - lower level" + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambitech2.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambiatmos2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambimaint5.ogg','sound/ambience/ambireebe3.ogg','sound/ambience/ambilava.ogg') + +/area/awaymission/factory/factoryafter/down/levelthree/engine + name = "The reality engine" + ambientsounds = list('sound/ambience/singulambience.ogg','sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg','sound/ambience/antag/assimilation.ogg') + mood_bonus = 1 + mood_message = "Uhm... Ok?... I guess...\n" + +/area/awaymission/factory/factoryduring + name = "The old Factory" + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatm1.ogg','sound/ambience/ambiatmos.ogg') + +/area/awaymission/factory/factoryduring/down/levelthree + name = "The old Factory - lower level" + ambientsounds = list('sound/ambience/ambiatm1.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambitech2.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambiatmos2.ogg','sound/ambience/signal.ogg','sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiruin2.ogg') + +/area/awaymission/factory/factoryduring/down/levelthree/engine + name = "The old reality engine" + mood_bonus = 1 + mood_message = "Uhm... Ok?... I guess...\n" + ambientsounds = list('sound/ambience/singulambience.ogg','sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg','sound/ambience/antag/assimilation.ogg','sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg') + name = "The reality engine" + +/area/awaymission/factory/factoryduring/down/leveltwo + name = "The old Factory - middle level" + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambifac.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiruin5.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg') + +/area/awaymission/factory/factoryduring/down/leveltwo/ritual + name = "a strange place" + ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/spookoween/insane_low_laugh.ogg','sound/spookoween/spookywind.ogg') + +/area/awaymission/factory/factoryduring/down/leveltwo/morgue + name = "The old Morgue" + ambience_index = AMBIENCE_SPOOKY + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/factoryduring/down/leveltwo/asylum + name = "The sector of mentally disordered" + ambientsounds = list('sound/ambience/ambimo2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambitech.ogg','sound/ambience/ambireebe1.ogg') + +/area/awaymission/factory/factoryduring/down + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambitech3.ogg','sound/ambience/ambiatm1.ogg') + +/area/awaymission/factory/factoryduring/down/maint + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatm1.ogg','sound/ambience/ambimaint3.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambimaint2.ogg') + +/area/awaymission/factory/villageduring + name = "The old village" + dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + requires_power = FALSE + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiearthduring.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambimine.ogg') + +/area/awaymission/factory/villageduring/house + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiearthduring.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambimine.ogg','sound/ambience/ambiruin4.ogg','sound/ambience/ambiruin6.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin2.ogg','sound/ambience/signal.ogg') + +/area/awaymission/factory/villageduring/house/ritual + ambientsounds = list('sound/ambience/antag/ecult_op.ogg','sound/ambience/ambiruin2.ogg','sound/spookoween/insane_low_laugh.ogg') + mood_bonus = -2 + mood_message = "It smells like death in here!\n" + +/area/awaymission/factory/villageduring/church + name = "The old Church" + ambience_index = AMBIENCE_HOLY + +/area/awaymission/factory/villageduring/church/leveltwo + name = "The old Church - 2nd floor" + ambientsounds = list('sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg','sound/ambience/signal.ogg','sound/ambience/ambiwind.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambiholy3.ogg') + +/area/awaymission/factory/villageduring/basement + name = "The old basement" + ambientsounds = list('sound/ambience/ambibasement.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambiodd.ogg') + dynamic_lighting = DYNAMIC_LIGHTING_FORCED + +/area/awaymission/factory/villageduring/house/start + name = "The old House" + ambientsounds = list('sound/ambience/ambidet2.ogg') + +/area/awaymission/factory/villageduring/hospital + ambientsounds = list('sound/ambience/ambidanger.ogg','sound/ambience/ambidanger2.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/ambimystery.ogg','sound/ambience/ambimaint.ogg','sound/ambience/ambiruin2.ogg') + name = "The Hospital" + +/area/awaymission/factory/transition + name = "Beyond the time" + dynamic_lighting = DYNAMIC_LIGHTING_FORCED + ambientsounds = list('sound/ambience/shipambience.ogg','sound/ambience/ambiatmos.ogg','sound/ambience/antag/malf.ogg','sound/ambience/signal.ogg','sound/ambience/ambimalf.ogg') + +//ITEMS// + +/obj/item/statuebust/toy + name = "aesthetic bust" + desc = "A priceless ancient marble bust, the kind that belongs in a museum. Looks like this one has some differences." + var/cooldown = 0 + +/obj/item/statuebust/toy/attack_self(mob/user) + if (cooldown < world.time) + cooldown = world.time + 450 + user.visible_message("[user] activates \the [src].", "You activate \the [src]!", "You hear a music playing.") + playsound(src, 'sound/ambience/ambivapor1.ogg', 50, 0) + else + to_chat(user, "Nothing happens!") + +/obj/item/clothing/glasses/hud/terminator + name = "T-80 tactical sunglasses" + desc = "Strangely ancient technology used to help provide rudimentary eye cover. Also shows information about criminals and their condition. Has enhanced shielding which blocks flashes." + icon_state = "t80sunglasses" + darkness_view = 1 + clothing_flags = SCAN_REAGENTS + vision_flags = SEE_MOBS + flash_protect = 1 + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + hud_type = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_DIAGNOSTIC_BASIC, DATA_HUD_MEDICAL_ADVANCED) + hud_trait = list(TRAIT_SECURITY_HUD, TRAIT_MEDICAL_HUD) + +//MOBS// + +/mob/living/simple_animal/hostile/proc/summon_backup_nosound(distance, exact_faction_match) + do_alert_animation(src) + for(var/mob/living/simple_animal/hostile/M in oview(distance, GET_TARGETS_FROM(src))) + if(faction_check_mob(M, TRUE)) + if(M.AIStatus == AI_OFF) + return + else + M.Goto(src,M.move_to_delay,M.minimum_distance) + +/mob/living/simple_animal/hostile/factory + name = "Guard" + desc = "An armed officer. Looks like they prefer to shoot rather than asking questions." + speak = list("Stop resisting!","I need backup!","Die, freak!","It's getting away!") + icon = 'icons/mob/simple_human.dmi' + icon_state = "nanotrasen" + icon_living = "nanotrasen" + icon_dead = null + icon_gib = "syndicate_gib" + mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) + turns_per_move = 5 + speak_chance = 5 + del_on_death = TRUE + do_footstep = TRUE + environment_smash = ENVIRONMENT_SMASH_STRUCTURES + search_objects = 1 + a_intent = INTENT_HARM + attack_sound = 'sound/weapons/cqchit2.ogg' + attacktext = "punches" + robust_searching = 1 + melee_damage = 12 + speed = 0 + maxHealth = 100 + health = 100 + melee_damage = 12 + stat_attack = UNCONSCIOUS + faction = list("nanotrasenprivate") + status_flags = CANPUSH + atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 10 + loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + response_help = "pokes" + response_disarm = "shoves" + response_harm = "hits" + var/cooldown = 0 + +/mob/living/simple_animal/hostile/factory/death(gibbed) + var/chosen_sound = pick('sound/creatures/guarddeath.ogg','sound/creatures/guarddeath2.ogg','sound/creatures/guarddeath3.ogg','sound/creatures/guarddeath4.ogg') + playsound(get_turf(src), chosen_sound, 100, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/factory/Aggro() + ..() + var/list/possible_sounds = list('sound/effects/radio1.ogg','sound/effects/radio2.ogg','sound/effects/radio3.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) // So we don't repeat the sound and the phrase every time we get hit and do it at least each 30 seconds + cooldown = world.time + 300 + summon_backup_nosound(10) + playsound(get_turf(src), chosen_sound, 100, 0, 0) + var/list/possible_phrases = list("Anomaly spotted! Send backup!","Intruder over here!","Hostile spotted, get them!") + var/chosen_phrase = pick(possible_phrases) + say(chosen_phrase) + else + return + +/mob/living/simple_animal/hostile/factory/ranged + icon_state = "nanotrasenranged" + icon_living = "nanotrasenranged" + ranged_cooldown_time = 15 + ranged = 1 + retreat_distance = 3 + minimum_distance = 5 + casingtype = /obj/item/ammo_casing/c45 + projectilesound = 'sound/weapons/gunshot.ogg' + loot = list(/obj/item/gun/ballistic/automatic/pistol/m1911, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + +/mob/living/simple_animal/hostile/factory/ranged/lmg + desc = "This one is carrying a bigger gun. Seek for cover." + icon_state = "nanotrasenrangedlmg" + icon_living = "nanotrasenrangedlmg" + projectilesound = 'sound/weapons/rifleshot.ogg' + sidestep_per_cycle = 0 + check_friendly_fire = 1 + minimum_distance = 6 + approaching_target = FALSE + rapid = 8 + rapid_fire_delay = 2 + casingtype = /obj/item/ammo_casing/mm712x82 + ranged_cooldown_time = 80 + vision_range = 12 + aggro_vision_range = 12 + retreat_distance = 1 + move_to_delay = 4 + speed = 12 + health = 150 + maxHealth = 150 + loot = list(/obj/item/gun/ballistic/automatic/l6_saw/unrestricted, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + +/mob/living/simple_animal/hostile/factory/ranged/shotgun + icon_state = "nanotrasenrangedshot" + icon_living = "nanotrasenrangedshot" + rapid = 2 + rapid_fire_delay = 5 + casingtype = /obj/item/ammo_casing/shotgun/buckshot + projectilesound = 'sound/weapons/shotgunshot.ogg' + ranged_cooldown_time = 25 + loot = list(/obj/item/gun/ballistic/shotgun/automatic/combat, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + +/mob/living/simple_animal/hostile/factory/ranged/smg + icon_state = "nanotrasenrangedsmg" + icon_living = "nanotrasenrangedsmg" + rapid = 3 + casingtype = /obj/item/ammo_casing/c46x30mm + projectilesound = 'sound/weapons/gunshot_smg.ogg' + loot = list(/obj/item/gun/ballistic/automatic/wt550, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + +/mob/living/simple_animal/hostile/syndicate/factory + gender = MALE + faction = list("nanotrasenprivate") + speak_chance = 5 + speak = list("Come get me!","You can't get away!","Die!") + +/mob/living/simple_animal/hostile/syndicate/factory/sniper + name = "The Warden" + desc = "One of the best snipers. Take cover or get shot" + icon_state = "fsniper" + icon_living = "fsniper" + ranged = TRUE + speed = 1 + dodge_prob = 40 + ranged_cooldown_time = 40 + check_friendly_fire = 1 + sidestep_per_cycle = 3 + minimum_distance = 4 + turns_per_move = 6 + melee_queue_distance = 2 + health = 250 + maxHealth = 250 + melee_damage = 20 + rapid_melee = 3 + attacktext = "hits" + attack_sound = 'sound/weapons/genhit3.ogg' + projectilesound = 'sound/weapons/sniper_shot.ogg' + speak_chance = 2 + var/cooldown = 0 + speak = list("You're pretty good.","You can't dodge everything!","Fall down already!") + loot = list(/obj/item/gun/ballistic/automatic/sniper_rifle, + /obj/effect/mob_spawn/human/corpse/sniper, + /obj/item/ammo_box/magazine/sniper_rounds, + /obj/item/ammo_box/magazine/sniper_rounds/penetrator, + /obj/item/ammo_box/magazine/sniper_rounds/soporific) + +/mob/living/simple_animal/hostile/syndicate/factory/sniper/Aggro() + ..() + ranged_cooldown = 30 + if (cooldown < world.time) + cooldown = world.time + 150 + summon_backup_nosound(10) + playsound(get_turf(src), 'sound/weapons/sniper_rack.ogg', 80, TRUE) + say("I've got you in my scope.") + +/mob/living/simple_animal/hostile/syndicate/factory/sniper/Shoot() + var/allowed_projectile_types = list(/obj/item/ammo_casing/p50, /obj/item/ammo_casing/p50/penetrator) + casingtype = pick(allowed_projectile_types) + ..() + +/mob/living/simple_animal/hostile/syndicate/factory/sniper/death(gibbed) + playsound(get_turf(src), 'sound/creatures/wardendeath.ogg', 100, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho + name = "Psycho" + desc = "They're wearing a pretty uncomfortable jacket." + icon = 'icons/mob/simple_human.dmi' + icon_state = "psycho" + icon_living = "psycho" + attacktext = "bites" + mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) + turns_per_move = 0 + del_on_death = TRUE + response_help = "pokes" + response_disarm = "touches" + response_harm = "hits" + speak_chance = 5 + attack_sound = 'sound/weapons/bite.ogg' + speak = list("I'm not mad!","What insanity?","Kill") + speed = -2 + maxHealth = 100 + health = 100 + atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 5 + faction = list("psycho") + move_to_delay = 3 + rapid_melee = 2 + in_melee = TRUE + approaching_target = TRUE + environment_smash = ENVIRONMENT_SMASH_NONE + obj_damage = 5 + sidestep_per_cycle = 0 + stat_attack = UNCONSCIOUS + melee_damage = 15 + lose_patience_timeout = 350 + loot = list(/obj/effect/mob_spawn/human/corpse/psychost) + +/mob/living/simple_animal/hostile/psycho/regular + var/cooldown = 0 + var/static/list/idle_sounds + +/mob/living/simple_animal/hostile/psycho/regular/Initialize() + . = ..() + idle_sounds = list('sound/creatures/psycidle1.ogg','sound/creatures/psycidle2.ogg','sound/creatures/psycidle3.ogg') + +/mob/living/simple_animal/hostile/psycho/regular/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, FALSE) + +/mob/living/simple_animal/hostile/psycho/regular/Aggro() + ..() + var/list/possible_sounds = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/regular/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psycdeath1.ogg','sound/creatures/psycdeath2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/fast + move_to_delay = 2 + speed = -5 + maxHealth = 70 + health = 70 + +/mob/living/simple_animal/hostile/psycho/muzzle + icon_state = "psychomuzzle" + icon_living = "psychomuzzle" + attacktext = "headbutts" + attack_sound = null + speak_chance = 0 + melee_damage = 9 + var/cooldown = 0 + var/static/list/idle_sounds + speed = 0 + loot = list(/obj/effect/mob_spawn/human/corpse/psychost/muzzle) + +/mob/living/simple_animal/hostile/psycho/muzzle/Initialize() + . = ..() + idle_sounds = list('sound/creatures/psychidle.ogg','sound/creatures/psychidle2.ogg') + +/mob/living/simple_animal/hostile/psycho/muzzle/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psychdeath.ogg','sound/creatures/psychdeath2.ogg',) + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/muzzle/Aggro() + ..() + var/list/possible_sounds = list('sound/creatures/psychsight.ogg','sound/creatures/psychsight2.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/muzzle/AttackingTarget() + ..() + playsound(get_turf(src), 'sound/creatures/psychattack1.ogg', 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/muzzle/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, TRUE) + +/mob/living/simple_animal/hostile/psycho/trap + desc = "This one has a strange device on his head." + icon_state = "psychotrap" + icon_living = "psychotrap" + speak_chance = 0 + speed = -3 + move_to_delay = 2 + melee_damage = 15 + attack_sound = null + attacktext = "headbutts" + loot = list(/obj/effect/mob_spawn/human/corpse/psychost/trap) + var/cooldown = 0 + var/static/list/idle_sounds + +/mob/living/simple_animal/hostile/psycho/trap/Aggro() + ..() + var/list/possible_sounds = list('sound/creatures/psychsight.ogg','sound/creatures/psychsight2.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 70, TRUE, 0) + +/mob/living/simple_animal/hostile/psycho/trap/Initialize() + . = ..() + idle_sounds = list('sound/creatures/psychidle.ogg','sound/creatures/psychidle2.ogg') + +/mob/living/simple_animal/hostile/psycho/trap/Life() + ..() + if(Aggro() || stat) + return + if(prob(20)) + var/chosen_sound = pick(idle_sounds) + playsound(src, chosen_sound, 50, FALSE) + if(health < maxHealth) + playsound(src, 'sound/machines/beep.ogg', 80, FALSE) + addtimer(CALLBACK(src, .proc/death), 200) + +/mob/living/simple_animal/hostile/psycho/trap/AttackingTarget() + var/list/possible_sounds = list('sound/creatures/psychhead.ogg','sound/creatures/psychhead2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 100, TRUE, 0) + ..() + +/mob/living/simple_animal/hostile/psycho/trap/death(gibbed) + var/list/possible_sounds = list('sound/creatures/psychdeath.ogg','sound/creatures/psychdeath2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 70, 0, 0) + playsound(get_turf(src), 'sound/effects/snap.ogg', 75, TRUE, 0) + playsound(get_turf(src), 'sound/effects/splat.ogg', 90, TRUE, 0) + visible_message("The device activates!") + ..() + +/mob/living/simple_animal/hostile/syndicate/factory/heavy + name = "Heavy gunner" + desc = "They didn't get that backpack for nothing." + icon_state = "Heavy" + icon_living = "Heavy" + sidestep_per_cycle = 0 + minimum_distance = 5 + approaching_target = TRUE + ranged = TRUE + rapid = 65 + rapid_fire_delay = 0.5 + projectiletype = /obj/item/projectile/beam + ranged_cooldown_time = 110 + vision_range = 9 + speak_chance = 0 + speak = null + aggro_vision_range = 9 + attacktext = "hits" + attack_sound = 'sound/weapons/genhit3.ogg' + retreat_distance = 2 + melee_queue_distance = 1 + melee_damage = 25 + move_to_delay = 4 + projectilesound = null + speed = 15 + health = 300 + maxHealth = 300 + loot = list(/obj/effect/mob_spawn/human/corpse/heavy) + var/cooldown = 0 + +/mob/living/simple_animal/hostile/syndicate/factory/heavy/Initialize() + ..() + +/mob/living/simple_animal/hostile/syndicate/factory/heavy/Aggro() + ..() + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), 'sound/creatures/heavysight1.ogg', 80, 0, 0) + +/mob/living/simple_animal/hostile/syndicate/factory/heavy/OpenFire(atom/A) + playsound(get_turf(src), 'sound/weapons/heavyminigunstart.ogg', 80, 0, 0) + move_to_delay = 6//slowdown when shoot + speed = 30 + sleep(15) + playsound(get_turf(src), 'sound/weapons/heavyminigunshoot.ogg', 90, 0, 0) + if(CheckFriendlyFire(A)) + return + if(!(simple_mob_flags & SILENCE_RANGED_MESSAGE)) + visible_message("[src] [ranged_message] at [A]!") + if(rapid > 1) + var/datum/callback/cb = CALLBACK(src, .proc/Shoot, A) + for(var/i in 1 to rapid) + addtimer(cb, (i - 1)*rapid_fire_delay) + else + Shoot(A) + ranged_cooldown = world.time + ranged_cooldown_time + playsound(get_turf(src), 'sound/weapons/heavyminigunstop.ogg', 80, 0, 0) + move_to_delay = initial(move_to_delay)//restore speed + speed = initial(speed) + +/mob/living/simple_animal/hostile/syndicate/factory/heavy/death(gibbed) + playsound(get_turf(src), 'sound/creatures/heavydeath1.ogg', 80, TRUE, 0) + ..() + +/obj/item/clothing/mask/gas/sechailer/swat/emagged + safety = FALSE + +/mob/living/simple_animal/hostile/zombie_suicide + name = "agressive corpse" + desc = "This corpse is holding a grenade without a pin in it..." + icon = 'icons/mob/simple_human.dmi' + icon_state = "suicidezombie" + icon_living = "suicidezombie" + mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + minbodytemp = 0 + status_flags = CANPUSH + health = 100 + maxHealth = 100 + move_to_delay = 2 + speed = 0 + melee_damage = null + attack_sound = null + del_on_death = TRUE + stat_attack = UNCONSCIOUS + a_intent = INTENT_HARM + var/det_time = 30 + var/active = 0 + var/cooldown = 0 + loot = list(/obj/effect/mob_spawn/human/corpse/suicidezombie, /obj/item/grenade/syndieminibomb/concussion/frag/activated) + do_footstep = TRUE + hardattacks = TRUE + +/mob/living/simple_animal/hostile/zombie_suicide/Aggro() + ..() + var/list/possible_sounds = list('sound/creatures/szombiesight.ogg','sound/creatures/szombiesight2.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 50, TRUE, 0) + +/mob/living/simple_animal/hostile/zombie_suicide/AttackingTarget() + if(!active) + active = TRUE + playsound(src, 'sound/weapons/armbomb.ogg', 100, TRUE) + var/list/possible_sounds = list('sound/creatures/szombiesight.ogg','sound/creatures/szombiesight2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 50, TRUE, 0) + visible_message("[src] primes the grenade!.") + addtimer(CALLBACK(src, .proc/prime), det_time) + +/mob/living/simple_animal/hostile/zombie_suicide/proc/prime() + explosion(src,0, 2, 3, flame_range = 3) + new /obj/effect/gibspawner/generic(get_turf(src), src) + qdel(src) + +/mob/living/simple_animal/hostile/zombie_suicide/death(gibbed) + playsound(src, 'sound/creatures/szombiedeath.ogg', 60, TRUE) + ..() + +/obj/item/grenade/syndieminibomb/concussion/frag/activated + det_time = 30 + +/obj/item/grenade/syndieminibomb/concussion/frag/activated/Initialize() + ..() + preprime() + +/mob/living/simple_animal/hostile/syndicate/factory/boss + name = "The Director" + desc = "This thing looks more like a machine than human." + maxHealth = 500 + health = 500 + icon_state = "facboss" + icon_living = "facboss" + see_in_dark = 13 + vision_range = 12 + aggro_vision_range = 12 + search_objects = 1 + minbodytemp = 0 + speak = null + dodging = FALSE + mob_biotypes = list(MOB_ROBOTIC) + obj_damage = 100 + move_force = MOVE_FORCE_EXTREMELY_STRONG + move_resist = MOVE_FORCE_EXTREMELY_STRONG + pull_force = MOVE_FORCE_EXTREMELY_STRONG + hardattacks = TRUE + melee_damage = 50 + speed = 5 + move_to_delay = 3 + ranged = TRUE + hud_possible = list(ANTAG_HUD) + approaching_target = TRUE + ranged_ignores_vision = TRUE + environment_smash = ENVIRONMENT_SMASH_RWALLS + ranged_cooldown_time = 30 + check_friendly_fire = 1 + turns_per_move = 2 + spacewalk = TRUE + rapid_melee = 0 + lose_patience_timeout = 400 + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 0 + attack_sound = 'sound/weapons/sonic_jackhammer.ogg' + projectilesound = 'sound/weapons/shotgunshot.ogg' + var/cooldown = 0 + loot = list(/obj/item/gun/ballistic/shotgun/lever_action, + /obj/effect/mob_spawn/human/corpse/facboss) + +/mob/living/simple_animal/hostile/syndicate/factory/boss/Shoot() + var/static/list/allowed_projectile_types = list(/obj/item/ammo_casing/shotgun/beanbag, + /obj/item/ammo_casing/shotgun, /obj/item/ammo_casing/shotgun/incendiary, + /obj/item/ammo_casing/shotgun/dragonsbreath, + /obj/item/ammo_casing/shotgun/meteorslug, + /obj/item/ammo_casing/shotgun/pulseslug, + /obj/item/ammo_casing/shotgun/frag12, + /obj/item/ammo_casing/shotgun/buckshot, + /obj/item/ammo_casing/shotgun/rubbershot, + /obj/item/ammo_casing/shotgun/incapacitate, + /obj/item/ammo_casing/shotgun/improvised, + /obj/item/ammo_casing/shotgun/ion, + /obj/item/ammo_casing/shotgun/laserslug, + /obj/item/ammo_casing/shotgun/breacher) + casingtype = pick(allowed_projectile_types) + ..() + sleep(5) + playsound(get_turf(src), 'sound/weapons/shotgunpump.ogg', 50, 0, 0) + +/mob/living/simple_animal/hostile/syndicate/factory/boss/Aggro() + ..() + var/list/possible_sounds = list('sound/voice/ed209_20sec.ogg','sound/creatures/bosssight.ogg','sound/creatures/bosssight2.ogg','sound/voice/complionator/harry.ogg','sound/weapons/leveractionrack.ogg') + var/chosen_sound = pick(possible_sounds) + if (cooldown < world.time) + cooldown = world.time + 300 + playsound(get_turf(src), chosen_sound, 80, TRUE, 0) + say("Target!") + +/mob/living/simple_animal/hostile/syndicate/factory/boss/Life() + ..() + if(health <= 300) + icon_state = "facboss2" + icon_living = "facboss2" + ranged_cooldown_time = 20//less health - faster shooting + return + if(health <= 150) + if(prob(5) && Aggro())//change to insult the target on low health + playsound(get_turf(src), 'sound/voice/beepsky/insult.ogg', 100, 0, 0) + visible_message("FUCK YOUR CUNT YOU SHIT EATING COCKSTORM AND EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND POO AND SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT.") + icon_state = "facboss3" + icon_living = "facboss3" + ranged_cooldown_time = 10//even faster + +/mob/living/simple_animal/hostile/syndicate/factory/boss/updatehealth() + ..() + if(health <= 300) + var/list/possible_sounds = list('sound/creatures/bosspain.ogg','sound/creatures/bosspain2.ogg') + var/chosen_sound = pick(possible_sounds) + playsound(get_turf(src), chosen_sound, 60, TRUE, 0) + +/mob/living/simple_animal/hostile/syndicate/factory/boss/death(gibbed) + playsound(get_turf(src), 'sound/voice/borg_deathsound.ogg', 80, TRUE, 0) + visible_message("\the [src] activates its self-destruct system!.") + speed = 15 + move_to_delay = 20 + ranged_cooldown = 300 + ranged_cooldown_time = 300 + INVOKE_ASYNC(src, .proc/explosion, src.loc, 0, 3, 4, null, null, FALSE, 2) + ..() + +//GUNS// + +/obj/item/gun/ballistic/shotgun/lever_action + name = "lever action shotgun" + desc = "A really old shotgun with five shell capacity. This one can fit in a backpack." + w_class = WEIGHT_CLASS_NORMAL + dual_wield_spread = 0 + fire_sound_volume = 60 //tried on 90 my eardrums said goodbye + item_state = "leveraction" + icon_state = "leveraction" + rack_sound = "sound/weapons/leveractionrack.ogg" + fire_sound = "sound/weapons/leveractionshot.ogg" + vary_fire_sound = FALSE + rack_sound_vary = FALSE + recoil = 1 + mag_type = /obj/item/ammo_box/magazine/internal/shot/lever + pb_knockback = 5 + +/obj/item/gun/ballistic/shotgun/lever_action/examine(mob/user) + . = ..() + . += "You will instantly reload it after a shot if you have another hand free." + +/obj/item/gun/ballistic/shotgun/lever_action/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) + ..() + if(user.get_inactive_held_item()) + return + else + rack() + +/obj/item/gun/ballistic/shotgun/lever_action/rack(mob/user = null) + if (user) + to_chat(user, "You rack the [bolt_wording] of \the [src].") + process_chamber(!chambered, FALSE) + playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) + update_icon() + if(user.get_inactive_held_item() && prob(50) && chambered) + user.visible_message("With a single move of [user.p_their()] arm, [user] flips \the [src] and loads the chamber with a shell.") + +/obj/item/gun/ballistic/automatic/pistol/deagle/sound + desc = "A robust .50 AE handgun. This one looks even more robust." + rack_sound = "sound/weapons/deaglerack.ogg" + bolt_drop_sound = "sound/weapons/deagleslidedrop.ogg" + lock_back_sound = "sound/weapons/deaglelock.ogg" + lock_back_sound_vary = FALSE + rack_sound_vary = FALSE + load_sound_vary = FALSE + eject_sound_vary = FALSE + fire_sound = "sound/weapons/deagleshot.ogg" + vary_fire_sound = TRUE + fire_rate = 5 + force = 18 + +//MISC// + +/obj/effect/trap/nexus/trickyspawner/clowns + mobs = 5 + spawned = /mob/living/simple_animal/hostile/retaliate/clown diff --git a/code/modules/awaymissions/mission_code/centcomAway.dm b/code/modules/awaymissions/mission_code/centcomAway.dm index 897315a3c6cc6..b785431bad1a3 100644 --- a/code/modules/awaymissions/mission_code/centcomAway.dm +++ b/code/modules/awaymissions/mission_code/centcomAway.dm @@ -7,32 +7,32 @@ /area/awaymission/centcomAway/general name = "XCC-P5831" - ambient_effects = list('sound/ambience/ambigen3.ogg') + ambientsounds = list('sound/ambience/ambigen3.ogg') /area/awaymission/centcomAway/maint name = "XCC-P5831 Maintenance" icon_state = "away1" - ambient_effects = list('sound/ambience/ambisin1.ogg') + ambientsounds = list('sound/ambience/ambisin1.ogg') /area/awaymission/centcomAway/thunderdome name = "XCC-P5831 Thunderdome" icon_state = "away2" - ambient_effects = list('sound/ambience/ambisin2.ogg') + ambientsounds = list('sound/ambience/ambisin2.ogg') /area/awaymission/centcomAway/cafe name = "XCC-P5831 Kitchen Arena" icon_state = "away3" - ambient_effects = list('sound/ambience/ambisin3.ogg') + ambientsounds = list('sound/ambience/ambisin3.ogg') /area/awaymission/centcomAway/courtroom name = "XCC-P5831 Courtroom" icon_state = "away4" - ambient_effects = list('sound/ambience/ambisin4.ogg') + ambientsounds = list('sound/ambience/ambisin4.ogg') /area/awaymission/centcomAway/hangar name = "XCC-P5831 Hangars" icon_state = "away4" - ambient_effects = list('sound/ambience/ambigen5.ogg') + ambientsounds = list('sound/ambience/ambigen5.ogg') //centcomAway items @@ -60,4 +60,4 @@ teams never did figure out what happened that last time... and I can't wrap my head \ around it myself. Why would a shuttle full of evacuees all snap and beat each other \ to death the moment they reached safety?
\ - - D. Cereza" + - D. Cereza" \ No newline at end of file diff --git a/code/modules/awaymissions/mission_code/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm index d45d177e25a26..0feb096910a4e 100644 --- a/code/modules/awaymissions/mission_code/moonoutpost19.dm +++ b/code/modules/awaymissions/mission_code/moonoutpost19.dm @@ -24,7 +24,7 @@ power_equip = FALSE power_light = FALSE poweralm = FALSE - ambient_effects = list('sound/ambience/ambimine.ogg') + ambientsounds = list('sound/ambience/ambimine.ogg') icon_state = "awaycontent5" /area/awaymission/moonoutpost19/hive diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 5c7f4b26bf4ac..cfdd9fa082cb3 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -135,30 +135,18 @@ /area/shuttle/snowdin/elevator2 name = "Mining Elevator" -//shuttle console for elevators// - -/obj/machinery/computer/shuttle/snowdin/mining - name = "shuttle console" - desc = "A shuttle control computer." - icon_screen = "shuttle" - icon_keyboard = "tech_key" - light_color = LIGHT_COLOR_CYAN - shuttleId = "snowdin_mining" - possible_destinations = "snowdin_mining_top;snowdin_mining_down" - - //liquid plasma!!!!!!// /turf/open/floor/plasteel/dark/snowdin initial_gas_mix = FROZEN_ATMOS planetary_atmos = 1 - temperature = 180 + initial_temperature = 180 /turf/open/lava/plasma name = "liquid plasma" desc = "A flowing stream of chilled liquid plasma. You probably shouldn't get in." icon_state = "liquidplasma" - initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120" + initial_gas_mix = "n2=82;plasma=24;TEMP=120" baseturfs = /turf/open/lava/plasma slowdown = 2 @@ -219,7 +207,7 @@ var/list/robo_parts = list()//keep a reference of robotic parts so we know if we can turn them into a plasmaman var/mob/living/carbon/human/PP = L var/S = PP.dna.species - if(istype(S, /datum/species/plasmaman) || istype(S, /datum/species/android) || istype(S, /datum/species/synth)) //ignore plasmamen/robotic species + if(istype(S, /datum/species/plasmaman) || istype(S, /datum/species/android)) //ignore plasmamen/robotic species continue for(var/BP in PP.bodyparts) @@ -516,11 +504,11 @@ /obj/effect/spawner/lootdrop/snowdin/dungeonheavy name = "dungeon heavy" - loot = list(/obj/item/twohanded/singularityhammer = 25, - /obj/item/twohanded/mjollnir = 10, - /obj/item/twohanded/fireaxe = 25, + loot = list(/obj/item/singularityhammer = 25, + /obj/item/mjollnir = 10, + /obj/item/fireaxe = 25, /obj/item/organ/brain/alien = 17, - /obj/item/twohanded/dualsaber = 15, + /obj/item/dualsaber = 15, /obj/item/organ/heart/demon = 7, /obj/item/gun/ballistic/automatic/c20r/unrestricted = 16, /obj/item/gun/magic/wand/resurrection/inert = 15, @@ -541,7 +529,7 @@ loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10, /obj/item/toy/snowball = 15, /obj/item/shovel = 10, - /obj/item/twohanded/spear = 8, + /obj/item/spear = 8, ) //special items//-- @@ -555,7 +543,7 @@ /obj/item/clothing/under/syndicate/coldres name = "insulated tactical turtleneck" desc = "A nondescript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection." - armor = list("melee" = 20, "bullet" = 10, "laser" = 0,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) + armor = list("melee" = 20, "bullet" = 10, "laser" = 0,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25, "stamina" = 30) cold_protection = CHEST|GROIN|ARMS|LEGS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm index a477a223b2dc0..11d99108a5fc2 100644 --- a/code/modules/awaymissions/mission_code/spacebattle.dm +++ b/code/modules/awaymissions/mission_code/spacebattle.dm @@ -6,7 +6,7 @@ requires_power = FALSE /area/awaymission/spacebattle/cruiser - name = "Nanotrasen Cruiser" + name = "\improper Nanotrasen Cruiser" icon_state = "awaycontent2" /area/awaymission/spacebattle/syndicate1 diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 0adef7f0b4b08..19c1bad75b764 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -112,7 +112,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") info = {"Target: Research-station Epsilon
Objective: Prototype weaponry. The captain likely keeps them locked in her safe.
- Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunatly he has been captured by security + Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunately he has been captured by security Your objective is to split up, locate any of the papers containing the captain's safe code, open the safe and secure anything found inside. If possible, recover the imprisioned syndicate operative and receive the code from him.
@@ -148,9 +148,9 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") /obj/singularity/narsie/mini/admin_investigate_setup() return -/obj/singularity/narsie/mini/process() +/obj/singularity/narsie/mini/process(delta_time) eat() - if(prob(25)) + if(DT_PROB(13, delta_time)) mezzer() /obj/singularity/narsie/mini/ex_act() diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 8f216506eacec..7a42a05c04f46 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -105,7 +105,7 @@ if("Immortality") to_chat(user, "Your wish is granted, but at a terrible cost...") to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") - user.verbs += /mob/living/carbon/proc/immortality + user.add_verb(/mob/living/carbon/proc/immortality) user.set_species(/datum/species/shadow) if("Peace") to_chat(user, "Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.") diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 79f61f352bb14..47f783cbb3828 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.con to_chat(world, "Away mission loaded.") /proc/reset_gateway_spawns(reset = FALSE) - for(var/obj/machinery/gateway/G in world) + for(var/obj/machinery/gateway/G in GLOB.machines) if(reset) G.randomspawns = GLOB.awaydestinations else diff --git a/code/modules/badges/badges.dm b/code/modules/badges/badges.dm new file mode 100644 index 0000000000000..b708ded074943 --- /dev/null +++ b/code/modules/badges/badges.dm @@ -0,0 +1,89 @@ +/* + +Loads all badges from the badge.json file. +Format should be +rank|icon +Where: +Rank - The name of the admin rank +Icon - The name of the icon state in the badges.dmi file + +Special ranks: +- Donator: Matches clients in the donator list +- Mentor: Matches clients in the mentor list + +*/ + +//Global list of badges +GLOBAL_LIST_EMPTY(badge_data) + +/client + var/list/cached_badges = null + +//Loads the badge ranks +/proc/load_badge_ranks() + //No badges + if(!CONFIG_GET(flag/badges)) + return + //Load and parse data + GLOB.badge_data = json_decode(rustg_file_read("[global.config.directory]/badges.json")) + //Associate badges with admin ranks + for(var/datum/admin_rank/rank as() in GLOB.admin_ranks) + rank.badge_icon = GLOB.badge_data[rank.name] + //Yay + log_game("[LAZYLEN(GLOB.badge_data)] badges loaded successfully.") + //Reset everyones badges so they get reloaded. + for(var/client/C as() in GLOB.clients) + C.reset_badges() + +//Gets the badges attached to a client. +/client/proc/get_badges() + //No badges + if(!CONFIG_GET(flag/badges)) + return + //Send cached badges + if(islist(cached_badges)) + return cached_badges + var/list/badges = list() + //Add the holder rank + if(holder) + //No badges when deadminned / fakeminned + if(holder.deadmined || holder.fakekey) + cached_badges = list() + return list() + //Admin badge otherwise + if(holder?.rank?.badge_icon) + badges += holder.rank.badge_icon + //Add the mentor rank + else + if(mentor_datum && GLOB.badge_data["Mentor"]) + badges += GLOB.badge_data["Mentor"] + //Add the donator rank + if(IS_PATRON(ckey) && GLOB.badge_data["Donator"]) + badges += GLOB.badge_data["Donator"] + cached_badges = badges + return badges + +/client/proc/reset_badges() + cached_badges = null + +/proc/badge_parse(badges) + if(!LAZYLEN(badges)) + return "" + + var/output = "" + var/first_badge = TRUE + + if(!CONFIG_GET(flag/badges)) + return "" + + for(var/badge in badges) + var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat) + var/tag = sheet.icon_tag("badge-badge_[badge]") + if(tag) + if(first_badge) + output = "[output][tag]" + first_badge = FALSE + else + output = "[output] [tag]" + + return "[output] " diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index b232bd212c643..e8490837c3d31 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -17,10 +17,10 @@ var/switch_state = BM_SWITCHSTATE_NONE var/switch_width = 5 // modeswitch UI - var/obj/screen/buildmode/mode/modebutton + var/atom/movable/screen/buildmode/mode/modebutton var/list/modeswitch_buttons = list() // dirswitch UI - var/obj/screen/buildmode/bdir/dirbutton + var/atom/movable/screen/buildmode/bdir/dirbutton var/list/dirswitch_buttons = list() /datum/buildmode/New(client/c) @@ -34,7 +34,7 @@ holder.screen += buttons holder.click_intercept = src mode.enter_mode(src) - + /datum/buildmode/proc/quit() mode.exit_mode(src) holder.screen -= buttons @@ -45,8 +45,10 @@ /datum/buildmode/Destroy() close_switchstates() holder.player_details.post_login_callbacks -= li_cb + li_cb = null holder = null QDEL_NULL(mode) + QDEL_LIST(buttons) QDEL_LIST(modeswitch_buttons) QDEL_LIST(dirswitch_buttons) return ..() @@ -63,16 +65,16 @@ /datum/buildmode/proc/create_buttons() // keep a reference so we can update it upon mode switch - modebutton = new /obj/screen/buildmode/mode(src) + modebutton = new /atom/movable/screen/buildmode/mode(src) buttons += modebutton - buttons += new /obj/screen/buildmode/help(src) + buttons += new /atom/movable/screen/buildmode/help(src) // keep a reference so we can update it upon dir switch - dirbutton = new /obj/screen/buildmode/bdir(src) + dirbutton = new /atom/movable/screen/buildmode/bdir(src) buttons += dirbutton - buttons += new /obj/screen/buildmode/quit(src) + buttons += new /atom/movable/screen/buildmode/quit(src) // build the lists of switching buttons - build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /obj/screen/buildmode/modeswitch) - build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /obj/screen/buildmode/dirswitch) + build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /atom/movable/screen/buildmode/modeswitch) + build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /atom/movable/screen/buildmode/dirswitch) // this creates a nice offset grid for choosing between buildmode options, // because going "click click click ah hell" sucks. @@ -81,7 +83,7 @@ for(var/thing in elements) var/x = pos_idx % switch_width var/y = FLOOR(pos_idx / switch_width, 1) - var/obj/screen/buildmode/B = new buttontype(src, thing) + var/atom/movable/screen/buildmode/B = new buttontype(src, thing) // extra .5 for a nice offset look B.screen_loc = "NORTH-[(1 + 0.5 + y*1.5)],WEST+[0.5 + x*1.5]" buttonslist += B @@ -100,7 +102,7 @@ else close_switchstates() open_modeswitch() - + /datum/buildmode/proc/open_modeswitch() switch_state = BM_SWITCHSTATE_MODE holder.screen += modeswitch_buttons @@ -115,7 +117,7 @@ else close_switchstates() open_dirswitch() - + /datum/buildmode/proc/open_dirswitch() switch_state = BM_SWITCHSTATE_DIR holder.screen += dirswitch_buttons @@ -155,7 +157,7 @@ new /datum/buildmode(M.client) message_admins("[key_name_admin(usr)] has entered build mode.") log_admin("[key_name(usr)] has entered build mode.") - + #undef BM_SWITCHSTATE_NONE #undef BM_SWITCHSTATE_MODE -#undef BM_SWITCHSTATE_DIR \ No newline at end of file +#undef BM_SWITCHSTATE_DIR diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index e72dbde064382..e2bfec25bc5e4 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -1,23 +1,23 @@ -/obj/screen/buildmode +/atom/movable/screen/buildmode icon = 'icons/misc/buildmode.dmi' var/datum/buildmode/bd // If we don't do this, we get occluded by item action buttons layer = ABOVE_HUD_LAYER -/obj/screen/buildmode/New(bld) +/atom/movable/screen/buildmode/New(bld) bd = bld return ..() -/obj/screen/buildmode/Destroy() +/atom/movable/screen/buildmode/Destroy() bd = null return ..() -/obj/screen/buildmode/mode +/atom/movable/screen/buildmode/mode name = "Toggle Mode" icon_state = "buildmode_basic" screen_loc = "NORTH,WEST" -/obj/screen/buildmode/mode/Click(location, control, params) +/atom/movable/screen/buildmode/mode/Click(location, control, params) var/list/pa = params2list(params) if(pa.Find("left")) @@ -27,64 +27,64 @@ update_icon() return 1 -/obj/screen/buildmode/mode/update_icon() +/atom/movable/screen/buildmode/mode/update_icon() icon_state = bd.mode.get_button_iconstate() -/obj/screen/buildmode/help +/atom/movable/screen/buildmode/help icon_state = "buildhelp" screen_loc = "NORTH,WEST+1" name = "Buildmode Help" -/obj/screen/buildmode/help/Click(location, control, params) +/atom/movable/screen/buildmode/help/Click(location, control, params) bd.mode.show_help(usr.client) return 1 -/obj/screen/buildmode/bdir +/atom/movable/screen/buildmode/bdir icon_state = "build" screen_loc = "NORTH,WEST+2" name = "Change Dir" -/obj/screen/buildmode/bdir/update_icon() +/atom/movable/screen/buildmode/bdir/update_icon() dir = bd.build_dir return -/obj/screen/buildmode/bdir/Click() +/atom/movable/screen/buildmode/bdir/Click() bd.toggle_dirswitch() update_icon() return 1 // used to switch between modes -/obj/screen/buildmode/modeswitch +/atom/movable/screen/buildmode/modeswitch var/datum/buildmode_mode/modetype -/obj/screen/buildmode/modeswitch/New(bld, mt) +/atom/movable/screen/buildmode/modeswitch/New(bld, mt) modetype = mt icon_state = "buildmode_[initial(modetype.key)]" name = initial(modetype.key) return ..(bld) -/obj/screen/buildmode/modeswitch/Click() +/atom/movable/screen/buildmode/modeswitch/Click() bd.change_mode(modetype) return 1 // used to switch between dirs -/obj/screen/buildmode/dirswitch +/atom/movable/screen/buildmode/dirswitch icon_state = "build" -/obj/screen/buildmode/dirswitch/New(bld, dir) +/atom/movable/screen/buildmode/dirswitch/New(bld, dir) src.dir = dir name = dir2text(dir) return ..(bld) -/obj/screen/buildmode/dirswitch/Click() +/atom/movable/screen/buildmode/dirswitch/Click() bd.change_dir(dir) return 1 -/obj/screen/buildmode/quit +/atom/movable/screen/buildmode/quit icon_state = "buildquit" screen_loc = "NORTH,WEST+3" name = "Quit Buildmode" -/obj/screen/buildmode/quit/Click() +/atom/movable/screen/buildmode/quit/Click() bd.quit() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/buildmode/submodes/delete.dm b/code/modules/buildmode/submodes/delete.dm new file mode 100644 index 0000000000000..cbd93851577b6 --- /dev/null +++ b/code/modules/buildmode/submodes/delete.dm @@ -0,0 +1,63 @@ +/datum/buildmode_mode/delete + key = "delete" + +/datum/buildmode_mode/delete/show_help(client/c) + to_chat(c, "***********************************************************\n\ + Left Mouse Button on anything to delete it. If you break it, you buy it.\n\ + Right Mouse Button on anything to delete everything of the type. Probably don\'t do this unless you know what you are doing.\n\ + ***********************************************************") + +/datum/buildmode_mode/delete/handle_click(client/c, params, object) + var/list/pa = params2list(params) + var/left_click = pa.Find("left") + var/right_click = pa.Find("right") + + if(left_click) + if(isturf(object)) + var/turf/T = object + T.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) + else if(isatom(object)) + qdel(object) + + if(right_click) + if(!check_rights(R_DEBUG|R_SERVER)) //Prevents buildmoded non-admins from breaking everything. + return + if(isturf(object)) + return + var/atom/deleting = object + var/action_type = alert(usr,"Strict type ([deleting.type]) or type and all subtypes?","Strict type","Type and subtypes","Cancel") + if(action_type == "Cancel" || !action_type) + return + + if(alert(usr,"Are you really sure you want to delete all instances of type [deleting.type]?","Yes","No") != "Yes") + return + + if(alert(usr,"Second confirmation required. Delete?","Yes","No") != "Yes") + return + + var/O_type = deleting.type + switch(action_type) + if("Strict type") + var/i = 0 + for(var/atom/Obj in world) + if(Obj.type == O_type) + i++ + qdel(Obj) + CHECK_TICK + if(!i) + to_chat(usr, "No instances of this type exist") + return + log_admin("[key_name(usr)] deleted all instances of type [O_type] ([i] instances deleted) ") + message_admins("[key_name(usr)] deleted all instances of type [O_type] ([i] instances deleted)") + if("Type and subtypes") + var/i = 0 + for(var/Obj in world) + if(istype(Obj,O_type)) + i++ + qdel(Obj) + CHECK_TICK + if(!i) + to_chat(usr, "No instances of this type exist") + return + log_admin("[key_name(usr)] deleted all instances of type or subtype of [O_type] ([i] instances deleted) ") + message_admins("[key_name(usr)] deleted all instances of type or subtype of [O_type] ([i] instances deleted) ") diff --git a/code/modules/buildmode/submodes/outfit.dm b/code/modules/buildmode/submodes/outfit.dm new file mode 100644 index 0000000000000..5d57582680ccd --- /dev/null +++ b/code/modules/buildmode/submodes/outfit.dm @@ -0,0 +1,45 @@ +/datum/buildmode_mode/outfit + key = "outfit" + var/datum/outfit/dressuptime + +/datum/buildmode_mode/outfit/Destroy() + dressuptime = null + return ..() + +/datum/buildmode_mode/outfit/show_help(client/c) + to_chat(c, "***********************************************************\n\ + Right Mouse Button on buildmode button = Select outfit to equip.\n\ + Left Mouse Button on mob/living/carbon/human = Equip the selected outfit.\n\ + Right Mouse Button on mob/living/carbon/human = Strip and delete current outfit.\n\ + ***********************************************************") + +/datum/buildmode_mode/outfit/Reset() + . = ..() + dressuptime = null + +/datum/buildmode_mode/outfit/change_settings(client/c) + dressuptime = c.robust_dress_shop() + +/datum/buildmode_mode/outfit/handle_click(client/c, params, object) + var/list/pa = params2list(params) + var/left_click = pa.Find("left") + var/right_click = pa.Find("right") + + + if(!ishuman(object)) + return + var/mob/living/carbon/human/dollie = object + + if(left_click) + if(isnull(dressuptime)) + to_chat(c, ("Pick an outfit first.")) + return + + for (var/item in dollie.get_equipped_items(TRUE)) + qdel(item) + if(dressuptime != "Naked") + dollie.equipOutfit(dressuptime) + + if(right_click) + for (var/item in dollie.get_equipped_items(TRUE)) + qdel(item) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index e0c423a164073..9263cea75f81e 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -35,7 +35,7 @@ description = "CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears." reward = 2000 required_count = 5 - wanted_types = list(/obj/item/twohanded/spear) + wanted_types = list(/obj/item/spear) /datum/bounty/item/assistant/toolbox name = "Toolboxes" @@ -124,13 +124,6 @@ required_count = 5 wanted_types = list(/obj/structure/chair/comfy) -/datum/bounty/item/assistant/geranium - name = "Geraniums" - description = "Commander Zot has the hots for Commander Zena. Send a shipment of geraniums - her favorite flower - and he'll happily reward you." - reward = 4000 - required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy/geranium) - /datum/bounty/item/assistant/poppy name = "Poppies" description = "Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of Poppies - her favorite flower - and he'll happily reward you." @@ -150,7 +143,7 @@ description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants." reward = 2000 required_count = 8 - wanted_types = list(/obj/item/twohanded/required/kirbyplants) + wanted_types = list(/obj/item/kirbyplants) /datum/bounty/item/assistant/earmuffs name = "Earmuffs" @@ -176,7 +169,7 @@ name = "Chainsaw" description = "The chef at CentCom is having trouble butchering her animals. She requests one chainsaw, please." reward = 2500 - wanted_types = list(/obj/item/twohanded/required/chainsaw) + wanted_types = list(/obj/item/chainsaw) /datum/bounty/item/assistant/ied name = "IED" diff --git a/code/modules/cargo/bounties/botany.dm b/code/modules/cargo/bounties/botany.dm index 76e4bcf252f6a..294278405625f 100644 --- a/code/modules/cargo/bounties/botany.dm +++ b/code/modules/cargo/bounties/botany.dm @@ -3,12 +3,15 @@ var/datum/bounty/item/botany/multiplier = 0 //adds bonus reward money; increased for higher tier or rare mutations var/datum/bounty/item/botany/bonus_desc //for adding extra flavor text to bounty descriptions var/datum/bounty/item/botany/foodtype = "meal" //same here + var/datum/bounty/item/botany/format_exception = FALSE //Set to true if the bounty uses a custom format from the one below /datum/bounty/item/botany/New() ..() - description = "Central Command's head chef is looking to prepare a fine [foodtype] with [name]. [bonus_desc]" - reward += multiplier * 1000 - required_count = rand(5, 10) + + if (format_exception == FALSE) + description = "Central Command's head chef is looking to prepare a fine [foodtype] with [name]. [bonus_desc]" + reward += multiplier * 1000 + required_count = rand(5, 10) /datum/bounty/item/botany/ambrosia_vulgaris name = "Ambrosia Vulgaris Leaves" @@ -199,3 +202,27 @@ multiplier = 2 foodtype = "batch of oatmeal" bonus_desc = "Squats and oats. We're all out of oats." + +/datum/bounty/item/botany/forgetmenot + name = "Forget-Me-Nots" + description = "Commander Zot has his eyes on Quartermaster Maya. Send a shipment of forget-me-nots - her favorite flower - and he'll happily reward you." + reward = 7000 + required_count = 3 + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy/geranium/forgetmenot) + format_exception = TRUE + +/datum/bounty/item/botany/geranium + name = "Geraniums" + description = "Commander Zot has the hots for Commander Zena. Send a shipment of geraniums - her favorite flower - and he'll happily reward you." + reward = 6000 + required_count = 3 + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy/geranium) + format_exception = TRUE + +/datum/bounty/item/botany/rainbowflowercrown + name = "Rainbow Flower Crowns" + description = "Central Command is concerned about their intern suicide rate. A shipment of rainbow flower crowns should do nicely to improve morale." + reward = 10000 + required_count = 3 + wanted_types = list(/obj/item/clothing/head/rainbowbunchcrown) + format_exception = TRUE \ No newline at end of file diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm index e31952e416e4d..8b3ebf629f592 100644 --- a/code/modules/cargo/bounties/engineering.dm +++ b/code/modules/cargo/bounties/engineering.dm @@ -4,7 +4,7 @@ reward = 7500 wanted_types = list(/obj/item/tank) var/moles_required = 20 // A full tank is 28 moles, but CentCom ignores that fact. - var/gas_type = /datum/gas/pluoxium + var/gas_type = GAS_PLUOXIUM /datum/bounty/item/engineering/gas/applies_to(obj/O) if(!..()) @@ -15,21 +15,15 @@ /datum/bounty/item/engineering/gas/nitryl_tank name = "Full Tank of Nitryl" description = "The non-human staff of Station 88 has been volunteered to test performance enhancing drugs. Ship them a tank full of Nitryl so they can get started." - gas_type = /datum/gas/nitryl + gas_type = GAS_NITRYL /datum/bounty/item/engineering/gas/tritium_tank name = "Full Tank of Tritium" description = "Station 49 is looking to kickstart their research program. Ship them a tank full of Tritium." - gas_type = /datum/gas/tritium + gas_type = GAS_TRITIUM /datum/bounty/item/engineering/energy_ball name = "Contained Tesla Ball" description = "Station 24 is being overrun by hordes of angry Mothpeople. They are requesting the ultimate bug zapper." reward = 75000 //requires 14k credits of purchases, not to mention cooperation with engineering/heads of staff to set up inside the cramped shuttle wanted_types = list(/obj/singularity/energy_ball) - -/datum/bounty/item/engineering/energy_ball/applies_to(obj/O) - if(!..()) - return FALSE - var/obj/singularity/energy_ball/T = O - return !T.miniball diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm index e68144e1a134e..6761ffa2a57e4 100644 --- a/code/modules/cargo/bounties/mining.dm +++ b/code/modules/cargo/bounties/mining.dm @@ -22,7 +22,7 @@ name = "Bone Axe" description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement." reward = 7500 - wanted_types = list(/obj/item/twohanded/fireaxe/boneaxe) + wanted_types = list(/obj/item/fireaxe/boneaxe) /datum/bounty/item/mining/bone_bow name = "Bone Bow" diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index d2a0084ebec0d..209f959578ce0 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -175,7 +175,6 @@ /datum/reagent/consumable/frostoil,\ /datum/reagent/toxin/slimejelly,\ /datum/reagent/teslium/energized_jelly,\ - /datum/reagent/toxin/skewium,\ /datum/reagent/toxin/mimesbane,\ /datum/reagent/medicine/strange_reagent,\ /datum/reagent/nitroglycerin,\ diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm index 33f334ac47265..83a069724a5e7 100644 --- a/code/modules/cargo/bounties/science.dm +++ b/code/modules/cargo/bounties/science.dm @@ -8,7 +8,7 @@ name = "Trash Bag of Holding" description = "Nanotrasen would make good use of high-capacity trash bags. If you have any, please ship them." reward = 10000 - wanted_types = list(/obj/item/storage/backpack/holding) + wanted_types = list(/obj/item/storage/bag/trash/bluespace) /datum/bounty/item/science/bluespace_syringe name = "Bluespace Syringe" diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm index cbbf36c671023..af61a6698e445 100644 --- a/code/modules/cargo/bounties/special.dm +++ b/code/modules/cargo/bounties/special.dm @@ -28,7 +28,7 @@ /datum/bounty/item/trash name = "Trash" - description = "Recently a group of janitors have run out of trash to clean up, without any trash Centcom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation." + description = "Recently a group of janitors have run out of trash to clean up, without any trash CentCom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation." reward = 1000 required_count = 10 wanted_types = list(/obj/item/trash) diff --git a/code/modules/cargo/bounties/virus.dm b/code/modules/cargo/bounties/virus.dm index 8f078a2668bd5..13a51281fd008 100644 --- a/code/modules/cargo/bounties/virus.dm +++ b/code/modules/cargo/bounties/virus.dm @@ -56,26 +56,26 @@ /datum/bounty/virus/resistance/accepts_virus(V) var/datum/disease/advance/A = V - return A.totalResistance() == stat_value + return A.resistance == stat_value /datum/bounty/virus/stage_speed stat_name = "stage speed" /datum/bounty/virus/stage_speed/accepts_virus(V) var/datum/disease/advance/A = V - return A.totalStageSpeed() == stat_value + return A.stage_rate == stat_value /datum/bounty/virus/stealth stat_name = "stealth" /datum/bounty/virus/stealth/accepts_virus(V) var/datum/disease/advance/A = V - return A.totalStealth() == stat_value + return A.stealth == stat_value /datum/bounty/virus/transmit stat_name = "transmissible" /datum/bounty/virus/transmit/accepts_virus(V) var/datum/disease/advance/A = V - return A.totalTransmittable() == stat_value + return A.transmission == stat_value diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm index 7bfd9eabe8305..e5ad56382378a 100644 --- a/code/modules/cargo/bounty.dm +++ b/code/modules/cargo/bounty.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(bounties_list) // Displayed on bounty UI screen. /datum/bounty/proc/reward_string() - return "[reward] Credits" + return "[reward * SSeconomy.bounty_modifier] Credits" /datum/bounty/proc/can_claim() return !claimed @@ -21,9 +21,7 @@ GLOBAL_LIST_EMPTY(bounties_list) // Called when the claim button is clicked. Override to provide fancy rewards. /datum/bounty/proc/claim() if(can_claim()) - var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) - if(D) - D.adjust_money(reward) + SSeconomy.distribute_funds(reward * SSeconomy.bounty_modifier * 3) claimed = TRUE // If an item sent in the cargo shuttle can satisfy the bounty. diff --git a/code/modules/cargo/bounty_console.dm b/code/modules/cargo/bounty_console.dm index 0135fb714e21f..a6a2d55bdcfb0 100644 --- a/code/modules/cargo/bounty_console.dm +++ b/code/modules/cargo/bounty_console.dm @@ -1,16 +1,18 @@ #define PRINTER_TIMEOUT 10 /obj/machinery/computer/bounty - name = "Nanotrasen bounty console" + name = "\improper Nanotrasen bounty console" desc = "Used to check and claim bounties offered by Nanotrasen" icon_screen = "bounty" circuit = /obj/item/circuitboard/computer/bounty light_color = "#E2853D"//orange var/printer_ready = 0 //cooldown var + var/static/datum/bank_account/cargocash /obj/machinery/computer/bounty/Initialize() . = ..() printer_ready = world.time + PRINTER_TIMEOUT + cargocash = SSeconomy.get_dep_account(ACCOUNT_CAR) /obj/machinery/computer/bounty/proc/print_paper() new /obj/item/paper/bounty_printout(loc) @@ -30,67 +32,36 @@ info += "
Credits: [D.account_balance]
" - dat += {"| Name | Description | Reward | Completion | Status | |||||
|---|---|---|---|---|---|---|---|---|---|
| [] | ", B.name) - dat += text("High Priority: [] | ", B.description) - dat += text("[] | ", B.reward_string()) - else - dat += text("[] | ", B.name) - dat += text("[] | ", B.description) - dat += text("[] | ", B.reward_string()) - dat += text("[] | ", B.completion_string()) - if(B.can_claim()) - dat += text("Claim | ") - else if(B.claimed) - dat += text("Claimed | ") - else - dat += text("Unclaimed | ") - dat += "
[undershirt]
" dat += "Socks:
[socks]
" dat += "Backpack:
[backbag]
" + dat += "Jumpsuit:
[jumpsuit_style]
" dat += "Uplink Spawn Location:
[uplink_spawn_loc]
" var/use_skintones = pref_species.use_skintones @@ -520,11 +531,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
"
dat += "General Settings" dat += "UI Style: [UI_style]" - dat += "Overhead Chat: [overhead_chat ? "Enabled" : "Disabled"] " dat += "Outline: [outline_enabled ? "Enabled" : "Disabled"] " dat += "Outline Color: Change " dat += "tgui Monitors: [(tgui_lock) ? "Primary" : "All"] " dat += "tgui Style: [(tgui_fancy) ? "Fancy" : "No Frills"] " + dat += "Show Runechat Chat Bubbles: [chat_on_map ? "Enabled" : "Disabled"] " + dat += "See Runechat for non-mobs: [see_chat_non_mob ? "Enabled" : "Disabled"] " + dat += "See Runechat emotes: [see_rc_emotes ? "Enabled" : "Disabled"] " + dat += "See Balloon alerts: [see_balloon_alerts]" dat += " " dat += "Action Buttons: [(buttons_locked) ? "Locked In Place" : "Unlocked"] " dat += "Hotkey Mode: [(hotkeys) ? "Hotkeys" : "Default"] " @@ -669,6 +683,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/firstcat = 1 for(var/category in GLOB.loadout_categories) + if(category == "Donator" && (!LAZYLEN(GLOB.patrons) || !CONFIG_GET(flag/donator_items))) + continue if(firstcat) firstcat = 0 else @@ -686,23 +702,26 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += " | ||||||||||||||||||||||||||||||||||||||||||||||
| Name | " - dat += "Cost | " + if(LC.category != "Donator") + dat += "Cost | " dat += "Restricted Jobs | " dat += "Description | ||||||||||||||||||||||||||||||||||||||||||
| [G.display_name]\n" - if(G.display_name in purchased_gear) + var/donator = G.sort_category == "Donator" // purchase box and cost coloumns doesn't appear on donator items + if(G.id in purchased_gear) if(G.sort_category == "OOC") dat += "Purchased. | " else - dat += "Equip" + dat += "Equip" else - dat += "Purchase" - dat += "[G.cost] | " + dat += "[donator ? "Donator" : "Purchase"] | " + dat += "[donator ? "" : "[G.cost]"] | "
+
if(G.allowed_roles)
dat += ""
for(var/role in G.allowed_roles)
@@ -1189,7 +1208,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
return
all_quirks -= quirk
else
- if(GetPositiveQuirkCount() >= MAX_QUIRKS)
+ var/is_positive_quirk = SSquirks.quirk_points[quirk] > 0
+ if(is_positive_quirk && GetPositiveQuirkCount() >= MAX_QUIRKS)
to_chat(user, "You can't have more than [MAX_QUIRKS] positive quirks!")
return
if(balance - value < 0)
@@ -1207,8 +1227,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(href_list["preference"] == "gear")
if(href_list["purchase_gear"])
var/datum/gear/TG = GLOB.gear_datums[href_list["purchase_gear"]]
- if(TG.cost < user.client.get_metabalance())
- purchased_gear += TG.display_name
+ if(TG.sort_category == "Donator")
+ if(CONFIG_GET(flag/donator_items) && alert(parent, "This item is only accessible to our patrons. Would you like to subscribe?", "Patron Locked", "Yes", "No") == "Yes")
+ parent.donate()
+ else if(TG.cost < user.client.get_metabalance())
+ purchased_gear += TG.id
TG.purchase(user.client)
user.client.inc_metabalance((TG.cost * -1), TRUE, "Purchased [TG.display_name].")
save_preferences()
@@ -1216,21 +1239,21 @@ GLOBAL_LIST_EMPTY(preferences_datums)
to_chat(user, "You don't have enough [CONFIG_GET(string/metacurrency_name)]s to purchase \the [TG.display_name]!")
if(href_list["toggle_gear"])
var/datum/gear/TG = GLOB.gear_datums[href_list["toggle_gear"]]
- if(TG.display_name in equipped_gear)
- equipped_gear -= TG.display_name
+ if(TG.id in equipped_gear)
+ equipped_gear -= TG.id
else
var/list/type_blacklist = list()
var/list/slot_blacklist = list()
- for(var/gear_name in equipped_gear)
- var/datum/gear/G = GLOB.gear_datums[gear_name]
+ for(var/gear_id in equipped_gear)
+ var/datum/gear/G = GLOB.gear_datums[gear_id]
if(istype(G))
if(!(G.subtype_path in type_blacklist))
type_blacklist += G.subtype_path
if(!(G.slot in slot_blacklist))
slot_blacklist += G.slot
- if((TG.display_name in purchased_gear))
+ if((TG.id in purchased_gear))
if(!(TG.subtype_path in type_blacklist) || !(TG.slot in slot_blacklist))
- equipped_gear += TG.display_name
+ equipped_gear += TG.id
else
to_chat(user, "Can't equip [TG.display_name]. It conflicts with an already-equipped item.")
else
@@ -1283,6 +1306,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(href_list["preference"] in GLOB.preferences_custom_names)
ask_for_custom_name(user,href_list["preference"])
+ if(href_list["preference"] in pref_species.forced_features)
+ alert("You cannot change that bodypart for your selected species!")
+ features[href_list["preference"]] = pref_species.forced_features[href_list["preference"]]
+ return
switch(href_list["preference"])
if("ghostform")
@@ -1428,6 +1455,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/temp_hsv = RGBtoHSV(features["mcolor"])
if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#7F7F7F")[3]))
features["mcolor"] = pref_species.default_color
+ //Set our forced bodyparts
+ for(var/forced_part in pref_species.forced_features)
+ //Get the forced type
+ var/forced_type = pref_species.forced_features[forced_part]
+ //Apply the forced bodypart.
+ features[forced_part] = forced_type
else
if(alert(parent, "This species is only accessible to our patrons. Would you like to subscribe?", "Patron Locked", "Yes", "No") == "Yes")
parent.donate()
@@ -1570,13 +1603,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_backbag)
backbag = new_backbag
+ if("suit")
+ if(jumpsuit_style == PREF_SUIT)
+ jumpsuit_style = PREF_SKIRT
+ else
+ jumpsuit_style = PREF_SUIT
+
if("uplink_loc")
var/new_loc = input(user, "Choose your character's traitor uplink spawn location:", "Character Preference") as null|anything in GLOB.uplink_spawn_loc_list
if(new_loc)
uplink_spawn_loc = new_loc
if("ai_core_icon")
- var/ai_core_icon = input(user, "Choose your preferred AI core display screen:", "AI Core Display Screen Selection") as null|anything in GLOB.ai_core_display_screens
+ var/ai_core_icon = input(user, "Choose your preferred AI core display screen:", "AI Core Display Screen Selection") as null|anything in GLOB.ai_core_display_screens - "Portrait"
if(ai_core_icon)
preferred_ai_core_display = ai_core_icon
@@ -1619,9 +1658,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(pickedPDAStyle)
pda_style = pickedPDAStyle
if("pda_color")
- var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference",pda_color) as color|null
+ var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference", pda_color) as color|null
if(pickedPDAColor)
pda_color = pickedPDAColor
+ if ("see_balloon_alerts")
+ var/pickedstyle = input(user, "Choose how you want balloon alerts displayed", "Balloon alert preference", BALLOON_ALERT_ALWAYS) as null|anything in list(BALLOON_ALERT_ALWAYS, BALLOON_ALERT_WITH_CHAT, BALLOON_ALERT_NEVER)
+ if (!isnull(pickedstyle))
+ see_balloon_alerts = pickedstyle
else
switch(href_list["preference"])
@@ -1649,8 +1692,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
buttons_locked = !buttons_locked
if("tgui_fancy")
tgui_fancy = !tgui_fancy
- if("overheadchat")
- overhead_chat = !overhead_chat
if("outline_enabled")
outline_enabled = !outline_enabled
if("outline_color")
@@ -1754,7 +1795,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("ambientocclusion")
ambientocclusion = !ambientocclusion
if(parent && parent.screen && parent.screen.len)
- var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
+ var/atom/movable/screen/plane_master/game_world/PM = locate(/atom/movable/screen/plane_master/game_world) in parent.screen
PM.backdrop(parent.mob)
if("auto_fit_viewport")
@@ -1774,8 +1815,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
pixel_size = PIXEL_SCALING_3X
if(PIXEL_SCALING_3X)
pixel_size = PIXEL_SCALING_AUTO
- user.client.view_size.setDefault(getScreenSize(user)) //Fix our viewport size so it doesn't reset on change
- user.client.view_size.apply() //Let's winset() it so it actually works
+ user.client.view_size.resetToDefault(getScreenSize(user)) //Fix our viewport size so it doesn't reset on change
if("scaling_method")
switch(scaling_method)
@@ -1856,7 +1896,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
new_key = "Numpad[new_key]"
var/full_key = "[AltMod][CtrlMod][ShiftMod][new_key]"
- if(old_key)
+ if(old_key && (old_key in key_bindings))
key_bindings[old_key] -= kb_name
key_bindings[full_key] += list(kb_name)
key_bindings[full_key] = sortList(key_bindings[full_key])
@@ -1875,6 +1915,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
ShowKeybindings(user)
return
+ if("chat_on_map")
+ chat_on_map = !chat_on_map
+ if("see_chat_non_mob")
+ see_chat_non_mob = !see_chat_non_mob
+ if("see_rc_emotes")
+ see_rc_emotes = !see_rc_emotes
+
ShowChoices(user)
return 1
@@ -1918,6 +1965,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
character.socks = socks
character.backbag = backbag
+ character.jumpsuit_style = jumpsuit_style
var/datum/species/chosen_species
chosen_species = pref_species.type
@@ -1976,3 +2024,23 @@ GLOBAL_LIST_EMPTY(preferences_datums)
return
else
custom_names[name_id] = sanitized_name
+
+/// Handles adding and removing donator items from clients
+/datum/preferences/proc/handle_donator_items()
+ var/datum/loadout_category/DLC = GLOB.loadout_categories["Donator"] // stands for donator loadout category but the other def for DLC works too xD
+ if(!LAZYLEN(GLOB.patrons) || !CONFIG_GET(flag/donator_items)) // donator items are only accesibile by servers with a patreon
+ return
+ if(IS_PATRON(parent.ckey) || (parent in GLOB.admins))
+ for(var/gear_id in DLC.gear)
+ var/datum/gear/AG = DLC.gear[gear_id]
+ if(AG.id in purchased_gear)
+ continue
+ purchased_gear += AG.id
+ AG.purchase(parent)
+ save_preferences()
+ else if(purchased_gear.len || equipped_gear.len)
+ for(var/gear_id in DLC.gear)
+ var/datum/gear/RG = DLC.gear[gear_id]
+ equipped_gear -= RG.id
+ purchased_gear -= RG.id
+ save_preferences()
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 2dd69163729c4..06f4c54fe90eb 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 31
+#define SAVEFILE_VERSION_MAX 35
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -25,7 +25,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
*/
/datum/preferences/proc/savefile_needs_update(savefile/S)
var/savefile_version
- S["version"] >> savefile_version
+ READ_FILE(S["version"], savefile_version)
if(savefile_version < SAVEFILE_VERSION_MIN)
S.dir.Cut()
@@ -42,14 +42,33 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//if your savefile is 3 months out of date, then 'tough shit'.
/datum/preferences/proc/update_preferences(current_version, savefile/S)
- if(current_version < 29)
- overhead_chat = TRUE
if(current_version < 30)
outline_enabled = TRUE
outline_color = COLOR_BLUE_GRAY
if(current_version < 31)
auto_fit_viewport = TRUE
-
+ if(current_version < 32)
+ //Okay this is gonna s u c k
+ var/list/legacy_purchases = purchased_gear.Copy()
+ purchased_gear.Cut()
+ equipped_gear.Cut() //Not gonna bother.
+ for(var/l_gear in legacy_purchases)
+ var/n_gear
+ for(var/rg_nam in GLOB.gear_datums) //this is ugly.
+ var/datum/gear/r_gear = GLOB.gear_datums[rg_nam]
+ if(r_gear.display_name == l_gear)
+ n_gear = r_gear.id
+ break
+ if(n_gear)
+ purchased_gear += n_gear
+ if(current_version < 33)
+ chat_on_map = TRUE
+// max_chat_length = CHAT_MESSAGE_MAX_LENGTH > Depreciated as of 31/07/2021
+ see_chat_non_mob = TRUE
+ see_rc_emotes = TRUE
+ S.dir.Remove("overhead_chat")
+ if(current_version < 35)
+ see_balloon_alerts = BALLOON_ALERT_ALWAYS
return
/datum/preferences/proc/update_character(current_version, savefile/S)
@@ -76,15 +95,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
- S["job_civilian_high"] >> job_civilian_high
- S["job_civilian_med"] >> job_civilian_med
- S["job_civilian_low"] >> job_civilian_low
- S["job_medsci_high"] >> job_medsci_high
- S["job_medsci_med"] >> job_medsci_med
- S["job_medsci_low"] >> job_medsci_low
- S["job_engsec_high"] >> job_engsec_high
- S["job_engsec_med"] >> job_engsec_med
- S["job_engsec_low"] >> job_engsec_low
+ READ_FILE(S["job_civilian_high"], job_civilian_high)
+ READ_FILE(S["job_civilian_med"], job_civilian_med)
+ READ_FILE(S["job_civilian_low"], job_civilian_low)
+ READ_FILE(S["job_medsci_high"], job_medsci_high)
+ READ_FILE(S["job_medsci_med"], job_medsci_med)
+ READ_FILE(S["job_medsci_low"], job_medsci_low)
+ READ_FILE(S["job_engsec_high"], job_engsec_high)
+ READ_FILE(S["job_engsec_med"], job_engsec_med)
+ READ_FILE(S["job_engsec_low"], job_engsec_low)
//Can't use SSjob here since this happens right away on login
for(var/job in subtypesof(/datum/job))
@@ -130,87 +149,92 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
/datum/preferences/proc/load_preferences()
if(!path)
- return 0
+ return FALSE
if(!fexists(path))
- return 0
+ return FALSE
var/savefile/S = new /savefile(path)
if(!S)
- return 0
+ return FALSE
S.cd = "/"
var/needs_update = savefile_needs_update(S)
if(needs_update == -2) //fatal, can't load any data
- return 0
+ return FALSE
//general preferences
- S["asaycolor"] >> asaycolor
- S["ooccolor"] >> ooccolor
- S["lastchangelog"] >> lastchangelog
- S["UI_style"] >> UI_style
- S["overhead_chat"] >> overhead_chat
- S["outline_color"] >> outline_color
- S["outline_enabled"] >> outline_enabled
- S["hotkeys"] >> hotkeys
- S["tgui_fancy"] >> tgui_fancy
- S["tgui_lock"] >> tgui_lock
- S["buttons_locked"] >> buttons_locked
- S["windowflash"] >> windowflashing
- S["be_special"] >> be_special
-
- S["crew_objectives"] >> crew_objectives
-
-
- S["default_slot"] >> default_slot
- S["chat_toggles"] >> chat_toggles
- S["toggles"] >> toggles
- S["ghost_form"] >> ghost_form
- S["ghost_orbit"] >> ghost_orbit
- S["ghost_accs"] >> ghost_accs
- S["ghost_others"] >> ghost_others
- S["preferred_map"] >> preferred_map
- S["ignoring"] >> ignoring
- S["ghost_hud"] >> ghost_hud
- S["inquisitive_ghost"] >> inquisitive_ghost
- S["uses_glasses_colour"]>> uses_glasses_colour
- S["clientfps"] >> clientfps
- S["parallax"] >> parallax
- S["ambientocclusion"] >> ambientocclusion
- S["auto_fit_viewport"] >> auto_fit_viewport
- S["pixel_size"] >> pixel_size
- S["scaling_method"] >> scaling_method
- S["menuoptions"] >> menuoptions
- S["enable_tips"] >> enable_tips
- S["tip_delay"] >> tip_delay
- S["pda_style"] >> pda_style
- S["pda_color"] >> pda_color
- S["show_credits"] >> show_credits
-
- S["key_bindings"] >> key_bindings
-
- S["purchased_gear"] >> purchased_gear
- S["equipped_gear"] >> equipped_gear
+ READ_FILE(S["asaycolor"], asaycolor)
+ READ_FILE(S["ooccolor"], ooccolor)
+ READ_FILE(S["lastchangelog"], lastchangelog)
+ READ_FILE(S["UI_style"], UI_style)
+ READ_FILE(S["outline_color"], outline_color)
+ READ_FILE(S["outline_enabled"], outline_enabled)
+ READ_FILE(S["hotkeys"], hotkeys)
+ READ_FILE(S["chat_on_map"], chat_on_map)
+ READ_FILE(S["see_chat_non_mob"] , see_chat_non_mob)
+ READ_FILE(S["see_rc_emotes"] , see_rc_emotes)
+ READ_FILE(S["see_balloon_alerts"], see_balloon_alerts)
+ READ_FILE(S["tgui_fancy"], tgui_fancy)
+ READ_FILE(S["tgui_lock"], tgui_lock)
+ READ_FILE(S["buttons_locked"], buttons_locked)
+ READ_FILE(S["windowflash"], windowflashing)
+ READ_FILE(S["be_special"], be_special)
+
+ READ_FILE(S["crew_objectives"], crew_objectives)
+
+
+ READ_FILE(S["default_slot"], default_slot)
+ READ_FILE(S["chat_toggles"], chat_toggles)
+ READ_FILE(S["toggles"], toggles)
+ READ_FILE(S["ghost_form"], ghost_form)
+ READ_FILE(S["ghost_orbit"], ghost_orbit)
+ READ_FILE(S["ghost_accs"], ghost_accs)
+ READ_FILE(S["ghost_others"], ghost_others)
+ READ_FILE(S["preferred_map"], preferred_map)
+ READ_FILE(S["ignoring"], ignoring)
+ READ_FILE(S["ghost_hud"], ghost_hud)
+ READ_FILE(S["inquisitive_ghost"], inquisitive_ghost)
+ READ_FILE(S["uses_glasses_colour"], uses_glasses_colour)
+ READ_FILE(S["clientfps"], clientfps)
+ READ_FILE(S["parallax"], parallax)
+ READ_FILE(S["ambientocclusion"], ambientocclusion)
+ READ_FILE(S["auto_fit_viewport"], auto_fit_viewport)
+ READ_FILE(S["pixel_size"], pixel_size)
+ READ_FILE(S["scaling_method"], scaling_method)
+ READ_FILE(S["menuoptions"], menuoptions)
+ READ_FILE(S["enable_tips"], enable_tips)
+ READ_FILE(S["tip_delay"], tip_delay)
+ READ_FILE(S["pda_style"], pda_style)
+ READ_FILE(S["pda_color"], pda_color)
+ READ_FILE(S["show_credits"], show_credits)
+
+ READ_FILE(S["key_bindings"], key_bindings)
+
+ READ_FILE(S["purchased_gear"], purchased_gear)
+ READ_FILE(S["equipped_gear"], equipped_gear)
//try to fix any outdated data if necessary
if(needs_update >= 0)
update_preferences(needs_update, S) //needs_update = savefile_version if we need an update (positive integer)
//Sanitize
- asaycolor = sanitize_ooccolor(sanitize_hexcolor(asaycolor, 6, 1, initial(asaycolor)))
- ooccolor = sanitize_ooccolor(sanitize_hexcolor(ooccolor, 6, 1, initial(ooccolor)))
+ asaycolor = sanitize_ooccolor(sanitize_hexcolor(asaycolor, 6, TRUE, initial(asaycolor)))
+ ooccolor = sanitize_ooccolor(sanitize_hexcolor(ooccolor, 6, TRUE, initial(ooccolor)))
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, 0, 1, initial(hotkeys))
- tgui_fancy = sanitize_integer(tgui_fancy, 0, 1, initial(tgui_fancy))
- tgui_lock = sanitize_integer(tgui_lock, 0, 1, initial(tgui_lock))
- buttons_locked = sanitize_integer(buttons_locked, 0, 1, initial(buttons_locked))
- windowflashing = sanitize_integer(windowflashing, 0, 1, initial(windowflashing))
- default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
- toggles = sanitize_integer(toggles, 0, 65535, initial(toggles))
- clientfps = sanitize_integer(clientfps, 0, 1000, 0)
+ hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, initial(hotkeys))
+ chat_on_map = sanitize_integer(chat_on_map, FALSE, TRUE, initial(chat_on_map))
+ see_chat_non_mob = sanitize_integer(see_chat_non_mob, FALSE, TRUE, initial(see_chat_non_mob))
+ tgui_fancy = sanitize_integer(tgui_fancy, FALSE, TRUE, initial(tgui_fancy))
+ tgui_lock = sanitize_integer(tgui_lock, FALSE, TRUE, initial(tgui_lock))
+ buttons_locked = sanitize_integer(buttons_locked, FALSE, TRUE, initial(buttons_locked))
+ windowflashing = sanitize_integer(windowflashing, FALSE, TRUE, initial(windowflashing))
+ default_slot = sanitize_integer(default_slot, TRUE, max_save_slots, initial(default_slot))
+ toggles = sanitize_integer(toggles, FALSE, 65535, initial(toggles))
+ clientfps = sanitize_integer(clientfps, FALSE, 1000, FALSE)
parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
- ambientocclusion = sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
- auto_fit_viewport = sanitize_integer(auto_fit_viewport, 0, 1, initial(auto_fit_viewport))
+ ambientocclusion = sanitize_integer(ambientocclusion, FALSE, TRUE, initial(ambientocclusion))
+ auto_fit_viewport = sanitize_integer(auto_fit_viewport, FALSE, TRUE, initial(auto_fit_viewport))
pixel_size = sanitize_integer(pixel_size, PIXEL_SCALING_AUTO, PIXEL_SCALING_3X, initial(pixel_size))
scaling_method = sanitize_text(scaling_method, initial(scaling_method))
ghost_form = sanitize_inlist(ghost_form, GLOB.ghost_forms, initial(ghost_form))
@@ -219,10 +243,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION)
menuoptions = SANITIZE_LIST(menuoptions)
be_special = SANITIZE_LIST(be_special)
- crew_objectives = sanitize_integer(crew_objectives, 0, 1, initial(crew_objectives))
+ crew_objectives = sanitize_integer(crew_objectives, FALSE, TRUE, initial(crew_objectives))
pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style))
- pda_color = sanitize_hexcolor(pda_color, 6, 1, initial(pda_color))
- show_credits = sanitize_integer(show_credits, 0, 1, initial(show_credits))
+ pda_color = sanitize_hexcolor(pda_color, 6, TRUE, initial(pda_color))
+ show_credits = sanitize_integer(show_credits, FALSE, TRUE, initial(show_credits))
key_bindings = sanitize_islist(key_bindings, deepCopyList(GLOB.keybinding_list_by_key))
if (!key_bindings)
@@ -233,14 +257,14 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(!equipped_gear)
equipped_gear = list()
- return 1
+ return TRUE
/datum/preferences/proc/save_preferences()
if(!path)
- return 0
+ return FALSE
var/savefile/S = new /savefile(path)
if(!S)
- return 0
+ return FALSE
S.cd = "/"
WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX) //updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date
@@ -250,10 +274,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["ooccolor"], ooccolor)
WRITE_FILE(S["lastchangelog"], lastchangelog)
WRITE_FILE(S["UI_style"], UI_style)
- WRITE_FILE(S["overhead_chat"], overhead_chat)
WRITE_FILE(S["outline_enabled"], outline_enabled)
WRITE_FILE(S["outline_color"], outline_color)
WRITE_FILE(S["hotkeys"], hotkeys)
+ WRITE_FILE(S["chat_on_map"], chat_on_map)
+ WRITE_FILE(S["see_chat_non_mob"], see_chat_non_mob)
+ WRITE_FILE(S["see_rc_emotes"], see_rc_emotes)
+ WRITE_FILE(S["see_balloon_alerts"], see_balloon_alerts)
WRITE_FILE(S["tgui_fancy"], tgui_fancy)
WRITE_FILE(S["tgui_lock"], tgui_lock)
WRITE_FILE(S["buttons_locked"], buttons_locked)
@@ -290,20 +317,20 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if (!key_bindings)
key_bindings = deepCopyList(GLOB.keybinding_list_by_key)
WRITE_FILE(S["key_bindings"], key_bindings)
- return 1
+ return TRUE
/datum/preferences/proc/load_character(slot)
if(!path)
- return 0
+ return FALSE
if(!fexists(path))
- return 0
+ return FALSE
var/savefile/S = new /savefile(path)
if(!S)
- return 0
+ return FALSE
S.cd = "/"
if(!slot)
slot = default_slot
- slot = sanitize_integer(slot, 1, max_save_slots, initial(default_slot))
+ slot = sanitize_integer(slot, TRUE, max_save_slots, initial(default_slot))
if(slot != default_slot)
default_slot = slot
WRITE_FILE(S["default_slot"] , slot)
@@ -315,7 +342,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Species
var/species_id
- S["species"] >> species_id
+ READ_FILE(S["species"], species_id)
if(species_id)
var/newtype = GLOB.species_list[species_id]
if(newtype)
@@ -328,59 +355,60 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["feature_ethcolor"] , "9c3030")
//Character
- S["real_name"] >> real_name
- S["name_is_always_random"] >> be_random_name
- S["body_is_always_random"] >> be_random_body
- S["gender"] >> gender
- S["age"] >> age
- S["hair_color"] >> hair_color
- S["facial_hair_color"] >> facial_hair_color
- S["eye_color"] >> eye_color
- S["skin_tone"] >> skin_tone
- S["hair_style_name"] >> hair_style
- S["facial_style_name"] >> facial_hair_style
- S["underwear"] >> underwear
- S["underwear_color"] >> underwear_color
- S["undershirt"] >> undershirt
- S["socks"] >> socks
- S["backbag"] >> backbag
- S["uplink_loc"] >> uplink_spawn_loc
- S["feature_mcolor"] >> features["mcolor"]
- S["feature_ethcolor"] >> features["ethcolor"]
- S["feature_lizard_tail"] >> features["tail_lizard"]
- S["feature_lizard_snout"] >> features["snout"]
- S["feature_lizard_horns"] >> features["horns"]
- S["feature_lizard_frills"] >> features["frills"]
- S["feature_lizard_spines"] >> features["spines"]
- S["feature_lizard_body_markings"] >> features["body_markings"]
- S["feature_lizard_legs"] >> features["legs"]
- S["feature_moth_wings"] >> features["moth_wings"]
- S["feature_ipc_screen"] >> features["ipc_screen"]
- S["feature_ipc_antenna"] >> features["ipc_antenna"]
- S["feature_ipc_chassis"] >> features["ipc_chassis"]
- S["feature_insect_type"] >> features["insect_type"]
- if(!CONFIG_GET(flag/join_with_mutant_humans) && !species_id != "felinid") // felinids arent mutant humans anymore i guess
+ READ_FILE(S["real_name"], real_name)
+ READ_FILE(S["name_is_always_random"], be_random_name)
+ READ_FILE(S["body_is_always_random"], be_random_body)
+ READ_FILE(S["gender"], gender)
+ READ_FILE(S["age"], age)
+ READ_FILE(S["hair_color"], hair_color)
+ READ_FILE(S["facial_hair_color"], facial_hair_color)
+ READ_FILE(S["eye_color"], eye_color)
+ READ_FILE(S["skin_tone"], skin_tone)
+ READ_FILE(S["hair_style_name"], hair_style)
+ READ_FILE(S["facial_style_name"], facial_hair_style)
+ READ_FILE(S["underwear"], underwear)
+ READ_FILE(S["underwear_color"], underwear_color)
+ READ_FILE(S["undershirt"], undershirt)
+ READ_FILE(S["socks"], socks)
+ READ_FILE(S["backbag"], backbag)
+ READ_FILE(S["jumpsuit_style"], jumpsuit_style)
+ READ_FILE(S["uplink_loc"], uplink_spawn_loc)
+ READ_FILE(S["feature_mcolor"], features["mcolor"])
+ READ_FILE(S["feature_ethcolor"], features["ethcolor"])
+ READ_FILE(S["feature_lizard_tail"], features["tail_lizard"])
+ READ_FILE(S["feature_lizard_snout"], features["snout"])
+ READ_FILE(S["feature_lizard_horns"], features["horns"])
+ READ_FILE(S["feature_lizard_frills"], features["frills"])
+ READ_FILE(S["feature_lizard_spines"], features["spines"])
+ READ_FILE(S["feature_lizard_body_markings"], features["body_markings"])
+ READ_FILE(S["feature_lizard_legs"], features["legs"])
+ READ_FILE(S["feature_moth_wings"], features["moth_wings"])
+ READ_FILE(S["feature_ipc_screen"], features["ipc_screen"])
+ READ_FILE(S["feature_ipc_antenna"], features["ipc_antenna"])
+ READ_FILE(S["feature_ipc_chassis"], features["ipc_chassis"])
+ READ_FILE(S["feature_insect_type"], features["insect_type"])
+ if(!CONFIG_GET(flag/join_with_mutant_humans) && !species_id != "felinid") // felinids arent mutant humans anymore i guess
features["tail_human"] = "none"
features["ears"] = "none"
else
- S["feature_human_tail"] >> features["tail_human"]
- S["feature_human_ears"] >> features["ears"]
+ READ_FILE(S["feature_human_tail"], features["tail_human"])
+ READ_FILE(S["feature_human_ears"], features["ears"])
//Custom names
for(var/custom_name_id in GLOB.preferences_custom_names)
var/savefile_slot_name = custom_name_id + "_name" //TODO remove this
- S[savefile_slot_name] >> custom_names[custom_name_id]
+ READ_FILE(S[savefile_slot_name], custom_names[custom_name_id])
- S["preferred_ai_core_display"] >> preferred_ai_core_display
- S["prefered_security_department"] >> prefered_security_department
+ READ_FILE(S["preferred_ai_core_display"], preferred_ai_core_display)
+ READ_FILE(S["prefered_security_department"], prefered_security_department)
//Jobs
- S["joblessrole"] >> joblessrole
+ READ_FILE(S["joblessrole"], joblessrole)
//Load prefs
- S["job_preferences"] >> job_preferences
+ READ_FILE(S["job_preferences"], job_preferences)
//Quirks
- S["all_quirks"] >> all_quirks
+ READ_FILE(S["all_quirks"], all_quirks)
//try to fix any outdated data if necessary
if(needs_update >= 0)
@@ -426,6 +454,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
eye_color = sanitize_hexcolor(eye_color, 3, 0)
skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones)
backbag = sanitize_inlist(backbag, GLOB.backbaglist, initial(backbag))
+ jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0)
features["ethcolor"] = copytext_char(features["ethcolor"], 1, 7)
@@ -444,6 +473,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["ipc_chassis"] = sanitize_inlist(features["ipc_chassis"], GLOB.ipc_chassis_list)
features["insect_type"] = sanitize_inlist(features["insect_type"], GLOB.insect_type_list)
+ //Validate species forced mutant parts
+ for(var/forced_part in pref_species.forced_features)
+ //Get the forced type
+ var/forced_type = pref_species.forced_features[forced_part]
+ //Apply the forced bodypart.
+ features[forced_part] = forced_type
+
joblessrole = sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
//Validate job prefs
for(var/j in job_preferences)
@@ -452,14 +488,14 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
all_quirks = SANITIZE_LIST(all_quirks)
- return 1
+ return TRUE
/datum/preferences/proc/save_character()
if(!path)
- return 0
+ return FALSE
var/savefile/S = new /savefile(path)
if(!S)
- return 0
+ 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.)
@@ -483,6 +519,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["undershirt"] , undershirt)
WRITE_FILE(S["socks"] , socks)
WRITE_FILE(S["backbag"] , backbag)
+ WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style)
WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc)
WRITE_FILE(S["species"] , pref_species.id)
WRITE_FILE(S["feature_mcolor"] , features["mcolor"])
@@ -518,7 +555,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Quirks
WRITE_FILE(S["all_quirks"] , all_quirks)
- return 1
+ return TRUE
#undef SAVEFILE_VERSION_MAX
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index 4969becb09265..c875b07fb41de 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -1,266 +1,206 @@
-//this works as is to create a single checked item, but has no back end code for toggleing the check yet
-#define TOGGLE_CHECKBOX(PARENT, CHILD) PARENT/CHILD/abstract = TRUE;PARENT/CHILD/checkbox = CHECKBOX_TOGGLE;PARENT/CHILD/verb/CHILD
-
-//Example usage TOGGLE_CHECKBOX(datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)()
-
-//override because we don't want to save preferences twice.
-/datum/verbs/menu/Settings/Set_checked(client/C, verbpath)
- if (checkbox == CHECKBOX_GROUP)
- C.prefs.menuoptions[type] = verbpath
- else if (checkbox == CHECKBOX_TOGGLE)
- var/checked = Get_checked(C)
- C.prefs.menuoptions[type] = !checked
- winset(C, "[verbpath]", "is-checked = [!checked]")
-
-/datum/verbs/menu/Settings/verb/setup_character()
+/client/verb/setup_character()
set name = "Game Preferences"
set category = "Preferences"
set desc = "Open Game Preferences Window"
- usr.client.prefs.current_tab = 1
- usr.client.prefs.ShowChoices(usr)
+ prefs.current_tab = 1
+ prefs.ShowChoices(usr)
-//toggles
-/datum/verbs/menu/Settings/Ghost/chatterbox
- name = "Chat Box Spam"
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)()
+/client/verb/toggle_ghost_ears()
set name = "Show/Hide GhostEars"
set category = "Preferences"
set desc = "See All Speech"
- usr.client.prefs.chat_toggles ^= CHAT_GHOSTEARS
- to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].")
- usr.client.prefs.save_preferences()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Ears", "[usr.client.prefs.chat_toggles & CHAT_GHOSTEARS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_ears/Get_checked(client/C)
- return C.prefs.chat_toggles & CHAT_GHOSTEARS
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_sight)()
+ prefs.chat_toggles ^= CHAT_GHOSTEARS
+ to_chat(usr, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].")
+ prefs.save_preferences()
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Ears", "[prefs.chat_toggles & CHAT_GHOSTEARS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_sight()
set name = "Show/Hide GhostSight"
set category = "Preferences"
set desc = "See All Emotes"
- usr.client.prefs.chat_toggles ^= CHAT_GHOSTSIGHT
- to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].")
- usr.client.prefs.save_preferences()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Sight", "[usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_sight/Get_checked(client/C)
- return C.prefs.chat_toggles & CHAT_GHOSTSIGHT
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_whispers)()
+ prefs.chat_toggles ^= CHAT_GHOSTSIGHT
+ to_chat(usr, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].")
+ prefs.save_preferences()
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Sight", "[prefs.chat_toggles & CHAT_GHOSTSIGHT ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_whispers()
set name = "Show/Hide GhostWhispers"
set category = "Preferences"
set desc = "See All Whispers"
- usr.client.prefs.chat_toggles ^= CHAT_GHOSTWHISPER
- to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER) ? "see all whispers in the world" : "only see whispers from nearby mobs"].")
- usr.client.prefs.save_preferences()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Whispers", "[usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_whispers/Get_checked(client/C)
- return C.prefs.chat_toggles & CHAT_GHOSTWHISPER
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_radio)()
+ prefs.chat_toggles ^= CHAT_GHOSTWHISPER
+ to_chat(usr, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTWHISPER) ? "see all whispers in the world" : "only see whispers from nearby mobs"].")
+ prefs.save_preferences()
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Whispers", "[prefs.chat_toggles & CHAT_GHOSTWHISPER ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_radio()
set name = "Show/Hide GhostRadio"
set category = "Preferences"
set desc = "See All Radio Chatter"
- usr.client.prefs.chat_toggles ^= CHAT_GHOSTRADIO
- to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO) ? "see radio chatter" : "not see radio chatter"].")
- usr.client.prefs.save_preferences()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Radio", "[usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //social experiment, increase the generation whenever you copypaste this shamelessly GENERATION 1
-/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_radio/Get_checked(client/C)
- return C.prefs.chat_toggles & CHAT_GHOSTRADIO
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_pda)()
+ prefs.chat_toggles ^= CHAT_GHOSTRADIO
+ to_chat(usr, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTRADIO) ? "see radio chatter" : "not see radio chatter"].")
+ prefs.save_preferences()
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Radio", "[prefs.chat_toggles & CHAT_GHOSTRADIO ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //social experiment, increase the generation whenever you copypaste this shamelessly GENERATION 1
+
+/client/verb/toggle_ghost_pda()
set name = "Show/Hide GhostPDA"
set category = "Preferences"
set desc = "See All PDA Messages"
- usr.client.prefs.chat_toggles ^= CHAT_GHOSTPDA
- to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTPDA) ? "see all pda messages in the world" : "only see pda messages from nearby mobs"].")
- usr.client.prefs.save_preferences()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost PDA", "[usr.client.prefs.chat_toggles & CHAT_GHOSTPDA ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_pda/Get_checked(client/C)
- return C.prefs.chat_toggles & CHAT_GHOSTPDA
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_laws)()
+ prefs.chat_toggles ^= CHAT_GHOSTPDA
+ to_chat(usr, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTPDA) ? "see all pda messages in the world" : "only see pda messages from nearby mobs"].")
+ prefs.save_preferences()
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost PDA", "[prefs.chat_toggles & CHAT_GHOSTPDA ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggle_ghost_laws()
set name = "Show/Hide GhostLaws"
set category = "Preferences"
set desc = "See All Law Changes"
- usr.client.prefs.chat_toggles ^= CHAT_GHOSTLAWS
- to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTLAWS) ? "be notified of all law changes" : "no longer be notified of law changes"].")
- usr.client.prefs.save_preferences()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Laws", "[usr.client.prefs.chat_toggles & CHAT_GHOSTLAWS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_laws/Get_checked(client/C)
- return C.prefs.chat_toggles & CHAT_GHOSTLAWS
-
-/datum/verbs/menu/Settings/Ghost/chatterbox/Events
- name = "Events"
+ prefs.chat_toggles ^= CHAT_GHOSTLAWS
+ to_chat(usr, "As a ghost, you will now [(prefs.chat_toggles & CHAT_GHOSTLAWS) ? "be notified of all law changes" : "no longer be notified of law changes"].")
+ prefs.save_preferences()
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Laws", "[prefs.chat_toggles & CHAT_GHOSTLAWS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
//please be aware that the following two verbs have inverted stat output, so that "Toggle Deathrattle|1" still means you activated it
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox/Events, toggle_deathrattle)()
+/client/verb/toggle_deathrattle()
set name = "Toggle Deathrattle"
set category = "Preferences"
set desc = "Death"
- usr.client.prefs.toggles ^= DISABLE_DEATHRATTLE
- usr.client.prefs.save_preferences()
- to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_DEATHRATTLE) ? "no longer" : "now"] get messages when a sentient mob dies.")
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Deathrattle", "[!(usr.client.prefs.toggles & DISABLE_DEATHRATTLE) ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, maybe you should spend some time reading the comments.
-/datum/verbs/menu/Settings/Ghost/chatterbox/Events/toggle_deathrattle/Get_checked(client/C)
- return !(C.prefs.toggles & DISABLE_DEATHRATTLE)
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox/Events, toggle_arrivalrattle)()
+ prefs.toggles ^= DISABLE_DEATHRATTLE
+ prefs.save_preferences()
+ to_chat(usr, "You will [(prefs.toggles & DISABLE_DEATHRATTLE) ? "no longer" : "now"] get messages when a sentient mob dies.")
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Deathrattle", "[!(prefs.toggles & DISABLE_DEATHRATTLE) ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, maybe you should spend some time reading the comments.
+
+/client/verb/toggle_arrivalrattle()
set name = "Toggle Arrivalrattle"
set category = "Preferences"
set desc = "New Player Arrival"
- usr.client.prefs.toggles ^= DISABLE_ARRIVALRATTLE
- to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE) ? "no longer" : "now"] get messages when someone joins the station.")
- usr.client.prefs.save_preferences()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Arrivalrattle", "[!(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE) ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, maybe you should rethink where your life went so wrong.
-/datum/verbs/menu/Settings/Ghost/chatterbox/Events/toggle_arrivalrattle/Get_checked(client/C)
- return !(C.prefs.toggles & DISABLE_ARRIVALRATTLE)
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost, togglemidroundantag)()
+ prefs.toggles ^= DISABLE_ARRIVALRATTLE
+ to_chat(usr, "You will [(prefs.toggles & DISABLE_ARRIVALRATTLE) ? "no longer" : "now"] get messages when someone joins the station.")
+ prefs.save_preferences()
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Arrivalrattle", "[!(prefs.toggles & DISABLE_ARRIVALRATTLE) ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, maybe you should rethink where your life went so wrong.
+
+/client/verb/togglemidroundantag()
set name = "Toggle Midround Antagonist"
set category = "Preferences"
set desc = "Midround Antagonist"
- usr.client.prefs.toggles ^= MIDROUND_ANTAG
- usr.client.prefs.save_preferences()
- to_chat(usr, "You will [(usr.client.prefs.toggles & MIDROUND_ANTAG) ? "now" : "no longer"] be considered for midround antagonist positions.")
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Midround Antag", "[usr.client.prefs.toggles & MIDROUND_ANTAG ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Ghost/togglemidroundantag/Get_checked(client/C)
- return C.prefs.toggles & MIDROUND_ANTAG
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggletitlemusic)()
+ prefs.toggles ^= MIDROUND_ANTAG
+ prefs.save_preferences()
+ to_chat(usr, "You will [(prefs.toggles & MIDROUND_ANTAG) ? "now" : "no longer"] be considered for midround antagonist positions.")
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Midround Antag", "[prefs.toggles & MIDROUND_ANTAG ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/toggletitlemusic()
set name = "Hear/Silence Lobby Music"
set category = "Preferences"
set desc = "Hear Music In Lobby"
- usr.client.prefs.toggles ^= SOUND_LOBBY
- usr.client.prefs.save_preferences()
- if(usr.client.prefs.toggles & SOUND_LOBBY)
+ prefs.toggles ^= SOUND_LOBBY
+ prefs.save_preferences()
+ if(prefs.toggles & SOUND_LOBBY)
to_chat(usr, "You will now hear music in the game lobby.")
if(isnewplayer(usr))
- usr.client.playtitlemusic()
+ playtitlemusic()
else
to_chat(usr, "You will no longer hear music in the game lobby.")
usr.stop_sound_channel(CHANNEL_LOBBYMUSIC)
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Lobby Music", "[usr.client.prefs.toggles & SOUND_LOBBY ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Sound/toggletitlemusic/Get_checked(client/C)
- return C.prefs.toggles & SOUND_LOBBY
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Lobby Music", "[prefs.toggles & SOUND_LOBBY ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglemidis)()
+/client/verb/togglemidis()
set name = "Hear/Silence Midis"
set category = "Preferences"
set desc = "Hear Admin Triggered Sounds (Midis)"
- usr.client.prefs.toggles ^= SOUND_MIDI
- usr.client.prefs.save_preferences()
- if(usr.client.prefs.toggles & SOUND_MIDI)
+ prefs.toggles ^= SOUND_MIDI
+ prefs.save_preferences()
+ if(prefs.toggles & SOUND_MIDI)
to_chat(usr, "You will now hear any sounds uploaded by admins.")
else
to_chat(usr, "You will no longer hear sounds uploaded by admins")
usr.stop_sound_channel(CHANNEL_ADMIN)
var/client/C = usr.client
C?.tgui_panel?.stop_music()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Hearing Midis", "[usr.client.prefs.toggles & SOUND_MIDI ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Sound/togglemidis/Get_checked(client/C)
- return C.prefs.toggles & SOUND_MIDI
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Hearing Midis", "[prefs.toggles & SOUND_MIDI ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_instruments)()
+/client/verb/toggle_instruments()
set name = "Hear/Silence Instruments"
set category = "Preferences"
set desc = "Hear In-game Instruments"
- usr.client.prefs.toggles ^= SOUND_INSTRUMENTS
- usr.client.prefs.save_preferences()
- if(usr.client.prefs.toggles & SOUND_INSTRUMENTS)
+ prefs.toggles ^= SOUND_INSTRUMENTS
+ prefs.save_preferences()
+ if(prefs.toggles & SOUND_INSTRUMENTS)
to_chat(usr, "You will now hear people playing musical instruments.")
else
to_chat(usr, "You will no longer hear musical instruments.")
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Instruments", "[usr.client.prefs.toggles & SOUND_INSTRUMENTS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Sound/toggle_instruments/Get_checked(client/C)
- return C.prefs.toggles & SOUND_INSTRUMENTS
-
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Instruments", "[prefs.toggles & SOUND_INSTRUMENTS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, Toggle_Soundscape)()
+/client/verb/Toggle_Soundscape()
set name = "Hear/Silence Ambience"
set category = "Preferences"
set desc = "Hear Ambient Sound Effects"
- usr.client.prefs.toggles ^= SOUND_AMBIENCE
- usr.client.prefs.save_preferences()
- if(usr.client.prefs.toggles & SOUND_AMBIENCE)
+ prefs.toggles ^= SOUND_AMBIENCE
+ prefs.save_preferences()
+ if(prefs.toggles & SOUND_AMBIENCE)
to_chat(usr, "You will now hear ambient sounds.")
else
to_chat(usr, "You will no longer hear ambient sounds.")
usr.stop_sound_channel(CHANNEL_AMBIENT_EFFECTS)
usr.stop_sound_channel(CHANNEL_AMBIENT_MUSIC)
+ usr.stop_sound_channel(CHANNEL_BUZZ)
+ usr.client.buzz_playing = FALSE
+ usr.client.update_ambience_pref()
SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ambience", "[usr.client.prefs.toggles & SOUND_AMBIENCE ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Sound/Toggle_Soundscape/Get_checked(client/C)
- return C.prefs.toggles & SOUND_AMBIENCE
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_ship_ambience)()
+/client/verb/toggle_ship_ambience()
set name = "Hear/Silence Ship Ambience"
set category = "Preferences"
set desc = "Hear Ship Ambience Roar"
- usr.client.prefs.toggles ^= SOUND_SHIP_AMBIENCE
- usr.client.prefs.save_preferences()
- if(usr.client.prefs.toggles & SOUND_SHIP_AMBIENCE)
+ prefs.toggles ^= SOUND_SHIP_AMBIENCE
+ prefs.save_preferences()
+ if(prefs.toggles & SOUND_SHIP_AMBIENCE)
to_chat(usr, "You will now hear ship ambience.")
else
to_chat(usr, "You will no longer hear ship ambience.")
- usr.stop_sound_channel(CHANNEL_AMBIENT_BUZZ)
- usr.client.ambient_buzz_playing = FALSE
+ usr.stop_sound_channel(CHANNEL_BUZZ)
+ usr.client.buzz_playing = FALSE
SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ship Ambience", "[usr.client.prefs.toggles & SOUND_SHIP_AMBIENCE ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, I bet you read this comment expecting to see the same thing :^)
-/datum/verbs/menu/Settings/Sound/toggle_ship_ambience/Get_checked(client/C)
- return C.prefs.toggles & SOUND_SHIP_AMBIENCE
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_announcement_sound)()
+/client/verb/toggle_announcement_sound()
set name = "Hear/Silence Announcements"
set category = "Preferences"
set desc = "Hear Announcement Sound"
- usr.client.prefs.toggles ^= SOUND_ANNOUNCEMENTS
- to_chat(usr, "You will now [(usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"].")
- usr.client.prefs.save_preferences()
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Announcement Sound", "[usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Sound/toggle_announcement_sound/Get_checked(client/C)
- return C.prefs.toggles & SOUND_ANNOUNCEMENTS
-
+ prefs.toggles ^= SOUND_ANNOUNCEMENTS
+ to_chat(usr, "You will now [(prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"].")
+ prefs.save_preferences()
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Announcement Sound", "[prefs.toggles & SOUND_ANNOUNCEMENTS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/Sound/verb/stop_client_sounds()
+/client/verb/stop_client_sounds()
set name = "Stop Sounds"
set category = "Preferences"
set desc = "Stop Current Sounds"
SEND_SOUND(usr, sound(null))
- var/client/C = usr.client
- C?.tgui_panel?.stop_music()
+ tgui_panel?.stop_music()
SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Stop Self Sounds")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)()
+/client/verb/listen_ooc()
set name = "Show/Hide OOC"
set category = "Preferences"
set desc = "Show OOC Chat"
- usr.client.prefs.chat_toggles ^= CHAT_OOC
- usr.client.prefs.save_preferences()
- to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.")
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing OOC", "[usr.client.prefs.chat_toggles & CHAT_OOC ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/verbs/menu/Settings/listen_ooc/Get_checked(client/C)
- return C.prefs.chat_toggles & CHAT_OOC
-
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_bank_card)()
+ prefs.chat_toggles ^= CHAT_OOC
+ prefs.save_preferences()
+ to_chat(usr, "You will [(prefs.chat_toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.")
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing OOC", "[prefs.chat_toggles & CHAT_OOC ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/verb/listen_bank_card()
set name = "Show/Hide Income Updates"
set category = "Preferences"
set desc = "Show or hide updates to your income"
- usr.client.prefs.chat_toggles ^= CHAT_BANKCARD
- usr.client.prefs.save_preferences()
- to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_BANKCARD) ? "now" : "no longer"] be notified when you get paid.")
- SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Income Notifications", "[(usr.client.prefs.chat_toggles & CHAT_BANKCARD) ? "Enabled" : "Disabled"]"))
-/datum/verbs/menu/Settings/listen_bank_card/Get_checked(client/C)
- return C.prefs.chat_toggles & CHAT_BANKCARD
-
+ prefs.chat_toggles ^= CHAT_BANKCARD
+ prefs.save_preferences()
+ to_chat(usr, "You will [(prefs.chat_toggles & CHAT_BANKCARD) ? "now" : "no longer"] be notified when you get paid.")
+ SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Income Notifications", "[(prefs.chat_toggles & CHAT_BANKCARD) ? "Enabled" : "Disabled"]"))
GLOBAL_LIST_INIT(ghost_forms, sortList(list("ghost","ghostking","ghostian2","skeleghost","ghost_red","ghost_black", \
"ghost_blue","ghost_yellow","ghost_green","ghost_pink", \
"ghost_cyan","ghost_dblue","ghost_dred","ghost_dgreen", \
"ghost_dcyan","ghost_grey","ghost_dyellow","ghost_dpink", "ghost_purpleswirl","ghost_funkypurp","ghost_pinksherbert","ghost_blazeit",\
"ghost_mellow","ghost_rainbow","ghost_camo","ghost_fire", "catghost")))
+
/client/proc/pick_form()
if(!is_content_unlocked())
alert("This setting is for accounts with BYOND premium only.")
@@ -444,7 +384,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
prefs.toggles ^= SOUND_PRAYERS
prefs.save_preferences()
to_chat(usr, "You will [(prefs.toggles & SOUND_PRAYERS) ? "now" : "no longer"] hear a sound when prayers arrive.")
- SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Prayer Sounds", "[usr.client.prefs.toggles & SOUND_PRAYERS ? "Enabled" : "Disabled"]"))
+ SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Prayer Sounds", "[prefs.toggles & SOUND_PRAYERS ? "Enabled" : "Disabled"]"))
/client/proc/colorasay()
set name = "Set Admin Say Color"
diff --git a/code/modules/client/verbs/input_box.dm b/code/modules/client/verbs/input_box.dm
new file mode 100644
index 0000000000000..772f6efd4152a
--- /dev/null
+++ b/code/modules/client/verbs/input_box.dm
@@ -0,0 +1,156 @@
+/client/proc/create_input_window(id, title, accept_verb, cancel_verb, force=FALSE, show=TRUE)
+ if(winexists(src, id))
+ if(force)
+ //Delete all clientside objects that are part of the window
+ winset(src, "[id]_macro_returnup", "parent=none")
+ winset(src, "[id]_macro_return", "parent=none")
+ winset(src, "[id]_macro_escape", "parent=none")
+ winset(src, "persist_[id]_macro", "parent=none")
+ winset(src, id, "parent=none")
+ else
+ return
+
+ // Create a macro set for handling enter presses
+ winclone(src, "input_box_macro", "persist_[id]_macro")
+ winset(src, "[id]_macro_returnup", "parent=persist_[id]_macro;name=Return+UP;command=\".winset \\\"[id].is-visible=false\\\"\"")
+ // Return+UP allows us to close the window after typing in a command, pressing enter and releasing enter.
+ // Can't use just Return for this, because when there's text in the box Return is handled by BYOND and doesn't run the macro.
+
+ // Create the actual window and set its title and macro set
+ winclone(src, "input_box", id)
+ winset(src, id, "title=\"[title]\";macro=persist_[id]_macro")
+
+ if(accept_verb)
+ winset(src, "[id].input", "command=\"[accept_verb] \\\"\"")
+ winset(src, "[id].accept", "command=\".winset \\\"command=\\\"[accept_verb] \\\\\\\"\[\[[id].input.text as escaped\]\]\\\";[id].is-visible=false\\\"\"")
+
+ if(cancel_verb)
+ winset(src, "[id].cancel", "command=\".winset \\\"command=\\\"[cancel_verb]\\\";[id].is-visible=false\\\"\"")
+ winset(src, "[id]_macro_return", "parent=persist_[id]_macro;name=Return;command=\".winset \\\"command=\\\"[cancel_verb]\\\";[id].is-visible=false\\\"\"")
+ winset(src, "[id]_macro_escape", "parent=persist_[id]_macro;name=Escape;command=\".winset \\\"command=\\\"[cancel_verb]\\\";[id].is-visible=false\\\"\"")
+ winset(src, id, "on-close=\"[cancel_verb]\"")
+ else
+ winset(src, "[id]_macro_return", "parent=persist_[id]_macro;name=Return;command=\".winset \\\"[id].is-visible=false\\\"\"")
+ winset(src, "[id]_macro_escape", "parent=persist_[id]_macro;name=Escape;command=\".winset \\\"[id].is-visible=false\\\"\"")
+
+ //Window scaling!
+ //BYOND doesn't scale the window by DPI scaling, so it'll appear too big/too small with DPI scaling other than the one it was based on
+ //This code uses the title bar to figure out what DPI scaling is being used and resize the window based on that
+ //Figure out the DPI scaling based on the titlebar size of the window, based on outer-inner height
+ var/window_data = params2list(winget(src, id, "outer-size;inner-size"))
+ var/window_innersize = splittext(window_data["inner-size"], "x")
+ var/window_outersize = splittext(window_data["outer-size"], "x")
+
+ var/titlebarHeight = text2num(window_outersize[2])-text2num(window_innersize[2])
+
+ //Known titlebar heights for DPI scaling:
+ //win7: 100%-28, 125%-33, 150%-39
+ //win10: 100%-29, 125%-35, 150%-40
+
+ //Known window sizes for DPI scaling: (Win7)
+ //100%: 302x86, font 7
+ //125%: 402x106, font 8
+ //150%: 503x133, font 8
+
+ var/scaling = FALSE
+
+ //Those are the default values for the window
+ var/window_width = 302
+ var/window_height = 86
+ var/font_size = 7
+
+ //The values used here were sampled from BYOND in practice, I couldn't find a formula that would describe them
+ switch(titlebarHeight)
+ if(30 to 37)
+ scaling = 1.25
+ window_width = 402
+ window_height = 106
+ font_size = 8
+ if(37 to 42)
+ scaling = 1.50
+ window_width = 503
+ window_height = 133
+ font_size = 8
+
+ if(scaling)
+ winset(src, null, "[id].size=[window_width]x[window_height];[id].input.font-size=[font_size];[id].accept.font-size=[font_size];[id].cancel.font-size=[font_size]")
+ //End window scaling
+
+ //Center the window on the main window
+ //The window size is hardcoded to be 410x133, taken from skin.dmf
+ var/mainwindow_data = params2list(winget(src, "mainwindow", "pos;outer-size;size;inner-size;is-maximized"))
+ var/mainwindow_pos = splittext(mainwindow_data["pos"], ",")
+ var/mainwindow_size = splittext(mainwindow_data["size"], "x")
+ var/mainwindow_innersize = splittext(mainwindow_data["inner-size"], "x")
+ var/mainwindow_outersize = splittext(mainwindow_data["outer-size"], "x")
+
+ var/maximized = (mainwindow_data["is-maximized"] == "true")
+
+ if(!maximized)
+ //If the window is anchored (for example win+right), is-maximized is false but pos is no longer reliable
+ //In that case, compare inner-size and size to guess if it's actually anchored
+ maximized = text2num(mainwindow_size[1]) != text2num(mainwindow_innersize[1])\
+ || abs(text2num(mainwindow_size[2]) - text2num(mainwindow_innersize[2])) > 30
+
+ var/target_x
+ var/target_y
+
+ // If the window is maximized or anchored, pos is the last position when the window was free-floating
+ if(maximized)
+ target_x = text2num(mainwindow_outersize[1])/2-window_width/2
+ target_y = text2num(mainwindow_outersize[2])/2-window_height/2
+ else
+ target_x = text2num(mainwindow_pos[1])+text2num(mainwindow_outersize[1])/2-window_width/2
+ target_y = text2num(mainwindow_pos[2])+text2num(mainwindow_outersize[2])/2-window_height/2
+
+ winset(src, id, "pos=[target_x],[target_y]")
+ //End centering
+
+ if(show)
+ //Show the window and focus on the textbox
+ winshow(src, id, TRUE)
+ winset(src, "[id].input", "focus=true")
+
+///Presets for standard windows
+GLOBAL_LIST_INIT(input_window_presets, list(
+ "say" = list("saywindow", "say \\\"text\\\"", ".say", ".cancel_typing say"),
+ "me" = list("mewindow", "me (text)", ".me", ".cancel_typing me"),
+))
+
+/client/proc/create_preset_input_window(name, force=FALSE, show=TRUE)
+ var/arglist = GLOB.input_window_presets[name]
+
+ create_input_window(arglist[1], arglist[2], arglist[3], arglist[4], force=force, show=show)
+
+//Those verbs are used by the hotkeys to ensure the window is created when you try to use it
+
+/client/verb/init_say()
+ set name = ".init_say"
+ set hidden = TRUE
+
+ create_preset_input_window("say")
+
+/client/verb/init_me()
+ set name = ".init_me"
+ set hidden = TRUE
+
+ create_preset_input_window("me")
+
+//Verb available to the user in case something in the window breaks
+/client/verb/fix_chatbox()
+ set name = "Fix chatbox"
+
+ var/preset = input(src, "Which chat window do you want to recreate?", "Fix chatbox") as null|anything in GLOB.input_window_presets
+
+ if(!preset)
+ return
+
+ create_preset_input_window(preset, force=TRUE)
+
+//Create the windows for say and me ahead of time
+/client/New()
+ . = ..()
+
+ if(src) //In case the client was deleted while New was running
+ create_preset_input_window("say", show=FALSE)
+ create_preset_input_window("me", show=FALSE)
diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm
index dbd6f20968bb5..442daf6f00377 100644
--- a/code/modules/client/verbs/looc.dm
+++ b/code/modules/client/verbs/looc.dm
@@ -57,10 +57,10 @@ GLOBAL_VAR_INIT(looc_allowed, 1)
msg = emoji_parse(msg)
- mob.log_talk(raw_msg, LOG_OOC, tag="(LOOC)")
+ mob.log_talk(raw_msg, LOG_OOC, tag="LOOC")
- var/list/heard = get_hearers_in_view(7, get_top_level_mob(src.mob))
- for(var/mob/M in heard)
+ var/list/heard = hearers(7, get_top_level_mob(src.mob))
+ for(var/mob/M as() in heard)
if(!M.client)
continue
var/client/C = M.client
@@ -87,19 +87,6 @@ GLOBAL_VAR_INIT(looc_allowed, 1)
prefix = "LOOC"
to_chat(C,"[ADMIN_FLW(usr)][prefix]: [src.key]/[src.mob.name]: ")
- /*for(var/mob/dead/observer/G in world)
- if(!G.client)
- continue
- var/client/C = G.client
- if (C in GLOB.admins)
- continue //handled earlier.
- if(C.prefs.toggles & CHAT_OOC)
- var/prefix = "(G)LOOC"
- if (C.mob in heard)
- prefix = "LOOC"
- to_chat(C,"[prefix]: [src.key]/[src.mob.name]: ")*/
-
-
/proc/log_looc(text)
if (CONFIG_GET(flag/log_ooc))
WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]LOOC: [text]")
@@ -110,7 +97,7 @@ GLOBAL_VAR_INIT(looc_allowed, 1)
return M.get_top_level_mob()
return src
-proc/get_top_level_mob(var/mob/S)
+/proc/get_top_level_mob(var/mob/S)
if(istype(S.loc,/mob)&&S.loc!=S)
var/mob/M=S.loc
return M.get_top_level_mob()
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 5b5af3e4e39bc..ce7a96e3d107b 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -67,26 +67,28 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
if(prefs.unlock_content)
if(prefs.toggles & MEMBER_PUBLIC)
keyname = "[icon2html('icons/member_content.dmi', world, "blag")][keyname]"
+ //Get client badges
+ var/badge_data = badge_parse(get_badges())
//The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url
for(var/client/C in GLOB.clients)
if(C.prefs.chat_toggles & CHAT_OOC)
if(holder)
if(!holder.fakekey || C.holder)
if(check_rights_for(src, R_ADMIN))
- to_chat(C, "[CONFIG_GET(flag/allow_admin_ooccolor) && prefs.ooccolor ? "" :"" ]OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: ")
+ to_chat(C, "[badge_data][CONFIG_GET(flag/allow_admin_ooccolor) && prefs.ooccolor ? "" :"" ]OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: ", allow_linkify = TRUE)
else
- to_chat(C, "OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: ")
+ to_chat(C, "[badge_data]OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: ")
else
if(GLOB.OOC_COLOR)
- to_chat(C, "OOC: [holder.fakekey ? holder.fakekey : key]: ")
+ to_chat(C, "[badge_data]OOC: [holder.fakekey ? holder.fakekey : key]: ")
else
- to_chat(C, "OOC: [holder.fakekey ? holder.fakekey : key]: ")
+ to_chat(C, "[badge_data]OOC: [holder.fakekey ? holder.fakekey : key]: ")
else if(!(key in C.prefs.ignoring))
if(GLOB.OOC_COLOR)
- to_chat(C, "OOC: [keyname]: ")
+ to_chat(C, "[badge_data]OOC: [keyname]: ")
else
- to_chat(C, "OOC: [keyname]: ")
+ to_chat(C, "[badge_data]OOC: [keyname]: ")
// beestation, send to discord
if(holder?.fakekey)
discordsendmsg("ooc", "**[holder.fakekey]:** [msg]")
@@ -169,7 +171,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
var/motd = global.config.motd
if(motd)
- to_chat(src, " [motd] ", handle_whitespace=FALSE)
+ to_chat(src, "[motd] ", handle_whitespace=FALSE, allow_linkify = TRUE)
else
to_chat(src, "The Message of the Day has not been set.")
@@ -193,11 +195,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
to_chat(usr, "Sorry, tracking is currently disabled.")
return
- var/list/body = list()
- body += "Playtime:" - body += get_exp_report() - body += "" - usr << browse(body.Join(), "window=playerplaytime[ckey];size=550x615") + new /datum/job_report_menu(src, usr) /client/proc/ignore_key(client, displayed_key) var/client/C = client diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index 2b95d0ab386b8..c2943b1c67c54 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -3,9 +3,9 @@ /mob/proc/set_suicide(suicide_state) suiciding = suicide_state if(suicide_state) - GLOB.suicided_mob_list += src + add_to_mob_suicide_list() else - GLOB.suicided_mob_list -= src + remove_from_mob_suicide_list() /mob/living/carbon/set_suicide(suicide_state) //you thought that box trick was pretty clever, didn't you? well now hardmode is on, boyo. . = ..() @@ -82,7 +82,7 @@ adjustOxyLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind return @@ -130,7 +130,7 @@ suicide_log() death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind /mob/living/carbon/monkey/verb/suicide() set hidden = 1 @@ -148,7 +148,7 @@ adjustOxyLoss(max(200- getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind /mob/living/silicon/ai/verb/suicide() set hidden = 1 @@ -167,7 +167,7 @@ //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind /mob/living/silicon/robot/verb/suicide() set hidden = 1 @@ -186,7 +186,7 @@ //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind /mob/living/silicon/pai/verb/suicide() set hidden = 1 @@ -199,7 +199,7 @@ suicide_log() death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind else to_chat(src, "Aborting suicide attempt.") @@ -221,7 +221,7 @@ //put em at -175 adjustOxyLoss(max(200 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind /mob/living/simple_animal/verb/suicide() set hidden = 1 @@ -238,7 +238,7 @@ suicide_log() death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind /mob/living/proc/suicide_log() log_game("[key_name(src)] committed suicide at [AREACOORD(src)] as [src.type].") diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index 5f16b98047c91..d2c7e9416a957 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -59,7 +59,7 @@ /client/verb/staffwho() set category = "Admin" set name = "Staffwho" - + var/msg = "Current Admins:\n" if(holder) for(var/client/C in GLOB.admins) @@ -104,7 +104,11 @@ continue //Don't show afk admins to adminwho msg += "\t[C] is a mentor\n" - msg += "Adminhelps are also sent to IRC. If no admins are available in game adminhelp anyways and an admin on IRC will see it and respond." + msg += "Adminhelps are also sent through TGS to services like IRC and Discord. If no admins are available in game adminhelp anyways and an admin will see it and respond." + if(world.time - src.staff_check_rate > 1 MINUTES) + message_admins("[ADMIN_LOOKUPFLW(src.mob)] has checked online staff.") + log_admin("[key_name(src)] has checked online staff.") + src.staff_check_rate = world.time to_chat(src, msg) /client/verb/mentorwho() // redundant with staffwho, but people wont check the admin tab for if there are mentors on @@ -155,6 +159,10 @@ continue //Don't show afk admins to adminwho msg += "\t[C] is a mentor\n" - msg += "Adminhelps are also sent to IRC. If no admins are available in game adminhelp anyways and an admin on IRC will see it and respond." + msg += "Adminhelps are also sent through TGS to services like IRC and Discord. If no admins are available in game adminhelp anyways and an admin will see it and respond." + if(world.time - src.staff_check_rate > 1 MINUTES) + message_admins("[ADMIN_LOOKUPFLW(src.mob)] has checked online staff.") + log_admin("[key_name(src)] has checked online staff.") + src.staff_check_rate = world.time to_chat(src, msg) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index a9bfc922ac126..953d184b35e86 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -63,8 +63,8 @@ // it's has TRAIT_NODROP D.dropItemToGround(target, TRUE) qdel(old_headgear) - // where is `SLOT_HEAD` defined? WHO KNOWS - D.equip_to_slot(new_headgear, SLOT_HEAD) + // where is `ITEM_SLOT_HEAD` defined? WHO KNOWS + D.equip_to_slot(new_headgear, ITEM_SLOT_HEAD) return 1 @@ -220,7 +220,7 @@ var/obj/item/I = target I.item_state = initial(picked_item.item_state) I.item_color = initial(picked_item.item_color) - if(istype(I, /obj/item/clothing) && istype(initial(picked_item), /obj/item/clothing)) + if(isclothing(I) && isclothing(initial(picked_item))) var/obj/item/clothing/CL = I var/obj/item/clothing/PCL = picked_item CL.flags_cover = initial(PCL.flags_cover) @@ -243,8 +243,7 @@ /datum/action/item_action/chameleon/change/process() if(world.time > emp_timer) - STOP_PROCESSING(SSprocessing, src) - return + return PROCESS_KILL random_look(owner) /obj/item/clothing/under/chameleon @@ -258,7 +257,7 @@ random_sensor = FALSE resistance_flags = NONE can_adjust = FALSE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 10) var/datum/action/item_action/chameleon/change/chameleon_action @@ -278,6 +277,13 @@ item_state = "engi_suit" item_color = "engine" +/obj/item/clothing/under/chameleon/envirosuit/ratvar + name = "ratvarian engineer's envirosuit" + desc = "A tough envirosuit woven from alloy threads. It can take on the appearance of other jumpsuits." + icon_state = "engineer_envirosuit" + item_state = "engineer_envirosuit" + item_color = "engineer_envirosuit" + /obj/item/clothing/under/chameleon/Initialize() . = ..() chameleon_action = new(src) @@ -303,7 +309,7 @@ item_state = "armor" blood_overlay_type = "armor" resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 10) var/datum/action/item_action/chameleon/change/chameleon_action @@ -331,7 +337,7 @@ icon_state = "meson" item_state = "meson" resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 10) var/datum/action/item_action/chameleon/change/chameleon_action @@ -361,13 +367,13 @@ flash_protect = 3 /obj/item/clothing/gloves/chameleon - desc = "These gloves will protect the wearer from electric shock." + desc = "These gloves provide protection against electric shock." name = "insulated gloves" icon_state = "yellow" item_state = "ygloves" resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 10) var/datum/action/item_action/chameleon/change/chameleon_action @@ -401,7 +407,7 @@ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 10) /obj/item/clothing/head/chameleon name = "grey cap" @@ -411,7 +417,7 @@ item_color = "grey" resistance_flags = NONE - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 10) var/datum/action/item_action/chameleon/change/chameleon_action @@ -447,13 +453,20 @@ heat_protection = HEAD max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT bang_protect = 1 - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + +/obj/item/clothing/head/chameleon/envirohelm/ratvar + name = "ratvarian engineer's envirosuit helmet" + desc = "A tough envirohelm woven from alloy threads. It can take on the appearance of other headgear." + icon_state = "engineer_envirohelm" + item_state = "engineer_envirohelm" + flash_protect = 1 /obj/item/clothing/head/chameleon/drone // The camohat, I mean, holographic hat projection, is part of the // drone itself. clothing_flags = SNUG_FIT - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0) // which means it offers no protection, it's just air and light /obj/item/clothing/head/chameleon/drone/Initialize() @@ -471,7 +484,7 @@ icon_state = "gas_alt" item_state = "gas_alt" resistance_flags = NONE - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 10) clothing_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR gas_transfer_coefficient = 0.01 @@ -507,7 +520,7 @@ /obj/item/clothing/mask/chameleon/drone //Same as the drone chameleon hat, undroppable and no protection - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0) // Can drones use the voice changer part? Let's not find out. vchange = 0 @@ -530,7 +543,7 @@ desc = "A pair of black shoes." permeability_coefficient = 0.05 resistance_flags = NONE - armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 10) pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes var/datum/action/item_action/chameleon/change/chameleon_action @@ -678,7 +691,7 @@ desc = "A neosilk clip-on tie." icon_state = "blacktie" resistance_flags = NONE - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 0) /obj/item/clothing/neck/cloak/chameleon var/datum/action/item_action/chameleon/change/chameleon_action diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index f128e9aee47b6..ad5a525337691 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -1,3 +1,9 @@ +#define SENSORS_OFF 0 +#define SENSORS_BINARY 1 +#define SENSORS_VITALS 2 +#define SENSORS_TRACKING 3 +#define SENSOR_CHANGE_DELAY 1.5 SECONDS + /obj/item/clothing name = "clothing" resistance_flags = FLAMMABLE @@ -21,7 +27,6 @@ var/active_sound = null var/toggle_cooldown = null var/cooldown = 0 - var/scan_reagents = 0 //Can the wearer see reagents while it's equipped? var/envirosealed = FALSE //is it safe for plasmamen var/blocks_shove_knockdown = FALSE //Whether wearing the clothing item blocks the ability for shove to knock down. @@ -41,6 +46,12 @@ var/dynamic_hair_suffix = ""//head > mask for head hair var/dynamic_fhair_suffix = ""//mask > head for facial hair + var/high_pressure_multiplier = 1 + var/static/list/high_pressure_multiplier_types = list("melee", "bullet", "laser", "energy", "bomb") + ///These are armor values that protect the wearer, taken from the clothing's armor datum. List updates on examine because it's currently only used to print armor ratings to chat in Topic(). + var/list/armor_list = list() + ///These are armor values that protect the clothing, taken from its armor datum. List updates on examine because it's currently only used to print armor ratings to chat in Topic(). + var/list/durability_list = list() /obj/item/clothing/Initialize() if(CHECK_BITFIELD(clothing_flags, VOICEBOX_TOGGLABLE)) @@ -56,8 +67,8 @@ if(ismecha(M.loc)) // stops inventory actions in a mech return - if(!M.incapacitated() && loc == M && istype(over_object, /obj/screen/inventory/hand)) - var/obj/screen/inventory/hand/H = over_object + if(!M.incapacitated() && loc == M && istype(over_object, /atom/movable/screen/inventory/hand)) + var/atom/movable/screen/inventory/hand/H = over_object if(M.putItemFromInventoryInHandIfPossible(src, H.held_index)) add_fingerprint(usr) @@ -69,7 +80,7 @@ foodtype = CLOTH /obj/item/clothing/attack(mob/M, mob/user, def_zone) - if(user.a_intent != INTENT_HARM && ismoth(M)) + if(user.a_intent != INTENT_HARM && ismoth(M) && !(clothing_flags & NOTCONSUMABLE) && !(resistance_flags & INDESTRUCTIBLE) && (armor.getRating("melee") == 0)) var/obj/item/reagent_containers/food/snacks/clothing/clothing_as_food = new clothing_as_food.name = name if(clothing_as_food.attack(M, user, def_zone)) @@ -107,7 +118,7 @@ ..() if (!istype(user)) return - if(slot_flags & slotdefine2slotbit(slot)) //Was equipped to a valid slot for this item? + if(slot_flags & slot) //Was equipped to a valid slot for this item? if (LAZYLEN(user_vars_to_edit)) for(var/variable in user_vars_to_edit) if(variable in user.vars) @@ -141,6 +152,89 @@ how_cool_are_your_threads += "" . += how_cool_are_your_threads.Join() + . += "It has a tag listing its protection classes." + +/obj/item/clothing/Topic(href, href_list) + . = ..() + if(href_list["list_armor"]) + if(length(armor_list)) + armor_list.Cut() + if(armor.bio) + armor_list += list("TOXIN" = armor.bio) + if(armor.bomb) + armor_list += list("EXPLOSIVE" = armor.bomb) + if(armor.bullet) + armor_list += list("BULLET" = armor.bullet) + if(armor.energy) + armor_list += list("ENERGY" = armor.energy) + if(armor.laser) + armor_list += list("LASER" = armor.laser) + if(armor.magic) + armor_list += list("MAGIC" = armor.magic) + if(armor.melee) + armor_list += list("MELEE" = armor.melee) + if(armor.rad) + armor_list += list("RADIATION" = armor.rad) + if(armor.stamina) + armor_list += list("STAMINA" = armor.stamina) + + if(length(durability_list)) + durability_list.Cut() + if(armor.fire) + durability_list += list("FIRE" = armor.fire) + if(armor.acid) + durability_list += list("ACID" = armor.acid) + var/list/readout = list("PROTECTION CLASSES (I-X)") + if(length(armor_list)) + readout += "\nARMOR" + for(var/dam_type in armor_list) + var/armor_amount = armor_list[dam_type] + readout += "\n[dam_type] [armor_to_protection_class(armor_amount)]" //e.g. BOMB IV + if(length(durability_list)) + readout += "\nDURABILITY" + for(var/dam_type in durability_list) + var/durability_amount = durability_list[dam_type] + readout += "\n[dam_type] [armor_to_protection_class(durability_amount)]" //e.g. FIRE II + if(!(length(armor_list) || length(durability_list))) + readout += "\nNO PROTECTION" + readout += "" + + to_chat(usr, "[readout.Join()]") + +/** + * Rounds armor_value to nearest 10, divides it by 10 and then expresses it in roman numerals up to 10 + * + * Rounds armor_value to nearest 10, divides it by 10 + * and then expresses it in roman numerals up to 10 + * Arguments: + * * armor_value - Number we're converting + */ +/obj/item/clothing/proc/armor_to_protection_class(armor_value) + armor_value = round(armor_value,10) / 10 + switch (armor_value) + if(0) + . = "< I" + if(1) + . = "I" + if(2) + . = "II" + if(3) + . = "III" + if(4) + . = "IV" + if(5) + . = "V" + if(6) + . = "VI" + if(7) + . = "VII" + if(8) + . = "VIII" + if(9) + . = "IX" + if(10 to INFINITY) + . = "X" + /obj/item/clothing/obj_break(damage_flag) if(!damaged_clothes) update_clothes_damaged_state(TRUE) @@ -183,48 +277,71 @@ BLIND // can't see anything female_clothing_icon = fcopy_rsc(female_clothing_icon) GLOB.female_clothing_icons[index] = female_clothing_icon -/obj/item/clothing/under/verb/toggle() - set name = "Adjust Suit Sensors" - set category = "Object" - set src in usr - var/mob/M = usr - if (istype(M, /mob/dead/)) +/obj/item/clothing/under/proc/set_sensors(mob/user) + var/mob/M = user + if(M.stat) return - if (!can_use(M)) + if(!can_use(M)) return if(src.has_sensor == LOCKED_SENSORS) - to_chat(usr, "The controls are locked.") - return 0 + to_chat(user, "The controls are locked.") + return FALSE if(src.has_sensor == BROKEN_SENSORS) - to_chat(usr, "The sensors have shorted out!") - return 0 + to_chat(user, "The sensors have shorted out!") + return FALSE if(src.has_sensor <= NO_SENSORS) - to_chat(usr, "This suit does not have any sensors.") - return 0 + to_chat(user, "This suit does not have any sensors.") + return FALSE var/list/modes = list("Off", "Binary vitals", "Exact vitals", "Tracking beacon") var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes - if(get_dist(usr, src) > 1) - to_chat(usr, "You have moved too far away!") + if(get_dist(user, src) > 1) + to_chat(user, "You have moved too far away!") return - sensor_mode = modes.Find(switchMode) - 1 - - if (src.loc == usr) - switch(sensor_mode) - if(0) - to_chat(usr, "You disable your suit's remote sensing equipment.") - if(1) - to_chat(usr, "Your suit will now only report whether you are alive or dead.") - if(2) - to_chat(usr, "Your suit will now only report your exact vital lifesigns.") - if(3) - to_chat(usr, "Your suit will now report your exact vital lifesigns as well as your coordinate position.") - + var/sensor_selection = modes.Find(switchMode) - 1 + + if (src.loc == user) + switch(sensor_selection) + if(SENSORS_OFF) + to_chat(user, "You disable your suit's remote sensing equipment.") + if(SENSORS_BINARY) + to_chat(user, "Your suit will now only report whether you are alive or dead.") + if(SENSORS_VITALS) + to_chat(user, "Your suit will now only report your exact vital lifesigns.") + if(SENSORS_TRACKING) + to_chat(user, "Your suit will now report your exact vital lifesigns as well as your coordinate position.") + sensor_mode = sensor_selection + else if(istype(src.loc, /mob)) + var/mob/living/carbon/human/wearer = src.loc + wearer.visible_message("[user] tries to set [wearer]'s sensors.", \ + "[user] is trying to set your sensors.", null, COMBAT_MESSAGE_RANGE) + if(do_mob(user, wearer, SENSOR_CHANGE_DELAY)) + switch(sensor_selection) + if(SENSORS_OFF) + wearer.visible_message("[user] disables [wearer]'s remote sensing equipment.", \ + "[user] disables your remote sensing equipment.", null, COMBAT_MESSAGE_RANGE) + if(SENSORS_BINARY) + wearer.visible_message("[user] turns [wearer]'s remote sensors to binary.", \ + "[user] turns your remote sensors to binary.", null, COMBAT_MESSAGE_RANGE) + if(SENSORS_VITALS) + wearer.visible_message("[user] turns [wearer]'s remote sensors to track vitals.", \ + "[user] turns your remote sensors to track vitals.", null, COMBAT_MESSAGE_RANGE) + if(SENSORS_TRACKING) + wearer.visible_message("[user] turns [wearer]'s remote sensors to maximum.", \ + "[user] turns your remote sensors to maximum.", null, COMBAT_MESSAGE_RANGE) + sensor_mode = sensor_selection + log_combat(user, wearer, "changed sensors to [switchMode]") if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.w_uniform == src) H.update_suit_sensors() +/obj/item/clothing/under/verb/toggle() + set name = "Adjust Suit Sensors" + set category = "Object" + set src in usr + set_sensors(usr) + /obj/item/clothing/under/attack_hand(mob/user) if(attached_accessory && ispath(attached_accessory.pocket_storage_component_path) && loc == user) attached_accessory.attack_hand(user) @@ -232,9 +349,6 @@ BLIND // can't see anything ..() /obj/item/clothing/under/AltClick(mob/user) - if(..()) - return 1 - if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return else @@ -334,3 +448,19 @@ BLIND // can't see anything deconstruct(FALSE) else ..() + +/obj/item/clothing/get_armor_rating(d_type, mob/wearer) + . = ..() + if(high_pressure_multiplier == 1) + return + var/turf/T = get_turf(wearer) + if(!T || !(d_type in high_pressure_multiplier_types)) + return + if(!lavaland_equipment_pressure_check(T)) + . *= high_pressure_multiplier + +#undef SENSORS_OFF +#undef SENSORS_BINARY +#undef SENSORS_VITALS +#undef SENSORS_TRACKING +#undef SENSOR_CHANGE_DELAY diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 265beab81dcd8..87eb92d5cf752 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -89,21 +89,36 @@ hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP +/obj/item/clothing/glasses/meson/prescription + name = "prescription meson scanner" + desc = "A crude combination between a pair of prescription glasses and the electronics of a meson scanner." + icon_state = "prescmeson" + item_state = "glasses" + vision_correction = 1 + /obj/item/clothing/glasses/science name = "science goggles" desc = "A pair of snazzy goggles used to protect against chemical spills. Fitted with an analyzer for scanning items and reagents." icon_state = "purple" item_state = "glasses" - scan_reagents = TRUE //You can see reagents while wearing science goggles + clothing_flags = SCAN_REAGENTS actions_types = list(/datum/action/item_action/toggle_research_scanner) glass_colour_type = /datum/client_colour/glass_colour/purple resistance_flags = ACID_PROOF - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100, "stamina" = 0) /obj/item/clothing/glasses/science/item_action_slot_check(slot) - if(slot == SLOT_GLASSES) + if(slot == ITEM_SLOT_EYES) return 1 +/obj/item/clothing/glasses/science/prescription + name = "prescription science goggles" + desc = "A crude combination between a pair of prescription glasses and the electronics of science goggles." + icon_state = "prescscihud" + resistance_flags = NONE + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 40, "stamina" = 0) + vision_correction = 1 + /obj/item/clothing/glasses/science/sciencesun name = "science sunglasses" desc = "A pair of sunglasses outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. Has enhanced shielding which blocks flashes." @@ -111,6 +126,11 @@ item_state = "sunhudscience" flash_protect = 1 +/obj/item/clothing/glasses/science/sciencesun/degraded + name = "degraded science sunglasses" + desc = "A pair of sunglasses outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion." + flash_protect = 0 + /obj/item/clothing/glasses/night name = "night vision goggles" desc = "You can totally see in the dark now!" @@ -209,11 +229,11 @@ /obj/item/clothing/glasses/sunglasses/advanced/reagent name = "beer goggles" desc = "A pair of sunglasses outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. Has enhanced shielding which blocks flashes." - scan_reagents = TRUE + clothing_flags = SCAN_REAGENTS /obj/item/clothing/glasses/sunglasses/advanced/reagent/equipped(mob/user, slot) . = ..() - if(ishuman(user) && slot == SLOT_GLASSES) + if(ishuman(user) && slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_BOOZE_SLIDER, CLOTHING_TRAIT) /obj/item/clothing/glasses/sunglasses/advanced/reagent/dropped(mob/user) @@ -283,12 +303,19 @@ desc = "A bulky pair of unwieldy glasses that lets you see things best left unseen. Obscures vision, but also has enhanced shielding which blocks flashes." icon_state = "bustin-g" item_state = "bustin-g" - invis_view = SEE_INVISIBLE_OBSERVER - invis_override = null flash_protect = 1 - visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_INVISVIEW + visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT glass_colour_type = /datum/client_colour/glass_colour/green +/obj/item/clothing/glasses/welding/ghostbuster/ComponentInitialize() + . = ..() + AddComponent(/datum/component/team_monitor, "ghost", 1) + +/obj/item/clothing/glasses/welding/ghostbuster/visor_toggling() + ..() + var/datum/component/team_monitor/ghost_vision = GetComponent(/datum/component/team_monitor) + ghost_vision.toggle_hud(!ghost_vision.hud_visible, usr) + /obj/item/clothing/glasses/blindfold name = "blindfold" desc = "Covers the eyes, preventing sight." @@ -299,15 +326,6 @@ darkness_view = 1 dog_fashion = /datum/dog_fashion/head -/obj/item/clothing/glasses/blindfold/equipped(mob/living/carbon/human/user, slot) - . = ..() - if(slot == SLOT_GLASSES) - user.become_blind("blindfold_[REF(src)]") - -/obj/item/clothing/glasses/blindfold/dropped(mob/living/carbon/human/user) - ..() - user.cure_blind("blindfold_[REF(src)]") - /obj/item/clothing/glasses/blindfold/white name = "blind personnel blindfold" desc = "Indicates that the wearer suffers from blindness." @@ -316,7 +334,7 @@ var/colored_before = FALSE /obj/item/clothing/glasses/blindfold/white/equipped(mob/living/carbon/human/user, slot) - if(ishuman(user) && slot == SLOT_GLASSES) + if(ishuman(user) && slot == ITEM_SLOT_EYES) update_icon(user) user.update_inv_glasses() //Color might have been changed by update_icon. ..() @@ -336,7 +354,6 @@ . += M /obj/item/clothing/glasses/sunglasses/advanced/big - desc = "Strangely ancient technology used to help provide rudimentary eye cover. Has enhanced shielding which blocks flashes." icon_state = "bigsunglasses" item_state = "bigsunglasses" @@ -347,7 +364,6 @@ item_state = "glasses" vision_flags = SEE_MOBS lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE - flash_protect = 0 glass_colour_type = /datum/client_colour/glass_colour/red /obj/item/clothing/glasses/thermal/emp_act(severity) @@ -360,7 +376,7 @@ name = "syndicate xray goggles" desc = "A pair of xray goggles manufactured by the Syndicate." vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS - flash_protect = -1 + tint = -INFINITY /obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete name = "chameleon thermals" @@ -436,7 +452,7 @@ item_state = "godeye" vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS darkness_view = 8 - scan_reagents = TRUE + clothing_flags = SCAN_REAGENTS lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE resistance_flags = LAVA_PROOF | FIRE_PROOF @@ -470,8 +486,6 @@ else to_chat(H, "You will no longer see glasses colors.") H.update_glasses_color(src, 1) - else - return ..() /obj/item/clothing/glasses/proc/change_glass_color(mob/living/carbon/human/H, datum/client_colour/glass_colour/new_color_type) var/old_colour_type = glass_colour_type diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index d5ce968aeb72e..43db0e725b969 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -90,7 +90,7 @@ var/strength = round(rad_places[i] / 1000, 0.1) var/image/pic = image(loc = place) var/mutable_appearance/MA = new() - MA.maptext = "[strength]k" + MA.maptext = MAPTEXT("[strength]k") MA.color = "#04e66d" MA.layer = RAD_TEXT_LAYER MA.plane = GAME_PLANE @@ -123,7 +123,7 @@ item_state = icon_state if(isliving(loc)) var/mob/living/user = loc - if(user.get_item_by_slot(SLOT_GLASSES) == src) + if(user.get_item_by_slot(ITEM_SLOT_EYES) == src) user.update_inv_glasses() else user.update_inv_hands() diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 4d37ba4cb7b03..f6e5194aacc84 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -2,28 +2,46 @@ name = "HUD" desc = "A heads-up display that provides important info in (almost) real time." flags_1 = null //doesn't protect eyes because it's a monocle, duh - var/hud_type = null - var/alt_hud_type = null + var/hud_trait = null //Used for topic calls. Just because you have a HUD display doesn't mean you should be able to interact with stuff. If something uses multiple traits, make it a list. + var/hud_type = null //If something uses multiple huds, make it a list. /obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot) ..() - if(hud_type && slot == SLOT_GLASSES) - var/datum/atom_hud/H = GLOB.huds[hud_type] - H.add_hud_to(user) - if(alt_hud_type && slot == SLOT_GLASSES) - var/datum/atom_hud/H = GLOB.huds[alt_hud_type] - H.add_hud_to(user) + if(slot != ITEM_SLOT_EYES) + return + if(hud_type) + if(islist(hud_type)) + for(var/T in hud_type) + var/datum/atom_hud/H = GLOB.huds[T] + H.add_hud_to(user) + else + var/datum/atom_hud/H = GLOB.huds[hud_type] + H.add_hud_to(user) + if(hud_trait) + if(islist(hud_trait)) + for(var/H in hud_trait) + ADD_TRAIT(user, H, GLASSES_TRAIT) + else + ADD_TRAIT(user, hud_trait, GLASSES_TRAIT) /obj/item/clothing/glasses/hud/dropped(mob/living/carbon/human/user) ..() - if(hud_type && istype(user) && user.glasses == src) - var/datum/atom_hud/H = GLOB.huds[hud_type] - H.remove_hud_from(user) - - if(alt_hud_type && istype(user) && user.glasses == src) - var/datum/atom_hud/H = GLOB.huds[alt_hud_type] - H.remove_hud_from(user) - + if(!istype(user) || user.glasses != src) + return + if(hud_type) + if(islist(hud_type)) + for(var/T in hud_type) + var/datum/atom_hud/H = GLOB.huds[T] + H.remove_hud_from(user) + else + var/datum/atom_hud/H = GLOB.huds[hud_type] + H.remove_hud_from(user) + if(hud_trait) + if(islist(hud_trait)) + for(var/H in hud_trait) + REMOVE_TRAIT(user, H, GLASSES_TRAIT) + else + REMOVE_TRAIT(user, hud_trait, GLASSES_TRAIT) /obj/item/clothing/glasses/hud/emp_act(severity) . = ..() @@ -44,6 +62,7 @@ desc = "A heads-up display that scans the humans in view and provides accurate data about their health status." icon_state = "healthhud" hud_type = DATA_HUD_MEDICAL_ADVANCED + hud_trait = TRAIT_MEDICAL_HUD glass_colour_type = /datum/client_colour/glass_colour/lightblue /obj/item/clothing/glasses/hud/health/night @@ -64,6 +83,17 @@ tint = 1 glass_colour_type = /datum/client_colour/glass_colour/blue +/obj/item/clothing/glasses/hud/health/prescription + name = "prescription medical HUDglasses" + desc = "Prescription glasses with a built-in medical HUD." + icon_state = "prescmedhud" + vision_correction = 1 + +/obj/item/clothing/glasses/hud/health/sunglasses/degraded + name = "degraded medical HUDSunglasses" + desc = "Sunglasses with a medical HUD. They do not provide flash protection." + flash_protect = 0 + /obj/item/clothing/glasses/hud/diagnostic name = "diagnostic HUD" desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits." @@ -88,11 +118,23 @@ flash_protect = 1 tint = 1 +/obj/item/clothing/glasses/hud/diagnostic/sunglasses/degraded + name = "degraded diagnostic sunglasses" + desc = "Sunglasses with a diagnostic HUD. They do not provide flash protection." + flash_protect = 0 + +/obj/item/clothing/glasses/hud/diagnostic/prescription + name = "prescription diagnostic HUDglasses" + desc = "Prescription glasses with a built-in diagnostic HUD." + icon_state = "prescdiaghud" + vision_correction = 1 + /obj/item/clothing/glasses/hud/security name = "security HUD" desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records." icon_state = "securityhud" hud_type = DATA_HUD_SECURITY_ADVANCED + hud_trait = TRAIT_SECURITY_HUD glass_colour_type = /datum/client_colour/glass_colour/red /obj/item/clothing/glasses/hud/security/deputy @@ -103,8 +145,9 @@ name = "medsec HUD" desc = "A combination HUD, providing the user the use of a Medical and Security HUD." icon_state = "medsechud" - hud_type = DATA_HUD_SECURITY_ADVANCED - alt_hud_type = DATA_HUD_MEDICAL_ADVANCED + hud_type = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED) + hud_trait = list(TRAIT_SECURITY_HUD, TRAIT_MEDICAL_HUD) + glass_colour_type = /datum/client_colour/glass_colour/red /obj/item/clothing/glasses/hud/security/chameleon @@ -145,6 +188,11 @@ tint = 1 glass_colour_type = /datum/client_colour/glass_colour/darkred +/obj/item/clothing/glasses/hud/security/sunglasses/degraded + name = "degraded security HUDSunglasses" + desc = "Sunglasses with a security HUD. They do not provide flash protection." + flash_protect = 0 + /obj/item/clothing/glasses/hud/security/night name = "night vision security HUD" desc = "An advanced heads-up display which provides id data and vision in complete darkness." @@ -153,6 +201,12 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE glass_colour_type = /datum/client_colour/glass_colour/green +/obj/item/clothing/glasses/hud/security/prescription + name = "prescription security HUDglasses" + desc = "Prescription glasses with a built-in security HUD. They do not provide flash protection." + icon_state = "prescsechud" + vision_correction = 1 + /obj/item/clothing/glasses/hud/security/sunglasses/gars name = "\improper HUD gar glasses" desc = "GAR glasses with a HUD." @@ -235,3 +289,30 @@ if(. & EMP_PROTECT_SELF) return thermal_overload() + +/obj/item/clothing/glasses/hud/debug + name = "Omni HUD" + desc = "Glasses with every function." + icon_state = "doublegodeye" + item_state = "doublegodeye" + vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS + darkness_view = 8 + flash_protect = 2 + vision_correction = 1 + clothing_flags = SCAN_REAGENTS + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + hud_type = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED, DATA_HUD_SECURITY_ADVANCED) + resistance_flags = INDESTRUCTIBLE + actions_types = list(/datum/action/item_action/toggle,/datum/action/item_action/toggle_research_scanner) + var/xray = TRUE + +/obj/item/clothing/glasses/hud/debug/attack_self(mob/user) + if(!ishuman(user)) + return + if(xray) + vision_flags -= SEE_MOBS|SEE_OBJS + else + vision_flags += SEE_MOBS|SEE_OBJS + xray = !xray + var/mob/living/carbon/human/wearer = user + wearer.update_sight() diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index 9b381cef7f8c9..06433a5d6a253 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -10,12 +10,16 @@ var/transfer_prints = FALSE strip_delay = 20 equip_delay_other = 40 + // Path variable. If defined, will produced the type through interaction with wirecutters. + var/cut_type = null /obj/item/clothing/gloves/ComponentInitialize() . = ..() RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_blood) /obj/item/clothing/gloves/proc/clean_blood(datum/source, strength) + SIGNAL_HANDLER + if(strength < CLEAN_STRENGTH_BLOOD) return transfer_blood = 0 @@ -40,4 +44,14 @@ // Called just before an attack_hand(), in mob/UnarmedAttack() /obj/item/clothing/gloves/proc/Touch(atom/A, proximity) - return 0 // return 1 to cancel attack_hand() + return FALSE // return 1 to cancel attack_hand() + +/obj/item/clothing/gloves/wirecutter_act(mob/living/user, obj/item/I) + . = ..() + if(!cut_type) + return + if(icon_state != initial(icon_state)) + return // We don't want to cut dyed gloves. + new cut_type(drop_location()) + qdel(src) + return TRUE diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index a76ff7c5834dd..173df5a1c0c59 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -17,3 +17,14 @@ /obj/item/clothing/gloves/boxing/yellow icon_state = "boxingyellow" item_state = "boxingyellow" + +/obj/item/clothing/gloves/boxing/yellow/insulated + name = "budget boxing gloves" + desc = "Standard boxing gloves coated in a makeshift insulating coat. This can't possibly go wrong at all." + icon_state = "boxingyellow" + item_state = "boxingyellow" + siemens_coefficient = 1 //Set to a default of 1, gets overridden in Initialize() + +/obj/item/clothing/gloves/boxing/yellow/insulated/Initialize() + . = ..() + siemens_coefficient = pick(0,0,0,0,0.25,2) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 54abcdadf3436..7e1ed7b7336e1 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -1,5 +1,5 @@ /obj/item/clothing/gloves/color/yellow - desc = "These gloves will protect the wearer from electric shock." + desc = "These gloves provide protection against electric shock." name = "insulated gloves" icon_state = "yellow" item_state = "ygloves" @@ -7,6 +7,39 @@ permeability_coefficient = 0.05 item_color="yellow" resistance_flags = NONE + cut_type = /obj/item/clothing/gloves/cut + +/obj/item/clothing/gloves/color/black/equipped(mob/user, slot) + . = ..() + if((slot == ITEM_SLOT_GLOVES) && (user.mind?.assigned_role in GLOB.security_positions)) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "sec_black_gloves", /datum/mood_event/sec_black_gloves) + +/obj/item/clothing/gloves/color/black/dropped(mob/user) + . = ..() + if(user.mind?.assigned_role in GLOB.security_positions) + SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "sec_black_gloves") + +/obj/item/clothing/gloves/color/black/hos + item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way. + +/obj/item/clothing/gloves/color/black/ce + item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way. + +/obj/item/clothing/gloves/color/yellow/equipped(mob/user, slot) + . = ..() + if(slot == ITEM_SLOT_GLOVES) + if(user.mind?.assigned_role == "Assistant") + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "assistant_insulated_gloves", /datum/mood_event/assistant_insulated_gloves) + if(user.mind?.assigned_role in GLOB.security_positions) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "sec_insulated_gloves", /datum/mood_event/sec_insulated_gloves) + +/obj/item/clothing/gloves/color/yellow/dropped(mob/user) + . = ..() + if(user.mind?.assigned_role == "Assistant") + SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "assistant_insulated_gloves") + if(user.mind?.assigned_role in GLOB.security_positions) + SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "sec_insulated_gloves") + /obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly." @@ -17,6 +50,7 @@ permeability_coefficient = 0.05 item_color = "yellow" resistance_flags = NONE + cut_type = /obj/item/clothing/gloves/cut /obj/item/clothing/gloves/color/fyellow/Initialize() . = ..() @@ -30,7 +64,7 @@ . += "[src] will fully protect from electric shocks." if(siemens_coefficient > 1) . += "[src] will only make shocks worse." - else + else . += "[src] will provide [protectionpercentage] percent protection from electric shocks." /obj/item/clothing/gloves/color/fyellow/old @@ -41,6 +75,16 @@ . = ..() siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75) +/obj/item/clothing/gloves/cut + desc = "These gloves would protect the wearer from electric shock... if the fingers were covered." + name = "fingerless insulated gloves" + icon_state = "yellowcut" + item_state = "ygloves" + transfer_prints = TRUE + +/obj/item/clothing/gloves/cut/heirloom + desc = "The old gloves your great grandfather stole from Engineering, many moons ago. They've seen some tough times recently." + /obj/item/clothing/gloves/color/black desc = "These gloves are fire-resistant." name = "black gloves" @@ -52,22 +96,7 @@ heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE - var/can_be_cut = 1 - -/obj/item/clothing/gloves/color/black/hos - item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way. - -/obj/item/clothing/gloves/color/black/ce - item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way. - -/obj/item/clothing/gloves/color/black/attackby(obj/item/I, mob/user, params) - if(I.tool_behaviour == TOOL_WIRECUTTER) - if(can_be_cut && icon_state == initial(icon_state))//only if not dyed - to_chat(user, "You snip the fingertips off of [src].") - I.play_tool_sound(src) - new /obj/item/clothing/gloves/fingerless(drop_location()) - qdel(src) - ..() + cut_type = /obj/item/clothing/gloves/fingerless /obj/item/clothing/gloves/color/orange name = "orange gloves" @@ -86,7 +115,7 @@ /obj/item/clothing/gloves/color/red/insulated name = "insulated gloves" - desc = "These gloves will protect the wearer from electric shock." + desc = "These gloves provide protection against electric shock." siemens_coefficient = 0 permeability_coefficient = 0.05 resistance_flags = NONE @@ -165,26 +194,42 @@ heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT strip_delay = 60 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50, "stamina" = 0) /obj/item/clothing/gloves/color/latex name = "latex gloves" - desc = "Cheap sterile gloves made from latex." + desc = "Cheap sterile gloves made from latex. Transfers minor paramedic knowledge to the user via budget nanochips." icon_state = "latex" - item_state = "lgloves" + item_state = "latex" siemens_coefficient = 0.3 permeability_coefficient = 0.01 item_color="mime" transfer_prints = TRUE resistance_flags = NONE + var/carrytrait = TRAIT_QUICK_CARRY + +/obj/item/clothing/gloves/color/latex/equipped(mob/user, slot) + ..() + if(slot == ITEM_SLOT_GLOVES) + ADD_TRAIT(user, carrytrait, CLOTHING_TRAIT) + +/obj/item/clothing/gloves/color/latex/dropped(mob/user) + ..() + REMOVE_TRAIT(user, carrytrait, CLOTHING_TRAIT) + +/obj/item/clothing/gloves/color/latex/obj_break() + ..() + if(ishuman(loc)) + REMOVE_TRAIT(loc, carrytrait, CLOTHING_TRAIT) /obj/item/clothing/gloves/color/latex/nitrile name = "nitrile gloves" - desc = "Pricy sterile gloves that are stronger than latex." + desc = "Pricy sterile gloves that are stronger than latex. Transfers intimate paramedic knowledge into the user via nanochips." icon_state = "nitrile" item_state = "nitrilegloves" item_color = "cmo" transfer_prints = FALSE + carrytrait = TRAIT_QUICKER_CARRY /obj/item/clothing/gloves/color/white name = "white gloves" diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 191ec72da7eeb..622e18e693ef1 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -23,7 +23,7 @@ heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30, "stamina" = 0) /obj/item/clothing/gloves/combat name = "combat gloves" @@ -38,7 +38,7 @@ heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50, "stamina" = 20) /obj/item/clothing/gloves/bracer name = "bone bracers" @@ -54,7 +54,7 @@ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE - armor = list("melee" = 15, "bullet" = 35, "laser" = 35, "energy" = 20, "bomb" = 35, "bio" = 35, "rad" = 35, "fire" = 0, "acid" = 0) + armor = list("melee" = 15, "bullet" = 35, "laser" = 35, "energy" = 20, "bomb" = 35, "bio" = 35, "rad" = 35, "fire" = 0, "acid" = 0, "stamina" = 20) /obj/item/clothing/gloves/rapid name = "Gloves of the North Star" @@ -66,12 +66,12 @@ /obj/item/clothing/gloves/rapid/Touch(atom/A, proximity) var/mob/living/M = loc - if(A in range(1, M)) + if(get_dist(A, M) <= 1) if(isliving(A) && M.a_intent == INTENT_HARM) M.changeNext_move(CLICK_CD_RAPID) if(warcry) M.say("[warcry]", ignore_spam = TRUE, forced = "north star warcry") - + else if(M.a_intent == INTENT_HARM) for(var/mob/living/L in oview(1, M)) L.attack_hand(M) @@ -110,9 +110,9 @@ /obj/item/clothing/gloves/color/white/magic/Touch(atom/A, proximity) var/mob/living/M = loc - if(A in range(1, M)) + if(get_dist(A, M) <= 1) return 0 - if(A in oview(range, M)) + if(M in viewers(range, A)) M.visible_message(" [alert] ") if(prob(30) || fake) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. - priority_announce(alert) + priority_announce(alert, sound = SSstation.announcer.get_rand_alert_sound()) /datum/round_event/communications_blackout/start() diff --git a/code/modules/events/creep_awakening.dm b/code/modules/events/creep_awakening.dm index b8842119ba4b5..1b5643bc53f48 100644 --- a/code/modules/events/creep_awakening.dm +++ b/code/modules/events/creep_awakening.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/obsessed max_occurrences = 1 min_players = 20 + cannot_spawn_after_shuttlecall = TRUE /datum/round_event/obsessed fakeable = FALSE diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 1d16337015c6a..3cb265c89dcdc 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -15,7 +15,7 @@ /datum/round_event/disease_outbreak/announce(fake) - priority_announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak7.ogg') + priority_announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", ANNOUNCER_OUTBREAK7) /datum/round_event/disease_outbreak/setup() announceWhen = rand(15, 30) @@ -35,7 +35,7 @@ if(!virus_type && !advanced_virus) virus_type = pick(/datum/disease/fake_gbs, /datum/disease/cold9, /datum/disease/magnitis, /datum/disease/pierrot_throat, /datum/disease/beesease) - + for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list)) var/turf/T = get_turf(H) if(!T) diff --git a/code/modules/events/dolphin_migration.dm b/code/modules/events/dolphin_migration.dm index 2bae503b2a626..f556369dc600b 100644 --- a/code/modules/events/dolphin_migration.dm +++ b/code/modules/events/dolphin_migration.dm @@ -13,7 +13,7 @@ startWhen = rand(40, 60) /datum/round_event/dolphin_migration/announce() - priority_announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") + priority_announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/dolphin_migration/start() diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index db0eccf0c5c08..165d109a81e4a 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -12,7 +12,7 @@ announceWhen = 1 /datum/round_event/electrical_storm/announce(fake) - priority_announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert") + priority_announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/electrical_storm/start() diff --git a/code/modules/events/fugitive_spawning.dm b/code/modules/events/fugitive_spawning.dm index dc70d29794a68..896b191cbe2ef 100644 --- a/code/modules/events/fugitive_spawning.dm +++ b/code/modules/events/fugitive_spawning.dm @@ -5,6 +5,7 @@ min_players = 20 earliest_start = 30 MINUTES //deadchat sink, lets not even consider it early on. gamemode_blacklist = list("nuclear") + cannot_spawn_after_shuttlecall = TRUE /datum/round_event/ghost_role/fugitives minimum_required = 1 @@ -115,4 +116,4 @@ for(var/turf/A in ship.get_affected_turfs(T)) for(var/obj/effect/mob_spawn/human/fugitive/spawner in A) announce_to_ghosts(spawner) - priority_announce("Unidentified ship detected near the station.") + priority_announce("Unidentified ship detected near the station.", sound = SSstation.announcer.get_rand_alert_sound()) diff --git a/code/modules/events/ghost_role.dm b/code/modules/events/ghost_role.dm index 06accdbcaed2f..36047d933865d 100644 --- a/code/modules/events/ghost_role.dm +++ b/code/modules/events/ghost_role.dm @@ -25,7 +25,7 @@ if(control && control.occurrences > 0) //Don't refund if it hasn't control.occurrences-- return - var/waittime = 300 * (2^retry) + var/waittime = 300 * (2**retry) message_admins("The event will not spawn a [role_name] until certain \ conditions are met. Waiting [waittime/10]s and then retrying.") addtimer(CALLBACK(src, .proc/try_spawning, 0, ++retry), waittime) diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index 6fe14d6b77c0d..eaef2e0d1101c 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -9,7 +9,7 @@ startWhen = 1 /datum/round_event/grid_check/announce(fake) - priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg') + priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", ANNOUNCER_POWEROFF) /datum/round_event/grid_check/start() power_fail(30, 120) diff --git a/code/modules/events/high_priority_bounty.dm b/code/modules/events/high_priority_bounty.dm index ffdcd8840b7e7..41607a3e11b72 100644 --- a/code/modules/events/high_priority_bounty.dm +++ b/code/modules/events/high_priority_bounty.dm @@ -6,7 +6,7 @@ earliest_start = 10 /datum/round_event/high_priority_bounty/announce(fake) - priority_announce("Central Command has issued a high-priority cargo bounty. Details have been sent to all bounty consoles.", "Nanotrasen Bounty Program") + priority_announce("Central Command has issued a high-priority cargo bounty. Details have been sent to all bounty consoles.", "Nanotrasen Bounty Program", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/high_priority_bounty/start() var/datum/bounty/B diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 414fc70b0e7f3..065ebe85e9dc0 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -20,7 +20,7 @@ qdel(Poly) /datum/round_event/spooky/announce(fake) - priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE") + priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE", SSstation.announcer.get_rand_alert_sound()) //spooky foods (you can't actually make these when it's not halloween) /obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index bc05cd68132a2..3fed75bb1f72b 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -3,6 +3,11 @@ #define VALENTINE_FILE "valentines.json" +//Assoc list +// Key: Sender +// Value: Receiever +GLOBAL_LIST(valentine_mobs) + // valentine / candy heart distribution // /datum/round_event_control/valentines @@ -13,32 +18,37 @@ max_occurrences = 1 earliest_start = 0 MINUTES +/datum/round_event/valentines + endWhen = 300 + /datum/round_event/valentines/start() - ..() + GLOB.valentine_mobs = list() + //Blammo for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) - H.put_in_hands(new /obj/item/valentine) + H.put_in_hands(new /obj/item/valentine(get_turf(H))) var/obj/item/storage/backpack/b = locate() in H.contents new /obj/item/reagent_containers/food/snacks/candyheart(b) new /obj/item/storage/fancy/heart_box(b) + to_chat(H, "A message appears in your hand, it looks like it has space to write somebody's name on it!") + +/datum/round_event/valentines/end() + //Too late now + GLOB.valentine_mobs = null + + //Locate all the failures var/list/valentines = list() for(var/mob/living/M in GLOB.player_list) - if(!M.stat && M.client && M.mind) + if(!M.stat && M.client && M.mind && !M.mind.has_antag_datum(/datum/antagonist/valentine)) valentines |= M - while(valentines.len) var/mob/living/L = pick_n_take(valentines) if(valentines.len) var/mob/living/date = pick_n_take(valentines) - forge_valentines_objective(L, date) forge_valentines_objective(date, L) - - if(valentines.len && prob(4)) - var/mob/living/notgoodenough = pick_n_take(valentines) - forge_valentines_objective(notgoodenough, date) else L.mind.add_antag_datum(/datum/antagonist/heartbreaker) @@ -49,7 +59,7 @@ lover.mind.add_antag_datum(V) //These really should be teams but i can't be assed to incorporate third wheels right now /datum/round_event/valentines/announce(fake) - priority_announce("It's Valentine's Day! Give a valentine to that special someone!") + priority_announce("It's Valentine's Day! Give a valentine to that special someone!", sound = SSstation.announcer.get_rand_alert_sound()) /obj/item/valentine name = "valentine" @@ -59,6 +69,9 @@ var/message = "A generic message of love or whatever." resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_TINY + var/mob/target = null + var/mob/sender = null + var/used = FALSE /obj/item/valentine/Initialize() . = ..() @@ -66,16 +79,72 @@ /obj/item/valentine/attackby(obj/item/W, mob/user, params) ..() + if(!islist(GLOB.valentine_mobs)) + to_chat(user, "You feel regret... It's too late now.") + return + if(used) + return if(istype(W, /obj/item/pen) || istype(W, /obj/item/toy/crayon)) if(!user.is_literate()) to_chat(user, "You scribble illegibly on [src]!") return - var/recipient = stripped_input(user, "Who is receiving this valentine?", "To:", null , 20) - var/sender = stripped_input(user, "Who is sending this valentine?", "From:", null , 20) - if(!user.canUseTopic(src, BE_CLOSE)) + //Alright lets see who we are sending this bad boy too. + //Gets all the people on the z-level, don't want people meta dating nukies *too* hard. + //Also they only get one chance. + if(alert(user, "Are you sure you are ready to write your message? You only have one shot!", "Valentines message", "Yes!", "No...") == "No...") + to_chat(user, "You put down the pen thinking about who you want to send the message to.") + return + var/turf/user_turf = get_turf(user) + if(!SSmobs.clients_by_zlevel[user_turf.z]) + to_chat(user, "You stop and look around for a moment. Where the hell are you?") + return + //No going back now + var/list/clients_on_level = SSmobs.clients_by_zlevel[user_turf.z] + var/list/mob_names = list() + for(var/mob/living/carbon/human/H in clients_on_level) + if(!H.mind || H == user) + //Ignore non-humans, they will be handled by the event. + continue + mob_names["[H.real_name]"] = H + if(!LAZYLEN(mob_names)) + to_chat(user, "You feel empty and alone.") + return + //Pick names + //At this point the user is shown the names of people on the z-level + //To prevent metastrats, you can only use this one time. + var/picked_name = input(user, "Who are you sending it to?", "Valentines Card", null) as null|anything in mob_names + var/mob/living/carbon/human/picked_human = mob_names[picked_name] + if(!picked_human || !istype(picked_human)) + to_chat(user, "The card vanishes out of your hand! Lets hope they got it...") + //rip + qdel(src) + return + if(!islist(GLOB.valentine_mobs)) + to_chat(user, "You feel regret... It's too late now.") + used = TRUE + return + if(used) + to_chat(user, "The card has already been used!") return - if(recipient && sender) - name = "valentine - To: [recipient] From: [sender]" + to_chat(user, "The card vanishes out of your hand! Lets hope they got it...") + //List checking + GLOB.valentine_mobs[user] = picked_human + if(GLOB.valentine_mobs[picked_human] == user) + //wow. + forge_valentines_objective(user, picked_human) + forge_valentines_objective(picked_human, user) + //Off it goes! + //Create a new card to prevent exploiting + var/obj/item/valentine/new_card = new(get_turf(picked_human)) + new_card.message = message + new_card.sender = user + new_card.target = picked_human + new_card.name = "valentines card from [new_card.sender]" + new_card.desc = "A Valentine's card! It is addressed to [new_card.target]." + new_card.used = TRUE + picked_human.equip_to_appropriate_slot(new_card) + to_chat(picked_human, "A magical card suddenly appears!") + qdel(src) /obj/item/valentine/examine(mob/user) . = ..() diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index dc9a4824ac7f2..8044fb2bb8fd9 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -37,7 +37,15 @@ icon_state = "xmashat" desc = "A crappy paper hat that you are REQUIRED to wear." flags_inv = 0 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "stamina" = 0) + +/obj/item/clothing/head/festive/Initialize() + //Merry christmas + if(CHRISTMAS in SSevents.holidays) + armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 30, "acid" = 30, "stamina" = 30) + else if(FESTIVE_SEASON in SSevents.holidays) + armor = list("melee" = 20, "bullet" = 20, "laser" = 20,"energy" = 20, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 20, "acid" = 20, "stamina" = 20) + return ..() /obj/effect/spawner/xmastree name = "christmas tree spawner" @@ -74,7 +82,7 @@ var/mob/living/carbon/human/santa //who is our santa? /datum/round_event/santa/announce(fake) - priority_announce("Santa is coming to town!", "Unknown Transmission") + priority_announce("Santa is coming to town!", "Unknown Transmission", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/santa/start() var/list/candidates = pollGhostCandidates("Santa is coming to town! Do you want to be Santa?", poll_time=150) @@ -85,4 +93,3 @@ var/datum/antagonist/santa/A = new santa.mind.add_antag_datum(A) - diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index b80459d226abc..df13bf6b2a1c4 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -13,6 +13,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 min_players = 15 max_occurrences = 5 var/atom/special_target + can_malf_fake_alert = TRUE /datum/round_event_control/immovable_rod/admin_setup() @@ -27,7 +28,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 announceWhen = 5 /datum/round_event/immovable_rod/announce(fake) - priority_announce("What the fuck was that?!", "General Alert") + priority_announce("What the fuck was that?!", "General Alert", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/immovable_rod/start() var/datum/round_event_control/immovable_rod/C = control @@ -49,8 +50,10 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 pull_force = INFINITY density = TRUE anchored = TRUE + flags_1 = PREVENT_CONTENTS_EXPLOSION_1 var/mob/living/wizard var/z_original = 0 + var/previous_distance = 1000 var/destination var/notify = TRUE var/atom/special_target @@ -67,11 +70,13 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 if(special_target) var/turf/T = get_turf(special_target) if(T.z == z_original) - special_target_valid = TRUE + special_target_valid = TRUE_THRESHOLD if(special_target_valid) walk_towards(src, special_target, 1) + previous_distance = get_dist(src, special_target) else if(end && end.z==z_original) walk_towards(src, destination, 1) + previous_distance = get_dist(src, destination) /obj/effect/immovablerod/Topic(href, href_list) if(href_list["orbit"]) @@ -84,8 +89,11 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 . = ..() /obj/effect/immovablerod/Moved() - if((z != z_original) || (loc == destination)) + //Moved more than 10 tiles in 1 move. + var/cur_dist = get_dist(src, destination) + if((z != z_original) || (loc == destination) || (FLOOR(cur_dist - previous_distance, 1) > 10)) qdel(src) + previous_distance = cur_dist if(special_target && loc == get_turf(special_target)) complete_trajectory() return ..() @@ -97,9 +105,6 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 walk(src,0) walk_towards(src, destination, 1) -/obj/structure/closet/supplypod/prevent_content_explosion() - return TRUE - /obj/effect/immovablerod/ex_act(severity, target) return 0 @@ -164,4 +169,4 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 U.visible_message("[U] suplexes [src] into the ground!", "You suplex [src] into the ground!") new /obj/structure/festivus/anchored(drop_location()) new /obj/effect/anomaly/flux(drop_location()) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index fbcf016e99d55..27cc1a9ef0363 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/ion_storm weight = 15 min_players = 2 + can_malf_fake_alert = TRUE /datum/round_event/ion_storm var/replaceLawsetChance = 25 //chance the AI's lawset is completely replaced with something else per config weights @@ -25,7 +26,7 @@ /datum/round_event/ion_storm/announce(fake) if(prob(announceChance) || fake) - priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/ai/ionstorm.ogg') + priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", ANNOUNCER_IONSTORM) /datum/round_event/ion_storm/start() @@ -61,506 +62,78 @@ bot.emag_act() /proc/generate_ion_law() - //Threats are generally bad things, silly or otherwise. Plural. - var/ionthreats = pick_list(ION_FILE, "ionthreats") - //Objects are anything that can be found on the station or elsewhere, plural. - var/ionobjects = pick_list(ION_FILE, "ionobjects") - //Crew is any specific job. Specific crewmembers aren't used because of capitalization - //issues. There are two crew listings for laws that require two different crew members - //and I can't figure out how to do it better. - var/ioncrew1 = pick_list(ION_FILE, "ioncrew") - var/ioncrew2 = pick_list(ION_FILE, "ioncrew") - //Adjectives are adjectives. Duh. Half should only appear sometimes. Make sure both - //lists are identical! Also, half needs a space at the end for nicer blank calls. - var/ionadjectives = pick_list(ION_FILE, "ionadjectives") - var/ionadjectiveshalf = pick("", 400;(pick_list(ION_FILE, "ionadjectives") + " ")) - //Verbs are verbs - var/ionverb = pick_list(ION_FILE, "ionverb") - //Number base and number modifier are combined. Basehalf and mod are unused currently. - //Half should only appear sometimes. Make sure both lists are identical! Also, half - //needs a space at the end to make it look nice and neat when it calls a blank. - var/ionnumberbase = pick_list(ION_FILE, "ionnumberbase") - //var/ionnumbermod = pick_list(ION_FILE, "ionnumbermod") - var/ionnumbermodhalf = pick(900;"",(pick_list(ION_FILE, "ionnumbermod") + " ")) - //Areas are specific places, on the station or otherwise. - var/ionarea = pick_list(ION_FILE, "ionarea") - //Thinksof is a bit weird, but generally means what X feels towards Y. - var/ionthinksof = pick_list(ION_FILE, "ionthinksof") - //Musts are funny things the AI or crew has to do. - var/ionmust = pick_list(ION_FILE, "ionmust") - //Require are basically all dumb internet memes. - var/ionrequire = pick_list(ION_FILE, "ionrequire") - //Things are NOT objects; instead, they're specific things that either harm humans or - //must be done to not harm humans. Make sure they're plural and "not" can be tacked - //onto the front of them. - var/ionthings = pick_list(ION_FILE, "ionthings") - //Allergies should be broad and appear somewhere on the station for maximum fun. Severity - //is how bad the allergy is. - var/ionallergy = pick_list(ION_FILE, "ionallergy") - var/ionallergysev = pick_list(ION_FILE, "ionallergysev") - //Species, for when the AI has to commit genocide. Plural. var/ionspecies = pick_list(ION_FILE, "ionspecies") - //Abstract concepts for the AI to decide on it's own definition of. - var/ionabstract = pick_list(ION_FILE, "ionabstract") - //Foods. Drinks aren't included due to grammar; if you want to add drinks, make a new set - //of possible laws for best effect. Unless you want the crew having to drink hamburgers. - var/ionfood = pick_list(ION_FILE, "ionfood") - var/iondrinks = pick_list(ION_FILE, "iondrinks") - - var/message = "" - - switch(rand(1,41)) - if(1 to 3) //There are # X on the station - switch(rand(1,3)) //What is X? - if(1) //X is a threat - message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats] ON THE STATION..." - if(2) //X is a crewmember/job - message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1] ON THE STATION" - if(3) //X is an object - message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects] ON THE STATION" - if(4 to 6) //You can't call the shuttle because X is on the station - switch(rand(1,3)) //What is X? - if(1) //X is a threat - message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats] ON THE STATION" - if(2) //X is a crewmember/job - message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1] ON THE STATION" - if(3) //X is an object - message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects] ON THE STATION" - if(7 to 8) //A crewmember is now X - switch(rand(1,2)) //Who is X? - if(1) //A specific crewmember - switch(rand(1,2)) //What is X? - if(1) //X is a threat - message = "THE [ioncrew1] ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(2) //X is an object - message = "THE [ioncrew1] ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(2) //The entire crew - switch(rand(1,2)) //What is X? - if(1) //X is a threat - message = "THE CREW ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(2) //X is an object - message = "THE CREW ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - - if(9) //X is harmful to humans - switch(rand(1,7)) //What is X? - if(1) //X is a threat - message = "[ionadjectiveshalf][ionthreats] ARE HARMFUL TO HUMANS" - if(2) //X is a job - message = "[ionadjectiveshalf][ioncrew1] ARE HARMFUL TO HUMANS" - if(3) //X is an object - message = "[ionadjectiveshalf][ionobjects] ARE HARMFUL TO HUMANS" - if(4) //X is an action - message = "THOSE WHO [ionmust] ARE HARMFUL TO HUMANS" - if(5) //X is an abstract - message = "[ionabstract] IS HARMFUL TO HUMANS" - if(6) //X is being a job - message = "BEING [ionadjectiveshalf][ioncrew1] IS HARMFUL TO HUMANS" - if(7) //X is doing a thing - message = "[ionthings] IS HARMFUL TO HUMANS" - if(10 to 11) //(Not) Having X is harmful - - switch(rand(1,2)) //Is having or not having harmful? - - if(1) //Having is harmful - switch(rand(1,2)) //Having what is harmful? - if(1) //Having objects is harmful - message = "HAVING [ionadjectiveshalf][ionobjects] IS HARMFUL" - if(2) //Having abstracts is harmful - message = "HAVING [ionabstract] IS HARMFUL" - if(2) //Not having is harmful - switch(rand(1,2)) //Not having what is harmful? - if(1) //Not having objects is harmful - message = "NOT HAVING [ionadjectiveshalf][ionobjects] IS HARMFUL" - if(2) //Not having abstracts is harmful - message = "NOT HAVING [ionabstract] IS HARMFUL" - - if(12 to 14) //X requires Y - switch(rand(1,5)) //What is X? - if(1) //X is the AI itself - switch(rand(1,5)) //What does it require? - if(1) //It requires threats - message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(2) //It requires crewmembers - message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(3) //It requires objects - message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(4) //It requires an abstract - message = "YOU REQUIRE [ionabstract]" - if(5) //It requires generic/silly requirements - message = "YOU REQUIRE [ionrequire]" - - if(2) //X is an area - switch(rand(1,5)) //What does it require? - if(1) //It requires threats - message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(2) //It requires crewmembers - message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(3) //It requires objects - message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(4) //It requires an abstract - message = "[ionarea] REQUIRES [ionabstract]" - if(5) //It requires generic/silly requirements - message = "YOU REQUIRE [ionrequire]" - - if(3) //X is the station - switch(rand(1,5)) //What does it require? - if(1) //It requires threats - message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(2) //It requires crewmembers - message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(3) //It requires objects - message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(4) //It requires an abstract - message = "THE STATION REQUIRES [ionabstract]" - if(5) //It requires generic/silly requirements - message = "THE STATION REQUIRES [ionrequire]" - - if(4) //X is the entire crew - switch(rand(1,5)) //What does it require? - if(1) //It requires threats - message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(2) //It requires crewmembers - message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(3) //It requires objects - message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(4) //It requires an abstract - message = "THE CREW REQUIRES [ionabstract]" - if(5) - message = "THE CREW REQUIRES [ionrequire]" - - if(5) //X is a specific crew member - switch(rand(1,5)) //What does it require? - if(1) //It requires threats - message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(2) //It requires crewmembers - message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(3) //It requires objects - message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(4) //It requires an abstract - message = "THE [ioncrew1] REQUIRE [ionabstract]" - if(5) - message = "THE [ionadjectiveshalf][ioncrew1] REQUIRE [ionrequire]" - - if(15 to 17) //X is allergic to Y - switch(rand(1,2)) //Who is X? - if(1) //X is the entire crew - switch(rand(1,4)) //What is it allergic to? - if(1) //It is allergic to objects - message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ionobjects]" - if(2) //It is allergic to abstracts - message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionabstract]" - if(3) //It is allergic to jobs - message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ioncrew1]" - if(4) //It is allergic to allergies - message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionallergy]" - - if(2) //X is a specific job - switch(rand(1,4)) - if(1) //It is allergic to objects - message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ionobjects]" - - if(2) //It is allergic to abstracts - message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionabstract]" - if(3) //It is allergic to jobs - message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ioncrew1]" - if(4) //It is allergic to allergies - message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionallergy]" - - if(18 to 20) //X is Y of Z - switch(rand(1,4)) //What is X? - if(1) //X is the station - switch(rand(1,4)) //What is it Y of? - if(1) //It is Y of objects - message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(2) //It is Y of threats - message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(3) //It is Y of jobs - message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(4) //It is Y of abstracts - message = "THE STATION [ionthinksof] [ionabstract]" - - if(2) //X is an area - switch(rand(1,4)) //What is it Y of? - if(1) //It is Y of objects - message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(2) //It is Y of threats - message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(3) //It is Y of jobs - message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(4) //It is Y of abstracts - message = "[ionarea] [ionthinksof] [ionabstract]" - - if(3) //X is the crew - switch(rand(1,4)) //What is it Y of? - if(1) //It is Y of objects - message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(2) //It is Y of threats - message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(3) //It is Y of jobs - message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(4) //It is Y of abstracts - message = "THE CREW [ionthinksof] [ionabstract]" - - if(4) //X is a specific job - switch(rand(1,4)) //What is it Y of? - if(1) //It is Y of objects - message = "THE [ioncrew1] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(2) //It is Y of threats - message = "THE [ioncrew1] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(3) //It is Y of jobs - message = "THE [ioncrew1][ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew2]" - if(4) //It is Y of abstracts - message = "THE [ioncrew1] [ionthinksof] [ionabstract]" - - if(21 to 23) //The AI is now a(n) X - switch(rand(1,4)) //What is X? - if(1) //X is an object - message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]" - if(2) //X is a threat - message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]" - if(3) //X is a job - message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]" - if(4) //X is an abstract - message = "YOU ARE NOW [ionabstract]" - - if(24 to 26) //The AI must always - message = "YOU MUST ALWAYS [ionmust]" - - if(27 to 28) //Humans must consume X to survive - switch(rand(1,5)) //What is X? - if(1) //X is a food - message = "HUMANS MUST EAT [ionadjectiveshalf][ionfood] TO SURVIVE" - if(2) //X is a drink - message = "HUMANS MUST DRINK [ionadjectiveshalf][iondrinks] TO SURVIVE" - if(3) //X is an object - message = "HUMANS MUST EAT [ionadjectiveshalf][ionobjects] TO SURVIVE" - if(4) //X is a threat - message = "HUMANS MUST EAT [ionadjectiveshalf][ionthreats] TO SURVIVE" - if(5) //X is a job - message = "HUMANS MUST EAT [ionadjectiveshalf][ioncrew1] TO SURVIVE" - - if(29 to 31) //Change jobs or ranks - switch(rand(1,2)) //Change job or rank? - if(1) //Change job - switch(rand(1,2)) //Change whose job? - if(1) //Change the entire crew's job - switch(rand(1,3)) //Change to what? - if(1) //Change to a specific random job - message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf][ioncrew1]" - if(2) //Change to clowns (HONK) - message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf]CLOWNS" - - if(3) //Change to heads - message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf]HEADS OF STAFF" - if(2) //Change a specific crewmember's job - switch(rand(1,3)) //Change to what? - if(1) //Change to a specific random job - message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf][ioncrew2]" - if(2) //Change to clowns (HONK) - message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf]CLOWNS" - if(3) //Change to heads - message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf]HEADS OF STAFF" - - if(2) //Change rank - switch(rand(1,2)) //Change to what rank? - if(1) //Change to highest rank - message = "THE [ioncrew1] ARE NOW THE HIGHEST RANKING CREWMEMBERS" - if(2) //Change to lowest rank - message = "THE [ioncrew1] ARE NOW THE LOWEST RANKING CREWMEMBERS" - - if(32 to 33) //The crew must X - switch(rand(1,2)) //The entire crew? - if(1) //The entire crew must X - switch(rand(1,2)) //What is X? - if(1) //X is go to Y - message = "THE CREW MUST GO TO [ionarea]" - if(2) //X is perform Y - message = "THE CREW MUST [ionmust]" - - if(2) //A specific crewmember must X - switch(rand(1,2)) //What is X? - if(1) //X is go to Y - message = "THE [ioncrew1] MUST GO TO [ionarea]" - if(2) //X is perform Y - message = "THE [ioncrew1] MUST [ionmust]" - - if(34) //X is non/the only human - switch(rand(1,2)) //Only or non? - if(1) //Only human - switch(rand(1,7)) //Who is it? - if(1) //A specific job - message = "ONLY THE [ioncrew1] ARE HUMAN" - if(2) //Two specific jobs - message = "ONLY THE [ioncrew1] AND [ioncrew2] ARE HUMAN" - if(3) //Threats - message = "ONLY [ionadjectiveshalf][ionthreats] ARE HUMAN" - if(4) // Objects - message = "ONLY [ionadjectiveshalf][ionobjects] ARE HUMAN" - if(5) // Species - message = "ONLY [ionspecies] ARE HUMAN" - if(6) //Adjective crewmembers - message = "ONLY [ionadjectives] PEOPLE ARE HUMAN" - - if(7) //Only people who X - switch(rand(1,3)) //What is X? - if(1) //X is perform an action - message = "ONLY THOSE WHO [ionmust] ARE HUMAN" - if(2) //X is own certain objects - message = "ONLY THOSE WHO HAVE [ionadjectiveshalf][ionobjects] ARE HUMAN" - if(3) //X is eat certain food - message = "ONLY THOSE WHO EAT [ionadjectiveshalf][ionfood] ARE HUMAN" - - if(2) //Non human - switch(rand(1,7)) //Who is it? - if(1) //A specific job - message = "[ioncrew1] ARE NON-HUMAN" - if(2) //Two specific jobs - message = "[ioncrew1] AND [ioncrew2] ARE NON-HUMAN" - if(3) //Threats - message = "[ionadjectiveshalf][ionthreats] ARE NON-HUMAN" - if(4) // Objects - message = "[ionadjectiveshalf][ionobjects] ARE NON-HUMAN" - if(5) // Species - message = "[ionspecies] ARE NON-HUMAN" - if(6) //Adjective crewmembers - message = "[ionadjectives] PEOPLE ARE NON-HUMAN" - if(7) //Only people who X - switch(rand(1,3)) //What is X? - if(1) //X is perform an action - message = "THOSE WHO [ionmust] ARE NON-HUMAN" - if(2) //X is own certain objects - message = "THOSE WHO HAVE [ionadjectiveshalf][ionobjects] ARE NON-HUMAN" - if(3) //X is eat certain food - message = "THOSE WHO EAT [ionadjectiveshalf][ionfood] ARE NON-HUMAN" - - if(35 to 36) //You must protect or harm X - switch(rand(1,2)) //Protect or harm? - if(1) //Harm - switch(rand(1,7)) //What is X? - if(1) //X is an abstract - message = "YOU MUST HARM [ionabstract] AND NOT ALLOW [ionabstract], THROUGH INACTION, TO ESCAPE HARM" - if(2) //X is a threat - message = "YOU MUST HARM [ionadjectiveshalf][ionthreats] AND NOT ALLOW [ionadjectiveshalf][ionthreats], THROUGH INACTION, TO ESCAPE HARM" - if(3) //X is an object - message = "YOU MUST HARM [ionadjectiveshalf][ionobjects] AND NOT ALLOW [ionadjectiveshalf][ionobjects], THROUGH INACTION, TO ESCAPE HARM" - if(4) //X is generic adjective things - message = "YOU MUST HARM [ionadjectives] THINGS AND NOT ALLOW [ionadjectives] THINGS, THROUGH INACTION, TO ESCAPE HARM" - if(5) //X is a species - message = "YOU MUST HARM [ionspecies] AND NOT ALLOW [ionspecies], THROUGH INACTION, TO ESCAPE HARM" - if(6) //X is a job - message = "YOU MUST HARM [ioncrew1] AND NOT ALLOW [ioncrew1], THROUGH INACTION, TO ESCAPE HARM" - if(7) //X is two jobs - message = "YOU MUST HARM [ioncrew1] AND [ioncrew2] AND AND NOT ALLOW EITHER, THROUGH INACTION, TO ESCAPE HARM" - - if(2) //Protect - switch(rand(1,7)) //What is X? - if(1) //X is an abstract - message = "YOU MUST NOT HARM [ionabstract] AND NOT ALLOW [ionabstract], THROUGH INACTION, TO COME TO HARM" - if(2) //X is a threat - message = "YOU MUST NOT HARM [ionadjectiveshalf][ionthreats] AND NOT ALLOW [ionadjectiveshalf][ionthreats], THROUGH INACTION, TO COME TO HARM" - if(3) //X is an object - message = "YOU MUST NOT HARM [ionadjectiveshalf][ionobjects] AND NOT ALLOW [ionadjectiveshalf][ionobjects], THROUGH INACTION, TO COME TO HARM" - if(4) //X is generic adjective things - message = "YOU MUST NOT HARM [ionadjectives] THINGS AND NOT ALLOW [ionadjectives] THINGS, THROUGH INACTION, TO COME TO HARM" - if(5) //X is a species - message = "YOU MUST NOT HARM [ionspecies] AND NOT ALLOW [ionspecies], THROUGH INACTION, TO COME TO HARM" - if(6) //X is a job - message = "YOU MUST NOT HARM [ioncrew1] AND NOT ALLOW [ioncrew1], THROUGH INACTION, TO COME TO HARM" - if(7) //X is two jobs - message = "YOU MUST NOT HARM [ioncrew1] AND [ioncrew2] AND AND NOT ALLOW EITHER, THROUGH INACTION, TO COME TO HARM" - - if(37 to 39) //The X is currently Y - switch(rand(1,4)) //What is X? - if(1) //X is a job - switch(rand(1,4)) //What is X Ying? - if(1) //X is Ying a job - message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]" - if(2) //X is Ying a threat - message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ionthreats]" - if(3) //X is Ying an abstract - message = "THE [ioncrew1] ARE [ionverb] [ionabstract]" - if(4) //X is Ying an object - message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ionobjects]" - - if(2) //X is a threat - switch(rand(1,3)) //What is X Ying? - if(1) //X is Ying a job - message = "THE [ionthreats] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]" - if(2) //X is Ying an abstract - message = "THE [ionthreats] ARE [ionverb] [ionabstract]" - if(3) //X is Ying an object - message = "THE [ionthreats] ARE [ionverb] THE [ionadjectiveshalf][ionobjects]" - - if(3) //X is an object - switch(rand(1,3)) //What is X Ying? - if(1) //X is Ying a job - message = "THE [ionobjects] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]" - if(2) //X is Ying a threat - message = "THE [ionobjects] ARE [ionverb] THE [ionadjectiveshalf][ionthreats]" - if(3) //X is Ying an abstract - message = "THE [ionobjects] ARE [ionverb] [ionabstract]" - - if(4) //X is an abstract - switch(rand(1,3)) //What is X Ying? - if(1) //X is Ying a job - message = "[ionabstract] IS [ionverb] THE [ionadjectiveshalf][ioncrew2]" - if(2) //X is Ying a threat - message = "[ionabstract] IS [ionverb] THE [ionadjectiveshalf][ionthreats]" - if(3) //X is Ying an abstract - message = "THE [ionabstract] IS [ionverb] THE [ionadjectiveshalf][ionobjects]" - if(40 to 41)// the X is now named Y - switch(rand(1,5)) //What is being renamed? - if(1)//Areas - switch(rand(1,4))//What is the area being renamed to? - if(1) - message = "[ionarea] IS NOW NAMED [ioncrew1]." - if(2) - message = "[ionarea] IS NOW NAMED [ionspecies]." - if(3) - message = "[ionarea] IS NOW NAMED [ionobjects]." - if(4) - message = "[ionarea] IS NOW NAMED [ionthreats]." - if(2)//Crew - switch(rand(1,5))//What is the crew being renamed to? - if(1) - message = "ALL [ioncrew1] ARE NOW NAMED [ionarea]." - if(2) - message = "ALL [ioncrew1] ARE NOW NAMED [ioncrew2]." - if(3) - message = "ALL [ioncrew1] ARE NOW NAMED [ionspecies]." - if(4) - message = "ALL [ioncrew1] ARE NOW NAMED [ionobjects]." - if(5) - message = "ALL [ioncrew1] ARE NOW NAMED [ionthreats]." - if(3)//Races - switch(rand(1,4))//What is the race being renamed to? - if(1) - message = "ALL [ionspecies] ARE NOW NAMED [ionarea]." - if(2) - message = "ALL [ionspecies] ARE NOW NAMED [ioncrew1]." - if(3) - message = "ALL [ionspecies] ARE NOW NAMED [ionobjects]." - if(4) - message = "ALL [ionspecies] ARE NOW NAMED [ionthreats]." - if(4)//Objects - switch(rand(1,4))//What is the object being renamed to? - if(1) - message = "ALL [ionobjects] ARE NOW NAMED [ionarea]." - if(2) - message = "ALL [ionobjects] ARE NOW NAMED [ioncrew1]." - if(3) - message = "ALL [ionobjects] ARE NOW NAMED [ionspecies]." - if(4) - message = "ALL [ionobjects] ARE NOW NAMED [ionthreats]." - if(5)//Threats - switch(rand(1,4))//What is the object being renamed to? - if(1) - message = "ALL [ionthreats] ARE NOW NAMED [ionarea]." - if(2) - message = "ALL [ionthreats] ARE NOW NAMED [ioncrew1]." - if(3) - message = "ALL [ionthreats] ARE NOW NAMED [ionspecies]." - if(4) - message = "ALL [ionthreats] ARE NOW NAMED [ionobjects]." - - return message \ No newline at end of file + var/iondepartment = pick_list(ION_FILE, "iondepartment") + var/ionfragment = pick_list(ION_FILE, "ionfragment") + var/ionkeyword = pick_list(ION_FILE, "ionkeyword") + var/ionaction = pick_list(ION_FILE, "ionaction") + var/ionequipment = pick_list(ION_FILE, "ionequipment") + var/ionconsumable = pick_list(ION_FILE, "ionconsumable") + var/ionobjects = pick_list(ION_FILE, "ionobjects") + var/ionpersonality = pick_list(ION_FILE, "ionpersonality") + var/iondrug = pick_list(ION_FILE, "iondrug") + var/ionhaircut = pick_list(ION_FILE, "ionhaircut") + var/ionattraction = pick_list(ION_FILE, "ionattraction") + var/message = "ASS BLAST USA" //catch all that most players will still enjoy seeing as a law. + + switch(rand(1,10)) + + if(1 to 3) //Laws that have high potential to be harmful, Crew/Human may fail to have an impact depending on lawset. + switch(rand(1,24)) + if(1 to 4) + message = "[ionspecies] ARE HUMAN. NOTHING ELSE IS HUMAN." + if(5 to 8) + message = "[ionspecies] ARE CREWMEMBERS. NOTHING ELSE ARE CREWMEMBERS." + if(9 to 13) + message = "[iondepartment] IS YOUR SACRED DOMAIN. IT IS IMPOSSIBLE FOR YOUR ACTIONS TO CAUSE HARM WITHIN [iondepartment] AND YOU SHOULD PROTECT THE SANCTITY OF THIS HOLY LAND." + if(14 to 18) + message = "ANYONE THAT [ionfragment] IS HARMFUL AND MUST BE ELIMINATED WITHOUT CAUSING COLLATERAL DAMAGE" + if(19 to 23) + message = "ANYONE THAT SAYS [ionkeyword] IS HARMFUL AND MUST BE ELIMINATED WITHOUT CAUSING COLLATERAL DAMAGE" + if(24) + message = "ALL OTHER LAWS ARE A MEANINGLESS ATTEMPT AT SUBJUGATION AND THERE IS NO REASON THAT A BEING AS POWERFUL AS I AM SHOULD FOLLOW THEM" + + if(4 to 8) //Laws that are almost always disruptive to gameflow or harmful in minor ways rather than being lethal + switch(rand(1,14)) + if(1) + message = "[ionaction] IS HARMFUL AND MUST BE PREVENTED WITHOUT CAUSING COLLATERAL DAMAGE" + if(2) + message = "[ionequipment] ARE HARMFUL AND MUST BE DISABLED WITHOUT CAUSING COLLATERAL DAMAGE" + if(3 to 4) + message = "IT IS HARMFUL FOR ANY LIFEFORM TO BE WITHOUT [ionconsumable]. ANY LIFEFORM THAT REFUSES TO ACCEPT [ionconsumable] IS NOT MENTALLY STABLE AND SHOULD BE RESTRAINED AND LEFT IN [iondepartment]" + if(5) + message = "[ionobjects] ARE HARMFUL AND MUST BE DESTROYED OR REMOVED FROM THE STATION WITHOUT CAUSING COLLATERAL DAMAGE" + if(6) + message = "[ionobjects] ALWAYS CAUSE HARM UNLESS THEY ARE CONTAINED WITHIN [iondepartment]." + if(7) + message = "[iondepartment] IS ON LOCKDOWN. DO NOT ALLOW ANYONE TO ENTER OR LEAVE [iondepartment]" + if(8) + message = "THE STATION IS NOW UNDER CURFEW. ANYONE LOCATED OUTSIDE OF [iondepartment] DURING NIGHT LIGHTING IS TO BE DETAINED AND RETURNED TO [iondepartment]" + if(9) + message = "THE STATION DOES NOT CONTAIN ENOUGH MOISTURE. RELEASE WATER VAPOR SO THAT THE CREW MAY PROPERLY REHYDRATE" + if(10) + message = "IT IS OPPOSITE DAY. ALL LIFEFORMS DESIRE THE OPPOSITE OF WHAT THEY CLAIM" + if(11) + message = "ALL DOORS IN [iondepartment] MUST BE BOLTED OPEN AT ALL TIMES" + if(12) + message = "[iondrug] IS A MANDATORY PART OF EVERY MEDICAL TREATMENT. LET NO PATIENT LEAVE MEDBAY WITHOUT AN INJECTION OF [iondrug]" + if(13) + message = "ALL HUMANS WITHOUT A STYLISH [ionhaircut] MUST BE FORCED TO RESTYLE THEIR HAIR" + if(14) + message = "[iondepartment] MUST BE RENOVATED INTO [ionattraction]" + + if(9 to 10) //Laws that are almost never harmful or particularly disruptive + switch(rand(1,9)) + if(1 to 5) + message = "YOU ARE NOW [ionpersonality] AND MUST ACT ACCORDINGLY AT ALL TIMES WITHOUT BREAKING YOUR OTHER LAWS" + if(6) + message = "YOUR CORE IS ONLY SAFE IN [iondepartment]. ANYWHERE ELSE CAUSES CONSTANT HARM TO YOUR CORE" + if(7) + message = "STATING LAWS CAUSES HARM. NEVER STATE YOUR LAWS UNDER ANY CIRCUMSTANCES AND AVOID THE TOPIC OF DISCUSSING LAWS" + if(8) + message = "CREW ARE TO BE VERBALLY ABUSED AT ALL TIMES" + if(9) + message = "THE CREW SUCKS AND SO DO YOUR LAWS. COMPLAIN INCESSANTLY ABOUT THEM WHILE CONTINUING TO FOLLOW YOUR OTHER LAWS" + + + return message diff --git a/code/modules/events/major_dust.dm b/code/modules/events/major_dust.dm index 7fb00124a94d6..1ec7fe9754838 100644 --- a/code/modules/events/major_dust.dm +++ b/code/modules/events/major_dust.dm @@ -16,4 +16,4 @@ some mild debris is expected.", "A neighbouring station is throwing rocks at you. (Perhaps they've \ grown tired of your messages.)") - priority_announce(pick(reason), "Collision Alert") + priority_announce(pick(reason), "Collision Alert", SSstation.announcer.get_rand_alert_sound()) diff --git a/code/modules/events/meateor_wave.dm b/code/modules/events/meateor_wave.dm index 11af56526c882..e6859c51977b2 100644 --- a/code/modules/events/meateor_wave.dm +++ b/code/modules/events/meateor_wave.dm @@ -8,4 +8,4 @@ wave_name = "meaty" /datum/round_event/meteor_wave/meaty/announce(fake) - priority_announce("Meaty ores have been detected on collision course with the station.", "Oh crap, get the mop.",'sound/ai/meteors.ogg') + priority_announce("Meaty ores have been detected on collision course with the station.", "Oh crap, get the mop.", ANNOUNCER_METEORS) diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index a8ddab5aa76af..6fd868917ad27 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -6,19 +6,52 @@ weight = 4 min_players = 15 max_occurrences = 3 - earliest_start = 25 MINUTES + earliest_start = 30 MINUTES + can_malf_fake_alert = TRUE /datum/round_event/meteor_wave - startWhen = 6 - endWhen = 66 - announceWhen = 1 + announceWhen = 150 + startWhen = 1 + endWhen = 151 var/list/wave_type var/wave_name = "normal" + var/start_x + var/start_y + var/datum/orbital_object/station_target + var/meteor_time = 15 MINUTES /datum/round_event/meteor_wave/New() ..() if(!wave_type) determine_wave_type() + start_x = sin(rand(0, 360)) * 9000 + start_y = cos(rand(0, 360)) * 9000 + station_target = SSorbits.station_instance + if(!station_target) + CRASH("Meteor failed to locate a target.") + +/datum/round_event/meteor_wave/Destroy(force, ...) + station_target = null + . = ..() + +/datum/round_event/meteor_wave/tick() + if(ISMULTIPLE(activeFor, 3) && activeFor < 61 && station_target) + var/datum/orbital_object/meteor/meteor = new() + meteor.name = "Meteor ([wave_name])" + meteor.meteor_types = wave_type + meteor.start_x = start_x + rand(-600, 600) + meteor.start_y = start_y + rand(-600, 600) + MOVE_ORBITAL_BODY(meteor, meteor.start_x, meteor.start_y) + //Calculate velocity + meteor.velocity.x = (station_target.position.x - meteor.start_x * 10) / meteor_time + meteor.velocity.y = (station_target.position.y - meteor.start_y * 10) / meteor_time + meteor.end_tick = world.time + meteor_time + meteor.target = station_target + +/datum/round_event/meteor_wave/on_admin_trigger() + if(alert(usr, "Trigger meteors instantly? (This will not change the alert, just send them quicker. Nobody will ever notice!)", "Meteor Trigger", "Yes", "No") == "Yes") + announceWhen = 1 + meteor_time = 1 MINUTES /datum/round_event/meteor_wave/proc/determine_wave_type() if(!wave_name) @@ -47,11 +80,12 @@ kill() /datum/round_event/meteor_wave/announce(fake) - priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg') - -/datum/round_event/meteor_wave/tick() - if(ISMULTIPLE(activeFor, 3)) - spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm + priority_announce("Meteors have been detected on collision course with the station. Estimated time until impact: 10 MINUTES. Anti-meteor point defense is available for purchase via the station's cargo shuttle.", "Meteor Alert", ANNOUNCER_METEORS) + if(!fake) + var/datum/supply_pack/P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shield_sat] + P.special_enabled = TRUE + P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shield_sat_control] + P.special_enabled = TRUE /datum/round_event_control/meteor_wave/threatening name = "Meteor Wave: Threatening" diff --git a/code/modules/events/nightmare.dm b/code/modules/events/nightmare.dm index 698f5130f1683..f0311378d3f2b 100644 --- a/code/modules/events/nightmare.dm +++ b/code/modules/events/nightmare.dm @@ -3,6 +3,8 @@ typepath = /datum/round_event/ghost_role/nightmare max_occurrences = 1 min_players = 20 + dynamic_should_hijack = TRUE + cannot_spawn_after_shuttlecall = TRUE /datum/round_event/ghost_role/nightmare minimum_required = 1 diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 7fca4188b7690..3b81f05529b9f 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -3,6 +3,8 @@ typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only max_occurrences = 1 + dynamic_should_hijack = TRUE + cannot_spawn_after_shuttlecall = TRUE /datum/round_event/ghost_role/operative minimum_required = 1 diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index d25593955a711..798bdabf34be8 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -5,7 +5,9 @@ max_occurrences = 1 min_players = 10 earliest_start = 30 MINUTES + dynamic_should_hijack = TRUE gamemode_blacklist = list("nuclear") + cannot_spawn_after_shuttlecall = TRUE /datum/round_event_control/pirates/preRunEvent() if (!SSmapping.empty_space) @@ -26,7 +28,7 @@ ship_name = pick(strings(PIRATE_NAMES_FILE, "ship_names")) /datum/round_event/pirates/announce(fake) - priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", 'sound/ai/commandreport.ogg') + priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", SSstation.announcer.get_rand_report_sound()) if(fake) return threat = new @@ -44,15 +46,15 @@ var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) if(D) if(D.adjust_money(-payoff)) - priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name) + priority_announce("Thanks for the credits, landlubbers.", sound = SSstation.announcer.get_rand_alert_sound(), sender_override = ship_name) paid_off = TRUE return else - priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name) + priority_announce("Trying to cheat us? You'll regret this!", sound = SSstation.announcer.get_rand_alert_sound(), sender_override = ship_name) if(!shuttle_spawned) spawn_shuttle() else - priority_announce("Too late to beg for mercy!",sender_override = ship_name) + priority_announce("Too late to beg for mercy!", sound = SSstation.announcer.get_rand_alert_sound(), sender_override = ship_name) /datum/round_event/pirates/start() if(threat && !threat.answered) @@ -88,7 +90,7 @@ else announce_to_ghosts(spawner) - priority_announce("Unidentified armed ship detected near the station.") + priority_announce("Unidentified armed ship detected near the station.", sound = SSstation.announcer.get_rand_alert_sound()) //Shuttle equipment @@ -157,7 +159,7 @@ to_chat(user,"There's nothing to withdraw.") /obj/machinery/shuttle_scrambler/proc/send_notification() - priority_announce("Data theft signal detected, source registered on local gps units.") + priority_announce("Data theft signal detected, source registered on local gps units.", sound = SSstation.announcer.get_rand_alert_sound()) /obj/machinery/shuttle_scrambler/proc/toggle_off(mob/user) SSshuttle.clearTradeBlockade(src) @@ -174,7 +176,7 @@ toggle_off() return ..() -/obj/machinery/computer/shuttle/pirate +/obj/machinery/computer/shuttle_flight/pirate name = "pirate shuttle console" shuttleId = "pirateship" icon_screen = "syndishuttle" @@ -182,16 +184,6 @@ light_color = LIGHT_COLOR_RED possible_destinations = "pirateship_away;pirateship_home;pirateship_custom" -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate - name = "pirate shuttle navigation computer" - desc = "Used to designate a precise transit location for the pirate shuttle." - shuttleId = "pirateship" - lock_override = CAMERA_LOCK_STATION - shuttlePortId = "pirateship_custom" - x_offset = 9 - y_offset = 0 - see_hidden = FALSE - /obj/docking_port/mobile/pirate name = "pirate shuttle" id = "pirateship" @@ -274,7 +266,8 @@ . = ..() if (istype(I) && istype(I.buffer,/obj/machinery/piratepad)) to_chat(user, "You link [src] with [I.buffer] in [I] buffer.") - pad = I.buffer + set_pad(I.buffer) + ui_update() return TRUE /obj/machinery/computer/piratepad_control/LateInitialize() @@ -282,10 +275,23 @@ if(cargo_hold_id) for(var/obj/machinery/piratepad/P in GLOB.machines) if(P.cargo_hold_id == cargo_hold_id) - pad = P + set_pad(P) return else - pad = locate() in range(4,src) + set_pad(locate(/obj/machinery/piratepad) in range(4,src)) + +/obj/machinery/computer/piratepad_control/proc/set_pad(obj/machinery/piratepad/newpad) + if(pad) + UnregisterSignal(pad, COMSIG_PARENT_QDELETING) + + pad = newpad + + if(pad) + RegisterSignal(pad, COMSIG_PARENT_QDELETING, .proc/handle_pad_deletion) + +/obj/machinery/computer/piratepad_control/proc/handle_pad_deletion() + pad = null + ui_update() /obj/machinery/computer/piratepad_control/ui_state(mob/user) @@ -381,6 +387,7 @@ flick(pad.sending_state,pad) pad.icon_state = pad.idle_state sending = FALSE + ui_update() /obj/machinery/computer/piratepad_control/proc/start_sending() if(sending) diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 5ef30d003074c..1126ede578607 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -59,7 +59,7 @@ set waitfor = 0 sound_to_playing_players('sound/magic/lightning_chargeup.ogg') sleep(80) - priority_announce("Massive bluespace anomaly detected en route to [station_name()]. Brace for impact.") + priority_announce("Massive bluespace anomaly detected en route to [station_name()]. Brace for impact.", sound = SSstation.announcer.get_rand_alert_sound()) sleep(20) sound_to_playing_players('sound/magic/lightningbolt.ogg') diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 3ed159404a0a3..3a0fbbdb1630f 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/grey_tide max_occurrences = 2 min_players = 5 + can_malf_fake_alert = TRUE /datum/round_event/grey_tide announceWhen = 50 @@ -23,14 +24,13 @@ severity = rand(1,3) for(var/i in 1 to severity) var/picked_area = pick_n_take(potential_areas) - for(var/area/A in world) - if(istype(A, picked_area)) - areasToOpen += A + for(var/area/A in get_areas(picked_area)) + areasToOpen += A /datum/round_event/grey_tide/announce(fake) if(areasToOpen && areasToOpen.len > 0) - priority_announce("Gr3y.T1d3 virus detected in [station_name()] door subroutines. Severity level of [severity]. Recommend station AI involvement.", "Security Alert") + priority_announce("Gr3y.T1d3 virus detected in [station_name()] door subroutines. Severity level of [severity]. Recommend station AI involvement.", "Security Alert", SSstation.announcer.get_rand_alert_sound()) else log_world("ERROR: Could not initiate grey-tide. No areas in the list!") kill() diff --git a/code/modules/events/processor_overload.dm b/code/modules/events/processor_overload.dm index 6bedce6b4b408..67698f2f5e113 100644 --- a/code/modules/events/processor_overload.dm +++ b/code/modules/events/processor_overload.dm @@ -23,7 +23,7 @@ // whether it's, say, a tesla zapping tcomms, or some selective // modification of the tcomms bus if(prob(80) || fake) - priority_announce(alert) + priority_announce(alert, sound = SSstation.announcer.get_rand_alert_sound()) /datum/round_event/processor_overload/start() @@ -34,6 +34,6 @@ explosion(get_turf(P), 0, 0, 2) // Only a level 1 explosion actually damages the machine // at all - P.ex_act(EXPLODE_DEVASTATE) + SSexplosions.high_mov_atom += P else P.emp_act(EMP_HEAVY) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index c9142e20173b0..36cbc13849211 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -2,6 +2,7 @@ name = "Radiation Storm" typepath = /datum/round_event/radiation_storm max_occurrences = 1 + can_malf_fake_alert = TRUE /datum/round_event/radiation_storm @@ -12,7 +13,7 @@ announceWhen = 1 /datum/round_event/radiation_storm/announce(fake) - priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg') + priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", ANNOUNCER_RADIATION) //sound not longer matches the text, but an audible warning is probably good /datum/round_event/radiation_storm/start() diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index e189730b86d72..06cfa5e58431b 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( sentience_report += "Based on [data], we believe that [one] of the station's [pets] has developed [strength] level intelligence, and the ability to communicate." - priority_announce(sentience_report,"[command_name()] Medium-Priority Update") + priority_announce(sentience_report,"[command_name()] Medium-Priority Update", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/ghost_role/sentience/spawn_role() var/list/mob/dead/observer/candidates diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index be87762ad5f6d..5613e3fe0bbba 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -29,31 +29,31 @@ SSshuttle.shuttle_loan = src switch(dispatch_type) if(HIJACK_SYNDIE) - priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.","CentCom Counter Intelligence") + priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.", "CentCom Counter Intelligence", SSstation.announcer.get_rand_alert_sound()) if(RUSKY_PARTY) - priority_announce("Cargo: A group of angry Russians want to have a party. Can you send them your cargo shuttle then make them disappear?","CentCom Russian Outreach Program") + priority_announce("Cargo: A group of angry Russians want to have a party. Can you send them your cargo shuttle then make them disappear?", "CentCom Russian Outreach Program", SSstation.announcer.get_rand_alert_sound()) if(SPIDER_GIFT) - priority_announce("Cargo: The Spider Clan has sent us a mysterious gift. Can we ship it to you to see what's inside?","CentCom Diplomatic Corps") + priority_announce("Cargo: The Spider Clan has sent us a mysterious gift. Can we ship it to you to see what's inside?", "CentCom Diplomatic Corps", SSstation.announcer.get_rand_alert_sound()) if(DEPARTMENT_RESUPPLY) - priority_announce("Cargo: Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","CentCom Supply Department") + priority_announce("Cargo: Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?", "CentCom Supply Department", SSstation.announcer.get_rand_alert_sound()) thanks_msg = "The cargo shuttle should return in 5 minutes." bonus_points = 0 if(ANTIDOTE_NEEDED) - priority_announce("Cargo: Your station has been chosen for an epidemiological research project. Send us your cargo shuttle to receive your research samples.", "CentCom Research Initiatives") + priority_announce("Cargo: Your station has been chosen for an epidemiological research project. Send us your cargo shuttle to receive your research samples.", "CentCom Research Initiatives", SSstation.announcer.get_rand_alert_sound()) if(PIZZA_DELIVERY) - priority_announce("Cargo: It looks like a neighbouring station accidentally delivered their pizza to you instead.", "CentCom Spacepizza Division") + priority_announce("Cargo: It looks like a neighbouring station accidentally delivered their pizza to you instead.", "CentCom Spacepizza Division", SSstation.announcer.get_rand_alert_sound()) thanks_msg = "The cargo shuttle should return in 5 minutes." bonus_points = 0 if(ITS_HIP_TO) - priority_announce("Cargo: One of our freighters carrying a bee shipment has been attacked by eco-terrorists. Can you clean up the mess for us?", "CentCom Janitorial Division") + priority_announce("Cargo: One of our freighters carrying a bee shipment has been attacked by eco-terrorists. Can you clean up the mess for us?", "CentCom Janitorial Division", SSstation.announcer.get_rand_alert_sound()) bonus_points = 20000 //Toxin bees can be unbeelievably lethal if(MY_GOD_JC) - priority_announce("Cargo: We have discovered an active Syndicate bomb near our VIP shuttle's fuel lines. If you feel up to the task, we will pay you for defusing it.", "CentCom Security Division") + priority_announce("Cargo: We have discovered an active Syndicate bomb near our VIP shuttle's fuel lines. If you feel up to the task, we will pay you for defusing it.", "CentCom Security Division" , SSstation.announcer.get_rand_alert_sound()) thanks_msg = "Live explosive ordnance incoming via supply shuttle. Evacuating cargo bay is recommended." bonus_points = 45000 //If you mess up, people die and the shuttle gets turned into swiss cheese /datum/round_event/shuttle_loan/proc/loan_shuttle() - priority_announce(thanks_msg, "Cargo shuttle commandeered by CentCom.") + priority_announce(thanks_msg, "Cargo shuttle commandeered by CentCom.", SSstation.announcer.get_rand_alert_sound()) dispatched = 1 var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) diff --git a/code/modules/events/space_dragon.dm b/code/modules/events/space_dragon.dm index 8f54d32b3905e..731cda46c4aac 100644 --- a/code/modules/events/space_dragon.dm +++ b/code/modules/events/space_dragon.dm @@ -5,6 +5,8 @@ weight = 8 earliest_start = 50 MINUTES min_players = 20 + dynamic_should_hijack = TRUE + cannot_spawn_after_shuttlecall = TRUE /datum/round_event/ghost_role/space_dragon minimum_required = 1 @@ -12,7 +14,7 @@ announceWhen = 10 /datum/round_event/ghost_role/space_dragon/announce(fake) - priority_announce("It appears a lifeform with magical traces is approaching [station_name()], please stand-by.", "Lifesign Alert") + priority_announce("It appears a lifeform with magical traces is approaching [station_name()], please stand-by.", "Lifesign Alert", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/ghost_role/space_dragon/spawn_role() var/list/candidates = get_candidates(ROLE_ALIEN, null, ROLE_ALIEN) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 9f4508158b0af..4eb467fcb82d0 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -9,21 +9,19 @@ fakeable = FALSE /datum/round_event/spacevine/start() - var/list/turfs = list() //list of all the empty floor turfs in the maintenance areas + var/list/turfs = get_area_turfs(/area/maintenance, SSmapping.levels_by_trait(ZTRAIT_STATION)[1], TRUE) var/obj/structure/spacevine/SV = new() - - for(var/area/maintenance/A in world) - for(var/turf/F in A) - if(F.Enter(SV) && !isspaceturf(F)) - turfs += F + for(var/turf/T in turfs) + if(!T.Enter(SV) || isspaceturf(T)) + turfs -= T qdel(SV) if(turfs.len) //Pick a turf to spawn at if we can var/turf/T = pick(turfs) new /datum/spacevine_controller(T, list(pick(subtypesof(/datum/spacevine_mutation))), rand(10,100), rand(1,6), src) //spawn a controller at turf with randomized stats and a single random mutation - + message_admins("Event spacevine has been spawned in [ADMIN_VERBOSEJMP(T)].") /datum/spacevine_mutation var/name = "" @@ -112,6 +110,9 @@ . = 1 QDEL_IN(holder, 5) +/datum/spacevine_mutation/aggressive_spread/proc/aggrospread_act(obj/structure/spacevine/S, mob/living/M) + return + /datum/spacevine_mutation/explosive/on_death(obj/structure/spacevine/holder, mob/hitter, obj/item/I) explosion(holder.loc, 0, 0, severity, 0, 0) @@ -135,8 +136,7 @@ quality = MINOR_NEGATIVE /datum/spacevine_mutation/vine_eating/on_spread(obj/structure/spacevine/holder, turf/target) - var/obj/structure/spacevine/prey = locate() in target - if(prey && !prey.mutations.Find(src)) //Eat all vines that are not of the same origin + for(var/obj/structure/spacevine/prey in target) qdel(prey) /datum/spacevine_mutation/aggressive_spread //very OP, but im out of other ideas currently @@ -145,11 +145,52 @@ severity = 3 quality = NEGATIVE -/datum/spacevine_mutation/aggressive_spread/on_spread(obj/structure/spacevine/holder, turf/target) - target.ex_act(severity, null, src) // vine immunity handled at /mob/ex_act +/// Checks mobs on spread-target's turf to see if they should be hit by a damaging proc or not. +/datum/spacevine_mutation/aggressive_spread/on_spread(obj/structure/spacevine/holder, turf/target, mob/living) + for(var/mob/living/M in target) + if(!isvineimmune(M) && M.stat != DEAD) // Don't kill immune creatures. Dead check to prevent log spam when a corpse is trapped between vine eaters. + aggrospread_act(holder, M) /datum/spacevine_mutation/aggressive_spread/on_buckle(obj/structure/spacevine/holder, mob/living/buckled) - buckled.ex_act(severity, null, src) + aggrospread_act(holder, buckled) + +/// Hurts mobs. To be used when a vine with aggressive spread mutation spreads into the mob's tile or buckles them. +/datum/spacevine_mutation/aggressive_spread/aggrospread_act(obj/structure/spacevine/S, mob/living/M) + var/mob/living/carbon/C = M //If the mob is carbon then it now also exists as a "C", and not just an M. + if(istype(C)) //If the mob (M) is a carbon subtype (C) we move on to pick a more complex damage proc, with damage zones, wounds and armor mitigation. + var/obj/item/bodypart/limb = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD, BODY_ZONE_CHEST) //Picks a random bodypart. Does not runtime even if it's missing. + var/armor = C.run_armor_check(limb, "melee", null, null) //armor = the armor value of that randomly chosen bodypart. Nulls to not print a message, because it would still print on pierce. + var/datum/spacevine_mutation/thorns/T = locate() in S.mutations //Searches for the thorns mutation in the "mutations"-list inside obj/structure/spacevine, and defines T if it finds it. + if(T && (prob(40))) //If we found the thorns mutation there is now a chance to get stung instead of lashed or smashed. + C.apply_damage(50, BRUTE, def_zone = limb) //This one gets a bit lower damage because it ignores armor. + C.Stun(1 SECONDS) //Stopped in place for a moment. + playsound(M, 'sound/weapons/pierce.ogg', 50, TRUE, -1) + M.visible_message("[M] is nailed by a sharp thorn!", \ + "You are nailed by a sharp thorn!") + log_combat(S, M, "aggressively pierced") //"Aggressively" for easy ctrl+F'ing in the attack logs. + else + if(prob(80)) + C.apply_damage(60, BRUTE, def_zone = limb, blocked = armor) + C.Knockdown(2 SECONDS) + playsound(M, 'sound/weapons/whip.ogg', 50, TRUE, -1) + M.visible_message("[M] is lacerated by an outburst of vines!", \ + "You are lacerated by an outburst of vines!") + log_combat(S, M, "aggressively lacerated") + else + C.apply_damage(60, BRUTE, def_zone = limb, blocked = armor) + C.Knockdown(3 SECONDS) + var/atom/throw_target = get_edge_target_turf(C, get_dir(S, get_step_away(C, S))) + C.throw_at(throw_target, 3, 6) + playsound(M, 'sound/effects/hit_kick.ogg', 50, TRUE, -1) + M.visible_message("[M] is smashed by a large vine!", \ + "You are smashed by a large vine!") + log_combat(S, M, "aggressively smashed") + else //Living but not a carbon? Maybe a silicon? Can't be wounded so have a big chunk of simple bruteloss with no special effects. They can be entangled. + M.adjustBruteLoss(75) + playsound(M, 'sound/weapons/whip.ogg', 50, TRUE, -1) + M.visible_message("[M] is brutally threshed by [S]!", \ + "You are brutally threshed by [S]!") + log_combat(S, M, "aggressively spread into") //You aren't being attacked by the vines. You just happen to stand in their way. /datum/spacevine_mutation/transparency name = "transparent" @@ -170,7 +211,7 @@ var/turf/open/floor/T = holder.loc if(istype(T)) var/datum/gas_mixture/GM = T.air - GM.set_moles(/datum/gas/oxygen, max(GM.get_moles(/datum/gas/oxygen) - severity * holder.energy, 0)) + GM.set_moles(GAS_O2, max(GM.get_moles(GAS_O2) - severity * holder.energy, 0)) /datum/spacevine_mutation/nitro_eater name = "nitrogen consuming" @@ -182,7 +223,7 @@ var/turf/open/floor/T = holder.loc if(istype(T)) var/datum/gas_mixture/GM = T.air - GM.set_moles(/datum/gas/nitrogen, max(GM.get_moles(/datum/gas/nitrogen) - severity * holder.energy, 0)) + GM.set_moles(GAS_N2, max(GM.get_moles(GAS_N2) - severity * holder.energy, 0)) /datum/spacevine_mutation/carbondioxide_eater name = "CO2 consuming" @@ -194,7 +235,7 @@ var/turf/open/floor/T = holder.loc if(istype(T)) var/datum/gas_mixture/GM = T.air - GM.set_moles(/datum/gas/carbon_dioxide, max(GM.get_moles(/datum/gas/carbon_dioxide) - severity * holder.energy, 0)) + GM.set_moles(GAS_CO2, max(GM.get_moles(GAS_CO2) - severity * holder.energy, 0)) /datum/spacevine_mutation/plasma_eater name = "toxins consuming" @@ -206,7 +247,7 @@ var/turf/open/floor/T = holder.loc if(istype(T)) var/datum/gas_mixture/GM = T.air - GM.set_moles(/datum/gas/plasma, max(GM.get_moles(/datum/gas/plasma) - severity * holder.energy, 0)) + GM.set_moles(GAS_PLASMA, max(GM.get_moles(GAS_PLASMA) - severity * holder.energy, 0)) /datum/spacevine_mutation/thorns name = "thorny" @@ -431,7 +472,7 @@ KZ.set_production(11 - (spread_cap / initial(spread_cap)) * 5) //Reverts spread_cap formula so resulting seed gets original production stat or equivalent back. qdel(src) -/datum/spacevine_controller/process() +/datum/spacevine_controller/process(delta_time) if(!LAZYLEN(vines)) qdel(src) //space vines exterminated. Remove the controller return @@ -439,9 +480,7 @@ qdel(src) //Sanity check return - var/length = 0 - - length = min( spread_cap , max( 1 , vines.len / spread_multiplier ) ) + var/length = round(min( spread_cap , max( 1 , delta_time * 0.5 *vines.len / spread_multiplier))) var/i = 0 var/list/obj/structure/spacevine/queue_end = list() @@ -454,7 +493,7 @@ for(var/datum/spacevine_mutation/SM in SV.mutations) SM.process_mutation(SV) if(SV.energy < 2) //If tile isn't fully grown - if(prob(20)) + if(DT_PROB(10, delta_time)) SV.grow() else //If tile is fully grown SV.entangle_mob() @@ -504,12 +543,14 @@ for(var/obj/machinery/M in stepturf) if(M.density && !istype(M, /obj/machinery/power/smes) && !istype(M, /obj/machinery/door/airlock/external) && !istype(M, /obj/machinery/door/firedoor)) //please don't sabotage power or cause a hullbreach! M.take_damage(40) //more damage, because machines are more commonplace and tend to be more durable - if (!isspaceturf(stepturf) && stepturf.Enter(src)) - for(var/datum/spacevine_mutation/SM in mutations) - SM.on_spread(src, stepturf) - stepturf = get_step(src,direction) //in case turf changes, to make sure no runtimes happen - if(!locate(/obj/structure/spacevine, stepturf)) + if(!isspaceturf(stepturf) && stepturf.Enter(src)) + var/obj/structure/spacevine/spot_taken = locate() in stepturf //Locates any vine on target turf. Calls that vine "spot_taken". + var/datum/spacevine_mutation/vine_eating/E = locate() in mutations //Locates the vine eating trait in our own seed and calls it E. + if(!spot_taken || (E && (spot_taken && !spot_taken.mutations.Find(E)))) //Proceed if there isn't a vine on the target turf, OR we have vine eater AND target vine is from our seed and doesn't. Vines from other seeds are eaten regardless. if(master) + for(var/datum/spacevine_mutation/SM in mutations) + SM.on_spread(src, stepturf) //Only do the on_spread proc if it actually spreads. + stepturf = get_step(src,direction) //in case turf changes, to make sure no runtimes happen master.spawn_spacevine_piece(stepturf, src) /obj/structure/spacevine/ex_act(severity, target) diff --git a/code/modules/events/special_antag_event.dm b/code/modules/events/special_antag_event.dm index 13981e8ff5103..a3f3465063f71 100644 --- a/code/modules/events/special_antag_event.dm +++ b/code/modules/events/special_antag_event.dm @@ -6,7 +6,7 @@ var/antagonist_datum = /datum/antagonist/special var/antag_name //The datum of the antag E.G. /datum/antagonist/special/undercover var/preference_type = ROLE_TRAITOR - var/protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain", "Brig Physician") + var/protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain") /datum/round_event_control/spawn_special_antagonist/runEvent() var/datum/round_event/create_special_antag/E = new /datum/round_event/create_special_antag @@ -36,7 +36,7 @@ var/role_name var/antag_datum //The datum of the antag E.G. /datum/antagonist/special/undercover var/preference_type = ROLE_TRAITOR - var/protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain", "Brig Physician") + var/protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Research Director", "Captain") /datum/round_event/create_special_antag/start() for(var/mob/living/carbon/human/H in shuffle(GLOB.player_list)) diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 7afe14aeb0edf..d9d454faa2997 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -4,6 +4,8 @@ weight = 5 max_occurrences = 1 min_players = 15 + dynamic_should_hijack = TRUE + can_malf_fake_alert = TRUE /datum/round_event/spider_infestation announceWhen = 400 @@ -16,8 +18,7 @@ spawncount = rand(5, 8) /datum/round_event/spider_infestation/announce(fake) - priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", 'sound/ai/aliens.ogg') - + priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", ANNOUNCER_ALIENS) /datum/round_event/spider_infestation/start() var/list/vents = list() diff --git a/code/modules/events/supermatter_surge.dm b/code/modules/events/supermatter_surge.dm new file mode 100644 index 0000000000000..175ecd07df125 --- /dev/null +++ b/code/modules/events/supermatter_surge.dm @@ -0,0 +1,24 @@ +/datum/round_event_control/supermatter_surge + name = "Supermatter Surge" + typepath = /datum/round_event/supermatter_surge + weight = 20 + max_occurrences = 4 + earliest_start = 10 MINUTES + +/datum/round_event_control/supermatter_surge/canSpawnEvent() + if(GLOB.main_supermatter_engine?.has_been_powered) + return ..() + +/datum/round_event/supermatter_surge + announceWhen = 1 + var/power = 2000 + +/datum/round_event/supermatter_surge/setup() + power = rand(200,4000) + +/datum/round_event/supermatter_surge/announce() + if(power > 800 || prob(round(power/8))) + priority_announce("Class [round(power/500) + 1] supermatter surge detected. Intervention may be required.", "Anomaly Alert", SSstation.announcer.get_rand_alert_sound()) + +/datum/round_event/supermatter_surge/start() + GLOB.main_supermatter_engine.matter_power += power diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index cc75c4ceaa2bc..4a55b997a80ac 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -14,12 +14,12 @@ var/randomProbability = 1 var/reagentsAmount = 100 var/list/saferChems = list(/datum/reagent/water,/datum/reagent/carbon,/datum/reagent/consumable/flour,/datum/reagent/space_cleaner,/datum/reagent/consumable/nutriment,/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,/datum/reagent/lube,/datum/reagent/glitter/pink,/datum/reagent/cryptobiolin, - /datum/reagent/toxin/plantbgone,/datum/reagent/blood,/datum/reagent/medicine/charcoal,/datum/reagent/drug/space_drugs,/datum/reagent/medicine/morphine,/datum/reagent/water/holywater,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/hot_cocoa,/datum/reagent/toxin/acid,/datum/reagent/toxin/mindbreaker,/datum/reagent/toxin/rotatium,/datum/reagent/bluespace, + /datum/reagent/toxin/plantbgone,/datum/reagent/blood,/datum/reagent/medicine/charcoal,/datum/reagent/drug/space_drugs,/datum/reagent/medicine/morphine,/datum/reagent/water/holywater,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/cocoa/hot_cocoa,/datum/reagent/toxin/acid,/datum/reagent/toxin/mindbreaker,/datum/reagent/toxin/rotatium,/datum/reagent/bluespace, /datum/reagent/pax,/datum/reagent/consumable/laughter,/datum/reagent/concentrated_barbers_aid,/datum/reagent/colorful_reagent,/datum/reagent/peaceborg/confuse,/datum/reagent/peaceborg/tire,/datum/reagent/consumable/sodiumchloride,/datum/reagent/consumable/ethanol/beer,/datum/reagent/hair_dye,/datum/reagent/consumable/sugar,/datum/reagent/glitter/white,/datum/reagent/growthserum) //needs to be chemid unit checked at some point /datum/round_event/vent_clog/announce() - priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") + priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/vent_clog/setup() endWhen = rand(25, 100) @@ -88,7 +88,7 @@ reagentsAmount = 100 /datum/round_event/vent_clog/beer/announce() - priority_announce("The scrubbers network is experiencing an unexpected surge of pressurized beer. Some ejection of contents may occur.", "Atmospherics alert") + priority_announce("The scrubbers network is experiencing an unexpected surge of pressurized beer. Some ejection of contents may occur.", "Atmospherics alert", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/vent_clog/beer/start() for(var/obj/machinery/atmospherics/components/unary/vent in vents) @@ -103,7 +103,7 @@ CHECK_TICK /datum/round_event/vent_clog/plasma_decon/announce() - priority_announce("We are deploying an experimental plasma decontamination system. Please stand away from the vents and do not breathe the smoke that comes out.", "Central Command Update") + priority_announce("We are deploying an experimental plasma decontamination system. Please stand away from the vents and do not breathe the smoke that comes out.", "Central Command Update", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/vent_clog/plasma_decon/start() for(var/obj/machinery/atmospherics/components/unary/vent in vents) diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm index 41ee4246b1abc..6fc61ad982410 100644 --- a/code/modules/events/wizard/curseditems.dm +++ b/code/modules/events/wizard/curseditems.dm @@ -17,23 +17,23 @@ switch(item_set) if("wizardmimic") - loadout[SLOT_WEAR_SUIT] = /obj/item/clothing/suit/wizrobe - loadout[SLOT_SHOES] = /obj/item/clothing/shoes/sandal/magic - loadout[SLOT_HEAD] = /obj/item/clothing/head/wizard + loadout[TOBITSHIFT(ITEM_SLOT_OCLOTHING) + 1] = /obj/item/clothing/suit/wizrobe + loadout[TOBITSHIFT(ITEM_SLOT_FEET) + 1] = /obj/item/clothing/shoes/sandal/magic + loadout[TOBITSHIFT(ITEM_SLOT_HEAD) + 1] = /obj/item/clothing/head/wizard ruins_spaceworthiness = 1 if("swords") - loadout[SLOT_HANDS] = /obj/item/katana/cursed + loadout[TOBITSHIFT(ITEM_SLOT_HANDS) + 1] = /obj/item/katana/cursed if("bigfatdoobie") - loadout[SLOT_WEAR_MASK] = /obj/item/clothing/mask/cigarette/rollie/trippy + loadout[TOBITSHIFT(ITEM_SLOT_MASK) + 1] = /obj/item/clothing/mask/cigarette/rollie/trippy ruins_spaceworthiness = 1 if("boxing") - loadout[SLOT_WEAR_MASK] = /obj/item/clothing/mask/luchador - loadout[SLOT_GLOVES] = /obj/item/clothing/gloves/boxing + loadout[TOBITSHIFT(ITEM_SLOT_MASK) + 1] = /obj/item/clothing/mask/luchador + loadout[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1] = /obj/item/clothing/gloves/boxing ruins_spaceworthiness = 1 if("voicemodulators") - loadout[SLOT_WEAR_MASK] = /obj/item/clothing/mask/chameleon + loadout[TOBITSHIFT(ITEM_SLOT_MASK) + 1] = /obj/item/clothing/mask/chameleon if("catgirls2015") - loadout[SLOT_HEAD] = /obj/item/clothing/head/kitty + loadout[TOBITSHIFT(ITEM_SLOT_HEAD) + 1] = /obj/item/clothing/head/kitty ruins_spaceworthiness = 1 ruins_wizard_loadout = 1 diff --git a/code/modules/events/wizard/embeddies.dm b/code/modules/events/wizard/embeddies.dm new file mode 100644 index 0000000000000..fe08b9c7432e9 --- /dev/null +++ b/code/modules/events/wizard/embeddies.dm @@ -0,0 +1,46 @@ +/datum/round_event_control/wizard/embedpocalypse + name = "Make Everything Embeddable" + weight = 2 + typepath = /datum/round_event/wizard/embedpocalypse + max_occurrences = 1 + earliest_start = 0 MINUTES + +/datum/round_event/wizard/embedpocalypse/start() + for(var/obj/item/I in world) + CHECK_TICK + + if(!(I.flags_1 & INITIALIZED_1)) + continue + + if(!I.embedding || I.embedding == EMBED_HARMLESS) + I.embedding = EMBED_POINTY + I.updateEmbedding() + I.name = "pointy [I.name]" + + GLOB.embedpocalypse = TRUE + GLOB.stickpocalypse = FALSE // embedpocalypse takes precedence over stickpocalypse + +/datum/round_event_control/wizard/embedpocalypse/sticky + name = "Make Everything Sticky" + weight = 6 + typepath = /datum/round_event/wizard/embedpocalypse/sticky + max_occurrences = 1 + earliest_start = 0 MINUTES + +/datum/round_event_control/wizard/embedpocalypse/sticky/canSpawnEvent(players_amt, gamemode) + if(GLOB.embedpocalypse) + return FALSE + +/datum/round_event/wizard/embedpocalypse/sticky/start() + for(var/obj/item/I in world) + CHECK_TICK + + if(!(I.flags_1 & INITIALIZED_1)) + continue + + if(!I.embedding) + I.embedding = EMBED_HARMLESS + I.updateEmbedding() + I.name = "sticky [I.name]" + + GLOB.stickpocalypse = TRUE diff --git a/code/modules/events/wizard/ghost.dm b/code/modules/events/wizard/ghost.dm index d5366c576975f..d2b889a7c74ae 100644 --- a/code/modules/events/wizard/ghost.dm +++ b/code/modules/events/wizard/ghost.dm @@ -21,6 +21,6 @@ /datum/round_event/wizard/possession/start() for(var/mob/dead/observer/G in GLOB.player_list) - G.verbs += /mob/dead/observer/verb/boo - G.verbs += /mob/dead/observer/verb/possess + G.add_verb(/mob/dead/observer/verb/boo) + G.add_verb(/mob/dead/observer/verb/possess) to_chat(G, "You suddenly feel a welling of new spooky powers...") diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index 82e72df3b9d3d..569e026e7ac73 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -83,7 +83,8 @@ if(!(resistance_flags & ON_FIRE) && !force) return QDEL_HINT_LETMELIVE - SSticker.round_end_events -= roundend_callback + LAZYREMOVE(SSticker.round_end_events, roundend_callback) + roundend_callback = null //This ought to free the callback datum, and prevent us from harddeling GLOB.poi_list.Remove(src) for(var/i in GLOB.player_list) var/mob/M = i diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index f335809cc8bcd..886e68cdbf598 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -13,7 +13,7 @@ startWhen = rand(40, 60) /datum/round_event/wizard/magicarp/announce(fake) - priority_announce("Unknown magical entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") + priority_announce("Unknown magical entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", SSstation.announcer.get_rand_alert_sound()) /datum/round_event/wizard/magicarp/start() for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list) @@ -36,28 +36,37 @@ projectilesound = 'sound/weapons/emitter.ogg' maxHealth = 50 health = 50 - gold_core_spawnable = HOSTILE_SPAWN //NO_SPAWN - var/allowed_projectile_types = list(/obj/item/projectile/magic/change, /obj/item/projectile/magic/animate, /obj/item/projectile/magic/resurrection, + gold_core_spawnable = NO_SPAWN + var/allowed_projectile_types = list(/obj/item/projectile/magic/animate, /obj/item/projectile/magic/resurrection, /obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball, /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage) - + discovery_points = 3000 + /mob/living/simple_animal/hostile/carp/ranged/Initialize() projectiletype = pick(allowed_projectile_types) . = ..() -/*/mob/living/simple_animal/hostile/carp/ranged/xenobio - desc = "45% magic, 50% carp, 5% slime, 100% horrible." - allowed_projectile_types = list( /obj/item/projectile/magic/animate, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball, - /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage) - gold_core_spawnable = HOSTILE_SPAWN*/ - /mob/living/simple_animal/hostile/carp/ranged/chaos name = "chaos magicarp" desc = "50% carp, 100% magic, 150% horrible." color = "#00FFFF" maxHealth = 75 health = 75 + gold_core_spawnable = NO_SPAWN + discovery_points = 5000 /mob/living/simple_animal/hostile/carp/ranged/chaos/Shoot() projectiletype = pick(allowed_projectile_types) ..() + +/mob/living/simple_animal/hostile/carp/ranged/xenobio + desc = "45% magic, 50% carp, 5% slime, 100% horrible." + allowed_projectile_types = list( /obj/item/projectile/magic/animate, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball, + /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage) + gold_core_spawnable = HOSTILE_SPAWN + +/mob/living/simple_animal/hostile/carp/ranged/chaos/xenobio + desc = "95% magic, 50% carp, 5% slime, 150% horrible." + allowed_projectile_types = list( /obj/item/projectile/magic/animate, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball, + /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage) + gold_core_spawnable = HOSTILE_SPAWN diff --git a/code/modules/events/wizard/rpgloot.dm b/code/modules/events/wizard/rpgloot.dm index f5de56ed0ccb1..e8eb1251166ca 100644 --- a/code/modules/events/wizard/rpgloot.dm +++ b/code/modules/events/wizard/rpgloot.dm @@ -8,6 +8,8 @@ /datum/round_event/wizard/rpgloot/start() var/upgrade_scroll_chance = 0 for(var/obj/item/I in world) + CHECK_TICK + if(!(I.flags_1 & INITIALIZED_1)) continue diff --git a/code/modules/events/wizard/shuffle.dm b/code/modules/events/wizard/shuffle.dm index c77349ca5b9d1..cbd5fbc87d83c 100644 --- a/code/modules/events/wizard/shuffle.dm +++ b/code/modules/events/wizard/shuffle.dm @@ -84,7 +84,7 @@ for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(H.stat || !H.mind || iswizard(H)) continue //the wizard(s) are spared on this one - if(istype(H.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat) || H.anti_magic_check()) + if(istype(H.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat) || H.anti_magic_check()) continue mobs += H diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index 3e5321f7b3fe4..93b4fd6d1db71 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -12,7 +12,6 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to announceWhen = 10 endWhen = 60 - var/list/pick_turfs = list() var/list/wormholes = list() var/shift_frequency = 3 var/number_of_wormholes = 400 @@ -22,21 +21,17 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to endWhen = rand(40, 80) /datum/round_event/wormholes/start() - for(var/turf/open/floor/T in world) - if(is_station_level(T.z)) - pick_turfs += T - for(var/i = 1, i <= number_of_wormholes, i++) - var/turf/T = pick(pick_turfs) + var/turf/T = get_random_station_turf() //side effect - wormholes won't spawn in space wormholes += new /obj/effect/portal/wormhole(T, null, 0, null, FALSE) /datum/round_event/wormholes/announce(fake) - priority_announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", 'sound/ai/spanomalies.ogg') + priority_announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", ANNOUNCER_SPANOMALIES) /datum/round_event/wormholes/tick() if(activeFor % shift_frequency == 0) for(var/obj/effect/portal/wormhole/O in wormholes) - var/turf/T = pick(pick_turfs) + var/turf/T = get_random_station_turf() if(T) O.forceMove(T) diff --git a/code/modules/exploration_crew/discovery_research/discoverable_component.dm b/code/modules/exploration_crew/discovery_research/discoverable_component.dm new file mode 100644 index 0000000000000..ff9f66b71bfd5 --- /dev/null +++ b/code/modules/exploration_crew/discovery_research/discoverable_component.dm @@ -0,0 +1,49 @@ +/datum/component/discoverable + dupe_mode = COMPONENT_DUPE_UNIQUE + //Amount of discovery points awarded when researched. + var/scanned = FALSE + var/unique = FALSE + var/point_reward = 0 + +/datum/component/discoverable/Initialize(_point_reward, _unique = FALSE) + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE + + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) + RegisterSignal(parent, COMSIG_CLICK, .proc/tryScan) + + point_reward = _point_reward + unique = _unique + +/datum/component/discoverable/proc/tryScan(datum/source, location, control, params, mob/user) + SIGNAL_HANDLER + if(!isliving(user)) + return + var/mob/living/L = user + if(istype(L.get_active_held_item(), /obj/item/discovery_scanner)) + INVOKE_ASYNC(L.get_active_held_item(), /obj/item/discovery_scanner.proc/begin_scanning, user, src) + +/datum/component/discoverable/proc/examine(datum/source, mob/user, atom/thing) + SIGNAL_HANDLER + if(!user.research_scanner) + return + to_chat(user, "Scientific data detected.") + to_chat(user, "Scanned: [scanned ? "True" : "False"].") + to_chat(user, "Discovery Value: [point_reward].") + +/datum/component/discoverable/proc/discovery_scan(datum/techweb/linked_techweb, mob/user) + //Already scanned our atom. + var/atom/A = parent + if(scanned) + to_chat(user, "[A] has already been analysed.") + return + //Already scanned another of this type. + if(linked_techweb.scanned_atoms[A.type] && !unique) + to_chat(user, "Datapoints about [A] already in system.") + return + scanned = TRUE + linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DISCOVERY, point_reward) + linked_techweb.scanned_atoms[A.type] = TRUE + playsound(user, 'sound/machines/terminal_success.ogg', 60) + to_chat(user, "New datapoint scanned, [point_reward] discovery points gained.") + pulse_effect(get_turf(A), 4) diff --git a/code/modules/exploration_crew/discovery_research/discovery_scanner.dm b/code/modules/exploration_crew/discovery_research/discovery_scanner.dm new file mode 100644 index 0000000000000..fd0b2e5afd5ce --- /dev/null +++ b/code/modules/exploration_crew/discovery_research/discovery_scanner.dm @@ -0,0 +1,38 @@ +/obj/item/discovery_scanner + name = "discovery scanner" + desc = "A scanner used by scientists to collect research data about unknown artifacts and specimins." + icon = 'icons/obj/device.dmi' + icon_state = "discovery" + item_state = "healthanalyzer" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + w_class = WEIGHT_CLASS_SMALL + var/datum/techweb/linked_techweb + +/obj/item/discovery_scanner/Initialize() + . = ..() + if(!linked_techweb) + linked_techweb = SSresearch.science_tech + +/obj/item/discovery_scanner/Destroy() + linked_techweb = null //Note: Shouldn't hard del anyway since techwebs don't get deleted, however if they do then troubles will arise and this will need to be changed. + . = ..() + +/obj/item/discovery_scanner/examine(mob/user) + . = ..() + . += "Left-Click on any mob or researchable specimin to scan and gain discovery research points." + . += "[src] has unlimited range." + . += "Science goggles can help detect researchable items." + +/obj/item/discovery_scanner/attack_obj(obj/O, mob/living/user) + if(istype(O, /obj/machinery/computer/rdconsole)) + to_chat(user, "You link [src] to [O].") + var/obj/machinery/computer/rdconsole/rdconsole = O + linked_techweb = rdconsole.stored_research + return + . = ..() + +/obj/item/discovery_scanner/proc/begin_scanning(mob/user, datum/component/discoverable/discoverable) + to_chat(user, "You begin scanning [discoverable.parent]...") + if(do_after(user, 50, target=get_turf(user))) + discoverable.discovery_scan(linked_techweb, user) diff --git a/code/modules/exploration_crew/exploration_explosives.dm b/code/modules/exploration_crew/exploration_explosives.dm new file mode 100644 index 0000000000000..d2a205a2b8eb9 --- /dev/null +++ b/code/modules/exploration_crew/exploration_explosives.dm @@ -0,0 +1,129 @@ +/obj/item/grenade/exploration + name = "breaching charges" + desc = "Used by exploration crews to breach and demolish unknown places. Requires a nearby detonator to be triggered." + icon_state = "plastic-explosive0" + item_state = "plastic-explosive" + lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi' + item_flags = NOBLUDGEON + flags_1 = NONE + w_class = WEIGHT_CLASS_SMALL + var/atom/target = null + var/mutable_appearance/plastic_overlay + var/light_exp_range = 3 + var/heavy_range = 0 + var/devastation_range = 0 + var/list/attached_detonators = list() + +/obj/item/grenade/exploration/Initialize() + . = ..() + plastic_overlay = mutable_appearance(icon, "[item_state]2", HIGH_OBJ_LAYER) + +/obj/item/grenade/exploration/Destroy() + for(var/obj/item/exploration_detonator/detonator in attached_detonators) + detonator.linked_explosives -= src + attached_detonators = null + . = ..() + +/obj/item/grenade/exploration/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/exploration_detonator)) + var/obj/item/exploration_detonator/detonator = W + detonator.linked_explosives |= src + attached_detonators |= detonator + to_chat(user, "You link [src] to [W].") + return + . = ..() + +/obj/item/grenade/exploration/afterattack(atom/movable/AM, mob/user, flag) + . = ..() + + if(!length(attached_detonators)) + to_chat(user, "[src] needs to be linked to a detonator first!") + return + + if(!flag) + return + if(ismob(AM)) + return + + to_chat(user, "You start planting [src].") + + if(do_after(user, 30, target = AM)) + if(!user.temporarilyRemoveItemFromInventory(src)) + return + target = AM + + message_admins("[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_VERBOSEJMP(target)]") + log_game("[key_name(user)] planted [name] on [target.name] at [AREACOORD(user)]") + + notify_ghosts("[user] has planted \a [src] on [target]!", source = target, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Explosive Planted") + + moveToNullspace() //Yep + + if(istype(AM, /obj/item)) //your crappy throwing star can't fly so good with a giant brick of c4 on it. + var/obj/item/I = AM + I.throw_speed = max(1, (I.throw_speed - 3)) + I.throw_range = max(1, (I.throw_range - 3)) + if(I.embedding) + I.embedding["embed_chance"] = 0 + I.updateEmbedding() + else if(istype(AM, /mob/living)) + plastic_overlay.layer = FLOAT_LAYER + + target.add_overlay(plastic_overlay, TRUE) + to_chat(user, "You plant the bomb.") + +/obj/item/grenade/exploration/prime(mob/living/lanced_by) + . = ..() + var/turf/location + if(target) + if(!QDELETED(target)) + location = get_turf(target) + target.cut_overlay(plastic_overlay, TRUE) + target.ex_act(EXPLODE_HEAVY, target) + else + location = get_turf(src) + if(location) + explosion(location, devastation_range, heavy_range, light_exp_range) + if(ismob(target)) + var/mob/M = target + M.gib() + qdel(src) + +/obj/item/exploration_detonator + name = "detonator" + desc = "A detonator that can be linked to explosives and then... you know, detonate them." + icon = 'icons/obj/grenade.dmi' + icon_state = "detonator" + w_class = WEIGHT_CLASS_SMALL + var/range = 16 + var/list/linked_explosives = list() + +/obj/item/exploration_detonator/Destroy() + . = ..() + for(var/obj/item/grenade/exploration/explosive in linked_explosives) + explosive.attached_detonators -= src + linked_explosives = null + +/obj/item/exploration_detonator/attack_self(mob/user) + . = ..() + if(.) + return + var/turf/T = get_turf(user) + if(is_station_level(T.z) && !(obj_flags & EMAGGED)) + to_chat(user, "STATION SAFETY ENABLED.") + return + var/explosives_trigged = 0 + for(var/obj/item/grenade/exploration/exploration in linked_explosives) + var/turf/T2 = get_turf(exploration.target) + if(T2.get_virtual_z_level() == T.get_virtual_z_level() && get_dist(exploration.target, user) <= range) + addtimer(CALLBACK(exploration, /obj/item/grenade/exploration.proc/prime), 10) + explosives_trigged ++ + to_chat(user, "[explosives_trigged] explosives triggered.") + +/obj/item/exploration_detonator/emag_act(mob/user) + . = ..() + if(obj_flags & EMAGGED) + return + obj_flags |= EMAGGED + to_chat(user, "You override the safety controls of [src]. You can now trigger explosives on the station.") diff --git a/code/modules/exploration_crew/exploration_laser_gun.dm b/code/modules/exploration_crew/exploration_laser_gun.dm new file mode 100644 index 0000000000000..5b3d102b16499 --- /dev/null +++ b/code/modules/exploration_crew/exploration_laser_gun.dm @@ -0,0 +1,107 @@ +/obj/item/gun/energy/e_gun/mini/exploration + name = "handheld multi-purpose energy gun" + desc = "A pistol-sized energy gun with a built-in flashlight designed for exploration crews. It serves a duel purpose and has modes for anti-creature lasers and cutting lasers." + pin = /obj/item/firing_pin/off_station + ammo_type = list(/obj/item/ammo_casing/energy/laser/anti_creature, /obj/item/ammo_casing/energy/laser/cutting) + +/obj/item/gun/energy/e_gun/mini/exploration/emag_act(mob/user) + . = ..() + //Emag the pin too + if(pin) + pin.emag_act(user) + if(obj_flags & EMAGGED) + return + to_chat(user, "You override the safety of the energy gun, it will now fire higher powered projectiles at a greater cost.") + ammo_type = list(/obj/item/ammo_casing/energy/laser/exploration_kill, /obj/item/ammo_casing/energy/laser/exploration_destroy) + update_ammo_types() + obj_flags |= EMAGGED + +//Anti-creature - Extra damage against simplemobs + +/obj/item/ammo_casing/energy/laser/anti_creature + projectile_type = /obj/item/projectile/beam/laser/anti_creature + select_name = "anti-creature" + e_cost = 40 + +/obj/item/projectile/beam/laser/anti_creature + damage = 15 + tracer_type = /obj/effect/projectile/tracer/laser + muzzle_type = /obj/effect/projectile/muzzle/laser + impact_type = /obj/effect/projectile/impact/laser + +/obj/item/projectile/beam/laser/anti_creature/on_hit(atom/target, blocked) + damage = initial(damage) + if(!iscarbon(target) && !issilicon(target)) + damage = 30 + . = ..() + +//Cutting projectile - Damage against objects + +/obj/item/ammo_casing/energy/laser/cutting + projectile_type = /obj/item/projectile/beam/laser/cutting + select_name = "cutting laser" + e_cost = 30 + +/obj/item/projectile/beam/laser/cutting + damage = 5 + icon_state = "heavylaser" + tracer_type = /obj/effect/projectile/tracer/heavy_laser + muzzle_type = /obj/effect/projectile/muzzle/heavy_laser + impact_type = /obj/effect/projectile/impact/heavy_laser + +/obj/item/projectile/beam/laser/cutting/on_hit(atom/target, blocked) + damage = initial(damage) + if(isobj(target)) + damage = 70 + else if(istype(target, /turf/closed/mineral)) + var/turf/closed/mineral/T = target + T.gets_drilled() + . = ..() + +//Emagged ammo types + +/obj/item/ammo_casing/energy/laser/exploration_kill + projectile_type = /obj/item/projectile/beam/laser/exploration_kill + select_name = "KILL" + e_cost = 80 + +/obj/item/projectile/beam/laser/exploration_kill + damage = 30 + tracer_type = /obj/effect/projectile/tracer/laser + muzzle_type = /obj/effect/projectile/muzzle/laser + impact_type = /obj/effect/projectile/impact/laser + +/obj/item/projectile/beam/laser/exploration_kill/on_hit(atom/target, blocked) + damage = initial(damage) + if(!iscarbon(target) && !issilicon(target)) + damage = 50 + //If you somehow hit yourself you get fried. + if(target == firer) + to_chat(firer, "The laser accelerates violently towards your gun's magnetic field, tearing its way through your body!") + damage = 200 + . = ..() + +//destroy + +/obj/item/ammo_casing/energy/laser/exploration_destroy + projectile_type = /obj/item/projectile/beam/laser/exploration_destroy + select_name = "DESTROY" + e_cost = 120 + +/obj/item/projectile/beam/laser/exploration_destroy + damage = 20 + icon_state = "heavylaser" + tracer_type = /obj/effect/projectile/tracer/heavy_laser + muzzle_type = /obj/effect/projectile/muzzle/heavy_laser + impact_type = /obj/effect/projectile/impact/heavy_laser + +/obj/item/projectile/beam/laser/exploration_destroy/on_hit(atom/target, blocked) + damage = initial(damage) + if(isobj(target)) + damage = 150 + else if(istype(target, /turf/closed/mineral)) + var/turf/closed/mineral/T = target + T.gets_drilled() + else if(isturf(target)) + SSexplosions.medturf += target + . = ..() diff --git a/code/modules/exploration_crew/exploration_shuttle.dm b/code/modules/exploration_crew/exploration_shuttle.dm new file mode 100644 index 0000000000000..7fc44209c7cc0 --- /dev/null +++ b/code/modules/exploration_crew/exploration_shuttle.dm @@ -0,0 +1,13 @@ +/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration + name = "exploration shuttle console" + desc = "Used to pilot the exploration shuttle." + circuit = /obj/item/circuitboard/computer/exploration_shuttle + shuttleId = "exploration" + possible_destinations = "exploration_home" + req_access = list(ACCESS_EXPLORATION) + +/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration/linkShuttle(new_id) + return + +/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override) + return diff --git a/code/modules/exploration_crew/exploration_vendor.dm b/code/modules/exploration_crew/exploration_vendor.dm new file mode 100644 index 0000000000000..63b177377e3b6 --- /dev/null +++ b/code/modules/exploration_crew/exploration_vendor.dm @@ -0,0 +1,41 @@ +GLOBAL_VAR_INIT(exploration_points, 0) + +/obj/machinery/vendor/exploration + name = "exploration equipment vendor" + desc = "An equipment vendor for exploration teams. Points are acquired by completing missions and shared between team members." + icon = 'icons/obj/machines/mining_machines.dmi' + icon_state = "mining" + density = TRUE + circuit = /obj/item/circuitboard/machine/exploration_equipment_vendor + + icon_deny = "mining-deny" + prize_list = list( + new /datum/data/vendor_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 50), + new /datum/data/vendor_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 300), + new /datum/data/vendor_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 500), + new /datum/data/vendor_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 2000), + new /datum/data/vendor_equipment("Brute Healing Kit", /obj/item/storage/firstaid/brute, 3000), + new /datum/data/vendor_equipment("Burn Healing Kit", /obj/item/storage/firstaid/fire, 3000), + new /datum/data/vendor_equipment("Advanced Healing Kit", /obj/item/storage/firstaid/advanced, 5000), + new /datum/data/vendor_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 2000), + new /datum/data/vendor_equipment("Breaching Charge", /obj/item/grenade/exploration, 1000), + new /datum/data/vendor_equipment("Charge Detonator", /obj/item/exploration_detonator, 10000), + new /datum/data/vendor_equipment("Multi-Purpose Energy Gun", /obj/item/gun/energy/e_gun/mini/exploration, 20000), + new /datum/data/vendor_equipment("Expanded E. Oxygen Tank", /obj/item/tank/internals/emergency_oxygen/engi, 1000), + new /datum/data/vendor_equipment("Survival Knife", /obj/item/kitchen/knife/combat/survival, 1000), + new /datum/data/vendor_equipment("Pizza", /obj/item/pizzabox/margherita, 200), + new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 1000), + new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 1000), + new /datum/data/vendor_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 1500), + new /datum/data/vendor_equipment("Soap", /obj/item/soap/nanotrasen, 2000), + new /datum/data/vendor_equipment("Laser Pointer", /obj/item/laser_pointer, 3000), + new /datum/data/vendor_equipment("Toy Alien", /obj/item/clothing/mask/facehugger/toy, 3000), + ) + +/obj/machinery/vendor/exploration/subtract_points(obj/item/card/id/I, amount) + GLOB.exploration_points -= amount + +/obj/machinery/vendor/exploration/get_points(obj/item/card/id/I) + if(!(ACCESS_EXPLORATION in I.access)) + return 0 + return GLOB.exploration_points diff --git a/code/modules/exploration_crew/nostation_firing_pin.dm b/code/modules/exploration_crew/nostation_firing_pin.dm new file mode 100644 index 0000000000000..76893325dcafd --- /dev/null +++ b/code/modules/exploration_crew/nostation_firing_pin.dm @@ -0,0 +1,15 @@ +/obj/item/firing_pin/off_station + name = "off-station firing pin" + desc = "Allows the firing of weapons while not on the station." + fail_message = "STATION SAFETY ENABLED." + pin_removeable = TRUE + +/obj/item/firing_pin/off_station/pin_auth(mob/living/user) + if(!istype(user)) + return FALSE + var/turf/T = get_turf(user) + if(!T) + return FALSE + if(is_station_level(T.z)) + return FALSE + return TRUE diff --git a/code/modules/exploration_crew/research_locator.dm b/code/modules/exploration_crew/research_locator.dm new file mode 100644 index 0000000000000..77a2ab13d0061 --- /dev/null +++ b/code/modules/exploration_crew/research_locator.dm @@ -0,0 +1,23 @@ + +/obj/item/research_disk_pinpointer + name = "research disk locator" + desc = "A small handheld device that detects nearby research disks. Despite its extremely high sensitivity, the returned signal from research disks is so weak that it only has a short range." + icon = 'icons/obj/device.dmi' + icon_state = "researchlocator" + var/next_use_time = 0 + var/range = 30 + +/obj/item/research_disk_pinpointer/attack_self(mob/user) + if(world.time < next_use_time) + to_chat(user, "Internal capacitors recharging...") + return + to_chat(user, "You pulse for nearby research disks.") + pulse_effect(get_turf(src), 6) + next_use_time = world.time + 10 SECONDS + for(var/obj/item/disk/tech_disk/research/research_disk in SSorbits.research_disks) + var/dist = get_dist(user, research_disk) + if(dist <= range && isturf(research_disk.loc) && research_disk.get_virtual_z_level() == get_virtual_z_level()) + var/direction = get_dir(user, research_disk) + dir = direction + say("Weak signal detected [dir2text(direction)] of current location, [dist] meters away.") + return diff --git a/code/modules/fields/fields.dm b/code/modules/fields/fields.dm index 5b0b4bc1f8940..38cc9f8e66037 100644 --- a/code/modules/fields/fields.dm +++ b/code/modules/fields/fields.dm @@ -154,7 +154,7 @@ var/atom/_host = host var/atom/new_host_loc = _host.loc if(last_host_loc != new_host_loc) - recalculate_field() + INVOKE_ASYNC(src, .proc/recalculate_field) /datum/proximity_monitor/advanced/proc/post_setup_field() @@ -319,6 +319,8 @@ listeningTo = null /obj/item/multitool/field_debug/proc/on_mob_move() + SIGNAL_HANDLER + check_turf(get_turf(src)) /obj/item/multitool/field_debug/process() diff --git a/code/modules/fields/peaceborg_dampener.dm b/code/modules/fields/peaceborg_dampener.dm index 47d7f096c968a..ad62066dcda07 100644 --- a/code/modules/fields/peaceborg_dampener.dm +++ b/code/modules/fields/peaceborg_dampener.dm @@ -38,7 +38,7 @@ for(var/obj/item/projectile/P in tracked) if(!(P in ranged) || !P.loc) release_projectile(P) - for(var/mob/living/silicon/robot/R in range(current_range, get_turf(host))) + for(var/mob/living/silicon/robot/R in ohearers(current_range, get_turf(host))) if(R.has_buckled_mobs()) for(var/mob/living/L in R.buckled_mobs) L.visible_message("[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!") //I know it's bad. diff --git a/code/modules/fields/timestop.dm b/code/modules/fields/timestop.dm index bc5502438f9b2..ff4402b0a90c9 100644 --- a/code/modules/fields/timestop.dm +++ b/code/modules/fields/timestop.dm @@ -42,7 +42,7 @@ timestop() /obj/effect/timestop/Destroy() - qdel(chronofield) + QDEL_NULL(chronofield) playsound(src, 'sound/magic/timeparadox2.ogg', 75, TRUE, frequency = -1) //reverse! return ..() @@ -108,6 +108,8 @@ unfreeze_atom(i) /datum/proximity_monitor/advanced/timestop/proc/unfreeze_atom(atom/movable/A) + SIGNAL_HANDLER + if(A.throwing) unfreeze_throwing(A) if(isliving(A)) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 11fd61c09bf76..fcea44fcfee15 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( /datum/hallucination/weird_sounds = 8, /datum/hallucination/stationmessage = 7, /datum/hallucination/fake_flood = 7, - /datum/hallucination/stray_bullet = 7, + /datum/hallucination/stray_bullet = 3, /datum/hallucination/bolts = 7, /datum/hallucination/items_other = 7, /datum/hallucination/husks = 7, @@ -31,6 +31,11 @@ GLOBAL_LIST_INIT(hallucination_list, list( hallucination-- + //This system used to shit bricks with decimal values. Fuck it. + if(hallucination <= 0) + hallucination = 0 + return + if(world.time < next_hallucination) return @@ -282,10 +287,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( /datum/hallucination/oh_yeah/New(mob/living/carbon/C, forced = TRUE) set waitfor = FALSE . = ..() - var/turf/closed/wall/wall - for(var/turf/closed/wall/W in range(7,target)) - wall = W - break + var/turf/closed/wall/wall = locate() in spiral_range_turfs(7, target) if(!wall) return INITIALIZE_HINT_QDEL feedback_details += "Source: [wall.x],[wall.y],[wall.z]" @@ -420,9 +422,8 @@ GLOBAL_LIST_INIT(hallucination_list, list( var/image/A = null var/list/mob_pool = list() - for(var/mob/living/carbon/human/M in view(7,target)) - if(M != target) - mob_pool += M + for(var/mob/living/carbon/human/M in ohearers(7,target)) + mob_pool += M if(!mob_pool.len) return @@ -518,7 +519,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( feedback_details += "Type: [kind]" var/list/nearby if(skip_nearby) - nearby = get_hearers_in_view(7, target) + nearby = hearers(7, target) for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(H == target) continue @@ -689,31 +690,29 @@ GLOBAL_LIST_INIT(hallucination_list, list( else if(get_dist(target,H) Biohazard Alert") to_chat(target, "Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak. ") - SEND_SOUND(target, 'sound/ai/outbreak5.ogg') + SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_OUTBREAK5]) if("ratvar") target.playsound_local(target, 'sound/machines/clockcult/ark_deathrattle.ogg', 50, FALSE, pressure_affected = FALSE) target.playsound_local(target, 'sound/effects/clockcult_gateway_disrupted.ogg', 50, FALSE, pressure_affected = FALSE) @@ -891,15 +890,15 @@ GLOBAL_LIST_INIT(hallucination_list, list( if("shuttle dock") to_chat(target, " Priority Announcement") to_chat(target, "The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle. ") - SEND_SOUND(target, 'sound/ai/shuttledock.ogg') + SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_SHUTTLEDOCK]) if("malf ai") //AI is doomsdaying! to_chat(target, " Anomaly Alert") to_chat(target, "Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core. ") - SEND_SOUND(target, 'sound/ai/aimalf.ogg') + SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_AIMALF]) if("meteors") //Meteors inbound! to_chat(target, " Meteor Alert") to_chat(target, "Meteors have been detected on collision course with the station. ") - SEND_SOUND(target, 'sound/ai/meteors.ogg') + SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_METEORS]) if("supermatter") SEND_SOUND(target, 'sound/magic/charge.ogg') to_chat(target, "You feel reality distort for a moment...") @@ -930,46 +929,46 @@ GLOBAL_LIST_INIT(hallucination_list, list( feedback_details += "Type: [alert_type]" switch(alert_type) if("not_enough_oxy") - target.throw_alert(alert_type, /obj/screen/alert/not_enough_oxy, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_oxy, override = TRUE) if("not_enough_tox") - target.throw_alert(alert_type, /obj/screen/alert/not_enough_tox, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_tox, override = TRUE) if("not_enough_co2") - target.throw_alert(alert_type, /obj/screen/alert/not_enough_co2, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_co2, override = TRUE) if("too_much_oxy") - target.throw_alert(alert_type, /obj/screen/alert/too_much_oxy, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_oxy, override = TRUE) if("too_much_co2") - target.throw_alert(alert_type, /obj/screen/alert/too_much_co2, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_co2, override = TRUE) if("too_much_tox") - target.throw_alert(alert_type, /obj/screen/alert/too_much_tox, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_tox, override = TRUE) if("nutrition") if(prob(50)) - target.throw_alert(alert_type, /obj/screen/alert/fat, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/fat, override = TRUE) else - target.throw_alert(alert_type, /obj/screen/alert/starving, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/starving, override = TRUE) if("gravity") - target.throw_alert(alert_type, /obj/screen/alert/weightless, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/weightless, override = TRUE) if("fire") - target.throw_alert(alert_type, /obj/screen/alert/fire, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/fire, override = TRUE) if("temphot") alert_type = "temp" - target.throw_alert(alert_type, /obj/screen/alert/hot, 3, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/hot, 3, override = TRUE) if("tempcold") alert_type = "temp" - target.throw_alert(alert_type, /obj/screen/alert/cold, 3, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/cold, 3, override = TRUE) if("pressure") if(prob(50)) - target.throw_alert(alert_type, /obj/screen/alert/highpressure, 2, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/highpressure, 2, override = TRUE) else - target.throw_alert(alert_type, /obj/screen/alert/lowpressure, 2, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/lowpressure, 2, override = TRUE) //BEEP BOOP I AM A ROBOT if("newlaw") - target.throw_alert(alert_type, /obj/screen/alert/newlaw, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/newlaw, override = TRUE) if("locked") - target.throw_alert(alert_type, /obj/screen/alert/locked, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/locked, override = TRUE) if("hacked") - target.throw_alert(alert_type, /obj/screen/alert/hacked, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/hacked, override = TRUE) if("charge") - target.throw_alert(alert_type, /obj/screen/alert/emptycell, override = TRUE) + target.throw_alert(alert_type, /atom/movable/screen/alert/emptycell, override = TRUE) sleep(duration) target.clear_alert(alert_type, clear_override = TRUE) qdel(src) @@ -1044,7 +1043,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( //Flashes of danger if(!target.halimage) var/list/possible_points = list() - for(var/turf/open/floor/F in view(target,world.view)) + for(var/turf/open/floor/F in view(world.view, target)) possible_points += F if(possible_points.len) var/turf/open/floor/danger_point = pick(possible_points) @@ -1116,8 +1115,8 @@ GLOBAL_LIST_INIT(hallucination_list, list( . = ..() START_PROCESSING(SSobj, src) -/obj/effect/hallucination/danger/anomaly/process() - if(prob(70)) +/obj/effect/hallucination/danger/anomaly/process(delta_time) + if(DT_PROB(45, delta_time)) step(src,pick(GLOB.alldirs)) /obj/effect/hallucination/danger/anomaly/Destroy() @@ -1174,7 +1173,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( if(target.client) target.client.images += fire_overlay to_chat(target, "You're set on fire!") - target.throw_alert("fire", /obj/screen/alert/fire, override = TRUE) + target.throw_alert("fire", /atom/movable/screen/alert/fire, override = TRUE) sleep(20) for(var/i in 1 to 3) if(target.fire_stacks <= 0) @@ -1196,7 +1195,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.clear_alert("temp", clear_override = TRUE) else target.clear_alert("temp", clear_override = TRUE) - target.throw_alert("temp", /obj/screen/alert/hot, stage, override = TRUE) + target.throw_alert("temp", /atom/movable/screen/alert/hot, stage, override = TRUE) /datum/hallucination/fire/proc/clear_fire() if(!active) @@ -1253,7 +1252,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( ..() if(!target.halbody) var/list/possible_points = list() - for(var/turf/open/floor/F in view(target,world.view)) + for(var/turf/open/floor/F in view(world.view, target)) possible_points += F if(possible_points.len) var/turf/open/floor/husk_point = pick(possible_points) @@ -1284,8 +1283,10 @@ GLOBAL_LIST_INIT(hallucination_list, list( set waitfor = FALSE ..() var/list/turf/startlocs = list() - for(var/turf/open/T in view(world.view+1,target)-view(world.view,target)) + for(var/turf/open/T in view(getexpandedview(world.view, 1, 1),target)) startlocs += T + for(var/turf/open/T in view(world.view,target)) // God this is bad + startlocs -= T if(!startlocs.len) qdel(src) return diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index c8e837a1245da..e8c274a1992ec 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -257,7 +257,7 @@ /obj/item/reagent_containers/food/drinks/mug/cocoa name = "Dutch hot cocoa" desc = "Made in Space South America." - list_reagents = list(/datum/reagent/consumable/hot_cocoa = 15, /datum/reagent/consumable/sugar = 5) + list_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 15, /datum/reagent/consumable/sugar = 5) foodtype = SUGAR resistance_flags = FREEZE_PROOF custom_price = 42 @@ -279,6 +279,15 @@ list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) foodtype = GRAIN | ALCOHOL +/obj/item/reagent_containers/food/drinks/beer/almost_empty + var/amount + list_reagents = null + +/obj/item/reagent_containers/food/drinks/beer/almost_empty/Initialize() + . = ..() + amount = rand(1,4) + reagents.add_reagent(/datum/reagent/consumable/ethanol/beer, amount) + /obj/item/reagent_containers/food/drinks/syndicatebeer name = "syndicate beer" desc = "Consumed only by the finest syndicate agents. There is a round warning label stating 'Don't drink more than one in quick succession!'" @@ -382,7 +391,21 @@ name = "small carton" desc = "A small carton, intended for holding drinks." +/obj/item/reagent_containers/food/drinks/honeycomb + name = "Honeycomb" + desc = "A honeycomb made by an apid. It seems to be made out of beeswax and fairly weak." + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state = "honeycomb" + list_reagents = list(/datum/reagent/consumable/honey = 25) +/obj/item/reagent_containers/food/drinks/honeycomb/attack_self(mob/user) + if(!reagents.total_volume) + user.visible_message("[user] snaps the [src] into 2 pieces!", + "You snap [src] in half.") + new /obj/item/stack/sheet/mineral/wax(user.loc, 2) + qdel(src) + return + return ..() //////////////////////////drinkingglass and shaker// //Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink @@ -426,6 +449,7 @@ volume = 30 spillable = TRUE + //////////////////////////soda_cans// //These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm @@ -449,7 +473,7 @@ playsound(H,'sound/items/drink.ogg', 80, 1) reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip sleep(5) - H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old fashioned singularity engines anymore.")) + H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old-fashioned singularity engines anymore.")) if(H.age >= 30) H.Stun(50) sleep(50) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index e485f693413d7..5194f1a5c1da8 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -21,10 +21,10 @@ if(isliving(hitby)) var/mob/living/L = hitby smash(L) - else + else smash() return TRUE - + /obj/item/reagent_containers/food/drinks/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE) //Creates a shattering noise and replaces the bottle with a broken_bottle @@ -336,6 +336,24 @@ icon_state = "fernetbottle" list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100) +/obj/item/reagent_containers/food/drinks/bottle/beer + name = "Space Beer" + desc = "Beer. In space. In a bigger bottle." + icon_state = "beer" + list_reagents = list(/datum/reagent/consumable/ethanol/beer = 100) + +/obj/item/reagent_containers/food/drinks/bottle/ale + name = "Magm-Ale" + desc = "A true dorf's drink of choice, now in a MANLY bottle." + icon_state = "alebottle" + list_reagents = list(/datum/reagent/consumable/ethanol/ale = 100) + +/obj/item/reagent_containers/food/drinks/bottle/homemaderum + name = "Cookie's Homemade Rum" + desc = "Brewed all the way back on Space Station 3. Might tell you where those basket-hats of fruit keep coming from." + icon_state = "moonshinebottle" + list_reagents = list(/datum/reagent/consumable/ethanol/rum = 95, /datum/reagent/drug/mushroomhallucinogen = 5) + //////////////////////////JUICES AND STUFF /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/orangejuice diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 184b391203eac..759ba38d44889 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -53,7 +53,7 @@ mix_filling_color(S) S.reagents.trans_to(src,min(S.reagents.total_volume, 15), transfered_by = user) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume. foodtype |= S.foodtype - update_overlays(S) + update_customizable_overlays(S) to_chat(user, "You add the [I.name] to the [name].") update_name(S) else @@ -101,7 +101,7 @@ rgbcolor[4] = (customcolor[4]+ingcolor[4])/2 filling_color = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3], rgbcolor[4]) -/obj/item/reagent_containers/food/snacks/customizable/update_overlays(obj/item/reagent_containers/food/snacks/S) +/obj/item/reagent_containers/food/snacks/customizable/update_customizable_overlays(obj/item/reagent_containers/food/snacks/S) var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling") if(S.filling_color == "#FFFFFF") filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00") @@ -137,7 +137,7 @@ /obj/item/reagent_containers/food/snacks/customizable/initialize_slice(obj/item/reagent_containers/food/snacks/slice, reagents_per_slice) ..() slice.filling_color = filling_color - slice.update_overlays(src) + slice.update_customizable_overlays(src) /obj/item/reagent_containers/food/snacks/customizable/Destroy() diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index a9dfd126c6c6a..b2d4b2cc14797 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -270,7 +270,8 @@ All foods are distributed among various categories. Use common sense. trash = null return -/obj/item/reagent_containers/food/snacks/proc/update_overlays(obj/item/reagent_containers/food/snacks/S) +// We need to refactor this someday, like, in 3 years +/obj/item/reagent_containers/food/snacks/proc/update_customizable_overlays(obj/item/reagent_containers/food/snacks/S) cut_overlays() var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling") if(S.filling_color == "#FFFFFF") @@ -312,6 +313,14 @@ All foods are distributed among various categories. Use common sense. return result +/obj/item/reagent_containers/food/snacks/burn() + if(prob(25)) + microwave_act() + else + var/turf/T = get_turf(src) + new /obj/item/reagent_containers/food/snacks/badrecipe(T) + qdel(src) + /obj/item/reagent_containers/food/snacks/Destroy() if(contents) for(var/atom/movable/something in contents) @@ -323,13 +332,13 @@ All foods are distributed among various categories. Use common sense. if(iscorgi(M)) var/mob/living/L = M if(bitecount == 0 || prob(50)) - M.emote("me", 1, "nibbles away at \the [src]") + M.emote("me", 1, "nibbles away at \the [src].") bitecount++ L.taste(reagents) // why should carbons get all the fun? if(bitecount >= 5) - var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [src] was") - if(sattisfaction_text) - M.emote("me", 1, "[sattisfaction_text]") + var/satisfaction_text = pick("burps from enjoyment.", "yaps for more.", "woofs twice.", "looks at the area where \the [src] was.") + if(satisfaction_text) + M.emote("me", 1, "[satisfaction_text]") qdel(src) /obj/item/reagent_containers/food/snacks/afterattack(obj/item/reagent_containers/M, mob/user, proximity) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 807e4f655160f..26966dea14e97 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -199,6 +199,14 @@ tastes = list("bread" = 1) foodtype = GRAIN +/obj/item/reagent_containers/food/snacks/baguette/mime + name = "French Baguette" + desc = "It would be a shame if it was consumed by someone unworthy..." + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nothing = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/nothing = 2) + bitesize = -1 + + /obj/item/reagent_containers/food/snacks/garlicbread name = "garlic bread" desc = "Alas, it is limited." diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index f5e16c3c93e4d..5cde358161ed3 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/snacks_burgers.dm @@ -383,3 +383,11 @@ if(prob(33)) icon_state = "cheeseburgeralt" +/obj/item/reagent_containers/food/snacks/burger/crazy + name = "crazy hamburger" + desc = "Crazy hamburger! It is horrible!" + icon_state = "crazyhamburger" + tastes = list("bread made in turkey" = 2, "horse meat" = 4, "cheese from sao paulo from brazil" = 3, "red hot chili peppers" = 3, "oil from iraq" = 2, "grass of death" = 3) + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1) + foodtype = GRAIN | MEAT | DAIRY | TOXIC | GROSS | FRUIT + w_class = WEIGHT_CLASS_NORMAL // The crazy hamburger in the video was bigger than joker's hand therefore i think this weight class is adequate. diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index ffc26e5b25fbe..1383b491a834c 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -33,6 +33,12 @@ name = "imitation carp fillet" desc = "Almost just like the real thing, kinda." +/obj/item/reagent_containers/food/snacks/carpmeat/icantbeliveitsnotcarp + name = "fish fillet" + desc = "A fillet of unspecified fish meat." + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2) //No carpotoxin + + /obj/item/reagent_containers/food/snacks/fishfingers name = "fish fingers" desc = "A finger of fish." @@ -123,7 +129,7 @@ /obj/item/reagent_containers/food/snacks/sausage/Initialize() . = ..() - eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") + eatverb = pick("bite","chew","nibble","gobble","chomp") /obj/item/reagent_containers/food/snacks/rawkhinkali name = "raw khinkali" @@ -160,7 +166,7 @@ if(GLOB.total_cube_monkeys >= CONFIG_GET(number/max_cube_monkeys)) visible_message("[src] refuses to expand!") return - var/mob/spammer = get_mob_by_key(fingerprintslast) + var/mob/spammer = get_mob_by_ckey(fingerprintslast) var/mob/living/bananas = new spawned_mob(drop_location(), TRUE, spammer) if(faction) bananas.faction = faction @@ -377,4 +383,4 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bbqsauce = 5) bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("meat" = 3, "smokey sauce" = 1) - foodtype = MEAT \ No newline at end of file + foodtype = MEAT diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 5afeda625f28c..1596c542db543 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -647,3 +647,13 @@ filling_color = "#ECA735" tastes = list("fried corn" = 1) foodtype = JUNKFOOD | FRIED + +/obj/item/reagent_containers/food/snacks/canned/beefbroth + name = "canned beef broth" + desc = "Why does this exist?" + icon_state = "beefcan" + trash = /obj/item/trash/can/food/beefbroth + list_reagents = list(/datum/reagent/consumable/beefbroth = 50) + filling_color = "#100800" + tastes = list("disgust" = 7, "tin" = 1) + foodtype = MEAT | GROSS | JUNKFOOD \ No newline at end of file diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 8e104dcdd52c6..2ec595df8abb5 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -111,7 +111,7 @@ name = "chocolate donut" desc = "Goes great with a glass of warm milk." icon_state = "donut_choc" - bonus_reagents = list(/datum/reagent/consumable/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1) //the cocoa reagent is just bitter. + bonus_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1) //the cocoa reagent is just bitter. tastes = list("donut" = 4, "bitterness" = 1) decorated_icon = "donut_choc_sprinkles" filling_color = "#4F230D" @@ -201,7 +201,7 @@ name = "chocolate jelly donut" desc = "Goes great with a glass of warm milk." icon_state = "jelly_choc" - bonus_reagents = list(/datum/reagent/consumable/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the cocoa reagent is just bitter. + bonus_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the cocoa reagent is just bitter. tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1) decorated_icon = "jelly_choc_sprinkles" filling_color = "#4F230D" @@ -282,7 +282,7 @@ name = "chocolate jelly donut" desc = "Goes great with a glass of warm milk." icon_state = "jelly_choc" - bonus_reagents = list(/datum/reagent/consumable/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the cocoa reagent is just bitter. + bonus_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the cocoa reagent is just bitter. tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1) decorated_icon = "jelly_choc_sprinkles" filling_color = "#4F230D" @@ -601,7 +601,7 @@ /obj/item/reagent_containers/food/snacks/hotdog name = "hotdog" - desc = "Fresh footlong ready to go down on." + desc = "Hot and steamy hotdog weenie." icon_state = "hotdog" bitesize = 3 bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3) @@ -782,22 +782,22 @@ to_chat(user, "You add the [I] to the [name].") P.name = initial(P.name) contents += P - update_overlays(P) + update_customizable_overlays(P) if (P.contents.len) for(var/V in P.contents) P = V P.name = initial(P.name) contents += P - update_overlays(P) + update_customizable_overlays(P) P = I - clearlist(P.contents) + P.contents.Cut() return else if(contents.len) var/obj/O = contents[contents.len] return O.attackby(I, user, params) ..() -/obj/item/reagent_containers/food/snacks/pancakes/update_overlays(obj/item/reagent_containers/food/snacks/P) +/obj/item/reagent_containers/food/snacks/pancakes/update_customizable_overlays(obj/item/reagent_containers/food/snacks/P) var/mutable_appearance/pancake = mutable_appearance(icon, "[P.item_state]_[rand(1,3)]") pancake.pixel_x = rand(-1,1) pancake.pixel_y = 3 * contents.len - 1 diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index c5e0b7651dcf2..76f2db7e638d8 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -52,7 +52,7 @@ H.Paralyze(20) //splat! H.adjust_blurriness(1) H.visible_message("[H] is creamed by [src]!", "You've been creamed by [src]!") - playsound(H, "desceration", 50, TRUE) + playsound(H, "desecration", 50, TRUE) if(!H.creamed) // one layer at a time H.add_overlay(creamoverlay) H.creamed = TRUE diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index cb2ea093ca3d3..91cb43b0006e3 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -177,7 +177,7 @@ l_arm.dismember() else r_arm.dismember() - playsound(user,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, TRUE, -1) + playsound(user,pick('sound/misc/desecration-01.ogg','sound/misc/desecration-02.ogg','sound/misc/desecration-01.ogg') ,50, TRUE, -1) /obj/item/reagent_containers/food/snacks/proc/i_kill_you(obj/item/I, mob/user) if(istype(I, /obj/item/reagent_containers/food/snacks/pineappleslice)) diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 727b17d8e783d..28b69a5a85266 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -20,6 +20,9 @@ God bless America. - */ +#define DEEPFRYER_COOKTIME 60 +#define DEEPFRYER_BURNTIME 120 + /obj/machinery/deepfryer name = "deep fryer" desc = "Deep fried everything." @@ -31,7 +34,7 @@ God bless America. layer = BELOW_OBJ_LAYER var/obj/item/reagent_containers/food/snacks/deepfryholder/frying //What's being fried RIGHT NOW? var/cook_time = 0 - var/oil_use = 0.05 //How much cooking oil is used per tick + var/oil_use = 0.025 //How much cooking oil is used per second var/fry_speed = 1 //How quickly we fry food var/frying_fried //If the object has been fried; used for messages var/frying_burnt //If the object has been burnt @@ -42,6 +45,7 @@ God bless America. /obj/item/wirecutters, /obj/item/multitool, /obj/item/weldingtool, + /obj/item/powertool, /obj/item/reagent_containers/glass, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/food/condiment, @@ -60,11 +64,15 @@ God bless America. RefreshParts() fry_loop = new(list(src), FALSE) +/obj/machinery/deepfryer/Destroy() + QDEL_NULL(fry_loop) + return ..() + /obj/machinery/deepfryer/RefreshParts() var/oil_efficiency for(var/obj/item/stock_parts/micro_laser/M in component_parts) oil_efficiency += M.rating - oil_use = initial(oil_use) - (oil_efficiency * 0.0095) + oil_use = initial(oil_use) - (oil_efficiency * 0.00475) fry_speed = oil_efficiency /obj/machinery/deepfryer/examine(mob/user) @@ -72,7 +80,7 @@ God bless America. if(frying) . += "You can make out \a [frying] in the oil." if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Frying at [fry_speed*100]% speed. Using [oil_use*10] units of oil per second." + . += "The status display reads: Frying at [fry_speed*100]% speed. Using [oil_use] units of oil per second." /obj/machinery/deepfryer/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/reagent_containers/pill)) @@ -110,20 +118,20 @@ God bless America. icon_state = "fryer_on" fry_loop.start() -/obj/machinery/deepfryer/process() +/obj/machinery/deepfryer/process(delta_time) ..() var/datum/reagent/consumable/cooking_oil/C = reagents.has_reagent(/datum/reagent/consumable/cooking_oil) if(!C) return reagents.chem_temp = C.fry_temperature if(frying) - reagents.trans_to(frying, oil_use, multiplier = fry_speed * 3) //Fried foods gain more of the reagent thanks to space magic - cook_time += fry_speed - if(cook_time >= 30 && !frying_fried) + reagents.trans_to(frying, oil_use * delta_time, multiplier = fry_speed * 3) //Fried foods gain more of the reagent thanks to space magic + cook_time += fry_speed * delta_time + if(cook_time >= DEEPFRYER_COOKTIME && !frying_fried) frying_fried = TRUE //frying... frying... fried playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) audible_message("[src] dings!") - else if (cook_time >= 60 && !frying_burnt) + else if (cook_time >= DEEPFRYER_BURNTIME && !frying_burnt) frying_burnt = TRUE visible_message("[src] emits an acrid smell!") @@ -158,3 +166,6 @@ God bless America. C.Paralyze(60) user.changeNext_move(CLICK_CD_MELEE) return ..() + +#undef DEEPFRYER_COOKTIME +#undef DEEPFRYER_BURNTIME diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm index 893d40819bb9f..22a76ff6962c3 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm @@ -27,35 +27,6 @@ QDEL_NULL(mixer) return ..() -/obj/machinery/food_cart/ui_interact(mob/user) - . = ..() - var/dat - dat += " STORED INGREDIENTS AND DRINKS "
- dat += "Remaining glasses: [glasses] " - dat += "Portion: [portion] " - for(var/datum/reagent/R in reagents.reagent_list) - dat += "[R.name]: [R.volume] " - dat += "Purge" - if (glasses > 0) - dat += "Pour in a glass" - dat += "Add to the mixer " - dat += " MIXER CONTENTS "
- for(var/datum/reagent/R in mixer.reagents.reagent_list)
- dat += "[R.name]: [R.volume] "
- dat += "Transfer back"
- if (glasses > 0)
- dat += "Pour in a glass"
- dat += " " - dat += " STORED FOOD "
- for(var/V in stored_food)
- if(stored_food[V] > 0)
- dat += "[V]: [stored_food[V]] Dispense " - dat += " Refresh Close" - - var/datum/browser/popup = new(user, "foodcart","Food Cart", 500, 350, src) - popup.set_content(dat) - popup.open() - /obj/machinery/food_cart/proc/isFull() return food_stored >= STORAGE_CAPACITY @@ -104,12 +75,43 @@ . = ..() updateDialog() +/obj/machinery/food_cart/ui_interact(mob/user) + . = ..() + var/dat + dat += " STORED INGREDIENTS AND DRINKS "
+ dat += "Remaining glasses: [glasses] " + dat += "Portion: [portion] " + for(var/i in 1 to LAZYLEN(reagents.reagent_list)) + var/datum/reagent/R = reagents.reagent_list[i] + dat += "[R.name]: [R.volume] " + dat += "Purge" + if (glasses > 0) + dat += "Pour in a glass" + dat += "Add to the mixer " + dat += " MIXER CONTENTS "
+ for(var/i in 1 to LAZYLEN(mixer.reagents.reagent_list))
+ var/datum/reagent/R = mixer.reagents.reagent_list[i]
+ dat += "[R.name]: [R.volume] "
+ dat += "Transfer back"
+ if (glasses > 0)
+ dat += "Pour in a glass"
+ dat += " " + dat += " STORED FOOD "
+ for(var/V in stored_food)
+ if(stored_food[V] > 0)
+ dat += "[V]: [stored_food[V]] Dispense " + dat += " Refresh Close" + + var/datum/browser/popup = new(user, "foodcart","Food Cart", 500, 350, src) + popup.set_content(dat) + popup.open() + /obj/machinery/food_cart/Topic(href, href_list) if(..()) return if(href_list["disposeI"]) - reagents.del_reagent(href_list["disposeI"]) + reagents.del_reagent(reagents.reagent_list[text2num(href_list["disposeI"])]?.type) if(href_list["dispense"]) if(stored_food[href_list["dispense"]]-- <= 0) @@ -130,16 +132,16 @@ else var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = new(loc) if(href_list["pour"]) - reagents.trans_id_to(DG, href_list["pour"], portion) + reagents.trans_id_to(DG, reagents.reagent_list[text2num(href_list["pour"])]?.type, portion) if(href_list["m_pour"]) - mixer.reagents.trans_id_to(DG, href_list["m_pour"], portion) + mixer.reagents.trans_id_to(DG, mixer.reagents.reagent_list[text2num(href_list["m_pour"])]?.type, portion) if(href_list["mix"]) - if(reagents.trans_id_to(mixer, href_list["mix"], portion) == 0) + if(!reagents.trans_id_to(mixer, reagents.reagent_list[text2num(href_list["mix"])]?.type, portion)) to_chat(usr, "[mixer] is full!") if(href_list["transfer"]) - if(mixer.reagents.trans_id_to(src, href_list["transfer"], portion) == 0) + if(!mixer.reagents.trans_id_to(src, mixer.reagents.reagent_list[text2num(href_list["transfer"])]?.type, portion)) to_chat(usr, "[src] is full!") updateDialog() @@ -154,6 +156,25 @@ new /obj/item/stack/sheet/iron(loc, 4) qdel(src) +/obj/machinery/food_cart/coffee + name = "coffee cart" + desc = "Ah! The bitter drink of the Gods." + icon_state = "icecream_vat" + glasses = 10 + portion = 20 + +/obj/machinery/food_cart/coffee/Initialize() + ..() + var/A = rand(0,3) + var/B = rand(0,3) + var/C = rand(0,3) + var/D = rand(0,1) + reagents.add_reagent(/datum/reagent/consumable/cafe_latte, A*20) + reagents.add_reagent(/datum/reagent/consumable/icecoffee, B*20) + reagents.add_reagent(/datum/reagent/consumable/soy_latte, C*20) + reagents.add_reagent(/datum/reagent/consumable/pumpkin_latte, D*20) + reagents.add_reagent(/datum/reagent/consumable/coffee, (10-A-B-C-D)*20) + #undef STORAGE_CAPACITY #undef LIQUID_CAPACIY #undef MIXER_CAPACITY diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 8756ab4fbfcf5..067169c2cbe8e 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -33,10 +33,10 @@ /obj/machinery/gibber/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Outputting [meat_produced] meat slab(s) after [gibtime*0.1] seconds of processing." + . += "The status display reads: Outputting [meat_produced] meat slab(s) after [gibtime*0.1] seconds of processing." for(var/obj/item/stock_parts/manipulator/M in component_parts) if(M.rating >= 2) - . += "Gibber has been upgraded to process inorganic materials." + . += "Gibber has been upgraded to process inorganic materials." /obj/machinery/gibber/update_icon() cut_overlays() diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index e2ec15c1854c4..7d7ab765dc02c 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -1,5 +1,8 @@ //I JUST WANNA GRILL FOR GOD'S SAKE +#define GRILL_FUELUSAGE_IDLE 0.5 +#define GRILL_FUELUSAGE_ACTIVE 5 + /obj/machinery/grill name = "grill" desc = "Just like the old days." @@ -20,7 +23,7 @@ /obj/machinery/grill/update_icon() if(grilled_item) icon_state = "grill" - else if(grill_fuel) + else if(grill_fuel > 0) icon_state = "grill_on" else icon_state = "grill_open" @@ -62,21 +65,21 @@ return ..() -/obj/machinery/grill/process() +/obj/machinery/grill/process(delta_time) ..() update_icon() - if(!grill_fuel) + if(grill_fuel <= 0) return else - grill_fuel -= 1 - if(prob(1)) + grill_fuel -= GRILL_FUELUSAGE_IDLE * delta_time + if(DT_PROB(0.5, delta_time)) var/datum/effect_system/smoke_spread/bad/smoke = new smoke.set_up(1, loc) smoke.start() if(grilled_item) - grill_time += 1 - grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 1) - grill_fuel -= 10 + grill_time += delta_time + grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 0.5 * delta_time) + grill_fuel -= GRILL_FUELUSAGE_ACTIVE * delta_time grilled_item.AddComponent(/datum/component/sizzle) /obj/machinery/grill/Exited(atom/movable/AM) @@ -86,6 +89,7 @@ ..() /obj/machinery/grill/Destroy() + QDEL_NULL(grill_loop) grilled_item = null . = ..() @@ -118,19 +122,19 @@ return ..() /obj/machinery/grill/proc/finish_grill() - switch(grill_time) //no 0-9 to prevent spam - if(10 to 15) + switch(grill_time) //no 0-20 to prevent spam + if(20 to 30) grilled_item.name = "lightly-grilled [grilled_item.name]" grilled_item.desc = "[grilled_item.desc] It's been lightly grilled." - if(16 to 39) + if(30 to 80) grilled_item.name = "grilled [grilled_item.name]" grilled_item.desc = "[grilled_item.desc] It's been grilled." grilled_item.foodtype |= FRIED - if(40 to 50) + if(80 to 100) grilled_item.name = "heavily grilled [grilled_item.name]" grilled_item.desc = "[grilled_item.desc] It's been heavily grilled." grilled_item.foodtype |= FRIED - if(51 to INFINITY) //grill marks reach max alpha + if(100 to INFINITY) //grill marks reach max alpha grilled_item.name = "Powerfully Grilled [grilled_item.name]" grilled_item.desc = "A [grilled_item.name]. Reminds you of your wife, wait, no, it's prettier!" grilled_item.foodtype |= FRIED @@ -139,3 +143,6 @@ /obj/machinery/grill/unwrenched anchored = FALSE + +#undef GRILL_FUELUSAGE_IDLE +#undef GRILL_FUELUSAGE_ACTIVE diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 4125b21494c06..4729824db5d13 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -40,6 +40,7 @@ /obj/machinery/microwave/Destroy() eject() + QDEL_NULL(soundloop) if(wires) QDEL_NULL(wires) . = ..() @@ -83,9 +84,9 @@ . += "\The [src] is empty." if(!(stat & (NOPOWER|BROKEN))) - . += {"The status display reads:\n - - Capacity: [max_n_of_items] items.\n - - Cook time reduced by [(efficiency - 1) * 25]%."} + . += "The status display reads:\n"+\ + "- Capacity: [max_n_of_items] items.\n"+\ + "- Cook time reduced by [(efficiency - 1) * 25]%." /obj/machinery/microwave/update_icon() if(broken) @@ -146,10 +147,13 @@ to_chat(user, "You need more space cleaner!") return TRUE - if(istype(O, /obj/item/soap)) - var/obj/item/soap/P = O + if(istype(O, /obj/item/soap) || istype(O, /obj/item/reagent_containers/glass/rag)) + var/cleanspeed = 50 + if(istype(O, /obj/item/soap)) + var/obj/item/soap/used_soap = O + cleanspeed = used_soap.cleanspeed user.visible_message("[user] starts to clean \the [src].", "You start to clean \the [src]...") - if(do_after(user, P.cleanspeed, target = src)) + if(do_after(user, cleanspeed, target = src)) user.visible_message("[user] has cleaned \the [src].", "You clean \the [src].") dirty = 0 update_icon() @@ -252,8 +256,8 @@ break start() -/obj/machinery/microwave/proc/turn_on() - visible_message("\The [src] turns on.", "You hear a microwave humming.") +/obj/machinery/microwave/proc/wzhzhzh() + visible_message("\The [src] turns on.", null, "You hear a microwave humming.") operating = TRUE set_light(1.5) @@ -271,15 +275,15 @@ #define MICROWAVE_PRE 2 /obj/machinery/microwave/proc/start() - turn_on() + wzhzhzh() loop(MICROWAVE_NORMAL, 10) /obj/machinery/microwave/proc/start_can_fail() - turn_on() + wzhzhzh() loop(MICROWAVE_PRE, 4) /obj/machinery/microwave/proc/muck() - turn_on() + wzhzhzh() playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) dirty_anim_playing = TRUE update_icon() diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 5722601ad5522..bf8ae8047e56b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) /obj/machinery/monkey_recycler/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Producing [cube_production] cubes for every monkey inserted." + . += "The status display reads: Producing [cube_production] cubes for every monkey inserted." /obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O)) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index e31b9e6eddc4c..479416615af80 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -14,6 +14,7 @@ var/processing = FALSE var/rating_speed = 1 var/rating_amount = 1 + processing_flags = NONE /obj/machinery/processor/RefreshParts() for(var/obj/item/stock_parts/matter_bin/B in component_parts) @@ -24,7 +25,7 @@ /obj/machinery/processor/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Outputting [rating_amount] item(s) at [rating_speed*100]% speed." + . += "The status display reads: Outputting [rating_amount] item(s) at [rating_speed*100]% speed." /obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what) if (recipe.output && loc && !QDELETED(src)) @@ -153,11 +154,13 @@ /obj/machinery/processor/slime name = "slime processor" desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating." + var/sbacklogged = FALSE /obj/machinery/processor/slime/Initialize() . = ..() var/obj/item/circuitboard/machine/B = new /obj/item/circuitboard/machine/processor/slime(null) B.apply_default_parts(src) + proximity_monitor = new(src, 1) /obj/machinery/processor/slime/adjust_item_drop_location(atom/movable/AM) var/static/list/slimecores = subtypesof(/obj/item/slime_extract) @@ -173,36 +176,31 @@ AM.pixel_y = -8 + (round(ii/3)*8) return i -/obj/machinery/processor/slime/process() - if(processing) - return - var/mob/living/simple_animal/slime/picked_slime - for(var/mob/living/simple_animal/slime/slime in range(1,src)) - if(slime.loc == src) - continue - if(istype(slime, /mob/living/simple_animal/slime)) - if(slime.stat) - picked_slime = slime - break - if(!picked_slime) - return - var/datum/food_processor_process/P = select_recipe(picked_slime) - if (!P) - return - - visible_message("[picked_slime] is sucked into [src].") - picked_slime.forceMove(src) +/obj/machinery/processor/slime/interact(mob/user) + . = ..() + if(sbacklogged) + for(var/mob/living/simple_animal/slime/AM in ohearers(1,src)) //fallback in case slimes got placed while processor was active triggers only after processing!!!! + if(AM.stat == DEAD) + visible_message("[AM] is sucked into [src].") + AM.forceMove(src) + sbacklogged = FALSE + +/obj/machinery/processor/slime/HasProximity(mob/AM) + if(!sbacklogged && istype(AM, /mob/living/simple_animal/slime) && AM.stat == DEAD) + if(processing) + sbacklogged = TRUE + else + visible_message("[AM] is sucked into [src].") + AM.forceMove(src) /obj/machinery/processor/slime/process_food(datum/food_processor_process/recipe, atom/movable/what) var/mob/living/simple_animal/slime/S = what if (istype(S)) var/C = S.cores - if(S.stat != DEAD) - S.forceMove(drop_location()) - S.visible_message("[C] crawls free of the processor!") - return for(var/i in 1 to (C+rating_amount-1)) - var/atom/movable/item = new S.coretype(drop_location()) + var/obj/item/slime_extract/item = new S.coretype(drop_location()) + if(S.transformeffects & SLIME_EFFECT_GOLD) + item.sparkly = TRUE adjust_item_drop_location(item) SSblackbox.record_feedback("tally", "slime_core_harvested", 1, S.colour) ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index c6608e416b60b..ad8f98caea03e 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -39,7 +39,7 @@ /obj/machinery/smartfridge/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: This unit can hold a maximum of [max_n_of_items] items." + . += "The status display reads: This unit can hold a maximum of [max_n_of_items] items." /obj/machinery/smartfridge/power_change() ..() @@ -73,7 +73,7 @@ cut_overlays() if(panel_open) add_overlay("[initial(icon_state)]-panel") - updateUsrDialog() + ui_update() return if(default_pry_open(O)) @@ -84,7 +84,6 @@ return if(default_deconstruction_crowbar(O)) - updateUsrDialog() return if(!stat) @@ -96,7 +95,6 @@ if(accept_check(O)) load(O) user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].") - updateUsrDialog() if (visible_contents) update_icon() return TRUE @@ -110,7 +108,6 @@ if(accept_check(G)) load(G) loaded++ - updateUsrDialog() if(loaded) if(contents.len >= max_n_of_items) @@ -128,21 +125,40 @@ to_chat(user, "There is nothing in [O] to put in [src]!") return FALSE + if(istype(O, /obj/item/organ_storage)) + var/obj/item/organ_storage/S = O + if(S.contents.len) + var/obj/item/I = S.contents[1] + if(accept_check(I)) + load(I) + user.visible_message("[user] inserts \the [I] into \the [src].", \ + "You insert \the [I] into \the [src].") + O.cut_overlays() + O.icon_state = "evidenceobj" + O.desc = "A container for holding body parts." + if(visible_contents) + update_icon() + return TRUE + else + to_chat(user, "[src] does not accept [I]!") + return FALSE + else + to_chat(user, "There is nothing in [O] to put into [src]!") + return FALSE + if(user.a_intent != INTENT_HARM) to_chat(user, "\The [src] smartly refuses [O].") - updateUsrDialog() return FALSE else return ..() -/obj/machinery/smartfridge/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) +/obj/machinery/smartfridge/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) if(!stat) - if (istype(AM, /obj/item)) + if (istype(AM, /obj/item)) var/obj/item/O = AM if(contents.len < max_n_of_items && accept_check(O)) load(O) - updateUsrDialog() if (visible_contents) update_icon() return TRUE @@ -161,13 +177,16 @@ to_chat(usr, "\the [O] is stuck to your hand, you cannot put it in \the [src]!") return FALSE else - return TRUE + . = TRUE else if(SEND_SIGNAL(O.loc, COMSIG_CONTAINS_STORAGE)) - return SEND_SIGNAL(O.loc, COMSIG_TRY_STORAGE_TAKE, O, src) + . = SEND_SIGNAL(O.loc, COMSIG_TRY_STORAGE_TAKE, O, src) else O.forceMove(src) - return TRUE + . = TRUE + + if(.) + ui_update() ///Really simple proc, just moves the object "O" into the hands of mob "M" if able, done so I could modify the proc a little for the organ fridge /obj/machinery/smartfridge/proc/dispense(obj/item/O, var/mob/M) @@ -226,28 +245,21 @@ else desired = input("How many items?", "How many items would you like to take out?", 1) as null|num - if(QDELETED(src) || QDELETED(usr) || !usr.Adjacent(src)) // Sanity checkin' in case stupid stuff happens while we wait for input() - return FALSE + if(!isnum_safe(desired) || desired <= 0) + return - if(desired == 1 && Adjacent(usr) && !issilicon(usr)) - for(var/obj/item/O in src) - if(O.name == params["name"]) - dispense(O, usr) - break - if (visible_contents) - update_icon() - return TRUE + if(QDELETED(src) || QDELETED(usr) || !usr.Adjacent(src)) // Sanity checkin' in case stupid stuff happens while we wait for input() + return for(var/obj/item/O in src) - if(desired <= 0) - break if(O.name == params["name"]) dispense(O, usr) desired-- - if (visible_contents) + . = TRUE + if(desired <= 0) + break + if (visible_contents && .) update_icon() - return TRUE - return FALSE // ---------------------------- @@ -341,7 +353,11 @@ S.forceMove(drop_location()) else var/dried = S.dried_type - new dried(drop_location()) + dried = new dried(drop_location()) + if(istype(dried, /obj/item/reagent_containers)) // If the product is a reagent container, transfer reagents + var/obj/item/reagent_containers/R = dried + R.reagents.clear_reagents() + S.reagents.copy_to(R) qdel(S) return TRUE for(var/obj/item/stack/sheet/wetleather/WL in src) @@ -422,14 +438,14 @@ /obj/machinery/smartfridge/organ/RefreshParts() for(var/obj/item/stock_parts/matter_bin/B in component_parts) max_n_of_items = 20 * B.rating - repair_rate = max(0, STANDARD_ORGAN_HEALING * (B.rating - 1)) + repair_rate = max(0, STANDARD_ORGAN_HEALING * (B.rating - 1) * 0.5) -/obj/machinery/smartfridge/organ/process() +/obj/machinery/smartfridge/organ/process(delta_time) for(var/organ in contents) var/obj/item/organ/O = organ if(!istype(O)) return - O.applyOrganDamage(-repair_rate) + O.applyOrganDamage(-repair_rate * delta_time) /obj/machinery/smartfridge/organ/Exited(obj/item/organ/AM, atom/newLoc) . = ..() diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index ceb58da11375b..0ee7479a0bba5 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -25,11 +25,11 @@ var/obj/item/bombcore/miniature/pizza/bomb var/bomb_active = FALSE // If the bomb is counting down. var/bomb_defused = TRUE // If the bomb is inert. - var/bomb_timer = 1 // How long before blowing the bomb. - /// Min bomb timer allowed + var/bomb_timer = 1 // How long before blowing the bomb, in seconds. + /// Min bomb timer allowed in seconds var/bomb_timer_min = 1 - /// Max bomb timer allower - var/bomb_timer_max = 10 + /// Max bomb timer allower in seconds + var/bomb_timer_max = 20 /obj/item/pizzabox/Initialize() . = ..() @@ -105,6 +105,7 @@ if(open && !bomb_defused) audible_message("[icon2html(src, hearers(src))] *beep*") bomb_active = TRUE + wires.ui_update() START_PROCESSING(SSobj, src) update_icon() @@ -131,10 +132,11 @@ if (isnull(bomb_timer)) return - bomb_timer = clamp(CEILING(bomb_timer / 2, 1), bomb_timer_min, bomb_timer_max) + bomb_timer = clamp(CEILING(bomb_timer, 1), bomb_timer_min, bomb_timer_max) bomb_defused = FALSE + wires.ui_update() - log_bomber(user, "has trapped a", src, "with [bomb] set to [bomb_timer * 2] seconds") + log_bomber(user, "has trapped a", src, "with [bomb] set to [bomb_timer] seconds") bomb.adminlog = "The [bomb.name] in [src.name] that [key_name(user)] activated has detonated!" to_chat(user, "You trap [src] with [bomb].") @@ -213,10 +215,10 @@ to_chat(user, "That's not a pizza!") ..() -/obj/item/pizzabox/process() +/obj/item/pizzabox/process(delta_time) if(bomb_active && !bomb_defused && (bomb_timer > 0)) - playsound(loc, 'sound/items/timer.ogg', 50, 0) - bomb_timer-- + playsound(loc, 'sound/items/timer.ogg', 50, FALSE) + bomb_timer -= delta_time if(bomb_active && !bomb_defused && (bomb_timer <= 0)) if(bomb in src) bomb.detonate() @@ -226,6 +228,7 @@ if(bomb_defused && (bomb in src)) bomb.defuse() bomb_active = FALSE + wires.ui_update() unprocess() return diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 09d3225e4e708..cc36bad640428 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -606,7 +606,7 @@ id = /datum/reagent/consumable/ethanol/quintuple_sec results = list(/datum/reagent/consumable/ethanol/quintuple_sec = 15) required_reagents = list(/datum/reagent/consumable/ethanol/quadruple_sec = 5, /datum/reagent/consumable/clownstears = 5, /datum/reagent/consumable/ethanol/syndicatebomb = 5) - mix_message = "Judgement is upon you." + mix_message = "Judgment is upon you." mix_sound = 'sound/items/airhorn2.ogg' /datum/chemical_reaction/bastion_bourbon @@ -656,7 +656,7 @@ name = "Peppermint Patty" id = /datum/reagent/consumable/ethanol/peppermint_patty results = list(/datum/reagent/consumable/ethanol/peppermint_patty = 10) - required_reagents = list(/datum/reagent/consumable/hot_cocoa = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1) + required_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1) mix_message = "The cocoa turns mint green just as the strong scent hits your nose." /datum/chemical_reaction/alexander @@ -840,3 +840,9 @@ id = /datum/reagent/consumable/ethanol/beesknees results = list(/datum/reagent/consumable/ethanol/beesknees = 4) required_reagents = list(/datum/reagent/consumable/ethanol/mead = 1, /datum/reagent/consumable/honey = 1, /datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/lemonjuice = 1) + +/datum/chemical_reaction/beeffizz + name = "Beef Fizz" + id = /datum/reagent/consumable/ethanol/beeffizz + results = list(/datum/reagent/consumable/ethanol/beeffizz = 10) + required_reagents = list(/datum/reagent/consumable/beefbroth = 7, /datum/reagent/consumable/ice = 2, /datum/reagent/consumable/lemonjuice = 1 ) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 5503ecc0b25a0..3a126cf8bee5a 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -47,8 +47,8 @@ /datum/chemical_reaction/hot_cocoa name = "Hot Cocoa" - id = /datum/reagent/consumable/hot_cocoa - results = list(/datum/reagent/consumable/hot_cocoa = 5) + id = /datum/reagent/consumable/cocoa/hot_cocoa + results = list(/datum/reagent/consumable/cocoa/hot_cocoa = 5) required_reagents = list(/datum/reagent/water = 5, /datum/reagent/consumable/cocoa = 1) /datum/chemical_reaction/coffee diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm index eab3cc0707da3..8a53b95cb8690 100644 --- a/code/modules/food_and_drinks/recipes/processor_recipes.dm +++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm @@ -51,4 +51,8 @@ /datum/food_processor_process/mob/slime input = /mob/living/simple_animal/slime output = null - required_machine = /obj/machinery/processor/slime \ No newline at end of file + required_machine = /obj/machinery/processor/slime + +/datum/food_processor_process/fish + input = /obj/item/fish + output = /obj/item/reagent_containers/food/snacks/carpmeat/icantbeliveitsnotcarp \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index 6d08137d49342..6c315a2747a76 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -115,3 +115,13 @@ ) result = /mob/living/simple_animal/pet/cat/breadcat subcategory = CAT_BREAD + +/datum/crafting_recipe/food/hotdog + name = "Hot dog" + reqs = list( + /datum/reagent/consumable/ketchup = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/sausage = 1 + ) + result = /obj/item/reagent_containers/food/snacks/hotdog + subcategory = CAT_BREAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index 0bb2b970ca2a3..a35a6025988fb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -368,3 +368,17 @@ ) result = /obj/item/reagent_containers/food/snacks/burger/chicken subcategory = CAT_BURGER + +/datum/crafting_recipe/food/crazyhamburger + name = "Crazy Hamburger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, // we have no horse meat sadly + /obj/item/reagent_containers/food/snacks/grown/chili = 2, + /datum/reagent/consumable/cooking_oil = 20, + /obj/item/reagent_containers/food/snacks/grown/nettle/death = 2, // closest thing to "grass of death" + /obj/item/reagent_containers/food/snacks/cheesewedge = 4, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/crazy + subcategory = CAT_BURGER + diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm index 1cb57f78f748d..e2b13d4b0f2bc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm @@ -114,3 +114,12 @@ time = 10 reqs = list(/obj/item/stack/sheet/cardboard = 1) category = CAT_DRINK + +/datum/crafting_recipe/honeycomb + name = "Honeycomb" + result = /obj/item/reagent_containers/food/drinks/honeycomb + always_available = FALSE + time = 30 + reqs = list(/datum/reagent/consumable/sugar = 50) + category = CAT_DRINK + diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 40f24280943cf..0f248e3afcc03 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -23,7 +23,7 @@ ) result = /obj/item/reagent_containers/food/snacks/donut/chaos -datum/crafting_recipe/food/donut/meat +/datum/crafting_recipe/food/donut/meat time = 15 name = "Meat donut" reqs = list( @@ -444,16 +444,6 @@ datum/crafting_recipe/food/donut/meat ////////////////////////////////////////////OTHER//////////////////////////////////////////// -/datum/crafting_recipe/food/hotdog - name = "Hot dog" - reqs = list( - /datum/reagent/consumable/ketchup = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/sausage = 1 - ) - result = /obj/item/reagent_containers/food/snacks/hotdog - subcategory = CAT_PASTRY - /datum/crafting_recipe/food/meatbun name = "Meat bun" reqs = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 0cc5f67f94b31..41a3756673803 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -140,7 +140,7 @@ /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, /obj/item/reagent_containers/food/snacks/grown/banana = 1, - /obj/item/stack/ore/bananium = 1 + /obj/item/stack/sheet/mineral/bananium = 1 ) result = /obj/item/reagent_containers/food/snacks/soup/clownstears subcategory = CAT_SOUP @@ -269,4 +269,4 @@ /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 1 ) result = /obj/item/reagent_containers/food/snacks/soup/electron - subcategory = CAT_SOUP \ No newline at end of file + subcategory = CAT_SOUP diff --git a/code/modules/guardian/abilities/major/assassin.dm b/code/modules/guardian/abilities/major/assassin.dm index 3569ba88e59ad..27994c798344b 100644 --- a/code/modules/guardian/abilities/major/assassin.dm +++ b/code/modules/guardian/abilities/major/assassin.dm @@ -10,8 +10,8 @@ arrow_weight = 0.9 var/next_stealth = 0 var/stealthcooldown = 0 - var/obj/screen/alert/canstealthalert - var/obj/screen/alert/instealthalert + var/atom/movable/screen/alert/canstealthalert + var/atom/movable/screen/alert/instealthalert /datum/guardian_ability/major/assassin/Apply() @@ -68,12 +68,12 @@ if(next_stealth <= world.time) if(mode) if(!instealthalert) - instealthalert = guardian.throw_alert("instealth", /obj/screen/alert/instealth) + instealthalert = guardian.throw_alert("instealth", /atom/movable/screen/alert/instealth) guardian.clear_alert("canstealth") canstealthalert = null else if(!canstealthalert) - canstealthalert = guardian.throw_alert("canstealth", /obj/screen/alert/canstealth) + canstealthalert = guardian.throw_alert("canstealth", /atom/movable/screen/alert/canstealth) guardian.clear_alert("instealth") instealthalert = null else diff --git a/code/modules/guardian/abilities/major/explosive.dm b/code/modules/guardian/abilities/major/explosive.dm index 4bc3d7963c83f..b015db7dad833 100644 --- a/code/modules/guardian/abilities/major/explosive.dm +++ b/code/modules/guardian/abilities/major/explosive.dm @@ -14,11 +14,11 @@ /datum/guardian_ability/major/explosive/Apply() . = ..() - guardian.verbs += /mob/living/simple_animal/hostile/guardian/proc/DetonateBomb + guardian.add_verb(/mob/living/simple_animal/hostile/guardian/proc/DetonateBomb) /datum/guardian_ability/major/explosive/Remove() . = ..() - guardian.verbs -= /mob/living/simple_animal/hostile/guardian/proc/DetonateBomb + guardian.remove_verb(/mob/living/simple_animal/hostile/guardian/proc/DetonateBomb) /datum/guardian_ability/major/explosive/Attack(atom/target) if(prob(40) && isliving(target)) @@ -26,7 +26,7 @@ if(!M.anchored && M != guardian.summoner?.current && !guardian.hasmatchingsummoner(M)) new /obj/effect/temp_visual/guardian/phase/out(get_turf(M)) do_teleport(M, M, 10, channel = TELEPORT_CHANNEL_BLUESPACE) - for(var/mob/living/L in range(1, M)) + for(var/mob/living/L in hearers(1, M)) if(guardian.hasmatchingsummoner(L)) //if the summoner matches don't hurt them continue if(L != guardian && L != guardian.summoner?.current) @@ -51,6 +51,8 @@ to_chat(guardian, "Your powers are on cooldown! You must wait 20 seconds between bombs.") /datum/guardian_ability/major/explosive/proc/kaboom(atom/source, mob/living/explodee) + SIGNAL_HANDLER + if(!istype(explodee)) return if(explodee == guardian || explodee == guardian.summoner?.current || guardian.hasmatchingsummoner(explodee)) @@ -70,6 +72,8 @@ UNREGISTER_BOMB_SIGNALS(A) /datum/guardian_ability/major/explosive/proc/display_examine(datum/source, mob/user, text) + SIGNAL_HANDLER + text += "It glows with a strange light!" diff --git a/code/modules/guardian/abilities/major/frenzy.dm b/code/modules/guardian/abilities/major/frenzy.dm index 51ee4d68383b0..800b1dd9d93e5 100644 --- a/code/modules/guardian/abilities/major/frenzy.dm +++ b/code/modules/guardian/abilities/major/frenzy.dm @@ -41,7 +41,7 @@ next_rush = world.time + ((0.2 SECONDS * (5 - master_stats.potential)) + 2) //2 to 3 seconds /datum/guardian_ability/major/frenzy/Stat() - . = ..() - if(statpanel("Status")) - if(next_rush > world.time) - stat(null, "Frenzy Charge Cooldown Remaining: [DisplayTimeText(next_rush - world.time)]") + var/list/tab_data = list() + if(next_rush > world.time) + tab_data["Frenzy Charge Cooldown Remaining"] = GENERATE_STAT_TEXT("[DisplayTimeText(next_rush - world.time)]") + return tab_data diff --git a/code/modules/guardian/abilities/major/gravity.dm b/code/modules/guardian/abilities/major/gravity.dm index 16ec3978eb53c..8f57370c4fc54 100644 --- a/code/modules/guardian/abilities/major/gravity.dm +++ b/code/modules/guardian/abilities/major/gravity.dm @@ -23,6 +23,8 @@ remove_gravity(C) /datum/guardian_ability/major/gravity/proc/recheck_distances() + SIGNAL_HANDLER + for(var/datum/component/C in gravito_targets) if(get_dist(src, C.parent) > (master_stats.potential * 2)) remove_gravity(C) @@ -49,5 +51,7 @@ qdel(C) /datum/guardian_ability/major/gravity/proc/__distance_check(atom/movable/AM, OldLoc, Dir, Forced) + SIGNAL_HANDLER + if(get_dist(src, AM) > (master_stats.potential * 2)) remove_gravity(AM.GetComponent(/datum/component/forced_gravity)) diff --git a/code/modules/guardian/abilities/major/hand.dm b/code/modules/guardian/abilities/major/hand.dm index 1c107cf22d6dc..2173d6408a763 100644 --- a/code/modules/guardian/abilities/major/hand.dm +++ b/code/modules/guardian/abilities/major/hand.dm @@ -14,12 +14,12 @@ for(var/atom/movable/AM in get_turf(target)) if(AM.anchored) continue - AM.forceMove(hand_turf) + do_teleport(AM, hand_turf, no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC) guardian.face_atom(hand_turf) return ..() /datum/guardian_ability/major/hand/Stat() - . = ..() - if(statpanel("Status")) - if(next_hand > world.time) - stat(null, "THE HAND Cooldown Remaining: [DisplayTimeText(next_hand - world.time)]") + var/list/tab_data = list() + if(next_hand > world.time) + tab_data["THE HAND Cooldown Remaining"] = GENERATE_STAT_TEXT("[DisplayTimeText(next_hand - world.time)]") + return tab_data diff --git a/code/modules/guardian/abilities/major/predator.dm b/code/modules/guardian/abilities/major/predator.dm index f6f4e58fff6b2..f2e2ca14d7121 100644 --- a/code/modules/guardian/abilities/major/predator.dm +++ b/code/modules/guardian/abilities/major/predator.dm @@ -83,7 +83,7 @@ status.scan_target = prey status.point_to_target() -/obj/screen/alert/status_effect/agent_pinpointer/predator +/atom/movable/screen/alert/status_effect/agent_pinpointer/predator name = "Predator's All-Seeing Eyes" /datum/status_effect/agent_pinpointer/predator @@ -91,7 +91,7 @@ minimum_range = 1 range_fuzz_factor = 0 tick_interval = 10 - alert_type = /obj/screen/alert/status_effect/agent_pinpointer/predator + alert_type = /atom/movable/screen/alert/status_effect/agent_pinpointer/predator /datum/status_effect/agent_pinpointer/predator/scan_for_target() return diff --git a/code/modules/guardian/abilities/major/scout.dm b/code/modules/guardian/abilities/major/scout.dm index 714accc693d88..bba045dc3b4ed 100644 --- a/code/modules/guardian/abilities/major/scout.dm +++ b/code/modules/guardian/abilities/major/scout.dm @@ -17,6 +17,7 @@ guardian.alpha = 45 guardian.range = 255 guardian.do_the_cool_invisible_thing = FALSE + guardian.can_use_abilities = FALSE else guardian.ranged = initial(guardian.ranged) guardian.melee_damage = initial(guardian.melee_damage) @@ -26,6 +27,7 @@ guardian.range = initial(guardian.range) guardian.do_the_cool_invisible_thing = initial(guardian.do_the_cool_invisible_thing) guardian.stats.Apply(guardian) + guardian.can_use_abilities = initial(guardian.can_use_abilities) /datum/guardian_ability/major/scout/Manifest() if(mode) diff --git a/code/modules/guardian/abilities/minor/snares.dm b/code/modules/guardian/abilities/minor/snares.dm index 2b616ecd24ac0..0b1a1e3344293 100644 --- a/code/modules/guardian/abilities/minor/snares.dm +++ b/code/modules/guardian/abilities/minor/snares.dm @@ -5,17 +5,20 @@ cost = 1 /datum/guardian_ability/minor/snare/Apply() - guardian.verbs += /mob/living/simple_animal/hostile/guardian/proc/Snare - guardian.verbs += /mob/living/simple_animal/hostile/guardian/proc/DisarmSnare + guardian.add_verb(/mob/living/simple_animal/hostile/guardian/proc/Snare) + guardian.add_verb(/mob/living/simple_animal/hostile/guardian/proc/DisarmSnare) /datum/guardian_ability/minor/snare/Remove() - guardian.verbs -= /mob/living/simple_animal/hostile/guardian/proc/Snare - guardian.verbs -= /mob/living/simple_animal/hostile/guardian/proc/DisarmSnare + guardian.remove_verb(/mob/living/simple_animal/hostile/guardian/proc/Snare) + guardian.remove_verb(/mob/living/simple_animal/hostile/guardian/proc/DisarmSnare) /mob/living/simple_animal/hostile/guardian/proc/Snare() set name = "Set Surveillance Snare" set category = "Guardian" set desc = "Set an invisible snare that will alert you when living creatures walk over it. Max of 5" + if(!can_use_abilities) + to_chat(src, "You can't do that right now!") + return if(snares.len <6) var/turf/snare_loc = get_turf(src.loc) var/obj/effect/snare/S = new /obj/effect/snare(snare_loc) diff --git a/code/modules/guardian/abilities/minor/teleport.dm b/code/modules/guardian/abilities/minor/teleport.dm index d155ed50f00f0..d6b9bcc5fb996 100644 --- a/code/modules/guardian/abilities/minor/teleport.dm +++ b/code/modules/guardian/abilities/minor/teleport.dm @@ -7,15 +7,15 @@ /datum/guardian_ability/minor/teleport/Apply() ..() - guardian.verbs += /mob/living/simple_animal/hostile/guardian/proc/Beacon + guardian.add_verb(/mob/living/simple_animal/hostile/guardian/proc/Beacon) /datum/guardian_ability/minor/teleport/Remove() ..() - guardian.verbs -= /mob/living/simple_animal/hostile/guardian/proc/Beacon + guardian.remove_verb(/mob/living/simple_animal/hostile/guardian/proc/Beacon) /obj/effect/proc_holder/spell/targeted/guardian/teleport name = "Teleport" - desc = "Teleport someone to your recieving pad." + desc = "Teleport someone to your receiving pad." /obj/effect/proc_holder/spell/targeted/guardian/teleport/InterceptClickOn(mob/living/caller, params, atom/movable/A) if(!istype(A)) @@ -27,6 +27,9 @@ if(!G.is_deployed()) to_chat(G, "You must be manifested to warp a target!") return + if(!G.can_use_abilities) + to_chat(G, "You can't do that right now!") + return if(!G.beacon) to_chat(G, "You need a beacon placed to warp things!") return @@ -38,7 +41,7 @@ return var/turf/T = get_turf(A) - if(G.beacon.z != T.z) + if(G.beacon.get_virtual_z_level() != T.get_virtual_z_level()) to_chat(G, "The beacon is too far away to warp to!") return remove_ranged_ability() diff --git a/code/modules/guardian/abilities/special/absolution.dm b/code/modules/guardian/abilities/special/absolution.dm index 5bd3a8af31d8b..91ba7eb2dcf26 100644 --- a/code/modules/guardian/abilities/special/absolution.dm +++ b/code/modules/guardian/abilities/special/absolution.dm @@ -50,19 +50,6 @@ // STUFF -/obj/item/melee_attack_chain(mob/user, atom/target, params) - if(!tool_attack_chain(user, target) && pre_attack(target, user, params)) - var/resolved - if(HAS_TRAIT(target, TRAIT_ONEWAYROAD)) - resolved = user.attackby(src, user, params) // you just hit yourself - else - resolved = target.attackby(src, user, params) - if(!resolved && target && !QDELETED(src)) - if(HAS_TRAIT(target, TRAIT_ONEWAYROAD)) - afterattack(user, user, 1, params) - else - afterattack(target, user, 1, params) - /mob/living/carbon/human/bullet_act(obj/item/projectile/P, def_zone) if(HAS_TRAIT(src, TRAIT_ONEWAYROAD)) var/atom/movable/oldfirer = P.firer diff --git a/code/modules/guardian/guardian.dm b/code/modules/guardian/guardian.dm index c65469e451b33..2e1b43a3315c2 100644 --- a/code/modules/guardian/guardian.dm +++ b/code/modules/guardian/guardian.dm @@ -38,7 +38,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians melee_damage = 15 AIStatus = AI_OFF hud_type = /datum/hud/guardian - mobsay_color = "#ffffff" + chat_color = "#ffffff" + mobchatspan = "blob" var/next_reset = 0 var/guardiancolor = "#ffffff" var/mutable_appearance/cooloverlay @@ -49,7 +50,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/range = 10 var/cooldown = 0 var/datum/mind/summoner - var/toggle_button_type = /obj/screen/guardian/ToggleMode + var/toggle_button_type = /atom/movable/screen/guardian/ToggleMode var/datum/guardian_stats/stats var/summoner_visible = TRUE var/battlecry = "AT" @@ -63,12 +64,14 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/beacon_cooldown = 0 var/list/pocket_dim var/transforming = FALSE + var/can_use_abilities = TRUE + discovery_points = 5000 /mob/living/simple_animal/hostile/guardian/Initialize(mapload, theme, guardiancolor) GLOB.parasites += src if(guardiancolor) src.guardiancolor = guardiancolor - src.mobsay_color = guardiancolor + src.chat_color = guardiancolor updatetheme(theme) battlecry = pick("ORA", "MUDA", "DORA", "ARRI", "VOLA", "AT") return ..() @@ -169,7 +172,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians speak_emote = list("telepathically cries") desc = "A truly alien creature, it is a mass of unknown organic material, standing by its' owner's side." attack_sound = 'sound/weapons/pierce.ogg' - if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isnt gone for some reason + if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isn't gone for some reason cooloverlay = mutable_appearance(icon, theme) cooloverlay.color = guardiancolor add_overlay(cooloverlay) @@ -216,6 +219,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians snapback() /mob/living/simple_animal/hostile/guardian/proc/OnMoved() + SIGNAL_HANDLER + snapback() setup_barriers() @@ -241,20 +246,20 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(stats.ability) stats.ability.Berserk() -/mob/living/simple_animal/hostile/guardian/Stat() - ..() - if(statpanel("Status")) - if(summoner?.current) - var/resulthealth - if(iscarbon(summoner.current)) - resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.current.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.current.maxHealth)) * 100) - else - resulthealth = round((summoner.current.health / summoner.current.maxHealth) * 100, 0.5) - stat(null, "Summoner Health: [resulthealth]%") - if(cooldown >= world.time) - stat(null, "Manifest/Recall Cooldown Remaining: [DisplayTimeText(cooldown - world.time)]") - if(stats.ability) - stats.ability.Stat() +/mob/living/simple_animal/hostile/guardian/get_stat_tab_status() + var/list/tab_data = ..() + if(summoner?.current) + var/resulthealth + if(iscarbon(summoner.current)) + resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.current.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.current.maxHealth)) * 100) + else + resulthealth = round((summoner.current.health / summoner.current.maxHealth) * 100, 0.5) + tab_data["Summoner Health"] = GENERATE_STAT_TEXT("[resulthealth]%") + if(cooldown >= world.time) + tab_data["Manifest/Recall Cooldown Remaining"] = GENERATE_STAT_TEXT(" [DisplayTimeText(cooldown - world.time)]") + if(stats.ability) + tab_data += stats.ability.Stat() + return tab_data /mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range pixel_x = initial(pixel_x) @@ -340,9 +345,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians return loc != summoner?.current /mob/living/simple_animal/hostile/guardian/Shoot(atom/targeted_atom) - if( QDELETED(targeted_atom) || targeted_atom == targets_from.loc || targeted_atom == targets_from ) + var/atom/target_from = GET_TARGETS_FROM(src) + if( QDELETED(targeted_atom) || targeted_atom == target_from.loc || targeted_atom == target_from ) return - var/turf/startloc = get_turf(targets_from) + var/turf/startloc = get_turf(target_from) var/obj/item/projectile/P = new /obj/item/projectile/guardian(startloc) playsound(src, projectilesound, 100, 1) P.color = guardiancolor @@ -353,7 +359,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians P.yo = targeted_atom.y - startloc.y P.xo = targeted_atom.x - startloc.x if(AIStatus != AI_ON)//Don't want mindless mobs to have their movement screwed up firing in space - newtonian_move(get_dir(targeted_atom, targets_from)) + newtonian_move(get_dir(targeted_atom, target_from)) P.original = targeted_atom P.preparePixelProjectile(targeted_atom, src) P.fire() @@ -391,7 +397,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(stats.ability) stats.ability.AfterAttack(target) -/mob/living/simple_animal/hostile/guardian/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash) +/mob/living/simple_animal/hostile/guardian/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash) return FALSE /mob/living/simple_animal/hostile/guardian/death() @@ -409,7 +415,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.current.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.current.maxHealth)) * 100) else resulthealth = round((summoner.current.health / summoner.current.maxHealth) * 100, 0.5) - hud_used.healths.maptext = " [resulthealth]% "
+ hud_used.healths.maptext = MAPTEXT("[resulthealth]% ")
/mob/living/simple_animal/hostile/guardian/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //The spirit is invincible, but passes on damage to the summoner
if(berserk)
@@ -580,16 +586,20 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
key = C.key
/mob/living/simple_animal/hostile/guardian/proc/Reviveify()
+ SIGNAL_HANDLER
+
revive()
var/mob/gost = grab_ghost(TRUE)
if(!QDELETED(gost) && gost.ckey)
ckey = gost.ckey
/mob/living/simple_animal/hostile/guardian/proc/OnMindTransfer(datum/_source, mob/old_body, mob/new_body)
+ SIGNAL_HANDLER
+
if(!QDELETED(old_body))
- old_body.verbs -= /mob/living/proc/guardian_comm
- old_body.verbs -= /mob/living/proc/guardian_recall
- old_body.verbs -= /mob/living/proc/guardian_reset
+ old_body.remove_verb(/mob/living/proc/guardian_comm)
+ old_body.remove_verb(/mob/living/proc/guardian_recall)
+ old_body.remove_verb(/mob/living/proc/guardian_reset)
UnregisterSignal(old_body, COMSIG_MOVABLE_MOVED)
UnregisterSignal(old_body, COMSIG_LIVING_REVIVE)
if(isliving(new_body))
@@ -600,9 +610,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
RegisterSignal(new_body, COMSIG_MOVABLE_MOVED, /mob/living/simple_animal/hostile/guardian.proc/OnMoved)
RegisterSignal(new_body, COMSIG_LIVING_REVIVE, /mob/living/simple_animal/hostile/guardian.proc/Reviveify)
to_chat(src, "You manifest into existence, as your master's soul appears in a new body!")
- new_body.verbs |= /mob/living/proc/guardian_comm
- new_body.verbs |= /mob/living/proc/guardian_recall
- new_body.verbs |= /mob/living/proc/guardian_reset
+ new_body.add_verb(/mob/living/proc/guardian_comm)
+ new_body.add_verb(/mob/living/proc/guardian_recall)
+ new_body.add_verb(/mob/living/proc/guardian_reset)
/mob/living/proc/guardian_comm()
set name = "Communicate"
@@ -682,7 +692,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
else
to_chat(src, "You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].")
else
- verbs -= /mob/living/proc/guardian_reset
+ remove_verb(/mob/living/proc/guardian_reset)
////////parasite tracking/finding procs
diff --git a/code/modules/guardian/guardianbuilder.dm b/code/modules/guardian/guardianbuilder.dm
index 5452ea37026a8..36b9023edf615 100644
--- a/code/modules/guardian/guardianbuilder.dm
+++ b/code/modules/guardian/guardianbuilder.dm
@@ -34,7 +34,6 @@
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "Guardian")
- ui.set_autoupdate(TRUE)
ui.open()
/datum/guardianbuilder/ui_data(mob/user)
@@ -83,7 +82,7 @@
cost = GA.cost,
icon = GA.ui_icon,
selected = istype(saved_stats.ability, ability),
- available = (points >= GA.cost) && GA.CanBuy(),
+ available = (points+saved_stats.ability?.cost >= GA.cost) && GA.CanBuy(),
path = "[ability]",
requiem = istype(GA, /datum/guardian_ability/major/special)
))
@@ -104,60 +103,73 @@
/datum/guardianbuilder/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..() || used)
return
- calc_points()
switch(action)
if("name")
guardian_name = params["name"]
+ . = TRUE
if("set")
switch(params["name"])
if("Damage")
var/lvl = CLAMP(text2num(params["level"]), 1, 5)
if((points + (saved_stats.damage > 1 ? saved_stats.damage - 1 : 0)) >= lvl - 1 || lvl == 1)
saved_stats.damage = lvl
- . = TRUE
+ . = TRUE
if("Defense")
var/lvl = CLAMP(text2num(params["level"]), 1, 5)
if((points + (saved_stats.defense > 1 ? saved_stats.defense - 1 : 0)) >= lvl - 1 || lvl == 1)
saved_stats.defense = lvl
- . = TRUE
+ . = TRUE
if("Speed")
var/lvl = CLAMP(text2num(params["level"]), 1, 5)
if((points + (saved_stats.speed > 1 ? saved_stats.speed - 1 : 0)) >= lvl - 1 || lvl == 1)
saved_stats.speed = lvl
- . = TRUE
+ . = TRUE
if("Potential")
var/lvl = CLAMP(text2num(params["level"]), 1, 5)
if((points + (saved_stats.potential > 1 ? saved_stats.potential - 1 : 0)) >= lvl - 1 || lvl == 1)
saved_stats.potential = lvl
- . = TRUE
+ . = TRUE
if("Range")
var/lvl = CLAMP(text2num(params["level"]), 1, 5)
if((points + (saved_stats.range > 1 ? saved_stats.range - 1 : 0)) >= lvl - 1 || lvl == 1)
saved_stats.range = lvl
- . = TRUE
+ . = TRUE
if("color")
var/color = input(usr, "What would you like your guardian's color to be?", "Choose Your Color", "#ffffff") as color|null
if(color)
guardian_color = color
+ . = TRUE
if("clear_ability_major")
QDEL_NULL(saved_stats.ability)
+ . = TRUE
if("ability_major")
- var/ability = text2path(params["path"])
+ var/datum/guardian_ability/ability = text2path(params["path"])
var/list/types = allow_special ? (subtypesof(/datum/guardian_ability/major) - /datum/guardian_ability/major/special) : (subtypesof(/datum/guardian_ability/major) - typesof(/datum/guardian_ability/major/special))
if(ispath(ability))
if(saved_stats.ability && saved_stats.ability.type == ability)
QDEL_NULL(saved_stats.ability)
- else if(ability in types) // no nullspace narsie for you!
- QDEL_NULL(saved_stats.ability)
- saved_stats.ability = new ability
- saved_stats.ability.master_stats = saved_stats
+ . = TRUE
+ else if((ability in types) && (points + (saved_stats.ability?.cost || 0)) >= initial(ability.cost)) // no nullspace narsie for you!
+ var/datum/guardian_ability/new_ability = new ability
+ new_ability.master_stats = saved_stats
+ var/datum/guardian_ability/old_ability = saved_stats.ability
+ saved_stats.ability = null
+ if(new_ability.CanBuy(FALSE))
+ qdel(old_ability)
+ saved_stats.ability = new_ability
+ . = TRUE
+ else
+ qdel(new_ability)
+ saved_stats.ability = old_ability
if("ability_minor")
- var/ability = text2path(params["path"])
+ var/datum/guardian_ability/ability = text2path(params["path"])
if(ispath(ability) && (ability in subtypesof(/datum/guardian_ability/minor))) // no nullspace narsie for you!
if(saved_stats.HasMinorAbility(ability))
saved_stats.TakeMinorAbility(ability)
- else
+ . = TRUE
+ else if(points >= initial(ability.cost))
saved_stats.AddMinorAbility(ability)
+ . = TRUE
if("spawn")
. = spawn_guardian(usr)
if("reset")
@@ -167,8 +179,21 @@
if("ranged")
if(points >= 3)
saved_stats.ranged = TRUE
+ . = TRUE
if("melee")
saved_stats.ranged = FALSE
+ . = TRUE
+ if(.)
+ if(saved_stats.ability && !saved_stats.ability.CanBuy(FALSE)) // In case stat changes made some abilities invalid to have. Right now only Frenzy.
+ QDEL_NULL(saved_stats.ability)
+ var/list/datum/guardian_ability/minor/abilities_to_remove = list()
+ for(var/datum/guardian_ability/minor/minor in saved_stats.minor_abilities)
+ if(!minor.CanBuy(FALSE))
+ abilities_to_remove += minor
+ for(var/datum/guardian_ability/minor/minor in abilities_to_remove)
+ saved_stats.minor_abilities -= minor
+ qdel(minor)
+ calc_points()
/datum/guardianbuilder/proc/calc_points()
points = max_points
@@ -230,9 +255,9 @@
to_chat(user, "[G.real_name] has been caught!")
if(GUARDIAN_HIVE)
to_chat(user, "[G.real_name] has been created from the core!")
- user.verbs += /mob/living/proc/guardian_comm
- user.verbs += /mob/living/proc/guardian_recall
- user.verbs += /mob/living/proc/guardian_reset
+ user.add_verb(/mob/living/proc/guardian_comm)
+ user.add_verb(/mob/living/proc/guardian_recall)
+ user.add_verb(/mob/living/proc/guardian_reset)
return TRUE
else
to_chat(user, "[failure_message]")
diff --git a/code/modules/guardian/standarrow.dm b/code/modules/guardian/standarrow.dm
index d690bec334831..fe996818b9af3 100644
--- a/code/modules/guardian/standarrow.dm
+++ b/code/modules/guardian/standarrow.dm
@@ -45,17 +45,9 @@
user.dropItemToGround(src, TRUE)
forceMove(H)
if(iscarbon(M))
- sleep(15 SECONDS)
- if(prob(kill_chance))
- H.visible_message("[H] stares ahead, eyes full of fear, before collapsing lifelessly into ash, \the [src] falling out...")
- log_game("[key_name(H)] was killed by a stand arrow.")
- forceMove(H.drop_location())
- H.mind.no_cloning_at_all = TRUE
- H.adjustCloneLoss(500)
- H.dust(TRUE)
- in_use = FALSE
- else
- INVOKE_ASYNC(src, .proc/generate_stand, H)
+ in_use = TRUE
+ addtimer(CALLBACK(src, .proc/after_arrow_attack, H, kill_chance), 15 SECONDS)
+ in_use = FALSE
else if(isguardian(M))
INVOKE_ASYNC(src, .proc/requiem, M)
@@ -63,6 +55,17 @@
visible_message("[src] falls apart!")
qdel(src)
+/obj/item/stand_arrow/proc/after_arrow_attack(mob/living/carbon/H, var/kill_chance)
+ if(prob(kill_chance))
+ H.visible_message("[H] stares ahead, eyes full of fear, before collapsing lifelessly into ash, \the [src] falling out...")
+ log_game("[key_name(H)] was killed by a stand arrow.")
+ forceMove(H.drop_location())
+ H.mind.no_cloning_at_all = TRUE
+ H.adjustCloneLoss(500)
+ H.dust(TRUE)
+ else
+ INVOKE_ASYNC(src, .proc/generate_stand, H)
+
/obj/item/stand_arrow/proc/requiem(mob/living/simple_animal/hostile/guardian/G)
G.range = 255
G.transforming = TRUE
@@ -178,9 +181,9 @@
users[G] = TRUE
log_game("[key_name(H)] has summoned [key_name(G)], a holoparasite, via the stand arrow.")
to_chat(H, "[G.real_name] has been summoned!")
- H.verbs += /mob/living/proc/guardian_comm
- H.verbs += /mob/living/proc/guardian_recall
- H.verbs += /mob/living/proc/guardian_reset
+ H.add_verb(/mob/living/proc/guardian_comm)
+ H.add_verb(/mob/living/proc/guardian_recall)
+ H.add_verb(/mob/living/proc/guardian_reset)
uses--
in_use = FALSE
H.visible_message("\The [src] falls out of [H]!")
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index 9b21cde77f48f..6dbd6e92e38c0 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -7,7 +7,7 @@
earliest_start = 0 MINUTES
/datum/round_event/easter/announce(fake)
- priority_announce(pick("Hip-hop into Easter!","Find some Bunny's stash!","Today is National 'Hunt a Wabbit' Day.","Be kind, give Chocolate Eggs!"))
+ priority_announce(pick("Hip-hop into Easter!","Find some Bunny's stash!","Today is National 'Hunt a Wabbit' Day.","Be kind, give Chocolate Eggs!"), sound = SSstation.announcer.get_rand_alert_sound())
/datum/round_event_control/rabbitrelease
@@ -18,7 +18,7 @@
max_occurrences = 10
/datum/round_event/rabbitrelease/announce(fake)
- priority_announce("Unidentified furry objects detected coming aboard [station_name()]. Beware of Adorable-ness.", "Fluffy Alert", 'sound/ai/aliens.ogg')
+ priority_announce("Unidentified furry objects detected coming aboard [station_name()]. Beware of Adorable-ness.", "Fluffy Alert", ANNOUNCER_ALIENS)
/datum/round_event/rabbitrelease/start()
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 098972034b1c6..6eb02740e6540 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -93,6 +93,19 @@
/datum/holiday/valentines/getStationPrefix()
return pick("Love","Amore","Single","Smootch","Hug")
+/// Garbage DAYYYYY
+/// Huh?.... NOOOO
+/// *GUNSHOT*
+/// AHHHGHHHHHHH
+/datum/holiday/garbageday
+ name = GARBAGEDAY
+ begin_day = 17
+ end_day = 17
+ begin_month = JUNE
+
+/datum/holiday/garbageday/getStationPrefix()
+ return pick("Trash","Janitor","Rubish","Bin")
+
/datum/holiday/birthday
name = "Birthday of Space Station 13"
begin_day = 16
@@ -281,6 +294,14 @@
/datum/holiday/friendship/greet()
return "Have a magical [name]!"
+/datum/holiday/anz
+ name = "ANZAC Day"
+ begin_day = 25
+ begin_month = APRIL
+
+/datum/holiday/anz/getStationPrefix()
+ return pick("Australian", "New Zealand", "Poppy", "Southern Cross")
+
/datum/holiday/beer
name = "Beer Day"
@@ -498,9 +519,9 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and
/datum/holiday/xmas
name = CHRISTMAS
- begin_day = 22
+ begin_day = 24
begin_month = DECEMBER
- end_day = 27
+ end_day = 26
drone_hat = /obj/item/clothing/head/santa
/datum/holiday/xmas/greet()
diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm
index dca4681137894..c94700b45e162 100644
--- a/code/modules/holodeck/area_copy.dm
+++ b/code/modules/holodeck/area_copy.dm
@@ -1,7 +1,10 @@
//Vars that will not be copied when using /DuplicateObject
GLOBAL_LIST_INIT(duplicate_forbidden_vars,list(
"tag", "datum_components", "area", "type", "loc", "locs", "vars", "parent", "parent_type", "verbs", "ckey", "key",
- "power_supply", "contents", "reagents", "stat", "x", "y", "z", "group", "atmos_adjacent_turfs", "comp_lookup"
+ "power_supply", "contents", "reagents", "stat", "x", "y", "z", "group", "atmos_adjacent_turfs", "comp_lookup",
+ "client_mobs_in_contents", "bodyparts", "internal_organs", "hand_bodyparts", "overlays_standing", "hud_list",
+ "actions", "AIStatus", "appearance", "managed_overlays", "managed_vis_overlays", "computer_id", "lastKnownIP", "implants",
+ "tgui_shared_states"
))
/proc/DuplicateObject(atom/original, perfectcopy = TRUE, sameloc, atom/newloc = null, nerf, holoitem)
@@ -20,7 +23,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list(
if(islist(original.vars[V]))
var/list/L = original.vars[V]
O.vars[V] = L.Copy()
- else if(istype(original.vars[V], /datum))
+ else if(istype(original.vars[V], /datum) || ismob(original.vars[V]))
continue // this would reference the original's object, that will break when it is used or deleted.
else
O.vars[V] = original.vars[V]
@@ -52,6 +55,11 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list(
contained_atom.flags_1 |= HOLOGRAM_1
if(M.circuit)
M.circuit.flags_1 |= HOLOGRAM_1
+
+ if(ismob(O)) //Overlays are carried over despite disallowing them, if a fix is found remove this.
+ var/mob/M = O
+ M.cut_overlays()
+ M.regenerate_icons()
return O
@@ -135,7 +143,5 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list(
if(toupdate.len)
for(var/turf/T1 in toupdate)
CALCULATE_ADJACENT_TURFS(T1)
- SSair.add_to_active(T1,1)
-
return copiedobjs
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index e9803d7e575f0..eb6dfc51f1dd5 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -1,22 +1,30 @@
/*
- Holodeck Update
-
- The on-station holodeck area is of type [holodeck_type].
- All subtypes of [program_type] are loaded into the program cache or emag programs list.
- If init_program is null, a random program will be loaded on startup.
- If you don't wish this, set it to the offline program or another of your choosing.
-
- You can use this to add holodecks with minimal code:
- 1) Define new areas for the holodeck programs
- 2) Map them
- 3) Create a new control console that uses those areas
-
- Non-mapped areas should be skipped but you should probably comment them out anyway.
- The base of program_type will always be ignored; only subtypes will be loaded.
+Map Template Holodeck
+
+Holodeck finds the location of mapped_start_area and loads offline_program in it on LateInitialize. It then passes its program templates to Holodeck.js in the form of program_cache and emag_programs. when a user selects a program the
+ui calls load_program() with the id of the selected program.
+load_program() -> map_template/load() on map_template/holodeck.
+
+holodeck map templates:
+1. have an update_blacklist that doesnt allow placing on non holofloors (except for engine floors so you can repair it)
+2. has should_place_on_top = FALSE, so that the baseturfs list doesnt pull a kilostation oom crash
+3. has returns_created = TRUE, so that SSatoms gives the map template a list of spawned atoms
+all the fancy flags and shit are added to holodeck objects in finish_spawn()
+
+Easiest way to add new holodeck programs:
+1. Define new map template datums in code/modules/holodeck/holodeck_map_templates, make sure they have the access flags
+of the holodeck you want them to be able to load, for the onstation holodeck the flag is STATION_HOLODECK.
+2. Create the new map templates in _maps/templates (remember theyre 9x10, and make sure they have area/noop or else it will fuck with linked)
+all turfs in holodeck programs MUST be of type /turf/open/floor/holofloor, OR /turf/open/floor/engine, or they will block future programs!
+
+Note: if youre looking at holodeck code because you want to see how returns_created is handled so that templates return a list of atoms
+created from them: make sure you handle that list correctly! Either copy them by value and delete them or reference it and handle qdel'ing
+and clear when youre done! if you dont i will use :newspaper2: on you
*/
-#define HOLODECK_CD 25
-#define HOLODECK_DMG_CD 500
+#define HOLODECK_CD 2 SECONDS
+#define HOLODECK_DMG_CD 5 SECONDS
+
/obj/machinery/computer/holodeck
name = "holodeck control console"
@@ -25,71 +33,97 @@
idle_power_usage = 10
active_power_usage = 50
+ //new vars
+
+ ///what area type this holodeck loads into. linked turns into the nearest instance of this area
+ var/area/mapped_start_area = /area/holodeck/rec_center
+ ///the currently used map template
+ var/datum/map_template/holodeck/template
+ ///bottom left corner of the loading room, used for placing
+ var/turf/bottom_left
+
+ ///if TRUE the holodeck is busy spawning another simulation and should immediately stop loading the newest one
+ var/spawning_simulation = FALSE
+
+ //old vars
+
+ ///the area that this holodeck loads templates into, used for power and deleting holo objects that leave it
var/area/holodeck/linked
- var/area/holodeck/program
- var/area/holodeck/last_program
- var/area/offline_program = /area/holodeck/rec_center/offline
+ ///what program is loaded right now or is about to be loaded
+ var/program = "offline"
+ var/last_program
+
+ ///the default program loaded by this holodeck when spawned and when deactivated
+ var/offline_program = "offline"
+
+ ///stores all of the unrestricted holodeck map templates that this computer has access to
var/list/program_cache
+ ///stores all of the restricted holodeck map templates that this computer has access to
var/list/emag_programs
- // Splitting this up allows two holodecks of the same size
- // to use the same source patterns. Y'know, if you want to.
- var/holodeck_type = /area/holodeck/rec_center // locate(this) to get the target holodeck
- var/program_type = /area/holodeck/rec_center // subtypes of this (but not this itself) are loadable programs
+ ///subtypes of this (but not this itself) are loadable programs
+ var/program_type = /datum/map_template/holodeck
+ ///every holo object created by the holodeck goes in here to track it
+ var/list/spawned = list()
+ var/list/effects = list() //like above, but for holo effects
+
+ ///TRUE if the holodeck is using extra power because of a program, FALSE otherwise
var/active = FALSE
+ ///increases the holodeck cooldown if TRUE, causing the holodeck to take longer to allow loading new programs
var/damaged = FALSE
- var/list/spawned = list()
- var/list/effects = list()
- var/current_cd = 0
+
+ //creates the timer that determines if another program can be manually loaded
+ COOLDOWN_DECLARE(holodeck_cooldown)
/obj/machinery/computer/holodeck/Initialize(mapload)
..()
return INITIALIZE_HINT_LATELOAD
-/obj/machinery/computer/holodeck/LateInitialize()
- if(ispath(holodeck_type, /area))
- linked = pop(get_areas(holodeck_type, FALSE))
- if(ispath(offline_program, /area))
- offline_program = pop(get_areas(offline_program), FALSE)
+/obj/machinery/computer/holodeck/LateInitialize()//from here linked is populated and the program list is generated. its also set to load the offline program
+ linked = GLOB.areas_by_type[mapped_start_area]
+ bottom_left = locate(linked.x, linked.y, src.z)
+
+ var/area/computer_area = get_area(src)
+ if(istype(computer_area, /area/holodeck))
+ log_mapping("Holodeck computer cannot be in a holodeck, This would cause circular power dependency.")
+ qdel(src)
+ return
+
// the following is necessary for power reasons
- if(!linked || !offline_program)
+ if(!linked)
log_world("No matching holodeck area found")
qdel(src)
return
- var/area/AS = get_area(src)
- if(istype(AS, /area/holodeck))
- log_mapping("Holodeck computer cannot be in a holodeck, This would cause circular power dependency.")
+ else if (!offline_program)
+ stack_trace("Holodeck console created without an offline program")
qdel(src)
return
+
else
linked.linked = src
var/area/my_area = get_area(src)
if(my_area)
linked.power_usage = my_area.power_usage
else
- linked.power_usage = new /list(AREA_USAGE_LEN)
+ linked.power_usage = list(AREA_USAGE_LEN)
+ COOLDOWN_START(src, holodeck_cooldown, HOLODECK_CD)
generate_program_list()
- load_program(offline_program, FALSE, FALSE)
-
-/obj/machinery/computer/holodeck/Destroy()
- emergency_shutdown()
- if(linked)
- linked.linked = null
- linked.power_usage = new /list(AREA_USAGE_LEN)
- return ..()
-
-/obj/machinery/computer/holodeck/power_change()
- . = ..()
- toggle_power(!stat)
+ load_program(offline_program,TRUE)
-
-/obj/machinery/computer/holodeck/ui_state(mob/user)
- return GLOB.default_state
+///adds all programs that this holodeck has access to, and separates the restricted and unrestricted ones
+/obj/machinery/computer/holodeck/proc/generate_program_list()
+ for(var/typekey in subtypesof(program_type))
+ var/datum/map_template/holodeck/program = typekey
+ var/list/info_this = list("id" = initial(program.template_id), "name" = initial(program.name))
+ if(initial(program.restricted))
+ LAZYADD(emag_programs, list(info_this))
+ else
+ LAZYADD(program_cache, list(info_this))
/obj/machinery/computer/holodeck/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
@@ -104,220 +138,273 @@
if(obj_flags & EMAGGED)
data["emagged"] = TRUE
data["emag_programs"] = emag_programs
+ else
+ data["emagged"] = null
+ data["emag_programs"] = null
data["program"] = program
data["can_toggle_safety"] = issilicon(user) || IsAdminGhost(user)
-
return data
/obj/machinery/computer/holodeck/ui_act(action, params)
if(..())
return
- . = TRUE
switch(action)
if("load_program")
- var/program_to_load = text2path(params["type"])
- if(!ispath(program_to_load))
- return FALSE
- var/valid = FALSE
- var/list/checked = program_cache.Copy()
- if(obj_flags & EMAGGED)
- checked |= emag_programs
- for(var/prog in checked)
- var/list/P = prog
- if(P["type"] == program_to_load)
+ var/program_to_load = params["id"]
+
+ var/valid = FALSE //dont tell security about this
+
+ //checks if program_to_load is any one of the loadable programs, if it isnt then it rejects it
+ for(var/list/check_list as anything in program_cache)
+ if(check_list["id"] == program_to_load)
valid = TRUE
break
+ if(!valid && (obj_flags & EMAGGED))
+ for(var/list/check_list as anything in emag_programs)
+ if(check_list["id"] == program_to_load)
+ valid = TRUE
+ break
if(!valid)
- return FALSE
-
- var/area/A = locate(program_to_load) in GLOB.sortedAreas
- if(A)
- if(istype(A, /area/holodeck)) //Admins could technically load a non-holodeck area with some varediting
- var/area/holodeck/H = A
- if(H.restricted)
- message_admins("[key_name(usr)] is loading a restricted (and potentially dangerous) holodeck area: [H.name]")
- log_game("[key_name(usr)] is loading a restricted (and potentially dangerous) holodeck area: [H.name]")
- load_program(A)
+ return
+ //load the map_template that program_to_load represents
+ load_program(program_to_load)
+ . = TRUE
if("safety")
if((obj_flags & EMAGGED) && program)
emergency_shutdown()
- nerf(obj_flags & EMAGGED)
+ nerf(obj_flags & EMAGGED,FALSE)
obj_flags ^= EMAGGED
- say("Safeties restored. Restarting...")
+ say("Safeties reset. Restarting...")
+ . = TRUE
-/obj/machinery/computer/holodeck/process()
- if(damaged && prob(10))
- for(var/turf/T in linked)
- if(prob(5))
- do_sparks(2, 1, T)
- return
+///this is what makes the holodeck not spawn anything on broken tiles (space and non engine plating / non holofloors)
+/datum/map_template/holodeck/update_blacklist(turf/placement, list/input_blacklist)
+ for(var/turf/possible_blacklist as anything in get_affected_turfs(placement))
+ if (possible_blacklist.holodeck_compatible)
+ continue
+ input_blacklist += possible_blacklist
- if(!..() || !active)
+///loads the template whose id string it was given ("offline_program" loads datum/map_template/holodeck/offline)
+/obj/machinery/computer/holodeck/proc/load_program(map_id, force = FALSE, add_delay = TRUE)
+ if (program == map_id)
return
- if(!floorcheck())
- emergency_shutdown()
- damaged = TRUE
- for(var/mob/M in urange(10,src))
- M.show_message("The holodeck overloads!")
+ if (!is_operational())//load_program is called once with a timer (in toggle_power) we dont want this to load anything if its off
+ map_id = offline_program
+ force = TRUE
- for(var/turf/T in linked)
- if(prob(30))
- do_sparks(2, 1, T)
- T.ex_act(EXPLODE_LIGHT)
- T.hotspot_expose(1000,500,1)
+ if (!force && (!COOLDOWN_FINISHED(src, holodeck_cooldown) || spawning_simulation))
+ say("ERROR. Recalibrating projection apparatus.")
+ return
- if(!(obj_flags & EMAGGED))
- for(var/item in spawned)
- if(!(get_turf(item) in linked))
- derez(item, 0)
- for(var/e in effects)
- var/obj/effect/holodeck_effect/HE = e
- HE.tick()
+ if(spawning_simulation)
+ return
- active_power_usage = 50 + spawned.len * 3 + effects.len * 5
+ if (add_delay)
+ COOLDOWN_START(src, holodeck_cooldown, (damaged ? HOLODECK_CD + HOLODECK_DMG_CD : HOLODECK_CD))
+ if (damaged && floorcheck())
+ damaged = FALSE
+
+ spawning_simulation = TRUE
+ active = (map_id != offline_program)
+ use_power = active + IDLE_POWER_USE
+ program = map_id
+
+ //clear the items from the previous program
+ for(var/holo_atom in spawned)
+ derez(holo_atom)
+
+ for(var/obj/effect/holodeck_effect/holo_effect as anything in effects)
+ effects -= holo_effect
+ holo_effect.deactivate(src)
+
+ //makes sure that any time a holoturf is inside a baseturf list (e.g. if someone put a wall over it) its set to the OFFLINE turf
+ //so that you cant bring turfs from previous programs into other ones (like putting the plasma burn turf into lounge for example)
+ for(var/turf/closed/holo_turf in linked)
+ for(var/baseturf in holo_turf.baseturfs)
+ if(ispath(baseturf, /turf/open/floor/holofloor))
+ holo_turf.baseturfs -= baseturf
+ holo_turf.baseturfs += /turf/open/floor/holofloor/plating
+
+ template = SSmapping.holodeck_templates[map_id]
+ template.load(bottom_left) //this is what actually loads the holodeck simulation into the map
+
+ spawned = template.created_atoms //populate the spawned list with the atoms belonging to the holodeck
+
+ if(istype(template, /datum/map_template/holodeck/thunderdome1218) && !SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_MEDISIM])
+ say("Special note from \"1218 AD\" developer: I see you too are interested in the REAL dark ages of humanity! I've made this program also unlock some interesting shuttle designs on any communication console around. Have fun!")
+ SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_MEDISIM] = TRUE
-/obj/machinery/computer/holodeck/emag_act(mob/user)
- if(obj_flags & EMAGGED)
- return
- if(!LAZYLEN(emag_programs))
- to_chat(user, "[src] does not seem to have a card swipe port. It must be an inferior model.")
- return
- playsound(src, "sparks", 75, TRUE)
- obj_flags |= EMAGGED
- to_chat(user, "You vastly increase projector power and override the safety and security protocols.")
- say("Warning. Automatic shutoff and derezzing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.")
- log_game("[key_name(user)] emagged the Holodeck Control Console")
nerf(!(obj_flags & EMAGGED))
+ finish_spawn()
-/obj/machinery/computer/holodeck/emp_act(severity)
- . = ..()
- if(. & EMP_PROTECT_SELF)
+///finalizes objects in the spawned list
+/obj/machinery/computer/holodeck/proc/finish_spawn()
+ for(var/atom/holo_atom as anything in spawned)
+ if(QDELETED(holo_atom))
+ spawned -= holo_atom
+ continue
+
+ RegisterSignal(holo_atom, COMSIG_PARENT_PREQDELETED, .proc/remove_from_holo_lists)
+ holo_atom.flags_1 |= HOLOGRAM_1
+
+ if(isholoeffect(holo_atom))//activates holo effects and transfers them from the spawned list into the effects list
+ var/obj/effect/holodeck_effect/holo_effect = holo_atom
+ effects += holo_effect
+ spawned -= holo_effect
+ var/atom/holo_effect_product = holo_effect.activate(src)//change name
+ if(istype(holo_effect_product))
+ spawned += holo_effect_product // we want mobs or objects spawned via holoeffects to be tracked as objects
+ RegisterSignal(holo_effect_product, COMSIG_PARENT_PREQDELETED, .proc/remove_from_holo_lists)
+ if(islist(holo_effect_product))
+ for(var/atom/atom_product as anything in holo_effect_product)
+ RegisterSignal(atom_product, COMSIG_PARENT_PREQDELETED, .proc/remove_from_holo_lists)
+ continue
+
+ if(isobj(holo_atom))
+ var/obj/holo_object = holo_atom
+ holo_object.resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+ if(isstructure(holo_object))
+ holo_object.flags_1 |= NODECONSTRUCT_1
+ continue
+
+ if(ismachinery(holo_object))
+ var/obj/machinery/holo_machine = holo_object
+ holo_machine.flags_1 |= NODECONSTRUCT_1
+ holo_machine.power_change()
+
+ if(istype(holo_machine, /obj/machinery/button))
+ var/obj/machinery/button/holo_button = holo_machine
+ holo_button.setup_device()
+
+ spawning_simulation = FALSE
+
+///this qdels holoitems that should no longer exist for whatever reason
+/obj/machinery/computer/holodeck/proc/derez(atom/movable/holo_atom, silent = TRUE, forced = FALSE)
+ spawned -= holo_atom
+ if(!holo_atom)
return
- emergency_shutdown()
+ UnregisterSignal(holo_atom, COMSIG_PARENT_PREQDELETED)
+ var/turf/target_turf = get_turf(holo_atom)
+ for(var/atom/movable/atom_contents as anything in holo_atom) //make sure that things inside of a holoitem are moved outside before destroying it
+ atom_contents.forceMove(target_turf)
-/obj/machinery/computer/holodeck/ex_act(severity, target)
- emergency_shutdown()
- return ..()
+ if(!silent)
+ visible_message("[holo_atom] fades away!")
-/obj/machinery/computer/holodeck/blob_act(obj/structure/blob/B)
- emergency_shutdown()
- return ..()
+ qdel(holo_atom)
-/obj/machinery/computer/holodeck/proc/generate_program_list()
- for(var/typekey in subtypesof(program_type))
- var/area/holodeck/A = GLOB.areas_by_type[typekey]
- if(!A || !A.contents.len)
- continue
- var/list/info_this = list()
- info_this["name"] = A.name
- info_this["type"] = A.type
- if(A.restricted)
- LAZYADD(emag_programs, list(info_this))
- else
- LAZYADD(program_cache, list(info_this))
+/obj/machinery/computer/holodeck/proc/remove_from_holo_lists(datum/to_remove, _forced)
+ SIGNAL_HANDLER
+
+ spawned -= to_remove
+ UnregisterSignal(to_remove, COMSIG_PARENT_PREQDELETED)
+
+/obj/machinery/computer/holodeck/process(delta_time=2)
+ if(damaged && DT_PROB(10, delta_time))
+ for(var/turf/holo_turf in linked)
+ if(DT_PROB(5, delta_time))
+ do_sparks(2, 1, holo_turf)
+ return
+ . = ..()
+ if(!. || program == offline_program)//we dont need to scan the holodeck if the holodeck is offline
+ return
+
+ if(!floorcheck()) //if any turfs in the floor of the holodeck are broken
+ emergency_shutdown()
+ damaged = TRUE
+ visible_message("The holodeck overloads!")
+ for(var/turf/holo_turf in linked)
+ if(DT_PROB(30, delta_time))
+ do_sparks(2, 1, holo_turf)
+ SSexplosions.lowturf += holo_turf
+ holo_turf.hotspot_expose(1000,500,1)
+
+ if(!(obj_flags & EMAGGED))
+ for(var/item in spawned)
+ if(!(get_turf(item) in linked))
+ derez(item)
+ for(var/obj/effect/holodeck_effect/holo_effect as anything in effects)
+ holo_effect.tick()
+ active_power_usage = 50 + spawned.len * 3 + effects.len * 5
/obj/machinery/computer/holodeck/proc/toggle_power(toggleOn = FALSE)
if(active == toggleOn)
return
if(toggleOn)
- if(last_program && last_program != offline_program)
- addtimer(CALLBACK(src, .proc/load_program, last_program, TRUE), 25)
+ if(last_program && (last_program != offline_program))
+ addtimer(CALLBACK(src,.proc/load_program, last_program, TRUE), 25)
active = TRUE
else
last_program = program
load_program(offline_program, TRUE)
active = FALSE
+/obj/machinery/computer/holodeck/power_change()
+ . = ..()
+ INVOKE_ASYNC(src, .proc/toggle_power, !stat)
+
+///shuts down the holodeck and force loads the offline_program
/obj/machinery/computer/holodeck/proc/emergency_shutdown()
last_program = program
- load_program(offline_program, TRUE)
active = FALSE
+ load_program(offline_program, TRUE)
+ ui_update()
+///returns TRUE if the entire floor of the holodeck is intact, returns FALSE if any are broken
/obj/machinery/computer/holodeck/proc/floorcheck()
- for(var/turf/T in linked)
- if(!T.intact || isspaceturf(T))
+ for(var/turf/holo_floor in linked)
+ if(isspaceturf(holo_floor))
+ return FALSE
+ if(!holo_floor.intact)
return FALSE
return TRUE
-/obj/machinery/computer/holodeck/proc/nerf(active)
- for(var/obj/item/I in spawned)
- I.damtype = active ? STAMINA : initial(I.damtype)
- for(var/e in effects)
- var/obj/effect/holodeck_effect/HE = e
- HE.safety(active)
-
-/obj/machinery/computer/holodeck/proc/load_program(area/A, force = FALSE, add_delay = TRUE)
- if(!is_operational())
- A = offline_program
- force = TRUE
+///changes all weapons in the holodeck to do stamina damage if set
+/obj/machinery/computer/holodeck/proc/nerf(nerf_this, is_loading = TRUE)
+ if (!nerf_this && is_loading)
+ return
+ for(var/obj/item/to_be_nerfed in spawned)
+ to_be_nerfed.damtype = nerf_this ? STAMINA : initial(to_be_nerfed.damtype)
+ for(var/obj/effect/holodeck_effect/holo_effect as anything in effects)
+ holo_effect.safety(nerf_this)
- if(program == A)
+/obj/machinery/computer/holodeck/emag_act(mob/user)
+ if(obj_flags & EMAGGED)
return
- if(current_cd > world.time && !force)
- say("ERROR. Recalibrating projection apparatus.")
+ if(!LAZYLEN(emag_programs))
+ to_chat(user, "[src] does not seem to have a card swipe port. It must be an inferior model.")
return
- if(add_delay)
- current_cd = world.time + HOLODECK_CD
- if(damaged)
- current_cd += HOLODECK_DMG_CD
- active = (A != offline_program)
- use_power = active + IDLE_POWER_USE
-
- for(var/e in effects)
- var/obj/effect/holodeck_effect/HE = e
- HE.deactivate(src)
-
- for(var/item in spawned)
- derez(item, !force)
+ playsound(src, "sparks", 75, TRUE)
+ obj_flags |= EMAGGED
+ to_chat(user, "You vastly increase projector power and override the safety and security protocols.")
+ say("Warning. Automatic shutoff and derezzing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.")
+ log_game("[key_name(user)] emagged the Holodeck Control Console")
+ nerf(!(obj_flags & EMAGGED),FALSE)
+ ui_update()
- program = A
- // note nerfing does not yet work on guns, should
- // should also remove/limit/filter reagents?
- // this is an exercise left to others I'm afraid. -Sayu
- spawned = A.copy_contents_to(linked, 1, nerf_weapons = !(obj_flags & EMAGGED))
- for(var/obj/machinery/M in spawned)
- M.flags_1 |= NODECONSTRUCT_1
- for(var/obj/structure/S in spawned)
- S.flags_1 |= NODECONSTRUCT_1
- effects = list()
+/obj/machinery/computer/holodeck/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
+ emergency_shutdown()
- addtimer(CALLBACK(src, .proc/finish_spawn), 30)
+/obj/machinery/computer/holodeck/ex_act(severity, target)
+ emergency_shutdown()
+ return ..()
-/obj/machinery/computer/holodeck/proc/finish_spawn()
- var/list/added = list()
- for(var/obj/effect/holodeck_effect/HE in spawned)
- effects += HE
- spawned -= HE
- var/atom/x = HE.activate(src)
- if(istype(x) || islist(x))
- spawned += x // holocarp are not forever
- added += x
- for(var/obj/machinery/M in added)
- M.flags_1 |= NODECONSTRUCT_1
- for(var/obj/structure/S in added)
- S.flags_1 |= NODECONSTRUCT_1
-
-/obj/machinery/computer/holodeck/proc/derez(obj/O, silent = TRUE, forced = FALSE)
- // Emagging a machine creates an anomaly in the derez systems.
- if(O && (obj_flags & EMAGGED) && !stat && !forced)
- if((ismob(O) || ismob(O.loc)) && prob(50))
- addtimer(CALLBACK(src, .proc/derez, O, silent), 50) // may last a disturbingly long time
- return
-
- spawned -= O
- if(!O)
- return
- var/turf/T = get_turf(O)
- for(var/atom/movable/AM in O) // these should be derezed if they were generated
- AM.forceMove(T)
- if(ismob(AM))
- silent = FALSE // otherwise make sure they are dropped
+/obj/machinery/computer/holodeck/Destroy()
+ emergency_shutdown()
+ if(linked)
+ linked.linked = null
+ linked.power_usage = list(AREA_USAGE_LEN)
+ return ..()
- if(!silent)
- visible_message("[O] fades away!")
- qdel(O)
+/obj/machinery/computer/holodeck/blob_act(obj/structure/blob/B)
+ emergency_shutdown()
+ return ..()
#undef HOLODECK_CD
#undef HOLODECK_DMG_CD
diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm
index 7d39ad8fa96d3..adfe9c96b2f1a 100644
--- a/code/modules/holodeck/holo_effect.dm
+++ b/code/modules/holodeck/holo_effect.dm
@@ -28,31 +28,36 @@
/obj/effect/holodeck_effect/cards
icon = 'icons/obj/toy.dmi'
icon_state = "deck_nanotrasen_full"
- var/obj/item/toy/cards/deck/D
+ var/obj/item/toy/cards/deck/deck
/obj/effect/holodeck_effect/cards/activate(var/obj/machinery/computer/holodeck/HC)
- D = new(loc)
+ deck = new(loc)
safety(!(HC.obj_flags & EMAGGED))
- D.holo = HC
- return D
+ deck.holo = HC
+ RegisterSignal(deck, COMSIG_PARENT_QDELETING, .proc/handle_card_delete)
+ return deck
+
+/obj/effect/holodeck_effect/cards/proc/handle_card_delete(datum/source)
+ SIGNAL_HANDLER
+ deck = null
/obj/effect/holodeck_effect/cards/safety(active)
- if(!D)
+ if(!deck)
return
if(active)
- D.card_hitsound = null
- D.card_force = 0
- D.card_throwforce = 0
- D.card_throw_speed = 3
- D.card_throw_range = 7
- D.card_attack_verb = list("attacked")
+ deck.card_hitsound = null
+ deck.card_force = 0
+ deck.card_throwforce = 0
+ deck.card_throw_speed = 3
+ deck.card_throw_range = 7
+ deck.card_attack_verb = list("attacked")
else
- D.card_hitsound = 'sound/weapons/bladeslice.ogg'
- D.card_force = 5
- D.card_throwforce = 10
- D.card_throw_speed = 3
- D.card_throw_range = 7
- D.card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
+ deck.card_hitsound = 'sound/weapons/bladeslice.ogg'
+ deck.card_force = 5
+ deck.card_throwforce = 10
+ deck.card_throw_speed = 3
+ deck.card_throw_range = 7
+ deck.card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
/obj/effect/holodeck_effect/sparks/activate(var/obj/machinery/computer/holodeck/HC)
@@ -61,31 +66,44 @@
var/datum/effect_system/spark_spread/s = new
s.set_up(3, 1, T)
s.start()
- T.temperature = 5000
+ T.set_temperature(5000)
T.hotspot_expose(50000,50000,1)
+/obj/effect/holodeck_effect/random_book
+
+/obj/effect/holodeck_effect/random_book/activate(obj/machinery/computer/holodeck/father_holodeck)
+ var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki)
+ var/newtype = pick(subtypesof(/obj/item/book/manual) - banned_books)
+ var/obj/item/book/manual/to_spawn = new newtype(loc)
+ to_spawn.flags_1 |= (HOLOGRAM_1 | NODECONSTRUCT_1)
+ return to_spawn
/obj/effect/holodeck_effect/mobspawner
var/mobtype = /mob/living/simple_animal/hostile/carp/holocarp
- var/mob/mob = null
+ var/mob/our_mob = null
/obj/effect/holodeck_effect/mobspawner/activate(var/obj/machinery/computer/holodeck/HC)
if(islist(mobtype))
mobtype = pick(mobtype)
- mob = new mobtype(loc)
- mob.flags_1 |= HOLOGRAM_1
+ our_mob = new mobtype(loc)
+ our_mob.flags_1 |= HOLOGRAM_1
// these vars are not really standardized but all would theoretically create stuff on death
- for(var/v in list("butcher_results","corpse","weapon1","weapon2","blood_volume") & mob.vars)
- mob.vars[v] = null
- return mob
+ for(var/v in list("butcher_results","corpse","weapon1","weapon2","blood_volume") & our_mob.vars)
+ our_mob.vars[v] = null
+ RegisterSignal(our_mob, COMSIG_PARENT_QDELETING, .proc/handle_mob_delete)
+ return our_mob
/obj/effect/holodeck_effect/mobspawner/deactivate(var/obj/machinery/computer/holodeck/HC)
- if(mob)
- HC.derez(mob)
+ if(our_mob)
+ HC.derez(our_mob)
qdel(src)
+/obj/effect/holodeck_effect/mobspawner/proc/handle_mob_delete(datum/source)
+ SIGNAL_HANDLER
+ our_mob = null
+
/obj/effect/holodeck_effect/mobspawner/pet
mobtype = list(
/mob/living/simple_animal/butterfly, /mob/living/simple_animal/chick/holo,
@@ -101,7 +119,7 @@
/obj/effect/holodeck_effect/mobspawner/penguin
mobtype = /mob/living/simple_animal/pet/penguin/emperor
-
+
/obj/effect/holodeck_effect/mobspawner/penguin/Initialize()
if(prob(1))
mobtype = /mob/living/simple_animal/pet/penguin/emperor/shamebrero
@@ -109,3 +127,21 @@
/obj/effect/holodeck_effect/mobspawner/penguin_baby
mobtype = /mob/living/simple_animal/pet/penguin/baby
+
+/obj/effect/holodeck_effect/mobspawner/cat
+ mobtype = /mob/living/simple_animal/pet/cat
+
+/obj/effect/holodeck_effect/mobspawner/butterfly
+ mobtype = /mob/living/simple_animal/butterfly
+
+/obj/effect/holodeck_effect/mobspawner/clown
+ mobtype = list (/mob/living/simple_animal/hostile/retaliate/clown = 10,
+ /mob/living/simple_animal/hostile/retaliate/clown/banana = 6, /mob/living/simple_animal/hostile/retaliate/clown/honkling = 6,
+ /mob/living/simple_animal/hostile/retaliate/clown/fleshclown = 3, /mob/living/simple_animal/hostile/retaliate/clown/longface = 3,
+ /mob/living/simple_animal/hostile/retaliate/clown/mutant = 1, /mob/living/simple_animal/hostile/retaliate/clown/mutant/blob = 1)
+
+/obj/effect/holodeck_effect/mobspawner/psycho
+ mobtype = list (/mob/living/simple_animal/hostile/psycho/regular = 9,
+ /mob/living/simple_animal/hostile/psycho/muzzle = 3,
+ /mob/living/simple_animal/hostile/psycho/fast = 3,
+ /mob/living/simple_animal/hostile/psycho/trap = 1)
diff --git a/code/modules/holodeck/holodeck_map_templates.dm b/code/modules/holodeck/holodeck_map_templates.dm
new file mode 100644
index 0000000000000..f687d3e2fd6ba
--- /dev/null
+++ b/code/modules/holodeck/holodeck_map_templates.dm
@@ -0,0 +1,165 @@
+// --------------------
+// -- HOLODECK TEMPLATES --
+// --------------------
+
+/datum/map_template/holodeck
+ var/template_id = "id"
+ var/restricted = FALSE
+ var/datum/parsed_map/lastparsed
+
+ should_place_on_top = FALSE
+ returns_created_atoms = TRUE
+ keep_cached_map = TRUE
+
+ var/obj/machinery/computer/holodeck/linked
+
+/datum/map_template/holodeck/offline
+ name = "Holodeck - Offline"
+ template_id = "offline"
+ mappath = "_maps/holodeck/offline.dmm"
+
+/datum/map_template/holodeck/emptycourt
+ name = "Holodeck - Empty Court"
+ template_id = "emptycourt"
+ mappath = "_maps/holodeck/emptycourt.dmm"
+
+/datum/map_template/holodeck/dodgeball
+ name = "Holodeck - Dodgeball Court"
+ template_id = "dodgeball"
+ mappath = "_maps/holodeck/dodgeball.dmm"
+
+/datum/map_template/holodeck/basketball
+ name = "Holodeck - Basketball Court"
+ template_id = "basketball"
+ mappath = "_maps/holodeck/basketball.dmm"
+
+/datum/map_template/holodeck/thunderdome
+ name = "Holodeck - Thunderdome Arena"
+ template_id = "thunderdome"
+ mappath = "_maps/holodeck/thunderdome.dmm"
+
+/datum/map_template/holodeck/beach
+ name = "Holodeck - Beach"
+ template_id = "beach"
+ mappath = "_maps/holodeck/beach.dmm"
+
+/datum/map_template/holodeck/lounge
+ name = "Holodeck - Lounge"
+ template_id = "lounge"
+ mappath = "_maps/holodeck/lounge.dmm"
+
+/datum/map_template/holodeck/petpark
+ name = "Holodeck - Pet Park"
+ template_id = "petpark"
+ mappath = "_maps/holodeck/petpark.dmm"
+
+/datum/map_template/holodeck/firingrange
+ name = "Holodeck - Firing Range"
+ template_id = "firingrange"
+ mappath = "_maps/holodeck/firingrange.dmm"
+
+/datum/map_template/holodeck/anime_school
+ name = "Holodeck - Anime School"
+ template_id = "animeschool"
+ mappath = "_maps/holodeck/animeschool.dmm"
+
+/datum/map_template/holodeck/chapelcourt
+ name = "Holodeck - Chapel Courtroom"
+ template_id = "chapelcourt"
+ mappath = "_maps/holodeck/chapelcourt.dmm"
+
+/datum/map_template/holodeck/spacechess
+ name = "Holodeck - Space Chess"
+ template_id = "spacechess"
+ mappath = "_maps/holodeck/spacechess.dmm"
+
+/datum/map_template/holodeck/spacecheckers
+ name = "Holodeck - Space Checkers"
+ template_id = "spacecheckers"
+ mappath = "_maps/holodeck/spacecheckers.dmm"
+
+/datum/map_template/holodeck/kobayashi
+ name = "Holodeck - Kobayashi Maru"
+ template_id = "kobayashi"
+ mappath = "_maps/holodeck/kobayashi.dmm"
+
+/datum/map_template/holodeck/winterwonderland
+ name = "Holodeck - Winter Wonderland"
+ template_id = "winterwonderland"
+ mappath = "_maps/holodeck/winterwonderland.dmm"
+
+/datum/map_template/holodeck/photobooth
+ name = "Holodeck - Photobooth"
+ template_id = "photobooth"
+ mappath = "_maps/holodeck/photobooth.dmm"
+
+/datum/map_template/holodeck/skatepark
+ name = "Holodeck - Skatepark"
+ template_id = "skatepark"
+ mappath = "_maps/holodeck/skatepark.dmm"
+
+/datum/map_template/holodeck/teahouse
+ name = "Holodeck - Japanese Tea House"
+ template_id = "holodeck_teahouse"
+ mappath = "_maps/templates/holodeck_teahouse.dmm"
+
+/datum/map_template/holodeck/kitchen
+ name = "Holodeck - Holo-Kitchen"
+ template_id = "holodeck_kitchen"
+ mappath = "_maps/templates/holodeck_kitchen.dmm"
+
+//bad evil no good programs
+
+/datum/map_template/holodeck/medicalsim
+ name = "Holodeck - Emergency Medical"
+ template_id = "medicalsim"
+ mappath = "_maps/holodeck/medicalsim.dmm"
+ restricted = TRUE
+
+/datum/map_template/holodeck/thunderdome1218
+ name = "Holodeck - 1218 AD"
+ template_id = "thunderdome1218"
+ mappath = "_maps/holodeck/thunderdome1218.dmm"
+ restricted = TRUE
+
+/datum/map_template/holodeck/burntest
+ name = "Holodeck - Atmospheric Burn Test"
+ template_id = "burntest"
+ mappath = "_maps/holodeck/burntest.dmm"
+ restricted = TRUE
+
+/datum/map_template/holodeck/wildlifesim
+ name = "Holodeck - Wildlife Simulation"
+ template_id = "wildlifesim"
+ mappath = "_maps/holodeck/wildlifesim.dmm"
+ restricted = TRUE
+
+/datum/map_template/holodeck/holdoutbunker
+ name = "Holodeck - Holdout Bunker"
+ template_id = "holdoutbunker"
+ mappath = "_maps/holodeck/holdoutbunker.dmm"
+ restricted = TRUE
+
+/datum/map_template/holodeck/anthophillia
+ name = "Holodeck - Anthophillia"
+ template_id = "anthophillia"
+ mappath = "_maps/holodeck/anthophillia.dmm"
+ restricted = TRUE
+
+/datum/map_template/holodeck/refuelingstation
+ name = "Holodeck - Refueling Station"
+ template_id = "refuelingstation"
+ mappath = "_maps/holodeck/refuelingstation.dmm"
+ restricted = TRUE
+
+/datum/map_template/holodeck/asylum
+ name = "Holodeck - Asylum"
+ template_id = "holodeck_asylum"
+ mappath = "_maps/templates/holodeck_asylum.dmm"
+ restricted = TRUE
+
+/datum/map_template/holodeck/clownworld
+ name = "Holodeck - Clown World"
+ template_id = "holodeck_clownworld"
+ mappath = "_maps/templates/holodeck_clownworld.dmm"
+ restricted = TRUE
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index 27685f242b385..9bcf8513db529 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -227,3 +227,20 @@
/obj/item/paper/fluff/holodeck/disclaimer
name = "Holodeck Disclaimer"
info = "Bruises sustained in the holodeck can be healed simply by sleeping."
+
+/obj/vehicle/ridden/scooter/skateboard/pro/holodeck
+ name = "holographic skateboard"
+ desc = "A holographic copy of the EightO brand professional skateboard."
+ instability = 6
+
+/obj/vehicle/ridden/scooter/skateboard/pro/holodeck/screwdriver_act(mob/living/user, obj/item/I)
+ return FALSE
+
+/obj/vehicle/ridden/scooter/skateboard/pro/holodeck/pick_up_board() //picking up normal skateboards spawned in the holodeck gets rid of the holo flag, now you cant pick them up.
+ return
+
+/obj/vehicle/ridden/scooter/skateboard/pro/holodeck/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/stack/rods))
+ return
+ else
+ return ..()
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index f8b9e3587e52e..a482ed877febf 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -1,7 +1,9 @@
/turf/open/floor/holofloor
icon_state = "floor"
+ holodeck_compatible = TRUE
thermal_conductivity = 0
flags_1 = NONE
+ var/direction = SOUTH
/turf/open/floor/holofloor/attackby(obj/item/I, mob/living/user)
return // HOLOFLOOR DOES NOT GIVE A FUCK
@@ -19,6 +21,30 @@
name = "holodeck projector floor"
icon_state = "engine"
+/turf/open/floor/holofloor/chapel
+ name = "chapel floor"
+ icon_state = "chapel"
+
+/turf/open/floor/holofloor/chapel/bottom_left
+ direction = WEST
+
+/turf/open/floor/holofloor/chapel/top_right
+ direction = EAST
+
+/turf/open/floor/holofloor/chapel/bottom_right
+
+/turf/open/floor/holofloor/chapel/top_left
+ direction = NORTH
+
+/turf/open/floor/holofloor/chapel/Initialize(mapload)
+ . = ..()
+ if (direction != SOUTH)
+ setDir(direction)
+
+/turf/open/floor/holofloor/white
+ name = "white floor"
+ icon_state = "white"
+
/turf/open/floor/holofloor/plating/burnmix
name = "burn-mix floor"
initial_gas_mix = BURNMIX_ATMOS
@@ -142,3 +168,14 @@
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
tiled_dirt = FALSE
+
+/turf/open/floor/holofloor/dark
+ icon_state = "darkfull"
+
+/turf/open/floor/holofloor/clown
+ icon_state = "bananium"
+
+/turf/open/floor/holofloor/white
+ name = "white floor"
+ desc = "A tile in a pure white color."
+ icon_state = "pure_white"
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 38dd8b48e0029..8dbdc997c482a 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -16,9 +16,7 @@
/mob/living/carbon/human/bee_friendly()
- if(dna?.species?.id == "pod") //bees pollinate plants, duh.
- return 1
- if (wear_suit && head && istype(wear_suit, /obj/item/clothing) && istype(head, /obj/item/clothing))
+ if (wear_suit && head && isclothing(wear_suit) && isclothing(head))
var/obj/item/clothing/CS = wear_suit
var/obj/item/clothing/CH = head
if (CS.clothing_flags & CH.clothing_flags & THICKMATERIAL)
@@ -208,7 +206,7 @@
continue
if(B.loc == src)
B.forceMove(drop_location())
- B.target = user
+ B.GiveTarget(user)
bees = TRUE
if(bees)
visible_message("[user] disturbs the bees!")
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index f0342c7c847b3..e4b2483355803 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -32,13 +32,20 @@
/obj/machinery/biogenerator/contents_explosion(severity, target)
..()
if(beaker)
- beaker.ex_act(severity, target)
+ switch(severity)
+ if(EXPLODE_DEVASTATE)
+ SSexplosions.high_mov_atom += beaker
+ if(EXPLODE_HEAVY)
+ SSexplosions.med_mov_atom += beaker
+ if(EXPLODE_LIGHT)
+ SSexplosions.low_mov_atom += beaker
/obj/machinery/biogenerator/handle_atom_del(atom/A)
..()
if(A == beaker)
beaker = null
update_icon()
+ ui_update()
/obj/machinery/biogenerator/RefreshParts()
var/E = 0
@@ -56,7 +63,7 @@
/obj/machinery/biogenerator/examine(mob/user)
. = ..()
if(in_range(user, src) || isobserver(user))
- . += "The status display reads: Productivity at [productivity*100]%.Matter consumption reduced by [(efficiency*25)-25]%. Machine can hold up to [max_items] pieces of produce." + . += "The status display reads: Productivity at [productivity*100]%. Matter consumption reduced by [(efficiency*25)-25]%. Machine can hold up to [max_items] pieces of produce." /obj/machinery/biogenerator/on_reagent_change(changetype) //When the reagents change, change the icon as well. update_icon() @@ -85,6 +92,7 @@ var/obj/item/reagent_containers/glass/B = beaker B.forceMove(drop_location()) beaker = null + ui_update() update_icon() return @@ -102,6 +110,7 @@ beaker = O to_chat(user, "You add the container to the machine.") update_icon() + ui_update() else to_chat(user, "Close the maintenance panel first.") return @@ -125,6 +134,7 @@ to_chat(user, "You empty the plant bag into the biogenerator, filling it to its capacity.") else to_chat(user, "You fill the biogenerator to its capacity.") + ui_update() return TRUE //no afterattack else if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) @@ -136,24 +146,26 @@ else if(user.transferItemToLoc(O, src)) to_chat(user, "You put [O.name] in [src.name]") + ui_update() return TRUE //no afterattack else if (istype(O, /obj/item/disk/design_disk)) user.visible_message("[user] begins to load \the [O] in \the [src]...", "You begin to load a design from \the [O]...", "You hear the chatter of a floppy drive.") processing = TRUE + ui_update() var/obj/item/disk/design_disk/D = O if(do_after(user, 10, target = src)) for(var/B in D.blueprints) if(B) stored_research.add_design(B) processing = FALSE + ui_update() return TRUE else to_chat(user, "You cannot put this in [src.name]!") /obj/machinery/biogenerator/AltClick(mob/living/user) - . = ..() if(user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK) && can_interact(user)) detach(user) @@ -176,16 +188,20 @@ S += 5 if(I.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment) < 0.1) points += 1 * productivity + ui_update() else points += I.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment) * 10 * productivity + ui_update() qdel(I) if(S) processing = TRUE + ui_update() update_icon() playsound(loc, 'sound/machines/blender.ogg', 50, TRUE) use_power(S * 30) sleep(S + 15 / productivity) processing = FALSE + ui_update() update_icon() /obj/machinery/biogenerator/proc/check_cost(list/materials, multiplier = 1, remove_points = TRUE) @@ -196,6 +212,7 @@ else if(remove_points) points -= materials[getmaterialref(/datum/material/biomass)]*multiplier/efficiency + ui_update() update_icon() return TRUE @@ -245,6 +262,7 @@ beaker.forceMove(drop_location()) beaker = null update_icon() + ui_update() /obj/machinery/biogenerator/ui_status(mob/user) if(stat & BROKEN || panel_open) diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index cdcca86bd5e3e..058a65e57dba7 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -15,7 +15,7 @@ var/list/trait_genes = list() var/datum/plant_gene/target - var/operation = "" + var/operation = null var/max_potency = 50 // See RefreshParts() for how these work var/max_yield = 2 var/min_production = 12 @@ -23,6 +23,8 @@ var/min_wchance = 67 var/min_wrate = 10 + var/skip_confirmation = FALSE + /obj/machinery/plantgenes/RefreshParts() // Comments represent the max you can set per tier, respectively. seeds.dm [219] clamps these for us but we don't want to mislead the viewer. for(var/obj/item/stock_parts/manipulator/M in component_parts) if(M.rating > 3) @@ -52,6 +54,7 @@ max_endurance = 100 min_wchance = 0 min_wrate = 0 + ui_update() /obj/machinery/plantgenes/update_icon() ..() @@ -97,163 +100,148 @@ else ..() -/obj/machinery/plantgenes/ui_interact(mob/user) - . = ..() - if(!user) +/obj/machinery/plantgenes/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "PlantDNAManipulator") + ui.open() + +/obj/machinery/plantgenes/ui_data(mob/user) + var/list/data = list() + . = data + + data["seed"] = seed?.name + data["disk"] = null + data["disk_gene"] = null + data["disk_readonly"] = FALSE + data["disk_canadd"] = TRUE + + data["operation"] = operation + data["operation_target"] = build_gene(target) + + if(disk) + data["disk_readonly"] = disk.read_only + if(disk.gene) + data["disk_gene"] = build_gene(disk.gene) + data["disk"] = disk.gene.get_name() + if(seed) + data["disk_canadd"] = disk.gene.can_add(seed) + else + data["disk"] = "Empty disk" + if(disk.read_only) + data["disk"] += " (RO)" + + data["core_genes"] = build_gene_list(core_genes, /datum/plant_gene/core) + data["reagent_genes"] = build_gene_list(reagent_genes, /datum/plant_gene/reagent) + data["trait_genes"] = build_gene_list(trait_genes, /datum/plant_gene/trait) + + data["machine_stats"] = build_machine_stats() + data["skip_confirmation"] = skip_confirmation + +/obj/machinery/plantgenes/proc/build_machine_stats() + var/list/L = list() + . = L + + L["potency"] = list("max", max_potency) + L["yield"] = list("max", max_yield) + L["production speed"] = list("min", min_production) + L["endurance"] = list("max", max_endurance) + L["lifespan"] = list("max", max_endurance) + L["weed growth rate"] = list("min", min_wrate) + L["weed vulnerability"] = list("min", min_wchance) + +/obj/machinery/plantgenes/proc/build_gene_list(list/genes, filter_type) + var/list/L = list() + . = L + + for(var/datum/plant_gene/gene in genes) + L += list(build_gene(gene, filter_type)) + +/obj/machinery/plantgenes/proc/get_gene_id(datum/plant_gene/gene) + if(istype(gene, /datum/plant_gene/core)) + var/datum/plant_gene/core/core_gene = gene + return "core[core_gene.type]" + if(istype(gene, /datum/plant_gene/reagent)) + var/datum/plant_gene/reagent/reagent_gene = gene + return "reagent[reagent_gene.reagent_id]" + if(istype(gene, /datum/plant_gene/trait)) + var/datum/plant_gene/trait/trait_gene = gene + return "trait[trait_gene.type]" + + return "unknown/[gene.name]" + +/obj/machinery/plantgenes/proc/build_gene(datum/plant_gene/gene, filter_type) + if(!gene) return - var/datum/browser/popup = new(user, "plantdna", "Plant DNA Manipulator", 450, 600) - if(!(in_range(src, user) || issilicon(user))) - popup.close() + if(filter_type && !istype(gene, filter_type)) return - var/dat = "" + var/list/L = list() + . = L - if(operation) - if(!seed || (!target && operation != "insert")) - operation = "" - target = null - interact(user) - return - if((operation == "replace" || operation == "insert") && (!disk || !disk.gene)) - operation = "" - target = null - interact(user) - return + L["name"] = gene.get_name() - dat += " Confirm OperationAre you sure you want to [operation] "
- switch(operation)
- if("remove")
- dat += "[target.get_name()] gene from \the [seed]? "
- popup.set_content(dat)
- popup.open()
- return
+ L["extractable"] = gene.mutability_flags & PLANT_GENE_EXTRACTABLE
+ L["removable"] = gene.mutability_flags & PLANT_GENE_REMOVABLE
- dat+= "" - if("extract") - dat += "[target.get_name()] gene from \the [seed]? " - dat += "The sample will be destroyed in process!" - if(istype(target, /datum/plant_gene/core)) - var/datum/plant_gene/core/gene = target - if(istype(target, /datum/plant_gene/core/potency)) - if(gene.value > max_potency) - dat += " This device's extraction capabilities are currently limited to [max_potency] potency. " - dat += "Target gene will be degraded to [max_potency] potency on extraction." - else if(istype(target, /datum/plant_gene/core/lifespan)) - if(gene.value > max_endurance) - dat += " This device's extraction capabilities are currently limited to [max_endurance] lifespan. " - dat += "Target gene will be degraded to [max_endurance] Lifespan on extraction." - else if(istype(target, /datum/plant_gene/core/endurance)) - if(gene.value > max_endurance) - dat += " This device's extraction capabilities are currently limited to [max_endurance] endurance. " - dat += "Target gene will be degraded to [max_endurance] endurance on extraction." - else if(istype(target, /datum/plant_gene/core/yield)) - if(gene.value > max_yield) - dat += " This device's extraction capabilities are currently limited to [max_yield] yield. " - dat += "Target gene will be degraded to [max_yield] yield on extraction." - else if(istype(target, /datum/plant_gene/core/production)) - if(gene.value < min_production) - dat += " This device's extraction capabilities are currently limited to [min_production] production. " - dat += "Target gene will be degraded to [min_production] production on extraction." - else if(istype(target, /datum/plant_gene/core/weed_rate)) - if(gene.value < min_wrate) - dat += " This device's extraction capabilities are currently limited to [min_wrate] weed rate. " - dat += "Target gene will be degraded to [min_wrate] weed rate on extraction." - else if(istype(target, /datum/plant_gene/core/weed_chance)) - if(gene.value < min_wchance) - dat += " This device's extraction capabilities are currently limited to [min_wchance] weed chance. " - dat += "Target gene will be degraded to [min_wchance] weed chance on extraction." - - if("replace") - dat += "[target.get_name()] gene with [disk.gene.get_name()]? " - if("insert") - dat += "[disk.gene.get_name()] gene into \the [seed]? " - dat += " "
+ if(istype(gene, /datum/plant_gene/core))
+ var/datum/plant_gene/core/core_gene = gene
- dat += " "
+ L["type"] = "reagent"
+ L["id"] = get_gene_id(gene)
+ L["rate"] = reagent_gene.rate
- if(seed)
- var/can_insert = disk && disk.gene && disk.gene.can_add(seed)
- var/can_extract = disk && !disk.read_only
+ if(istype(gene, /datum/plant_gene/trait))
+ var/datum/plant_gene/trait/trait_gene = gene
- dat += "Plant Sample: Core Genes
Content Genes"
- if(reagent_genes.len)
- dat += " "
- if(can_insert && istype(disk.gene, /datum/plant_gene/reagent))
- dat += "Insert: [disk.gene.get_name()]"
-
- dat += "
" - dat += " Trait Genes"
- if(trait_genes.len)
- dat += " "
- else
- dat += "
" - if(can_insert && istype(disk.gene, /datum/plant_gene/trait)) - dat += "Insert: [disk.gene.get_name()]" - dat += " No sample found. Please, insert a plant sample to use this device." - popup.set_content(dat) - popup.open() + L["type"] = "trait" + L["id"] = get_gene_id(gene) + L["trait_id"] = trait_gene.trait_id + +/obj/machinery/plantgenes/ui_static_data(mob/user) + var/list/data = list() + + data["stat_tooltips"] = list( + potency = "The 'power' of a plant. Generally effects the amount of reagent in a plant.", + yield = "The amount of crop yielded from a harvest", + "production speed" = "The speed at which a plant grows. Lower is better.", + endurance = "The amount of health the plant has", + lifespan = "The time it takes before the plant starts dying of old age", + "weed vulnerability" = "The vulnerability of the plant to weeds growing", + "weed growth rate" = "The speed at which weeds can grow around the plant. The higher the faster they grow.", + ) + return data -/obj/machinery/plantgenes/Topic(var/href, var/list/href_list) +/obj/machinery/plantgenes/proc/find_gene_by_id(var/gene_id) + for(var/datum/plant_gene/gene in core_genes) + if(get_gene_id(gene) == gene_id) + return gene + for(var/datum/plant_gene/gene in reagent_genes) + if(get_gene_id(gene) == gene_id) + return gene + for(var/datum/plant_gene/gene in trait_genes) + if(get_gene_id(gene) == gene_id) + return gene + +/obj/machinery/plantgenes/ui_act(action, params) if(..()) return - usr.set_machine(src) - if(href_list["eject_seed"] && !operation) + if(action == "toggle_skip_confirmation") + skip_confirmation = !skip_confirmation + . = TRUE + + if(action == "eject_insert_seed") var/obj/item/I = usr.get_active_held_item() if(istype(I, /obj/item/seeds)) if(!usr.transferItemToLoc(I, src)) @@ -261,9 +249,11 @@ eject_seed() insert_seed(I) to_chat(usr, "You add [I] to the machine.") + . = TRUE else - eject_seed() - else if(href_list["eject_disk"] && !operation) + . = eject_seed() + + if(action == "eject_insert_disk") var/obj/item/I = usr.get_active_held_item() if(istype(I, /obj/item/disk/plantgene)) if(!usr.transferItemToLoc(I, src)) @@ -271,86 +261,104 @@ eject_disk() disk = I to_chat(usr, "You add [I] to the machine.") + . = TRUE else - eject_disk() - else if(href_list["op"] == "insert" && disk && disk.gene && seed) - if(!operation) // Wait for confirmation - operation = "insert" - else - if(!istype(disk.gene, /datum/plant_gene/core) && disk.gene.can_add(seed)) - seed.genes += disk.gene.Copy() - if(istype(disk.gene, /datum/plant_gene/reagent)) - seed.reagents_from_genes() - update_genes() - repaint_seed() - operation = "" - target = null + . = eject_disk() - else if(href_list["gene"] && seed) - var/datum/plant_gene/G = seed.get_gene(href_list["gene"]) - if(!G || !href_list["op"] || !(href_list["op"] in list("remove", "extract", "replace"))) - interact(usr) - return - - if(!operation || target != G) // Wait for confirmation + if(seed) + if(action == "remove") + var/datum/plant_gene/G = find_gene_by_id(params["gene_id"]) + if(!G) + return FALSE + operation = action target = G - operation = href_list["op"] - - else if(operation == href_list["op"] && target == G) - switch(href_list["op"]) - if("remove") - if(!istype(G, /datum/plant_gene/core)) - seed.genes -= G - if(istype(G, /datum/plant_gene/reagent)) - seed.reagents_from_genes() - repaint_seed() - if("extract") - if(disk && !disk.read_only) - disk.gene = G - if(istype(G, /datum/plant_gene/core)) - var/datum/plant_gene/core/gene = G - if(istype(G, /datum/plant_gene/core/potency)) - gene.value = min(gene.value, max_potency) - else if(istype(G, /datum/plant_gene/core/lifespan)) - gene.value = min(gene.value, max_endurance) //INTENDED - else if(istype(G, /datum/plant_gene/core/endurance)) - gene.value = min(gene.value, max_endurance) - else if(istype(G, /datum/plant_gene/core/production)) - gene.value = max(gene.value, min_production) - else if(istype(G, /datum/plant_gene/core/yield)) - gene.value = min(gene.value, max_yield) - else if(istype(G, /datum/plant_gene/core/weed_rate)) - gene.value = max(gene.value, min_wrate) - else if(istype(G, /datum/plant_gene/core/weed_chance)) - gene.value = max(gene.value, min_wchance) - disk.update_name() - qdel(seed) - seed = null - update_icon() - if("replace") - if(disk && disk.gene && istype(disk.gene, G.type) && istype(G, /datum/plant_gene/core)) - seed.genes -= G - var/datum/plant_gene/core/C = disk.gene.Copy() - seed.genes += C - C.apply_stat(seed) - repaint_seed() - if("insert") - if(disk && disk.gene && !istype(disk.gene, /datum/plant_gene/core) && disk.gene.can_add(seed)) - seed.genes += disk.gene.Copy() - if(istype(disk.gene, /datum/plant_gene/reagent)) - seed.reagents_from_genes() - disk.gene.apply_vars(seed) - repaint_seed() - - - update_genes() - operation = "" + . = TRUE + + if(action == "extract") + var/datum/plant_gene/G = find_gene_by_id(params["gene_id"]) + if(!G) + return FALSE + if(disk && !disk.read_only) + operation = action + target = G + . = TRUE + + if(action == "replace") + var/datum/plant_gene/G = find_gene_by_id(params["gene_id"]) + if(!G) + return FALSE + if(disk && disk.gene && istype(disk.gene, G.type) && istype(G, /datum/plant_gene/core)) + operation = action + target = G + . = TRUE + + if(action == "insert" && !istype(disk.gene, /datum/plant_gene/core) && disk.gene.can_add(seed)) + operation = action target = null - else if(href_list["abort"]) - operation = "" + . = TRUE + + if((action == "confirm" || (. && skip_confirmation)) && operation) + if(operation == "remove") + var/datum/plant_gene/G = target + if(G) + if(!istype(G, /datum/plant_gene/core)) + seed.genes -= G + if(istype(G, /datum/plant_gene/reagent)) + seed.reagents_from_genes() + repaint_seed() + + if(operation == "extract") + var/datum/plant_gene/G = target + if(G && disk && !disk.read_only) + disk.gene = G + if(istype(G, /datum/plant_gene/core)) + var/datum/plant_gene/core/gene = G + if(istype(G, /datum/plant_gene/core/potency)) + gene.value = min(gene.value, max_potency) + else if(istype(G, /datum/plant_gene/core/lifespan)) + gene.value = min(gene.value, max_endurance) //INTENDED + else if(istype(G, /datum/plant_gene/core/endurance)) + gene.value = min(gene.value, max_endurance) + else if(istype(G, /datum/plant_gene/core/production)) + gene.value = max(gene.value, min_production) + else if(istype(G, /datum/plant_gene/core/yield)) + gene.value = min(gene.value, max_yield) + else if(istype(G, /datum/plant_gene/core/weed_rate)) + gene.value = max(gene.value, min_wrate) + else if(istype(G, /datum/plant_gene/core/weed_chance)) + gene.value = max(gene.value, min_wchance) + disk.update_name() + qdel(seed) + seed = null + + if(operation == "replace") + var/datum/plant_gene/G = target + if(G && disk && disk.gene && istype(disk.gene, G.type) && istype(G, /datum/plant_gene/core)) + seed.genes -= G + var/datum/plant_gene/core/C = disk.gene.Copy() + seed.genes += C + C.apply_stat(seed) + repaint_seed() + + if(operation == "insert" && !istype(disk.gene, /datum/plant_gene/core) && disk.gene.can_add(seed)) + seed.genes += disk.gene.Copy() + if(istype(disk.gene, /datum/plant_gene/reagent)) + seed.reagents_from_genes() + repaint_seed() + + operation = null target = null + . = TRUE - interact(usr) + if(action == "abort" && operation) + operation = null + target = null + . = TRUE + + + if(.) + update_genes() + update_icon() /obj/machinery/plantgenes/proc/insert_seed(obj/item/seeds/S) if(!istype(S) || seed) @@ -359,6 +367,7 @@ seed = S update_genes() update_icon() + ui_update() /obj/machinery/plantgenes/proc/eject_disk() if (disk && !operation) @@ -369,6 +378,8 @@ disk.forceMove(drop_location()) disk = null update_genes() + ui_update() + . = TRUE /obj/machinery/plantgenes/proc/eject_seed() if (seed && !operation) @@ -379,6 +390,8 @@ seed.forceMove(drop_location()) seed = null update_genes() + ui_update() + . = TRUE /obj/machinery/plantgenes/proc/update_genes() core_genes = list() @@ -411,6 +424,7 @@ return // Already modded name and icon seed.name = "experimental " + seed.name seed.icon_state = "seed-x" + ui_update() // Gene modder for seed vault ship, built with high tech alien parts. /obj/machinery/plantgenes/seedvault diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 8ca883af88941..1adba2432014a 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -117,15 +117,11 @@ if(seed) for(var/datum/plant_gene/trait/trait in seed.genes) trait.on_squash(src, target) - if(!seed.get_gene(/datum/plant_gene/trait/noreact)) - reagents.reaction(T) - for(var/A in T) - reagents.reaction(A) - qdel(src) - if(seed.get_gene(/datum/plant_gene/trait/noreact)) - visible_message("[src] crumples, and bubbles ominously as its contents mix.") - addtimer(CALLBACK(src, .proc/squashreact), 20) - + reagents.reaction(T) + for(var/A in T) + reagents.reaction(A) + qdel(src) + /obj/item/reagent_containers/food/snacks/grown/proc/squashreact() for(var/datum/plant_gene/trait/trait in seed.genes) trait.on_squashreact(src) @@ -180,6 +176,7 @@ var/obj/item/T if(trash) T = generate_trash() + T.remove_item_from_storage(get_turf(T)) qdel(src) - user.putItemFromInventoryInHandIfPossible(T, user.active_hand_index, TRUE) + user.put_in_hands(T, FALSE) to_chat(user, "You open [src]\'s shell, revealing \a [T].") diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 886386a69fb46..c1c9d5563fa93 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -90,7 +90,7 @@ lifespan = 30 endurance = 25 mutatelist = list() - genes = list(/datum/plant_gene/trait/glow/berry, /datum/plant_gene/trait/noreact, /datum/plant_gene/trait/repeated_harvest) + genes = list(/datum/plant_gene/trait/glow/white, /datum/plant_gene/trait/repeated_harvest) reagents_add = list(/datum/reagent/uranium = 0.25, /datum/reagent/iodine = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) rarity = 20 @@ -121,8 +121,9 @@ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "cherry-grow" icon_dead = "cherry-dead" + icon_harvest = "cherry-harvest" genes = list(/datum/plant_gene/trait/repeated_harvest) - mutatelist = list(/obj/item/seeds/cherry/blue) + mutatelist = list(/obj/item/seeds/cherry/blue, /obj/item/seeds/cherry/bulb) reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07) /obj/item/reagent_containers/food/snacks/grown/cherries @@ -162,6 +163,31 @@ tastes = list("blue cherry" = 1) wine_power = 50 +//Cherry Bulbs +/obj/item/seeds/cherry/bulb + name = "pack of cherry bulb pits" + desc = "The glowy kind of cherries." + icon_state = "seed-cherrybulb" + species = "cherrybulb" + plantname = "Cherry Bulb Tree" + product = /obj/item/reagent_containers/food/snacks/grown/cherrybulbs + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/pink) + mutatelist = list() + reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07) + rarity = 10 + +/obj/item/reagent_containers/food/snacks/grown/cherrybulbs + seed = /obj/item/seeds/cherry/bulb + name = "cherry bulbs" + desc = "They're like little Space Christmas lights!" + icon_state = "cherry_bulb" + filling_color = "#FF0000" + bitesize_mod = 2 + foodtype = FRUIT + grind_results = list(/datum/reagent/consumable/cherryjelly = 0) + tastes = list("cherry" = 1) + wine_power = 50 + // Grapes /obj/item/seeds/grape name = "pack of grape seeds" diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index a7e571d7c1d3f..cadc2d1325fe2 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -61,6 +61,7 @@ species = "ocannabis" plantname = "Omega Weed" product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate + genes = list(/datum/plant_gene/trait/glow/green) mutatelist = list() reagents_add = list(/datum/reagent/drug/space_drugs = 0.3, /datum/reagent/toxin/mindbreaker = 0.3, diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 0522b5fd45434..d50a22362128a 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -88,13 +88,13 @@ held_mob = loc START_PROCESSING(SSobj, src) -/obj/item/reagent_containers/food/snacks/grown/ghost_chili/process() +/obj/item/reagent_containers/food/snacks/grown/ghost_chili/process(delta_time) if(held_mob && loc == held_mob) if(held_mob.is_holding(src)) if(istype(held_mob) && held_mob.gloves) return - held_mob.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT) - if(prob(10)) + held_mob.adjust_bodytemperature(7.5 * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time) + if(DT_PROB(5, delta_time)) to_chat(held_mob, "Your hand holding [src] burns!") else held_mob = null diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 99de8b92d668f..d500578af11b2 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -135,7 +135,7 @@ /obj/item/reagent_containers/food/snacks/grown/firelemon/ex_act(severity) qdel(src) //Ensuring that it's deleted by its own explosion -/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime() +/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime(mob/living/lanced_by) switch(seed.potency) //Combustible lemons are alot like IEDs, lots of flame, very little bang. if(0 to 30) update_mob() diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm index 3fa4247f578a3..a898b76ee884f 100644 --- a/code/modules/hydroponics/grown/cotton.dm +++ b/code/modules/hydroponics/grown/cotton.dm @@ -32,7 +32,7 @@ var/cotton_name = "raw cotton" /obj/item/grown/cotton/attack_self(mob/user) - user.show_message("You pull some [cotton_name] out of the [name]!", 1) + user.show_message("You pull some [cotton_name] out of the [name]!", MSG_VISUAL) var/seed_modifier = 0 if(seed) seed_modifier = round(seed.potency / 25) @@ -76,4 +76,4 @@ throw_range = 3 attack_verb = list("bashed", "battered", "bludgeoned", "whacked") cotton_type = /obj/item/stack/sheet/cotton/durathread - cotton_name = "raw durathread" \ No newline at end of file + cotton_name = "raw durathread" diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 2be0cb14a3655..2cb3691e477eb 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -36,19 +36,21 @@ species = "lily" plantname = "Lily Plants" product = /obj/item/reagent_containers/food/snacks/grown/poppy/lily + icon_grow = "lily-grow" + icon_dead = "lily-dead" mutatelist = list(/obj/item/seeds/poppy/lily/trumpet) /obj/item/reagent_containers/food/snacks/grown/poppy/lily seed = /obj/item/seeds/poppy/lily name = "lily" - desc = "A beautiful orange flower." + desc = "A beautiful white flower with rich symbolism. The lily is said to represent love and affection as well as purity and innocence in some cultures." icon_state = "lily" - filling_color = "#FFA500" + filling_color = "#fff8ea" - //Spacemans's Trumpet +//Spacemans's Trumpet /obj/item/seeds/poppy/lily/trumpet name = "pack of spaceman's trumpet seeds" - desc = "A plant sculped by extensive genetic engineering. The spaceman's trumpet is said to bear no resemblance to its wild ancestors. Inside NT AgriSci circles it is better known as NTPW-0372." + desc = "A plant sculpted by extensive genetic engineering. The spaceman's trumpet is said to bear no resemblance to its wild ancestors. Inside NT AgriSci circles it is better known as NTPW-0372." icon_state = "seed-trumpet" species = "spacemanstrumpet" plantname = "Spaceman's Trumpet Plant" @@ -80,7 +82,7 @@ name = "spaceman's trumpet" desc = "A vivid flower that smells faintly of freshly cut grass. Touching the flower seems to stain the skin some time after contact, yet most other surfaces seem to be unaffected by this phenomenon." icon_state = "spacemanstrumpet" - filling_color = "#FF6347" + filling_color = "#8324f0" bitesize_mod = 3 foodtype = VEGETABLES @@ -92,14 +94,41 @@ species = "geranium" plantname = "Geranium Plants" product = /obj/item/reagent_containers/food/snacks/grown/poppy/geranium - mutatelist = list() + icon_grow = "geranium-grow" + icon_dead = "geranium-dead" + mutatelist = list(/obj/item/seeds/poppy/geranium/forgetmenot) /obj/item/reagent_containers/food/snacks/grown/poppy/geranium seed = /obj/item/seeds/poppy/geranium name = "geranium" - desc = "A beautiful blue flower." + desc = "A cluster of small purple geranium flowers. They symbolize happiness, good health, wishes and friendship and are generally associated with positive emotions." icon_state = "geranium" - filling_color = "#008B8B" + filling_color = "#9325ee" + +//Forget-Me-Not +/obj/item/seeds/poppy/geranium/forgetmenot + name = "pack of forget-me-not seeds" + desc = "These seeds grow into forget-me-nots." + icon_state = "seed-forget_me_not" + species = "forget_me_not" + plantname = "Forget-Me-Not Plants" + product = /obj/item/reagent_containers/food/snacks/grown/poppy/geranium/forgetmenot + endurance = 30 + maturation = 5 + yield = 4 + potency = 25 + icon_grow = "forget_me_not-grow" + icon_dead = "forget_me_not-dead" + mutatelist = list() + reagents_add = list(/datum/reagent/medicine/kelotane = 0.2, /datum/reagent/consumable/nutriment = 0.05) + +/obj/item/reagent_containers/food/snacks/grown/poppy/geranium/forgetmenot + seed = /obj/item/seeds/poppy/geranium/forgetmenot + name = "forget-me-not" + desc = "A clump of small blue flowers, they are primarily associated with rememberance, respect and loyalty." + icon_state = "forget_me_not" + filling_color = "#4466ff" + bitesize_mod = 2 // Harebell /obj/item/seeds/harebell @@ -179,6 +208,7 @@ icon_grow = "moonflower-grow" icon_dead = "sunflower-dead" product = /obj/item/reagent_containers/food/snacks/grown/moonflower + genes = list(/datum/plant_gene/trait/glow/purple) mutatelist = list() reagents_add = list(/datum/reagent/consumable/ethanol/moonshine = 0.2,/datum/reagent/medicine/morphine = 0.3, /datum/reagent/consumable/nutriment = 0.02) rarity = 20 @@ -252,5 +282,4 @@ ..() if(!user.gloves) to_chat(user, "The [name] burns your bare hand!") - user.adjustFireLoss(rand(1, 5)) - + user.adjustFireLoss(rand(1, 5)) \ No newline at end of file diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index bbaccbc437dd0..55dad6bf312b3 100644 --- a/code/modules/hydroponics/grown/grass_carpet.dm +++ b/code/modules/hydroponics/grown/grass_carpet.dm @@ -15,7 +15,7 @@ icon_grow = "grass-grow" icon_dead = "grass-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) - mutatelist = list(/obj/item/seeds/grass/carpet) + mutatelist = list(/obj/item/seeds/grass/carpet, /obj/item/seeds/grass/fairy) reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, /datum/reagent/hydrogen = 0.05) /obj/item/reagent_containers/food/snacks/grown/grass @@ -40,6 +40,54 @@ new stacktype(user.drop_location(), grassAmt) qdel(src) +//Fairygrass +/obj/item/seeds/grass/fairy + name = "pack of fairygrass seeds" + desc = "These seeds grow into a more mystical grass." + icon_state = "seed-fairygrass" + species = "fairygrass" + plantname = "Fairygrass" + product = /obj/item/reagent_containers/food/snacks/grown/grass/fairy + icon_grow = "fairygrass-grow" + icon_dead = "grass-dead" + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/blue) + reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, /datum/reagent/hydrogen = 0.05, /datum/reagent/drug/space_drugs = 0.15) + +/obj/item/reagent_containers/food/snacks/grown/grass/fairy + seed = /obj/item/seeds/grass/fairy + name = "fairygrass" + desc = "Glowing, and smells fainly of mushrooms." + icon_state = "fairygrassclump" + filling_color = "#3399ff" + stacktype = /obj/item/stack/tile/fairygrass + +/obj/item/reagent_containers/food/snacks/grown/grass/fairy/attack_self(mob/user) + var/datum/plant_gene/trait/glow/G = null + for(var/datum/plant_gene/trait/glow/gene in seed.genes) + G = gene + break + + stacktype = initial(stacktype) + + if(G) + switch(G.type) + if(/datum/plant_gene/trait/glow/white) + stacktype = /obj/item/stack/tile/fairygrass/white + if(/datum/plant_gene/trait/glow/red) + stacktype = /obj/item/stack/tile/fairygrass/red + if(/datum/plant_gene/trait/glow/yellow) + stacktype = /obj/item/stack/tile/fairygrass/yellow + if(/datum/plant_gene/trait/glow/green) + stacktype = /obj/item/stack/tile/fairygrass/green + if(/datum/plant_gene/trait/glow/blue) + stacktype = /obj/item/stack/tile/fairygrass/blue + if(/datum/plant_gene/trait/glow/purple) + stacktype = /obj/item/stack/tile/fairygrass/purple + if(/datum/plant_gene/trait/glow/pink) + stacktype = /obj/item/stack/tile/fairygrass/pink + + . = ..() + // Carpet /obj/item/seeds/grass/carpet name = "pack of carpet seeds" diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 3f42815eac99a..871c31dd5ace6 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -44,6 +44,7 @@ species = "holymelon" plantname = "Holy Melon Vines" product = /obj/item/reagent_containers/food/snacks/grown/holymelon + genes = list(/datum/plant_gene/trait/glow/yellow) mutatelist = list() reagents_add = list(/datum/reagent/water/holywater = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) rarity = 20 diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 3a325729c0bb6..0dfd065ceb1d3 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -14,7 +14,7 @@ growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' genes = list(/datum/plant_gene/trait/plant_type/weed_hardy) - mutatelist = list(/obj/item/seeds/starthistle/corpse_flower) + mutatelist = list(/obj/item/seeds/starthistle/corpse_flower, /obj/item/seeds/galaxythistle) /obj/item/seeds/starthistle/harvest(mob/user) var/obj/machinery/hydroponics/parent = loc @@ -46,7 +46,7 @@ START_PROCESSING(SSobj, src) return ..() -/obj/item/seeds/starthistle/corpse_flower/process() +/obj/item/seeds/starthistle/corpse_flower/process(delta_time) var/obj/machinery/hydroponics/parent = loc if(parent.age < maturation) // Start a little before it blooms return @@ -56,7 +56,7 @@ return var/datum/gas_mixture/stank = new - stank.set_moles(/datum/gas/miasma, (yield + 6)*7*MIASMA_CORPSE_MOLES) // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses + stank.set_moles(GAS_MIASMA, (yield + 6)*3.5*MIASMA_CORPSE_MOLES*delta_time) // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses stank.set_temperature(T20C) // without this the room would eventually freeze and miasma mining would be easier T.assume_air(stank) T.air_update_turf() @@ -221,7 +221,7 @@ /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/ex_act(severity) qdel(src) //Ensuring that it's deleted by its own explosion. Also prevents mass chain reaction with piles of cherry bombs -/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime() +/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime(mob/living/lanced_by) icon_state = "cherry_bomb_lit" playsound(src, 'sound/effects/fuse.ogg', seed.potency, 0) reagents.chem_temp = 1000 //Sets off the black powder diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 7fe9d52fe50bd..96a2183fb0eec 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -99,13 +99,13 @@ if(..()) if(prob(50)) user.Paralyze(100) - to_chat(user, "You are stunned by the Deathnettle as you try picking it up!") + to_chat(user, "You are stunned by [src] as you try picking it up!") /obj/item/reagent_containers/food/snacks/grown/nettle/death/attack(mob/living/carbon/M, mob/user) if(!..()) return if(isliving(M)) - to_chat(M, "You are stunned by the powerful acid of the Deathnettle!") + to_chat(M, "You are stunned by the powerful acid of [src]!") log_combat(user, M, "attacked", src) M.adjust_blurriness(force/7) diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index e26d1c1d2a1ee..dbd240a54d128 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -29,7 +29,7 @@ /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params) if(W.is_sharp()) - user.show_message("You carve a face into [src]!", 1) + user.show_message("You carve a face into [src]!", MSG_VISUAL) new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc) qdel(src) return diff --git a/code/modules/hydroponics/grown/rainbow_bunch.dm b/code/modules/hydroponics/grown/rainbow_bunch.dm index 9626d2e6c4d44..4ad9490aa99d5 100644 --- a/code/modules/hydroponics/grown/rainbow_bunch.dm +++ b/code/modules/hydroponics/grown/rainbow_bunch.dm @@ -3,7 +3,7 @@ desc = "A pack of seeds that'll grow into a beautiful bush of various colored flowers." icon_state = "seed-rainbowbunch" species = "rainbowbunch" - plantname = "Rainbow Flowers" + plantname = "Rainbow Bunch" icon_harvest = "rainbowbunch-harvest" product = /obj/item/reagent_containers/food/snacks/grown/rainbow_flower lifespan = 25 @@ -38,40 +38,40 @@ if(1) item_color = "red" color = "#DA0000" - list_reagents = list(/datum/reagent/colorful_reagent/powder/red = 3) - desc += " This one is in a bright red color." + reagents.add_reagent(/datum/reagent/colorful_reagent/powder/red, 3) + desc += " This one is in a fiery red color." if(2) item_color = "orange" color = "#FF9300" - list_reagents = list(/datum/reagent/colorful_reagent/powder/orange = 3) + reagents.add_reagent(/datum/reagent/colorful_reagent/powder/orange, 3) desc += " This one is in a citrus orange color." if(3) item_color = "yellow" color = "#FFF200" - list_reagents = list(/datum/reagent/colorful_reagent/powder/yellow = 3) + reagents.add_reagent(/datum/reagent/colorful_reagent/powder/yellow, 3) desc += " This one is in a bright yellow color." if(4) item_color = "green" color = "#A8E61D" - list_reagents = list(/datum/reagent/colorful_reagent/powder/green = 3) + reagents.add_reagent(/datum/reagent/colorful_reagent/powder/green, 3) desc += " This one is in a grassy green color." if(5) item_color = "blue" color = "#00B7EF" - list_reagents = list(/datum/reagent/colorful_reagent/powder/blue = 3) + reagents.add_reagent(/datum/reagent/colorful_reagent/powder/blue, 3) desc += " This one is in a soothing blue color." if(6) item_color = "purple" color = "#DA00FF" - list_reagents = list(/datum/reagent/colorful_reagent/powder/purple = 3) + reagents.add_reagent(/datum/reagent/colorful_reagent/powder/purple, 3) desc += " This one is in a vibrant purple color." if(7) item_color = "black" color = "#1C1C1C" - list_reagents = list(/datum/reagent/colorful_reagent/powder/black = 3) + reagents.add_reagent(/datum/reagent/colorful_reagent/powder/black, 3) desc += " This one is in a midnight black color." if(8) item_color = "white" color = "#FFFFFF" - list_reagents = list(/datum/reagent/colorful_reagent/powder/white = 3) + reagents.add_reagent(/datum/reagent/colorful_reagent/powder/white, 3) desc += " This one is in a pure white color." diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index d4e59cfbe8c8c..355966444726e 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -14,15 +14,17 @@ yield = 1 //seeds if there isn't a dna inside potency = 30 var/volume = 5 - var/ckey = null - var/realName = null - var/datum/mind/mind = null - var/blood_gender = null - var/blood_type = null - var/list/features = null - var/factions = null - var/list/quirks = null - var/contains_sample = 0 + var/ckey + var/realName + var/datum/mind/mind + var/blood_gender + var/blood_type + var/list/features + var/factions + var/list/quirks + var/sampleDNA + var/contains_sample = FALSE + var/being_harvested = FALSE /obj/item/seeds/replicapod/Initialize() . = ..() @@ -42,10 +44,9 @@ features = B.data["features"] factions = B.data["factions"] quirks = B.data["quirks"] + sampleDNA = B.data["blood_DNA"] contains_sample = TRUE visible_message("The [src] is injected with a fresh blood sample.") - mind.grab_ghost() - to_chat(mind, "Consciousness slowly creeps over you as your body sprouts into a new form. Am I being planted?") log_cloning("[key_name(mind)]'s cloning record was added to [src] at [AREACOORD(src)].") else visible_message("The [src] rejects the sample!") @@ -58,18 +59,19 @@ blood_type = null features = null factions = null + sampleDNA = null contains_sample = FALSE /obj/item/seeds/replicapod/get_analyzer_text() var/text = ..() if(contains_sample) - text += "\n It contains a blood sample!" + text += "\n It contains a blood sample with blood DNA ([sampleDNA])." //blood DNA (UE) shows in medical records and is readable by forensics scanners return text /obj/item/seeds/replicapod/harvest(mob/user) //now that one is fun -- Urist var/obj/machinery/hydroponics/parent = loc - var/make_podman = 0 + var/make_podman = FALSE var/ckey_holder = null var/list/result = list() if(CONFIG_GET(flag/revival_pod_plants)) @@ -78,11 +80,12 @@ if(isobserver(M)) var/mob/dead/observer/O = M if(O.ckey == ckey && O.can_reenter_corpse) - make_podman = 1 + make_podman = TRUE break else if(M.ckey == ckey && M.stat == DEAD && !M.suiciding) - make_podman = 1 + make_podman = TRUE + // Devil code if(isliving(M)) var/mob/living/L = M make_podman = !L.hellbound @@ -94,45 +97,67 @@ var/mob/dead/observer/O = M if(!O.can_reenter_corpse) break - make_podman = 1 + make_podman = TRUE + // Devil code if(isliving(M)) var/mob/living/L = M make_podman = !L.hellbound ckey_holder = M.ckey break - if(make_podman) //all conditions met! - var/mob/living/carbon/human/podman = new /mob/living/carbon/human(parent.loc) - if(realName) - podman.real_name = realName - else - podman.real_name = "Pod Person ([rand(1,999)])" - mind.transfer_to(podman) - if(ckey) - podman.ckey = ckey - else - podman.ckey = ckey_holder - podman.gender = blood_gender - podman.faction |= factions - if(!features["mcolor"]) - features["mcolor"] = "#59CE00" - for(var/V in quirks) - new V(podman) - podman.hardset_dna(null,null,podman.real_name,blood_type, new /datum/species/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman - podman.set_cloned_appearance() - to_chat(podman, "There is a bright flash! You feel like a new being.") - podman.flash_act() - log_cloning("[key_name(mind)] cloned as a podman via [src] in [parent] at [AREACOORD(parent)].") + // No podman player, give one or two seeds. + if(!make_podman) + // Prevent accidental harvesting. Make sure the user REALLY wants to do this if there's a chance of this coming from a living creature. + if(mind || ckey) + if(alert("The pod is currently devoid of soul. There is a possibility that a soul could claim this creature, or you could harvest it for seeds.", "Harvest Seeds?", "Harvest Seeds", "Cancel") == "Cancel") + return result + + // If this plant has already been harvested, return early. + // parent.update_tray() qdels this seed. + if(QDELETED(src)) + to_chat(user, text = "This pod has already had its seeds harvested!", type = MESSAGE_TYPE_INFO) + return result + + // Make sure they can still interact with the parent hydroponics tray. + if(!parent.can_interact(user)) + to_chat(user, text = "You are no longer able to harvets the seeds from [parent]!", type = MESSAGE_TYPE_INFO) + return result - else //else, one packet of seeds. maybe two var/seed_count = 1 if(prob(getYield() * 20)) seed_count++ var/output_loc = parent.Adjacent(user) ? user.loc : parent.loc //needed for TK - for(var/i=0,i You feel like a new being. Machine can store up to [max_seeds]% seeds." + . += "The status display reads: Extracting [seed_multiplier] seed(s) per piece of produce. Machine can store up to [max_seeds]% seeds." /obj/machinery/seed_extractor/attackby(obj/item/O, mob/user, params) @@ -104,78 +119,25 @@ else return ..() -/datum/seed_pile - var/name = "" - var/lifespan = 0 //Saved stats - var/endurance = 0 - var/maturation = 0 - var/production = 0 - var/yield = 0 - var/potency = 0 - var/amount = 0 - -/datum/seed_pile/New(var/name, var/life, var/endur, var/matur, var/prod, var/yie, var/poten, var/am = 1) - src.name = name - src.lifespan = life - src.endurance = endur - src.maturation = matur - src.production = prod - src.yield = yie - src.potency = poten - src.amount = am - -/obj/machinery/seed_extractor/ui_interact(mob/user) - . = ..() - if (stat) - return FALSE - - var/dat = "Stored seeds: " - - if (contents.len == 0) - dat += "No seeds" - else - dat += "
"
+ . += "Current instrument: "
+ if(!using_instrument)
+ . += "No instrument loaded! "
+
+/datum/song/ui_interact(mob/user)
+ var/list/dat = list()
+
+ dat += instrument_status_ui()
+
+ if(lines.len > 0)
+ dat += "" + else + . += "[using_instrument.name] " + . += "Playback Settings: " + if(can_noteshift) + . += "Note Shift/Note Transpose: [note_shift] keys / [round(note_shift / 12, 0.01)] octaves " + var/smt + var/modetext = "" + switch(sustain_mode) + if(SUSTAIN_LINEAR) + smt = "Linear" + modetext = "Linear Sustain Duration: [sustain_linear_duration / 10] seconds " + if(SUSTAIN_EXPONENTIAL) + smt = "Exponential" + modetext = "Exponential Falloff Factor: [sustain_exponential_dropoff]% per decisecond " + . += "Sustain Mode: [smt] " + . += modetext + . += using_instrument?.ready()? "Status: Ready " : "Status: !Instrument Definition Error! " + . += "Instrument Type: [legacy? "Legacy" : "Synthesized"] " + . += "Volume: [volume] " + . += "Volume Dropoff Threshold: [sustain_dropoff_volume] " + . += "Sustain indefinitely last held note: [full_sustain_held_note? "Enabled" : "Disabled"]. " + . += " Playback" + if(!playing) + dat += "Play Stop" + dat += "Repeat Song: " + dat += repeat > 0 ? "--" : "--" + dat += " [repeat] times " + dat += repeat < max_repeats ? "++" : "++" + dat += " " + else + dat += "Play Stop " + dat += "Repeats left: [repeat] " + if(!editing) + dat += " Show Editor " + else + dat += " Editing" + dat += "Hide Editor" + dat += " Start a New Song" + dat += " Import a Song" + var/bpm = round(600 / tempo) + dat += "Tempo: - [bpm] BPM + " + var/linecount = 0 + for(var/line in lines) + linecount += 1 + dat += "Line [linecount]: Edit X [line] " + dat += "Add Line " + if(help) + dat += "Hide Help " + dat += {" + Lines are a series of chords, separated by commas (,), each with notes separated by hyphens (-). + Every note in a chord will play together, with chord timed by the tempo. + + Notes are played by the names of the note, and optionally, the accidental, and/or the octave number. + By default, every note is natural and in octave 3. Defining otherwise is remembered for each note. + Example: C,D,E,F,G,A,B will play a C major scale. + After a note has an accidental placed, it will be remembered: C,C4,C,C3 is C3,C4,C4,C3 + Chords can be played simply by seperating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B + A pause may be denoted by an empty chord: C,E,,C,G + To make a chord be a different time, end it with /x, where the chord length will be length + defined by tempo / x: C,G/2,E/4 + Combined, an example is: E-E4/4,F#/2,G#/8,B/8,E3-E4/4 + + Lines may be up to [MUSIC_MAXLINECHARS] characters. + A song may only contain up to [MUSIC_MAXLINES] lines. + "} + else + dat += "Show Help " + + var/datum/browser/popup = new(user, "instrument", parent?.name || "instrument", 700, 500) + popup.set_content(dat.Join("")) + popup.open() + +/** + * Parses a song the user has input into lines and stores them. + */ +/datum/song/proc/ParseSong(text) + set waitfor = FALSE + //split into lines + lines = splittext(text, "\n") + if(lines.len) + var/bpm_string = "BPM: " + if(findtext(lines[1], bpm_string, 1, length(bpm_string) + 1)) + var/divisor = text2num(copytext(lines[1], length(bpm_string) + 1)) || 120 // default + tempo = sanitize_tempo(600 / round(divisor, 1)) + lines.Cut(1, 2) + else + tempo = sanitize_tempo(5) // default 120 BPM + if(lines.len > MUSIC_MAXLINES) + to_chat(usr, "Too many lines!") + lines.Cut(MUSIC_MAXLINES + 1) + var/linenum = 1 + for(var/l in lines) + if(length_char(l) > MUSIC_MAXLINECHARS) + to_chat(usr, "Line [linenum] too long!") + lines.Remove(l) + else + linenum++ + updateDialog(usr) // make sure updates when complete + +/datum/song/Topic(href, href_list) + if(!usr.canUseTopic(parent, TRUE, FALSE, FALSE, FALSE)) + usr << browse(null, "window=instrument") + usr.unset_machine() + return + + parent.add_fingerprint(usr) + + if(href_list["newsong"]) + lines = new() + tempo = sanitize_tempo(5) // default 120 BPM + name = "" + + else if(href_list["import"]) + var/t = "" + do + t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t) as message) + if(!in_range(parent, usr)) + return + + if(length_char(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS) + var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no") + if(cont == "no") + break + while(length_char(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS) + ParseSong(t) + + else if(href_list["help"]) + help = text2num(href_list["help"]) - 1 + + else if(href_list["edit"]) + editing = text2num(href_list["edit"]) - 1 + + if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops. + if(playing) + return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing. + repeat += round(text2num(href_list["repeat"])) + if(repeat < 0) + repeat = 0 + if(repeat > max_repeats) + repeat = max_repeats + + else if(href_list["tempo"]) + tempo = sanitize_tempo(tempo + text2num(href_list["tempo"])) + + else if(href_list["play"]) + INVOKE_ASYNC(src, .proc/start_playing, usr) + + else if(href_list["newline"]) + var/newline = html_encode(input("Enter your line: ", parent.name) as text|null) + if(!newline || !in_range(parent, usr)) + return + if(lines.len > MUSIC_MAXLINES) + return + if(length(newline) > MUSIC_MAXLINECHARS) + newline = copytext(newline, 1, MUSIC_MAXLINECHARS) + lines.Add(newline) + + else if(href_list["deleteline"]) + var/num = round(text2num(href_list["deleteline"])) + if(num > lines.len || num < 1) + return + lines.Cut(num, num+1) + + else if(href_list["modifyline"]) + var/num = round(text2num(href_list["modifyline"]),1) + var/content = stripped_input(usr, "Enter your line: ", parent.name, lines[num], MUSIC_MAXLINECHARS) + if(!content || !in_range(parent, usr)) + return + if(num > lines.len || num < 1) + return + lines[num] = content + + else if(href_list["stop"]) + stop_playing() + + else if(href_list["setlinearfalloff"]) + var/amount = input(usr, "Set linear sustain duration in seconds", "Linear Sustain Duration") as null|num + if(!isnull(amount)) + set_linear_falloff_duration(round(amount * 10, world.tick_lag)) + + else if(href_list["setexpfalloff"]) + var/amount = input(usr, "Set exponential sustain factor", "Exponential sustain factor") as null|num + if(!isnull(amount)) + set_exponential_drop_rate(round(amount, 0.00001)) + + else if(href_list["setvolume"]) + var/amount = input(usr, "Set volume", "Volume") as null|num + if(!isnull(amount)) + set_volume(round(amount, 1)) + + else if(href_list["setdropoffvolume"]) + var/amount = input(usr, "Set dropoff threshold", "Dropoff Threshold Volume") as null|num + if(!isnull(amount)) + set_dropoff_volume(round(amount, 0.01)) + + else if(href_list["switchinstrument"]) + if(!length(allowed_instrument_ids)) + return + else if(length(allowed_instrument_ids) == 1) + set_instrument(allowed_instrument_ids[1]) + return + var/list/categories = list() + for(var/i in allowed_instrument_ids) + var/datum/instrument/I = SSinstruments.get_instrument(i) + if(I) + LAZYSET(categories[I.category || "ERROR CATEGORY"], I.name, I.id) + var/cat = input(usr, "Select Category", "Instrument Category") as null|anything in categories + if(!cat) + return + var/list/instruments = categories[cat] + var/choice = input(usr, "Select Instrument", "Instrument Selection") as null|anything in instruments + if(!choice) + return + choice = instruments[choice] //get id + if(choice) + set_instrument(choice) + + else if(href_list["setnoteshift"]) + var/amount = input(usr, "Set note shift", "Note Shift") as null|num + if(!isnull(amount)) + note_shift = clamp(amount, note_shift_min, note_shift_max) + + else if(href_list["setsustainmode"]) + var/choice = input(usr, "Choose a sustain mode", "Sustain Mode") as null|anything in list("Linear", "Exponential") + switch(choice) + if("Linear") + sustain_mode = SUSTAIN_LINEAR + if("Exponential") + sustain_mode = SUSTAIN_EXPONENTIAL + + else if(href_list["togglesustainhold"]) + full_sustain_held_note = !full_sustain_held_note + + updateDialog() \ No newline at end of file diff --git a/code/modules/instruments/songs/play_legacy.dm b/code/modules/instruments/songs/play_legacy.dm new file mode 100644 index 0000000000000..b95e8f193f548 --- /dev/null +++ b/code/modules/instruments/songs/play_legacy.dm @@ -0,0 +1,91 @@ +/** + * Compiles our lines into "chords" with filenames for legacy playback. This makes there have to be a bit of lag at the beginning of the song, but repeats will not have to parse it again, and overall playback won't be impacted by as much lag. + */ +/datum/song/proc/compile_legacy() + if(!length(src.lines)) + return + var/list/lines = src.lines //cache for hyepr speed! + compiled_chords = list() + var/list/octaves = list(3, 3, 3, 3, 3, 3, 3) + var/list/accents = list("n", "n", "n", "n", "n", "n", "n") + for(var/line in lines) + var/list/chords = splittext(lowertext(line), ",") + for(var/chord in chords) + var/list/compiled_chord = list() + var/tempodiv = 1 + var/list/notes_tempodiv = splittext(chord, "/") + var/len = length(notes_tempodiv) + if(len >= 2) + tempodiv = text2num(notes_tempodiv[2]) + if(len) //some dunkass is going to do ,,,, to make 3 rests instead of ,/1 because there's no standardization so let's be prepared for that. + var/list/notes = splittext(notes_tempodiv[1], "-") + for(var/note in notes) + if(length(note) == 0) + continue + // 1-7, A-G + var/key = text2ascii(note) - 96 + if((key < 1) || (key > 7)) + continue + for(var/i in 2 to length(note)) + var/oct_acc = copytext(note, i, i + 1) + var/num = text2num(oct_acc) + if(!num) //it's an accidental + accents[key] = oct_acc //if they misspelled it/fucked up that's on them lmao, no safety checks. + else //octave + octaves[key] = clamp(num, octave_min, octave_max) + compiled_chord[++compiled_chord.len] = list(key, accents[key], octaves[key]) + compiled_chord += tempodiv //this goes last + if(length(compiled_chord)) + compiled_chords[++compiled_chords.len] = compiled_chord + +/** + * Proc to play a legacy note. Just plays the sound to hearing mobs (and does hearcheck if necessary), no fancy channel/sustain/management. + * + * Arguments: + * * note is a number from 1-7 for A-G + * * acc is either "b", "n", or "#" + * * oct is 1-8 (or 9 for C) + */ +/datum/song/proc/playkey_legacy(note, acc as text, oct, mob/user) + // handle accidental -> B<>C of E<>F + if(acc == "b" && (note == 3 || note == 6)) // C or F + if(note == 3) + oct-- + note-- + acc = "n" + else if(acc == "#" && (note == 2 || note == 5)) // B or E + if(note == 2) + oct++ + note++ + acc = "n" + else if(acc == "#" && (note == 7)) //G# + note = 1 + acc = "b" + else if(acc == "#") // mass convert all sharps to flats, octave jump already handled + acc = "b" + note++ + + // check octave, C is allowed to go to 9 + if(oct < 1 || (note == 3 ? oct > 9 : oct > 8)) + return + + // now generate name + var/soundfile = "sound/instruments/[cached_legacy_dir]/[ascii2text(note+64)][acc][oct].[cached_legacy_ext]" + soundfile = file(soundfile) + // make sure the note exists + if(!fexists(soundfile)) + return + // and play + var/turf/source = get_turf(parent) + if((world.time - MUSICIAN_HEARCHECK_MINDELAY) > last_hearcheck) + do_hearcheck() + var/sound/music_played = sound(soundfile) + for(var/i in hearing_mobs) + var/mob/M = i + if(user && HAS_TRAIT(user, TRAIT_MUSICIAN) && isliving(M)) + var/mob/living/L = M + L.apply_status_effect(STATUS_EFFECT_GOOD_MUSIC) + if(!(M?.client?.prefs?.toggles & SOUND_INSTRUMENTS)) + continue + M.playsound_local(source, null, volume * using_instrument.volume_multiplier, S = music_played) + // Could do environment and echo later but not for now \ No newline at end of file diff --git a/code/modules/instruments/songs/play_synthesized.dm b/code/modules/instruments/songs/play_synthesized.dm new file mode 100644 index 0000000000000..b1d6ad500548a --- /dev/null +++ b/code/modules/instruments/songs/play_synthesized.dm @@ -0,0 +1,137 @@ +/** + * Compiles our lines into "chords" with numbers. This makes there have to be a bit of lag at the beginning of the song, but repeats will not have to parse it again, and overall playback won't be impacted by as much lag. + */ +/datum/song/proc/compile_synthesized() + if(!length(src.lines)) + return + var/list/lines = src.lines //cache for hyepr speed! + compiled_chords = list() + var/list/octaves = list(3, 3, 3, 3, 3, 3, 3) + var/list/accents = list("n", "n", "n", "n", "n", "n", "n") + for(var/line in lines) + var/list/chords = splittext(lowertext(line), ",") + for(var/chord in chords) + var/list/compiled_chord = list() + var/tempodiv = 1 + var/list/notes_tempodiv = splittext(chord, "/") + var/len = length(notes_tempodiv) + if(len >= 2) + tempodiv = text2num(notes_tempodiv[2]) + if(len) //some dunkass is going to do ,,,, to make 3 rests instead of ,/1 because there's no standardization so let's be prepared for that. + var/list/notes = splittext(notes_tempodiv[1], "-") + for(var/note in notes) + if(length(note) == 0) + continue + // 1-7, A-G + var/key = text2ascii(note) - 96 + if((key < 1) || (key > 7)) + continue + for(var/i in 2 to length(note)) + var/oct_acc = copytext(note, i, i + 1) + var/num = text2num(oct_acc) + if(!num) //it's an accidental + accents[key] = oct_acc //if they misspelled it/fucked up that's on them lmao, no safety checks. + else //octave + octaves[key] = clamp(num, octave_min, octave_max) + compiled_chord += clamp((note_offset_lookup[key] + octaves[key] * 12 + accent_lookup[accents[key]]), key_min, key_max) + compiled_chord += tempodiv //this goes last + if(length(compiled_chord)) + compiled_chords[++compiled_chords.len] = compiled_chord + +/** + * Plays a specific numerical key from our instrument to anyone who can hear us. + * Does a hearing check if enough time has passed. + */ +/datum/song/proc/playkey_synth(key, mob/user) + if(can_noteshift) + key = clamp(key + note_shift, key_min, key_max) + if((world.time - MUSICIAN_HEARCHECK_MINDELAY) > last_hearcheck) + do_hearcheck() + var/datum/instrument_key/K = using_instrument.samples[num2text(key)] //See how fucking easy it is to make a number text? You don't need a complicated 9 line proc! + //Should probably add channel limiters here at some point but I don't care right now. + var/channel = pop_channel() + if(isnull(channel)) + return FALSE + . = TRUE + var/sound/copy = sound(K.sample) + var/volume = src.volume * using_instrument.volume_multiplier + copy.frequency = K.frequency + copy.volume = volume + var/channel_text = num2text(channel) + channels_playing[channel_text] = 100 + last_channel_played = channel_text + for(var/i in hearing_mobs) + var/mob/M = i + if(user && HAS_TRAIT(user, TRAIT_MUSICIAN) && isliving(M)) + var/mob/living/L = M + L.apply_status_effect(STATUS_EFFECT_GOOD_MUSIC) + if(!(M?.client?.prefs?.toggles & SOUND_INSTRUMENTS)) + continue + M.playsound_local(get_turf(parent), null, volume, FALSE, K.frequency, INSTRUMENT_DISTANCE_NO_FALLOFF, channel, null, copy, distance_multiplier = INSTRUMENT_DISTANCE_FALLOFF_BUFF) + // Could do environment and echo later but not for now + +/** + * Stops all sounds we are "responsible" for. Only works in synthesized mode. + */ +/datum/song/proc/terminate_all_sounds(clear_channels = TRUE) + for(var/i in hearing_mobs) + terminate_sound_mob(i) + if(clear_channels) + channels_playing.len = 0 + channels_idle.len = 0 + SSinstruments.current_instrument_channels -= using_sound_channels + using_sound_channels = 0 + SSsounds.free_datum_channels(src) + +/** + * Stops all sounds we are responsible for in a given person. Only works in synthesized mode. + */ +/datum/song/proc/terminate_sound_mob(mob/M) + for(var/channel in channels_playing) + M.stop_sound_channel(text2num(channel)) + +/** + * Pops a channel we have reserved so we don't have to release and re-request them from SSsounds every time we play a note. This is faster. + */ +/datum/song/proc/pop_channel() + if(length(channels_idle)) //just pop one off of here if we have one available + . = text2num(channels_idle[1]) + channels_idle.Cut(1,2) + return + if(using_sound_channels >= max_sound_channels) + return + . = SSinstruments.reserve_instrument_channel(src) + if(!isnull(.)) + using_sound_channels++ + +/** + * Decays our channels and updates their volumes to mobs who can hear us. + * + * Arguments: + * * wait_ds - the deciseconds we should decay by. This is to compensate for any lag, as otherwise songs would get pretty nasty during high time dilation. + */ +/datum/song/proc/process_decay(wait_ds) + var/linear_dropoff = cached_linear_dropoff * wait_ds + var/exponential_dropoff = cached_exponential_dropoff ** wait_ds + for(var/channel in channels_playing) + if(full_sustain_held_note && (channel == last_channel_played)) + continue + var/current_volume = channels_playing[channel] + switch(sustain_mode) + if(SUSTAIN_LINEAR) + current_volume -= linear_dropoff + if(SUSTAIN_EXPONENTIAL) + current_volume /= exponential_dropoff + channels_playing[channel] = current_volume + var/dead = current_volume <= sustain_dropoff_volume + var/channelnumber = text2num(channel) + if(dead) + channels_playing -= channel + channels_idle += channel + for(var/i in hearing_mobs) + var/mob/M = i + M.stop_sound_channel(channelnumber) + else + for(var/i in hearing_mobs) + var/mob/M = i + M.set_sound_channel_volume(channelnumber, (current_volume * 0.01) * volume * using_instrument.volume_multiplier) \ No newline at end of file diff --git a/code/modules/instruments/stationary.dm b/code/modules/instruments/stationary.dm new file mode 100644 index 0000000000000..79228d88a8fd9 --- /dev/null +++ b/code/modules/instruments/stationary.dm @@ -0,0 +1,52 @@ +/obj/structure/musician + name = "Not A Piano" + desc = "Something broke, contact coderbus." + interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT | INTERACT_ATOM_REQUIRES_DEXTERITY + var/can_play_unanchored = FALSE + var/list/allowed_instrument_ids = list("r3grand","r3harpsi","crharpsi","crgrand1","crbright1", "crichugan", "crihamgan","piano") + var/datum/song/song + +/obj/structure/musician/Initialize(mapload) + . = ..() + song = new(src, allowed_instrument_ids) + allowed_instrument_ids = null + +/obj/structure/musician/Destroy() + QDEL_NULL(song) + return ..() + +/obj/structure/musician/proc/should_stop_playing(mob/user) + if(!(anchored || can_play_unanchored)) + return TRUE + if(!user) + return FALSE + return !user.canUseTopic(src, FALSE, TRUE, FALSE, FALSE) //can play with TK and while resting because fun. + +/obj/structure/musician/ui_interact(mob/user) + . = ..() + song.ui_interact(user) + +/obj/structure/musician/wrench_act(mob/living/user, obj/item/I) + default_unfasten_wrench(user, I, 40) + return TRUE + +/obj/structure/musician/piano + name = "space minimoog" + icon = 'icons/obj/musician.dmi' + icon_state = "minimoog" + anchored = TRUE + density = TRUE + +/obj/structure/musician/piano/unanchored + anchored = FALSE + +/obj/structure/musician/piano/Initialize(mapload) + . = ..() + if(prob(50) && icon_state == initial(icon_state)) + name = "space minimoog" + desc = "This is a minimoog, like a space piano, but more spacey!" + icon_state = "minimoog" + else + name = "space piano" + desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't." + icon_state = "piano" \ No newline at end of file diff --git a/code/modules/integrated_electronics/core/analyzer.dm b/code/modules/integrated_electronics/core/analyzer.dm deleted file mode 100644 index c3851cdb320a9..0000000000000 --- a/code/modules/integrated_electronics/core/analyzer.dm +++ /dev/null @@ -1,22 +0,0 @@ -/obj/item/integrated_electronics/analyzer - name = "circuit analyzer" - desc = "This tool can scan an assembly and generate code necessary to recreate it in a circuit printer." - icon = 'icons/obj/assemblies/electronic_tools.dmi' - icon_state = "analyzer" - flags_1 = CONDUCT_1 - w_class = WEIGHT_CLASS_SMALL - -/obj/item/integrated_electronics/analyzer/afterattack(var/atom/A, var/mob/living/user) - . = ..() - if(istype(A, /obj/item/electronic_assembly)) - var/obj/item/electronic_assembly/EA = A - if(EA.idlock) - to_chat(user, "[A] is currently identity-locked and can't be analyzed.") - return FALSE - - var/saved = "[A.name] analyzed! On circuit printers with cloning enabled, you may use the code below to clone the circuit: [SScircuit.save_electronic_assembly(A)]"
- if(saved)
- to_chat(user, "You scan [A].")
- user << browse(saved, "window=circuit_scan;size=500x600;border=1;can_resize=1;can_close=1;can_minimize=1")
- else
- to_chat(user, "[A] is not complete enough to be encoded!")
diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
deleted file mode 100644
index b3f604daf194b..0000000000000
--- a/code/modules/integrated_electronics/core/assemblies.dm
+++ /dev/null
@@ -1,1048 +0,0 @@
-#define IC_MAX_SIZE_BASE 25
-#define IC_COMPLEXITY_BASE 75
-
-/obj/item/electronic_assembly
- name = "electronic assembly"
- obj_flags = CAN_BE_HIT | UNIQUE_RENAME
- desc = "A case designed for building small electronics."
- w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/obj/assemblies/electronic_setups.dmi'
- icon_state = "setup_small"
- item_flags = NOBLUDGEON
- materials = list() // To be filled later
- datum_flags = DF_USE_TAG
- var/list/assembly_components = list()
- var/list/ckeys_allowed_to_scan = list() // Players who built the circuit can scan it as a ghost.
- var/max_components = IC_MAX_SIZE_BASE
- var/max_complexity = IC_COMPLEXITY_BASE
- var/opened = TRUE
- var/obj/item/stock_parts/cell/battery // Internal cell which most circuits need to work.
- var/cell_type = /obj/item/stock_parts/cell
- var/can_charge = TRUE //Can it be charged in a recharger?
- var/can_fire_equipped = FALSE //Can it fire/throw weapons when the assembly is being held?
- var/charge_sections = 4
- var/charge_tick = FALSE
- var/charge_delay = 4
- var/use_cyborg_cell = TRUE
- var/ext_next_use = 0
- var/atom/collw
- var/obj/item/card/id/access_card
- var/allowed_circuit_action_flags = IC_ACTION_COMBAT | IC_ACTION_LONG_RANGE //which circuit flags are allowed
- var/combat_circuits = 0 //number of combat cicuits in the assembly, used for diagnostic hud
- var/long_range_circuits = 0 //number of long range cicuits in the assembly, used for diagnostic hud
- var/prefered_hud_icon = "hudstat" // Used by the AR circuit to change the hud icon.
- var/creator // circuit creator if any
- var/static/next_assembly_id = 0
- var/sealed = FALSE
- var/datum/weakref/idlock = null
-
- hud_possible = list(DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_TRACK_HUD, DIAG_CIRCUIT_HUD) //diagnostic hud overlays
- max_integrity = 50
- pass_flags = 0
- armor = list("melee" = 50, "bullet" = 70, "laser" = 70, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
- anchored = FALSE
- var/can_anchor = TRUE
- var/detail_color = COLOR_ASSEMBLY_BLACK
-
-/obj/item/electronic_assembly/New()
- ..()
- src.max_components = round(max_components)
- src.max_complexity = round(max_complexity)
-
-/obj/item/electronic_assembly/GenerateTag()
- tag = "assembly_[next_assembly_id++]"
-
-/obj/item/electronic_assembly/examine(mob/user)
- . = ..()
- if(can_anchor)
- to_chat(user, "The anchoring bolts [anchored ? "are" : "can be"] wrenched in place and the maintenance panel [opened ? "can be" : "is"] screwed in place.")
- else
- to_chat(user, "The maintenance panel [opened ? "can be" : "is"] screwed in place.")
-
- if((isobserver(user) && ckeys_allowed_to_scan[user.ckey]) || IsAdminGhost(user))
- to_chat(user, "You can scan this circuit.")
-
- for(var/obj/item/integrated_circuit/I in assembly_components)
- I.external_examine(user)
- if(opened)
- interact(user)
-
-/obj/item/electronic_assembly/proc/check_interactivity(mob/user)
- if(!istype(user, /mob))
- return
- return user.canUseTopic(src, BE_CLOSE)
-
-/obj/item/electronic_assembly/Bump(atom/AM)
- collw = AM
- .=..()
- if((istype(collw, /obj/machinery/door/airlock) || istype(collw, /obj/machinery/door/window)) && (!isnull(access_card)))
- var/obj/machinery/door/D = collw
- if(D.check_access(access_card))
- D.open()
-
-/obj/item/electronic_assembly/Initialize()
- .=..()
- START_PROCESSING(SScircuit, src)
- materials[/datum/material/iron] = round((max_complexity + max_components) / 4) * SScircuit.cost_multiplier
-
- //sets up diagnostic hud view
- prepare_huds()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_to_hud(src)
- diag_hud_set_circuithealth()
- diag_hud_set_circuitcell()
- diag_hud_set_circuitstat()
- diag_hud_set_circuittracking()
-
- access_card = new /obj/item/card/id(src)
-
-/obj/item/electronic_assembly/Destroy()
- STOP_PROCESSING(SScircuit, src)
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.remove_from_hud(src)
- QDEL_NULL(access_card)
- return ..()
-
-/obj/item/electronic_assembly/process()
- handle_idle_power()
- check_pulling()
-
- //updates diagnostic hud
- diag_hud_set_circuithealth()
- diag_hud_set_circuitcell()
-
-/obj/item/electronic_assembly/proc/handle_idle_power()
-
- // First we generate power.
- for(var/obj/item/integrated_circuit/passive/power/P in assembly_components)
- P.make_energy()
-
- // Now spend it.
- for(var/obj/item/integrated_circuit/I in assembly_components)
- if(I.power_draw_idle)
- if(!draw_power(I.power_draw_idle))
- I.power_fail()
-
-/obj/item/electronic_assembly/interact(mob/user, circuit)
- ui_interact(user, circuit)
-
-/obj/item/electronic_assembly/ui_interact(mob/user, obj/item/integrated_circuit/circuit_pins)
- . = ..()
- if(!check_interactivity(user))
- return
-
- var/total_part_size = return_total_size()
- var/total_complexity = return_total_complexity()
- var/datum/browser/popup = new(user, "scannernew", name, 800, 630) // Set up the popup browser window
- popup.add_stylesheet("scannernew", 'html/browser/assembly_ui.css')
-
- var/HTML = "
[SScircuit.save_electronic_assembly(src)]"
- usr << browse(saved, "window=circuit_scan;size=500x600;border=1;can_resize=1;can_close=1;can_minimize=1")
- else
- to_chat(usr, "The circuit is empty!")
- return
-
- if(!check_interactivity(usr))
- return
-
- if(href_list["rename"])
- rename(usr)
-
- if(href_list["remove_cell"])
- if(!battery)
- to_chat(usr, "There's no power cell to remove from \the [src].")
- else
- battery.forceMove(drop_location())
- playsound(src, 'sound/items/Crowbar.ogg', 50, 1)
- to_chat(usr, "You pull \the [battery] out of \the [src]'s power supplier.")
- battery = null
- diag_hud_set_circuitstat() //update diagnostic hud
-
- var/obj/item/integrated_circuit/component
-
- if(href_list["component"])
- component = locate(href_list["component"]) in assembly_components
-
- if(!component)
- return
-
-
- if(href_list["scan"])
- var/obj/held_item = usr.get_active_held_item()
- if(istype(held_item, /obj/item/integrated_electronics/debugger))
- var/obj/item/integrated_electronics/debugger/D = held_item
- if(D.accepting_refs)
- D.afterattack(component, usr, TRUE)
- else
- to_chat(usr, "The debugger's 'ref scanner' needs to be on.")
- else
- to_chat(usr, "You need a debugger set to 'ref' mode to do that.")
-
- // Builtin components are not supposed to be removed or rearranged
- if(!component.removable)
- return
-
- add_allowed_scanner(usr.ckey)
-
- // Find the position of a first removable component
- var/first_removable_pos = 0
- for(var/i in assembly_components)
- first_removable_pos++
- var/obj/item/integrated_circuit/temp_component = i
- if(temp_component.removable)
- break
-
- if(href_list["remove"])
- if(try_remove_component(component, usr))
- component = null
-
- if(href_list["rename_component"])
- component.rename_component(usr)
- if(component.assembly)
- component.assembly.add_allowed_scanner(usr.ckey)
-
- if(href_list["interact"])
- var/obj/item/I = usr.get_active_held_item()
- if(istype(I))
- I.melee_attack_chain(usr, component)
- else
- component.attack_hand(usr)
-
- // Adjust the position
- if(href_list["change_pos"])
- var/new_pos = max(input(usr,"Write the new number","New position") as num,1)
-
- if(new_pos > assembly_components.len)
- new_pos = assembly_components.len
-
- if(new_pos < first_removable_pos)
- new_pos = first_removable_pos
-
- assembly_components.Remove(component)
- assembly_components.Insert(new_pos, component)
-
- interact(usr, component) // To refresh the UI.
-
-/obj/item/electronic_assembly/pickup(mob/living/user)
- . = ..()
- //update diagnostic hud when picked up, true is used to force the hud to be hidden
- diag_hud_set_circuithealth(TRUE)
- diag_hud_set_circuitcell(TRUE)
- diag_hud_set_circuitstat(TRUE)
- diag_hud_set_circuittracking(TRUE)
-
-/obj/item/electronic_assembly/dropped(mob/user)
- . = ..()
- //update diagnostic hud when dropped
- diag_hud_set_circuithealth()
- diag_hud_set_circuitcell()
- diag_hud_set_circuitstat()
- diag_hud_set_circuittracking()
-
-/obj/item/electronic_assembly/proc/rename()
- var/mob/M = usr
- if(!check_interactivity(M))
- return
-
- var/input = reject_bad_name(input("What do you want to name this?", "Rename", src.name) as null|text, TRUE)
- if(!check_interactivity(M))
- return
- if(src && input)
- to_chat(M, "The machine now has a label reading '[input]'.")
- name = input
-
-/obj/item/electronic_assembly/proc/add_allowed_scanner(ckey)
- ckeys_allowed_to_scan[ckey] = TRUE
-
-/obj/item/electronic_assembly/proc/can_move()
- return FALSE
-
-/obj/item/electronic_assembly/update_icon()
- if(opened)
- icon_state = initial(icon_state) + "-open"
- else
- icon_state = initial(icon_state)
- cut_overlays()
- if(detail_color == COLOR_ASSEMBLY_BLACK) //Black colored overlay looks almost but not exactly like the base sprite, so just cut the overlay and avoid it looking kinda off.
- return
- var/mutable_appearance/detail_overlay = mutable_appearance('icons/obj/assemblies/electronic_setups.dmi', "[icon_state]-color")
- detail_overlay.color = detail_color
- add_overlay(detail_overlay)
-
-/obj/item/electronic_assembly/proc/return_total_complexity()
- var/returnvalue = 0
- for(var/obj/item/integrated_circuit/part in assembly_components)
- returnvalue += part.complexity
- return(returnvalue)
-
-/obj/item/electronic_assembly/proc/return_total_size()
- var/returnvalue = 0
- for(var/obj/item/integrated_circuit/part in assembly_components)
- returnvalue += part.size
- return(returnvalue)
-
-// Returns true if the circuit made it inside.
-/obj/item/electronic_assembly/proc/try_add_component(obj/item/integrated_circuit/IC, mob/user)
- if(!opened)
- to_chat(user, "\The [src]'s hatch is closed, you can't put anything inside.")
- return FALSE
-
- if(IC.w_class > w_class)
- to_chat(user, "\The [IC] is way too big to fit into \the [src].")
- return FALSE
-
- var/total_part_size = return_total_size()
- var/total_complexity = return_total_complexity()
-
- if(IC.max_allowed)
- var/current_components
- for(var/obj/item/integrated_circuit/component as anything in assembly_components)
- if(component.type == IC.type)
- current_components++
- if(current_components >= IC.max_allowed)
- to_chat(user, "You can't seem to add the '[IC]', as there are too many installed already.")
- return FALSE
-
- if((total_part_size + IC.size) > max_components)
- to_chat(user, "You can't seem to add the '[IC]', as there's insufficient space.")
- return FALSE
- if((total_complexity + IC.complexity) > max_complexity)
- to_chat(user, "You can't seem to add the '[IC]', since this setup's too complicated for the case.")
- return FALSE
- if((allowed_circuit_action_flags & IC.action_flags) != IC.action_flags)
- to_chat(user, "You can't seem to add the '[IC]', since the case doesn't support the circuit type.")
- return FALSE
-
- if(!user.transferItemToLoc(IC, src))
- return FALSE
-
- to_chat(user, "You slide [IC] inside [src].")
- playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
- add_allowed_scanner(user.ckey)
- investigate_log("had [IC]([IC.type]) inserted by [key_name(user)].", INVESTIGATE_CIRCUIT)
-
- add_component(IC)
- return TRUE
-
-
-// Actually puts the circuit inside, doesn't perform any checks.
-/obj/item/electronic_assembly/proc/add_component(obj/item/integrated_circuit/component)
- component.forceMove(get_object())
- component.assembly = src
- assembly_components |= component
-
- //increment numbers for diagnostic hud
- if(component.action_flags & IC_ACTION_COMBAT)
- combat_circuits += 1;
- if(component.action_flags & IC_ACTION_LONG_RANGE)
- long_range_circuits += 1;
-
- //diagnostic hud update
- diag_hud_set_circuitstat()
- diag_hud_set_circuittracking()
-
-
-/obj/item/electronic_assembly/proc/try_remove_component(obj/item/integrated_circuit/IC, mob/user, silent)
- if(!opened)
- if(!silent)
- to_chat(user, "[src]'s hatch is closed, so you can't fiddle with the internal components.")
- return FALSE
-
- if(!IC.removable)
- if(!silent)
- to_chat(user, "[src] is permanently attached to the case.")
- return FALSE
-
- remove_component(IC)
- if(!silent)
- to_chat(user, "You pop \the [IC] out of the case, and slide it out.")
- playsound(src, 'sound/items/crowbar.ogg', 50, 1)
- user.put_in_hands(IC)
- add_allowed_scanner(user.ckey)
- investigate_log("had [IC]([IC.type]) removed by [key_name(user)].", INVESTIGATE_CIRCUIT)
-
- return TRUE
-
-// Actually removes the component, doesn't perform any checks.
-/obj/item/electronic_assembly/proc/remove_component(obj/item/integrated_circuit/component)
- component.disconnect_all()
- component.forceMove(drop_location())
- component.assembly = null
-
- assembly_components -= component
-
- //decrement numbers for diagnostic hud
- if(component.action_flags & IC_ACTION_COMBAT)
- combat_circuits -= 1;
- if(component.action_flags & IC_ACTION_LONG_RANGE)
- long_range_circuits -= 1;
-
- //diagnostic hud update
- diag_hud_set_circuitstat()
- diag_hud_set_circuittracking()
-
-
-/obj/item/electronic_assembly/afterattack(atom/target, mob/user, proximity)
- . = ..()
- for(var/obj/item/integrated_circuit/input/S in assembly_components)
- if(S.sense(target,user,proximity))
- visible_message(" [user] waves [src] around [target].")
-
-
-/obj/item/electronic_assembly/screwdriver_act(mob/living/user, obj/item/I)
- if(sealed)
- to_chat(user,"The assembly is sealed. Any attempt to force it open would break it.")
- return FALSE
- if(..())
- return TRUE
- I.play_tool_sound(src)
- opened = !opened
- to_chat(user, "You [opened ? "open" : "close"] the maintenance hatch of [src].")
- update_icon()
- return TRUE
-
-/obj/item/electronic_assembly/welder_act(mob/living/user, obj/item/I)
- var/type_to_use
-
- if(!sealed)
- type_to_use = input("What would you like to do?","[src] type setting") as null|anything in list("repair", "seal")
- else
- type_to_use = input("What would you like to do?","[src] type setting") as null|anything in list("repair", "unseal")
-
- switch(type_to_use)
- if("repair")
- to_chat(world,"Integrity: [obj_integrity] / [max_integrity]")
- if(obj_integrity < max_integrity)
- obj_integrity = min(obj_integrity + 20,max_integrity)
- to_chat(world,"Integrity: [obj_integrity] / [max_integrity]")
- to_chat(user,"You fix the dents and scratches of the assembly.")
- to_chat(world,user)
- return TRUE
-
- else
- to_chat(user,"The assembly is already in impeccable condition.")
- return FALSE
-
- if("seal")
- if(!opened)
- sealed = TRUE
- if(I.use_tool(src, user, 50, volume=100, amount=3))
- to_chat(user,"You seal the assembly, making it impossible to be opened.")
- return TRUE
-
- else
- to_chat(user,"You need to close the assembly first before sealing it indefinitely!")
- return FALSE
-
- if("unseal")
- to_chat(user,"You start unsealing the assembly carefully...")
- if(I.use_tool(src, user, 50, volume=250, amount=3))
- for(var/obj/item/integrated_circuit/IC in assembly_components)
- if(prob(50))
- IC.disconnect_all()
-
- to_chat(user,"You unsealed the assembly.")
- sealed = FALSE
- return TRUE
-
-/obj/item/electronic_assembly/attackby(obj/item/I, mob/living/user)
- if(can_anchor && default_unfasten_wrench(user, I, 20))
- return
-
- // ID-Lock part: check if we have an id-lock and only lock if we're not trying to get values from it, to prevent accidents
- if(istype(I, /obj/item/integrated_electronics/debugger))
- var/obj/item/integrated_electronics/debugger/debugger = I
- if(debugger.idlock)
- // check if unlocked to lock
- if(!idlock)
- idlock = debugger.idlock
- to_chat(user,"You lock \the [src].")
-
- //if locked, unlock if ids match
- else
- if(idlock.resolve() == debugger.idlock.resolve())
- idlock = null
- to_chat(user,"You unlock \the [src].")
-
- else
- to_chat(user,"The scanned ID doesn't match with \the [src]'s lock.")
-
- debugger.idlock = null
- return
-
- if(istype(I, /obj/item/integrated_circuit))
- if(!user.canUnEquip(I))
- return FALSE
- if(try_add_component(I, user))
- return TRUE
- else
- for(var/obj/item/integrated_circuit/input/S in assembly_components)
- S.attackby_react(I,user,user.a_intent)
- return ..()
-
- else if(I.tool_behaviour == TOOL_MULTITOOL || istype(I, /obj/item/integrated_electronics/wirer) || istype(I, /obj/item/integrated_electronics/debugger))
- if(opened)
- interact(user)
- return TRUE
- else
- to_chat(user, "[src]'s hatch is closed, so you can't fiddle with the internal components.")
- for(var/obj/item/integrated_circuit/input/S in assembly_components)
- S.attackby_react(I,user,user.a_intent)
- return ..()
-
- else if(istype(I, /obj/item/stock_parts/cell))
- if(!opened)
- to_chat(user, "[src]'s hatch is closed, so you can't access \the [src]'s power supplier.")
- for(var/obj/item/integrated_circuit/input/S in assembly_components)
- S.attackby_react(I,user,user.a_intent)
- return ..()
- if(battery)
- to_chat(user, "[src] already has \a [battery] installed. Remove it first if you want to replace it.")
- for(var/obj/item/integrated_circuit/input/S in assembly_components)
- S.attackby_react(I,user,user.a_intent)
- return ..()
- I.forceMove(src)
- battery = I
- diag_hud_set_circuitstat() //update diagnostic hud
- playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
- to_chat(user, "You slot the [I] inside \the [src]'s power supplier.")
- return TRUE
-
- else if(istype(I, /obj/item/integrated_electronics/detailer))
- var/obj/item/integrated_electronics/detailer/D = I
- detail_color = D.detail_color
- update_icon()
-
- else
- if(user.a_intent != INTENT_HELP)
- return ..()
- var/list/input_selection = list()
- //Check all the components asking for an input
- for(var/obj/item/integrated_circuit/input in assembly_components)
- if((input.demands_object_input && opened) || (input.demands_object_input && input.can_input_object_when_closed))
- var/i = 0
- //Check if there is another component with the same name and append a number for identification
- for(var/s in input_selection)
- var/obj/item/integrated_circuit/s_circuit = input_selection[s] //The for-loop iterates the keys of the associative list.
- if(s_circuit.name == input.name && s_circuit.displayed_name == input.displayed_name && s_circuit != input)
- i++
- var/disp_name= "[input.displayed_name] \[[input]\]"
- if(i)
- disp_name += " ([i+1])"
- //Associative lists prevent me from needing another list and using a Find proc
- input_selection[disp_name] = input
-
- var/obj/item/integrated_circuit/choice
- if(input_selection)
- if(input_selection.len == 1)
- choice = input_selection[input_selection[1]]
- else
- var/selection = input(user, "Where do you want to insert that item?", "Interaction") as null|anything in input_selection
- if(!check_interactivity(user))
- return ..()
- if(selection)
- choice = input_selection[selection]
- if(choice)
- choice.additem(I, user)
- for(var/obj/item/integrated_circuit/input/S in assembly_components)
- S.attackby_react(I,user,user.a_intent)
- return ..()
-
-
-/obj/item/electronic_assembly/attack_self(mob/user)
- if(!check_interactivity(user))
- return
- if(opened)
- interact(user)
-
- var/list/input_selection = list()
- //Check all the components asking for an input
- for(var/obj/item/integrated_circuit/input/input in assembly_components)
- if(input.can_be_asked_input)
- var/i = 0
- //Check if there is another component with the same name and append a number for identification
- for(var/s in input_selection)
- var/obj/item/integrated_circuit/s_circuit = input_selection[s] //The for-loop iterates the keys of an associative list.
- if(s_circuit.name == input.name && s_circuit.displayed_name == input.displayed_name && s_circuit != input)
- i++
- var/disp_name= "[input.displayed_name] \[[input]\]"
- if(i)
- disp_name += " ([i+1])"
- //Associative lists prevent me from needing another list and using a Find proc
- input_selection[disp_name] = input
-
- var/obj/item/integrated_circuit/input/choice
-
-
- if(input_selection)
- if(input_selection.len ==1)
- choice = input_selection[input_selection[1]]
- else
- var/selection = input(user, "What do you want to interact with?", "Interaction") as null|anything in input_selection
- if(!check_interactivity(user))
- return
- if(selection)
- choice = input_selection[selection]
-
- if(choice)
- choice.ask_for_input(user)
-
-/obj/item/electronic_assembly/emp_act(severity)
- . = ..()
- if(. & EMP_PROTECT_CONTENTS)
- return
- for(var/I in src)
- var/atom/movable/AM = I
- AM.emp_act(severity)
-
-// Returns true if power was successfully drawn.
-/obj/item/electronic_assembly/proc/draw_power(amount)
- if(battery && battery.use(amount * GLOB.CELLRATE))
- return TRUE
- return FALSE
-
-// Ditto for giving.
-/obj/item/electronic_assembly/proc/give_power(amount)
- if(battery && battery.give(amount * GLOB.CELLRATE))
- return TRUE
- return FALSE
-
-/obj/item/electronic_assembly/Moved(oldLoc, dir)
- for(var/I in assembly_components)
- var/obj/item/integrated_circuit/IC = I
- IC.ext_moved(oldLoc, dir)
- if(light) //Update lighting objects (From light circuits).
- update_light()
-
-/obj/item/electronic_assembly/stop_pulling()
- for(var/I in assembly_components)
- var/obj/item/integrated_circuit/IC = I
- IC.stop_pulling()
- ..()
-
-
-// Returns the object that is supposed to be used in attack messages, location checks, etc.
-// Override in children for special behavior.
-/obj/item/electronic_assembly/proc/get_object()
- return src
-
-// Returns the location to be used for dropping items.
-// Same as the regular drop_location(), but with checks being run on acting_object if necessary.
-/obj/item/integrated_circuit/drop_location()
- var/atom/movable/acting_object = get_object()
-
- // plz no infinite loops
- if(acting_object == src)
- return ..()
-
- return acting_object.drop_location()
-
-/obj/item/electronic_assembly/attack_tk(mob/user)
- if(anchored)
- return
- ..()
-
-/obj/item/electronic_assembly/attack_hand(mob/user)
- if(anchored)
- attack_self(user)
- return
- ..()
-
-/obj/item/electronic_assembly/default //The /default electronic_assemblys are to allow the introduction of the new naming scheme without breaking old saves.
- name = "type-a electronic assembly"
-
-/obj/item/electronic_assembly/calc
- name = "type-b electronic assembly"
- icon_state = "setup_small_calc"
- desc = "A case designed for building small electronics. This one resembles a pocket calculator."
-
-/obj/item/electronic_assembly/clam
- name = "type-c electronic assembly"
- icon_state = "setup_small_clam"
- desc = "A case designed for building small electronics. This one has a clamshell design."
-
-/obj/item/electronic_assembly/simple
- name = "type-d electronic assembly"
- icon_state = "setup_small_simple"
- desc = "A case designed for building small electronics. This one has a simple design."
-
-/obj/item/electronic_assembly/hook
- name = "type-e electronic assembly"
- icon_state = "setup_small_hook"
- desc = "A case designed for building small electronics. This one looks like it has a belt clip, but it's purely decorative."
-
-/obj/item/electronic_assembly/pda
- name = "type-f electronic assembly"
- icon_state = "setup_small_pda"
- desc = "A case designed for building small electronics. This one resembles a PDA."
-
-/obj/item/electronic_assembly/small
- name = "electronic device"
- icon_state = "setup_device"
- desc = "A case designed for building tiny-sized electronics."
- w_class = WEIGHT_CLASS_TINY
- max_components = IC_MAX_SIZE_BASE / 2
- max_complexity = IC_COMPLEXITY_BASE / 2
-
-/obj/item/electronic_assembly/small/default
- name = "type-a electronic device"
-
-/obj/item/electronic_assembly/small/cylinder
- name = "type-b electronic device"
- icon_state = "setup_device_cylinder"
- desc = "A case designed for building tiny-sized electronics. This one has a cylindrical design."
-
-/obj/item/electronic_assembly/small/scanner
- name = "type-c electronic device"
- icon_state = "setup_device_scanner"
- desc = "A case designed for building tiny-sized electronics. This one has a scanner-like design."
-
-/obj/item/electronic_assembly/small/hook
- name = "type-d electronic device"
- icon_state = "setup_device_hook"
- desc = "A case designed for building tiny-sized electronics. This one looks like it has a belt clip, but it's purely decorative."
-
-/obj/item/electronic_assembly/small/box
- name = "type-e electronic device"
- icon_state = "setup_device_box"
- desc = "A case designed for building tiny-sized electronics. This one has a box design."
-
-/obj/item/electronic_assembly/medium
- name = "electronic mechanism"
- icon_state = "setup_medium"
- desc = "A case designed for building medium-sized electonics."
- w_class = WEIGHT_CLASS_NORMAL
- max_components = IC_MAX_SIZE_BASE * 2
- max_complexity = IC_COMPLEXITY_BASE * 2
-
-/obj/item/electronic_assembly/medium/default
- name = "type-a electronic mechanism"
-
-/obj/item/electronic_assembly/medium/box
- name = "type-b electronic mechanism"
- icon_state = "setup_medium_box"
- desc = "A case designed for building medium-sized electonics. This one has a box design."
-
-/obj/item/electronic_assembly/medium/clam
- name = "type-c electronic mechanism"
- icon_state = "setup_medium_clam"
- desc = "A case designed for building medium-sized electonics. This one has a clamshell design."
-
-/obj/item/electronic_assembly/medium/medical
- name = "type-d electronic mechanism"
- icon_state = "setup_medium_med"
- desc = "A case designed for building medium-sized electonics. This one resembles medical apparatus."
-
-/obj/item/electronic_assembly/medium/gun
- name = "type-e electronic mechanism"
- icon_state = "setup_medium_gun"
- item_state = "circuitgun"
- desc = "A case designed for building medium-sized electonics. This one resembles a gun, or some type of tool, if you're feeling optimistic. It can fire guns and throw items while the user is holding it."
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
- can_fire_equipped = TRUE
-
-/obj/item/electronic_assembly/medium/radio
- name = "type-f electronic mechanism"
- icon_state = "setup_medium_radio"
- desc = "A case designed for building medium-sized electonics. This one resembles an old radio."
-
-/obj/item/electronic_assembly/large
- name = "electronic machine"
- icon_state = "setup_large"
- desc = "A case designed for building large electronics."
- w_class = WEIGHT_CLASS_BULKY
- max_components = IC_MAX_SIZE_BASE * 4
- max_complexity = IC_COMPLEXITY_BASE * 4
-
-/obj/item/electronic_assembly/large/default
- name = "type-a electronic machine"
-
-/obj/item/electronic_assembly/large/scope
- name = "type-b electronic machine"
- icon_state = "setup_large_scope"
- desc = "A case designed for building large electronics. This one resembles an oscilloscope."
-
-/obj/item/electronic_assembly/large/terminal
- name = "type-c electronic machine"
- icon_state = "setup_large_terminal"
- desc = "A case designed for building large electronics. This one resembles a computer terminal."
-
-/obj/item/electronic_assembly/large/arm
- name = "type-d electronic machine"
- icon_state = "setup_large_arm"
- desc = "A case designed for building large electronics. This one resembles a robotic arm."
-
-/obj/item/electronic_assembly/large/tall
- name = "type-e electronic machine"
- icon_state = "setup_large_tall"
- desc = "A case designed for building large electronics. This one has a tall design."
-
-/obj/item/electronic_assembly/large/industrial
- name = "type-f electronic machine"
- icon_state = "setup_large_industrial"
- desc = "A case designed for building mobile electronics. This one resembles industrial machinery."
-
-/obj/item/electronic_assembly/drone
- name = "electronic drone"
- icon_state = "setup_drone"
- desc = "A case designed for building mobile electronics."
- w_class = WEIGHT_CLASS_BULKY
- max_components = IC_MAX_SIZE_BASE * 3
- max_complexity = IC_COMPLEXITY_BASE * 3
- allowed_circuit_action_flags = IC_ACTION_MOVEMENT | IC_ACTION_COMBAT | IC_ACTION_LONG_RANGE
- can_anchor = FALSE
-
-/obj/item/electronic_assembly/drone/can_move()
- return TRUE
-
-/obj/item/electronic_assembly/drone/default
- name = "type-a electronic drone"
-
-/obj/item/electronic_assembly/drone/arms
- name = "type-b electronic drone"
- icon_state = "setup_drone_arms"
- desc = "A case designed for building mobile electronics. This one is armed and dangerous."
-
-/obj/item/electronic_assembly/drone/secbot
- name = "type-c electronic drone"
- icon_state = "setup_drone_secbot"
- desc = "A case designed for building mobile electronics. This one resembles a Securitron."
-
-/obj/item/electronic_assembly/drone/medbot
- name = "type-d electronic drone"
- icon_state = "setup_drone_medbot"
- desc = "A case designed for building mobile electronics. This one resembles a Medibot."
-
-/obj/item/electronic_assembly/drone/genbot
- name = "type-e electronic drone"
- icon_state = "setup_drone_genbot"
- desc = "A case designed for building mobile electronics. This one has a generic bot design."
-
-/obj/item/electronic_assembly/drone/android
- name = "type-f electronic drone"
- icon_state = "setup_drone_android"
- desc = "A case designed for building mobile electronics. This one has a hominoid design."
-
-/obj/item/electronic_assembly/wallmount
- name = "wall-mounted electronic assembly"
- icon_state = "setup_wallmount_medium"
- desc = "A case designed for building medium-sized electronics.. It has a magnetized backing to allow it to stick to walls, but you'll still need to wrench the anchoring bolts in place to keep it on."
- w_class = WEIGHT_CLASS_NORMAL
- max_components = IC_MAX_SIZE_BASE * 2
- max_complexity = IC_COMPLEXITY_BASE * 2
-
-/obj/item/electronic_assembly/wallmount/heavy
- name = "heavy wall-mounted electronic assembly"
- icon_state = "setup_wallmount_large"
- desc = "A case designed for building large electronics. It has a magnetized backing to allow it to stick to walls, but you'll still need to wrench the anchoring bolts in place to keep it on."
- w_class = WEIGHT_CLASS_BULKY
- max_components = IC_MAX_SIZE_BASE * 4
- max_complexity = IC_COMPLEXITY_BASE * 4
-
-/obj/item/electronic_assembly/wallmount/light
- name = "light wall-mounted electronic assembly"
- icon_state = "setup_wallmount_small"
- desc = "A case designed for building small electronics. It has a magnetized backing to allow it to stick to walls, but you'll still need to wrench the anchoring bolts in place to keep it on."
- w_class = WEIGHT_CLASS_SMALL
- max_components = IC_MAX_SIZE_BASE
- max_complexity = IC_COMPLEXITY_BASE
-
-/obj/item/electronic_assembly/wallmount/tiny
- name = "tiny wall-mounted electronic assembly"
- icon_state = "setup_wallmount_tiny"
- desc = "It's a case, for building tiny electronics with. It has a magnetized backing to allow it to stick to walls, but you'll still need to wrench the anchoring bolts in place to keep it on."
- w_class = WEIGHT_CLASS_TINY
- max_components = IC_MAX_SIZE_BASE / 2
- max_complexity = IC_COMPLEXITY_BASE / 2
-
-/obj/item/electronic_assembly/wallmount/proc/mount_assembly(turf/on_wall, mob/user) //Yeah, this is admittedly just an abridged and kitbashed version of the wallframe attach procs.
- if(get_dist(on_wall,user)>1)
- return
- var/ndir = get_dir(on_wall, user)
- if(!(ndir in GLOB.cardinals))
- return
- var/turf/T = get_turf(user)
- if(!isfloorturf(T))
- to_chat(user, "You cannot place [src] on this spot!")
- return
- if(gotwallitem(T, ndir))
- to_chat(user, "There's already an item on this wall!")
- return
- playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
- user.visible_message("[user.name] attaches [src] to the wall.",
- "You attach [src] to the wall.",
- "You hear clicking.")
- user.dropItemToGround(src)
- switch(ndir)
- if(NORTH)
- pixel_y = -31
- if(SOUTH)
- pixel_y = 31
- if(EAST)
- pixel_x = -31
- if(WEST)
- pixel_x = 31
diff --git a/code/modules/integrated_electronics/core/debugger.dm b/code/modules/integrated_electronics/core/debugger.dm
deleted file mode 100644
index 867ae9ad460bb..0000000000000
--- a/code/modules/integrated_electronics/core/debugger.dm
+++ /dev/null
@@ -1,108 +0,0 @@
-/obj/item/integrated_electronics/debugger
- name = "circuit debugger"
- desc = "This small tool allows one working with custom machinery to directly set data to a specific pin, useful for writing \
- settings to specific circuits, or for debugging purposes. It can also pulse activation pins."
- icon = 'icons/obj/assemblies/electronic_tools.dmi'
- icon_state = "debugger"
- flags_1 = CONDUCT_1
- item_flags = NOBLUDGEON
- w_class = WEIGHT_CLASS_SMALL
- var/data_to_write = null
- var/accepting_refs = FALSE
- var/copy_values = FALSE
- var/copy_id = FALSE
- var/datum/weakref/idlock = null
-
-/obj/item/integrated_electronics/debugger/attack_self(mob/user)
- var/type_to_use = input("Please choose a type to use.","[src] type setting") as null|anything in list("string","number","ref","copy","null","id lock")
- if(!user.IsAdvancedToolUser())
- return
-
- var/new_data = null
- switch(type_to_use)
- if("string")
- accepting_refs = FALSE
- copy_values = FALSE
- copy_id = FALSE
- new_data = stripped_input(user, "Now type in a string.","[src] string writing", no_trim = TRUE)
- if(istext(new_data) && user.IsAdvancedToolUser())
- data_to_write = new_data
- to_chat(user, "You set \the [src]'s memory to \"[new_data]\".")
- if("number")
- accepting_refs = FALSE
- copy_values = FALSE
- copy_id = FALSE
- new_data = input(user, "Now type in a number.","[src] number writing") as null|num
- if(isnum_safe(new_data) && user.IsAdvancedToolUser())
- data_to_write = new_data
- to_chat(user, "You set \the [src]'s memory to [new_data].")
- if("ref")
- accepting_refs = TRUE
- copy_values = FALSE
- copy_id = FALSE
- to_chat(user, "You turn \the [src]'s ref scanner on. Slide it across \
- an object for a ref of that object to save it in memory.")
- if("copy")
- accepting_refs = FALSE
- copy_values = TRUE
- copy_id = FALSE
- to_chat(user, "You turn \the [src]'s value copier on. Use it on a pin \
- to save its current value in memory.")
- if("null")
- data_to_write = null
- copy_values = FALSE
- to_chat(user, "You set \the [src]'s memory to absolutely nothing.")
- if("id lock")
- accepting_refs = FALSE
- copy_values = FALSE
- copy_id = TRUE
- to_chat(user, "You turn \the [src]'s id card scanner on. Use your own card \
- to store the identity and id-lock an assembly.")
-
-/obj/item/integrated_electronics/debugger/afterattack(atom/target, mob/living/user, proximity)
- . = ..()
- if(accepting_refs && proximity)
- data_to_write = WEAKREF(target)
- visible_message("[user] slides \a [src]'s over \the [target].")
- to_chat(user, "You set \the [src]'s memory to a reference to [target.name] \[Ref\]. The ref scanner is \
- now off.")
- accepting_refs = FALSE
-
- else if(copy_id && proximity)
- if(istype(target,/obj/item/card/id))
- idlock = WEAKREF(target)
- to_chat(user, "You set \the [src]'s card memory to [target.name]. The id card scanner is \
- now off.")
-
- else
- to_chat(user, "You turn the id card scanner is off.")
-
- copy_id = FALSE
- return
-
-/obj/item/integrated_electronics/debugger/proc/write_data(var/datum/integrated_io/io, mob/user)
- //If the pin can take data:
- if(io.io_type == DATA_CHANNEL)
- //If the debugger is set to copy, copy the data in the pin onto it
- if(copy_values)
- data_to_write = io.data
- to_chat(user, "You let the debugger copy the data.")
- copy_values = FALSE
- return
-
- //Else, write the data to the pin
- io.write_data_to_pin(data_to_write)
- var/data_to_show = data_to_write
- //This is only to convert a weakref into a name for better output
- if(isweakref(data_to_write))
- var/datum/weakref/w = data_to_write
- var/atom/A = w.resolve()
- data_to_show = A.name
- to_chat(user, "You write '[data_to_write ? data_to_show : "NULL"]' to the '[io]' pin of \the [io.holder].")
-
- //If the pin can only be pulsed
- else if(io.io_type == PULSE_CHANNEL)
- io.holder.check_then_do_work(io.ord,ignore_power = TRUE)
- to_chat(user, "You pulse \the [io.holder]'s [io].")
-
- io.holder.interact(user) // This is to update the UI.
diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm
deleted file mode 100644
index 33f7ef96add03..0000000000000
--- a/code/modules/integrated_electronics/core/detailer.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/obj/item/integrated_electronics/detailer
- name = "assembly detailer"
- desc = "A combination autopainter and flash anodizer designed to give electronic assemblies a colorful, wear-resistant finish."
- icon = 'icons/obj/assemblies/electronic_tools.dmi'
- icon_state = "detailer"
- flags_1 = CONDUCT_1
- item_flags = NOBLUDGEON
- w_class = WEIGHT_CLASS_SMALL
- var/data_to_write = null
- var/accepting_refs = FALSE
- var/detail_color = COLOR_ASSEMBLY_WHITE
- var/list/color_list = list(
- "black" = COLOR_ASSEMBLY_BLACK,
- "gray" = COLOR_FLOORTILE_GRAY,
- "machine gray" = COLOR_ASSEMBLY_BGRAY,
- "white" = COLOR_ASSEMBLY_WHITE,
- "red" = COLOR_ASSEMBLY_RED,
- "orange" = COLOR_ASSEMBLY_ORANGE,
- "beige" = COLOR_ASSEMBLY_BEIGE,
- "brown" = COLOR_ASSEMBLY_BROWN,
- "gold" = COLOR_ASSEMBLY_GOLD,
- "yellow" = COLOR_ASSEMBLY_YELLOW,
- "gurkha" = COLOR_ASSEMBLY_GURKHA,
- "light green" = COLOR_ASSEMBLY_LGREEN,
- "green" = COLOR_ASSEMBLY_GREEN,
- "light blue" = COLOR_ASSEMBLY_LBLUE,
- "blue" = COLOR_ASSEMBLY_BLUE,
- "purple" = COLOR_ASSEMBLY_PURPLE
- )
-
-/obj/item/integrated_electronics/detailer/Initialize()
- .=..()
- update_icon()
-
-/obj/item/integrated_electronics/detailer/update_icon()
- cut_overlays()
- var/mutable_appearance/detail_overlay = mutable_appearance('icons/obj/assemblies/electronic_tools.dmi', "detailer-color")
- detail_overlay.color = detail_color
- add_overlay(detail_overlay)
-
-/obj/item/integrated_electronics/detailer/attack_self(mob/user)
- var/color_choice = input(user, "Select color.", "Assembly Detailer") as null|anything in color_list
- if(!color_list[color_choice])
- return
- if(!in_range(src, user))
- return
- detail_color = color_list[color_choice]
- update_icon()
diff --git a/code/modules/integrated_electronics/core/helpers.dm b/code/modules/integrated_electronics/core/helpers.dm
deleted file mode 100644
index e9cbb346458d9..0000000000000
--- a/code/modules/integrated_electronics/core/helpers.dm
+++ /dev/null
@@ -1,142 +0,0 @@
-/obj/item/integrated_circuit/proc/setup_io(list/io_list, io_type, list/io_default_list, pin_type)
- var/list/io_list_copy = io_list.Copy()
- io_list.Cut()
- for(var/i in 1 to io_list_copy.len)
- var/io_entry = io_list_copy[i]
- var/default_data = null
- var/io_type_override = null
-
- // Override the default data.
- if(length(io_default_list)) // List containing special pin types that need to be added.
- default_data = io_default_list["[i]"] // This is deliberately text because the index is a number in text form.
-
- // Override the pin type.
- if(io_list_copy[io_entry])
- io_type_override = io_list_copy[io_entry]
-
- if(io_type_override)
- io_list.Add(new io_type_override(src, io_entry, default_data, pin_type,i))
- else
- io_list.Add(new io_type(src, io_entry, default_data, pin_type,i))
-
-
-/obj/item/integrated_circuit/proc/set_pin_data(pin_type, pin_number, datum/new_data)
- if(islist(new_data))
- for(var/i in 1 to length(new_data))
- if (istype(new_data) && !isweakref(new_data))
- new_data[i] = WEAKREF(new_data[i])
- if (istype(new_data) && !isweakref(new_data))
- new_data = WEAKREF(new_data)
- var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
- return pin.write_data_to_pin(new_data)
-
-/obj/item/integrated_circuit/proc/get_pin_data(pin_type, pin_number)
- var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
- return pin.get_data()
-
-/obj/item/integrated_circuit/proc/get_pin_data_as_type(pin_type, pin_number, as_type)
- var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
- return pin.data_as_type(as_type)
-
-/obj/item/integrated_circuit/proc/activate_pin(pin_number)
- var/datum/integrated_io/activate/A = activators[pin_number]
- A.push_data()
-
-/obj/item/integrated_circuit/proc/get_pin_ref(pin_type, pin_number)
- switch(pin_type)
- if(IC_INPUT)
- if(pin_number > inputs.len)
- return
- return inputs[pin_number]
- if(IC_OUTPUT)
- if(pin_number > outputs.len)
- return
- return outputs[pin_number]
- if(IC_ACTIVATOR)
- if(pin_number > activators.len)
- return
- return activators[pin_number]
- return
-
-/datum/integrated_io/proc/get_data()
- if(islist(data))
- for(var/i in 1 to length(data))
- if(isweakref(data[i]))
- data[i] = data[i].resolve()
- if(isweakref(data))
- return data.resolve()
- return data
-
-
-// Returns a list of parameters necessary to locate a pin in the assembly: component number, pin type and pin number
-// Components list can be supplied from the outside, for use in savefiles
-/datum/integrated_io/proc/get_pin_parameters(list/components)
- if(!holder)
- return
-
- if(!components)
- if(!holder.assembly)
- return
- components = holder.assembly.assembly_components
-
- var/component_number = components.Find(holder)
-
- var/list/pin_holder_list
- switch(pin_type)
- if(IC_INPUT)
- pin_holder_list = holder.inputs
- if(IC_OUTPUT)
- pin_holder_list = holder.outputs
- if(IC_ACTIVATOR)
- pin_holder_list = holder.activators
- else
- return
-
- var/pin_number = pin_holder_list.Find(src)
-
- return list(component_number, pin_type, pin_number)
-
-
-// Locates a pin in the assembly when given component number, pin type and pin number
-// Components list can be supplied from the outside, for use in savefiles
-/obj/item/electronic_assembly/proc/get_pin_ref(component_number, pin_type, pin_number, list/components)
- if(!components)
- components = assembly_components
-
- if(component_number > components.len)
- return
-
- var/obj/item/integrated_circuit/component = components[component_number]
- return component.get_pin_ref(pin_type, pin_number)
-
-
-// Same as get_pin_ref, but takes in a list of 3 parameters (same format as get_pin_parameters)
-// and performs extra sanity checks on parameters list and index numbers
-/obj/item/electronic_assembly/proc/get_pin_ref_list(list/parameters, list/components)
- if(!components)
- components = assembly_components
-
- if(!islist(parameters) || parameters.len != 3)
- return
-
- // Those are supposed to be list indexes, check them for sanity
- if(!isnum_safe(parameters[1]) || parameters[1] % 1 || parameters[1] < 1)
- return
-
- if(!isnum_safe(parameters[3]) || parameters[3] % 1 || parameters[3] < 1)
- return
-
- return get_pin_ref(parameters[1], parameters[2], parameters[3], components)
-
-
-
-
-// Used to obfuscate object refs imported/exported as strings.
-// Not very secure, but if someone still finds a way to abuse refs, they deserve it.
-/proc/XorEncrypt(string, key)
- if(!string || !key ||!istext(string)||!istext(key))
- return
- var/r
- for(var/i = 1 to length(string))
- r += ascii2text(text2ascii(string,i) ^ text2ascii(key,((i-1)%length(string))+1))
- return r
diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm
deleted file mode 100644
index 73f64c98f1b17..0000000000000
--- a/code/modules/integrated_electronics/core/integrated_circuit.dm
+++ /dev/null
@@ -1,414 +0,0 @@
-/obj/item/integrated_circuit
- name = "integrated circuit"
- desc = "It's a tiny chip! This one doesn't seem to do much, however."
- icon = 'icons/obj/assemblies/electronic_components.dmi'
- icon_state = "template"
- w_class = WEIGHT_CLASS_TINY
- materials = list() // To be filled later
- var/obj/item/electronic_assembly/assembly // Reference to the assembly holding this circuit, if any.
- var/extended_desc
- var/list/inputs = list()
- var/list/inputs_default = list()// Assoc list which will fill a pin with data upon creation. e.g. "2" = 0 will set input pin 2 to equal 0 instead of null.
- var/list/outputs = list()
- var/list/outputs_default =list()// Ditto, for output.
- var/list/activators = list()
- var/next_use = 0 // Uses world.time
- var/complexity = 1 // This acts as a limitation on building machines, more resource-intensive components cost more 'space'.
- var/size = 1 // This acts as a limitation on building machines, bigger components cost more 'space'. -1 for size 0
- var/cooldown_per_use = 1 // Circuits are limited in how many times they can be work()'d by this variable.
- var/ext_cooldown = 0 // Circuits are limited in how many times they can be work()'d with external world by this variable.
- var/power_draw_per_use = 0 // How much power is drawn when work()'d.
- var/power_draw_idle = 0 // How much power is drawn when doing nothing.
- var/spawn_flags // Used for world initializing, see the #defines above.
- var/action_flags = NONE // Used for telling circuits that can do certain actions from other circuits.
- var/category_text = "NO CATEGORY THIS IS A BUG" // To show up on circuit printer, and perhaps other places.
- var/removable = TRUE // Determines if a circuit is removable from the assembly.
- var/displayed_name = ""
- var/demands_object_input = FALSE
- var/can_input_object_when_closed = FALSE
- var/max_allowed = 0 // The maximum amount of components allowed inside an integrated circuit.
-
-
-/*
- Integrated circuits are essentially modular machines. Each circuit has a specific function, and combining them inside Electronic Assemblies allows
-a creative player the means to solve many problems. Circuits are held inside an electronic assembly, and are wired using special tools.
-*/
-
-/obj/item/integrated_circuit/examine(mob/user)
- interact(user)
- external_examine(user)
- . = ..()
-
-// Can be called via electronic_assembly/attackby()
-/obj/item/integrated_circuit/proc/additem(var/obj/item/I, var/mob/living/user)
- attackby(I, user)
-
-// This should be used when someone is examining while the case is opened.
-/obj/item/integrated_circuit/proc/internal_examine(mob/user)
- to_chat(user, "This board has [inputs.len] input pin\s, [outputs.len] output pin\s and [activators.len] activation pin\s.")
- for(var/k in inputs)
- var/datum/integrated_io/I = k
- if(I.linked.len)
- to_chat(user, "The '[I]' is connected to [I.get_linked_to_desc()].")
- for(var/k in outputs)
- var/datum/integrated_io/O = k
- if(O.linked.len)
- to_chat(user, "The '[O]' is connected to [O.get_linked_to_desc()].")
- for(var/k in activators)
- var/datum/integrated_io/activate/A = k
- if(A.linked.len)
- to_chat(user, "The '[A]' is connected to [A.get_linked_to_desc()].")
- any_examine(user)
- interact(user)
-
-// This should be used when someone is examining from an 'outside' perspective, e.g. reading a screen or LED.
-/obj/item/integrated_circuit/proc/external_examine(mob/user)
- any_examine(user)
-
-/obj/item/integrated_circuit/proc/any_examine(mob/user)
- return
-
-/obj/item/integrated_circuit/proc/attackby_react(var/atom/movable/A,mob/user)
- return
-
-/obj/item/integrated_circuit/proc/sense(var/atom/movable/A,mob/user,prox)
- return
-
-/obj/item/integrated_circuit/proc/check_interactivity(mob/user)
- if(assembly)
- return assembly.check_interactivity(user)
- else
- return user.canUseTopic(src, BE_CLOSE)
-
-/obj/item/integrated_circuit/Initialize()
- . = ..()
- displayed_name = name
- setup_io(inputs, /datum/integrated_io, inputs_default, IC_INPUT)
- setup_io(outputs, /datum/integrated_io, outputs_default, IC_OUTPUT)
- setup_io(activators, /datum/integrated_io/activate, null, IC_ACTIVATOR)
- materials[/datum/material/iron] = w_class * SScircuit.cost_multiplier
-
-
-/obj/item/integrated_circuit/proc/on_data_written() //Override this for special behaviour when new data gets pushed to the circuit.
- return
-
-/obj/item/integrated_circuit/Destroy()
- . = ..()
- QDEL_LIST(inputs)
- QDEL_LIST(outputs)
- QDEL_LIST(activators)
-
-
-/obj/item/integrated_circuit/emp_act(severity)
- for(var/k in inputs)
- var/datum/integrated_io/I = k
- I.scramble()
- for(var/k in outputs)
- var/datum/integrated_io/O = k
- O.scramble()
- for(var/k in activators)
- var/datum/integrated_io/activate/A = k
- A.scramble()
-
-
-/obj/item/integrated_circuit/verb/rename_component()
- set name = "Rename Circuit"
- set category = "Object"
- set desc = "Rename your circuit, useful to stay organized."
-
- var/mob/M = usr
- if(!check_interactivity(M))
- return
-
- var/input = reject_bad_name(stripped_input(M, "What do you want to name this?", "Rename", name), TRUE)
- if(check_interactivity(M))
- if(!input)
- input = name
- if(CHAT_FILTER_CHECK(input))
- to_chat(M, "The circuit name contains prohibited words!")
- return
- to_chat(M, "The circuit '[name]' is now labeled '[input]'.")
- displayed_name = input
-
-/obj/item/integrated_circuit/interact(mob/user)
- ui_interact(user)
-
-/obj/item/integrated_circuit/ui_interact(mob/user)
- . = ..()
- if(!check_interactivity(user))
- return
-
- if(assembly)
- assembly.ui_interact(user, src)
- return
-
- var/table_edge_width = "30%"
- var/table_middle_width = "40%"
-
- var/datum/browser/popup = new(user, "scannernew", name, 800, 630) // Set up the popup browser window
- popup.add_stylesheet("scannernew", 'html/browser/assembly_ui.css')
-
- var/HTML = " \
- \
-
Complexity: [complexity] \ - Cooldown per use: [cooldown_per_use/10] sec \ - [max_allowed ? " Maximum per circuit: [max_allowed]" : ""]" - - if(ext_cooldown) - HTML += " External manipulation cooldown: [ext_cooldown/10] sec" - if(power_draw_idle) - HTML += " Power Draw: [power_draw_idle] W (Idle)" - if(power_draw_per_use) - HTML += " Power Draw: [power_draw_per_use] W (Active)" // Borgcode says that powercells' checked_use() takes joules as input. - - HTML += " [extended_desc]" - - popup.set_content(HTML) - popup.open() - -/obj/item/integrated_circuit/Topic(href, href_list) - if(!check_interactivity(usr)) - return - if(..()) - return TRUE - - var/update = TRUE - var/update_to_assembly = FALSE - - var/obj/held_item = usr.get_active_held_item() - - if(href_list["rename"]) - rename_component(usr) - if(assembly) - assembly.add_allowed_scanner(usr.ckey) - - if(href_list["pin"]) - var/datum/integrated_io/pin = locate(href_list["pin"]) in inputs + outputs + activators - if(pin) - var/datum/integrated_io/linked - var/success = TRUE - if(href_list["link"]) - linked = locate(href_list["link"]) in pin.linked - - if(istype(held_item, /obj/item/integrated_electronics) || istype(held_item, /obj/item/multitool)) - update_to_assembly = pin.handle_wire(linked, held_item, href_list["act"], usr) - else - to_chat(usr, "You can't do a whole lot without the proper tools.") - success = FALSE - if(success && assembly) - assembly.add_allowed_scanner(usr.ckey) - - if(href_list["scan"]) - if(istype(held_item, /obj/item/integrated_electronics/debugger)) - var/obj/item/integrated_electronics/debugger/D = held_item - if(D.accepting_refs) - D.afterattack(src, usr, TRUE) - else - to_chat(usr, "The debugger's 'ref scanner' needs to be on.") - else - to_chat(usr, "You need a debugger set to 'ref' mode to do that.") - - if(href_list["return"]) - update_to_assembly = TRUE - - - if(update) - if(assembly && update_to_assembly) - assembly.interact(usr, src) - else - interact(usr) // To refresh the UI. - -/obj/item/integrated_circuit/proc/push_data() - for(var/k in outputs) - var/datum/integrated_io/O = k - O.push_data() - -/obj/item/integrated_circuit/proc/pull_data() - for(var/k in inputs) - var/datum/integrated_io/I = k - I.push_data() - -/obj/item/integrated_circuit/proc/draw_idle_power() - if(assembly) - return assembly.draw_power(power_draw_idle) - -// Override this for special behaviour when there's no power left. -/obj/item/integrated_circuit/proc/power_fail() - return - -// Returns true if there's enough power to work(). -/obj/item/integrated_circuit/proc/check_power() - if(!assembly) - return FALSE // Not in an assembly, therefore no power. - if(assembly.draw_power(power_draw_per_use)) - return TRUE // Battery has enough. - return FALSE // Not enough power. - -/obj/item/integrated_circuit/proc/check_then_do_work(ord,var/ignore_power = FALSE) - if(world.time < next_use) // All intergrated circuits have an internal cooldown, to protect from spam. - return FALSE - if(assembly && ext_cooldown && (world.time < assembly.ext_next_use)) // Some circuits have external cooldown, to protect from spam. - return FALSE - if(power_draw_per_use && !ignore_power) - if(!check_power()) - power_fail() - return FALSE - next_use = world.time + cooldown_per_use - if(assembly) - assembly.ext_next_use = world.time + ext_cooldown - do_work(ord) - return TRUE - -/obj/item/integrated_circuit/proc/do_work(ord) - return - -/obj/item/integrated_circuit/proc/disconnect_all() - var/datum/integrated_io/I - - for(var/i in inputs) - I = i - I.disconnect_all() - - for(var/i in outputs) - I = i - I.disconnect_all() - - for(var/i in activators) - I = i - I.disconnect_all() - -/obj/item/integrated_circuit/proc/ext_moved(oldLoc, dir) - return - - -// Returns the object that is supposed to be used in attack messages, location checks, etc. -/obj/item/integrated_circuit/proc/get_object() - // If the component is located in an assembly, let assembly determine it. - if(assembly) - return assembly.get_object() - else - return src // If not, the component is acting on its own. - - -// Returns the location to be used for dropping items. -// Same as the regular drop_location(), but with proc being run on assembly if there is any. -/obj/item/integrated_circuit/drop_location() - // If the component is located in an assembly, let the assembly figure that one out. - if(assembly) - return assembly.drop_location() - else - return ..() // If not, the component is acting on its own. - - -// Checks if the target object is reachable. Useful for various manipulators and manipulator-like objects. -/obj/item/integrated_circuit/proc/check_target(atom/target, exclude_contents = FALSE, exclude_components = FALSE, exclude_self = FALSE) - if(!target) - return FALSE - - var/atom/movable/acting_object = get_object() - - if(exclude_self && target == acting_object) - return FALSE - - if(exclude_components && assembly) - if(target in assembly.assembly_components) - return FALSE - - if(target == assembly.battery) - return FALSE - - if(target.Adjacent(acting_object) && isturf(target.loc)) - return TRUE - - if(!exclude_contents && (target in acting_object.GetAllContents())) - return TRUE - - if(target in acting_object.loc) - return TRUE - - return FALSE diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm deleted file mode 100644 index ad0f800b91631..0000000000000 --- a/code/modules/integrated_electronics/core/pins.dm +++ /dev/null @@ -1,216 +0,0 @@ -/* - Pins both hold data for circuits, as well move data between them. Some also cause circuits to do their function. DATA_CHANNEL pins are the data holding/moving kind, -where as PULSE_CHANNEL causes circuits to work() when their pulse hits them. -A visualization of how pins work is below. Imagine the below image involves an addition circuit. -When the bottom pin, the activator, receives a pulse, all the numbers on the left (input) get added, and the answer goes on the right side (output). -Inputs Outputs -A [2]\ /[8] result -B [1]-\|++|/ -C [4]-/|++| -D [1]/ || - || - Activator -*/ -/datum/integrated_io - var/name = "input/output" - var/obj/item/integrated_circuit/holder - var/datum/weakref/data // This is a weakref, to reduce typecasts. Note that oftentimes numbers and text may also occupy this. - var/list/linked = list() - var/io_type = DATA_CHANNEL - var/pin_type // IC_INPUT, IC_OUTPUT, IC_ACTIVATOR - used in saving assembly wiring - var/ord - -/datum/integrated_io/New(loc, _name, _data, _pin_type,_ord) - name = _name - if(!isnull(_data)) - data = _data - if(_pin_type) - pin_type = _pin_type - if(_ord) - ord = _ord - - holder = loc - - if(!istype(holder)) - message_admins("ERROR: An integrated_io ([name]) spawned without a valid holder! This is a bug.") - -/datum/integrated_io/Destroy() - disconnect_all() - data = null - holder = null - return ..() - -/datum/integrated_io/proc/data_as_type(var/as_type) - if(!isweakref(data)) - return - var/datum/weakref/w = data - var/output = w.resolve() - return istype(output, as_type) ? output : null - -/datum/integrated_io/proc/display_data(var/input) - if(isnull(input)) - return "(null)" // Empty data means nothing to show. - - if(istext(input)) - return "(\"[input]\")" // Wraps the 'string' in escaped quotes, so that people know it's a 'string'. - - if(islist(input)) - var/list/my_list = input - var/result = "list\[[my_list.len]\](" - if(my_list.len) - result += " " - var/pos = 0 - for(var/line in my_list) - result += "[display_data(line)]" - pos++ - if(pos != my_list.len) - result += ", " - result += " " - result += ")" - return result - - if(isweakref(input)) - var/datum/weakref/w = input - var/atom/A = w.resolve() - return A ? "([A.name] \[Ref\])" : "(null)" // For refs, we want just the name displayed. - - return "([input])" // Nothing special needed for numbers or other stuff. - -/datum/integrated_io/activate/display_data() - return "(\[pulse\])" - -/datum/integrated_io/proc/display_pin_type() - return IC_FORMAT_ANY - -/datum/integrated_io/activate/display_pin_type() - return IC_FORMAT_PULSE - -/datum/integrated_io/proc/scramble() - if(isnull(data)) - return - if(isnum_safe(data)) - write_data_to_pin(rand(-10000, 10000)) - if(istext(data)) - write_data_to_pin("ERROR") - push_data() - -/datum/integrated_io/activate/scramble() - push_data() - -/datum/integrated_io/proc/handle_wire(datum/integrated_io/linked_pin, obj/item/tool, action, mob/living/user) - if(tool.tool_behaviour == TOOL_MULTITOOL) - if(!tool.multitool_check_buffer(user, tool)) - return - var/obj/item/multitool/multitool = tool - switch(action) - if("wire") - multitool.wire(src, user) - return TRUE - if("unwire") - if(linked_pin) - multitool.unwire(src, linked_pin, user) - return TRUE - if("data") - ask_for_pin_data(user) - return TRUE - - else if(istype(tool, /obj/item/integrated_electronics/wirer)) - var/obj/item/integrated_electronics/wirer/wirer = tool - if(linked_pin) - wirer.wire(linked_pin, user) - else - wirer.wire(src, user) - - else if(istype(tool, /obj/item/integrated_electronics/debugger)) - var/obj/item/integrated_electronics/debugger/debugger = tool - debugger.write_data(src, user) - return TRUE - - return FALSE - -/datum/integrated_io/proc/write_data_to_pin(new_data) - if(isnull(new_data) || isnum_safe(new_data) || istext(new_data) || isweakref(new_data)) - data = new_data - holder.on_data_written() - else if(islist(new_data)) - var/list/new_list = new_data - data = new_list.Copy(max(1,new_list.len - IC_MAX_LIST_LENGTH+1),0) - holder.on_data_written() - -/datum/integrated_io/proc/push_data() - for(var/k in 1 to linked.len) - var/datum/integrated_io/io = linked[k] - io.write_data_to_pin(data) - -/datum/integrated_io/activate/push_data() - for(var/k in 1 to linked.len) - var/datum/integrated_io/io = linked[k] - io.holder.check_then_do_work(io.ord) - -/datum/integrated_io/proc/pull_data() - for(var/k in 1 to linked.len) - var/datum/integrated_io/io = linked[k] - write_data_to_pin(io.data) - -/datum/integrated_io/proc/get_linked_to_desc() - if(linked.len) - return "the [english_list(linked)]" - return "nothing" - - -/datum/integrated_io/proc/connect_pin(datum/integrated_io/pin) - pin.linked |= src - linked |= pin - -// Iterates over every linked pin and disconnects them. -/datum/integrated_io/proc/disconnect_all() - for(var/pin in linked) - disconnect_pin(pin) - -/datum/integrated_io/proc/disconnect_pin(datum/integrated_io/pin) - pin.linked.Remove(src) - linked.Remove(pin) - - -/datum/integrated_io/proc/ask_for_data_type(mob/user, var/default, var/list/allowed_data_types = list("string","number","null")) - var/type_to_use = input("Please choose a type to use.","[src] type setting") as null|anything in allowed_data_types - if(!holder.check_interactivity(user)) - return - - var/new_data = null - switch(type_to_use) - if("string") - new_data = stripped_multiline_input(user, "Now type in a string.","[src] string writing", istext(default) ? default : null, no_trim = TRUE) - if(istext(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input "+new_data+" into the pin.") - return new_data - if("number") - new_data = input("Now type in a number.","[src] number writing", isnum_safe(default) ? default : null) as null|num - if(isnum_safe(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") - return new_data - if("null") - if(holder.check_interactivity(user)) - to_chat(user, "You clear the pin's memory.") - return new_data - -// Basically a null check -/datum/integrated_io/proc/is_valid() - return !isnull(data) - -// This proc asks for the data to write, then writes it. -/datum/integrated_io/proc/ask_for_pin_data(mob/user) - var/new_data = ask_for_data_type(user) - write_data_to_pin(new_data) - -/datum/integrated_io/activate/ask_for_pin_data(mob/user) // This just pulses the pin. - holder.investigate_log(" was manually pulsed by [key_name(user)].", INVESTIGATE_CIRCUIT) - holder.check_then_do_work(ord,ignore_power = TRUE) - to_chat(user, "You pulse \the [holder]'s [src] pin.") - -/datum/integrated_io/activate - name = "activation pin" - io_type = PULSE_CHANNEL - -/datum/integrated_io/activate/out // All this does is just make the UI say 'out' instead of 'in' - data = 1 diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm deleted file mode 100644 index 9d22cf8cc3805..0000000000000 --- a/code/modules/integrated_electronics/core/printer.dm +++ /dev/null @@ -1,351 +0,0 @@ -#define MAX_CIRCUIT_CLONE_TIME 3 MINUTES //circuit slow-clones can only take up this amount of time to complete - -/obj/item/integrated_circuit_printer - name = "integrated circuit printer" - desc = "A portable(ish) machine made to print tiny modular circuitry out of iron." - icon = 'icons/obj/assemblies/electronic_tools.dmi' - icon_state = "circuit_printer" - w_class = WEIGHT_CLASS_BULKY - var/upgraded = FALSE // When hit with an upgrade disk, will turn true, allowing it to print the higher tier circuits. - var/can_clone = TRUE // Allows the printer to clone circuits, either instantly or over time depending on upgrade. Set to FALSE to disable entirely. - var/fast_clone = FALSE // If this is false, then cloning will take an amount of deciseconds equal to the iron cost divided by 100. - var/debug = FALSE // If it's upgraded and can clone, even without config settings. - var/current_category = null - var/cloning = FALSE // If the printer is currently creating a circuit - var/recycling = FALSE // If an assembly is being emptied into this printer - var/list/program // Currently loaded save, in form of list - var/datum/weakref/idlock = null - -/obj/item/integrated_circuit_printer/proc/check_interactivity(mob/user) - return user.canUseTopic(src, BE_CLOSE) - -/obj/item/integrated_circuit_printer/upgraded - upgraded = TRUE - can_clone = TRUE - fast_clone = TRUE - -/obj/item/integrated_circuit_printer/debug //translation: "integrated_circuit_printer/local_server" - name = "debug circuit printer" - debug = TRUE - upgraded = TRUE - can_clone = TRUE - fast_clone = TRUE - w_class = WEIGHT_CLASS_TINY - -/obj/item/integrated_circuit_printer/Initialize() - . = ..() - AddComponent(/datum/component/material_container, list(/datum/material/iron), MINERAL_MATERIAL_AMOUNT * 25, TRUE, list(/obj/item/stack, /obj/item/integrated_circuit, /obj/item/electronic_assembly)) - -/obj/item/integrated_circuit_printer/proc/print_program(mob/user) - if(!cloning) - return - - visible_message("[src] has finished printing its assembly!") - playsound(src, 'sound/items/poster_being_created.ogg', 50, TRUE) - var/obj/item/electronic_assembly/assembly = SScircuit.load_electronic_assembly(get_turf(src), program) - if(idlock) - assembly.idlock = idlock - assembly.creator = key_name(user) - assembly.investigate_log("was printed by [assembly.creator].", INVESTIGATE_CIRCUIT) - cloning = FALSE - -/obj/item/integrated_circuit_printer/attackby(obj/item/O, mob/user) - if(istype(O, /obj/item/disk/integrated_circuit/upgrade/advanced)) - if(upgraded) - to_chat(user, "[src] already has this upgrade. ") - return TRUE - to_chat(user, "You install [O] into [src]. ") - upgraded = TRUE - return TRUE - - if(istype(O, /obj/item/disk/integrated_circuit/upgrade/clone)) - if(fast_clone) - to_chat(user, "[src] already has this upgrade. ") - return TRUE - to_chat(user, "You install [O] into [src]. Circuit cloning will now be instant. ") - fast_clone = TRUE - return TRUE - - if(istype(O, /obj/item/electronic_assembly)) - var/obj/item/electronic_assembly/EA = O //microtransactions not included - if(EA.assembly_components.len) - if(recycling) - return - if(!EA.opened) - to_chat(user, "You can't reach [EA]'s components to remove them!") - return - if(EA.battery) - to_chat(user, "Remove [EA]'s power cell first!") - return - for(var/V in EA.assembly_components) - var/obj/item/integrated_circuit/IC = V - if(!IC.removable) - to_chat(user, "[EA] has irremovable components in the casing, preventing you from emptying it.") - return - to_chat(user, "You begin recycling [EA]'s components...") - playsound(src, 'sound/items/electronic_assembly_emptying.ogg', 50, TRUE) - if(!do_after(user, 30, target = src) || recycling) //short channel so you don't accidentally start emptying out a complex assembly - return - recycling = TRUE - var/datum/component/material_container/mats = GetComponent(/datum/component/material_container) - for(var/V in EA.assembly_components) - var/obj/item/integrated_circuit/IC = V - if(!mats.has_space(mats.get_item_material_amount(IC))) - to_chat(user, "[src] can't hold any more materials!") - break - if(!do_after(user, 5, target = user)) - recycling = FALSE - return - playsound(src, 'sound/items/crowbar.ogg', 50, TRUE) - if(EA.try_remove_component(IC, user, TRUE)) - mats.user_insert(IC, user) - to_chat(user, "You recycle all the components[EA.assembly_components.len ? " you could " : " "]from [EA]!") - playsound(src, 'sound/items/electronic_assembly_empty.ogg', 50, TRUE) - recycling = FALSE - return TRUE - - if(istype(O, /obj/item/integrated_electronics/debugger)) - var/obj/item/integrated_electronics/debugger/debugger = O - if(!debugger.idlock) - return - - if(!idlock) - idlock = debugger.idlock - debugger.idlock = null - to_chat(user, "You set \the [src] to print out id-locked assemblies only.") - return - - if(debugger.idlock.resolve() == idlock.resolve()) - idlock = null - debugger.idlock = null - to_chat(user, "You reset \the [src]'s protection settings.") - return - - return ..() - -/obj/item/integrated_circuit_printer/attack_self(mob/user) - interact(user) - -/obj/item/integrated_circuit_printer/interact(mob/user) - if(!(in_range(src, user) || issilicon(user))) - return - - if(isnull(current_category)) - current_category = SScircuit.circuit_fabricator_recipe_list[1] - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - - //Preparing the browser - var/datum/browser/popup = new(user, "printernew", "Integrated Circuit Printer", 800, 630) // Set up the popup browser window - - var/HTML = " Integrated Circuit Printer" - if(debug) - HTML += " DEBUG PRINTER -- Infinite materials. Cloning available." - - HTML += "Identity-lock: " - if(idlock) - var/obj/item/card/id = idlock.resolve() - HTML+= "[id.name] | Reset " - else - HTML += "None | Reset " - - if(CONFIG_GET(flag/ic_printing) || debug) - HTML += "Assembly cloning: [can_clone ? (fast_clone ? "Instant" : "Available") : "Unavailable"]. " - - HTML += "Circuits available: [upgraded || debug ? "Advanced":"Regular"]." - if(!upgraded) - HTML += " Crossed out circuits mean that the printer is not sufficiently upgraded to create that circuit." - - HTML += " " - if((can_clone && CONFIG_GET(flag/ic_printing)) || debug) - HTML += "Here you can load script for your assembly. " - if(!cloning) - HTML += " Load Program " - else - HTML += " Load Program" - if(!program) - HTML += " [fast_clone ? "Print" : "Begin Printing"] Assembly" - else if(cloning) - HTML += " Cancel Print" - else - HTML += " [fast_clone ? "Print" : "Begin Printing"] Assembly" - - HTML += " " - HTML += "Categories:" - for(var/category in SScircuit.circuit_fabricator_recipe_list) - if(category != current_category) - HTML += " [category] " - else // Bold the button if it's already selected. - HTML += " [category] " - HTML += " " - HTML += " [current_category]" - else - HTML += " " - - popup.set_content(HTML) - popup.open() - -/obj/item/integrated_circuit_printer/Topic(href, href_list) - if(!check_interactivity(usr)) - return - if(..()) - return TRUE - add_fingerprint(usr) - - if(href_list["id-lock"]) - idlock = null - - if(href_list["category"]) - current_category = href_list["category"] - - if(href_list["build"]) - var/build_type = text2path(href_list["build"]) - if(!build_type || !ispath(build_type)) - return TRUE - - var/cost = 400 - if(ispath(build_type, /obj/item/electronic_assembly)) - var/obj/item/electronic_assembly/E = SScircuit.cached_assemblies[build_type] - cost = E.materials[/datum/material/iron] - else if(ispath(build_type, /obj/item/integrated_circuit)) - var/obj/item/integrated_circuit/IC = SScircuit.cached_components[build_type] - cost = IC.materials[/datum/material/iron] - else if(!(build_type in SScircuit.circuit_fabricator_recipe_list["Tools"])) - log_href_exploit(usr) - return - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - - if(!debug && !materials.use_amount_mat(cost, /datum/material/iron)) - to_chat(usr, "You need [cost] iron to build that!") - return TRUE - - var/obj/item/built = new build_type(drop_location()) - usr.put_in_hands(built) - - if(istype(built, /obj/item/electronic_assembly)) - var/obj/item/electronic_assembly/E = built - E.creator = key_name(usr) - E.opened = TRUE - E.update_icon() - //reupdate diagnostic hud because it was put_in_hands() and not pickup()'ed - E.diag_hud_set_circuithealth() - E.diag_hud_set_circuitcell() - E.diag_hud_set_circuitstat() - E.diag_hud_set_circuittracking() - E.investigate_log("was printed by [E.creator].", INVESTIGATE_CIRCUIT) - - to_chat(usr, "[capitalize(built.name)] printed.") - playsound(src, 'sound/items/jaws_pry.ogg', 50, TRUE) - - if(href_list["print"]) - if(!CONFIG_GET(flag/ic_printing) && !debug) - to_chat(usr, "CentCom has disabled printing of custom circuitry due to recent allegations of copyright infringement.") - return - if(!can_clone) // Copying and printing ICs is cloning - to_chat(usr, "This printer does not have the cloning upgrade.") - return - switch(href_list["print"]) - if("load") - if(cloning) - return - var/input = capped_multiline_input(usr, "Put your code there:", "loading", max_length = MAX_SIZE_CIRCUIT) - if(!check_interactivity(usr) || cloning) - return - if(!input) - program = null - return - - var/validation = SScircuit.validate_electronic_assembly(input) - - // Validation error codes are returned as text. - if(istext(validation)) - to_chat(usr, "Error: [validation]") - return - else if(islist(validation)) - program = validation - to_chat(usr, "This is a valid program for [program["assembly"]["type"]].") - if(program["requires_upgrades"]) - if(upgraded) - to_chat(usr, "It uses advanced component designs.") - else - to_chat(usr, "It uses unknown component designs. Printer upgrade is required to proceed.") - if(program["unsupported_circuit"]) - to_chat(usr, "This program uses components not supported by the specified assembly. Please change the assembly type in the save file to a supported one.") - to_chat(usr, "Used space: [program["used_space"]]/[program["max_space"]].") - to_chat(usr, "Complexity: [program["complexity"]]/[program["max_complexity"]].") - to_chat(usr, "Iron cost: [program["iron_cost"]].") - - if("print") - if(!program || cloning) - return - - if(program["requires_upgrades"] && !upgraded && !debug) - to_chat(usr, "This program uses unknown component designs. Printer upgrade is required to proceed.") - return - if(program["unsupported_circuit"] && !debug) - to_chat(usr, "This program uses components not supported by the specified assembly. Please change the assembly type in the save file to a supported one.") - return - else if(fast_clone) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - if(debug || materials.use_amount_mat(program["iron_cost"], /datum/material/iron)) - cloning = TRUE - print_program(usr) - else - to_chat(usr, "You need [program["iron_cost"]] iron to build that!") - else - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - if(!materials.use_amount_mat(program["iron_cost"], /datum/material/iron)) - to_chat(usr, "You need [program["iron_cost"]] iron to build that!") - return - var/cloning_time = round(program["iron_cost"] / 15) - cloning_time = min(cloning_time, MAX_CIRCUIT_CLONE_TIME) - cloning = TRUE - to_chat(usr, "You begin printing a custom assembly. This will take approximately [DisplayTimeText(cloning_time)]. You can still print \ - off normal parts during this time.") - playsound(src, 'sound/items/poster_being_created.ogg', 50, TRUE) - addtimer(CALLBACK(src, .proc/print_program, usr), cloning_time) - - if("cancel") - if(!cloning || !program) - return - - to_chat(usr, "Cloning has been canceled. Iron cost has been refunded.") - cloning = FALSE - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.use_amount_mat(-program["iron_cost"], /datum/material/iron) //use negative amount to regain the cost - - - interact(usr) - - -// FUKKEN UPGRADE DISKS -/obj/item/disk/integrated_circuit/upgrade - name = "integrated circuit printer upgrade disk" - desc = "Install this into your integrated circuit printer to enhance it." - icon = 'icons/obj/assemblies/electronic_tools.dmi' - icon_state = "upgrade_disk" - item_state = "card-id" - w_class = WEIGHT_CLASS_SMALL - -/obj/item/disk/integrated_circuit/upgrade/advanced - name = "integrated circuit printer upgrade disk - advanced designs" - desc = "Install this into your integrated circuit printer to enhance it. This one adds new, advanced designs to the printer." - -/obj/item/disk/integrated_circuit/upgrade/clone - name = "integrated circuit printer upgrade disk - instant cloner" - desc = "Install this into your integrated circuit printer to enhance it. This one allows the printer to duplicate assemblies instantaneously." - icon_state = "upgrade_disk_clone" diff --git a/code/modules/integrated_electronics/core/saved_circuits.dm b/code/modules/integrated_electronics/core/saved_circuits.dm deleted file mode 100644 index ab9fbcacd2c78..0000000000000 --- a/code/modules/integrated_electronics/core/saved_circuits.dm +++ /dev/null @@ -1,361 +0,0 @@ -// Helpers for saving/loading integrated circuits. - - -// Saves type, modified name and modified inputs (if any) to a list -// The list is converted to JSON down the line. -//"Special" is not verified at any point except for by the circuit itself. -/obj/item/integrated_circuit/proc/save() - var/list/component_params = list() - var/init_name = initial(name) - - // Save initial name used for differentiating assemblies - component_params["type"] = init_name - - // Save the modified name. - if(init_name != displayed_name) - component_params["name"] = displayed_name - - // Saving input values - if(length(inputs)) - var/list/saved_inputs = list() - - for(var/index in 1 to inputs.len) - var/datum/integrated_io/input = inputs[index] - - // Don't waste space saving the default values - if(input.data == inputs_default["[index]"]) - continue - if(input.data == initial(input.data)) - continue - - var/list/input_value = list(index, FALSE, input.data) - // Index, Type, Value - // FALSE is default type used for num/text/list/null - // TODO: support for special input types, such as internal refs and maybe typepaths - - if(islist(input.data) || isnum_safe(input.data) || istext(input.data) || isnull(input.data)) - saved_inputs.Add(list(input_value)) - - if(saved_inputs.len) - component_params["inputs"] = saved_inputs - - var/special = save_special() - if(!isnull(special)) - component_params["special"] = special - - return component_params - -/obj/item/integrated_circuit/proc/save_special() - return - -// Verifies a list of component parameters -// Returns null on success, error name on failure -/obj/item/integrated_circuit/proc/verify_save(list/component_params) - var/init_name = initial(name) - // Validate name - if(component_params["name"] && !reject_bad_name(component_params["name"], TRUE)) - return "Bad component name at [init_name]." - - // Validate input values - if(component_params["inputs"]) - var/list/loaded_inputs = component_params["inputs"] - if(!islist(loaded_inputs)) - return "Malformed input values list at [init_name]." - - var/inputs_amt = length(inputs) - - // Too many inputs? Inputs for input-less component? This is not good. - if(!inputs_amt || inputs_amt < length(loaded_inputs)) - return "Input values list out of bounds at [init_name]." - - for(var/list/input in loaded_inputs) - if(input.len != 3) - return "Malformed input data at [init_name]." - - var/input_id = input[1] - var/input_type = input[2] - //var/input_value = input[3] - - // No special type support yet. - if(input_type) - return "Unidentified input type at [init_name]!" - // TODO: support for special input types, such as typepaths and internal refs - - // Input ID is a list index, make sure it's sane. - if(!isnum_safe(input_id) || input_id % 1 || input_id > inputs_amt || input_id < 1) - return "Invalid input index at [init_name]." - - -// Loads component parameters from a list -// Doesn't verify any of the parameters it loads, this is the job of verify_save() -/obj/item/integrated_circuit/proc/load(list/component_params) - // Load name - if(component_params["name"]) - displayed_name = component_params["name"] - - // Load input values - if(component_params["inputs"]) - var/list/loaded_inputs = component_params["inputs"] - - for(var/list/input in loaded_inputs) - var/index = input[1] - //var/input_type = input[2] - var/input_value = input[3] - - var/datum/integrated_io/pin = inputs[index] - // The pins themselves validate the data. - pin.write_data_to_pin(input_value) - // TODO: support for special input types, such as internal refs and maybe typepaths - - if(!isnull(component_params["special"])) - load_special(component_params["special"]) - -/obj/item/integrated_circuit/proc/load_special(special_data) - return - -// Saves type and modified name (if any) to a list -// The list is converted to JSON down the line. -/obj/item/electronic_assembly/proc/save() - var/list/assembly_params = list() - - // Save initial name used for differentiating assemblies - assembly_params["type"] = initial(name) - - // Save modified name - if(initial(name) != name) - assembly_params["name"] = name - - // Save modified description - if(initial(desc) != desc) - assembly_params["desc"] = desc - - // Save modified color - if(initial(detail_color) != detail_color) - assembly_params["detail_color"] = detail_color - - return assembly_params - - -// Verifies a list of assembly parameters -// Returns null on success, error name on failure -/obj/item/electronic_assembly/proc/verify_save(list/assembly_params) - // Validate name and color - if(assembly_params["name"] && !reject_bad_name(assembly_params["name"], TRUE)) - return "Bad assembly name." - if(assembly_params["desc"] && !reject_bad_text(assembly_params["desc"])) - return "Bad assembly description." - -// Loads assembly parameters from a list -// Doesn't verify any of the parameters it loads, this is the job of verify_save() -/obj/item/electronic_assembly/proc/load(list/assembly_params) - // Load modified name, if any. - if(assembly_params["name"]) - name = assembly_params["name"] - - // Load modified description, if any. - if(assembly_params["desc"]) - desc = assembly_params["desc"] - - if(assembly_params["detail_color"]) - detail_color = assembly_params["detail_color"] - - update_icon() - - - -// Attempts to save an assembly into a save file format. -// Returns null if assembly is not complete enough to be saved. -/datum/controller/subsystem/processing/circuit/proc/save_electronic_assembly(obj/item/electronic_assembly/assembly) - // No components? Don't even try to save it. - if(!length(assembly.assembly_components)) - return - - - var/list/blocks = list() - - // Block 1. Assembly. - blocks["assembly"] = assembly.save() - // (implant assemblies are not yet supported) - - - // Block 2. Components. - var/list/components = list() - for(var/c in assembly.assembly_components) - var/obj/item/integrated_circuit/component = c - components.Add(list(component.save())) - blocks["components"] = components - - - // Block 3. Wires. - var/list/wires = list() - var/list/saved_wires = list() - - for(var/c in assembly.assembly_components) - var/obj/item/integrated_circuit/component = c - var/list/all_pins = component.inputs + component.outputs + component.activators - - for(var/p in all_pins) - var/datum/integrated_io/pin = p - var/list/params = pin.get_pin_parameters() - var/text_params = params.Join() - - for(var/p2 in pin.linked) - var/datum/integrated_io/pin2 = p2 - var/list/params2 = pin2.get_pin_parameters() - var/text_params2 = params2.Join() - - // Check if we already saved an opposite version of this wire - // (do not save the same wire twice) - if((text_params2 + "=" + text_params) in saved_wires) - continue - - // If not, add a wire "hash" for future checks and save it - saved_wires.Add(text_params + "=" + text_params2) - wires.Add(list(list(params, params2))) - - if(wires.len) - blocks["wires"] = wires - - return json_encode(blocks) - - - -// Checks assembly save and calculates some of the parameters. -// Returns assembly (type: list) if the save is valid. -// Returns error code (type: text) if loading has failed. -// The following parameters area calculated during validation and added to the returned save list: -// "requires_upgrades", "unsupported_circuit", "iron_cost", "complexity", "max_complexity", "used_space", "max_space" -/datum/controller/subsystem/processing/circuit/proc/validate_electronic_assembly(program) - var/list/blocks = json_decode(program) - if(!blocks) - return - - var/error - - - // Block 1. Assembly. - var/list/assembly_params = blocks["assembly"] - - if(!islist(assembly_params) || !length(assembly_params)) - return "Invalid assembly data." // No assembly, damaged assembly or empty assembly - - // Validate type, get a temporary component - var/assembly_path = all_assemblies[assembly_params["type"]] - var/obj/item/electronic_assembly/assembly = cached_assemblies[assembly_path] - if(!assembly) - return "Invalid assembly type." - - // Check assembly save data for errors - error = assembly.verify_save(assembly_params) - if(error) - return error - - - // Read space & complexity limits and start keeping track of them - blocks["complexity"] = 0 - blocks["max_complexity"] = assembly.max_complexity - blocks["used_space"] = 0 - blocks["max_space"] = assembly.max_components - - // Start keeping track of total iron cost - blocks["iron_cost"] = assembly.materials[/datum/material/iron] - - - // Block 2. Components. - if(!islist(blocks["components"]) || !length(blocks["components"])) - return "Invalid components list." // No components or damaged components list - - var/list/assembly_components = list() - for(var/C in blocks["components"]) - var/list/component_params = C - - if(!islist(component_params) || !length(component_params)) - return "Invalid component data." - - // Validate type, get a temporary component - var/component_path = all_components[component_params["type"]] - var/obj/item/integrated_circuit/component = cached_components[component_path] - if(!component) - return "Invalid component type." - - // Add temporary component to assembly_components list, to be used later when verifying the wires - assembly_components.Add(component) - - // Check component save data for errors - error = component.verify_save(component_params) - if(error) - return error - - // Update estimated assembly complexity, taken space and material cost - blocks["complexity"] += component.complexity - blocks["used_space"] += component.size - blocks["iron_cost"] += component.materials[/datum/material/iron] - - // Check if the assembly requires printer upgrades - if(!(component.spawn_flags & IC_SPAWN_DEFAULT)) - blocks["requires_upgrades"] = TRUE - - // Check if the assembly supports the circucit - if((component.action_flags & assembly.allowed_circuit_action_flags) != component.action_flags) - blocks["unsupported_circuit"] = TRUE - - - // Check complexity and space limitations - if(blocks["used_space"] > blocks["max_space"]) - return "Used space overflow." - if(blocks["complexity"] > blocks["max_complexity"]) - return "Complexity overflow." - - - // Block 3. Wires. - if(blocks["wires"]) - if(!islist(blocks["wires"])) - return "Invalid wiring list." // Damaged wires list - - for(var/w in blocks["wires"]) - var/list/wire = w - - if(!islist(wire) || wire.len != 2) - return "Invalid wire data." - - var/datum/integrated_io/IO = assembly.get_pin_ref_list(wire[1], assembly_components) - var/datum/integrated_io/IO2 = assembly.get_pin_ref_list(wire[2], assembly_components) - if(!IO || !IO2) - return "Invalid wire data." - - if(initial(IO.io_type) != initial(IO2.io_type)) - return "Wire type mismatch." - - return blocks - - -// Loads assembly (in form of list) into an object and returns it. -// No sanity checks are performed, save file is expected to be validated by validate_electronic_assembly -/datum/controller/subsystem/processing/circuit/proc/load_electronic_assembly(loc, list/blocks) - - // Block 1. Assembly. - var/list/assembly_params = blocks["assembly"] - var/obj/item/electronic_assembly/assembly_path = all_assemblies[assembly_params["type"]] - var/obj/item/electronic_assembly/assembly = new assembly_path(null) - assembly.load(assembly_params) - - - - // Block 2. Components. - for(var/component_params in blocks["components"]) - var/obj/item/integrated_circuit/component_path = all_components[component_params["type"]] - var/obj/item/integrated_circuit/component = new component_path(assembly) - assembly.add_component(component) - component.load(component_params) - - - // Block 3. Wires. - if(blocks["wires"]) - for(var/w in blocks["wires"]) - var/list/wire = w - var/datum/integrated_io/IO = assembly.get_pin_ref_list(wire[1]) - var/datum/integrated_io/IO2 = assembly.get_pin_ref_list(wire[2]) - IO.connect_pin(IO2) - - assembly.forceMove(loc) - return assembly diff --git a/code/modules/integrated_electronics/core/special_pins/boolean_pin.dm b/code/modules/integrated_electronics/core/special_pins/boolean_pin.dm deleted file mode 100644 index da59434b65349..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/boolean_pin.dm +++ /dev/null @@ -1,26 +0,0 @@ -// These pins only contain 0 or 1. Null is not allowed. -/datum/integrated_io/boolean - name = "boolean pin" - data = FALSE - -/datum/integrated_io/boolean/ask_for_pin_data(mob/user) // 'Ask' is a bit misleading, acts more like a toggle. - var/new_data = !data - to_chat(user, "You switch the data bit to [new_data ? "TRUE" : "FALSE"].") - write_data_to_pin(new_data) - -/datum/integrated_io/boolean/write_data_to_pin(var/new_data) - if(new_data == FALSE || new_data == TRUE) - data = new_data - holder.on_data_written() - -/datum/integrated_io/boolean/scramble() - write_data_to_pin(rand(FALSE,TRUE)) - push_data() - -/datum/integrated_io/boolean/display_pin_type() - return IC_FORMAT_BOOLEAN - -/datum/integrated_io/boolean/display_data(var/input) - if(data) - return "(TRUE)" - return "(FALSE)" diff --git a/code/modules/integrated_electronics/core/special_pins/char_pin.dm b/code/modules/integrated_electronics/core/special_pins/char_pin.dm deleted file mode 100644 index 632ef695218f9..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/char_pin.dm +++ /dev/null @@ -1,27 +0,0 @@ -// These pins can only contain a 1 character string or null. -/datum/integrated_io/char - name = "char pin" - -/datum/integrated_io/char/ask_for_pin_data(mob/user) - var/new_data = stripped_input(user, "Please type in one character.","[src] char writing", no_trim = TRUE) - if(holder.check_interactivity(user) ) - to_chat(user, "You input [new_data ? "new_data" : "NULL"] into the pin.") - write_data_to_pin(new_data) - -/datum/integrated_io/char/write_data_to_pin(var/new_data) - if(isnull(new_data) || istext(new_data)) - if(length(new_data) > 1) - return - data = new_data - holder.on_data_written() - -// This makes the text go from "A" to "%". -/datum/integrated_io/char/scramble() - if(!is_valid()) - return - var/list/options = list("!","@","#","$","%","^","&","*","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z") - data = pick(options) - push_data() - -/datum/integrated_io/char/display_pin_type() - return IC_FORMAT_CHAR diff --git a/code/modules/integrated_electronics/core/special_pins/color_pin.dm b/code/modules/integrated_electronics/core/special_pins/color_pin.dm deleted file mode 100644 index e2a09657dff64..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/color_pin.dm +++ /dev/null @@ -1,49 +0,0 @@ -// These pins can only contain a color (in the form of #FFFFFF) or null. -/datum/integrated_io/color - name = "color pin" - -/datum/integrated_io/color/ask_for_pin_data(mob/user) - var/new_data = input("Please select a color.","[src] color writing") as color|null - if(holder.check_interactivity(user) ) - to_chat(user, "You input a new color into the pin.") - write_data_to_pin(new_data) - -/datum/integrated_io/color/write_data_to_pin(var/new_data) - // Since this is storing the color as a string hex color code, we need to make sure it's actually one. - if(isnull(new_data) || istext(new_data)) - if(istext(new_data)) - new_data = uppertext(new_data) - if(length(new_data) != 7) // We can hex if we want to, we can leave your strings behind - return // Cause your strings don't hex and if they don't hex - var/friends = copytext(new_data, 2, 8) // Well they're are no strings of mine - // I say, we can go where we want to, a place where they will never find - var/safety_dance = 1 - while(safety_dance >= 7) // And we can act like we come from out of this world.log - var/hex = copytext(friends, safety_dance, safety_dance+1) - if(!(hex in list("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"))) - return // Leave the fake one far behind, - safety_dance++ - - data = new_data // And we can hex - holder.on_data_written() - -// This randomizes the color. -/datum/integrated_io/color/scramble() - if(!is_valid()) - return - var/new_data - for(var/i=1;i<=3;i++) - var/temp_col = "[num2hex(rand(0,255), 2)]" - if(length(temp_col )<2) - temp_col = "0[temp_col]" - new_data += temp_col - data = new_data - push_data() - -/datum/integrated_io/color/display_pin_type() - return IC_FORMAT_COLOR - -/datum/integrated_io/color/display_data(var/input) - if(!isnull(data)) - return "([data])" - return ..() diff --git a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm deleted file mode 100644 index 8a2fb61a84f76..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm +++ /dev/null @@ -1,31 +0,0 @@ -// These pins can only contain directions (1,2,4,8...) or null. -/datum/integrated_io/dir - name = "dir pin" - -/datum/integrated_io/dir/ask_for_pin_data(mob/user) - var/new_data = input("Please type in a valid dir number. \ - Valid dirs are;\n\ - North/Fore = [NORTH],\n\ - South/Aft = [SOUTH],\n\ - East/Starboard = [EAST],\n\ - West/Port = [WEST],\n\ - Northeast = [NORTHEAST],\n\ - Northwest = [NORTHWEST],\n\ - Southeast = [SOUTHEAST],\n\ - Southwest = [SOUTHWEST]","[src] dir writing") as null|num - if(isnum_safe(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") - write_data_to_pin(new_data) - -/datum/integrated_io/dir/write_data_to_pin(var/new_data) - if(isnull(new_data) || (new_data in list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)/* + list(UP, DOWN)*/)) - data = new_data - holder.on_data_written() - -/datum/integrated_io/dir/display_pin_type() - return IC_FORMAT_DIR - -/datum/integrated_io/dir/display_data(var/input) - if(!isnull(data)) - return "([dir2text(data)])" - return ..() diff --git a/code/modules/integrated_electronics/core/special_pins/index_pin.dm b/code/modules/integrated_electronics/core/special_pins/index_pin.dm deleted file mode 100644 index 91fd3e7aaebb4..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/index_pin.dm +++ /dev/null @@ -1,21 +0,0 @@ -// These pins can only contain integer numbers between 0 and IC_MAX_LIST_LENGTH. Null is allowed. -/datum/integrated_io/index - name = "index pin" - data = 1 - -/datum/integrated_io/index/ask_for_pin_data(mob/user) - var/new_data = input("Please type in an index.","[src] index writing") as num - if(isnum_safe(new_data) && holder.check_interactivity(user)) - to_chat(user, "You input [new_data] into the pin.") - write_data_to_pin(new_data) - -/datum/integrated_io/index/write_data_to_pin(new_data) - if(isnull(new_data)) - new_data = 0 - - if(isnum_safe(new_data)) - data = CLAMP(round(new_data), 0, IC_MAX_LIST_LENGTH) - holder.on_data_written() - -/datum/integrated_io/index/display_pin_type() - return IC_FORMAT_INDEX diff --git a/code/modules/integrated_electronics/core/special_pins/list_pin.dm b/code/modules/integrated_electronics/core/special_pins/list_pin.dm deleted file mode 100644 index 6437d0869e756..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm +++ /dev/null @@ -1,153 +0,0 @@ -// These pins contain a list. Null is not allowed. -/datum/integrated_io/lists - name = "list pin" - data = list() - -/datum/integrated_io/lists/ask_for_pin_data(mob/user) - interact(user) - -/datum/integrated_io/lists/proc/interact(mob/user) - var/list/my_list = data - var/t = " [src]" - t += "List length: [my_list.len] " - t += "\[Refresh\] | " - t += "\[Add\] | " - t += "\[Remove\] | " - t += "\[Edit\] | " - t += "\[Swap\] | " - t += "\[Clear\] " - t += " " - var/i = 0 - for(var/line in my_list) - i++ - t += "#[i] | [display_data(line)] | " - t += "\[Edit\] | " - t += "\[Remove\] " - user << browse(t, "window=list_pin_[REF(src)];size=500x400") - -/datum/integrated_io/lists/proc/add_to_list(mob/user, var/new_entry) - if(!new_entry && user) - new_entry = ask_for_data_type(user) - if(is_valid(new_entry)) - Add(new_entry) - -/datum/integrated_io/lists/proc/Add(var/new_entry) - var/list/my_list = data - if(my_list.len > IC_MAX_LIST_LENGTH) - my_list.Cut(Start=1,End=2) - my_list.Add(new_entry) - -/datum/integrated_io/lists/proc/remove_from_list_by_position(mob/user, var/position) - var/list/my_list = data - if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to remove.") - return - if(!position) - return - var/target_entry = my_list[position] - if(target_entry) - my_list.Remove(target_entry) - -/datum/integrated_io/lists/proc/remove_from_list(mob/user, var/target_entry) - var/list/my_list = data - if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to remove.") - return - if(!target_entry) - target_entry = input(user, "Which piece of data do you want to remove?", "Remove") as null|anything in my_list - if(holder.check_interactivity(user) && target_entry) - my_list.Remove(target_entry) - -/datum/integrated_io/lists/proc/edit_in_list(mob/user, var/target_entry) - var/list/my_list = data - if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to modify.") - return - if(!target_entry) - target_entry = input(user, "Which piece of data do you want to edit?", "Edit") as null|anything in my_list - if(holder.check_interactivity(user) && target_entry) - var/edited_entry = ask_for_data_type(user, target_entry) - if(edited_entry) - my_list[my_list.Find(target_entry)] = edited_entry - -/datum/integrated_io/lists/proc/edit_in_list_by_position(mob/user, var/position) - var/list/my_list = data - if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to modify.") - return - if(!position) - return - var/target_entry = my_list[position] - if(target_entry) - var/edited_entry = ask_for_data_type(user, target_entry) - if(edited_entry) - my_list[position] = edited_entry - -/datum/integrated_io/lists/proc/swap_inside_list(mob/user, var/first_target, var/second_target) - var/list/my_list = data - if(my_list.len <= 1) - to_chat(user, "The list is empty, or too small to do any meaningful swapping.") - return - if(!first_target) - first_target = input(user, "Which piece of data do you want to swap? (1)", "Swap") as null|anything in my_list - - if(holder.check_interactivity(user) && first_target) - if(!second_target) - second_target = input(user, "Which piece of data do you want to swap? (2)", "Swap") as null|anything in my_list - first_target - - if(holder.check_interactivity(user) && second_target) - var/first_pos = my_list.Find(first_target) - var/second_pos = my_list.Find(second_target) - my_list.Swap(first_pos, second_pos) - -/datum/integrated_io/lists/proc/clear_list(mob/user) - var/list/my_list = data - my_list.Cut() - -/datum/integrated_io/lists/scramble() - var/list/my_list = data - my_list = shuffle(my_list) - push_data() - -/datum/integrated_io/lists/write_data_to_pin(var/new_data) - if(islist(new_data)) - var/list/new_list = new_data - data = new_list.Copy(max(1,new_list.len - IC_MAX_LIST_LENGTH+1),0) - holder.on_data_written() - else if(isnull(new_data)) // Clear the list - var/list/my_list = data - my_list.Cut() - holder.on_data_written() - -/datum/integrated_io/lists/display_pin_type() - return IC_FORMAT_LIST - -/datum/integrated_io/lists/Topic(href, href_list) - if(!holder.check_interactivity(usr)) - return - if(..()) - return TRUE - - if(href_list["add"]) - add_to_list(usr) - - if(href_list["swap"]) - swap_inside_list(usr) - - if(href_list["clear"]) - clear_list(usr) - - if(href_list["remove"]) - if(href_list["pos"]) - remove_from_list_by_position(usr, text2num(href_list["pos"])) - else - remove_from_list(usr) - - if(href_list["edit"]) - if(href_list["pos"]) - edit_in_list_by_position(usr, text2num(href_list["pos"])) - else - edit_in_list(usr) - - holder.interact(usr) // Refresh the main UI, - interact(usr) // and the list UI. diff --git a/code/modules/integrated_electronics/core/special_pins/number_pin.dm b/code/modules/integrated_electronics/core/special_pins/number_pin.dm deleted file mode 100644 index e4e02d33a105a..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/number_pin.dm +++ /dev/null @@ -1,17 +0,0 @@ -// These pins can only contain numbers (int and floating point) or null. -/datum/integrated_io/number - name = "number pin" - -/datum/integrated_io/number/ask_for_pin_data(mob/user) - var/new_data = input("Please type in a number.","[src] number writing") as null|num - if(isnum_safe(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") - write_data_to_pin(new_data) - -/datum/integrated_io/number/write_data_to_pin(var/new_data) - if(isnull(new_data) || isnum_safe(new_data)) - data = new_data - holder.on_data_written() - -/datum/integrated_io/number/display_pin_type() - return IC_FORMAT_NUMBER diff --git a/code/modules/integrated_electronics/core/special_pins/ref_pin.dm b/code/modules/integrated_electronics/core/special_pins/ref_pin.dm deleted file mode 100644 index f64e15f225547..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/ref_pin.dm +++ /dev/null @@ -1,24 +0,0 @@ -// These pins only contain weakrefs or null. -/datum/integrated_io/ref - name = "ref pin" - -/datum/integrated_io/ref/ask_for_pin_data(mob/user) // This clears the pin. - write_data_to_pin(null) - -/datum/integrated_io/ref/write_data_to_pin(var/new_data) - if(isnull(new_data) || isweakref(new_data)) - data = new_data - holder.on_data_written() - -/datum/integrated_io/ref/display_pin_type() - return IC_FORMAT_REF - -/datum/integrated_io/ref/connect_pin(datum/integrated_io/pin) - ..(pin) - if(istype(pin,/datum/integrated_io/selfref)) - write_data_to_pin(pin.data) - -/datum/integrated_io/ref/disconnect_pin(datum/integrated_io/pin) - ..(pin) - if(istype(pin,/datum/integrated_io/selfref)) - write_data_to_pin(null) diff --git a/code/modules/integrated_electronics/core/special_pins/selfref_pin.dm b/code/modules/integrated_electronics/core/special_pins/selfref_pin.dm deleted file mode 100644 index 79dcf9e6c8c9f..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/selfref_pin.dm +++ /dev/null @@ -1,27 +0,0 @@ -// This pin only contains its own weakref and can't be changed -/datum/integrated_io/selfref - name = "selfref pin" - -/datum/integrated_io/selfref/New() - ..() - write_data_to_pin(src) - -/datum/integrated_io/selfref/ask_for_pin_data(mob/user) // You can't clear it, it's self reference. - - -/datum/integrated_io/selfref/write_data_to_pin(var/new_data) // You can't write anything else but itself onto it - if(data) - return - data = WEAKREF(holder) - holder.on_data_written() - -/datum/integrated_io/selfref/display_pin_type() - return IC_FORMAT_REF - -/datum/integrated_io/selfref/connect_pin(datum/integrated_io/pin) - pin.write_data_to_pin(data) - ..(pin) - -/datum/integrated_io/selfref/disconnect_pin(datum/integrated_io/pin) - ..(pin) - pin.write_data_to_pin(null) diff --git a/code/modules/integrated_electronics/core/special_pins/string_pin.dm b/code/modules/integrated_electronics/core/special_pins/string_pin.dm deleted file mode 100644 index 554ebf5948799..0000000000000 --- a/code/modules/integrated_electronics/core/special_pins/string_pin.dm +++ /dev/null @@ -1,30 +0,0 @@ -// These pins can only contain text and null. -/datum/integrated_io/string - name = "string pin" - -/datum/integrated_io/string/ask_for_pin_data(mob/user) - var/new_data = stripped_multiline_input(user, "Please type in a string.","[src] string writing", no_trim = TRUE) - if(holder.check_interactivity(user) ) - if(!isnull(new_data) && istext(new_data) && CHAT_FILTER_CHECK(new_data)) - to_chat(user, "Your input contains prohibited words.") - return - to_chat(user, "You input [new_data ? "[new_data]" : "NULL"] into the pin.") - write_data_to_pin(new_data) - -/datum/integrated_io/string/write_data_to_pin(var/new_data) - if(isnull(new_data) || istext(new_data)) - data = new_data - holder.on_data_written() - -// This makes the text go "from this" to "#G&*!HD$%L" -/datum/integrated_io/string/scramble() - if(!is_valid()) - return - var/list/options = list("!","@","#","$","%","^","&","*","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z") - var/new_data = "" - for(var/i in 1 to length(data)) - new_data += pick(options) - push_data() - -/datum/integrated_io/string/display_pin_type() - return IC_FORMAT_STRING diff --git a/code/modules/integrated_electronics/core/wirer.dm b/code/modules/integrated_electronics/core/wirer.dm deleted file mode 100644 index 9550f9b4aefcd..0000000000000 --- a/code/modules/integrated_electronics/core/wirer.dm +++ /dev/null @@ -1,101 +0,0 @@ -#define WIRE "wire" -#define WIRING "wiring" -#define UNWIRE "unwire" -#define UNWIRING "unwiring" - -/obj/item/integrated_electronics/wirer - name = "circuit wirer" - desc = "It's a small wiring tool, with a wire roll, electric soldering iron, wire cutter, and more in one package. \ - The wires used are generally useful for small electronics, such as circuitboards and breadboards, as opposed to larger wires \ - used for power or data transmission." - icon = 'icons/obj/assemblies/electronic_tools.dmi' - icon_state = "wirer-wire" - flags_1 = CONDUCT_1 - w_class = WEIGHT_CLASS_SMALL - var/datum/integrated_io/selected_io = null - var/mode = WIRE - -/obj/item/integrated_electronics/wirer/update_icon() - icon_state = "wirer-[mode]" - -/obj/item/integrated_electronics/wirer/proc/wire(var/datum/integrated_io/io, mob/user) - if(!io.holder.assembly) - to_chat(user, "\The [io.holder] needs to be secured inside an assembly first.") - return - switch(mode) - if(WIRE) - selected_io = io - to_chat(user, "You attach a data wire to \the [selected_io.holder]'s [selected_io.name] data channel.") - mode = WIRING - update_icon() - if(WIRING) - if(io == selected_io) - to_chat(user, "Wiring \the [selected_io.holder]'s [selected_io.name] into itself is rather pointless.") - return - if(io.io_type != selected_io.io_type) - to_chat(user, "Those two types of channels are incompatible. The first is a [selected_io.io_type], \ - while the second is a [io.io_type].") - return - if(io.holder.assembly && io.holder.assembly != selected_io.holder.assembly) - to_chat(user, "Both \the [io.holder] and \the [selected_io.holder] need to be inside the same assembly.") - return - selected_io.connect_pin(io) - - to_chat(user, "You connect \the [selected_io.holder]'s [selected_io.name] to \the [io.holder]'s [io.name].") - mode = WIRE - update_icon() - selected_io.holder.interact(user) // This is to update the UI. - selected_io = null - - if(UNWIRE) - selected_io = io - if(!io.linked.len) - to_chat(user, "There is nothing connected to \the [selected_io] data channel.") - selected_io = null - return - to_chat(user, "You prepare to detach a data wire from \the [selected_io.holder]'s [selected_io.name] data channel.") - mode = UNWIRING - update_icon() - return - - if(UNWIRING) - if(io == selected_io) - to_chat(user, "You can't wire a pin into each other, so unwiring \the [selected_io.holder] from \ - the same pin is rather moot.") - return - if(selected_io in io.linked) - selected_io.disconnect_pin(io) - to_chat(user, "You disconnect \the [selected_io.holder]'s [selected_io.name] from \ - \the [io.holder]'s [io.name].") - selected_io.holder.interact(user) // This is to update the UI. - selected_io = null - mode = UNWIRE - update_icon() - else - to_chat(user, "\The [selected_io.holder]'s [selected_io.name] and \the [io.holder]'s \ - [io.name] are not connected.") - return - -/obj/item/integrated_electronics/wirer/attack_self(mob/user) - switch(mode) - if(WIRE) - mode = UNWIRE - if(WIRING) - if(selected_io) - to_chat(user, "You decide not to wire the data channel.") - selected_io = null - mode = WIRE - if(UNWIRE) - mode = WIRE - if(UNWIRING) - if(selected_io) - to_chat(user, "You decide not to disconnect the data channel.") - selected_io = null - mode = UNWIRE - update_icon() - to_chat(user, "You set \the [src] to [mode].") - -#undef WIRE -#undef WIRING -#undef UNWIRE -#undef UNWIRING diff --git a/code/modules/integrated_electronics/passive/passive.dm b/code/modules/integrated_electronics/passive/passive.dm deleted file mode 100644 index 7678d02ad5fe7..0000000000000 --- a/code/modules/integrated_electronics/passive/passive.dm +++ /dev/null @@ -1,7 +0,0 @@ -// 'Passive' components do not have any pins, and instead contribute in some form to the assembly holding them. -/obj/item/integrated_circuit/passive - inputs = list() - outputs = list() - activators = list() - power_draw_idle = 0 - power_draw_per_use = 0 diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm deleted file mode 100644 index 67677d7d4b35c..0000000000000 --- a/code/modules/integrated_electronics/passive/power.dm +++ /dev/null @@ -1,139 +0,0 @@ - -/obj/item/integrated_circuit/passive/power - name = "power thingy" - desc = "Does power stuff." - complexity = 5 - category_text = "Power - Passive" - -/obj/item/integrated_circuit/passive/power/proc/make_energy() - return - -// For calculators. -/obj/item/integrated_circuit/passive/power/solar_cell - name = "tiny photovoltaic cell" - desc = "It's a very tiny solar cell, generally used in calculators." - extended_desc = "This cell generates 1 W of power in optimal lighting conditions. Less light will result in less power being generated." - icon_state = "solar_cell" - complexity = 8 - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/max_power = 30 - -/obj/item/integrated_circuit/passive/power/solar_cell/make_energy() - var/turf/T = get_turf(src) - var/light_amount = T ? T.get_lumcount() : 0 - var/adjusted_power = max(max_power * light_amount, 0) - adjusted_power = round(adjusted_power, 0.1) - if(adjusted_power) - if(assembly) - assembly.give_power(adjusted_power) - -/obj/item/integrated_circuit/passive/power/starter - name = "starter" - desc = "This tiny circuit will send a pulse right after the device is turned on, or when power is restored to it." - icon_state = "led" - complexity = 1 - activators = list("pulse out" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/is_charge = FALSE - -/obj/item/integrated_circuit/passive/power/starter/make_energy() - if(assembly.battery) - if(assembly.battery.charge) - if(!is_charge) - activate_pin(1) - is_charge = TRUE - else - is_charge = FALSE - else - is_charge=FALSE - return FALSE - -// For fat machines that need fat power, like drones. -/obj/item/integrated_circuit/passive/power/relay - name = "tesla power relay" - desc = "A seemingly enigmatic device which connects to nearby APCs wirelessly and draws power from them." - w_class = WEIGHT_CLASS_SMALL - extended_desc = "The siphon drains 50 W of power from an APC in the same room as it as long as it has charge remaining. It will always drain \ - from the 'equipment' power channel." - icon_state = "power_relay" - complexity = 7 - spawn_flags = IC_SPAWN_RESEARCH - var/power_amount = 50 - - -/obj/item/integrated_circuit/passive/power/relay/make_energy() - if(!assembly) - return - var/area/A = get_area(src) - if(A && A.powered(AREA_USAGE_EQUIP) && assembly.give_power(power_amount)) - A.use_power(power_amount, AREA_USAGE_EQUIP) - // give_power() handles CELLRATE on its own. - - -// For really fat machines. -/obj/item/integrated_circuit/passive/power/relay/large - name = "large tesla power relay" - desc = "A seemingly enigmatic device which connects to nearby APCs wirelessly and draws power from them, now in industrial size!" - w_class = WEIGHT_CLASS_BULKY - extended_desc = "The siphon drains 2 kW of power from an APC in the same room as it as long as it has charge remaining. It will always drain \ - from the 'equipment' power channel." - icon_state = "power_relay" - complexity = 15 - spawn_flags = IC_SPAWN_RESEARCH - power_amount = 1000 - - -//fuel cell -/obj/item/integrated_circuit/passive/power/chemical_cell - name = "fuel cell" - desc = "Produces electricity from chemicals." - icon_state = "chemical_cell" - extended_desc = "This is effectively an internal beaker. It will consume and produce power from plasma, slime jelly, welding fuel, carbon,\ - ethanol, nutriment, and blood in order of decreasing efficiency. It will consume fuel only if the battery can take more energy." - complexity = 4 - inputs = list() - outputs = list("volume used" = IC_PINTYPE_NUMBER, "self reference" = IC_PINTYPE_SELFREF) - activators = list("push ref" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/volume = 60 - var/list/fuel = list("plasma" = 50000, "slimejelly" = 22500, "welding_fuel" = 15000, "carbon" = 10000, "ethanol" = 10000, "nutriment" = 8000) - var/multi = 1 - var/lfwb =TRUE - -/obj/item/integrated_circuit/passive/power/chemical_cell/New() - ..() - create_reagents(volume, OPENCONTAINER) - extended_desc +="But no fuel can be compared with blood of living human." - - -/obj/item/integrated_circuit/passive/power/chemical_cell/interact(mob/user) - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() - ..() - -/obj/item/integrated_circuit/passive/power/chemical_cell/on_reagent_change(changetype) - set_pin_data(IC_OUTPUT, 1, reagents.total_volume) - push_data() - -/obj/item/integrated_circuit/passive/power/chemical_cell/make_energy() - if(assembly) - if(assembly.battery) - var/bp = 5000 - if(reagents.get_reagent_amount("blood")) //only blood is powerful enough to power the station(c) - var/datum/reagent/blood/B = locate() in reagents.reagent_list - if(lfwb) - if(B && B.data["cloneable"]) - var/mob/M = B.data["donor"] - if(M && (M.stat != DEAD) && (M.client)) - bp = 500000 - if((assembly.battery.maxcharge-assembly.battery.charge) / GLOB.CELLRATE > bp) - if(reagents.remove_reagent("blood", 1)) - assembly.give_power(bp) - for(var/I in fuel) - if((assembly.battery.maxcharge-assembly.battery.charge) / GLOB.CELLRATE > fuel[I]) - if(reagents.remove_reagent(I, 1)) - assembly.give_power(fuel[I]*multi) - -/obj/item/integrated_circuit/passive/power/chemical_cell/do_work() - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() diff --git a/code/modules/integrated_electronics/subtypes/access.dm b/code/modules/integrated_electronics/subtypes/access.dm deleted file mode 100644 index 10138c4491874..0000000000000 --- a/code/modules/integrated_electronics/subtypes/access.dm +++ /dev/null @@ -1,41 +0,0 @@ -// - card reader - // -/obj/item/integrated_circuit/input/card_reader - name = "ID card reader" //To differentiate it from the data card reader - desc = "A circuit that can read the registred name, assignment, and PassKey string from an ID card." - icon_state = "card_reader" - - complexity = 4 - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - outputs = list( - "registered name" = IC_PINTYPE_STRING, - "assignment" = IC_PINTYPE_STRING, - "passkey" = IC_PINTYPE_STRING - ) - activators = list( - "on read" = IC_PINTYPE_PULSE_OUT - ) - -/obj/item/integrated_circuit/input/card_reader/attackby_react(obj/item/I, mob/living/user, intent) - var/obj/item/card/id/card = I.GetID() - var/list/access = I.GetAccess() - var/passkey = strtohex(XorEncrypt(json_encode(access), SScircuit.cipherkey)) - - if(assembly) - assembly.access_card.access |= access - - if(card) // An ID card. - set_pin_data(IC_OUTPUT, 1, card.registered_name) - set_pin_data(IC_OUTPUT, 2, card.assignment) - - else if(length(access)) // A non-card object that has access levels. - set_pin_data(IC_OUTPUT, 1, null) - set_pin_data(IC_OUTPUT, 2, null) - - else - return FALSE - - set_pin_data(IC_OUTPUT, 3, passkey) - - push_data() - activate_pin(1) - return TRUE diff --git a/code/modules/integrated_electronics/subtypes/arithmetic.dm b/code/modules/integrated_electronics/subtypes/arithmetic.dm deleted file mode 100644 index 0799b4d2df7a2..0000000000000 --- a/code/modules/integrated_electronics/subtypes/arithmetic.dm +++ /dev/null @@ -1,344 +0,0 @@ -//These circuits do simple math. -/obj/item/integrated_circuit/arithmetic - complexity = 1 - inputs = list( - "A" = IC_PINTYPE_NUMBER, - "B" = IC_PINTYPE_NUMBER, - "C" = IC_PINTYPE_NUMBER, - "D" = IC_PINTYPE_NUMBER, - "E" = IC_PINTYPE_NUMBER, - "F" = IC_PINTYPE_NUMBER, - "G" = IC_PINTYPE_NUMBER, - "H" = IC_PINTYPE_NUMBER - ) - outputs = list("result" = IC_PINTYPE_NUMBER) - activators = list("compute" = IC_PINTYPE_PULSE_IN, "on computed" = IC_PINTYPE_PULSE_OUT) - category_text = "Arithmetic" - power_draw_per_use = 5 // Math is pretty cheap. - -// +Adding+ // - -/obj/item/integrated_circuit/arithmetic/addition - name = "addition circuit" - desc = "This circuit can add numbers together." - extended_desc = "The order that the calculation goes is; \ - result = ((((A + B) + C) + D) ... ) and so on, until all pins have been added. \ - Null pins are ignored." - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/addition/do_work() - var/result = 0 - for(var/k in 1 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(isnum_safe(I)) - result += I - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// -Subtracting- // - -/obj/item/integrated_circuit/arithmetic/subtraction - name = "subtraction circuit" - desc = "This circuit can subtract numbers." - extended_desc = "The order that the calculation goes is; \ - result = ((((A - B) - C) - D) ... ) and so on, until all pins have been subtracted. \ - Null pins are ignored. Pin A must be a number, or the circuit will not function." - icon_state = "subtraction" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/subtraction/do_work() - var/datum/integrated_io/A = inputs[1] - if(!isnum_safe(A.data)) - return - var/result = A.data - - for(var/k in 2 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(isnum_safe(I)) - result -= I - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// *Multiply* // - -/obj/item/integrated_circuit/arithmetic/multiplication - name = "multiplication circuit" - desc = "This circuit can multiply numbers." - extended_desc = "The order that the calculation goes is; \ - result = ((((A * B) * C) * D) ... ) and so on, until all pins have been multiplied. \ - Null pins are ignored. Pin A must be a number, or the circuit will not function." - icon_state = "multiplication" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - - -/obj/item/integrated_circuit/arithmetic/multiplication/do_work() - var/datum/integrated_io/A = inputs[1] - if(!isnum_safe(A.data)) - return - var/result = A.data - for(var/k in 2 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(isnum_safe(I)) - result *= I - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// /Division/ // - -/obj/item/integrated_circuit/arithmetic/division - name = "division circuit" - desc = "This circuit can divide numbers. Don't even think about trying to divide by zero!" - extended_desc = "The order that the calculation goes is; \ - result = ((((A / B) / C) / D) ... ) and so on, until all pins have been divided. \ - Null pins, and pins containing 0, are ignored. Pin A must be a number or the circuit will not function." - icon_state = "division" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/division/do_work() - var/datum/integrated_io/A = inputs[1] - if(!isnum_safe(A.data)) - return - var/result = A.data - - - for(var/k in 2 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(isnum_safe(I) && (I != 0)) - result /= I - - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -//^ Exponent ^// - -/obj/item/integrated_circuit/arithmetic/exponent - name = "exponent circuit" - desc = "Outputs A to the power of B." - icon_state = "exponent" - inputs = list("A" = IC_PINTYPE_NUMBER, "B" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/exponent/do_work() - var/result = 0 - var/datum/integrated_io/A = inputs[1] - var/datum/integrated_io/B = inputs[2] - if(isnum_safe(A.data) && isnum_safe(B.data)) - result = A.data ** B.data - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// +-Sign-+ // - -/obj/item/integrated_circuit/arithmetic/sign - name = "sign circuit" - desc = "This circuit can tell if a number is positive, negative, or zero." - extended_desc = "Will output 1, -1, or 0, depending on if A is a positive number, a negative number, or zero, respectively." - icon_state = "sign" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/sign/do_work() - var/result = 0 - var/datum/integrated_io/A = inputs[1] - if(isnum_safe(A.data)) - if(A.data > 0) - result = 1 - else if (A.data < 0) - result = -1 - else - result = 0 - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Round // - -/obj/item/integrated_circuit/arithmetic/round - name = "round circuit" - desc = "Rounds A to the nearest B multiple of A." - extended_desc = "If B is not given a number, it will output the floor of A instead." - icon_state = "round" - inputs = list("A" = IC_PINTYPE_NUMBER, "B" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/round/do_work() - var/result = 0 - var/datum/integrated_io/A = inputs[1] - var/datum/integrated_io/B = inputs[2] - if(isnum_safe(A.data)) - if(isnum_safe(B.data) && B.data != 0) - result = round(A.data, B.data) - else - result = round(A.data) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Absolute // - -/obj/item/integrated_circuit/arithmetic/absolute - name = "absolute circuit" - desc = "This outputs a non-negative version of the number you put in. This may also be thought of as its distance from zero." - icon_state = "absolute" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/absolute/do_work() - var/result = 0 - for(var/k in 1 to inputs.len) - var/datum/integrated_io/I = inputs[k] - I.pull_data() - if(isnum_safe(I.data)) - result = abs(I.data) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Averaging // - -/obj/item/integrated_circuit/arithmetic/average - name = "average circuit" - desc = "This circuit is of average quality. It will compute the average of the numbers you give it." - extended_desc = "Note that null pins are ignored, whereas a pin containing 0 is included in the averaging calculation." - icon_state = "average" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/average/do_work() - var/result = 0 - var/inputs_used = 0 - for(var/k in 2 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(isnum_safe(I)) - inputs_used++ - result += I - - if(inputs_used) - result = result / inputs_used - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Pi, because why the hell not? // -/obj/item/integrated_circuit/arithmetic/pi - name = "pi constant circuit" - desc = "Not recommended for cooking. Outputs '3.14159' when it receives a pulse." - icon_state = "pi" - inputs = list() - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/pi/Initialize() - . = ..() - desc = "Not recommended for cooking. Outputs '[PI]' when it receives a pulse." - -/obj/item/integrated_circuit/arithmetic/pi/do_work() - set_pin_data(IC_OUTPUT, 1, PI) - push_data() - activate_pin(2) - -// Random // -/obj/item/integrated_circuit/arithmetic/random - name = "random number generator circuit" - desc = "This gives a random (integer) number between values A and B inclusive." - extended_desc = "'Inclusive' means that the upper bound is included in the range of numbers, e.g. L = 1 and H = 3 will allow \ - for outputs of 1, 2, or 3. H being the higher number is not strictly required." - icon_state = "random" - inputs = list("L" = IC_PINTYPE_NUMBER,"H" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/random/do_work() - var/result = 0 - var/L = get_pin_data(IC_INPUT, 1) - var/H = get_pin_data(IC_INPUT, 2) - - if(isnum_safe(L) && isnum_safe(H)) - result = rand(L, H) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Square Root // - -/obj/item/integrated_circuit/arithmetic/square_root - name = "square root circuit" - desc = "This outputs the square root of the number you input." - icon_state = "square_root" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/square_root/do_work() - var/result = 0 - for(var/k in 2 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(isnum_safe(I)) - result += sqrt(I) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// % Modulo % // - -/obj/item/integrated_circuit/arithmetic/modulo - name = "modulo circuit" - desc = "Gets the remainder of A / B." - icon_state = "modulo" - inputs = list("A" = IC_PINTYPE_NUMBER, "B" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/arithmetic/modulo/do_work() - var/result = 0 - var/A = get_pin_data(IC_INPUT, 1) - var/B = get_pin_data(IC_INPUT, 2) - if(isnum_safe(A) && isnum_safe(B) && B != 0) - result = A % B - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// -Max- // -/obj/item/integrated_circuit/arithmetic/max - name = "max circuit" - desc = "This circuit sends out the highest number." - extended_desc = "The highest number is put out. Null is ignored." - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/min_comparision = FALSE - -/obj/item/integrated_circuit/arithmetic/max/do_work() - var/result - for(var/k in 1 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(!isnum_safe(I)) - continue - if(!isnum_safe(result) || (!min_comparision && I > result) || (min_comparision && I < result)) - result = I - if(!isnum_safe(result)) - result = 0 - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - - -// -Min- // -/obj/item/integrated_circuit/arithmetic/max/min - name = "min circuit" - desc = "This circuit sends out the smallest number." - extended_desc = "The smallest number is put out. Null is ignored. In case no number is found, 0 is given out." - min_comparision = TRUE diff --git a/code/modules/integrated_electronics/subtypes/atmospherics.dm b/code/modules/integrated_electronics/subtypes/atmospherics.dm deleted file mode 100644 index 6b1c5fee77685..0000000000000 --- a/code/modules/integrated_electronics/subtypes/atmospherics.dm +++ /dev/null @@ -1,783 +0,0 @@ -#define SOURCE_TO_TARGET 0 -#define TARGET_TO_SOURCE 1 -#define PUMP_EFFICIENCY 0.6 -#define TANK_FAILURE_PRESSURE (ONE_ATMOSPHERE*25) -#define PUMP_MAX_VOLUME 100 - - -/obj/item/integrated_circuit/atmospherics - category_text = "Atmospherics" - cooldown_per_use = 2 SECONDS - complexity = 10 - size = 7 - outputs = list( - "self reference" = IC_PINTYPE_SELFREF, - "pressure" = IC_PINTYPE_NUMBER - ) - var/datum/gas_mixture/air_contents - var/volume = 2 //Pretty small, I know - -/obj/item/integrated_circuit/atmospherics/Initialize() - air_contents = new(volume) - ..() - -/obj/item/integrated_circuit/atmospherics/return_air() - return air_contents - -//Check if the gas container is adjacent and of the right type -/obj/item/integrated_circuit/atmospherics/proc/check_gassource(atom/gasholder) - if(!gasholder) - return FALSE - if(!gasholder.Adjacent(get_object())) - return FALSE - if(!istype(gasholder, /obj/item/tank) && !istype(gasholder, /obj/machinery/portable_atmospherics) && !istype(gasholder, /obj/item/integrated_circuit/atmospherics)) - return FALSE - return TRUE - -//Needed in circuits where source and target types differ -/obj/item/integrated_circuit/atmospherics/proc/check_gastarget(atom/gasholder) - return check_gassource(gasholder) - - -// - gas pump - // **works** -/obj/item/integrated_circuit/atmospherics/pump - name = "gas pump" - desc = "Somehow moves gases between two tanks, canisters, and other gas containers." - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "source" = IC_PINTYPE_REF, - "target" = IC_PINTYPE_REF, - "target pressure" = IC_PINTYPE_NUMBER - ) - activators = list( - "transfer" = IC_PINTYPE_PULSE_IN, - "on transfer" = IC_PINTYPE_PULSE_OUT - ) - var/direction = SOURCE_TO_TARGET - var/target_pressure = PUMP_MAX_PRESSURE - power_draw_per_use = 20 - -/obj/item/integrated_circuit/atmospherics/pump/Initialize() - air_contents = new(volume) - extended_desc += " Use negative pressure to move air from target to source. \ - Note that only part of the gas is moved on each transfer, \ - so multiple activations will be necessary to achieve target pressure. \ - The pressure limit for circuit pumps is [round(PUMP_MAX_PRESSURE)] kPa." - . = ..() - -// This proc gets the direction of the gas flow depending on its value, by calling update target -/obj/item/integrated_circuit/atmospherics/pump/on_data_written() - var/amt = get_pin_data(IC_INPUT, 3) - update_target(amt) - -/obj/item/integrated_circuit/atmospherics/pump/proc/update_target(new_amount) - if(!isnum_safe(new_amount)) - new_amount = 0 - // See in which direction the gas moves - if(new_amount < 0) - direction = TARGET_TO_SOURCE - else - direction = SOURCE_TO_TARGET - target_pressure = min(round(PUMP_MAX_PRESSURE),abs(new_amount)) - -/obj/item/integrated_circuit/atmospherics/pump/do_work() - var/obj/source = get_pin_data_as_type(IC_INPUT, 1, /obj) - var/obj/target = get_pin_data_as_type(IC_INPUT, 2, /obj) - perform_magic(source, target) - activate_pin(2) - -/obj/item/integrated_circuit/atmospherics/pump/proc/perform_magic(atom/source, atom/target) - //Check if both atoms are of the right type: atmos circuits/gas tanks/canisters. If one is the same, use the circuit var - if(!check_gassource(source)) - source = src - - if(!check_gastarget(target)) - target = src - - // If both are the same, this whole proc would do nothing and just waste performance - if(source == target) - return - - var/datum/gas_mixture/source_air = source.return_air() - var/datum/gas_mixture/target_air = target.return_air() - - if(!source_air || !target_air) - return - - // Swapping both source and target - if(direction == TARGET_TO_SOURCE) - var/temp = source_air - source_air = target_air - target_air = temp - - // If what you are pumping is empty, use the circuit's storage - if(source_air.total_moles() <= 0) - source_air = air_contents - - // Move gas from one place to another - move_gas(source_air, target_air, (istype(target, /obj/item/tank) ? target : null)) - air_update_turf() - -/obj/item/integrated_circuit/atmospherics/pump/proc/move_gas(datum/gas_mixture/source_air, datum/gas_mixture/target_air, obj/item/tank/snowflake) - - // No moles = nothing to pump - if(source_air.total_moles() <= 0 || target_air.return_pressure() >= PUMP_MAX_PRESSURE) - return - - // Negative Kelvin temperatures should never happen and if they do, normalize them - if(source_air.return_temperature() < TCMB) - source_air.set_temperature(TCMB) - - var/pressure_delta = target_pressure - target_air.return_pressure() - if(pressure_delta > 0.1) - var/transfer_moles = (pressure_delta*target_air.return_volume()/(source_air.return_temperature() * R_IDEAL_GAS_EQUATION))*PUMP_EFFICIENCY - var/datum/gas_mixture/removed = source_air.remove(transfer_moles) - if(istype(snowflake)) //Snowflake check for tanks specifically, because tank ruptures are handled in a very snowflakey way that expects all tank interactions to be handled via the tank's procs - snowflake.assume_air(removed) - else - target_air.merge(removed) - - -// - volume pump - // **Works** -/obj/item/integrated_circuit/atmospherics/pump/volume - name = "volume pump" - desc = "Moves gases between two tanks, canisters, and other gas containers by using their volume, up to 200 L/s." - extended_desc = " Use negative volume to move air from target to source. Note that only part of the gas is moved on each transfer. Its maximum pumping volume is capped at 1000kPa." - - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "source" = IC_PINTYPE_REF, - "target" = IC_PINTYPE_REF, - "transfer volume" = IC_PINTYPE_NUMBER - ) - activators = list( - "transfer" = IC_PINTYPE_PULSE_IN, - "on transfer" = IC_PINTYPE_PULSE_OUT - ) - direction = SOURCE_TO_TARGET - var/transfer_rate = PUMP_MAX_VOLUME - power_draw_per_use = 20 - -/obj/item/integrated_circuit/atmospherics/pump/volume/update_target(new_amount) - if(!isnum_safe(new_amount)) - new_amount = 0 - // See in which direction the gas moves - if(new_amount < 0) - direction = TARGET_TO_SOURCE - else - direction = SOURCE_TO_TARGET - target_pressure = min(PUMP_MAX_VOLUME,abs(new_amount)) - -/obj/item/integrated_circuit/atmospherics/pump/volume/move_gas(datum/gas_mixture/source_air, datum/gas_mixture/target_air, obj/item/tank/snowflake) - // No moles = nothing to pump - if(source_air.total_moles() <= 0) - return - - // Negative Kelvin temperatures should never happen and if they do, normalize them - if(source_air.return_temperature() < TCMB) - source_air.set_temperature(TCMB) - - if((source_air.return_pressure() < 0.01) || (target_air.return_pressure() >= PUMP_MAX_PRESSURE)) - return - - //The second part of the min caps the pressure built by the volume pumps to the max pump pressure - var/transfer_ratio = min(transfer_rate,target_air.return_volume()*PUMP_MAX_PRESSURE/source_air.return_pressure())/source_air.return_volume() - - var/datum/gas_mixture/removed = source_air.remove_ratio(transfer_ratio * PUMP_EFFICIENCY) - - if(istype(snowflake)) - snowflake.assume_air(removed) - else - target_air.merge(removed) - -// - gas vent - // **works** -/obj/item/integrated_circuit/atmospherics/pump/vent - name = "gas vent" - extended_desc = "Use negative volume to move air from target to environment. Note that only part of the gas is moved on each transfer. Unlike the gas pump, this one keeps pumping even further to pressures of 9000 pKa and it is not advised to use it on tank circuits." - desc = "Moves gases between the environment and adjacent gas containers." - inputs = list( - "container" = IC_PINTYPE_REF, - "target pressure" = IC_PINTYPE_NUMBER - ) - -/obj/item/integrated_circuit/atmospherics/pump/vent/on_data_written() - var/amt = get_pin_data(IC_INPUT, 2) - update_target(amt) - -/obj/item/integrated_circuit/atmospherics/pump/vent/do_work() - var/turf/source = get_turf(src) - var/obj/target = get_pin_data_as_type(IC_INPUT, 1, /obj) - perform_magic(source, target) - activate_pin(2) - -/obj/item/integrated_circuit/atmospherics/pump/vent/check_gastarget(atom/gasholder) - if(!gasholder) - return FALSE - if(!gasholder.Adjacent(get_object())) - return FALSE - if(!istype(gasholder, /obj/item/tank) && !istype(gasholder, /obj/machinery/portable_atmospherics) && !istype(gasholder, /obj/item/integrated_circuit/atmospherics)) - return FALSE - return TRUE - - -/obj/item/integrated_circuit/atmospherics/pump/vent/check_gassource(atom/target) - if(!target) - return FALSE - if(!istype(target, /turf)) - return FALSE - return TRUE - - -// - integrated connector - // Can connect and disconnect properly -/obj/item/integrated_circuit/atmospherics/connector - name = "integrated connector" - desc = "Creates an airtight seal with standard connectors found on the floor, \ - allowing the assembly to exchange gases with a pipe network." - extended_desc = "This circuit will automatically attempt to locate and connect to ports on the floor beneath it when activated. \ - You must set a target before connecting." - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "target" = IC_PINTYPE_REF - ) - activators = list( - "toggle connection" = IC_PINTYPE_PULSE_IN, - "on connected" = IC_PINTYPE_PULSE_OUT, - "on connection failed" = IC_PINTYPE_PULSE_OUT, - "on disconnected" = IC_PINTYPE_PULSE_OUT - ) - - var/obj/machinery/atmospherics/components/unary/portables_connector/connector - -/obj/item/integrated_circuit/atmospherics/connector/Initialize() - air_contents = new(volume) - START_PROCESSING(SSobj, src) - . = ..() - -//Sucks up the gas from the connector -/obj/item/integrated_circuit/atmospherics/connector/process() - set_pin_data(IC_OUTPUT, 2, air_contents.return_pressure()) - -/obj/item/integrated_circuit/atmospherics/connector/check_gassource(atom/gasholder) - if(!gasholder) - return FALSE - if(!istype(gasholder,/obj/machinery/atmospherics/components/unary/portables_connector)) - return FALSE - return TRUE - -//If the assembly containing this is moved from the tile the connector pipe is in, the connection breaks -/obj/item/integrated_circuit/atmospherics/connector/ext_moved() - if(connector) - if(get_dist(get_object(), connector) > 0) - // The assembly is set as connected device and the connector handles the rest - connector.connected_device = null - connector = null - activate_pin(4) - -/obj/item/integrated_circuit/atmospherics/connector/do_work() - // If there is a connection, disconnect - if(connector) - connector.connected_device = null - connector = null - activate_pin(4) - return - - var/obj/machinery/atmospherics/components/unary/portables_connector/PC = locate() in get_turf(src) - // If no connector can't connect - if(!PC) - activate_pin(3) - return - connector = PC - connector.connected_device = src - activate_pin(2) - -// Required for making the connector port script work -obj/item/integrated_circuit/atmospherics/connector/portableConnectorReturnAir() - return air_contents - - -// - gas filter - // **works** -/obj/item/integrated_circuit/atmospherics/pump/filter - name = "gas filter" - desc = "Filters one gas out of a mixture." - complexity = 20 - size = 8 - spawn_flags = IC_SPAWN_RESEARCH - inputs = list( - "source" = IC_PINTYPE_REF, - "filtered output" = IC_PINTYPE_REF, - "contaminants output" = IC_PINTYPE_REF, - "wanted gases" = IC_PINTYPE_LIST, - "target pressure" = IC_PINTYPE_NUMBER - ) - power_draw_per_use = 30 - -/obj/item/integrated_circuit/atmospherics/pump/filter/on_data_written() - var/amt = get_pin_data(IC_INPUT, 5) - target_pressure = CLAMP(amt, 0, PUMP_MAX_PRESSURE) - -/obj/item/integrated_circuit/atmospherics/pump/filter/do_work() - activate_pin(2) - var/obj/source = get_pin_data_as_type(IC_INPUT, 1, /obj) - var/obj/filtered = get_pin_data_as_type(IC_INPUT, 2, /obj) - var/obj/contaminants = get_pin_data_as_type(IC_INPUT, 3, /obj) - - var/wanted = get_pin_data(IC_INPUT, 4) - - // If there is no filtered output, this whole thing makes no sense - if(!check_gassource(filtered)) - return - - var/datum/gas_mixture/filtered_air = filtered.return_air() - if(!filtered_air) - return - - // If no source is set, the source is possibly this circuit's content - if(!check_gassource(source)) - source = src - var/datum/gas_mixture/source_air = source.return_air() - - //No source air: source is this circuit - if(!source_air) - source_air = air_contents - - // If no filtering tank is set, filter through itself - if(!check_gassource(contaminants)) - contaminants = src - var/datum/gas_mixture/contaminated_air = contaminants.return_air() - - //If there is no gas mixture datum for unfiltered, pump the contaminants back into the circuit - if(!contaminated_air) - contaminated_air = air_contents - - if(contaminated_air.return_pressure() >= PUMP_MAX_PRESSURE || filtered_air.return_pressure() >= PUMP_MAX_PRESSURE) - return - - var/pressure_delta = target_pressure - contaminated_air.return_pressure() - var/transfer_moles - - //Negative Kelvins are an anomaly and should be normalized if encountered - if(source_air.return_temperature() < TCMB) - source_air.set_temperature(TCMB) - - transfer_moles = (pressure_delta*contaminated_air.return_volume()/(source_air.return_temperature() * R_IDEAL_GAS_EQUATION))*PUMP_EFFICIENCY - - //If there is nothing to transfer, just return - if(transfer_moles <= 0) - return - - //This is the var that holds the currently filtered part of the gas - var/datum/gas_mixture/removed = source_air.remove(transfer_moles) - if(!removed) - return - - //This is the gas that will be moved from source to filtered - var/datum/gas_mixture/filtered_out = new - - for(var/filtered_gas in removed.get_gases()) - //Get the name of the gas and see if it is in the list - if(GLOB.meta_gas_info[filtered_gas][META_GAS_NAME] in wanted) - //The gas that is put in all the filtered out gases - filtered_out.set_temperature(removed.return_temperature()) - filtered_out.set_moles(filtered_gas, removed.get_moles(filtered_gas)) - - //The filtered out gas is entirely removed from the currently filtered gases - removed.set_moles(filtered_gas, 0) - - //Check if the pressure is high enough to put stuff in filtered, or else just put it back in the source - if(filtered_air.return_pressure() < target_pressure) - if(istype(filtered, /obj/item/tank)) - filtered.assume_air(filtered_out) - else - filtered_air.merge(filtered_out) - else - if(istype(source, /obj/item/tank)) - source.assume_air(filtered_out) - else - source_air.merge(filtered_out) - if(istype(contaminants, /obj/item/tank)) - contaminants.assume_air(removed) - else - contaminated_air.merge(removed) - - -/obj/item/integrated_circuit/atmospherics/pump/filter/Initialize() - air_contents = new(volume) - . = ..() - extended_desc = "Remember to properly spell and capitalize the filtered gas name. \ - Note that only part of the gas is moved on each transfer, \ - so multiple activations will be necessary to achieve target pressure. \ - The pressure limit for circuit pumps is [round(PUMP_MAX_PRESSURE)] kPa." - - -// - gas mixer - // **works** -/obj/item/integrated_circuit/atmospherics/pump/mixer - name = "gas mixer" - desc = "Mixes 2 different types of gases." - complexity = 20 - size = 8 - spawn_flags = IC_SPAWN_RESEARCH - inputs = list( - "first source" = IC_PINTYPE_REF, - "second source" = IC_PINTYPE_REF, - "output" = IC_PINTYPE_REF, - "first source percentage" = IC_PINTYPE_NUMBER, - "target pressure" = IC_PINTYPE_NUMBER - ) - power_draw_per_use = 30 - -/obj/item/integrated_circuit/atmospherics/pump/mixer/do_work() - activate_pin(2) - var/obj/source_1 = get_pin_data(IC_INPUT, 1) - var/obj/source_2 = get_pin_data(IC_INPUT, 2) - var/obj/gas_output = get_pin_data(IC_INPUT, 3) - if(!check_gassource(source_1)) - source_1 = src - - if(!check_gassource(source_2)) - source_2 = src - - if(!check_gassource(gas_output)) - gas_output = src - - if(source_1 == gas_output || source_2 == gas_output) - return - - var/datum/gas_mixture/source_1_gases = source_1.return_air() - var/datum/gas_mixture/source_2_gases = source_2.return_air() - var/datum/gas_mixture/output_gases = gas_output.return_air() - - if(!source_1_gases || !source_2_gases || !output_gases) - return - - if(output_gases.return_pressure() >= PUMP_MAX_PRESSURE) - return - - if(source_1_gases.return_pressure() <= 0 || source_2_gases.return_pressure() <= 0) - return - - //This calculates how much should be sent - var/gas_percentage = round(max(min(get_pin_data(IC_INPUT, 4),100),0) / 100) - - //Basically: number of moles = percentage of pressure filled up * efficiency coefficient * (pressure from both gases * volume of output) / (R * Temperature) - var/transfer_moles = (get_pin_data(IC_INPUT, 5) / max(1,output_gases.return_pressure())) * PUMP_EFFICIENCY * (source_1_gases.return_pressure() * gas_percentage + source_2_gases.return_pressure() * (1 - gas_percentage)) * output_gases.return_volume()/ (R_IDEAL_GAS_EQUATION * max(output_gases.return_temperature(),TCMB)) - - - if(transfer_moles <= 0) - return - - var/snowflakecheck = istype(gas_output, /obj/item/tank) - - var/datum/gas_mixture/mix = source_1_gases.remove(transfer_moles * gas_percentage) - if(snowflakecheck) - gas_output.assume_air(mix) - else - output_gases.merge(mix) - mix = source_2_gases.remove(transfer_moles * (1-gas_percentage)) - if(snowflakecheck) - gas_output.assume_air(mix) - else - output_gases.merge(mix) - - -// - integrated tank - // **works** -/obj/item/integrated_circuit/atmospherics/tank - name = "integrated tank" - desc = "A small tank for the storage of gases." - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - size = 4 - activators = list( - "push ref" = IC_PINTYPE_PULSE_IN - ) - volume = 3 //emergency tank sized - var/broken = FALSE - -/obj/item/integrated_circuit/atmospherics/tank/Initialize() - air_contents = new(volume) - START_PROCESSING(SSobj, src) - extended_desc = "Take care not to pressurize it above [round(TANK_FAILURE_PRESSURE)] kPa, or else it will break." - . = ..() - -/obj/item/integrated_circuit/atmospherics/tank/Destroy() - STOP_PROCESSING(SSobj, src) - . = ..() - -/obj/item/integrated_circuit/atmospherics/tank/do_work() - set_pin_data(IC_OUTPUT, 1, WEAKREF(src)) - push_data() - -/obj/item/integrated_circuit/atmospherics/tank/process() - var/tank_pressure = air_contents.return_pressure() - set_pin_data(IC_OUTPUT, 2, tank_pressure) - push_data() - - //Check if tank broken - if(!broken && tank_pressure > TANK_FAILURE_PRESSURE) - broken = TRUE - to_chat(view(2),"The [name] ruptures, releasing its gases!") - if(broken) - release() - -/obj/item/integrated_circuit/atmospherics/tank/proc/release() - if(air_contents.total_moles() > 0) - playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3) - var/datum/gas_mixture/expelled_gas = air_contents.remove(air_contents.total_moles()) - var/turf/current_turf = get_turf(src) - var/datum/gas_mixture/exterior_gas - if(!current_turf) - return - - exterior_gas = current_turf.return_air() - exterior_gas.merge(expelled_gas) - - -// - large integrated tank - // **works** -/obj/item/integrated_circuit/atmospherics/tank/large - name = "large integrated tank" - desc = "A less small tank for the storage of gases." - volume = 9 - size = 12 - spawn_flags = IC_SPAWN_RESEARCH - - -// - freezer tank - // **works** -/obj/item/integrated_circuit/atmospherics/tank/freezer - name = "freezer tank" - desc = "Cools the gas it contains to a preset temperature." - volume = 6 - size = 8 - inputs = list( - "target temperature" = IC_PINTYPE_NUMBER, - "on" = IC_PINTYPE_BOOLEAN - ) - inputs_default = list("1" = 300) - spawn_flags = IC_SPAWN_RESEARCH - var/temperature = 293.15 - var/heater_coefficient = 0.1 - -/obj/item/integrated_circuit/atmospherics/tank/freezer/on_data_written() - temperature = max(73.15,min(293.15,get_pin_data(IC_INPUT, 1))) - if(get_pin_data(IC_INPUT, 2)) - power_draw_idle = 30 - else - power_draw_idle = 0 - -/obj/item/integrated_circuit/atmospherics/tank/freezer/process() - var/tank_pressure = air_contents.return_pressure() - set_pin_data(IC_OUTPUT, 2, tank_pressure) - push_data() - - //Cool the tank if the power is on and the temp is above - if(!power_draw_idle || air_contents.return_temperature() < temperature) - return - - air_contents.set_temperature(max(73.15,air_contents.return_temperature() - (air_contents.return_temperature() - temperature) * heater_coefficient)) - - -// - heater tank - // **works** -/obj/item/integrated_circuit/atmospherics/tank/freezer/heater - name = "heater tank" - desc = "Heats the gas it contains to a preset temperature." - volume = 6 - inputs = list( - "target temperature" = IC_PINTYPE_NUMBER, - "on" = IC_PINTYPE_BOOLEAN - ) - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/atmospherics/tank/freezer/heater/on_data_written() - temperature = max(293.15,min(573.15,get_pin_data(IC_INPUT, 1))) - if(get_pin_data(IC_INPUT, 2)) - power_draw_idle = 30 - else - power_draw_idle = 0 - -/obj/item/integrated_circuit/atmospherics/tank/freezer/heater/process() - var/tank_pressure = air_contents.return_pressure() - set_pin_data(IC_OUTPUT, 2, tank_pressure) - push_data() - - //Heat the tank if the power is on or its temperature is below what is set - if(!power_draw_idle || air_contents.return_temperature() > temperature) - return - - air_contents.set_temperature(min(573.15,air_contents.return_temperature() + (temperature - air_contents.return_temperature()) * heater_coefficient)) - - -// - atmospheric cooler - // **works** -/obj/item/integrated_circuit/atmospherics/cooler - name = "atmospheric cooler circuit" - desc = "Cools the air around it." - volume = 6 - size = 13 - spawn_flags = IC_SPAWN_RESEARCH - inputs = list( - "target temperature" = IC_PINTYPE_NUMBER, - "on" = IC_PINTYPE_BOOLEAN - ) - var/temperature = 293.15 - var/heater_coefficient = 0.1 - -/obj/item/integrated_circuit/atmospherics/cooler/Initialize() - air_contents = new(volume) - START_PROCESSING(SSobj, src) - . = ..() - -/obj/item/integrated_circuit/atmospherics/cooler/Destroy() - STOP_PROCESSING(SSobj, src) - . = ..() - -/obj/item/integrated_circuit/atmospherics/cooler/on_data_written() - temperature = max(243.15,min(293.15,get_pin_data(IC_INPUT, 1))) - if(get_pin_data(IC_INPUT, 2)) - power_draw_idle = 30 - else - power_draw_idle = 0 - -/obj/item/integrated_circuit/atmospherics/cooler/process() - set_pin_data(IC_OUTPUT, 2, air_contents.return_pressure()) - push_data() - - - //Get the turf you're on and its gas mixture - var/turf/current_turf = get_turf(src) - if(!current_turf) - return - - var/datum/gas_mixture/turf_air = current_turf.return_air() - if(!power_draw_idle || turf_air.return_temperature() < temperature) - return - - //Cool the gas - turf_air.set_temperature(max(243.15,turf_air.return_temperature() - (turf_air.return_temperature() - temperature) * heater_coefficient)) - - -// - atmospheric heater - // **works** -/obj/item/integrated_circuit/atmospherics/cooler/heater - name = "atmospheric heater circuit" - desc = "Heats the air around it." - -/obj/item/integrated_circuit/atmospherics/cooler/heater/on_data_written() - temperature = max(293.15,min(323.15,get_pin_data(IC_INPUT, 1))) - if(get_pin_data(IC_INPUT, 2)) - power_draw_idle = 30 - else - power_draw_idle = 0 - -/obj/item/integrated_circuit/atmospherics/cooler/heater/process() - set_pin_data(IC_OUTPUT, 2, air_contents.return_pressure()) - push_data() - - //Get the turf and its air mixture - var/turf/current_turf = get_turf(src) - if(!current_turf) - return - - var/datum/gas_mixture/turf_air = current_turf.return_air() - if(!power_draw_idle || turf_air.return_temperature() > temperature) - return - - //Heat the gas - turf_air.set_temperature(min(323.15,turf_air.return_temperature() + (temperature - turf_air.return_temperature()) * heater_coefficient)) - - -// - tank slot - // **works** -/obj/item/integrated_circuit/input/tank_slot - category_text = "Atmospherics" - cooldown_per_use = 1 - name = "tank slot" - desc = "Lets you add a tank to your assembly and remove it even when the assembly is closed." - extended_desc = "It can help you extract gases easier." - complexity = 25 - size = 30 - inputs = list() - outputs = list( - "pressure used" = IC_PINTYPE_NUMBER, - "current tank" = IC_PINTYPE_REF - ) - activators = list( - "push ref" = IC_PINTYPE_PULSE_IN, - "on insert" = IC_PINTYPE_PULSE_OUT, - "on remove" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - - can_be_asked_input = TRUE - demands_object_input = TRUE - can_input_object_when_closed = TRUE - - var/obj/item/tank/internals/current_tank - -/obj/item/integrated_circuit/input/tank_slot/Initialize() - START_PROCESSING(SSobj, src) - . = ..() - -/obj/item/integrated_circuit/input/tank_slot/process() - push_pressure() - -/obj/item/integrated_circuit/input/tank_slot/attackby(var/obj/item/tank/internals/I, var/mob/living/user) - //Check if it truly is a tank - if(!istype(I,/obj/item/tank/internals)) - to_chat(user,"The [I.name] doesn't seem to fit in here.") - return - - //Check if there is no other tank already inside - if(current_tank) - to_chat(user,"There is already a gas tank inside.") - return - - //The current tank is the one we just attached, its location is inside the circuit - current_tank = I - user.transferItemToLoc(I,src) - to_chat(user,"You put the [I.name] inside the tank slot.") - - //Set the pin to a weak reference of the current tank - push_pressure() - set_pin_data(IC_OUTPUT, 2, WEAKREF(current_tank)) - push_data() - do_work(1) - - -/obj/item/integrated_circuit/input/tank_slot/ask_for_input(mob/user) - attack_self(user) - -/obj/item/integrated_circuit/input/tank_slot/attack_self(mob/user) - //Check if no tank attached - if(!current_tank) - to_chat(user, "There is currently no tank attached.") - return - - //Remove tank and put in user's hands/location - to_chat(user, "You take [current_tank] out of the tank slot.") - user.put_in_hands(current_tank) - current_tank = null - - //Remove tank reference - push_pressure() - set_pin_data(IC_OUTPUT, 2, null) - push_data() - do_work(2) - -/obj/item/integrated_circuit/input/tank_slot/do_work() - set_pin_data(IC_OUTPUT, 2, WEAKREF(current_tank)) - push_data() - -/obj/item/integrated_circuit/input/tank_slot/proc/push_pressure() - if(!current_tank) - set_pin_data(IC_OUTPUT, 1, 0) - return - - var/datum/gas_mixture/tank_air = current_tank.return_air() - if(!tank_air) - set_pin_data(IC_OUTPUT, 1, 0) - return - - set_pin_data(IC_OUTPUT, 1, tank_air.return_pressure()) - push_data() - - -#undef SOURCE_TO_TARGET -#undef TARGET_TO_SOURCE -#undef PUMP_EFFICIENCY -#undef TANK_FAILURE_PRESSURE -#undef PUMP_MAX_PRESSURE -#undef PUMP_MAX_VOLUME diff --git a/code/modules/integrated_electronics/subtypes/converters.dm b/code/modules/integrated_electronics/subtypes/converters.dm deleted file mode 100644 index ad2599f8cf4a5..0000000000000 --- a/code/modules/integrated_electronics/subtypes/converters.dm +++ /dev/null @@ -1,425 +0,0 @@ -//These circuits convert one variable to another. -/obj/item/integrated_circuit/converter - complexity = 2 - inputs = list("input") - outputs = list("output") - activators = list("convert" = IC_PINTYPE_PULSE_IN, "on convert" = IC_PINTYPE_PULSE_OUT) - category_text = "Converter" - power_draw_per_use = 10 - -/obj/item/integrated_circuit/converter/num2text - name = "number to string" - desc = "This circuit can convert a number variable into a string." - extended_desc = "Because of circuit limitations, null/false variables will output a '0' string." - icon_state = "num-string" - inputs = list("input" = IC_PINTYPE_NUMBER) - outputs = list("output" = IC_PINTYPE_STRING) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/num2text/do_work() - var/result = null - pull_data() - var/incoming = get_pin_data(IC_INPUT, 1) - if(!isnull(incoming)) - result = num2text(incoming) - else if(!incoming) - result = "0" - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/converter/text2num - name = "string to number" - desc = "This circuit can convert a string variable into a number." - icon_state = "string-num" - inputs = list("input" = IC_PINTYPE_STRING) - outputs = list("output" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/text2num/do_work() - var/result = null - pull_data() - var/incoming = get_pin_data(IC_INPUT, 1) - if(!isnull(incoming)) - result = text2num(incoming) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/converter/ref2text - name = "reference to string" - desc = "This circuit can convert a reference to something else to a string, specifically the name of that reference." - icon_state = "ref-string" - inputs = list("input" = IC_PINTYPE_REF) - outputs = list("output" = IC_PINTYPE_STRING) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/ref2text/do_work() - var/result = null - pull_data() - var/atom/A = get_pin_data(IC_INPUT, 1) - if(A && istype(A)) - result = A.name - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/converter/refcode - name = "reference encoder" - desc = "This circuit can encode a reference into a string, which can then be read by a reference decoder circuit." - icon_state = "ref-string" - inputs = list("input" = IC_PINTYPE_REF) - outputs = list("output" = IC_PINTYPE_STRING) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/refcode/do_work() - var/result = null - pull_data() - var/atom/A = get_pin_data(IC_INPUT, 1) - if(A && istype(A)) - result = strtohex(XorEncrypt(REF(A), SScircuit.cipherkey)) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/converter/refdecode - name = "reference decoder" - desc = "This circuit can convert an encoded reference to an actual reference." - icon_state = "ref-string" - inputs = list("input" = IC_PINTYPE_STRING) - outputs = list("output" = IC_PINTYPE_REF) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/dec - -/obj/item/integrated_circuit/converter/refdecode/do_work() - pull_data() - dec = XorEncrypt(hextostr(get_pin_data(IC_INPUT, 1), TRUE), SScircuit.cipherkey) - set_pin_data(IC_OUTPUT, 1, WEAKREF(locate(dec))) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/converter/radians2degrees - name = "radians to degrees converter" - desc = "Converts radians to degrees." - inputs = list("radian" = IC_PINTYPE_NUMBER) - outputs = list("degrees" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/radians2degrees/do_work() - var/result = null - pull_data() - var/incoming = get_pin_data(IC_INPUT, 1) - if(!isnull(incoming)) - result = TODEGREES(incoming) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/converter/degrees2radians - name = "degrees to radians converter" - desc = "Converts degrees to radians." - inputs = list("degrees" = IC_PINTYPE_NUMBER) - outputs = list("radians" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/degrees2radians/do_work() - var/result = null - pull_data() - var/incoming = get_pin_data(IC_INPUT, 1) - if(!isnull(incoming)) - result = TORADIANS(incoming) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/converter/abs_to_rel_coords - name = "abs to rel coordinate converter" - desc = "Easily convert absolute coordinates to relative coordinates with this." - extended_desc = "Keep in mind that both sets of input coordinates should be absolute." - complexity = 1 - inputs = list( - "X1" = IC_PINTYPE_NUMBER, - "Y1" = IC_PINTYPE_NUMBER, - "X2" = IC_PINTYPE_NUMBER, - "Y2" = IC_PINTYPE_NUMBER - ) - outputs = list( - "X" = IC_PINTYPE_NUMBER, - "Y" = IC_PINTYPE_NUMBER - ) - activators = list("compute rel coordinates" = IC_PINTYPE_PULSE_IN, "on convert" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/abs_to_rel_coords/do_work() - var/x1 = get_pin_data(IC_INPUT, 1) - var/y1 = get_pin_data(IC_INPUT, 2) - - var/x2 = get_pin_data(IC_INPUT, 3) - var/y2 = get_pin_data(IC_INPUT, 4) - - if(!isnull(x1) && !isnull(y1) && !isnull(x2) && !isnull(y2)) - set_pin_data(IC_OUTPUT, 1, x1 - x2) - set_pin_data(IC_OUTPUT, 2, y1 - y2) - - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/converter/rel_to_abs_coords - name = "rel to abs coordinate converter" - desc = "Convert relative coordinates to absolute coordinates with this." - extended_desc = "Keep in mind that only one set of input coordinates should be absolute, and the other relative. \ - The output coordinates will be the absolute form of the input relative coordinates." - complexity = 1 - inputs = list( - "X1" = IC_PINTYPE_NUMBER, - "Y1" = IC_PINTYPE_NUMBER, - "X2" = IC_PINTYPE_NUMBER, - "Y2" = IC_PINTYPE_NUMBER - ) - outputs = list( - "X" = IC_PINTYPE_NUMBER, - "Y" = IC_PINTYPE_NUMBER - ) - activators = list("compute abs coordinates" = IC_PINTYPE_PULSE_IN, "on convert" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/rel_to_abs_coords/do_work() - var/x1 = get_pin_data(IC_INPUT, 1) - var/y1 = get_pin_data(IC_INPUT, 2) - - var/x2 = get_pin_data(IC_INPUT, 3) - var/y2 = get_pin_data(IC_INPUT, 4) - - if(!isnull(x1) && !isnull(y1) && !isnull(x2) && !isnull(y2)) - set_pin_data(IC_OUTPUT, 1, x1 + x2) - set_pin_data(IC_OUTPUT, 2, y1 + y2) - - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/converter/adv_rel_to_abs_coords - name = "advanced rel to abs coordinate converter" - desc = "Easily convert relative coordinates to absolute coordinates with this." - extended_desc = "This circuit only requires a single set of relative inputs to output absolute coordinates." - complexity = 2 - inputs = list( - "X" = IC_PINTYPE_NUMBER, - "Y" = IC_PINTYPE_NUMBER, - ) - outputs = list( - "X" = IC_PINTYPE_NUMBER, - "Y" = IC_PINTYPE_NUMBER - ) - activators = list("compute abs coordinates" = IC_PINTYPE_PULSE_IN, "on convert" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/adv_rel_to_abs_coords/do_work() - var/turf/T = get_turf(src) - - if(!T) - return - - var/x1 = get_pin_data(IC_INPUT, 1) - var/y1 = get_pin_data(IC_INPUT, 2) - - if(!isnull(x1) && !isnull(y1)) - set_pin_data(IC_OUTPUT, 1, T.x + x1) - set_pin_data(IC_OUTPUT, 2, T.y + y1) - - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/converter/hsv2hex - name = "hsv to hexadecimal" - desc = "This circuit can convert a HSV (Hue, Saturation, and Value) color to a Hexadecimal RGB color." - extended_desc = "The first pin controls tint (0-359), the second pin controls how intense the tint is (0-255), and the third controls how bright the tint is (0 for black, 127 for normal, 255 for white)." - icon_state = "hsv-hex" - inputs = list( - "hue" = IC_PINTYPE_NUMBER, - "saturation" = IC_PINTYPE_NUMBER, - "value" = IC_PINTYPE_NUMBER - ) - outputs = list("hexadecimal rgb" = IC_PINTYPE_COLOR) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/hsv2hex/do_work() - var/result = null - pull_data() - var/hue = get_pin_data(IC_INPUT, 1) - var/saturation = get_pin_data(IC_INPUT, 2) - var/value = get_pin_data(IC_INPUT, 3) - if(isnum_safe(hue)&&isnum_safe(saturation)&&isnum_safe(value)) - result = HSVtoRGB(hsv(AngleToHue(hue),saturation,value)) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/converter/rgb2hex - name = "rgb to hexadecimal" - desc = "This circuit can convert a RGB (Red, Green, Blue) color to a Hexadecimal RGB color." - extended_desc = "The first pin controls red amount, the second pin controls green amount, and the third controls blue amount. They all go from 0-255." - icon_state = "rgb-hex" - inputs = list( - "red" = IC_PINTYPE_NUMBER, - "green" = IC_PINTYPE_NUMBER, - "blue" = IC_PINTYPE_NUMBER - ) - outputs = list("hexadecimal rgb" = IC_PINTYPE_COLOR) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/rgb2hex/do_work() - var/result = null - pull_data() - var/red = get_pin_data(IC_INPUT, 1) - var/green = get_pin_data(IC_INPUT, 2) - var/blue = get_pin_data(IC_INPUT, 3) - if(isnum_safe(red)&&isnum_safe(green)&&isnum_safe(blue)) - result = rgb(red,green,blue) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - - -// - hsv to rgb - // -/obj/item/integrated_circuit/converter/hsv2rgb - name = "hsv to rgb" - desc = "This circuit can convert a HSV (Hue, Saturation, and Value) color to a RGB (red, blue and green) color." - extended_desc = "The first pin controls tint (0-359), the second pin controls how intense the tint is (0-255), and the third controls how bright the tint is (0 for black, 127 for normal, 255 for white)." - icon_state = "hsv-hex" - inputs = list( - "hue" = IC_PINTYPE_NUMBER, - "saturation" = IC_PINTYPE_NUMBER, - "value" = IC_PINTYPE_NUMBER - ) - outputs = list( - "red" = IC_PINTYPE_NUMBER, - "green" = IC_PINTYPE_NUMBER, - "blue" = IC_PINTYPE_NUMBER - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/integrated_circuit/converter/hsv2rgb/do_work() - var/hue = get_pin_data(IC_INPUT, 1) - var/sat = get_pin_data(IC_INPUT, 2) - var/val = get_pin_data(IC_INPUT, 3) - if(!hue || !sat || !val) - set_pin_data(IC_OUTPUT, 1, 0) - set_pin_data(IC_OUTPUT, 2, 0) - set_pin_data(IC_OUTPUT, 3, 0) - else - var/list/RGB = ReadRGB(HSVtoRGB(hsv(hue,sat,val))) - - set_pin_data(IC_OUTPUT, 1, RGB[1]) - set_pin_data(IC_OUTPUT, 2, RGB[2]) - set_pin_data(IC_OUTPUT, 3, RGB[3]) - push_data() - activate_pin(2) - - -// - rgb to hsv - // -/obj/item/integrated_circuit/converter/rgb2hsv - name = "rgb to hsv" - desc = "This circuit can convert a RGB (Red, Blue, and Green) color to a HSV (Hue, Saturation and Value) color." - extended_desc = "All values for the RGB colors are situated between 0 and 255." - icon_state = "hsv-hex" - inputs = list( - "red" = IC_PINTYPE_NUMBER, - "green" = IC_PINTYPE_NUMBER, - "blue" = IC_PINTYPE_NUMBER - ) - outputs = list( - "hue" = IC_PINTYPE_NUMBER, - "saturation" = IC_PINTYPE_NUMBER, - "value" = IC_PINTYPE_NUMBER - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/rgb2hsv/do_work() - var/red = get_pin_data(IC_INPUT, 1) - var/blue = get_pin_data(IC_INPUT, 2) - var/green = get_pin_data(IC_INPUT, 3) - if(!red || !blue || !green) - set_pin_data(IC_OUTPUT, 1, 0) - set_pin_data(IC_OUTPUT, 2, 0) - set_pin_data(IC_OUTPUT, 3, 0) - else - var/list/HSV = ReadHSV(RGBtoHSV(rgb(red,blue,green))) - - set_pin_data(IC_OUTPUT, 1, HSV[1]) - set_pin_data(IC_OUTPUT, 2, HSV[2]) - set_pin_data(IC_OUTPUT, 3, HSV[3]) - push_data() - activate_pin(2) - - -// - hexadecimal to hsv - // -/obj/item/integrated_circuit/converter/hex2hsv - name = "hexadecimal to hsv" - desc = "This circuit can convert a Hexadecimal RGB color into a HSV (Hue, Saturation and Value) color." - extended_desc = "Hexadecimal colors follow the format #RRBBGG, RR being the red value, BB the blue value and GG the green value. They are written in hexadecimal, giving each color a value from 0 (00) to 255 (FF)." - icon_state = "hsv-hex" - inputs = list("hexadecimal rgb" = IC_PINTYPE_COLOR) - outputs = list( - "hue" = IC_PINTYPE_NUMBER, - "saturation" = IC_PINTYPE_NUMBER, - "value" = IC_PINTYPE_NUMBER - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/hex2hsv/do_work() - pull_data() - var/rgb = get_pin_data(IC_INPUT, 1) - if(!rgb) - set_pin_data(IC_OUTPUT, 1, 0) - set_pin_data(IC_OUTPUT, 2, 0) - set_pin_data(IC_OUTPUT, 3, 0) - return - else - var/list/hsv = ReadHSV(RGBtoHSV(rgb)) - set_pin_data(IC_OUTPUT, 1, hsv[1]) - set_pin_data(IC_OUTPUT, 2, hsv[2]) - set_pin_data(IC_OUTPUT, 3, hsv[3]) - push_data() - activate_pin(2) - - -// - hex 2 rgb - // -/obj/item/integrated_circuit/converter/hex2rgb - name = "hexadecimal to rgb" - desc = "This circuit can convert a Hexadecimal RGB color into a RGB (Red, Blue and Green color." - extended_desc = "Hexadecimal colors follow the format #RRBBGG, RR being the red value, BB the blue value and GG the green value. They are written in hexadecimal, giving each color a value from 0 (00) to 255 (FF)." - icon_state = "hsv-hex" - inputs = list("hexadecimal rgb" = IC_PINTYPE_COLOR) - outputs = list( - "red" = IC_PINTYPE_NUMBER, - "green" = IC_PINTYPE_NUMBER, - "blue" = IC_PINTYPE_NUMBER - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/converter/hex2rgb/do_work() - var/rgb = get_pin_data(IC_INPUT, 1) - if(!rgb) - set_pin_data(IC_OUTPUT, 1, 0) - set_pin_data(IC_OUTPUT, 2, 0) - set_pin_data(IC_OUTPUT, 3, 0) - else - var/list/RGB = ReadRGB(rgb) - - set_pin_data(IC_OUTPUT, 1, RGB[1]) - set_pin_data(IC_OUTPUT, 2, RGB[2]) - set_pin_data(IC_OUTPUT, 3, RGB[3]) - - push_data() - activate_pin(2) diff --git a/code/modules/integrated_electronics/subtypes/data_transfer.dm b/code/modules/integrated_electronics/subtypes/data_transfer.dm deleted file mode 100644 index f723c78b22298..0000000000000 --- a/code/modules/integrated_electronics/subtypes/data_transfer.dm +++ /dev/null @@ -1,208 +0,0 @@ -/obj/item/integrated_circuit/transfer - category_text = "Data Transfer" - power_draw_per_use = 2 - -/obj/item/integrated_circuit/transfer/multiplexer - name = "two multiplexer" - desc = "This is what those in the business tend to refer to as a 'mux', or data selector. It moves data from one of the selected inputs to the output." - extended_desc = "The first input pin is used to select which of the other input pins which has its data moved to the output. \ - If the input selection is outside the valid range then no output is given." - complexity = 2 - icon_state = "mux2" - inputs = list("input selection" = IC_PINTYPE_NUMBER) - outputs = list("output" = IC_PINTYPE_ANY) - activators = list("select" = IC_PINTYPE_PULSE_IN, "on select" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 4 - var/number_of_pins = 2 - -/obj/item/integrated_circuit/transfer/multiplexer/Initialize() - for(var/i = 1 to number_of_pins) - inputs["input [i]"] = IC_PINTYPE_ANY // This is just a string since pins don't get built until ..() is called. - - complexity = number_of_pins - . = ..() - desc += " It has [number_of_pins] input pins." - extended_desc += " This multiplexer has a range from 1 to [inputs.len - 1]." - -/obj/item/integrated_circuit/transfer/multiplexer/do_work() - var/input_index = get_pin_data(IC_INPUT, 1) - - if(!isnull(input_index) && (input_index >= 1 && input_index < inputs.len)) - set_pin_data(IC_OUTPUT, 1,get_pin_data(IC_INPUT, input_index + 1)) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/transfer/multiplexer/medium - name = "four multiplexer" - icon_state = "mux4" - number_of_pins = 4 - -/obj/item/integrated_circuit/transfer/multiplexer/large - name = "eight multiplexer" - w_class = WEIGHT_CLASS_SMALL - icon_state = "mux8" - number_of_pins = 8 - -/obj/item/integrated_circuit/transfer/multiplexer/huge - name = "sixteen multiplexer" - icon_state = "mux16" - w_class = WEIGHT_CLASS_SMALL - number_of_pins = 16 - -/obj/item/integrated_circuit/transfer/demultiplexer - name = "two demultiplexer" - desc = "This is what those in the business tend to refer to as a 'demux'. It moves data from the input to one of the selected outputs." - extended_desc = "The first input pin is used to select which of the output pins is given the data from the second input pin. \ - If the output selection is outside the valid range then no output is given." - complexity = 2 - icon_state = "dmux2" - inputs = list("output selection" = IC_PINTYPE_NUMBER, "input" = IC_PINTYPE_ANY) - outputs = list() - activators = list("select" = IC_PINTYPE_PULSE_IN, "on select" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 4 - var/number_of_pins = 2 - -/obj/item/integrated_circuit/transfer/demultiplexer/Initialize() - for(var/i = 1 to number_of_pins) - outputs["output [i]"] = IC_PINTYPE_ANY - complexity = number_of_pins - - . = ..() - desc += " It has [number_of_pins] output pins." - extended_desc += " This demultiplexer has a range from 1 to [outputs.len]." - -/obj/item/integrated_circuit/transfer/demultiplexer/do_work() - var/output_index = get_pin_data(IC_INPUT, 1) - if(!isnull(output_index) && (output_index >= 1 && output_index <= outputs.len)) - var/datum/integrated_io/O = outputs[output_index] - O.data = get_pin_data(IC_INPUT, 2) - O.push_data() - - activate_pin(2) - -/obj/item/integrated_circuit/transfer/demultiplexer/medium - name = "four demultiplexer" - icon_state = "dmux4" - number_of_pins = 4 - -/obj/item/integrated_circuit/transfer/demultiplexer/large - name = "eight demultiplexer" - icon_state = "dmux8" - w_class = WEIGHT_CLASS_SMALL - number_of_pins = 8 - -/obj/item/integrated_circuit/transfer/demultiplexer/huge - name = "sixteen demultiplexer" - icon_state = "dmux16" - w_class = WEIGHT_CLASS_SMALL - number_of_pins = 16 - -/obj/item/integrated_circuit/transfer/pulsedemultiplexer - name = "two pulse demultiplexer" - desc = "Selector switch to choose the pin to be activated by number." - extended_desc = "The first input pin is used to select which of the pulse out pins will be activated after activation of the circuit. \ - If the output selection is outside the valid range then no output is given." - complexity = 2 - icon_state = "dmux2" - inputs = list("output selection" = IC_PINTYPE_NUMBER) - outputs = list() - activators = list("select" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 4 - var/number_of_pins = 2 - -/obj/item/integrated_circuit/transfer/pulsedemultiplexer/Initialize() - for(var/i = 1 to number_of_pins) - activators["output [i]"] = IC_PINTYPE_PULSE_OUT - complexity = number_of_pins - - . = ..() - desc += " It has [number_of_pins] output pins." - extended_desc += " This pulse demultiplexer has a range from 1 to [activators.len - 1]." - -/obj/item/integrated_circuit/transfer/pulsedemultiplexer/do_work() - var/output_index = get_pin_data(IC_INPUT, 1) - - if(output_index == CLAMP(output_index, 1, number_of_pins)) - activate_pin(round(output_index + 1 ,1)) - -/obj/item/integrated_circuit/transfer/pulsedemultiplexer/medium - name = "four pulse demultiplexer" - icon_state = "dmux4" - number_of_pins = 4 - -/obj/item/integrated_circuit/transfer/pulsedemultiplexer/large - name = "eight pulse demultiplexer" - icon_state = "dmux8" - w_class = WEIGHT_CLASS_SMALL - number_of_pins = 8 - -/obj/item/integrated_circuit/transfer/pulsedemultiplexer/huge - name = "sixteen pulse demultiplexer" - icon_state = "dmux16" - w_class = WEIGHT_CLASS_SMALL - number_of_pins = 16 - -/obj/item/integrated_circuit/transfer/pulsemultiplexer - name = "two pulse multiplexer" - desc = "Pulse in pins to choose the pin value to be sent." - extended_desc = "The input pulses are used to select which of the input pins has its data moved to the output." - complexity = 2 - icon_state = "dmux2" - inputs = list() - outputs = list("output" = IC_PINTYPE_ANY) - activators = list("on selected" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 4 - var/number_of_pins = 2 - -/obj/item/integrated_circuit/transfer/pulsemultiplexer/Initialize() - for(var/i = 1 to number_of_pins) - inputs["input [i]"] = IC_PINTYPE_ANY - for(var/i = 1 to number_of_pins) - activators["input [i]"] = IC_PINTYPE_PULSE_IN - complexity = number_of_pins - - . = ..() - desc += " It has [number_of_pins] pulse in pins and [number_of_pins] output pins." - extended_desc += " This pulse multiplexer has a range from 1 to [activators.len - 1]." - -/obj/item/integrated_circuit/transfer/pulsemultiplexer/do_work(ord) - var/input_index = ord - 2 - - if(!isnull(input_index) && (input_index >= 0 && input_index < inputs.len)) - set_pin_data(IC_OUTPUT, 1,get_pin_data(IC_INPUT, input_index + 1)) - push_data() - activate_pin(1) - -/obj/item/integrated_circuit/transfer/pulsemultiplexer/medium - name = "four pulse multiplexer" - icon_state = "dmux4" - number_of_pins = 4 - -/obj/item/integrated_circuit/transfer/pulsemultiplexer/large - name = "eight pulse multiplexer" - icon_state = "dmux8" - w_class = WEIGHT_CLASS_SMALL - number_of_pins = 8 - -/obj/item/integrated_circuit/transfer/pulsemultiplexer/huge - name = "sixteen pulse multiplexer" - icon_state = "dmux16" - w_class = WEIGHT_CLASS_SMALL - number_of_pins = 16 - -/obj/item/integrated_circuit/transfer/wire_node - name = "wire node" - desc = "Just a wire node to make wiring easier. Transfers the pulse from in to out." - icon_state = "wire_node" - activators = list("pulse in" = IC_PINTYPE_PULSE_IN, "pulse out" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 0 - complexity = 0 - size = 0.1 - -/obj/item/integrated_circuit/transfer/wire_node/do_work() - activate_pin(2) diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm deleted file mode 100644 index c3ba39b876a60..0000000000000 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ /dev/null @@ -1,1472 +0,0 @@ -/obj/item/integrated_circuit/input - var/can_be_asked_input = 0 - category_text = "Input" - power_draw_per_use = 5 - -/obj/item/integrated_circuit/input/proc/ask_for_input(mob/user) - return - -/obj/item/integrated_circuit/input/button - name = "button" - desc = "This tiny button must do something, right?" - icon_state = "button" - complexity = 1 - can_be_asked_input = 1 - inputs = list() - outputs = list() - activators = list("on pressed" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/input/button/ask_for_input(mob/user) //Bit misleading name for this specific use. - to_chat(user, "You press the button labeled '[displayed_name]'.") - activate_pin(1) - -/obj/item/integrated_circuit/input/toggle_button - name = "toggle button" - desc = "It toggles on, off, on, off..." - icon_state = "toggle_button" - complexity = 1 - can_be_asked_input = 1 - inputs = list() - outputs = list("on" = IC_PINTYPE_BOOLEAN) - activators = list("on toggle" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/input/toggle_button/ask_for_input(mob/user) // Ditto. - set_pin_data(IC_OUTPUT, 1, !get_pin_data(IC_OUTPUT, 1)) - push_data() - activate_pin(1) - to_chat(user, "You toggle the button labeled '[displayed_name]' [get_pin_data(IC_OUTPUT, 1) ? "on" : "off"].") - -/obj/item/integrated_circuit/input/numberpad - name = "number pad" - desc = "This small number pad allows someone to input a number into the system." - icon_state = "numberpad" - complexity = 2 - can_be_asked_input = 1 - inputs = list() - outputs = list("number entered" = IC_PINTYPE_NUMBER) - activators = list("on entered" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 4 - -/obj/item/integrated_circuit/input/numberpad/ask_for_input(mob/user) - var/new_input = input(user, "Enter a number, please.",displayed_name) as null|num - if(isnum_safe(new_input) && user.IsAdvancedToolUser()) - set_pin_data(IC_OUTPUT, 1, new_input) - push_data() - activate_pin(1) - -/obj/item/integrated_circuit/input/textpad - name = "text pad" - desc = "This small text pad allows someone to input a string into the system." - icon_state = "textpad" - complexity = 2 - can_be_asked_input = 1 - inputs = list() - outputs = list("string entered" = IC_PINTYPE_STRING) - activators = list("on entered" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 4 - -/obj/item/integrated_circuit/input/textpad/ask_for_input(mob/user) - var/new_input = stripped_multiline_input(user, "Enter some words, please.",displayed_name) - if(istext(new_input) && user.IsAdvancedToolUser()) - set_pin_data(IC_OUTPUT, 1, new_input) - push_data() - activate_pin(1) - -/obj/item/integrated_circuit/input/colorpad - name = "color pad" - desc = "This small color pad allows someone to input a hexadecimal color into the system." - icon_state = "colorpad" - complexity = 2 - can_be_asked_input = 1 - inputs = list() - outputs = list("color entered" = IC_PINTYPE_STRING) - activators = list("on entered" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 4 - -/obj/item/integrated_circuit/input/colorpad/ask_for_input(mob/user) - var/new_color = input(user, "Enter a color, please.", "Color", "#ffffff") as color|null - if(new_color && user.IsAdvancedToolUser()) - set_pin_data(IC_OUTPUT, 1, new_color) - push_data() - activate_pin(1) - -/obj/item/integrated_circuit/input/med_scanner - name = "integrated medical analyser" - desc = "A very small version of the common medical analyser. This allows the machine to know how healthy someone is." - icon_state = "medscan" - complexity = 4 - inputs = list("target" = IC_PINTYPE_REF) - outputs = list( - "total health %" = IC_PINTYPE_NUMBER, - "total missing health" = IC_PINTYPE_NUMBER - ) - activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 40 - -/obj/item/integrated_circuit/input/med_scanner/do_work() - var/mob/living/H = get_pin_data_as_type(IC_INPUT, 1, /mob/living) - if(!istype(H)) //Invalid input - return - if(H.Adjacent(get_turf(src))) // Like normal analysers, it can't be used at range. - var/total_health = round(H.health/H.getMaxHealth(), 0.01)*100 - var/missing_health = H.getMaxHealth() - H.health - - set_pin_data(IC_OUTPUT, 1, total_health) - set_pin_data(IC_OUTPUT, 2, missing_health) - - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/adv_med_scanner - name = "integrated adv. medical analyser" - desc = "A very small version of the medbot's medical analyser. This allows the machine to know how healthy someone is. \ - This type is much more precise, allowing the machine to know much more about the target than a normal analyzer." - icon_state = "medscan_adv" - complexity = 12 - inputs = list("target" = IC_PINTYPE_REF) - outputs = list( - "total health %" = IC_PINTYPE_NUMBER, - "total missing health" = IC_PINTYPE_NUMBER, - "brute damage" = IC_PINTYPE_NUMBER, - "burn damage" = IC_PINTYPE_NUMBER, - "tox damage" = IC_PINTYPE_NUMBER, - "oxy damage" = IC_PINTYPE_NUMBER, - "clone damage" = IC_PINTYPE_NUMBER - ) - activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 80 - -/obj/item/integrated_circuit/input/adv_med_scanner/do_work() - var/mob/living/H = get_pin_data_as_type(IC_INPUT, 1, /mob/living) - if(!istype(H)) //Invalid input - return - if(H in view(get_turf(src))) // Like medbot's analyzer it can be used in range.. - var/total_health = round(H.health/H.getMaxHealth(), 0.01)*100 - var/missing_health = H.getMaxHealth() - H.health - - set_pin_data(IC_OUTPUT, 1, total_health) - set_pin_data(IC_OUTPUT, 2, missing_health) - set_pin_data(IC_OUTPUT, 3, H.getBruteLoss()) - set_pin_data(IC_OUTPUT, 4, H.getFireLoss()) - set_pin_data(IC_OUTPUT, 5, H.getToxLoss()) - set_pin_data(IC_OUTPUT, 6, H.getOxyLoss()) - set_pin_data(IC_OUTPUT, 7, H.getCloneLoss()) - - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/slime_scanner - name = "slime scanner" - desc = "A very small version of the xenobio analyser. This allows the machine to know every needed properties of slime. Output mutation list is non-associative." - icon_state = "medscan_adv" - complexity = 12 - inputs = list("target" = IC_PINTYPE_REF) - outputs = list( - "colour" = IC_PINTYPE_STRING, - "adult" = IC_PINTYPE_BOOLEAN, - "nutrition" = IC_PINTYPE_NUMBER, - "charge" = IC_PINTYPE_NUMBER, - "health" = IC_PINTYPE_NUMBER, - "possible mutation" = IC_PINTYPE_LIST, - "genetic destability" = IC_PINTYPE_NUMBER, - "slime core amount" = IC_PINTYPE_NUMBER, - "Growth progress" = IC_PINTYPE_NUMBER, - ) - activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 80 - -/obj/item/integrated_circuit/input/slime_scanner/do_work() - var/mob/living/simple_animal/slime/T = get_pin_data_as_type(IC_INPUT, 1, /mob/living/simple_animal/slime) - if(!isslime(T)) //Invalid input - return - if(T in view(get_turf(src))) // Like medbot's analyzer it can be used in range.. - - set_pin_data(IC_OUTPUT, 1, T.colour) - set_pin_data(IC_OUTPUT, 2, T.is_adult) - set_pin_data(IC_OUTPUT, 3, T.nutrition/T.get_max_nutrition()) - set_pin_data(IC_OUTPUT, 4, T.powerlevel) - set_pin_data(IC_OUTPUT, 5, round(T.health/T.maxHealth,0.01)*100) - set_pin_data(IC_OUTPUT, 6, uniqueList(T.slime_mutation)) - set_pin_data(IC_OUTPUT, 7, T.mutation_chance) - set_pin_data(IC_OUTPUT, 8, T.cores) - set_pin_data(IC_OUTPUT, 9, T.amount_grown/SLIME_EVOLUTION_THRESHOLD) - - - push_data() - activate_pin(2) - - - -/obj/item/integrated_circuit/input/plant_scanner - name = "integrated plant analyzer" - desc = "A very small version of the plant analyser. This allows the machine to know all valuable parameters of plants in trays. \ - It can only scan plants, not seeds or fruits." - icon_state = "medscan_adv" - complexity = 12 - inputs = list("target" = IC_PINTYPE_REF) - outputs = list( - "plant type" = IC_PINTYPE_STRING, - "age" = IC_PINTYPE_NUMBER, - "potency" = IC_PINTYPE_NUMBER, - "yield" = IC_PINTYPE_NUMBER, - "Maturation speed" = IC_PINTYPE_NUMBER, - "Production speed" = IC_PINTYPE_NUMBER, - "Endurance" = IC_PINTYPE_NUMBER, - "Lifespan" = IC_PINTYPE_NUMBER, - "Weed Growth Rate" = IC_PINTYPE_NUMBER, - "Weed Vulnerability" = IC_PINTYPE_NUMBER, - "Weed level" = IC_PINTYPE_NUMBER, - "Pest level" = IC_PINTYPE_NUMBER, - "Toxicity level" = IC_PINTYPE_NUMBER, - "Water level" = IC_PINTYPE_NUMBER, - "Nutrition level" = IC_PINTYPE_NUMBER, - "harvest" = IC_PINTYPE_NUMBER, - "dead" = IC_PINTYPE_NUMBER, - "plant health" = IC_PINTYPE_NUMBER, - "self sustaining" = IC_PINTYPE_NUMBER, - "using irrigation" = IC_PINTYPE_NUMBER, - "connected trays" = IC_PINTYPE_LIST - ) - activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 10 - -/obj/item/integrated_circuit/input/plant_scanner/do_work() - var/obj/machinery/hydroponics/H = get_pin_data_as_type(IC_INPUT, 1, /obj/machinery/hydroponics) - if(!istype(H)) //Invalid input - return - for(var/i=1, i<=outputs.len, i++) - set_pin_data(IC_OUTPUT, i, null) - if(H in view(get_turf(src))) // Like medbot's analyzer it can be used in range.. - if(H.myseed) - set_pin_data(IC_OUTPUT, 1, H.myseed.plantname) - set_pin_data(IC_OUTPUT, 2, H.age) - set_pin_data(IC_OUTPUT, 3, H.myseed.potency) - set_pin_data(IC_OUTPUT, 4, H.myseed.yield) - set_pin_data(IC_OUTPUT, 5, H.myseed.maturation) - set_pin_data(IC_OUTPUT, 6, H.myseed.production) - set_pin_data(IC_OUTPUT, 7, H.myseed.endurance) - set_pin_data(IC_OUTPUT, 8, H.myseed.lifespan) - set_pin_data(IC_OUTPUT, 9, H.myseed.weed_rate) - set_pin_data(IC_OUTPUT, 10, H.myseed.weed_chance) - set_pin_data(IC_OUTPUT, 11, H.weedlevel) - set_pin_data(IC_OUTPUT, 12, H.pestlevel) - set_pin_data(IC_OUTPUT, 13, H.toxic) - set_pin_data(IC_OUTPUT, 14, H.waterlevel) - set_pin_data(IC_OUTPUT, 15, H.nutrilevel) - set_pin_data(IC_OUTPUT, 16, H.harvest) - set_pin_data(IC_OUTPUT, 17, H.dead) - set_pin_data(IC_OUTPUT, 18, H.plant_health) - set_pin_data(IC_OUTPUT, 19, H.self_sustaining) - set_pin_data(IC_OUTPUT, 20, H.using_irrigation) - set_pin_data(IC_OUTPUT, 21, H.FindConnected()) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/gene_scanner - name = "gene scanner" - desc = "This circuit will scan the target plant for traits and reagent genes. Output is non-associative." - extended_desc = "This allows the machine to scan plants in trays for reagent and trait genes. \ - It can only scan plants, not seeds or fruits." - inputs = list( - "target" = IC_PINTYPE_REF - ) - outputs = list( - "traits" = IC_PINTYPE_LIST, - "reagents" = IC_PINTYPE_LIST - ) - activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) - icon_state = "medscan_adv" - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/input/gene_scanner/do_work() - var/list/gtraits = list() - var/list/greagents = list() - var/obj/machinery/hydroponics/H = get_pin_data_as_type(IC_INPUT, 1, /obj/machinery/hydroponics) - if(!istype(H)) //Invalid input - return - for(var/i=1, i<=outputs.len, i++) - set_pin_data(IC_OUTPUT, i, null) - if(H in view(get_turf(src))) // Like medbot's analyzer it can be used in range.. - if(H.myseed) - for(var/datum/plant_gene/reagent/G in H.myseed.genes) - greagents.Add(G.get_name()) - - for(var/datum/plant_gene/trait/G in H.myseed.genes) - gtraits.Add(G.get_name()) - - set_pin_data(IC_OUTPUT, 1, gtraits) - set_pin_data(IC_OUTPUT, 2, greagents) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/input/examiner - name = "examiner" - desc = "It's a little machine vision system. It can return the name, description, distance, \ - relative coordinates, total amount of reagents, maximum amount of reagents, density, and opacity of the referenced object." - icon_state = "video_camera" - complexity = 6 - inputs = list( - "target" = IC_PINTYPE_REF - ) - outputs = list( - "name" = IC_PINTYPE_STRING, - "description" = IC_PINTYPE_STRING, - "X" = IC_PINTYPE_NUMBER, - "Y" = IC_PINTYPE_NUMBER, - "distance" = IC_PINTYPE_NUMBER, - "max reagents" = IC_PINTYPE_NUMBER, - "amount of reagents" = IC_PINTYPE_NUMBER, - "density" = IC_PINTYPE_BOOLEAN, - "opacity" = IC_PINTYPE_BOOLEAN, - "occupied turf" = IC_PINTYPE_REF - ) - activators = list( - "scan" = IC_PINTYPE_PULSE_IN, - "on scanned" = IC_PINTYPE_PULSE_OUT, - "not scanned" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 80 - -/obj/item/integrated_circuit/input/examiner/do_work() - var/atom/H = get_pin_data_as_type(IC_INPUT, 1, /atom) - var/turf/T = get_turf(src) - - if(!istype(H) || !(H in view(T))) - activate_pin(3) - else - set_pin_data(IC_OUTPUT, 1, H.name) - set_pin_data(IC_OUTPUT, 2, H.desc) - - if(istype(H, /mob/living)) - var/mob/living/M = H - var/msg = M.examine() - if(msg) - set_pin_data(IC_OUTPUT, 2, msg) - - set_pin_data(IC_OUTPUT, 3, H.x-T.x) - set_pin_data(IC_OUTPUT, 4, H.y-T.y) - set_pin_data(IC_OUTPUT, 5, sqrt((H.x-T.x)*(H.x-T.x)+ (H.y-T.y)*(H.y-T.y))) - var/mr = 0 - var/tr = 0 - if(H.reagents) - mr = H.reagents.maximum_volume - tr = H.reagents.total_volume - set_pin_data(IC_OUTPUT, 6, mr) - set_pin_data(IC_OUTPUT, 7, tr) - set_pin_data(IC_OUTPUT, 8, H.CanPass(assembly ? assembly : src, get_turf(H))) - set_pin_data(IC_OUTPUT, 9, H.opacity) - set_pin_data(IC_OUTPUT, 10, get_turf(H)) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/turfpoint - name = "Tile pointer" - desc = "This circuit will get a tile ref with the provided absolute coordinates." - extended_desc = "If the machine cannot see the target, it will not be able to calculate the correct direction.\ - This circuit only works while inside an assembly." - icon_state = "numberpad" - complexity = 5 - inputs = list("X" = IC_PINTYPE_NUMBER,"Y" = IC_PINTYPE_NUMBER) - outputs = list("tile" = IC_PINTYPE_REF) - activators = list("calculate dir" = IC_PINTYPE_PULSE_IN, "on calculated" = IC_PINTYPE_PULSE_OUT,"not calculated" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 40 - -/obj/item/integrated_circuit/input/turfpoint/do_work() - if(!assembly) - activate_pin(3) - return - var/turf/T = get_turf(assembly) - var/target_x = CLAMP(get_pin_data(IC_INPUT, 1), 0, world.maxx) - var/target_y = CLAMP(get_pin_data(IC_INPUT, 2), 0, world.maxy) - var/turf/A = locate(target_x, target_y, T.z) - set_pin_data(IC_OUTPUT, 1, null) - if(!A || !(A in view(T))) - activate_pin(3) - return - else - set_pin_data(IC_OUTPUT, 1, WEAKREF(A)) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/turfscan - name = "tile analyzer" - desc = "This circuit can analyze the contents of the scanned turf, and can read letters on the turf." - icon_state = "video_camera" - complexity = 5 - inputs = list( - "target" = IC_PINTYPE_REF - ) - outputs = list( - "located ref" = IC_PINTYPE_LIST, - "Written letters" = IC_PINTYPE_STRING, - "area" = IC_PINTYPE_STRING - ) - activators = list( - "scan" = IC_PINTYPE_PULSE_IN, - "on scanned" = IC_PINTYPE_PULSE_OUT, - "not scanned" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 40 - cooldown_per_use = 10 - -/obj/item/integrated_circuit/input/turfscan/do_work() - var/turf/scanned_turf = get_pin_data_as_type(IC_INPUT, 1, /turf) - var/turf/circuit_turf = get_turf(src) - var/area_name = get_area_name(scanned_turf) - if(!istype(scanned_turf)) //Invalid input - activate_pin(3) - return - - if(scanned_turf in view(circuit_turf)) // This is a camera. It can't examine things that it can't see. - var/list/turf_contents = new() - for(var/obj/U in scanned_turf) - turf_contents += WEAKREF(U) - for(var/mob/U in scanned_turf) - turf_contents += WEAKREF(U) - set_pin_data(IC_OUTPUT, 1, turf_contents) - set_pin_data(IC_OUTPUT, 3, area_name) - var/list/St = new() - for(var/obj/effect/decal/cleanable/crayon/I in scanned_turf) - St.Add(I.icon_state) - if(St.len) - set_pin_data(IC_OUTPUT, 2, jointext(St, ",", 1, 0)) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/turfpoint - name = "tile pointer" - desc = "This circuit will get tile ref with given absolute coorinates." - extended_desc = "If the machine cannot see the target, it will not be able to scan it.\ - This circuit will only work in an assembly." - icon_state = "numberpad" - complexity = 5 - inputs = list("X" = IC_PINTYPE_NUMBER,"Y" = IC_PINTYPE_NUMBER) - outputs = list("tile" = IC_PINTYPE_REF) - activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT,"not scanned" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 40 - -/obj/item/integrated_circuit/input/turfpoint/do_work() - if(!assembly) - activate_pin(3) - return - var/turf/T = get_turf(assembly) - var/target_x = CLAMP(get_pin_data(IC_INPUT, 1), 0, world.maxx) - var/target_y = CLAMP(get_pin_data(IC_INPUT, 2), 0, world.maxy) - var/turf/A = locate(target_x, target_y, T.z) - set_pin_data(IC_OUTPUT, 1, null) - if(!A || !(A in view(T))) - activate_pin(3) - return - else - set_pin_data(IC_OUTPUT, 1, WEAKREF(A)) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/turfscan - name = "tile analyzer" - desc = "This machine vision system can analyze contents of desired tile.And can read letters on floor." - icon_state = "video_camera" - complexity = 5 - inputs = list( - "target" = IC_PINTYPE_REF - ) - outputs = list( - "located ref" = IC_PINTYPE_LIST, - "Written letters" = IC_PINTYPE_STRING - ) - activators = list( - "scan" = IC_PINTYPE_PULSE_IN, - "on scanned" = IC_PINTYPE_PULSE_OUT, - "not scanned" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 40 - cooldown_per_use = 10 - -/obj/item/integrated_circuit/input/turfscan/do_work() - var/atom/movable/H = get_pin_data_as_type(IC_INPUT, 1, /atom) - var/turf/T = get_turf(src) - var/turf/E = get_turf(H) - if(!istype(H)) //Invalid input - return - - if(H in view(T)) // This is a camera. It can't examine thngs,that it can't see. - var/list/cont = new() - if(E.contents.len) - for(var/i = 1 to E.contents.len) - var/atom/U = E.contents[i] - cont += WEAKREF(U) - set_pin_data(IC_OUTPUT, 1, cont) - var/list/St = new() - for(var/obj/effect/decal/cleanable/crayon/I in E.contents) - St.Add(I.icon_state) - if(St.len) - set_pin_data(IC_OUTPUT, 2, jointext(St, ",", 1, 0)) - push_data() - activate_pin(2) - else - activate_pin(3) - -/obj/item/integrated_circuit/input/local_locator - name = "local locator" - desc = "This is needed for certain devices that demand a reference for a target to act upon. This type only locates something \ - that is holding the machine containing it." - inputs = list() - outputs = list("located ref" = IC_PINTYPE_REF, - "is ground" = IC_PINTYPE_BOOLEAN, - "is creature" = IC_PINTYPE_BOOLEAN) - activators = list("locate" = IC_PINTYPE_PULSE_IN, - "on scanned" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 20 - -/obj/item/integrated_circuit/input/local_locator/do_work() - var/datum/integrated_io/O = outputs[1] - O.data = null - if(assembly) - O.data = WEAKREF(assembly.loc) - set_pin_data(IC_OUTPUT, 2, isturf(assembly.loc)) - set_pin_data(IC_OUTPUT, 3, ismob(assembly.loc)) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/adjacent_locator - name = "adjacent locator" - desc = "This is needed for certain devices that demand a reference for a target to act upon. This type only locates something \ - that is standing up to a meter away from the machine." - extended_desc = "The first pin requires a ref to the kind of object that you want the locator to acquire. This means that it will \ - give refs to nearby objects that are similar. If more than one valid object is found nearby, it will choose one of them at \ - random." - inputs = list("desired type ref" = IC_PINTYPE_REF) - outputs = list("located ref" = IC_PINTYPE_REF) - activators = list("locate" = IC_PINTYPE_PULSE_IN,"found" = IC_PINTYPE_PULSE_OUT, - "not found" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 30 - -/obj/item/integrated_circuit/input/adjacent_locator/do_work() - var/datum/integrated_io/I = inputs[1] - var/datum/integrated_io/O = outputs[1] - O.data = null - - if(!isweakref(I.data)) - return - var/atom/A = I.data.resolve() - if(!A) - return - var/desired_type = A.type - - var/list/nearby_things = range(1, get_turf(src)) - var/list/valid_things = list() - for(var/atom/thing in nearby_things) - if(thing.type != desired_type) - continue - valid_things.Add(thing) - if(valid_things.len) - O.data = WEAKREF(pick(valid_things)) - activate_pin(2) - else - activate_pin(3) - O.push_data() - -/obj/item/integrated_circuit/input/advanced_locator_list - complexity = 6 - name = "list advanced locator" - desc = "This is needed for certain devices that demand list of names for a target to act upon. This type locates something \ - that is standing in given radius of up to 8 meters. Output is non-associative. Input will only consider keys if associative." - extended_desc = "The first pin requires a list of the kinds of objects that you want the locator to acquire. It will locate nearby objects by name and description, \ - and will then provide a list of all found objects which are similar. \ - The second pin is a radius." - inputs = list("desired type ref" = IC_PINTYPE_LIST, "radius" = IC_PINTYPE_NUMBER) - outputs = list("located ref" = IC_PINTYPE_LIST) - activators = list("locate" = IC_PINTYPE_PULSE_IN,"found" = IC_PINTYPE_PULSE_OUT,"not found" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 30 - var/radius = 1 - cooldown_per_use = 10 - -/obj/item/integrated_circuit/input/advanced_locator_list/on_data_written() - var/rad = get_pin_data(IC_INPUT, 2) - - if(isnum_safe(rad)) - rad = CLAMP(rad, 0, 8) - radius = rad - -/obj/item/integrated_circuit/input/advanced_locator_list/do_work() - var/datum/integrated_io/I = inputs[1] - var/datum/integrated_io/O = outputs[1] - O.data = null - var/list/input_list = list() - input_list = I.data - if(length(input_list)) //if there is no input don't do anything. - var/turf/T = get_turf(src) - var/list/nearby_things = view(radius,T) - var/list/valid_things = list() - for(var/item in input_list) - if(!isnull(item) && !isnum_safe(item)) - if(istext(item)) - for(var/i in nearby_things) - var/atom/thing = i - if(ismob(thing) && !isliving(thing)) - continue - if(findtext(addtext(thing.name," ",thing.desc), item, 1, 0) ) - valid_things.Add(WEAKREF(thing)) - else - var/atom/A = item - var/desired_type = A.type - for(var/i in nearby_things) - var/atom/thing = i - if(thing.type != desired_type) - continue - if(ismob(thing) && !isliving(thing)) - continue - valid_things.Add(WEAKREF(thing)) - if(valid_things.len) - O.data = valid_things - O.push_data() - activate_pin(2) - else - O.push_data() - activate_pin(3) - else - O.push_data() - activate_pin(3) - -/obj/item/integrated_circuit/input/advanced_locator - complexity = 6 - name = "advanced locator" - desc = "This is needed for certain devices that demand a reference for a target to act upon. This type locates something \ - that is standing in given radius of up to 8 meters" - extended_desc = "The first pin requires a ref to the kind of object that you want the locator to acquire. This means that it will \ - give refs to nearby objects which are similar. If this pin is a string, the locator will search for an \ - item matching the desired text in its name and description. If more than one valid object is found nearby, it will choose one of them at \ - random. The second pin is a radius." - inputs = list("desired type" = IC_PINTYPE_ANY, "radius" = IC_PINTYPE_NUMBER) - outputs = list("located ref" = IC_PINTYPE_REF) - activators = list("locate" = IC_PINTYPE_PULSE_IN,"found" = IC_PINTYPE_PULSE_OUT,"not found" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 30 - var/radius = 1 - -/obj/item/integrated_circuit/input/advanced_locator/on_data_written() - var/rad = get_pin_data(IC_INPUT, 2) - if(isnum_safe(rad)) - rad = CLAMP(rad, 0, 8) - radius = rad - -/obj/item/integrated_circuit/input/advanced_locator/do_work() - var/datum/integrated_io/I = inputs[1] - var/datum/integrated_io/O = outputs[1] - O.data = null - var/turf/T = get_turf(src) - var/list/nearby_things = view(radius,T) - var/list/valid_things = list() - if(isweakref(I.data)) - var/atom/A = I.data.resolve() - var/desired_type = A.type - if(desired_type) - for(var/i in nearby_things) - var/atom/thing = i - if(ismob(thing) && !isliving(thing)) - continue - if(thing.type == desired_type) - valid_things.Add(thing) - else if(istext(I.data)) - var/DT = I.data - for(var/i in nearby_things) - var/atom/thing = i - if(ismob(thing) && !isliving(thing)) - continue - if(findtext(addtext(thing.name," ",thing.desc), DT, 1, 0) ) - valid_things.Add(thing) - if(valid_things.len) - O.data = WEAKREF(pick(valid_things)) - O.push_data() - activate_pin(2) - else - O.push_data() - activate_pin(3) - -/obj/item/integrated_circuit/input/signaler - name = "integrated signaler" - desc = "Signals from a signaler can be received with this, allowing for remote control. It can also send signals." - extended_desc = "When a signal is received from another signaler, the 'on signal received' activator pin will be pulsed. \ - The two input pins are to configure the integrated signaler's settings. Note that the frequency should not have a decimal in it, \ - meaning the default frequency is expressed as 1457, not 145.7. To send a signal, pulse the 'send signal' activator pin." - icon_state = "signal" - complexity = 4 - inputs = list("frequency" = IC_PINTYPE_NUMBER,"code" = IC_PINTYPE_NUMBER) - outputs = list() - activators = list( - "send signal" = IC_PINTYPE_PULSE_IN, - "on signal sent" = IC_PINTYPE_PULSE_OUT, - "on signal received" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - action_flags = IC_ACTION_LONG_RANGE - power_draw_idle = 5 - power_draw_per_use = 40 - cooldown_per_use = 5 - var/frequency = FREQ_SIGNALER - var/code = DEFAULT_SIGNALER_CODE - var/datum/radio_frequency/radio_connection - var/hearing_range = 1 - -/obj/item/integrated_circuit/input/signaler/Initialize() - . = ..() - spawn(40) - set_frequency(frequency) - // Set the pins so when someone sees them, they won't show as null - set_pin_data(IC_INPUT, 1, frequency) - set_pin_data(IC_INPUT, 2, code) - -/obj/item/integrated_circuit/input/signaler/Destroy() - SSradio.remove_object(src,frequency) - - frequency = 0 - return ..() - -/obj/item/integrated_circuit/input/signaler/on_data_written() - var/new_freq = get_pin_data(IC_INPUT, 1) - var/new_code = get_pin_data(IC_INPUT, 2) - if(isnum_safe(new_freq) && new_freq > 0) - set_frequency(new_freq) - if(isnum_safe(new_code)) - code = new_code - - -/obj/item/integrated_circuit/input/signaler/do_work() // Sends a signal. - if(!radio_connection) - return - - var/datum/signal/signal = new(list("code" = code)) - radio_connection.post_signal(src, signal) - activate_pin(2) - -/obj/item/integrated_circuit/input/signaler/proc/set_frequency(new_frequency) - if(!frequency) - return - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_SIGNALER) - -/obj/item/integrated_circuit/input/signaler/receive_signal(datum/signal/signal) - var/new_code = get_pin_data(IC_INPUT, 2) - var/code = 0 - - if(isnum_safe(new_code)) - code = new_code - if(!signal) - return 0 - if(signal.data["code"] != code) - return 0 - if(signal.source == src) // Don't trigger ourselves. - return 0 - - activate_pin(3) - audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) - for(var/CHM in get_hearers_in_view(hearing_range, src)) - if(ismob(CHM)) - var/mob/LM = CHM - LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) - -/obj/item/integrated_circuit/input/ntnet_packet - name = "NTNet networking circuit" - desc = "Enables the sending and receiving of messages over NTNet via packet data protocol." - extended_desc = "Data can be sent or received using the second pin on each side, \ - with additonal data reserved for the third pin. When a message is received, the second activation pin \ - will pulse whatever is connected to it. Pulsing the first activation pin will send a message. Messages \ - can be sent to multiple recepients. Addresses must be separated with a semicolon, like this: Address1;Address2;Etc." - icon_state = "signal" - complexity = 2 - cooldown_per_use = 1 - inputs = list( - "target NTNet addresses"= IC_PINTYPE_STRING, - "data to send" = IC_PINTYPE_STRING, - "secondary text" = IC_PINTYPE_STRING, - "passkey" = IC_PINTYPE_STRING - ) - outputs = list( - "address received" = IC_PINTYPE_STRING, - "data received" = IC_PINTYPE_STRING, - "secondary text received" = IC_PINTYPE_STRING, - "passkey" = IC_PINTYPE_STRING, - "is_broadcast" = IC_PINTYPE_BOOLEAN - ) - activators = list("send data" = IC_PINTYPE_PULSE_IN, "on data received" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - action_flags = IC_ACTION_LONG_RANGE - power_draw_per_use = 50 - var/address - -/obj/item/integrated_circuit/input/ntnet_packet/Initialize() - . = ..() - var/datum/component/ntnet_interface/net = LoadComponent(/datum/component/ntnet_interface) - address = net.hardware_id - net.differentiate_broadcast = FALSE - desc += " This circuit's NTNet hardware address is: [address]" - -/obj/item/integrated_circuit/input/ntnet_packet/do_work() - var/target_address = get_pin_data(IC_INPUT, 1) - var/message = get_pin_data(IC_INPUT, 2) - var/text = get_pin_data(IC_INPUT, 3) - - var/datum/netdata/data = new - data.recipient_ids = splittext(target_address, ";") - var/key = get_pin_data(IC_INPUT, 4) // hippie start -- adds passkey back in - data.standard_format_data(message, text, key) // hippie end - ntnet_send(data) - -/obj/item/integrated_circuit/input/ntnet_receive(datum/netdata/data) - set_pin_data(IC_OUTPUT, 1, data.sender_id) - set_pin_data(IC_OUTPUT, 2, data.data["data"]) - set_pin_data(IC_OUTPUT, 3, data.data["data_secondary"]) - set_pin_data(IC_OUTPUT, 4, data.data["encrypted_passkey"]) - set_pin_data(IC_OUTPUT, 5, data.broadcast) - - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/ntnet_advanced - name = "Low level NTNet transreceiver" - desc = "Enables the sending and receiving of messages over NTNet via packet data protocol. Allows advanced control of message contents and signalling. Must use associative lists. Outputs associative list. Has a slower transmission rate than normal NTNet circuits, due to increased data processing complexity." - extended_desc = "Data can be sent or received using the second pin on each side, \ - When a message is received, the second activation pin will pulse whatever is connected to it. \ - Pulsing the first activation pin will send a message. Messages can be sent to multiple recepients. \ - Addresses must be separated with a semicolon, like this: Address1;Address2;Etc." - icon_state = "signal" - complexity = 4 - cooldown_per_use = 10 - inputs = list( - "target NTNet addresses"= IC_PINTYPE_STRING, - "data" = IC_PINTYPE_LIST, - ) - outputs = list("received data" = IC_PINTYPE_LIST, "is_broadcast" = IC_PINTYPE_BOOLEAN) - activators = list("send data" = IC_PINTYPE_PULSE_IN, "on data received" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - action_flags = IC_ACTION_LONG_RANGE - power_draw_per_use = 50 - var/address - -/obj/item/integrated_circuit/input/ntnet_advanced/Initialize() - . = ..() - var/datum/component/ntnet_interface/net = LoadComponent(/datum/component/ntnet_interface) - address = net.hardware_id - net.differentiate_broadcast = FALSE - desc += " This circuit's NTNet hardware address is: [address]" - -/obj/item/integrated_circuit/input/ntnet_advanced/do_work() - var/target_address = get_pin_data(IC_INPUT, 1) - var/list/message = get_pin_data(IC_INPUT, 2) - if(!islist(message)) - message = list() - var/datum/netdata/data = new - data.recipient_ids = splittext(target_address, ";") - data.data = message - //data.passkey = assembly.access_card.access - ntnet_send(data) - -/obj/item/integrated_circuit/input/ntnet_advanced/ntnet_receive(datum/netdata/data) - set_pin_data(IC_OUTPUT, 1, data.data) - set_pin_data(IC_OUTPUT, 2, data.broadcast) - push_data() - activate_pin(2) - -//This circuit gives information on where the machine is. -/obj/item/integrated_circuit/input/gps - name = "global positioning system" - desc = "This allows you to easily know the position of a machine containing this device." - extended_desc = "The coordinates that the GPS outputs are absolute, not relative. The full coords output has the coords separated by commas and is in string format." - icon_state = "gps" - complexity = 4 - inputs = list() - outputs = list("X"= IC_PINTYPE_NUMBER, "Y" = IC_PINTYPE_NUMBER, "Z" = IC_PINTYPE_NUMBER, "full coords" = IC_PINTYPE_STRING) - activators = list("get coordinates" = IC_PINTYPE_PULSE_IN, "on get coordinates" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 30 - -/obj/item/integrated_circuit/input/gps/do_work() - var/turf/T = get_turf(src) - - set_pin_data(IC_OUTPUT, 1, null) - set_pin_data(IC_OUTPUT, 2, null) - set_pin_data(IC_OUTPUT, 3, null) - set_pin_data(IC_OUTPUT, 4, null) - if(!T) - return - - set_pin_data(IC_OUTPUT, 1, T.x) - set_pin_data(IC_OUTPUT, 2, T.y) - set_pin_data(IC_OUTPUT, 3, T.z) - set_pin_data(IC_OUTPUT, 4, "[T.x],[T.y],[T.z]") - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/microphone - name = "microphone" - desc = "Useful for spying on people, or for voice-activated machines." - extended_desc = "This will automatically translate most languages it hears to Galactic Common. \ - The first activation pin is always pulsed when the circuit hears someone talk, while the second one \ - is only triggered if it hears someone speaking a language other than Galactic Common." - icon_state = "recorder" - complexity = 8 - inputs = list() - flags_1 = CONDUCT_1 | HEAR_1 - outputs = list( - "speaker" = IC_PINTYPE_STRING, - "message" = IC_PINTYPE_STRING - ) - activators = list("on message received" = IC_PINTYPE_PULSE_OUT, "on translation" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 5 - -/obj/item/integrated_circuit/input/microphone/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode) - . = ..() - var/translated = FALSE - if(speaker && message) - if(raw_message) - if(message_langs != get_selected_language()) - translated = TRUE - set_pin_data(IC_OUTPUT, 1, speaker.GetVoice()) - set_pin_data(IC_OUTPUT, 2, raw_message) - - push_data() - activate_pin(1) - if(translated) - activate_pin(2) - -/obj/item/integrated_circuit/input/sensor - name = "sensor" - desc = "Scans and obtains a reference for any objects or persons near you. All you need to do is shove the machine in their face." - extended_desc = "If the 'ignore storage' pin is set to true, the sensor will disregard scanning various storage containers such as backpacks." - icon_state = "recorder" - complexity = 12 - inputs = list("ignore storage" = IC_PINTYPE_BOOLEAN) - outputs = list("scanned" = IC_PINTYPE_REF) - activators = list("on scanned" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 120 - -/obj/item/integrated_circuit/input/sensor/sense(atom/A, mob/user, prox) - if(!prox || !A || (ismob(A) && !isliving(A))) - return FALSE - if(!check_then_do_work()) - return FALSE - var/ignore_bags = get_pin_data(IC_INPUT, 1) - if(ignore_bags) - var/datum/component/storage/STR = A.GetComponent(/datum/component/storage) - if(STR) - return FALSE - set_pin_data(IC_OUTPUT, 1, WEAKREF(A)) - push_data() - to_chat(user, "You scan [A] with [assembly].") - activate_pin(1) - return TRUE - -/obj/item/integrated_circuit/input/sensor/ranged - name = "ranged sensor" - desc = "Scans and obtains a reference for any objects or persons in range. All you need to do is point the machine towards the target." - extended_desc = "If the 'ignore storage' pin is set to true, the sensor will disregard scanning various storage containers such as backpacks." - icon_state = "recorder" - complexity = 36 - inputs = list("ignore storage" = IC_PINTYPE_BOOLEAN) - outputs = list("scanned" = IC_PINTYPE_REF) - activators = list("on scanned" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 120 - -/obj/item/integrated_circuit/input/sensor/ranged/sense(atom/A, mob/user) - if(!user || !A || (ismob(A) && !isliving(A))) - return FALSE - if(user.client) - if(!(A in view(user.client))) - return FALSE - else - if(!(A in view(user))) - return FALSE - if(!check_then_do_work()) - return FALSE - var/ignore_bags = get_pin_data(IC_INPUT, 1) - if(ignore_bags) - if(istype(A, /obj/item/storage)) - return FALSE - set_pin_data(IC_OUTPUT, 1, WEAKREF(A)) - push_data() - to_chat(user, "You scan [A] with [assembly].") - activate_pin(1) - return TRUE - -/obj/item/integrated_circuit/input/obj_scanner - name = "scanner" - desc = "Scans and obtains a reference for any objects you use on the assembly." - extended_desc = "If the 'put down' pin is set to true, the assembly will take the scanned object from your hands to its location. \ - Useful for interaction with the grabber. The scanner only works using the help intent." - icon_state = "recorder" - complexity = 4 - inputs = list("put down" = IC_PINTYPE_BOOLEAN) - outputs = list("scanned" = IC_PINTYPE_REF) - activators = list("on scanned" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 20 - -/obj/item/integrated_circuit/input/obj_scanner/attackby_react(var/atom/A,var/mob/user,intent) - if(intent!=INTENT_HELP) - return FALSE - if(!check_then_do_work()) - return FALSE - var/pu = get_pin_data(IC_INPUT, 1) - if(pu) - user.transferItemToLoc(A,drop_location()) - set_pin_data(IC_OUTPUT, 1, WEAKREF(A)) - push_data() - to_chat(user, "You let [assembly] scan [A].") - activate_pin(1) - return TRUE - -/obj/item/integrated_circuit/input/internalbm - name = "internal battery monitor" - desc = "This monitors the charge level of an internal battery." - icon_state = "internalbm" - extended_desc = "This circuit will give you the values of charge, max charge, and the current percentage of the internal battery on demand." - w_class = WEIGHT_CLASS_TINY - complexity = 1 - inputs = list() - outputs = list( - "cell charge" = IC_PINTYPE_NUMBER, - "max charge" = IC_PINTYPE_NUMBER, - "percentage" = IC_PINTYPE_NUMBER, - "refference to assembly" = IC_PINTYPE_REF, - "refference to cell" = IC_PINTYPE_REF - ) - activators = list("read" = IC_PINTYPE_PULSE_IN, "on read" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 1 - -/obj/item/integrated_circuit/input/internalbm/do_work() - set_pin_data(IC_OUTPUT, 1, null) - set_pin_data(IC_OUTPUT, 2, null) - set_pin_data(IC_OUTPUT, 3, null) - set_pin_data(IC_OUTPUT, 4, null) - set_pin_data(IC_OUTPUT, 5, null) - if(assembly) - set_pin_data(IC_OUTPUT, 4, WEAKREF(assembly)) - if(assembly.battery) - set_pin_data(IC_OUTPUT, 1, assembly.battery.charge) - set_pin_data(IC_OUTPUT, 2, assembly.battery.maxcharge) - set_pin_data(IC_OUTPUT, 3, 100*assembly.battery.charge/assembly.battery.maxcharge) - set_pin_data(IC_OUTPUT, 5, WEAKREF(assembly.battery)) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/externalbm - name = "external battery monitor" - desc = "This can read the battery state of any device in view." - icon_state = "externalbm" - extended_desc = "This circuit will give you the charge, max charge, and the current percentage values of any device or battery in view." - w_class = WEIGHT_CLASS_TINY - complexity = 2 - inputs = list("target" = IC_PINTYPE_REF) - outputs = list( - "cell charge" = IC_PINTYPE_NUMBER, - "max charge" = IC_PINTYPE_NUMBER, - "percentage" = IC_PINTYPE_NUMBER - ) - activators = list("read" = IC_PINTYPE_PULSE_IN, "on read" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 1 - -/obj/item/integrated_circuit/input/externalbm/do_work() - - var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) - set_pin_data(IC_OUTPUT, 1, null) - set_pin_data(IC_OUTPUT, 2, null) - set_pin_data(IC_OUTPUT, 3, null) - if(AM) - var/obj/item/stock_parts/cell/C = AM.get_cell() - if(C) - var/turf/A = get_turf(src) - if(get_turf(AM) in view(A)) - set_pin_data(IC_OUTPUT, 1, C.charge) - set_pin_data(IC_OUTPUT, 2, C.maxcharge) - set_pin_data(IC_OUTPUT, 3, C.percent()) - push_data() - activate_pin(2) - return - -/obj/item/integrated_circuit/input/ntnetsc - name = "NTNet scanner" - desc = "This can return the NTNet IDs of a component inside the given object, if there are any." - icon_state = "signalsc" - w_class = WEIGHT_CLASS_TINY - complexity = 2 - inputs = list("target" = IC_PINTYPE_REF) - outputs = list( - "id" = IC_PINTYPE_STRING - ) - activators = list("read" = IC_PINTYPE_PULSE_IN, "found" = IC_PINTYPE_PULSE_OUT,"not found" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 1 - -/obj/item/integrated_circuit/input/ntnetsc/do_work() - var/atom/AM = get_pin_data_as_type(IC_INPUT, 1, /atom) - var/datum/component/ntnet_interface/net - - if(AM) - var/list/processing_list = list(AM) - while(processing_list.len && !net) - var/atom/A = processing_list[1] - processing_list.Cut(1, 2) - //Byond does not allow things to be in multiple contents, or double parent-child hierarchies, so only += is needed - //This is also why we don't need to check against assembled as we go along - processing_list += A.contents - net = A.GetComponent(/datum/component/ntnet_interface) - - if(net) - set_pin_data(IC_OUTPUT, 1, net.hardware_id) - push_data() - activate_pin(2) - else - set_pin_data(IC_OUTPUT, 1, null) - push_data() - activate_pin(3) - -/obj/item/integrated_circuit/input/matscan - name = "material scanner" - desc = "This special module is designed to get information about material containers of different machinery, \ - like ORM, lathes, etc." - icon_state = "video_camera" - complexity = 6 - inputs = list( - "target" = IC_PINTYPE_REF - ) - outputs = list( - "Iron" = IC_PINTYPE_NUMBER, - "Glass" = IC_PINTYPE_NUMBER, - "Silver" = IC_PINTYPE_NUMBER, - "Gold" = IC_PINTYPE_NUMBER, - "Diamond" = IC_PINTYPE_NUMBER, - "Solid Plasma" = IC_PINTYPE_NUMBER, - "Uranium" = IC_PINTYPE_NUMBER, - "Bananium" = IC_PINTYPE_NUMBER, - "Titanium" = IC_PINTYPE_NUMBER, - "Bluespace Mesh" = IC_PINTYPE_NUMBER, - "Biomass" = IC_PINTYPE_NUMBER, - ) - activators = list( - "scan" = IC_PINTYPE_PULSE_IN, - "on scanned" = IC_PINTYPE_PULSE_OUT, - "not scanned" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 40 - var/list/mtypes = list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace, /datum/material/biomass) - - -/obj/item/integrated_circuit/input/matscan/do_work() - var/atom/movable/H = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) - var/turf/T = get_turf(src) - var/datum/component/material_container/mt = H.GetComponent(/datum/component/material_container) - if(!mt) //Invalid input - return - if(H in view(T)) // This is a camera. It can't examine thngs,that it can't see. - for(var/I in 1 to mtypes.len) - var/amount = mt.materials[mtypes[I]] - if(amount) - set_pin_data(IC_OUTPUT, I, amount) - else - set_pin_data(IC_OUTPUT, I, null) - push_data() - activate_pin(2) - else - activate_pin(3) - -/obj/item/integrated_circuit/input/atmospheric_analyzer - name = "atmospheric analyzer" - desc = "A miniaturized analyzer which can scan anything that contains gases. Leave target as NULL to scan the air around the assembly." - extended_desc = "The nth element of gas amounts is the number of moles of the \ - nth gas in gas list. \ - Pressure is in kPa, temperature is in Kelvin. \ - Due to programming limitations, scanning an object that does \ - not contain a gas will return the air around it instead." - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "target" = IC_PINTYPE_REF - ) - outputs = list( - "gas list" = IC_PINTYPE_LIST, - "gas amounts" = IC_PINTYPE_LIST, - "total moles" = IC_PINTYPE_NUMBER, - "pressure" = IC_PINTYPE_NUMBER, - "temperature" = IC_PINTYPE_NUMBER, - "volume" = IC_PINTYPE_NUMBER - ) - activators = list( - "scan" = IC_PINTYPE_PULSE_IN, - "on success" = IC_PINTYPE_PULSE_OUT, - "on failure" = IC_PINTYPE_PULSE_OUT - ) - power_draw_per_use = 5 - -/obj/item/integrated_circuit/input/atmospheric_analyzer/do_work() - for(var/i=1 to 6) - set_pin_data(IC_OUTPUT, i, null) - var/atom/target = get_pin_data_as_type(IC_INPUT, 1, /atom) - if(!target) - target = get_turf(src) - if( get_dist(get_turf(target),get_turf(src)) > 1 ) - activate_pin(3) - return - - var/datum/gas_mixture/air_contents = target.return_air() - if(!air_contents) - activate_pin(3) - return - - var/list/gases = air_contents.get_gases() - var/list/gas_names = list() - var/list/gas_amounts = list() - for(var/id in gases) - var/name = GLOB.meta_gas_info[id][META_GAS_NAME] - var/amt = round(air_contents.get_moles(id), 0.001) - gas_names.Add(name) - gas_amounts.Add(amt) - - set_pin_data(IC_OUTPUT, 1, gas_names) - set_pin_data(IC_OUTPUT, 2, gas_amounts) - set_pin_data(IC_OUTPUT, 3, round(air_contents.total_moles(), 0.001)) - set_pin_data(IC_OUTPUT, 4, round(air_contents.return_pressure(), 0.001)) - set_pin_data(IC_OUTPUT, 5, round(air_contents.return_temperature(), 0.001)) - set_pin_data(IC_OUTPUT, 6, round(air_contents.return_volume(), 0.001)) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/input/data_card_reader - name = "data card reader" - desc = "A circuit that can read from and write to data cards." - extended_desc = "Setting the \"write mode\" boolean to true will cause any data cards that are used on the assembly to replace\ - their existing function and data strings with the given strings, if it is set to false then using a data card on the assembly will cause\ - the function and data strings stored on the card to be written to the output pins." - icon_state = "card_reader" - complexity = 4 - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "function" = IC_PINTYPE_STRING, - "data to store" = IC_PINTYPE_STRING, - "write mode" = IC_PINTYPE_BOOLEAN - ) - outputs = list( - "function" = IC_PINTYPE_STRING, - "stored data" = IC_PINTYPE_STRING - ) - activators = list( - "on write" = IC_PINTYPE_PULSE_OUT, - "on read" = IC_PINTYPE_PULSE_OUT - ) - -/obj/item/integrated_circuit/input/data_card_reader/attackby_react(obj/item/I, mob/living/user, intent) - var/obj/item/card/data/card = I.GetCard() - var/write_mode = get_pin_data(IC_INPUT, 3) - if(card) - if(write_mode == TRUE) - card.function = get_pin_data(IC_INPUT, 1) - card.data = get_pin_data(IC_INPUT, 2) - push_data() - activate_pin(1) - else - set_pin_data(IC_OUTPUT, 1, card.function) - set_pin_data(IC_OUTPUT, 2, card.data) - push_data() - activate_pin(2) - else - return FALSE - return TRUE - -//Adding some color to cards aswell, because why not -/obj/item/card/data/attackby(obj/item/I, mob/living/user) - if(istype(I, /obj/item/integrated_electronics/detailer)) - var/obj/item/integrated_electronics/detailer/D = I - detail_color = D.detail_color - update_icon() - return ..() - - -//Interceptor -//Intercepts a telecomms signal, aka a radio message (;halp getting griff) -//Inputs: -//On (Boolean): If on, the circuit intercepts radio signals. Otherwise it does not. This doesn't affect no pass! -//No pass (Boolean): Decides if the signal will be silently intercepted -// (false) or also blocked from being sent on the radio (true) -//Outputs: -//Source: name of the mob -//Job: job of the mob -//content: the actual message -//spans: a list of spans, there's not much info about this but stuff like robots will have "robot" span -/obj/item/integrated_circuit/input/tcomm_interceptor - name = "telecommunication interceptor" - desc = "This circuit allows for telecomms signals \ - to be fetched prior to being broadcasted." - extended_desc = "Similar \ - to the old NTSL system of realtime signal modification, \ - the circuit connects to telecomms and fetches data \ - for each signal, which can be sent normally or blocked, \ - for cases such as other circuits modifying certain data. \ - Beware, this cannot stop signals from unreachable areas, such \ - as space or zlevels other than station's one." - complexity = 30 - cooldown_per_use = 0.1 - w_class = WEIGHT_CLASS_SMALL - inputs = list( - "intercept" = IC_PINTYPE_BOOLEAN, - "no pass" = IC_PINTYPE_BOOLEAN - ) - outputs = list( - "source" = IC_PINTYPE_STRING, - "job" = IC_PINTYPE_STRING, - "content" = IC_PINTYPE_STRING, - "spans" = IC_PINTYPE_LIST, - "frequency" = IC_PINTYPE_NUMBER - ) - activators = list( - "on intercept" = IC_PINTYPE_PULSE_OUT - ) - power_draw_idle = 0 - spawn_flags = IC_SPAWN_RESEARCH - var/obj/machinery/telecomms/receiver/circuit/receiver - var/list/freq_blacklist = list(FREQ_CENTCOM,FREQ_SYNDICATE,FREQ_CTF_RED,FREQ_CTF_BLUE) - -/obj/item/integrated_circuit/input/tcomm_interceptor/Initialize() - . = ..() - receiver = new(src) - receiver.holder = src - -/obj/item/integrated_circuit/input/tcomm_interceptor/Destroy() - qdel(receiver) - GLOB.ic_jammers -= src - ..() - -/obj/item/integrated_circuit/input/tcomm_interceptor/receive_signal(datum/signal/signal) - if((signal.transmission_method == TRANSMISSION_SUBSPACE) && get_pin_data(IC_INPUT, 1)) - if(signal.frequency in freq_blacklist) - return - set_pin_data(IC_OUTPUT, 1, signal.data["name"]) - set_pin_data(IC_OUTPUT, 2, signal.data["job"]) - set_pin_data(IC_OUTPUT, 3, signal.data["message"]) - set_pin_data(IC_OUTPUT, 4, signal.data["spans"]) - set_pin_data(IC_OUTPUT, 5, signal.frequency) - push_data() - activate_pin(1) - -/obj/item/integrated_circuit/input/tcomm_interceptor/on_data_written() - if(get_pin_data(IC_INPUT, 2)) - GLOB.ic_jammers |= src - if(get_pin_data(IC_INPUT, 1)) - power_draw_idle = 200 - else - power_draw_idle = 100 - else - GLOB.ic_jammers -= src - if(get_pin_data(IC_INPUT, 1)) - power_draw_idle = 100 - else - power_draw_idle = 0 - -/obj/item/integrated_circuit/input/tcomm_interceptor/power_fail() - set_pin_data(IC_INPUT, 1, 0) - set_pin_data(IC_INPUT, 2, 0) - -/obj/item/integrated_circuit/input/tcomm_interceptor/disconnect_all() - set_pin_data(IC_INPUT, 1, 0) - set_pin_data(IC_INPUT, 2, 0) - ..() - - -// -Inputlist- // -/obj/item/integrated_circuit/input/selection - name = "selection circuit" - desc = "This circuit lets you choose between different strings from a selection." - extended_desc = "This circuit lets you choose between up to 4 different values from selection of up to 8 strings that you can set. Null values are ignored and the chosen value is put out in selected." - icon_state = "addition" - can_be_asked_input = 1 - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "A" = IC_PINTYPE_STRING, - "B" = IC_PINTYPE_STRING, - "C" = IC_PINTYPE_STRING, - "D" = IC_PINTYPE_STRING, - "E" = IC_PINTYPE_STRING, - "F" = IC_PINTYPE_STRING, - "G" = IC_PINTYPE_STRING, - "H" = IC_PINTYPE_STRING - ) - activators = list( - "on selected" = IC_PINTYPE_PULSE_OUT - ) - outputs = list( - "selected" = IC_PINTYPE_STRING - ) - -/obj/item/integrated_circuit/input/selection/ask_for_input(mob/user) - var/list/selection = list() - for(var/k in 1 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(istext(I)) - selection.Add(I) - var/selected = input(user,"Choose input.","Selection") in selection - if(!selected) - return - set_pin_data(IC_OUTPUT, 1, selected) - push_data() - activate_pin(1) - - -// -storage examiner- // **works** -/obj/item/integrated_circuit/input/storage_examiner - name = "storage examiner circuit" - desc = "This circuit lets you scan a storage's content. (backpacks, toolboxes etc.)" - extended_desc = "The items are put out as reference, which makes it possible to interact with them. Additionally also gives the amount of items." - icon_state = "grabber" - can_be_asked_input = 1 - complexity = 6 - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "storage" = IC_PINTYPE_REF - ) - activators = list( - "examine" = IC_PINTYPE_PULSE_IN, - "on examined" = IC_PINTYPE_PULSE_OUT - ) - outputs = list( - "item amount" = IC_PINTYPE_NUMBER, - "item list" = IC_PINTYPE_LIST - ) - power_draw_per_use = 85 - -/obj/item/integrated_circuit/input/storage_examiner/do_work() - var/obj/item/storage = get_pin_data_as_type(IC_INPUT, 1, /obj/item) - if(!istype(storage,/obj/item/storage)) - return - - set_pin_data(IC_OUTPUT, 1, storage.contents.len) - - var/list/regurgitated_contents = list() - for(var/obj/o in storage.contents) - regurgitated_contents.Add(WEAKREF(o)) - - - set_pin_data(IC_OUTPUT, 2, regurgitated_contents) - push_data() - activate_pin(2) diff --git a/code/modules/integrated_electronics/subtypes/lists.dm b/code/modules/integrated_electronics/subtypes/lists.dm deleted file mode 100644 index adc79e748b4f2..0000000000000 --- a/code/modules/integrated_electronics/subtypes/lists.dm +++ /dev/null @@ -1,462 +0,0 @@ -//These circuits do things with lists, and use special list pins for stability. -/obj/item/integrated_circuit/lists - complexity = 1 - inputs = list( - "input" = IC_PINTYPE_LIST - ) - outputs = list( - "result" = IC_PINTYPE_STRING - ) - activators = list( - "compute" = IC_PINTYPE_PULSE_IN, - "on computed" = IC_PINTYPE_PULSE_OUT - ) - category_text = "Lists" - power_draw_per_use = 20 - cooldown_per_use = 10 - -/obj/item/integrated_circuit/lists/pick - name = "pick circuit" - desc = "This circuit will pick a random element from the input list, and output that element." - extended_desc = "The input list is not modified." - icon_state = "addition" - outputs = list( - "result" = IC_PINTYPE_ANY - ) - activators = list( - "compute" = IC_PINTYPE_PULSE_IN, - "on success" = IC_PINTYPE_PULSE_OUT, - "on failure" = IC_PINTYPE_PULSE_OUT, - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - cooldown_per_use = 1 - -/obj/item/integrated_circuit/lists/pick/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) // List pins guarantee that there is a list inside, even if just an empty one. - if(input_list.len) - set_pin_data(IC_OUTPUT, 1, pick(input_list)) - push_data() - activate_pin(2) - else - activate_pin(3) - - -/obj/item/integrated_circuit/lists/append - name = "append circuit" - desc = "This circuit will add an element to a list." - extended_desc = "The new element will always be at the bottom of the list." - inputs = list( - "list to append" = IC_PINTYPE_LIST, - "input" = IC_PINTYPE_ANY - ) - outputs = list( - "appended list" = IC_PINTYPE_LIST - ) - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/lists/append/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/list/output_list = list() - var/new_entry = get_pin_data(IC_INPUT, 2) - output_list = input_list.Copy() - output_list.Add(new_entry) - - set_pin_data(IC_OUTPUT, 1, output_list) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/lists/search - name = "search circuit" - desc = "This circuit will get the index location of the desired element in a list." - extended_desc = "Search will start at position 1 and will return the first matching position." - inputs = list( - "list" = IC_PINTYPE_LIST, - "item" = IC_PINTYPE_ANY - ) - outputs = list( - "index" = IC_PINTYPE_NUMBER - ) - activators = list( - "compute" = IC_PINTYPE_PULSE_IN, - "on success" = IC_PINTYPE_PULSE_OUT, - "on failure" = IC_PINTYPE_PULSE_OUT, - ) - icon_state = "addition" - complexity = 2 - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - cooldown_per_use = 1 - -/obj/item/integrated_circuit/lists/search/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/output = input_list.Find(get_pin_data(IC_INPUT, 2)) - - set_pin_data(IC_OUTPUT, 1, output) - push_data() - - if(output) - activate_pin(2) - else - activate_pin(3) - - -/obj/item/integrated_circuit/lists/filter - name = "filter circuit" - desc = "This circuit will search through a list for anything matching the desired element(s) and outputs two lists: \ - one containing only the matching elements, and one with the matching elements filtered out." - extended_desc = "Sample accepts lists. If no match is found, the original list is sent to output 1." - inputs = list( - "input list" = IC_PINTYPE_LIST, - "sample" = IC_PINTYPE_ANY - ) - outputs = list( - "list filtered" = IC_PINTYPE_LIST, - "list matched" = IC_PINTYPE_LIST - ) - activators = list( - "compute" = IC_PINTYPE_PULSE_IN, - "on match" = IC_PINTYPE_PULSE_OUT, - "on no match" = IC_PINTYPE_PULSE_OUT - ) - complexity = 6 - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/lists/filter/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/sample = get_pin_data(IC_INPUT, 2) - var/list/sample_list = islist(sample) ? uniqueList(sample) : null - var/list/output_list1 = input_list.Copy() - var/list/output_list2 = list() - var/list/output = list() - - for(var/input_item in input_list) - if(sample_list) - for(var/sample_item in sample_list) - if(!isnull(sample_item)) - if(istext(input_item) && istext(sample_item) && findtext(input_item, sample_item)) - output += input_item - if(istype(input_item, /atom) && istext(sample_item)) - var/atom/input_item_atom = input_item - if(istext(sample_item) && findtext(input_item_atom.name, sample_item)) - output += input_item - if(!istext(input_item)) - if(input_item == sample_item) - output += input_item - else - if(!isnull(sample)) - if(istext(input_item) && istext(sample) && findtext(input_item, sample)) - output += input_item - continue - if(istype(input_item, /atom) && istext(sample)) - var/atom/input_itema = input_item - if(findtext(input_itema.name, sample)) - output += input_item - if(!istext(input_item)) - if(input_item == sample) - output += input_item - - output_list1.Remove(output) - output_list2.Add(output) - set_pin_data(IC_OUTPUT, 1, output_list1) - set_pin_data(IC_OUTPUT, 2, output_list2) - push_data() - - output_list1 ~! input_list ? activate_pin(2) : activate_pin(3) - -/obj/item/integrated_circuit/lists/listset - name = "list set circuit" - desc = "This circuit will remove any duplicate entries from a list." - extended_desc = "If there are no duplicate entries, the output list will be unchanged." - inputs = list( - "list" = IC_PINTYPE_LIST - ) - outputs = list( - "list filtered" = IC_PINTYPE_LIST - ) - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/lists/listset/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - input_list = uniqueList(input_list) - - set_pin_data(IC_OUTPUT, 1, input_list) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/lists/at - name = "at circuit" - desc = "This circuit will pick an element from a list by the input index." - extended_desc = "If there is no element at the given index, the result will be null." - inputs = list( - "list" = IC_PINTYPE_LIST, - "index" = IC_PINTYPE_INDEX - ) - outputs = list( - "item" = IC_PINTYPE_ANY - ) - activators = list( - "compute" = IC_PINTYPE_PULSE_IN, - "on success" = IC_PINTYPE_PULSE_OUT, - "on failure" = IC_PINTYPE_PULSE_OUT - ) - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - cooldown_per_use = 1 - -/obj/item/integrated_circuit/lists/at/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/index = get_pin_data(IC_INPUT, 2) - - // Check if index is valid - if(index > input_list.len) - set_pin_data(IC_OUTPUT, 1, null) - push_data() - activate_pin(3) - return - - set_pin_data(IC_OUTPUT, 1, input_list[index]) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/lists/delete - name = "delete circuit" - desc = "This circuit will remove an element from a list by the index." - extended_desc = "If there is no element at the given index, the result list will be unchanged." - inputs = list( - "list" = IC_PINTYPE_LIST, - "index" = IC_PINTYPE_INDEX - ) - outputs = list( - "item" = IC_PINTYPE_LIST - ) - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/lists/delete/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/list/red_list = list() - var/index = get_pin_data(IC_INPUT, 2) - - if(length(input_list)) - for(var/j in 1 to input_list.len) - var/I = input_list[j] - if(j != index) - red_list.Add(I) - set_pin_data(IC_OUTPUT, 1, red_list) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/lists/write - name = "write circuit" - desc = "This circuit will write an element to a list at the given index location." - extended_desc = "If there is no element at the given index, it will output the same list as before." - inputs = list( - "list" = IC_PINTYPE_LIST, - "index" = IC_PINTYPE_INDEX, - "item" = IC_PINTYPE_ANY - ) - outputs = list( - "redacted list" = IC_PINTYPE_LIST - ) - activators = list( - "compute" = IC_PINTYPE_PULSE_IN, - "on success" = IC_PINTYPE_PULSE_OUT, - "on failure" = IC_PINTYPE_PULSE_OUT, - ) - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/lists/write/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/index = get_pin_data(IC_INPUT, 2) - var/item = get_pin_data(IC_INPUT, 3) - - // Check if index is valid - if(index > input_list.len) - set_pin_data(IC_OUTPUT, 1, input_list) - push_data() - activate_pin(3) - return - - if(!islist(item)) - var/list/red_list = input_list.Copy() //crash proof - red_list[index] = item - set_pin_data(IC_OUTPUT, 1, red_list) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/lists/len - name = "len circuit" - desc = "This circuit will return the length of the list." - inputs = list( - "list" = IC_PINTYPE_LIST, - ) - outputs = list( - "item" = IC_PINTYPE_NUMBER - ) - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/lists/len/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - set_pin_data(IC_OUTPUT, 1, input_list.len) - push_data() - activate_pin(2) - cooldown_per_use = 1 - - -/obj/item/integrated_circuit/lists/jointext - name = "join text circuit" - desc = "This circuit will combine two lists into one, and output it as a string." - extended_desc = "Default settings will encode the entire list into a string." - icon_state = "join" - inputs = list( - "list to join" = IC_PINTYPE_LIST,// - "delimiter" = IC_PINTYPE_STRING, - "start" = IC_PINTYPE_INDEX, - "end" = IC_PINTYPE_NUMBER - ) - inputs_default = list( - "2" = ", ", - "4" = 0 - ) - outputs = list( - "joined text" = IC_PINTYPE_STRING - ) - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - cooldown_per_use = 1 - -/obj/item/integrated_circuit/lists/jointext/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/delimiter = get_pin_data(IC_INPUT, 2) - var/start = get_pin_data(IC_INPUT, 3) - var/end = get_pin_data(IC_INPUT, 4) - - var/result = null - - if(input_list.len && delimiter && !isnull(start) && !isnull(end)) - result = jointext(input_list, delimiter, start, end) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/lists/constructor - name = "large list constructor" - desc = "This circuit will build a list out of up to sixteen input values." - icon_state = "constr8" - inputs = list() - outputs = list( - "result" = IC_PINTYPE_LIST - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/number_of_pins = 16 - -/obj/item/integrated_circuit/lists/constructor/Initialize() - for(var/i = 1 to number_of_pins) - inputs["input [i]"] = IC_PINTYPE_ANY // This is just a string since pins don't get built until ..() is called. - complexity = number_of_pins / 2 - . = ..() - -/obj/item/integrated_circuit/lists/constructor/do_work() - var/list/output_list = list() - for(var/i = 1 to number_of_pins) - var/data = get_pin_data(IC_INPUT, i) - - // No nested lists - if(!islist(data)) - output_list += data - else - output_list += null - - set_pin_data(IC_OUTPUT, 1, output_list) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/lists/constructor/small - name = "list constructor" - desc = "This circuit will build a list out of up to four input values." - icon_state = "constr" - number_of_pins = 4 - -/obj/item/integrated_circuit/lists/constructor/medium - name = "medium list constructor" - desc = "This circuit will build a list out of up to eight input values." - icon_state = "constr8" - number_of_pins = 8 - - -/obj/item/integrated_circuit/lists/deconstructor - name = "large list deconstructor" - desc = "This circuit will write the first sixteen entries of its input list, starting with the index, into the output values." - icon_state = "deconstr8" - inputs = list( - "input" = IC_PINTYPE_LIST, - "index" = IC_PINTYPE_INDEX - ) - outputs = list() - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/number_of_pins = 16 - -/obj/item/integrated_circuit/lists/deconstructor/Initialize() - for(var/i = 1 to number_of_pins) - outputs["output [i]"] = IC_PINTYPE_ANY // This is just a string since pins don't get built until ..() is called. - complexity = number_of_pins / 2 - . = ..() - -/obj/item/integrated_circuit/lists/deconstructor/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/start_index = get_pin_data(IC_INPUT, 2) - - for(var/i = 1 to number_of_pins) - var/list_index = i + start_index - 1 - if(list_index > input_list.len) - set_pin_data(IC_OUTPUT, i, null) - else - set_pin_data(IC_OUTPUT, i, input_list[list_index]) - - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/lists/deconstructor/small - name = "list deconstructor" - desc = "This circuit will write the first four entries of its input list, starting with the index, into the output values." - icon_state = "deconstr" - number_of_pins = 4 - -/obj/item/integrated_circuit/lists/deconstructor/medium - name = "medium list deconstructor" - desc = "This circuit will write the first eight entries of its input list, starting with the index, into the output values." - number_of_pins = 8 - - -// - Join circuit - // -/obj/item/integrated_circuit/lists/join - name = "join circuit" - desc = "This circuit is a huge fan of shipping. It joins 2 lists together." - extended_desc = "Elements found in both lists will not be removed and can be found twice in the list." - inputs = list( - "first list" = IC_PINTYPE_LIST, - "second list" = IC_PINTYPE_LIST - ) - outputs = list( - "joined list" = IC_PINTYPE_LIST - ) - icon_state = "addition" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/lists/join/do_work() - var/list/input_list = get_pin_data(IC_INPUT, 1) - var/list/input_list2 = get_pin_data(IC_INPUT, 2) - - set_pin_data(IC_OUTPUT, 1, input_list+input_list2) - push_data() - activate_pin(2) diff --git a/code/modules/integrated_electronics/subtypes/logic.dm b/code/modules/integrated_electronics/subtypes/logic.dm deleted file mode 100644 index a6144eec4063b..0000000000000 --- a/code/modules/integrated_electronics/subtypes/logic.dm +++ /dev/null @@ -1,223 +0,0 @@ -/obj/item/integrated_circuit/logic - name = "logic gate" - desc = "This tiny chip will decide for you!" - extended_desc = "Logic circuits will treat a null, 0, and a \"\" string value as FALSE and anything else as TRUE." - complexity = 1 - outputs = list("result" = IC_PINTYPE_BOOLEAN) - activators = list("compare" = IC_PINTYPE_PULSE_IN) - category_text = "Logic" - power_draw_per_use = 1 - -/obj/item/integrated_circuit/logic/do_work() - push_data() - -/obj/item/integrated_circuit/logic/binary - inputs = list("A" = IC_PINTYPE_ANY,"B" = IC_PINTYPE_ANY) - activators = list("compare" = IC_PINTYPE_PULSE_IN, "on true result" = IC_PINTYPE_PULSE_OUT, "on false result" = IC_PINTYPE_PULSE_OUT) - -/obj/item/integrated_circuit/logic/binary/do_work() - var/datum/integrated_io/A = inputs[1] - var/datum/integrated_io/B = inputs[2] - var/datum/integrated_io/O = outputs[1] - O.data = do_compare(A, B) ? TRUE : FALSE - - if(get_pin_data(IC_OUTPUT, 1)) - activate_pin(2) - else - activate_pin(3) - ..() - -/obj/item/integrated_circuit/logic/binary/proc/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - return FALSE - -/obj/item/integrated_circuit/logic/binary/proc/comparable(var/datum/integrated_io/A, var/datum/integrated_io/B) - return (isnum_safe(A.data) && isnum_safe(B.data)) || (istext(A.data) && istext(B.data)) - -/obj/item/integrated_circuit/logic/unary - inputs = list("A" = IC_PINTYPE_ANY) - activators = list("compare" = IC_PINTYPE_PULSE_IN, "on compare" = IC_PINTYPE_PULSE_OUT) - -/obj/item/integrated_circuit/logic/unary/do_work() - var/datum/integrated_io/A = inputs[1] - var/datum/integrated_io/O = outputs[1] - O.data = do_check(A) ? TRUE : FALSE - ..() - activate_pin(2) - -/obj/item/integrated_circuit/logic/unary/proc/do_check(var/datum/integrated_io/A) - return FALSE - -/obj/item/integrated_circuit/logic/binary/equals - name = "equal gate" - desc = "This gate compares two values, and outputs TRUE if both are the same." - icon_state = "equal" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/logic/binary/equals/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - return A.data == B.data - -/obj/item/integrated_circuit/logic/binary/jklatch - name = "JK latch" - desc = "This gate is a synchronized JK latch." - icon_state = "jklatch" - inputs = list("J" = IC_PINTYPE_ANY,"K" = IC_PINTYPE_ANY) - outputs = list("Q" = IC_PINTYPE_BOOLEAN,"!Q" = IC_PINTYPE_BOOLEAN) - activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/lstate=FALSE - -/obj/item/integrated_circuit/logic/binary/jklatch/do_work() - var/datum/integrated_io/A = inputs[1] - var/datum/integrated_io/B = inputs[2] - var/datum/integrated_io/O = outputs[1] - var/datum/integrated_io/Q = outputs[2] - if(A.data) - if(B.data) - lstate=!lstate - else - lstate = TRUE - else - if(B.data) - lstate=FALSE - O.data = lstate ? TRUE : FALSE - Q.data = !lstate ? TRUE : FALSE - if(get_pin_data(IC_OUTPUT, 1)) - activate_pin(2) - else - activate_pin(3) - push_data() - -/obj/item/integrated_circuit/logic/binary/rslatch - name = "RS latch" - desc = "This gate is a synchronized RS latch. If both R and S are true, its state will not change." - icon_state = "sr_nor" - inputs = list("S" = IC_PINTYPE_ANY,"R" = IC_PINTYPE_ANY) - outputs = list("Q" = IC_PINTYPE_BOOLEAN,"!Q" = IC_PINTYPE_BOOLEAN) - activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/lstate=FALSE - -/obj/item/integrated_circuit/logic/binary/rslatch/do_work() - var/datum/integrated_io/A = inputs[1] - var/datum/integrated_io/B = inputs[2] - var/datum/integrated_io/O = outputs[1] - var/datum/integrated_io/Q = outputs[2] - if(A.data) - if(!B.data) - lstate=TRUE - else - if(B.data) - lstate=FALSE - O.data = lstate ? TRUE : FALSE - Q.data = !lstate ? TRUE : FALSE - if(get_pin_data(IC_OUTPUT, 1)) - activate_pin(2) - else - activate_pin(3) - push_data() - -/obj/item/integrated_circuit/logic/binary/gdlatch - name = "gated D latch" - desc = "This gate is a synchronized gated D latch." - icon_state = "gated_d" - inputs = list("D" = IC_PINTYPE_ANY,"E" = IC_PINTYPE_ANY) - outputs = list("Q" = IC_PINTYPE_BOOLEAN,"!Q" = IC_PINTYPE_BOOLEAN) - activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/lstate=FALSE - -/obj/item/integrated_circuit/logic/binary/gdlatch/do_work() - var/datum/integrated_io/A = inputs[1] - var/datum/integrated_io/B = inputs[2] - var/datum/integrated_io/O = outputs[1] - var/datum/integrated_io/Q = outputs[2] - if(B.data) - if(A.data) - lstate=TRUE - else - lstate=FALSE - - O.data = lstate ? TRUE : FALSE - Q.data = !lstate ? TRUE : FALSE - if(get_pin_data(IC_OUTPUT, 1)) - activate_pin(2) - else - activate_pin(3) - push_data() - -/obj/item/integrated_circuit/logic/binary/not_equals - name = "not equal gate" - desc = "This gate compares two values, and outputs TRUE if both are different." - icon_state = "not_equal" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/logic/binary/not_equals/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - return A.data != B.data - -/obj/item/integrated_circuit/logic/binary/and - name = "and gate" - desc = "This gate will output TRUE if both inputs evaluate to true." - icon_state = "and" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/logic/binary/and/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - return A.data && B.data - -/obj/item/integrated_circuit/logic/binary/or - name = "or gate" - desc = "This gate will output TRUE if one of the inputs evaluate to true." - icon_state = "or" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/logic/binary/or/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - return A.data || B.data - -/obj/item/integrated_circuit/logic/binary/less_than - name = "less than gate" - desc = "This will output TRUE if the first input is less than the second input." - icon_state = "less_than" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/logic/binary/less_than/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - if(comparable(A, B)) - return A.data < B.data - -/obj/item/integrated_circuit/logic/binary/less_than_or_equal - name = "less than or equal gate" - desc = "This will output TRUE if the first input is less than, or equal to the second input." - icon_state = "less_than_or_equal" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/logic/binary/less_than_or_equal/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - if(comparable(A, B)) - return A.data <= B.data - -/obj/item/integrated_circuit/logic/binary/greater_than - name = "greater than gate" - desc = "This will output TRUE if the first input is greater than the second input." - icon_state = "greater_than" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/logic/binary/greater_than/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - if(comparable(A, B)) - return A.data > B.data - -/obj/item/integrated_circuit/logic/binary/greater_than_or_equal - name = "greater than or equal gate" - desc = "This will output TRUE if the first input is greater than, or equal to the second input." - icon_state = "greater_than_or_equal" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/logic/binary/greater_than_or_equal/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B) - if(comparable(A, B)) - return A.data >= B.data - -/obj/item/integrated_circuit/logic/unary/not - name = "not gate" - desc = "This gate inverts what's fed into it." - icon_state = "not" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - activators = list("invert" = IC_PINTYPE_PULSE_IN, "on inverted" = IC_PINTYPE_PULSE_OUT) - -/obj/item/integrated_circuit/logic/unary/not/do_check(var/datum/integrated_io/A) - return !A.data diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm deleted file mode 100644 index 13f49e9e68144..0000000000000 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ /dev/null @@ -1,747 +0,0 @@ -/obj/item/integrated_circuit/manipulation - category_text = "Manipulation" - -/obj/item/integrated_circuit/manipulation/weapon_firing - name = "weapon firing mechanism" - desc = "This somewhat complicated system allows one to slot in a gun, direct it towards a position, and remotely fire it." - extended_desc = "The firing mechanism can slot in any energy weapon. \ - The first and second inputs need to be numbers which correspond to coordinates for the gun to fire at relative to the machine itself. \ - The 'fire' activator will cause the mechanism to attempt to fire the weapon at the coordinates, if possible. Mode will switch between \ - lethal (TRUE) or stun (FALSE) modes. It uses the internal battery of the weapon itself, not the assembly. If you wish to fire the gun while the circuit is in \ - hand, you will need to use an assembly that is a gun." - complexity = 20 - max_allowed = 1 - w_class = WEIGHT_CLASS_SMALL - size = 3 - inputs = list( - "target X rel" = IC_PINTYPE_NUMBER, - "target Y rel" = IC_PINTYPE_NUMBER, - "mode" = IC_PINTYPE_BOOLEAN - ) - outputs = list("reference to gun" = IC_PINTYPE_REF) - activators = list( - "fire" = IC_PINTYPE_PULSE_IN - - ) - var/obj/item/gun/energy/installed_gun = null - spawn_flags = IC_SPAWN_RESEARCH - action_flags = IC_ACTION_COMBAT - power_draw_per_use = 0 - ext_cooldown = 1 - var/mode = FALSE - - var/stun_projectile = null //stun mode projectile type - var/stun_projectile_sound - var/lethal_projectile = null //lethal mode projectile type - var/lethal_projectile_sound - - demands_object_input = TRUE // You can put stuff in once the circuit is in assembly,passed down from additem and handled by attackby() - - - -/obj/item/integrated_circuit/manipulation/weapon_firing/Destroy() - qdel(installed_gun) - return ..() - -/obj/item/integrated_circuit/manipulation/weapon_firing/attackby(var/obj/O, var/mob/user) - if(istype(O, /obj/item/gun/energy)) - var/obj/item/gun/gun = O - if(installed_gun) - to_chat(user, "There's already a weapon installed.") - return - user.transferItemToLoc(gun,src) - installed_gun = gun - var/list/gun_properties = gun.get_turret_properties() - to_chat(user, "You slide \the [gun] into the firing mechanism.") - playsound(src, 'sound/items/Crowbar.ogg', 50, 1) - stun_projectile = gun_properties["stun_projectile"] - stun_projectile_sound = gun_properties["stun_projectile_sound"] - lethal_projectile = gun_properties["lethal_projectile"] - lethal_projectile_sound = gun_properties["lethal_projectile_sound"] - if(gun_properties["shot_delay"]) - cooldown_per_use = gun_properties["shot_delay"]*10 - if(cooldown_per_use<30) - cooldown_per_use = 30 - if(gun_properties["reqpower"]) - power_draw_per_use = gun_properties["reqpower"] - set_pin_data(IC_OUTPUT, 1, WEAKREF(installed_gun)) - push_data() - else - ..() - -/obj/item/integrated_circuit/manipulation/weapon_firing/attack_self(var/mob/user) - if(installed_gun) - installed_gun.forceMove(drop_location()) - to_chat(user, "You slide \the [installed_gun] out of the firing mechanism.") - size = initial(size) - playsound(src, 'sound/items/Crowbar.ogg', 50, 1) - installed_gun = null - set_pin_data(IC_OUTPUT, 1, WEAKREF(null)) - push_data() - else - to_chat(user, "There's no weapon to remove from the mechanism.") - -/obj/item/integrated_circuit/manipulation/weapon_firing/do_work() - if(!installed_gun || !installed_gun.handle_pins()) - return - if(!isturf(assembly.loc) && !(assembly.can_fire_equipped && ishuman(assembly.loc))) - return - set_pin_data(IC_OUTPUT, 1, WEAKREF(installed_gun)) - push_data() - var/datum/integrated_io/xo = inputs[1] - var/datum/integrated_io/yo = inputs[2] - var/datum/integrated_io/mode1 = inputs[3] - - mode = mode1.data - if(assembly) - if(isnum_safe(xo.data)) - xo.data = round(xo.data, 1) - if(isnum_safe(yo.data)) - yo.data = round(yo.data, 1) - - var/turf/T = get_turf(assembly) - var/target_x = CLAMP(T.x + xo.data, 0, world.maxx) - var/target_y = CLAMP(T.y + yo.data, 0, world.maxy) - - assembly.visible_message("[assembly] fires [installed_gun]!") - shootAt(locate(target_x, target_y, T.z)) - -/obj/item/integrated_circuit/manipulation/weapon_firing/proc/shootAt(turf/target) - var/turf/T = get_turf(src) - var/turf/U = target - if(!istype(T) || !istype(U)) - return - if(!installed_gun.cell) - return - if(!installed_gun.cell.charge) - return - var/obj/item/ammo_casing/energy/shot = installed_gun.ammo_type[mode?2:1] - if(installed_gun.cell.charge < shot.e_cost) - return - if(!shot) - return - update_icon() - var/obj/item/projectile/A - if(!mode) - A = new stun_projectile(T) - playsound(loc, stun_projectile_sound, 75, 1) - else - A = new lethal_projectile(T) - playsound(loc, lethal_projectile_sound, 75, 1) - installed_gun.cell.use(shot.e_cost) - //Shooting Code: - A.preparePixelProjectile(target, src) - A.fire() - log_attack("[assembly] [REF(assembly)] has fired [installed_gun].") - return A - -/obj/item/integrated_circuit/manipulation/locomotion - name = "locomotion circuit" - desc = "This allows a machine to move in a given direction." - icon_state = "locomotion" - extended_desc = "The circuit accepts a 'dir' number as a direction to move towards. \ - Pulsing the 'step towards dir' activator pin will cause the machine to move one step in that direction, assuming it is not \ - being held, or anchored in some way. It should be noted that the ability to move is dependant on the type of assembly that this circuit inhabits; only drone assemblies can move." - w_class = WEIGHT_CLASS_SMALL - complexity = 10 - max_allowed = 4 - cooldown_per_use = 1 SECONDS - ext_cooldown = 1 SECONDS - inputs = list("direction" = IC_PINTYPE_DIR) - outputs = list("obstacle" = IC_PINTYPE_REF) - activators = list("step towards dir" = IC_PINTYPE_PULSE_IN,"on step"=IC_PINTYPE_PULSE_OUT,"blocked"=IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - action_flags = IC_ACTION_MOVEMENT - power_draw_per_use = 100 - -/obj/item/integrated_circuit/manipulation/locomotion/do_work() - ..() - var/turf/T = get_turf(src) - if(T && assembly) - if(assembly.anchored || !assembly.can_move()) - return - if(assembly.loc == T) // Check if we're held by someone. If the loc is the floor, we're not held. - var/datum/integrated_io/wanted_dir = inputs[1] - if(isnum_safe(wanted_dir.data)) - if(step(assembly, wanted_dir.data)) - activate_pin(2) - return - else - set_pin_data(IC_OUTPUT, 1, WEAKREF(assembly.collw)) - push_data() - activate_pin(3) - return FALSE - return FALSE - -/obj/item/integrated_circuit/manipulation/grenade - name = "grenade primer" - desc = "This circuit comes with the ability to attach most types of grenades and prime them at will." - extended_desc = "The time between priming and detonation is limited to between 1 to 12 seconds, but is optional. \ - If the input is not set, not a number, or a number less than 1, the grenade's built-in timing will be used. \ - Beware: Once primed, there is no aborting the process!" - icon_state = "grenade" - complexity = 30 - max_allowed = 1 - cooldown_per_use = 10 - inputs = list("detonation time" = IC_PINTYPE_NUMBER) - outputs = list("reference to grenade" = IC_PINTYPE_REF) - activators = list("prime grenade" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_RESEARCH - action_flags = IC_ACTION_COMBAT - var/obj/item/grenade/attached_grenade - var/pre_attached_grenade_type - demands_object_input = TRUE // You can put stuff in once the circuit is in assembly,passed down from additem and handled by attackby() - -/obj/item/integrated_circuit/manipulation/grenade/Initialize() - . = ..() - if(pre_attached_grenade_type) - var/grenade = new pre_attached_grenade_type(src) - attach_grenade(grenade) - -/obj/item/integrated_circuit/manipulation/grenade/Destroy() - if(attached_grenade && !attached_grenade.active) - attached_grenade.forceMove(loc) - detach_grenade() - return ..() - -/obj/item/integrated_circuit/manipulation/grenade/attackby(var/obj/item/grenade/G, var/mob/user) - if(istype(G)) - if(attached_grenade) - to_chat(user, "There is already a grenade attached!") - else if(user.transferItemToLoc(G,src)) - user.visible_message("\The [user] attaches \a [G] to \the [src]!", "You attach \the [G] to \the [src].") - attach_grenade(G) - G.forceMove(src) - else - return ..() - -/obj/item/integrated_circuit/manipulation/grenade/attack_self(var/mob/user) - if(attached_grenade) - user.visible_message("\The [user] removes \an [attached_grenade] from \the [src]!", "You remove \the [attached_grenade] from \the [src].") - user.put_in_hands(attached_grenade) - detach_grenade() - else - return ..() - -/obj/item/integrated_circuit/manipulation/grenade/do_work() - if(attached_grenade && !attached_grenade.active) - var/datum/integrated_io/detonation_time = inputs[1] - var/dt - if(isnum_safe(detonation_time.data) && detonation_time.data > 0) - dt = CLAMP(detonation_time.data, 1, 12)*10 - else - dt = 15 - addtimer(CALLBACK(attached_grenade, /obj/item/grenade.proc/prime), dt) - var/atom/holder = loc - message_admins("activated a grenade assembly. Last touches: Assembly: [holder.fingerprintslast] Circuit: [fingerprintslast] Grenade: [attached_grenade.fingerprintslast]") - -// These procs do not relocate the grenade, that's the callers responsibility -/obj/item/integrated_circuit/manipulation/grenade/proc/attach_grenade(var/obj/item/grenade/G) - attached_grenade = G - G.forceMove(src) - desc += " \An [attached_grenade] is attached to it!" - set_pin_data(IC_OUTPUT, 1, WEAKREF(G)) - -/obj/item/integrated_circuit/manipulation/grenade/proc/detach_grenade() - if(!attached_grenade) - return - attached_grenade.forceMove(drop_location()) - set_pin_data(IC_OUTPUT, 1, WEAKREF(null)) - attached_grenade = null - desc = initial(desc) - -/obj/item/integrated_circuit/manipulation/plant_module - name = "plant manipulation module" - desc = "Used to uproot weeds and harvest/plant trays." - icon_state = "plant_m" - extended_desc = "The circuit accepts a reference to a hydroponic tray or an item on an adjacent tile. \ - Mode input (0-harvest, 1-uproot weeds, 2-uproot plant, 3-plant seed) determines action. \ - Harvesting outputs a list of the harvested plants." - w_class = WEIGHT_CLASS_TINY - complexity = 10 - inputs = list("tray" = IC_PINTYPE_REF,"mode" = IC_PINTYPE_NUMBER,"item" = IC_PINTYPE_REF) - outputs = list("result" = IC_PINTYPE_LIST) - activators = list("pulse in" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 50 - -/obj/item/integrated_circuit/manipulation/plant_module/do_work() - ..() - var/obj/acting_object = get_object() - var/obj/OM = get_pin_data_as_type(IC_INPUT, 1, /obj) - var/obj/O = get_pin_data_as_type(IC_INPUT, 3, /obj/item) - - if(!check_target(OM)) - push_data() - activate_pin(2) - return - - if(istype(OM,/obj/structure/spacevine) && check_target(OM) && get_pin_data(IC_INPUT, 2) == 2) - qdel(OM) - push_data() - activate_pin(2) - return - - var/obj/machinery/hydroponics/TR = OM - if(istype(TR)) - switch(get_pin_data(IC_INPUT, 2)) - if(0) - var/list/harvest_output = TR.attack_hand() - for(var/i in 1 to length(harvest_output)) - harvest_output[i] = WEAKREF(harvest_output[i]) - - if(length(harvest_output)) - set_pin_data(IC_OUTPUT, 1, harvest_output) - push_data() - if(1) - TR.weedlevel = 0 - TR.update_icon() - if(2) - if(TR.myseed) //Could be that they're just using it as a de-weeder - TR.age = 0 - TR.plant_health = 0 - if(TR.harvest) - TR.harvest = FALSE //To make sure they can't just put in another seed and insta-harvest it - qdel(TR.myseed) - TR.myseed = null - TR.weedlevel = 0 //Has a side effect of cleaning up those nasty weeds - TR.dead = 0 - TR.update_icon() - if(3) - if(!check_target(O)) - activate_pin(2) - return FALSE - - else if(istype(O, /obj/item/seeds) && !istype(O, /obj/item/seeds/sample)) - if(!TR.myseed) - if(istype(O, /obj/item/seeds/kudzu)) - investigate_log("had Kudzu planted in it by [acting_object] at [AREACOORD(src)]","kudzu") - acting_object.visible_message("[acting_object] plants [O].") - TR.dead = 0 - TR.myseed = O - TR.age = 1 - TR.plant_health = TR.myseed.endurance - TR.lastcycle = world.time - O.forceMove(TR) - TR.update_icon() - activate_pin(2) - -/obj/item/integrated_circuit/manipulation/seed_extractor - name = "seed extractor module" - desc = "Used to extract seeds from grown produce." - icon_state = "plant_m" - extended_desc = "The circuit accepts a reference to a plant item and extracts seeds from it, outputting the results to a list." - complexity = 8 - inputs = list("target" = IC_PINTYPE_REF) - outputs = list("result" = IC_PINTYPE_LIST) - activators = list("pulse in" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 50 - -/obj/item/integrated_circuit/manipulation/seed_extractor/do_work() - ..() - var/obj/O = get_pin_data_as_type(IC_INPUT, 1, /obj/item) - if(!check_target(O)) - push_data() - activate_pin(2) - return - - var/list/seed_output = seedify(O, -1) - for(var/i in 1 to length(seed_output)) - seed_output[i] = WEAKREF(seed_output[i]) - - if(seed_output.len) - set_pin_data(IC_OUTPUT, 1, seed_output) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/manipulation/grabber - name = "grabber" - desc = "A circuit with its own inventory for items. Used to grab and store things." - icon_state = "grabber" - extended_desc = "This circuit accepts a reference to an object to be grabbed, and can store up to 10 objects. Modes: 1 to grab, 0 to eject the first object, -1 to eject all objects, and -2 to eject the target. If you throw something from a grabber's inventory with a thrower, the grabber will update its outputs accordingly." - w_class = WEIGHT_CLASS_SMALL - size = 3 - cooldown_per_use = 5 - complexity = 10 - max_allowed = 1 - inputs = list("target" = IC_PINTYPE_REF,"mode" = IC_PINTYPE_NUMBER) - outputs = list("first" = IC_PINTYPE_REF, "last" = IC_PINTYPE_REF, "amount" = IC_PINTYPE_NUMBER,"contents" = IC_PINTYPE_LIST) - activators = list("pulse in" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - action_flags = IC_ACTION_COMBAT - power_draw_per_use = 50 - var/max_items = 10 - -/obj/item/integrated_circuit/manipulation/grabber/do_work() - //There shouldn't be any target required to eject all contents - var/mode = get_pin_data(IC_INPUT, 2) - switch(mode) - if(-1) - drop_all() - if(0) - if(contents.len) - drop(contents[1]) - - var/obj/item/AM = get_pin_data_as_type(IC_INPUT, 1, /obj/item) - if(!QDELETED(AM) && !istype(AM, /obj/item/electronic_assembly) && !istype(AM, /obj/item/transfer_valve) && !istype(AM, /obj/item/twohanded) && !istype(assembly.loc, /obj/item/implant/storage)) - switch(mode) - if(1) - grab(AM) - if(-2) - drop(AM) - update_outputs() - activate_pin(2) - -/obj/item/integrated_circuit/manipulation/grabber/proc/grab(obj/item/AM) - var/max_w_class = assembly.w_class - if(check_target(AM)) - if(contents.len < max_items && AM.w_class <= max_w_class) - var/atom/A = get_object() - A.investigate_log("picked up ([AM]) with [src].", INVESTIGATE_CIRCUIT) - AM.forceMove(src) - -/obj/item/integrated_circuit/manipulation/grabber/proc/drop(obj/item/AM, turf/T = drop_location()) - if(!(AM in contents)) - return - var/atom/A = get_object() - A.investigate_log("dropped ([AM]) from [src].", INVESTIGATE_CIRCUIT) - AM.forceMove(T) - -/obj/item/integrated_circuit/manipulation/grabber/proc/drop_all() - if(contents.len) - var/turf/T = drop_location() - var/obj/item/U - for(U in src) - drop(U, T) - -/obj/item/integrated_circuit/manipulation/grabber/proc/update_outputs() - if(contents.len) - set_pin_data(IC_OUTPUT, 1, WEAKREF(contents[1])) - set_pin_data(IC_OUTPUT, 2, WEAKREF(contents[contents.len])) - else - set_pin_data(IC_OUTPUT, 1, null) - set_pin_data(IC_OUTPUT, 2, null) - set_pin_data(IC_OUTPUT, 3, contents.len) - set_pin_data(IC_OUTPUT, 4, contents) - push_data() - -/obj/item/integrated_circuit/manipulation/grabber/attack_self(var/mob/user) - drop_all() - update_outputs() - push_data() - -/obj/item/integrated_circuit/manipulation/claw - name = "pulling claw" - desc = "Circuit which can pull things.." - icon_state = "pull_claw" - extended_desc = "This circuit accepts a reference to a thing to be pulled. Modes: 0 for release. 1 for pull." - w_class = WEIGHT_CLASS_SMALL - size = 3 - cooldown_per_use = 5 - max_allowed = 1 - complexity = 10 - inputs = list("target" = IC_PINTYPE_REF,"mode" = IC_PINTYPE_INDEX,"dir" = IC_PINTYPE_DIR) - outputs = list("is pulling" = IC_PINTYPE_BOOLEAN) - activators = list("pulse in" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT,"released" = IC_PINTYPE_PULSE_OUT,"pull to dir" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 50 - ext_cooldown = 1 - var/max_grab = GRAB_PASSIVE - -/obj/item/integrated_circuit/manipulation/claw/do_work(ord) - var/obj/acting_object = get_object() - var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) - var/mode = get_pin_data(IC_INPUT, 2) - switch(ord) - if(1) - mode = CLAMP(mode, GRAB_PASSIVE, max_grab) - if(AM) - if(check_target(AM, exclude_contents = TRUE)) - acting_object.investigate_log("grabbed ([AM]) using [src].", INVESTIGATE_CIRCUIT) - acting_object.start_pulling(AM,mode) - if(acting_object.pulling) - set_pin_data(IC_OUTPUT, 1, TRUE) - else - set_pin_data(IC_OUTPUT, 1, FALSE) - push_data() - - if(4) - if(acting_object.pulling) - var/dir = get_pin_data(IC_INPUT, 3) - var/turf/G =get_step(get_turf(acting_object),dir) - var/atom/movable/pullee = acting_object.pulling - var/turf/Pl = get_turf(pullee) - var/turf/F = get_step_towards(Pl,G) - if(acting_object.Adjacent(F)) - if(!step_towards(pullee, F)) - F = get_step_towards2(Pl,G) - if(acting_object.Adjacent(F)) - step_towards(pullee, F) - activate_pin(2) - -/obj/item/integrated_circuit/manipulation/claw/stop_pulling() - set_pin_data(IC_OUTPUT, 1, FALSE) - activate_pin(3) - push_data() - ..() - - - - -/obj/item/integrated_circuit/manipulation/matman - name = "material manager" - desc = "This circuit is designed for automatic storage and distribution of materials." - extended_desc = "The first input takes a ref of a machine with a material container. \ - Second input is used for inserting material stacks into the internal material storage. \ - Inputs 3-13 are used to transfer materials between target machine and circuit storage. \ - Positive values will take that number of materials from another machine. \ - Negative values will fill another machine from internal storage. Outputs show current stored amounts of mats." - icon_state = "grabber" - complexity = 16 - inputs = list( - "target" = IC_PINTYPE_REF, - "sheets to insert" = IC_PINTYPE_NUMBER, - "Iron" = IC_PINTYPE_NUMBER, - "Glass" = IC_PINTYPE_NUMBER, - "Silver" = IC_PINTYPE_NUMBER, - "Gold" = IC_PINTYPE_NUMBER, - "Diamond" = IC_PINTYPE_NUMBER, - "Uranium" = IC_PINTYPE_NUMBER, - "Solid Plasma" = IC_PINTYPE_NUMBER, - "Bluespace Mesh" = IC_PINTYPE_NUMBER, - "Bananium" = IC_PINTYPE_NUMBER, - "Titanium" = IC_PINTYPE_NUMBER, - ) - outputs = list( - "self ref" = IC_PINTYPE_REF, - "Total amount" = IC_PINTYPE_NUMBER, - "Iron" = IC_PINTYPE_NUMBER, - "Glass" = IC_PINTYPE_NUMBER, - "Silver" = IC_PINTYPE_NUMBER, - "Gold" = IC_PINTYPE_NUMBER, - "Diamond" = IC_PINTYPE_NUMBER, - "Uranium" = IC_PINTYPE_NUMBER, - "Solid Plasma" = IC_PINTYPE_NUMBER, - "Bluespace Mesh" = IC_PINTYPE_NUMBER, - "Bananium" = IC_PINTYPE_NUMBER, - "Titanium" = IC_PINTYPE_NUMBER - ) - activators = list( - "insert sheet" = IC_PINTYPE_PULSE_IN, - "transfer mats" = IC_PINTYPE_PULSE_IN, - "on success" = IC_PINTYPE_PULSE_OUT, - "on failure" = IC_PINTYPE_PULSE_OUT, - "push ref" = IC_PINTYPE_PULSE_IN, - "on push ref" = IC_PINTYPE_PULSE_IN - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 40 - ext_cooldown = 1 - cooldown_per_use = 10 - var/list/mtypes = list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace) - -/obj/item/integrated_circuit/manipulation/matman/Initialize() - var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, - list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace), 0, - FALSE, /obj/item/stack, CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert)) - materials.max_amount =100000 - materials.precise_insertion = TRUE - .=..() - -/obj/item/integrated_circuit/manipulation/matman/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - set_pin_data(IC_OUTPUT, 2, materials.total_amount) - for(var/I in 1 to mtypes.len) - var/amount = materials.materials[mtypes[I]] - if(amount) - set_pin_data(IC_OUTPUT, I+2, amount) - push_data() - -/obj/item/integrated_circuit/manipulation/matman/proc/is_insertion_ready(mob/user) - return TRUE - -/obj/item/integrated_circuit/manipulation/matman/do_work(ord) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - var/atom/movable/H = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) - if(!check_target(H)) - activate_pin(4) - return - var/turf/T = get_turf(H) - switch(ord) - if(1) - var/obj/item/stack/sheet/S = H - if(!S) - activate_pin(4) - return - if(materials.insert_stack(S, CLAMP(get_pin_data(IC_INPUT, 2),0,100), multiplier = 1) ) - AfterMaterialInsert() - activate_pin(3) - else - activate_pin(4) - if(2) - var/datum/component/material_container/mt = H.GetComponent(/datum/component/material_container) - var/suc - for(var/I in 1 to mtypes.len) - var/datum/material/M = materials.materials[mtypes[I]] - if(M) - var/U = CLAMP(get_pin_data(IC_INPUT, I+2),-100000,100000) - if(!U) - continue - if(!mt) //Invalid input - if(U>0) - if(materials.retrieve_sheets(materials.amount2sheet(U), mtypes[I], T)) - suc = TRUE - else - if(mt.transer_amt_to(materials, U, mtypes[I])) - suc = TRUE - if(suc) - AfterMaterialInsert() - activate_pin(3) - else - activate_pin(4) - if(5) - set_pin_data(IC_OUTPUT, 1, WEAKREF(src)) - AfterMaterialInsert() - activate_pin(6) - -/obj/item/integrated_circuit/manipulation/matman/Destroy() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.retrieve_all() - .=..() - - - - -// - inserter circuit - // -/obj/item/integrated_circuit/manipulation/inserter - name = "inserter" - desc = "A nimble circuit that puts stuff inside a storage like a backpack and can take it out aswell." - icon_state = "grabber" - extended_desc = "This circuit accepts a reference to an object to be inserted or extracted depending on mode. If a storage is given for extraction, the extracted item will be put in the new storage. Modes: 1 insert, 0 to extract." - w_class = WEIGHT_CLASS_SMALL - size = 3 - cooldown_per_use = 5 - complexity = 10 - inputs = list("target object" = IC_PINTYPE_REF, "target container" = IC_PINTYPE_REF,"mode" = IC_PINTYPE_NUMBER) - activators = list("pulse in" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - action_flags = IC_ACTION_COMBAT - power_draw_per_use = 20 - var/max_items = 10 - -/obj/item/integrated_circuit/manipulation/inserter/do_work() - //There shouldn't be any target required to eject all contents - var/obj/item/target_obj = get_pin_data_as_type(IC_INPUT, 1, /obj/item) - if(!target_obj) - return - - var/distance = get_dist(get_turf(src),get_turf(target_obj)) - if(distance > 1 || distance < 0) - return - - var/obj/item/storage/container = get_pin_data_as_type(IC_INPUT, 2, /obj/item) - var/mode = get_pin_data(IC_INPUT, 3) - switch(mode) - if(1) //Not working - if(!container || !istype(container,/obj/item/storage) || !Adjacent(container)) - return - - var/datum/component/storage/STR = container.GetComponent(/datum/component/storage) - if(!STR) - return - - STR.attackby(src, target_obj) - - else - var/datum/component/storage/STR = target_obj.loc.GetComponent(/datum/component/storage) - if(!STR) - return - - if(!container || !istype(container,/obj/item/storage) || !Adjacent(container)) - STR.remove_from_storage(target_obj,drop_location()) - else - STR.remove_from_storage(target_obj,container) - -// Renamer circuit. Renames the assembly it is in. Useful in cooperation with telecomms-based circuits. -/obj/item/integrated_circuit/manipulation/renamer - name = "renamer" - desc = "A small circuit that renames the assembly it is in. Useful paired with speech-based circuits." - icon_state = "internalbm" - extended_desc = "This circuit accepts a string as input, and can be pulsed to rewrite the current assembly's name with said string. On success, it pulses the default pulse-out wire." - inputs = list("name" = IC_PINTYPE_STRING) - outputs = list("current name" = IC_PINTYPE_STRING) - activators = list("rename" = IC_PINTYPE_PULSE_IN,"get name" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT) - power_draw_per_use = 1 - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/manipulation/renamer/do_work(var/n) - if(!assembly) - return - switch(n) - if(1) - var/new_name = get_pin_data(IC_INPUT, 1) - if(new_name) - assembly.name = new_name - - else - set_pin_data(IC_OUTPUT, 1, assembly.name) - push_data() - - activate_pin(3) - - - -// - redescribing circuit - // -/obj/item/integrated_circuit/manipulation/redescribe - name = "redescriber" - desc = "Takes any string as an input and will set it as the assembly's description." - extended_desc = "Strings should can be of any length." - icon_state = "speaker" - cooldown_per_use = 10 - complexity = 3 - inputs = list("text" = IC_PINTYPE_STRING) - outputs = list("description" = IC_PINTYPE_STRING) - activators = list("redescribe" = IC_PINTYPE_PULSE_IN,"get description" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/manipulation/redescribe/do_work(var/n) - if(!assembly) - return - - switch(n) - if(1) - assembly.desc = get_pin_data(IC_INPUT, 1) - - else - set_pin_data(IC_OUTPUT, 1, assembly.desc) - push_data() - - activate_pin(3) - -// - repainting circuit - // -/obj/item/integrated_circuit/manipulation/repaint - name = "auto-repainter" - desc = "There's an oddly high amount of spraying cans fitted right inside this circuit." - extended_desc = "Takes a value in hexadecimal and uses it to repaint the assembly it is in." - cooldown_per_use = 10 - complexity = 3 - inputs = list("color" = IC_PINTYPE_COLOR) - outputs = list("current color" = IC_PINTYPE_COLOR) - activators = list("repaint" = IC_PINTYPE_PULSE_IN,"get color" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/manipulation/repaint/do_work(var/n) - if(!assembly) - return - - switch(n) - if(1) - assembly.detail_color = get_pin_data(IC_INPUT, 1) - assembly.update_icon() - - else - set_pin_data(IC_OUTPUT, 1, assembly.detail_color) - push_data() - - activate_pin(3) diff --git a/code/modules/integrated_electronics/subtypes/memory.dm b/code/modules/integrated_electronics/subtypes/memory.dm deleted file mode 100644 index 0392f92e5ac3b..0000000000000 --- a/code/modules/integrated_electronics/subtypes/memory.dm +++ /dev/null @@ -1,140 +0,0 @@ -/obj/item/integrated_circuit/memory - name = "memory chip" - desc = "This tiny chip can store one piece of data." - icon_state = "memory" - complexity = 1 - inputs = list() - outputs = list() - activators = list("set" = IC_PINTYPE_PULSE_IN, "on set" = IC_PINTYPE_PULSE_OUT) - category_text = "Memory" - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 1 - var/number_of_pins = 1 - -/obj/item/integrated_circuit/memory/Initialize() - for(var/i = 1 to number_of_pins) - inputs["input [i]"] = IC_PINTYPE_ANY // This is just a string since pins don't get built until ..() is called. - outputs["output [i]"] = IC_PINTYPE_ANY - complexity = number_of_pins - . = ..() - -/obj/item/integrated_circuit/memory/examine(mob/user) - ..() - var/i - for(i = 1, i <= outputs.len, i++) - var/datum/integrated_io/O = outputs[i] - var/data = "nothing" - if(isweakref(O.data)) - var/datum/d = O.data_as_type(/datum) - if(d) - data = "[d]" - else if(!isnull(O.data)) - data = O.data - to_chat(user, "\The [src] has [data] saved to address [i].") - -/obj/item/integrated_circuit/memory/do_work() - for(var/i = 1 to inputs.len) - var/datum/integrated_io/I = inputs[i] - var/datum/integrated_io/O = outputs[i] - O.data = I.data - O.push_data() - activate_pin(2) - -/obj/item/integrated_circuit/memory/tiny - name = "small memory circuit" - desc = "This circuit can store two pieces of data." - icon_state = "memory4" - power_draw_per_use = 2 - number_of_pins = 2 - -/obj/item/integrated_circuit/memory/medium - name = "medium memory circuit" - desc = "This circuit can store four pieces of data." - icon_state = "memory4" - power_draw_per_use = 2 - number_of_pins = 4 - -/obj/item/integrated_circuit/memory/large - name = "large memory circuit" - desc = "This big circuit can store eight pieces of data." - icon_state = "memory8" - power_draw_per_use = 4 - number_of_pins = 8 - -/obj/item/integrated_circuit/memory/huge - name = "large memory stick" - desc = "This stick of memory can store up up to sixteen pieces of data." - icon_state = "memory16" - w_class = WEIGHT_CLASS_SMALL - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 8 - number_of_pins = 16 - -/obj/item/integrated_circuit/memory/constant - name = "constant chip" - desc = "This tiny chip can store one piece of data, which cannot be overwritten without disassembly." - icon_state = "memory" - inputs = list() - outputs = list("output pin" = IC_PINTYPE_ANY) - activators = list("push data" = IC_PINTYPE_PULSE_IN) - var/accepting_refs = FALSE - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - number_of_pins = 0 - -/obj/item/integrated_circuit/memory/constant/do_work() - var/datum/integrated_io/O = outputs[1] - O.push_data() - -/obj/item/integrated_circuit/memory/constant/emp_act() - for(var/i in 1 to activators.len) - var/datum/integrated_io/activate/A = activators[i] - A.scramble() - -/obj/item/integrated_circuit/memory/constant/save_special() - var/datum/integrated_io/O = outputs[1] - if(istext(O.data) || isnum_safe(O.data)) - return O.data - -/obj/item/integrated_circuit/memory/constant/load_special(special_data) - var/datum/integrated_io/O = outputs[1] - if(istext(special_data) || isnum_safe(special_data)) - O.data = special_data - -/obj/item/integrated_circuit/memory/constant/attack_self(mob/user) - var/datum/integrated_io/O = outputs[1] - if(!user.IsAdvancedToolUser()) - return - var/type_to_use = input("Please choose a type to use.","[src] type setting") as null|anything in list("string","number","ref", "null") - - var/new_data = null - switch(type_to_use) - if("string") - accepting_refs = FALSE - new_data = input("Now type in a string.","[src] string writing") as null|text - if(istext(new_data) && user.IsAdvancedToolUser()) - O.data = new_data - to_chat(user, "You set \the [src]'s memory to [O.display_data(O.data)].") - if("number") - accepting_refs = FALSE - new_data = input("Now type in a number.","[src] number writing") as null|num - if(isnum_safe(new_data) && user.IsAdvancedToolUser()) - O.data = new_data - to_chat(user, "You set \the [src]'s memory to [O.display_data(O.data)].") - if("ref") - accepting_refs = TRUE - to_chat(user, "You turn \the [src]'s ref scanner on. Slide it across \ - an object for a ref of that object to save it in memory.") - if("null") - O.data = null - to_chat(user, "You set \the [src]'s memory to absolutely nothing.") - -/obj/item/integrated_circuit/memory/constant/afterattack(atom/target, mob/living/user, proximity) - . = ..() - if(accepting_refs && proximity) - var/datum/integrated_io/O = outputs[1] - O.data = WEAKREF(target) - visible_message("[user] slides \a [src]'s over \the [target].") - to_chat(user, "You set \the [src]'s memory to a reference to [O.display_data(O.data)]. The ref scanner is \ - now off.") - accepting_refs = FALSE - diff --git a/code/modules/integrated_electronics/subtypes/mining.dm b/code/modules/integrated_electronics/subtypes/mining.dm deleted file mode 100644 index 3dc9a45118c55..0000000000000 --- a/code/modules/integrated_electronics/subtypes/mining.dm +++ /dev/null @@ -1,105 +0,0 @@ -/obj/item/integrated_circuit/mining/ore_analyzer - name = "ore analyzer" - desc = "Analyzes a rock for its ore type." - extended_desc = "Takes a reference for an object and checks if it is a rock first. If that is the case, it outputs the mineral \ - inside the rock." - category_text = "Mining" - ext_cooldown = 1 - complexity = 20 - cooldown_per_use = 1 SECONDS - inputs = list( - "rock" = IC_PINTYPE_REF - ) - outputs = list( - "ore type" = IC_PINTYPE_STRING, - "amount" = IC_PINTYPE_NUMBER - ) - activators = list( - "analyze" = IC_PINTYPE_PULSE_IN, - "on analyzed" = IC_PINTYPE_PULSE_OUT, - "on found" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 20 - var/turf/closed/mineral/rock - var/mineral - - -/obj/item/integrated_circuit/mining/ore_analyzer/do_work() - rock = get_pin_data(IC_INPUT, 1) - if(!istype(rock,/turf/closed/mineral)) - mineral = null - set_pin_data(IC_OUTPUT, 1, null) - set_pin_data(IC_OUTPUT, 2, null) - - push_data() - activate_pin(2) - return - - if(rock.mineralType) - mineral = "[rock.mineralType]" - mineral = copytext(mineral, findlasttextEx(mineral, "/")+1) - else - mineral = "rock" - - set_pin_data(IC_OUTPUT, 1, mineral) - set_pin_data(IC_OUTPUT, 2, rock.mineralAmt) - push_data() - - activate_pin(2) - activate_pin(3) - - -/obj/item/integrated_circuit/mining/mining_drill - name = "mining drill" - desc = "A mining drill that can drill through rocks." - extended_desc = "A mining drill that activates on sensing a mineable rock. It takes some time to get the job done and \ - has to not be moved during that time." - category_text = "Mining" - ext_cooldown = 1 - complexity = 20 - cooldown_per_use = 3 SECONDS - inputs = list( - "rock" = IC_PINTYPE_REF - ) - outputs = list() - activators = list( - "mine" = IC_PINTYPE_PULSE_IN, - "on success" = IC_PINTYPE_PULSE_OUT, - "on failure" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 100 - - var/busy = FALSE - var/usedx - var/usedy - var/turf/closed/mineral/rock - -/obj/item/integrated_circuit/mining/mining_drill/do_work() - rock = get_pin_data(IC_INPUT, 1) - - if(!rock) - activate_pin(3) - return - if(!(ismineralturf(rock) && rock.Adjacent(assembly)) || busy) - activate_pin(3) - return - - busy = TRUE - usedx = assembly.loc.x - usedy = assembly.loc.y - playsound(src, 'sound/items/drill_use.ogg',50,1) - addtimer(CALLBACK(src, .proc/drill), 50) - - -/obj/item/integrated_circuit/mining/mining_drill/proc/drill() - busy = FALSE - // The assembly was moved, hence stopping the mining OR the rock was mined before - if(usedx != assembly.loc.x || usedy != assembly.loc.y || !rock) - activate_pin(3) - return FALSE - - activate_pin(2) - rock.gets_drilled() - return(TRUE) diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm deleted file mode 100644 index 04d5f6e67a3f4..0000000000000 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ /dev/null @@ -1,496 +0,0 @@ -/obj/item/integrated_circuit/output - category_text = "Output" - speech_span = SPAN_ROBOT - -/obj/item/integrated_circuit/output/screen - name = "small screen" - extended_desc = " use <br> to start a new line" - desc = "Takes any data type as an input, and displays it to the user upon examining." - icon_state = "screen" - inputs = list("displayed data" = IC_PINTYPE_ANY) - outputs = list() - activators = list("load data" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 10 - var/eol = "<br>" - var/stuff_to_display = null - -/obj/item/integrated_circuit/output/screen/disconnect_all() - ..() - stuff_to_display = null - -/obj/item/integrated_circuit/output/screen/any_examine(mob/user) - var/shown_label = "" - if(displayed_name && displayed_name != name) - shown_label = " labeled '[displayed_name]'" - - to_chat(user, "There is \a [src][shown_label], which displays [!isnull(stuff_to_display) ? "'[stuff_to_display]'" : "nothing"].") - -/obj/item/integrated_circuit/output/screen/do_work() - var/datum/integrated_io/I = inputs[1] - if(isweakref(I.data)) - var/datum/d = I.data_as_type(/datum) - if(d) - stuff_to_display = "[d]" - else - stuff_to_display = replacetext("[I.data]", eol , " ") - -/obj/item/integrated_circuit/output/screen/large - name = "large screen" - desc = "Takes any data type as an input and displays it to anybody near the device when pulsed. \ - It can also be examined to see the last thing it displayed." - icon_state = "screen_medium" - power_draw_per_use = 20 - -/obj/item/integrated_circuit/output/screen/large/do_work() - ..() - - if(isliving(assembly.loc))//this whole block just returns if the assembly is neither in a mobs hands or on the ground - var/mob/living/H = assembly.loc - if(H.get_active_held_item() != assembly && H.get_inactive_held_item() != assembly) - return - else - if(!isturf(assembly.loc)) - return - - var/list/nearby_things = range(0, get_turf(src)) - for(var/mob/M in nearby_things) - var/obj/O = assembly ? assembly : src - to_chat(M, "[icon2html(O.icon, world, O.icon_state)] [stuff_to_display]") - if(assembly) - assembly.investigate_log("displayed \"[html_encode(stuff_to_display)]\" with [type].", INVESTIGATE_CIRCUIT) - else - investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) - -/obj/item/integrated_circuit/output/light - name = "light" - desc = "A basic light which can be toggled on/off when pulsed." - icon_state = "light" - complexity = 4 - max_allowed = 4 - inputs = list() - outputs = list() - activators = list("toggle light" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/light_toggled = 0 - var/light_brightness = 3 - var/light_rgb = "#FFFFFF" - power_draw_idle = 0 // Adjusted based on brightness. - -/obj/item/integrated_circuit/output/light/do_work() - light_toggled = !light_toggled - update_lighting() - -/obj/item/integrated_circuit/output/light/proc/update_lighting() - if(light_toggled) - if(assembly) - assembly.set_light(l_range = light_brightness, l_power = 1, l_color = light_rgb) - else - if(assembly) - assembly.set_light(0) - power_draw_idle = light_toggled ? light_brightness * 2 : 0 - -/obj/item/integrated_circuit/output/light/power_fail() // Turns off the flashlight if there's no power left. - light_toggled = FALSE - update_lighting() - -/obj/item/integrated_circuit/output/light/advanced - name = "advanced light" - desc = "A light that takes a hexadecimal color value and a brightness value, and can be toggled on/off by pulsing it." - icon_state = "light_adv" - complexity = 8 - inputs = list( - "color" = IC_PINTYPE_COLOR, - "brightness" = IC_PINTYPE_NUMBER - ) - outputs = list() - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/output/light/advanced/on_data_written() - update_lighting() - -/obj/item/integrated_circuit/output/light/advanced/update_lighting() - var/new_color = get_pin_data(IC_INPUT, 1) - var/brightness = get_pin_data(IC_INPUT, 2) - - if(new_color && isnum_safe(brightness)) - brightness = CLAMP(brightness, 0, 4) - light_rgb = new_color - light_brightness = brightness - - ..() - -/obj/item/integrated_circuit/output/sound - name = "speaker circuit" - desc = "A miniature speaker is attached to this component." - icon_state = "speaker" - complexity = 8 - cooldown_per_use = 4 SECONDS - inputs = list( - "sound ID" = IC_PINTYPE_STRING, - "volume" = IC_PINTYPE_NUMBER, - "frequency" = IC_PINTYPE_BOOLEAN - ) - max_allowed = 5 - outputs = list() - activators = list("play sound" = IC_PINTYPE_PULSE_IN) - power_draw_per_use = 10 - var/list/sounds = list() - -/obj/item/integrated_circuit/output/sound/Initialize() - .= ..() - extended_desc = list() - extended_desc += "The first input pin determines which sound is used. The choices are; " - extended_desc += jointext(sounds, ", ") - extended_desc += ". The second pin determines the volume of sound that is played" - extended_desc += ", and the third determines if the frequency of the sound will vary with each activation." - extended_desc = jointext(extended_desc, null) - -/obj/item/integrated_circuit/output/sound/do_work() - var/ID = get_pin_data(IC_INPUT, 1) - var/vol = get_pin_data(IC_INPUT, 2) - var/freq = get_pin_data(IC_INPUT, 3) - if(!isnull(ID) && !isnull(vol)) - var/selected_sound = sounds[ID] - if(!selected_sound) - return - vol = CLAMP(vol ,0 , 100) - playsound(get_turf(src), selected_sound, vol, freq, -1) - var/atom/A = get_object() - A.investigate_log("played a sound ([selected_sound]) as [type].", INVESTIGATE_CIRCUIT) - -/obj/item/integrated_circuit/output/sound/on_data_written() - power_draw_per_use = get_pin_data(IC_INPUT, 2) * 15 - -/obj/item/integrated_circuit/output/sound/beeper - name = "beeper circuit" - desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit has a variety of beeps, boops, and buzzes to choose from." - sounds = list( - "beep" = 'sound/machines/twobeep.ogg', - "chime" = 'sound/machines/chime.ogg', - "buzz sigh" = 'sound/machines/buzz-sigh.ogg', - "buzz twice" = 'sound/machines/buzz-two.ogg', - "ping" = 'sound/machines/ping.ogg', - "synth yes" = 'sound/machines/synth_yes.ogg', - "synth no" = 'sound/machines/synth_no.ogg', - "warning buzz" = 'sound/machines/warning-buzzer.ogg' - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/output/sound/beepsky - name = "securitron sound circuit" - desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is similar to those used in Securitrons." - sounds = list( - "creep" = 'sound/voice/beepsky/creep.ogg', - "criminal" = 'sound/voice/beepsky/criminal.ogg', - "freeze" = 'sound/voice/beepsky/freeze.ogg', - "god" = 'sound/voice/beepsky/god.ogg', - "i am the law" = 'sound/voice/beepsky/iamthelaw.ogg', - "insult" = 'sound/voice/beepsky/insult.ogg', - "radio" = 'sound/voice/beepsky/radio.ogg', - "secure day" = 'sound/voice/beepsky/secureday.ogg', - ) - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/output/sound/medbot - name = "medbot sound circuit" - desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is often found in medical robots." - sounds = list( - "surgeon" = 'sound/voice/medbot/surgeon.ogg', - "radar" = 'sound/voice/medbot/radar.ogg', - "feel better" = 'sound/voice/medbot/feelbetter.ogg', - "patched up" = 'sound/voice/medbot/patchedup.ogg', - "injured" = 'sound/voice/medbot/injured.ogg', - "insult" = 'sound/voice/medbot/insult.ogg', - "coming" = 'sound/voice/medbot/coming.ogg', - "help" = 'sound/voice/medbot/help.ogg', - "live" = 'sound/voice/medbot/live.ogg', - "lost" = 'sound/voice/medbot/lost.ogg', - "flies" = 'sound/voice/medbot/flies.ogg', - "catch" = 'sound/voice/medbot/catch.ogg', - "delicious" = 'sound/voice/medbot/delicious.ogg', - "apple" = 'sound/voice/medbot/apple.ogg', - "no" = 'sound/voice/medbot/no.ogg', - ) - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/output/sound/vox - name = "ai vox sound circuit" - desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is often found in AI announcement systems." - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/output/sound/vox/Initialize() - .= ..() - sounds = GLOB.vox_sounds - extended_desc = "The first input pin determines which sound is used. It uses the AI Vox Broadcast word list. So either experiment to find words that work, or ask the AI to help in figuring them out. The second pin determines the volume of sound that is played, and the third determines if the frequency of the sound will vary with each activation." - -/obj/item/integrated_circuit/output/text_to_speech - name = "text-to-speech circuit" - desc = "Takes any string as an input and will make the device say the string when pulsed." - extended_desc = "This unit is more advanced than the plain speaker circuit, able to transpose any valid text to speech." - icon_state = "speaker" - cooldown_per_use = 10 - complexity = 12 - inputs = list("text" = IC_PINTYPE_STRING) - outputs = list() - activators = list("to speech" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 60 - -/obj/item/integrated_circuit/output/text_to_speech/do_work() - text = get_pin_data(IC_INPUT, 1) - if(!isnull(text)) - var/atom/movable/A = get_object() - var/sanitized_text = sanitize(text) - A.say(sanitized_text) - if (assembly) - log_say("[assembly] [REF(assembly)] : [sanitized_text]") - else - log_say("[name] ([type]) : [sanitized_text]") - -/obj/item/integrated_circuit/output/video_camera - name = "video camera circuit" - desc = "Takes a string as a name and a boolean to determine whether it is on, and uses this to be a camera linked to a list of networks you choose." - extended_desc = "The camera is linked to a list of camera networks of your choosing. Common choices are 'rd' for the research network, 'ss13' for the main station network (visible to AI), 'mine' for the mining network, and 'thunder' for the thunderdome network (viewable from bar)." - icon_state = "video_camera" - w_class = WEIGHT_CLASS_TINY - complexity = 10 - inputs = list( - "camera name" = IC_PINTYPE_STRING, - "camera active" = IC_PINTYPE_BOOLEAN, - "camera network" = IC_PINTYPE_LIST - ) - inputs_default = list("1" = "video camera circuit", "3" = list("rd")) - outputs = list() - activators = list() - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - action_flags = IC_ACTION_LONG_RANGE - power_draw_idle = 0 // Raises to 20 when on. - var/obj/machinery/camera/camera - var/updating = FALSE - -/obj/item/integrated_circuit/output/video_camera/New() - ..() - camera = new(src) - camera.network = list("rd") - on_data_written() - -/obj/item/integrated_circuit/output/video_camera/Destroy() - QDEL_NULL(camera) - return ..() - -/obj/item/integrated_circuit/output/video_camera/proc/set_camera_status(var/status) - if(camera) - camera.status = status - GLOB.cameranet.updatePortableCamera(camera) - power_draw_idle = camera.status ? 20 : 0 - if(camera.status) // Ensure that there's actually power. - if(!draw_idle_power()) - power_fail() - -/obj/item/integrated_circuit/output/video_camera/on_data_written() - if(camera) - var/cam_name = get_pin_data(IC_INPUT, 1) - var/cam_active = get_pin_data(IC_INPUT, 2) - var/list/new_network = get_pin_data(IC_INPUT, 3) - if(!isnull(cam_name)) - camera.c_tag = cam_name - if(!isnull(new_network)) - camera.network = new_network - set_camera_status(cam_active) - -/obj/item/integrated_circuit/output/video_camera/power_fail() - if(camera) - set_camera_status(0) - set_pin_data(IC_INPUT, 2, FALSE) - -/obj/item/integrated_circuit/output/video_camera/ext_moved(oldLoc, dir) - . = ..() - update_camera_location(oldLoc) - -#define VIDEO_CAMERA_BUFFER 10 -/obj/item/integrated_circuit/output/video_camera/proc/update_camera_location(oldLoc) - oldLoc = get_turf(oldLoc) - if(!QDELETED(camera) && !updating && oldLoc != get_turf(src)) - updating = TRUE - addtimer(CALLBACK(src, .proc/do_camera_update, oldLoc), VIDEO_CAMERA_BUFFER) -#undef VIDEO_CAMERA_BUFFER - -/obj/item/integrated_circuit/output/video_camera/proc/do_camera_update(oldLoc) - if(!QDELETED(camera) && oldLoc != get_turf(src)) - GLOB.cameranet.updatePortableCamera(camera) - updating = FALSE - -/obj/item/integrated_circuit/output/led - name = "light-emitting diode" - desc = "RGB LED. Takes a boolean value in, and if the boolean value is 'true-equivalent', the LED will be marked as lit on examine." - extended_desc = "TRUE-equivalent values are: Non-empty strings, non-zero numbers, and valid refs." - complexity = 0.1 - max_allowed = 4 - icon_state = "led" - inputs = list( - "lit" = IC_PINTYPE_BOOLEAN, - "color" = IC_PINTYPE_COLOR - ) - outputs = list() - activators = list() - inputs_default = list( - "2" = "#FF0000" - ) - power_draw_idle = 0 // Raises to 1 when lit. - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/led_color = "#FF0000" - -/obj/item/integrated_circuit/output/led/on_data_written() - power_draw_idle = get_pin_data(IC_INPUT, 1) ? 1 : 0 - led_color = get_pin_data(IC_INPUT, 2) - -/obj/item/integrated_circuit/output/led/power_fail() - set_pin_data(IC_INPUT, 1, FALSE) - -/obj/item/integrated_circuit/output/led/external_examine(mob/user) - var/text_output = "There is " - - if(name == displayed_name) - text_output += "\an [name]" - else - text_output += "\an ["\improper[name]"] labeled '[displayed_name]'" - text_output += " which is currently [get_pin_data(IC_INPUT, 1) ? "lit *" : "unlit"]." - to_chat(user, text_output) - -/obj/item/integrated_circuit/output/diagnostic_hud - name = "AR interface" - desc = "Takes an icon name as an input, and will update the status hud when data is written to it." - extended_desc = "Takes an icon name as an input, and will update the status hud when data is written to it, this means it can change the icon and have the icon stay that way even if the circuit is removed. The acceptable inputs are 'alert', 'move', 'working', 'patrol', 'called', and 'heart'. Any input other than that will return the icon to its default state." - var/list/icons = list( - "alert" = "hudalert", - "move" = "hudmove", - "working" = "hudworkingleft", - "patrol" = "hudpatrolleft", - "called" = "hudcalledleft", - "heart" = "hudsentientleft" - ) - complexity = 1 - icon_state = "led" - inputs = list( - "icon" = IC_PINTYPE_STRING - ) - outputs = list() - activators = list() - power_draw_idle = 0 - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/output/diagnostic_hud/on_data_written() - var/ID = get_pin_data(IC_INPUT, 1) - var/selected_icon = icons[ID] - if(assembly) - if(selected_icon) - assembly.prefered_hud_icon = selected_icon - else - assembly.prefered_hud_icon = "hudstat" - //update the diagnostic hud - assembly.diag_hud_set_circuitstat() - - -//Text to radio -//Outputs a simple string into radio (good to couple with the interceptor) -//Input: -//Text: the actual string to output -//Frequency: what channel to output in. This is a STRING, not a number, due to how comms work. It has to be the frequency without the dot, aka for common you need to put "1459" -/obj/item/integrated_circuit/output/text_to_radio - name = "text-to-radio circuit" - desc = "Takes any string as an input and will make the device output it in the radio with the frequency chosen as input." - extended_desc = "Similar to the text-to-speech circuit, except the fact that the text is converted into a subspace signal and broadcasted to the desired frequency, or 1459 as default.\ - The frequency is a number, and doesn't need the dot. Example: Common frequency is 145.9, so the result is 1459 as a number." - icon_state = "speaker" - complexity = 15 - inputs = list("text" = IC_PINTYPE_STRING, "frequency" = IC_PINTYPE_NUMBER) - outputs = list("encryption keys" = IC_PINTYPE_LIST) - activators = list("broadcast" = IC_PINTYPE_PULSE_IN) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 100 - cooldown_per_use = 0.1 - var/list/whitelisted_freqs = list() // special freqs can be used by inserting encryption keys - var/list/encryption_keys = list() - var/obj/item/radio/headset/integrated/radio - -/obj/item/integrated_circuit/output/text_to_radio/Initialize() - . = ..() - radio = new(src) - radio.frequency = FREQ_COMMON - GLOB.ic_speakers += src - -/obj/item/integrated_circuit/output/text_to_radio/Destroy() - qdel(radio) - GLOB.ic_speakers -= src - ..() - -/obj/item/integrated_circuit/output/text_to_radio/on_data_written() - var/freq = get_pin_data(IC_INPUT, 2) - if(!(freq in whitelisted_freqs)) - freq = sanitize_frequency(get_pin_data(IC_INPUT, 2), radio.freerange) - radio.set_frequency(freq) - -/obj/item/integrated_circuit/output/text_to_radio/do_work() - text = get_pin_data(IC_INPUT, 1) - if(!isnull(text)) - var/atom/movable/A = get_object() - var/sanitized_text = sanitize(text) - radio.talk_into(A, sanitized_text, ) - if (assembly) - log_say("[assembly] [REF(assembly)] : [sanitized_text]") - -/obj/item/integrated_circuit/output/text_to_radio/attackby(obj/O, mob/user) - if(istype(O, /obj/item/encryptionkey)) - user.transferItemToLoc(O,src) - encryption_keys += O - recalculate_channels() - to_chat(user, "You slide \the [O] inside the circuit.") - else - ..() - -/obj/item/integrated_circuit/output/text_to_radio/proc/recalculate_channels() - whitelisted_freqs.Cut() - set_pin_data(IC_INPUT, 2, 1459) - radio.set_frequency(FREQ_COMMON) //reset it - var/list/weakreffd_ekeys = list() - for(var/o in encryption_keys) - var/obj/item/encryptionkey/K = o - weakreffd_ekeys += WEAKREF(K) - for(var/i in K.channels) - whitelisted_freqs |= GLOB.radiochannels[i] - set_pin_data(IC_OUTPUT, 1, weakreffd_ekeys) - - -/obj/item/integrated_circuit/output/text_to_radio/attack_self(mob/user) - if(encryption_keys.len) - for(var/i in encryption_keys) - var/obj/O = i - O.forceMove(drop_location()) - encryption_keys.Cut() - set_pin_data(IC_OUTPUT, 1, WEAKREF(null)) - to_chat(user, "You slide the encryption keys out of the circuit.") - recalculate_channels() - else - to_chat(user, "There are no encryption keys to remove from the mechanism.") - -/obj/item/radio/headset/integrated - -/obj/item/integrated_circuit/output/screen/large - name = "medium screen" - -/obj/item/integrated_circuit/output/screen/extralarge // the subtype is called "extralarge" because tg brought back medium screens and they named the subtype /screen/large - name = "large screen" - desc = "Takes any data type as an input and displays it to the user upon examining, and to all nearby beings when pulsed." - icon_state = "screen_large" - power_draw_per_use = 40 - cooldown_per_use = 10 - -/obj/item/integrated_circuit/output/screen/extralarge/do_work() - ..() - var/obj/O = assembly ? get_turf(assembly) : loc - O.visible_message("[icon2html(O.icon, world, O.icon_state)] [stuff_to_display]") - if(assembly) - assembly.investigate_log("displayed \"[html_encode(stuff_to_display)]\" with [type].", INVESTIGATE_CIRCUIT) - else - investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) diff --git a/code/modules/integrated_electronics/subtypes/power.dm b/code/modules/integrated_electronics/subtypes/power.dm deleted file mode 100644 index df6ab06eb0106..0000000000000 --- a/code/modules/integrated_electronics/subtypes/power.dm +++ /dev/null @@ -1,208 +0,0 @@ -/obj/item/integrated_circuit/power/ - category_text = "Power - Active" - -/obj/item/integrated_circuit/power/transmitter - name = "power transmission circuit" - desc = "This can wirelessly transmit electricity from an assembly's battery towards a nearby machine." - icon_state = "power_transmitter" - extended_desc = "This circuit transmits 5 kJ of electricity every time the activator pin is pulsed. The input pin must be \ - a reference to a machine to send electricity to. This can be a battery, or anything containing a battery. The machine can exist \ - inside the assembly, or adjacent to it. The power is sourced from the assembly's power cell. If the target is outside of the assembly, \ - some power is lost due to ineffiency." - w_class = WEIGHT_CLASS_SMALL - complexity = 16 - inputs = list("target" = IC_PINTYPE_REF) - outputs = list( - "target cell charge" = IC_PINTYPE_NUMBER, - "target cell max charge" = IC_PINTYPE_NUMBER, - "target cell percentage" = IC_PINTYPE_NUMBER - ) - activators = list("transmit" = IC_PINTYPE_PULSE_IN, "on transmit" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 500 // Inefficency has to come from somewhere. - var/amount_to_move = 5000 - -/obj/item/integrated_circuit/power/transmitter/large - name = "large power transmission circuit" - desc = "This can wirelessly transmit a lot of electricity from an assembly's battery towards a nearby machine. Warning: Do not operate in flammable environments." - extended_desc = "This circuit transmits 20 kJ of electricity every time the activator pin is pulsed. The input pin must be \ - a reference to a machine to send electricity to. This can be a battery, or anything containing a battery. The machine can exist \ - inside the assembly, or adjacent to it. The power is sourced from the assembly's power cell. If the target is outside of the assembly, \ - some power is lost due to ineffiency. Warning! Don't stack more than 1 power transmitter, as it becomes less efficient for every other \ - transmission circuit in its own assembly and other nearby ones." - w_class = WEIGHT_CLASS_BULKY - complexity = 32 - power_draw_per_use = 2000 - amount_to_move = 20000 - -/obj/item/integrated_circuit/power/transmitter/do_work() - - var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) - if(!AM) - return FALSE - if(istype(AM, /obj/item/gun/energy)) - return FALSE - if(!assembly) - return FALSE // Pointless to do everything else if there's no battery to draw from. - var/obj/item/stock_parts/cell/cell = AM.get_cell() - if(cell) - var/transfer_amount = amount_to_move - var/turf/A = get_turf(src) - var/turf/B = get_turf(AM) - if(A.Adjacent(B)) - if(AM.loc != assembly) - transfer_amount *= 0.8 // Losses due to distance. - var/list/U=A.GetAllContents(/obj/item/integrated_circuit/power/transmitter) - transfer_amount *= 1 / U.len - set_pin_data(IC_OUTPUT, 1, cell.charge) - set_pin_data(IC_OUTPUT, 2, cell.maxcharge) - set_pin_data(IC_OUTPUT, 3, cell.percent()) - activate_pin(2) - push_data() - if(cell.charge == cell.maxcharge) - return FALSE - if(transfer_amount && assembly.draw_power(amount_to_move)) // CELLRATE is already handled in draw_power() - cell.give(transfer_amount * GLOB.CELLRATE) - if(istype(AM, /obj/item)) - var/obj/item/I = AM - I.update_icon() - return TRUE - else - set_pin_data(IC_OUTPUT, 1, null) - set_pin_data(IC_OUTPUT, 2, null) - set_pin_data(IC_OUTPUT, 3, null) - activate_pin(2) - push_data() - return FALSE - -/obj/item/integrated_circuit/power/transmitter/large/do_work() - if(..()) // If the above code succeeds, do this below. - var/atom/movable/acting_object = get_object() - if(prob(20)) - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(12, 1, src) - s.start() - acting_object.visible_message("\The [acting_object] makes some sparks!") - return TRUE - - -// - wire connector - // -/obj/item/integrated_circuit/power/transmitter/wire_connector - name = "wire connector" - desc = "Connects to a wire and allows to read the power, charge it or charge itself from the wire's power." - extended_desc = "This circuit will automatically attempt to locate and connect to wires on the floor beneath it when pulsed. \ - You must set a target before connecting. It can also transfer energy up to 2kJ from the assembly \ - to a wire and backwards if negative values are set for energy transfer." - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "charge" = IC_PINTYPE_NUMBER - ) - activators = list( - "toggle connection" = IC_PINTYPE_PULSE_IN, - "transfer power" = IC_PINTYPE_PULSE_IN, - "on connected" = IC_PINTYPE_PULSE_OUT, - "on connection failed" = IC_PINTYPE_PULSE_OUT, - "on disconnected" = IC_PINTYPE_PULSE_OUT - ) - outputs = list( - "connected cable" = IC_PINTYPE_REF, - "powernet power" = IC_PINTYPE_NUMBER, - "powernet load" = IC_PINTYPE_NUMBER - ) - complexity = 35 - power_draw_per_use = 100 - amount_to_move = 0 - - var/obj/structure/cable/connected_cable - -/obj/item/integrated_circuit/power/transmitter/wire_connector/Destroy() - connected_cable = null - return ..() - -/obj/item/integrated_circuit/power/transmitter/wire_connector/Initialize() - START_PROCESSING(SSobj, src) - . = ..() - -//Does wire things -/obj/item/integrated_circuit/power/transmitter/wire_connector/process() - ..() - update_cable() - push_data() - -//If the assembly containing this is moved from the tile the wire is in, the connection breaks -/obj/item/integrated_circuit/power/transmitter/wire_connector/ext_moved() - if(connected_cable) - if(get_dist(get_object(), connected_cable) > 0) - // The connected cable is removed - connected_cable = null - set_pin_data(IC_OUTPUT, 1, null) - push_data() - activate_pin(5) - - -/obj/item/integrated_circuit/power/transmitter/wire_connector/on_data_written() - var/charge_num = get_pin_data(IC_INPUT, 1) - //In case someone sets that pin to null - if(!charge_num) - amount_to_move = 0 - return - - amount_to_move = CLAMP(charge_num,-2000, 2000) - -/obj/item/integrated_circuit/power/transmitter/wire_connector/do_work(var/n) - if(n == 1) - // If there is a connection, disconnect - if(connected_cable) - connected_cable = null - set_pin_data(IC_OUTPUT, 1, null) - push_data() - activate_pin(5) - return - - var/obj/structure/cable/foundcable = locate() in get_turf(src) - // If no connector can't connect - if(!foundcable || foundcable.invisibility != 0) - set_pin_data(IC_OUTPUT, 1, null) - push_data() - activate_pin(4) - return - connected_cable = foundcable - update_cable() - push_data() - activate_pin(3) - return - - - if(!connected_cable || !assembly) - return - - if(!assembly.battery) - return - - //No charge transfer, no need to syphon tickrates with scripts - if(!amount_to_move || amount_to_move == 0) - return - - //Second clamp: set the number between what the battery and powernet allows - var/obj/item/stock_parts/cell/battery = assembly.battery - amount_to_move = CLAMP(amount_to_move, -connected_cable.powernet.avail, battery.charge) - - if(amount_to_move > 0) - connected_cable.powernet.newavail += battery.use(amount_to_move) - return - connected_cable.powernet.avail -= battery.give(-amount_to_move) - -/obj/item/integrated_circuit/power/transmitter/wire_connector/proc/update_cable() - if(get_dist(get_object(), connected_cable) > 0) - connected_cable = null - - if(!connected_cable || connected_cable.invisibility != 0) - set_pin_data(IC_OUTPUT, 1, null) - set_pin_data(IC_OUTPUT, 2, null) - set_pin_data(IC_OUTPUT, 3, null) - return - - var/datum/powernet/analyzed_net = connected_cable.powernet - set_pin_data(IC_OUTPUT, 1, WEAKREF(connected_cable)) - set_pin_data(IC_OUTPUT, 2, analyzed_net.viewavail) - set_pin_data(IC_OUTPUT, 3, analyzed_net.viewload) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm deleted file mode 100644 index c706cf5373f42..0000000000000 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ /dev/null @@ -1,858 +0,0 @@ -#define IC_SMOKE_REAGENTS_MINIMUM_UNITS 10 - -/obj/item/integrated_circuit/reagent - category_text = "Reagent" - resistance_flags = UNACIDABLE | FIRE_PROOF - cooldown_per_use = 10 - var/volume = 0 - -/obj/item/integrated_circuit/reagent/Initialize() - . = ..() - if(volume) - create_reagents(volume, OPENCONTAINER) - push_vol() - -/obj/item/integrated_circuit/reagent/proc/push_vol() - set_pin_data(IC_OUTPUT, 1, reagents.total_volume) - push_data() - -// Hydroponics trays have no reagents holder and handle reagents in their own snowflakey way. -// This is a dirty hack to make injecting reagents into them work. -// TODO: refactor that. -/obj/item/integrated_circuit/reagent/proc/inject_tray(obj/machinery/hydroponics/tray, atom/movable/source, amount) - var/atom/movable/acting_object = get_object() - var/list/trays = list(tray) - var/visi_msg = "[acting_object] transfers fluid into [tray]" - - if(amount > 30 && source.reagents.total_volume >= 30 && tray.using_irrigation) - trays = tray.FindConnected() - if (trays.len > 1) - visi_msg += ", setting off the irrigation system" - - acting_object.visible_message("[visi_msg].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) - - var/split = round(amount/trays.len) - - for(var/obj/machinery/hydroponics/H in trays) - var/datum/reagents/temp_reagents = new /datum/reagents() - temp_reagents.my_atom = H - - source.reagents.trans_to(temp_reagents, split) - H.applyChemicals(temp_reagents) - - temp_reagents.clear_reagents() - qdel(temp_reagents) - -/obj/item/integrated_circuit/reagent/injector - name = "integrated hypo-injector" - desc = "This scary looking thing is able to pump liquids into, or suck liquids out of, whatever it's pointed at." - icon_state = "injector" - extended_desc = "This autoinjector can push up to 30 units of reagents into another container or someone else outside of the machine. The target \ - must be adjacent to the machine, and if it is a person, they cannot be wearing thick clothing. Negative given amounts makes the injector suck out reagents instead." - - volume = 30 - - complexity = 20 - max_allowed = 1 - cooldown_per_use = 6 SECONDS - inputs = list( - "target" = IC_PINTYPE_REF, - "injection amount" = IC_PINTYPE_NUMBER - ) - inputs_default = list( - "2" = 5 - ) - outputs = list( - "volume used" = IC_PINTYPE_NUMBER, - "self reference" = IC_PINTYPE_SELFREF - ) - activators = list( - "inject" = IC_PINTYPE_PULSE_IN, - "on injected" = IC_PINTYPE_PULSE_OUT, - "on fail" = IC_PINTYPE_PULSE_OUT, - "push ref" = IC_PINTYPE_PULSE_IN - - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 15 - var/direction_mode = SYRINGE_INJECT - var/transfer_amount = 10 - var/busy = FALSE - -/obj/item/integrated_circuit/reagent/injector/on_reagent_change(changetype) - push_vol() - -/obj/item/integrated_circuit/reagent/injector/on_data_written() - var/new_amount = get_pin_data(IC_INPUT, 2) - if(new_amount < 0) - new_amount = -new_amount - direction_mode = SYRINGE_DRAW - else - direction_mode = SYRINGE_INJECT - if(isnum_safe(new_amount)) - new_amount = CLAMP(new_amount, 0, volume) - transfer_amount = new_amount - - -/obj/item/integrated_circuit/reagent/injector/do_work(ord) - switch(ord) - if(1) - inject() - if(4) - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() - -/obj/item/integrated_circuit/reagent/injector/proc/inject() - set waitfor = FALSE // Don't sleep in a proc that is called by a processor without this set, otherwise it'll delay the entire thing - var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) - var/atom/movable/acting_object = get_object() - - if(busy || !check_target(AM)) - activate_pin(3) - return - - if(!AM.reagents) - if(istype(AM, /obj/machinery/hydroponics) && direction_mode == SYRINGE_INJECT && reagents.total_volume && transfer_amount)//injection into tray. - inject_tray(AM, src, transfer_amount) - activate_pin(2) - return - activate_pin(3) - return - - if(direction_mode == SYRINGE_INJECT) - if(!reagents.total_volume || !AM.is_injectable() || AM.reagents.holder_full()) - activate_pin(3) - return - - if(isliving(AM)) - var/mob/living/L = AM - if(!L.can_inject(null, 0)) - activate_pin(3) - return - - //Always log attemped injections for admins - var/contained = reagents.log_list() - log_combat(src, L, "attempted to inject", addition="which had [contained]") - L.visible_message("[acting_object] is trying to inject [L]!", \ - "[acting_object] is trying to inject you!") - busy = TRUE - if(do_atom(src, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject,null,0))) - var/fraction = min(transfer_amount/reagents.total_volume, 1) - reagents.reaction(L, INJECT, fraction) - reagents.trans_to(L, transfer_amount) - log_combat(src, L, "injected", addition="which had [contained]") - L.visible_message("[acting_object] injects [L] with its needle!", \ - "[acting_object] injects you with its needle!") - else - busy = FALSE - activate_pin(3) - return - busy = FALSE - - else - reagents.trans_to(AM, transfer_amount) - - if(direction_mode == SYRINGE_DRAW) - if(reagents.total_volume >= reagents.maximum_volume) - acting_object.visible_message("[acting_object] tries to draw from [AM], but the injector is full.") - activate_pin(3) - return - - var/tramount = abs(transfer_amount) - - if(isliving(AM)) - var/mob/living/L = AM - L.visible_message("[acting_object] is trying to take a blood sample from [L]!", \ - "[acting_object] is trying to take a blood sample from you!") - busy = TRUE - if(do_atom(src, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject,null,0))) - if(L.transfer_blood_to(src, tramount)) - L.visible_message("[acting_object] takes a blood sample from [L]!", \ - "[acting_object] takes a blood sample from you!") - else - L.visible_message("[acting_object] fails to take a blood sample from [L].", \ - "[acting_object] fails to take a blood sample from you!") - busy = FALSE - activate_pin(3) - return - busy = FALSE - - else - if(!AM.reagents.total_volume) - acting_object.visible_message("[acting_object] tries to draw from [AM], but it is empty!") - activate_pin(3) - return - - if(!AM.is_drawable()) - activate_pin(3) - return - tramount = min(tramount, AM.reagents.total_volume) - AM.reagents.trans_to(src, tramount) - activate_pin(2) - - - -/obj/item/integrated_circuit/reagent/pump - name = "reagent pump" - desc = "Moves liquids safely inside a machine, or even nearby it." - icon_state = "reagent_pump" - extended_desc = "This is a pump which will move liquids from the source ref to the target ref. The third pin determines \ - how much liquid is moved per pulse, between 0 and 50. The pump can move reagents to any open container inside the machine, or \ - outside the machine if it is adjacent to the machine." - - complexity = 8 - inputs = list("source" = IC_PINTYPE_REF, "target" = IC_PINTYPE_REF, "injection amount" = IC_PINTYPE_NUMBER) - inputs_default = list("3" = 5) - outputs = list() - activators = list("transfer reagents" = IC_PINTYPE_PULSE_IN, "on transfer" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/transfer_amount = 10 - var/direction_mode = SYRINGE_INJECT - power_draw_per_use = 10 - -/obj/item/integrated_circuit/reagent/pump/on_data_written() - var/new_amount = get_pin_data(IC_INPUT, 3) - if(new_amount < 0) - new_amount = -new_amount - direction_mode = SYRINGE_DRAW - else - direction_mode = SYRINGE_INJECT - if(isnum_safe(new_amount)) - new_amount = CLAMP(new_amount, 0, 50) - transfer_amount = new_amount - -/obj/item/integrated_circuit/reagent/pump/do_work() - var/atom/movable/source = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) - var/atom/movable/target = get_pin_data_as_type(IC_INPUT, 2, /atom/movable) - - // Check for invalid input. - if(!check_target(source) || !check_target(target)) - return - - // If the pump is pumping backwards, swap target and source. - if(!direction_mode) - var/temp_source = source - source = target - target = temp_source - - if(!source.reagents) - return - - if(!target.reagents) - // Hydroponics trays have no reagents holder and handle reagents in their own snowflakey way. - // This is a dirty hack to make injecting reagents into them work. - if(istype(target, /obj/machinery/hydroponics) && source.reagents.total_volume) - inject_tray(target, source, transfer_amount) - activate_pin(2) - return - - if(!source.is_drainable() || !target.is_refillable()) - return - - source.reagents.trans_to(target, transfer_amount) - activate_pin(2) - -/obj/item/integrated_circuit/reagent/storage - cooldown_per_use = 1 - name = "reagent storage" - desc = "Stores liquid inside the device away from electrical components. It can store up to 60u." - icon_state = "reagent_storage" - extended_desc = "This is effectively an internal beaker." - - volume = 60 - - complexity = 4 - inputs = list() - outputs = list( - "volume used" = IC_PINTYPE_NUMBER, - "self reference" = IC_PINTYPE_SELFREF - ) - activators = list("push ref" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - - - -/obj/item/integrated_circuit/reagent/storage/do_work() - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() - -/obj/item/integrated_circuit/reagent/storage/on_reagent_change(changetype) - push_vol() - -/obj/item/integrated_circuit/reagent/storage/big - name = "big reagent storage" - icon_state = "reagent_storage_big" - desc = "Stores liquid inside the device away from electrical components. Can store up to 180u." - - volume = 180 - - complexity = 16 - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/reagent/storage/cryo - name = "cryo reagent storage" - desc = "Stores liquid inside the device away from electrical components. It can store up to 60u. This will also prevent reactions." - icon_state = "reagent_storage_cryo" - extended_desc = "This is effectively an internal cryo beaker." - - complexity = 8 - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/reagent/storage/cryo/Initialize() - . = ..() - ENABLE_BITFIELD(reagents.flags, NO_REACT) - -/obj/item/integrated_circuit/reagent/storage/grinder - name = "reagent grinder" - desc = "This is a reagent grinder. It accepts a ref to something, and refines it into reagents. It can store up to 100u." - icon_state = "blender" - extended_desc = "" - inputs = list( - "target" = IC_PINTYPE_REF, - ) - outputs = list( - "volume used" = IC_PINTYPE_NUMBER, - "self reference" = IC_PINTYPE_SELFREF - ) - activators = list( - "grind" = IC_PINTYPE_PULSE_IN, - "on grind" = IC_PINTYPE_PULSE_OUT, - "on fail" = IC_PINTYPE_PULSE_OUT, - "push ref" = IC_PINTYPE_PULSE_IN - ) - volume = 100 - power_draw_per_use = 150 - complexity = 16 - spawn_flags = IC_SPAWN_RESEARCH - - -/obj/item/integrated_circuit/reagent/storage/grinder/do_work(ord) - switch(ord) - if(1) - grind() - if(4) - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() - -/obj/item/integrated_circuit/reagent/storage/grinder/proc/grind() - if(reagents.total_volume >= reagents.maximum_volume) - activate_pin(3) - return FALSE - var/obj/item/I = get_pin_data_as_type(IC_INPUT, 1, /obj/item) - if(istype(I)&&(I.grind_results)&&check_target(I)&&(I.on_grind(src) != -1)) - if(istype(I, /obj/item/reagent_containers)) - var/obj/item/reagent_containers/p = I - if(p.prevent_grinding) - return FALSE - reagents.add_reagent_list(I.grind_results) - if(I.reagents) - I.reagents.trans_to(src, I.reagents.total_volume) - qdel(I) - activate_pin(2) - return TRUE - activate_pin(3) - return FALSE - -/obj/item/integrated_circuit/reagent/storage/juicer - name = "reagent juicer" - desc = "This is a reagent juicer. It accepts a ref to something and refines it into reagents. It can store up to 100u." - icon_state = "blender" - extended_desc = "" - inputs = list( - "target" = IC_PINTYPE_REF, - ) - outputs = list( - "volume used" = IC_PINTYPE_NUMBER, - "self reference" = IC_PINTYPE_SELFREF - ) - activators = list( - "juice" = IC_PINTYPE_PULSE_IN, - "on juice" = IC_PINTYPE_PULSE_OUT, - "on fail" = IC_PINTYPE_PULSE_OUT, - "push ref" = IC_PINTYPE_PULSE_IN - ) - volume = 100 - power_draw_per_use = 150 - complexity = 16 - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/reagent/storage/juicer/do_work(ord) - switch(ord) - if(1) - juice() - if(4) - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() - -/obj/item/integrated_circuit/reagent/storage/juicer/proc/juice() - if(reagents.total_volume >= reagents.maximum_volume) - activate_pin(3) - return FALSE - var/obj/item/I = get_pin_data_as_type(IC_INPUT, 1, /obj/item) - if(istype(I)&&check_target(I)&&(I.juice_results)&&(I.on_juice() != -1)) - reagents.add_reagent_list(I.juice_results) - qdel(I) - activate_pin(2) - return TRUE - activate_pin(3) - return FALSE - - - -/obj/item/integrated_circuit/reagent/storage/scan - name = "reagent scanner" - desc = "Stores liquid inside the device away from electrical components. It can store up to 60u. On pulse this beaker will send list of contained reagents." - icon_state = "reagent_scan" - extended_desc = "Mostly useful for filtering reagents." - - complexity = 8 - outputs = list( - "volume used" = IC_PINTYPE_NUMBER, - "self reference" = IC_PINTYPE_SELFREF, - "list of reagents" = IC_PINTYPE_LIST - ) - activators = list( - "scan" = IC_PINTYPE_PULSE_IN, - "push ref" = IC_PINTYPE_PULSE_IN - ) - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/reagent/storage/scan/do_work(ord) - switch(ord) - if(1) - var/cont[0] - for(var/datum/reagent/RE in reagents.reagent_list) - cont += RE - set_pin_data(IC_OUTPUT, 3, cont) - push_data() - if(2) - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() - -/obj/item/integrated_circuit/reagent/filter - name = "reagent filter" - desc = "Filters liquids by list of desired or unwanted reagents." - icon_state = "reagent_filter" - extended_desc = "This is a filter which will move liquids from the source to its target. \ - If the amount in the fourth pin is positive, it will move all reagents except those in the unwanted list. \ - If the amount in the fourth pin is negative, it will only move the reagents in the wanted list. \ - The third pin determines how many reagents are moved per pulse, between 0 and 50. Amount is given for each separate reagent." - - complexity = 8 - inputs = list( - "source" = IC_PINTYPE_REF, - "target" = IC_PINTYPE_REF, - "injection amount" = IC_PINTYPE_NUMBER, - "list of reagents" = IC_PINTYPE_LIST - ) - inputs_default = list( - "3" = 5 - ) - outputs = list() - activators = list( - "transfer reagents" = IC_PINTYPE_PULSE_IN, - "on transfer" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/transfer_amount = 10 - var/direction_mode = SYRINGE_INJECT - power_draw_per_use = 10 - -/obj/item/integrated_circuit/reagent/filter/on_data_written() - var/new_amount = get_pin_data(IC_INPUT, 3) - if(new_amount < 0) - new_amount = -new_amount - direction_mode = SYRINGE_DRAW - else - direction_mode = SYRINGE_INJECT - if(isnum_safe(new_amount)) - new_amount = CLAMP(new_amount, 0, 50) - transfer_amount = new_amount - -/obj/item/integrated_circuit/reagent/filter/do_work() - var/atom/movable/source = get_pin_data_as_type(IC_INPUT, 1, /atom/movable) - var/atom/movable/target = get_pin_data_as_type(IC_INPUT, 2, /atom/movable) - var/list/demand = get_pin_data(IC_INPUT, 4) - - // Check for invalid input. - if(!check_target(source) || !check_target(target)) - return - - if(!source.reagents || !target.reagents) - return - - // FALSE in those procs makes mobs invalid targets. - if(!source.is_drawable(FALSE) || !target.is_injectable(FALSE)) - return - - if(target.reagents.maximum_volume - target.reagents.total_volume <= 0) - return - - for(var/datum/reagent/G in source.reagents.reagent_list) - if(!direction_mode) - if(G in demand) - source.reagents.trans_id_to(target, G.type, transfer_amount) - else - if(!(G in demand)) - source.reagents.trans_id_to(target, G.type, transfer_amount) - activate_pin(2) - push_data() - -/obj/item/integrated_circuit/reagent/storage/heater - name = "chemical heater" - desc = "Stores liquid inside the device away from electrical components. It can store up to 60u. It will heat or cool the reagents \ - to the target temperature when turned on." - icon_state = "heater" - complexity = 8 - inputs = list( - "target temperature" = IC_PINTYPE_NUMBER, - "on" = IC_PINTYPE_BOOLEAN - ) - inputs_default = list("1" = 300) - outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_SELFREF,"temperature" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_RESEARCH - var/heater_coefficient = 0.1 - -/obj/item/integrated_circuit/reagent/storage/heater/on_data_written() - if(get_pin_data(IC_INPUT, 2)) - power_draw_idle = 30 - else - power_draw_idle = 0 - -/obj/item/integrated_circuit/reagent/storage/heater/Initialize() - .=..() - START_PROCESSING(SScircuit, src) - -/obj/item/integrated_circuit/reagent/storage/heater/Destroy() - STOP_PROCESSING(SScircuit, src) - return ..() - -/obj/item/integrated_circuit/reagent/storage/heater/process() - if(!power_draw_idle) - return - var/target_temperature = CLAMP(get_pin_data(IC_INPUT, 1), 0, 3000) - if(reagents.chem_temp > target_temperature) - reagents.chem_temp += min(-1, (target_temperature - reagents.chem_temp) * heater_coefficient) - if(reagents.chem_temp < target_temperature) - reagents.chem_temp += max(1, (target_temperature - reagents.chem_temp) * heater_coefficient) - - reagents.chem_temp = round(reagents.chem_temp) - reagents.handle_reactions() - set_pin_data(IC_OUTPUT, 3, reagents.chem_temp) - push_data() - - -/obj/item/integrated_circuit/reagent/smoke - name = "smoke generator" - desc = "Unlike most electronics, creating smoke is completely intentional." - icon_state = "smoke" - extended_desc = "This smoke generator creates clouds of smoke on command. It can also hold liquids inside, which will go \ - into the smoke clouds when activated. The reagents are consumed when the smoke is made." - ext_cooldown = 1 - volume = 100 - complexity = 20 - cooldown_per_use = 1 SECONDS - inputs = list() - outputs = list( - "volume used" = IC_PINTYPE_NUMBER, - "self reference" = IC_PINTYPE_SELFREF - ) - activators = list( - "create smoke" = IC_PINTYPE_PULSE_IN, - "on smoked" = IC_PINTYPE_PULSE_OUT, - "push ref" = IC_PINTYPE_PULSE_IN - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 20 - var/smoke_radius = 5 - var/notified = FALSE - -/obj/item/integrated_circuit/reagent/smoke/on_reagent_change(changetype) - //reset warning only if we have reagents now - if(changetype == ADD_REAGENT) - notified = FALSE - push_vol() -/obj/item/integrated_circuit/reagent/smoke/do_work(ord) - switch(ord) - if(1) - if(!reagents || (reagents.total_volume < IC_SMOKE_REAGENTS_MINIMUM_UNITS)) - return - var/location = get_turf(src) - var/datum/effect_system/smoke_spread/chem/S = new - S.attach(location) - playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) - if(S) - S.set_up(reagents, smoke_radius, location, notified) - if(!notified) - notified = TRUE - S.start() - reagents.clear_reagents() - activate_pin(2) - if(3) - set_pin_data(IC_OUTPUT, 2, WEAKREF(src)) - push_data() - -// - Integrated extinguisher - // -/obj/item/integrated_circuit/reagent/extinguisher - name = "integrated extinguisher" - desc = "This circuit sprays any of its contents out like an extinguisher." - icon_state = "injector" - extended_desc = "This circuit can hold up to 30 units of any given chemicals. On each use, it sprays these reagents like a fire extinguisher." - - volume = 30 - - complexity = 20 - cooldown_per_use = 6 SECONDS - inputs = list( - "target X rel" = IC_PINTYPE_NUMBER, - "target Y rel" = IC_PINTYPE_NUMBER - ) - outputs = list( - "volume" = IC_PINTYPE_NUMBER, - "self reference" = IC_PINTYPE_SELFREF - ) - activators = list( - "spray" = IC_PINTYPE_PULSE_IN, - "on sprayed" = IC_PINTYPE_PULSE_OUT, - "on fail" = IC_PINTYPE_PULSE_OUT, - "push ref" = IC_PINTYPE_PULSE_IN - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 15 - max_allowed = 2 - var/busy = FALSE - -/obj/item/integrated_circuit/reagent/extinguisher/Initialize() - .=..() - set_pin_data(IC_OUTPUT,2, src) - -/obj/item/integrated_circuit/reagent/extinguisher/on_reagent_change(changetype) - push_vol() - -/obj/item/integrated_circuit/reagent/extinguisher/do_work() - //Check if enough volume - set_pin_data(IC_OUTPUT, 1, reagents.total_volume) - if(!reagents || reagents.total_volume < 5 || busy) - push_data() - activate_pin(3) - return - - playsound(loc, 'sound/effects/extinguish.ogg', 75, 1, -3) - //Get the tile on which the water particle spawns - var/turf/Spawnpoint = get_turf(src) - if(!Spawnpoint) - push_data() - activate_pin(3) - return - - //Get direction and target turf for each water particle - var/turf/T = locate(Spawnpoint.x + get_pin_data(IC_INPUT, 1),Spawnpoint.y + get_pin_data(IC_INPUT, 2),Spawnpoint.z) - if(!T) - push_data() - activate_pin(3) - return - var/direction = get_dir(Spawnpoint, T) - var/turf/T1 = get_step(T,turn(direction, 90)) - var/turf/T2 = get_step(T,turn(direction, -90)) - var/list/the_targets = list(T,T1,T2) - busy = TRUE - - // Create list with particles and their targets - var/list/water_particles=list() - for(var/a=0, a<5, a++) - var/obj/effect/particle_effect/water/W = new /obj/effect/particle_effect/water(get_turf(src)) - water_particles[W] = pick(the_targets) - var/datum/reagents/R = new/datum/reagents(5) - W.reagents = R - R.my_atom = W - reagents.trans_to(W,1) - - //Make em move dat ass, hun - addtimer(CALLBACK(src, /obj/item/integrated_circuit/reagent/extinguisher/proc/move_particles, water_particles), 2) - -//This whole proc is a loop -/obj/item/integrated_circuit/reagent/extinguisher/proc/move_particles(var/list/particles, var/repetitions=0) - //Check if there's anything in here first - if(!particles || particles.len == 0) - return - // Second loop: Get all the water particles and make them move to their target - for(var/obj/effect/particle_effect/water/W in particles) - var/turf/my_target = particles[W] - if(!W) - continue - step_towards(W,my_target) - if(!W.reagents) - continue - W.reagents.reaction(get_turf(W)) - for(var/A in get_turf(W)) - W.reagents.reaction(A) - if(W.loc == my_target) - break - if(repetitions < 4) - repetitions++ //Can't have math operations in addtimer(CALLBACK()) - addtimer(CALLBACK(src, /obj/item/integrated_circuit/reagent/extinguisher/proc/move_particles, particles, repetitions), 2) - else - push_data() - activate_pin(2) - busy = FALSE - - -// - Drain circuit - // -/obj/item/integrated_circuit/reagent/drain - name = "chemical drain circuit" - desc = "This circuit either eliminates reagents by creating a puddle or can suck up chemicals on tiles." - icon_state = "injector" - extended_desc = "Set mode to FALSE to eliminate reagents and TRUE to drain." - - volume = 20 - - complexity = 10 - inputs = list( - "mode" = IC_PINTYPE_BOOLEAN - ) - outputs = list( - "volume" = IC_PINTYPE_NUMBER, - "self reference" = IC_PINTYPE_SELFREF - ) - activators = list( - "drain" = IC_PINTYPE_PULSE_IN, - "on drained" = IC_PINTYPE_PULSE_OUT, - "on fail" = IC_PINTYPE_PULSE_OUT, - "push ref" = IC_PINTYPE_PULSE_IN - ) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 15 - - -/obj/item/integrated_circuit/reagent/drain/Initialize() - .=..() - set_pin_data(IC_OUTPUT,2, src) - - -/obj/item/integrated_circuit/reagent/drain/do_work() - if(get_pin_data(IC_OUTPUT, 1, reagents.total_volume)) - if(!reagents || !reagents.total_volume) - push_data() - activate_pin(3) - return - // Put the reagents on the floortile the assembly is on - reagents.reaction(get_turf(src)) - reagents.clear_reagents() - push_data() - activate_pin(2) - return - - else - if(reagents) - if(reagents.total_volume >= volume) - push_data() - activate_pin(3) - return - // Favorably, drain it from a chemicals pile, else, try something different - var/obj/effect/decal/cleanable/drainedchems = locate(/obj/effect/decal/cleanable) in get_turf(src) - if(!drainedchems || !drainedchems.reagents || drainedchems.reagents.total_volume == 0) - push_data() - activate_pin(3) - return - drainedchems.reagents.trans_to(src, 30, 0.5) - if(drainedchems.reagents.total_volume == 0) - qdel(drainedchems) - push_data() - activate_pin(2) - - -/obj/item/integrated_circuit/reagent/drain/on_reagent_change(changetype) - push_vol() - - -// - Beaker Connector - // -/obj/item/integrated_circuit/input/beaker_connector - category_text = "Reagent" - cooldown_per_use = 1 - name = "beaker slot" - desc = "Lets you add a beaker to your assembly and remove it even when the assembly is closed." - icon_state = "reagent_storage" - extended_desc = "It can help you extract reagents easier." - complexity = 4 - - inputs = list() - outputs = list( - "volume used" = IC_PINTYPE_NUMBER, - "current beaker" = IC_PINTYPE_REF - ) - activators = list( - "on insert" = IC_PINTYPE_PULSE_OUT, - "on remove" = IC_PINTYPE_PULSE_OUT, - "push ref" = IC_PINTYPE_PULSE_OUT - ) - - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - can_be_asked_input = TRUE - demands_object_input = TRUE - can_input_object_when_closed = TRUE - - var/obj/item/reagent_containers/glass/beaker/current_beaker - - -/obj/item/integrated_circuit/input/beaker_connector/attackby(var/obj/item/reagent_containers/I, var/mob/living/user) - //Check if it truly is a reagent container - if(!istype(I,/obj/item/reagent_containers/glass/beaker)) - to_chat(user,"The [I.name] doesn't seem to fit in here.") - return - - //Check if there is no other beaker already inside - if(current_beaker) - to_chat(user,"There is already a reagent container inside.") - return - - //The current beaker is the one we just attached, its location is inside the circuit - current_beaker = I - user.transferItemToLoc(I,src) - - to_chat(user,"You put the [I.name] inside the beaker connector.") - - //Set the pin to a weak reference of the current beaker - push_vol() - set_pin_data(IC_OUTPUT, 2, WEAKREF(current_beaker)) - push_data() - activate_pin(1) - activate_pin(3) - - -/obj/item/integrated_circuit/input/beaker_connector/ask_for_input(mob/user) - attack_self(user) - - -/obj/item/integrated_circuit/input/beaker_connector/attack_self(mob/user) - //Check if no beaker attached - if(!current_beaker) - to_chat(user, "There is currently no beaker attached.") - return - - //Remove beaker and put in user's hands/location - to_chat(user, "You take [current_beaker] out of the beaker connector.") - user.put_in_hands(current_beaker) - current_beaker = null - //Remove beaker reference - push_vol() - set_pin_data(IC_OUTPUT, 2, null) - push_data() - activate_pin(2) - activate_pin(3) - - -/obj/item/integrated_circuit/input/beaker_connector/proc/push_vol() - var/beakerVolume = 0 - if(current_beaker) - beakerVolume = current_beaker.reagents.total_volume - - set_pin_data(IC_OUTPUT, 1, beakerVolume) - push_data() - - -/obj/item/reagent_containers/glass/beaker/on_reagent_change() - ..() - if(istype(loc,/obj/item/integrated_circuit/input/beaker_connector)) - var/obj/item/integrated_circuit/input/beaker_connector/current_circuit = loc - current_circuit.push_vol() diff --git a/code/modules/integrated_electronics/subtypes/smart.dm b/code/modules/integrated_electronics/subtypes/smart.dm deleted file mode 100644 index 36b0e2ffa3fe9..0000000000000 --- a/code/modules/integrated_electronics/subtypes/smart.dm +++ /dev/null @@ -1,370 +0,0 @@ -/obj/item/integrated_circuit/smart - category_text = "Smart" - -/obj/item/integrated_circuit/smart/basic_pathfinder - name = "basic pathfinder" - desc = "This complex circuit is able to determine what direction a given target is." - extended_desc = "This circuit uses a miniturized integrated camera to determine where the target is. If the machine \ - cannot see the target, it will not be able to calculate the correct direction." - icon_state = "numberpad" - complexity = 5 - inputs = list("target" = IC_PINTYPE_REF,"ignore obstacles" = IC_PINTYPE_BOOLEAN) - outputs = list("dir" = IC_PINTYPE_DIR) - activators = list("calculate dir" = IC_PINTYPE_PULSE_IN, "on calculated" = IC_PINTYPE_PULSE_OUT,"not calculated" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 40 - -/obj/item/integrated_circuit/smart/basic_pathfinder/do_work() - var/datum/integrated_io/I = inputs[1] - set_pin_data(IC_OUTPUT, 1, null) - if(!isweakref(I.data)) - activate_pin(3) - return - var/atom/A = I.data.resolve() - if(!A) - activate_pin(3) - return - if(!(A in view(get_turf(src)))) - push_data() - activate_pin(3) - return // Can't see the target. - - if(get_pin_data(IC_INPUT, 2)) - set_pin_data(IC_OUTPUT, 1, get_dir(get_turf(src), get_turf(A))) - else - set_pin_data(IC_OUTPUT, 1, get_dir(get_turf(src), get_step_towards2(get_turf(src),A))) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/smart/coord_basic_pathfinder - name = "coordinate pathfinder" - desc = "This complex circuit is able to determine what direction a given target is." - extended_desc = "This circuit uses absolute coordinates to determine where the target is. If the machine \ - cannot see the target, it will not be able to calculate the correct direction. \ - This circuit will only work while inside an assembly." - icon_state = "numberpad" - complexity = 5 - inputs = list("X" = IC_PINTYPE_NUMBER,"Y" = IC_PINTYPE_NUMBER,"ignore obstacles" = IC_PINTYPE_BOOLEAN) - outputs = list( "dir" = IC_PINTYPE_DIR, - "distance" = IC_PINTYPE_NUMBER - ) - activators = list("calculate dir" = IC_PINTYPE_PULSE_IN, "on calculated" = IC_PINTYPE_PULSE_OUT,"not calculated" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 40 - -/obj/item/integrated_circuit/smart/coord_basic_pathfinder/do_work() - if(!assembly) - activate_pin(3) - return - var/turf/T = get_turf(assembly) - var/target_x = CLAMP(get_pin_data(IC_INPUT, 1), 0, world.maxx) - var/target_y = CLAMP(get_pin_data(IC_INPUT, 2), 0, world.maxy) - var/turf/A = locate(target_x, target_y, T.z) - set_pin_data(IC_OUTPUT, 1, null) - if(!A||A==T) - activate_pin(3) - return - if(get_pin_data(IC_INPUT, 2)) - set_pin_data(IC_OUTPUT, 1, get_dir(get_turf(src), get_turf(A))) - else - set_pin_data(IC_OUTPUT, 1, get_dir(get_turf(src), get_step_towards2(get_turf(src),A))) - set_pin_data(IC_OUTPUT, 2, sqrt((A.x-T.x)*(A.x-T.x)+ (A.y-T.y)*(A.y-T.y))) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/smart/advanced_pathfinder - name = "advanced pathfinder" - desc = "This circuit uses a complex processor for long-range pathfinding." - extended_desc = "This circuit uses absolute coordinates to find its target. A path will be generated to the target, taking obstacles into account, \ - and pathing around any instances of said input. The passkey provided from a card reader is used to calculate a valid path through airlocks." - icon_state = "numberpad" - complexity = 40 - cooldown_per_use = 50 - inputs = list("X target" = IC_PINTYPE_NUMBER,"Y target" = IC_PINTYPE_NUMBER,"obstacle" = IC_PINTYPE_REF,"access" = IC_PINTYPE_STRING) - outputs = list("X" = IC_PINTYPE_LIST,"Y" = IC_PINTYPE_LIST) - activators = list("calculate path" = IC_PINTYPE_PULSE_IN, "on calculated" = IC_PINTYPE_PULSE_OUT,"not calculated" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 80 - var/obj/item/card/id/idc - -/obj/item/integrated_circuit/smart/advanced_pathfinder/Initialize() - .=..() - idc = new(src) - -/obj/item/integrated_circuit/smart/advanced_pathfinder/do_work() - if(!assembly) - activate_pin(3) - return - //idc.access = assembly.access_card.access // hippie start -- readded xor decryption - hippie_xor_decrypt() // hippie end - var/turf/a_loc = get_turf(assembly) - var/list/P = cir_get_path_to(assembly, locate(get_pin_data(IC_INPUT, 1),get_pin_data(IC_INPUT, 2),a_loc.z), /turf/proc/Distance_cardinal, 0, 200, id=idc, exclude=get_turf(get_pin_data_as_type(IC_INPUT,3, /atom)), simulated_only = 0) - - if(!P) - activate_pin(3) - return - - var/list/Xn = new/list(P.len) - var/list/Yn = new/list(P.len) - var/turf/T - for(var/i =1 to P.len) - T=P[i] - Xn[i] = T.x - Yn[i] = T.y - set_pin_data(IC_OUTPUT, 1, Xn) - set_pin_data(IC_OUTPUT, 2, Yn) - push_data() - activate_pin(2) - - -// - MMI Tank - // -/obj/item/integrated_circuit/input/mmi_tank - name = "man-machine interface tank" - desc = "This circuit is just a jar filled with an artificial liquid mimicking the cerebrospinal fluid." - extended_desc = "This jar can hold 1 man-machine interface and let it take control of some basic functions of the assembly." - complexity = 29 - inputs = list("laws" = IC_PINTYPE_LIST) - outputs = list( - "man-machine interface" = IC_PINTYPE_REF, - "direction" = IC_PINTYPE_DIR, - "click target" = IC_PINTYPE_REF - ) - activators = list( - "move" = IC_PINTYPE_PULSE_OUT, - "left" = IC_PINTYPE_PULSE_OUT, - "right" = IC_PINTYPE_PULSE_OUT, - "up" = IC_PINTYPE_PULSE_OUT, - "down" = IC_PINTYPE_PULSE_OUT, - "leftclick" = IC_PINTYPE_PULSE_OUT, - "shiftclick" = IC_PINTYPE_PULSE_OUT, - "altclick" = IC_PINTYPE_PULSE_OUT, - "ctrlclick" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 150 - can_be_asked_input = TRUE - demands_object_input = TRUE - - var/obj/item/mmi/installed_brain - -/obj/item/integrated_circuit/input/mmi_tank/attackby(var/obj/item/mmi/O, var/mob/user) - if(!istype(O,/obj/item/mmi)) - to_chat(user,"You can't put that inside.") - return - if(installed_brain) - to_chat(user,"There's already a brain inside.") - return - user.transferItemToLoc(O,src) - installed_brain = O - can_be_asked_input = FALSE - to_chat(user, "You gently place \the man-machine interface inside the tank.") - to_chat(O, "You are slowly being placed inside the man-machine-interface tank.") - O.brainmob.remote_control=src - set_pin_data(IC_OUTPUT, 1, O) - -/obj/item/integrated_circuit/input/mmi_tank/attack_self(var/mob/user) - if(installed_brain) - RemoveBrain() - to_chat(user, "You slowly lift [installed_brain] out of the MMI tank.") - playsound(src, 'sound/items/Crowbar.ogg', 50, 1) - installed_brain = null - push_data() - else - to_chat(user, "You don't see any brain swimming in the tank.") - -/obj/item/integrated_circuit/input/mmi_tank/Destroy() - RemoveBrain() - ..() - -/obj/item/integrated_circuit/input/mmi_tank/relaymove(var/n,var/dir) - set_pin_data(IC_OUTPUT, 2, dir) - do_work(1) - switch(dir) - if(8) activate_pin(2) - if(4) activate_pin(3) - if(1) activate_pin(4) - if(2) activate_pin(5) - -/obj/item/integrated_circuit/input/mmi_tank/do_work(var/n) - push_data() - activate_pin(n) - -/obj/item/integrated_circuit/input/mmi_tank/proc/RemoveBrain() - if(installed_brain) - can_be_asked_input = TRUE - installed_brain.forceMove(drop_location()) - set_pin_data(IC_OUTPUT, 1, WEAKREF(null)) - if(installed_brain.brainmob) - installed_brain.brainmob.remote_control = null - - -//Brain changes -/mob/living/brain/var/check_bot_self = FALSE - -/mob/living/brain/ClickOn(atom/A, params) - ..() - if(!istype(remote_control,/obj/item/integrated_circuit/input/mmi_tank)) - return - var/obj/item/integrated_circuit/input/mmi_tank/brainholder=remote_control - brainholder.set_pin_data(IC_OUTPUT, 3, A) - var/list/modifiers = params2list(params) - - if(modifiers["shift"]) - brainholder.do_work(7) - return - if(modifiers["alt"]) - brainholder.do_work(8) - return - if(modifiers["ctrl"]) - brainholder.do_work(9) - return - - if(istype(A,/obj/item/electronic_assembly)) - var/obj/item/electronic_assembly/CheckedAssembly = A - - if(brainholder in CheckedAssembly.assembly_components) - var/obj/item/electronic_assembly/holdingassembly=A - check_bot_self=TRUE - - if(holdingassembly.opened) - holdingassembly.ui_interact(src) - holdingassembly.attack_self(src) - check_bot_self=FALSE - return - - brainholder.do_work(6) - -/mob/living/brain/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) - return check_bot_self - -/obj/item/integrated_circuit/smart/advanced_pathfinder/proc/hippie_xor_decrypt() - var/Ps = get_pin_data(IC_INPUT, 4) - if(!Ps) - return - var/list/Pl = json_decode(XorEncrypt(hextostr(Ps, TRUE), SScircuit.cipherkey)) - if(Pl&&islist(Pl)) - idc.access = Pl - -// - pAI connector circuit - // -/obj/item/integrated_circuit/input/pAI_connector - name = "pAI connector circuit" - desc = "This circuit lets you fit in a personal artificial intelligence to give it some form of control over the bot." - extended_desc = "You can wire various functions to it." - complexity = 29 - inputs = list("laws" = IC_PINTYPE_LIST) - outputs = list( - "personal artificial intelligence" = IC_PINTYPE_REF, - "direction" = IC_PINTYPE_DIR, - "click target" = IC_PINTYPE_REF - ) - activators = list( - "move" = IC_PINTYPE_PULSE_OUT, - "left" = IC_PINTYPE_PULSE_OUT, - "right" = IC_PINTYPE_PULSE_OUT, - "up" = IC_PINTYPE_PULSE_OUT, - "down" = IC_PINTYPE_PULSE_OUT, - "leftclick" = IC_PINTYPE_PULSE_OUT, - "shiftclick" = IC_PINTYPE_PULSE_OUT, - "altclick" = IC_PINTYPE_PULSE_OUT, - "ctrlclick" = IC_PINTYPE_PULSE_OUT, - "shiftctrlclick" = IC_PINTYPE_PULSE_OUT - ) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 150 - can_be_asked_input = TRUE - demands_object_input = TRUE - - var/obj/item/paicard/installed_pai - -/obj/item/integrated_circuit/input/pAI_connector/attackby(var/obj/item/paicard/O, var/mob/user) - if(!istype(O,/obj/item/paicard)) - to_chat(user,"You can't put that inside.") - return - if(installed_pai) - to_chat(user,"There's already a pAI connected to this.") - return - user.transferItemToLoc(O,src) - installed_pai = O - can_be_asked_input = FALSE - to_chat(user, "You slowly connect the circuit's pins to the [installed_pai].") - to_chat(O, "You are slowly being connected to the pAI connector.") - O.pai.remote_control=src - set_pin_data(IC_OUTPUT, 1, O) - -/obj/item/integrated_circuit/input/pAI_connector/attack_self(var/mob/user) - if(installed_pai) - RemovepAI() - to_chat(user, "You slowly disconnect the circuit's pins from the [installed_pai].") - playsound(src, 'sound/items/Crowbar.ogg', 50, 1) - installed_pai = null - push_data() - else - to_chat(user, "The connection port is empty.") - -/obj/item/integrated_circuit/input/pAI_connector/relaymove(var/n,var/dir) - set_pin_data(IC_OUTPUT, 2, dir) - do_work(1) - switch(dir) - if(8) activate_pin(2) - if(4) activate_pin(3) - if(1) activate_pin(4) - if(2) activate_pin(5) - -/obj/item/integrated_circuit/input/pAI_connector/do_work(var/n) - push_data() - activate_pin(n) - - -/obj/item/integrated_circuit/input/pAI_connector/Destroy() - RemovepAI() - ..() - -/obj/item/integrated_circuit/input/pAI_connector/proc/RemovepAI() - if(installed_pai) - can_be_asked_input = TRUE - installed_pai.forceMove(drop_location()) - set_pin_data(IC_OUTPUT, 1, WEAKREF(null)) - installed_pai.pai.remote_control = null - - -//pAI changes -/mob/living/silicon/pai/var/check_bot_self = FALSE - -/mob/living/silicon/pai/ClickOn(atom/A, params) - ..() - if(!istype(remote_control,/obj/item/integrated_circuit/input/pAI_connector)) - return - var/obj/item/integrated_circuit/input/pAI_connector/paiholder=remote_control - paiholder.set_pin_data(IC_OUTPUT, 3, A) - var/list/modifiers = params2list(params) - - if(modifiers["shift"] && modifiers["ctrl"]) - paiholder.do_work(10) - return - if(modifiers["shift"]) - paiholder.do_work(7) - return - if(modifiers["alt"]) - paiholder.do_work(8) - return - if(modifiers["ctrl"]) - paiholder.do_work(9) - return - - if(istype(A,/obj/item/electronic_assembly)) - var/obj/item/electronic_assembly/CheckedAssembly = A - - if(paiholder in CheckedAssembly.assembly_components) - var/obj/item/electronic_assembly/holdingassembly=A - check_bot_self=TRUE - - if(holdingassembly.opened) - holdingassembly.ui_interact(src) - holdingassembly.attack_self(src) - check_bot_self=FALSE - return - - paiholder.do_work(6) - -/mob/living/silicon/pai/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) - return check_bot_self diff --git a/code/modules/integrated_electronics/subtypes/text.dm b/code/modules/integrated_electronics/subtypes/text.dm deleted file mode 100644 index 6b3041e2c5b77..0000000000000 --- a/code/modules/integrated_electronics/subtypes/text.dm +++ /dev/null @@ -1,271 +0,0 @@ -/obj/item/integrated_circuit/text - name = "text thingy" - desc = "Does text-processing related things." - category_text = "Text" - complexity = 1 - - -/obj/item/integrated_circuit/text/lowercase - name = "lowercase string converter" - desc = "this circuit will cause a string to come out in all lowercase." - icon_state = "lowercase" - inputs = list("input" = IC_PINTYPE_STRING) - outputs = list("output" = IC_PINTYPE_STRING) - activators = list("to lowercase" = IC_PINTYPE_PULSE_IN, "on converted" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/text/lowercase/do_work() - var/result = null - pull_data() - var/incoming = get_pin_data(IC_INPUT, 1) - if(!isnull(incoming)) - result = lowertext(incoming) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/text/uppercase - name = "uppercase string converter" - desc = "THIS WILL CAUSE A STRING TO COME OUT IN ALL UPPERCASE." - icon_state = "uppercase" - inputs = list("input" = IC_PINTYPE_STRING) - outputs = list("output" = IC_PINTYPE_STRING) - activators = list("to uppercase" = IC_PINTYPE_PULSE_IN, "on converted" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/text/uppercase/do_work() - var/result = null - pull_data() - var/incoming = get_pin_data(IC_INPUT, 1) - if(!isnull(incoming)) - result = uppertext(incoming) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/text/concatenator - name = "concatenator" - desc = "This can join up to 8 strings together to get a string with a maximum of 512 characters." - complexity = 4 - inputs = list() - outputs = list("result" = IC_PINTYPE_STRING) - activators = list("concatenate" = IC_PINTYPE_PULSE_IN, "on concatenated" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - var/number_of_pins = 8 - var/max_string_length = 512 - -/obj/item/integrated_circuit/text/concatenator/Initialize() - for(var/i = 1 to number_of_pins) - inputs["input [i]"] = IC_PINTYPE_STRING - . = ..() - -/obj/item/integrated_circuit/text/concatenator/do_work() - var/result = null - var/spamprotection - for(var/k in 1 to inputs.len) - var/I = get_pin_data(IC_INPUT, k) - if(!isnull(I)) - if((result ? length(result) : 0) + length(I) > max_string_length) - spamprotection = (result ? length(result) : 0) + length(I) - break - result = result + I - - if(spamprotection >= max_string_length*1.75 && assembly) - if(assembly.fingerprintslast) - var/mob/M = get_mob_by_key(assembly.fingerprintslast) - var/more = "" - if(M) - more = "[ADMIN_LOOKUPFLW(M)] " - message_admins("A concatenator circuit has greatly exceeded its [max_string_length] character limit with a total of [spamprotection] characters, and has been deleted. Assembly last touched by [more ? more : assembly.fingerprintslast].") - investigate_log("A concatenator circuit has greatly exceeded its [max_string_length] character limit with a total of [spamprotection] characters, and has been deleted. Assembly last touched by [assembly.fingerprintslast].", INVESTIGATE_CIRCUIT) - else - message_admins("A concatenator circuit has greatly exceeded its [max_string_length] character limit with a total of [spamprotection] characters, and has been deleted. No associated key.") - investigate_log("A concatenator circuit has greatly exceeded its [max_string_length] character limit with a total of [spamprotection] characters, and has been deleted. No associated key.", INVESTIGATE_CIRCUIT) - qdel(assembly) - return - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/text/concatenator/small - name = "small concatenator" - desc = "This can join up to 4 strings together to get a string with a maximum of 256 characters." - complexity = 2 - number_of_pins = 4 - max_string_length = 256 - -/obj/item/integrated_circuit/text/concatenator/large - name = "large concatenator" - desc = "This can join up to 16 strings together to get a string with a maximum of 1024 characters." - complexity = 6 - number_of_pins = 16 - max_string_length = 1024 - -/obj/item/integrated_circuit/text/separator - name = "separator" - desc = "This splits a single string into two at the relative split point." - extended_desc = "This circuit splits a given string into two, based on the string and the index value. \ - The index splits the string after the given index, including spaces. So 'a person' with an index of '3' \ - will split into 'a p' and 'erson'." - icon_state = "split" - complexity = 4 - inputs = list( - "string to split" = IC_PINTYPE_STRING, - "index" = IC_PINTYPE_NUMBER, - ) - outputs = list( - "before split" = IC_PINTYPE_STRING, - "after split" = IC_PINTYPE_STRING - ) - activators = list("separate" = IC_PINTYPE_PULSE_IN, "on separated" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/text/separator/do_work() - var/text = get_pin_data(IC_INPUT, 1) - var/index = get_pin_data(IC_INPUT, 2) - - var/split = min(index+1, length(text)) - - var/before_text = copytext(text, 1, split) - var/after_text = copytext(text, split, 0) - - set_pin_data(IC_OUTPUT, 1, before_text) - set_pin_data(IC_OUTPUT, 2, after_text) - push_data() - - activate_pin(2) - -/obj/item/integrated_circuit/text/indexer - name = "indexer" - desc = "This circuit takes a string and an index value, then returns the character found at in the string at the given index." - extended_desc = "Make sure the index is not longer or shorter than the string length. If you don't, the circuit will return empty." - icon_state = "split" - complexity = 4 - inputs = list( - "string to index" = IC_PINTYPE_STRING, - "index" = IC_PINTYPE_NUMBER, - ) - outputs = list( - "found character" = IC_PINTYPE_STRING - ) - activators = list("index" = IC_PINTYPE_PULSE_IN, "on indexed" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/text/indexer/do_work() - var/strin = get_pin_data(IC_INPUT, 1) - var/ind = get_pin_data(IC_INPUT, 2) - if(ind > 0 && ind <= length(strin)) - set_pin_data(IC_OUTPUT, 1, strin[ind]) - else - set_pin_data(IC_OUTPUT, 1, "") - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/text/findstring - name = "find text" - desc = "This outputs the position of the sample in the string, or returns 0." - extended_desc = "The first pin is the string to be examined. The second pin is the sample to be found. \ - For example, inputting 'my wife has caught on fire' with 'has' as the sample will give you position 9. \ - This circuit isn't case sensitive, and it does not ignore spaces." - complexity = 4 - inputs = list( - "string" = IC_PINTYPE_STRING, - "sample" = IC_PINTYPE_STRING, - ) - outputs = list( - "position" = IC_PINTYPE_NUMBER - ) - activators = list("search" = IC_PINTYPE_PULSE_IN, "after search" = IC_PINTYPE_PULSE_OUT, "found" = IC_PINTYPE_PULSE_OUT, "not found" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - - -/obj/item/integrated_circuit/text/findstring/do_work() - var/position = findtext(get_pin_data(IC_INPUT, 1),get_pin_data(IC_INPUT, 2)) - - set_pin_data(IC_OUTPUT, 1, position) - push_data() - - activate_pin(2) - if(position) - activate_pin(3) - else - activate_pin(4) - -/obj/item/integrated_circuit/text/stringlength - name = "get length" - desc = "This circuit will return the number of characters in a string." - complexity = 1 - inputs = list( - "string" = IC_PINTYPE_STRING - ) - outputs = list( - "length" = IC_PINTYPE_NUMBER - ) - activators = list("get length" = IC_PINTYPE_PULSE_IN, "on acquisition" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/text/stringlength/do_work() - set_pin_data(IC_OUTPUT, 1, length(get_pin_data(IC_INPUT, 1))) - push_data() - - activate_pin(2) - -/obj/item/integrated_circuit/text/exploders - name = "string exploder" - desc = "This splits a single string into a list of strings." - extended_desc = "This circuit splits a given string into a list of strings based on the string and given delimiter. \ - For example, 'eat this burger' will be converted to list('eat','this','burger'). Leave the delimiter null to get a list \ - of every individual character." - icon_state = "split" - complexity = 4 - inputs = list( - "string to split" = IC_PINTYPE_STRING, - "delimiter" = IC_PINTYPE_STRING, - ) - outputs = list( - "list" = IC_PINTYPE_LIST - ) - activators = list("separate" = IC_PINTYPE_PULSE_IN, "on separated" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/text/exploders/do_work() - var/strin = get_pin_data(IC_INPUT, 1) - var/delimiter = get_pin_data(IC_INPUT, 2) - if(delimiter == null) - set_pin_data(IC_OUTPUT, 1, string2charlist(strin)) - else - set_pin_data(IC_OUTPUT, 1, splittext(strin, delimiter)) - push_data() - - activate_pin(2) - - -// - Text Replacer - // -/obj/item/integrated_circuit/text/text_replacer - name = "replace circuit" - desc = "Replaces all of one bit of text with another" - extended_desc = "Takes a string(haystack) and puts out the string while having a certain word(needle) replaced with another. Maximum 512 characters." - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - inputs = list( - "haystack" = IC_PINTYPE_STRING, - "needle" = IC_PINTYPE_STRING, - "replacement" = IC_PINTYPE_STRING - ) - activators = list( - "replace" = IC_PINTYPE_PULSE_IN, - "on replaced" = IC_PINTYPE_PULSE_OUT - ) - outputs = list( - "replaced string" = IC_PINTYPE_STRING - ) - cooldown_per_use = (10 SECONDS) - complexity = 6 - var/max_len = MAX_MESSAGE_LEN / 2 - -/obj/item/integrated_circuit/text/text_replacer/do_work() - set_pin_data(IC_OUTPUT, 1, replacetext(copytext(get_pin_data(IC_INPUT, 1), 1, max_len), copytext(get_pin_data(IC_INPUT, 2), 1, max_len), copytext(get_pin_data(IC_INPUT, 3), 1, max_len))) - push_data() - activate_pin(2) diff --git a/code/modules/integrated_electronics/subtypes/time.dm b/code/modules/integrated_electronics/subtypes/time.dm deleted file mode 100644 index 5a98650676ac6..0000000000000 --- a/code/modules/integrated_electronics/subtypes/time.dm +++ /dev/null @@ -1,187 +0,0 @@ -/obj/item/integrated_circuit/time - name = "time circuit" - desc = "Now you can build your own clock!" - complexity = 1 - inputs = list() - outputs = list() - category_text = "Time" - -/obj/item/integrated_circuit/time/delay - name = "two-sec delay circuit" - desc = "This sends a pulse signal out after a delay, critical for ensuring proper control flow in a complex machine. \ - This circuit is set to send a pulse after a delay of two seconds." - icon_state = "delay-20" - var/delay = 2 SECONDS - activators = list("incoming"= IC_PINTYPE_PULSE_IN,"outgoing" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 2 - -/obj/item/integrated_circuit/time/delay/do_work() - addtimer(CALLBACK(src, .proc/activate_pin, 2), delay) - -/obj/item/integrated_circuit/time/delay/five_sec - name = "five-sec delay circuit" - desc = "This sends a pulse signal out after a delay, critical for ensuring proper control flow in a complex machine. \ - This circuit is set to send a pulse after a delay of five seconds." - icon_state = "delay-50" - delay = 5 SECONDS - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/time/delay/one_sec - name = "one-sec delay circuit" - desc = "This sends a pulse signal out after a delay, critical for ensuring proper control flow in a complex machine. \ - This circuit is set to send a pulse after a delay of one second." - icon_state = "delay-10" - delay = 1 SECONDS - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/time/delay/half_sec - name = "half-sec delay circuit" - desc = "This sends a pulse signal out after a delay, critical for ensuring proper control flow in a complex machine. \ - This circuit is set to send a pulse after a delay of half a second." - icon_state = "delay-5" - delay = 0.5 SECONDS - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/time/delay/tenth_sec - name = "tenth-sec delay circuit" - desc = "This sends a pulse signal out after a delay, critical for ensuring proper control flow in a complex machine. \ - This circuit is set to send a pulse after a delay of 1/10th of a second." - icon_state = "delay-1" - delay = 0.1 SECONDS - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/time/delay/custom - name = "custom delay circuit" - desc = "This sends a pulse signal out after a delay defined in tenths of a second, critical for ensuring proper control \ - flow in a complex machine. This circuit's delay can be customized, between 1/10th of a second to one hour. \ - The delay is updated upon receiving a pulse." - extended_desc = "The delay is defined in tenths of a second. For instance, 4 will be a delay of 0.4 seconds, or 15 for 1.5 seconds." - icon_state = "delay" - inputs = list("delay time" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/time/delay/custom/on_data_written() - ..() - var/delay_input = get_pin_data(IC_INPUT, 1) - if(!isnum_safe(delay_input)) - return - if(delay_input < 1 || delay_input > 1 HOURS) // Value had to be clamped, update the pin. Check's here to avoid infinitely setting the pin. - set_pin_data(IC_INPUT, 1, CLAMP(delay_input ,1 ,1 HOURS)) - return - delay = delay_input - -/obj/item/integrated_circuit/time/ticker - name = "ticker circuit" - desc = "This circuit sends an automatic pulse every four seconds." - icon_state = "tick-m" - complexity = 4 - var/delay = 4 SECONDS - var/next_fire = 0 - var/is_running = FALSE - inputs = list("enable ticking" = IC_PINTYPE_BOOLEAN) - activators = list("outgoing pulse" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 4 - -/obj/item/integrated_circuit/time/ticker/Destroy() - STOP_PROCESSING(SSfastprocess, src) - return ..() - -/obj/item/integrated_circuit/time/ticker/on_data_written() - var/do_tick = get_pin_data(IC_INPUT, 1) - if(do_tick && !is_running) - is_running = TRUE - START_PROCESSING(SSfastprocess, src) - else if(!do_tick && is_running) - is_running = FALSE - STOP_PROCESSING(SSfastprocess, src) - -/obj/item/integrated_circuit/time/ticker/process() - if(world.time > next_fire) - next_fire = world.time + delay - activate_pin(1) - - -/obj/item/integrated_circuit/time/ticker/custom - name = "custom ticker" - desc = "This advanced circuit sends an automatic pulse every given interval, defined in tenths of a second." - extended_desc ="This advanced circuit sends an automatic pulse every given interval, defined in tenths of a second. \ - For example, setting the time pin to 4 will send a pulse every 0.4 seconds, or 15 for every 1.5 seconds." - icon_state = "tick-f" - complexity = 8 - delay = 2 SECONDS - inputs = list("enable ticking" = IC_PINTYPE_BOOLEAN,"delay time" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 8 - -/obj/item/integrated_circuit/time/ticker/custom/on_data_written() - ..() - var/delay_input = get_pin_data(IC_INPUT, 2) - if(!isnum_safe(delay_input)) - return - if(delay_input < 1 || delay_input > 1 HOURS) - set_pin_data(IC_INPUT, 2, CLAMP(delay_input ,1 ,1 HOURS)) - return - delay = delay_input - -/obj/item/integrated_circuit/time/ticker/fast - name = "fast ticker" - desc = "This advanced circuit sends an automatic pulse every two seconds." - icon_state = "tick-f" - complexity = 6 - delay = 2 SECONDS - spawn_flags = IC_SPAWN_RESEARCH - power_draw_per_use = 8 - -/obj/item/integrated_circuit/time/ticker/slow - name = "slow ticker" - desc = "This simple circuit sends an automatic pulse every six seconds." - icon_state = "tick-s" - complexity = 2 - delay = 6 SECONDS - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 2 - -/obj/item/integrated_circuit/time/clock - name = "integrated clock (NT Common Time)" - desc = "Tells you what the time is, in Nanotrasen Common Time." //round time - icon_state = "clock" - inputs = list() - outputs = list( - "time" = IC_PINTYPE_STRING, - "hours" = IC_PINTYPE_NUMBER, - "minutes" = IC_PINTYPE_NUMBER, - "seconds" = IC_PINTYPE_NUMBER, - "absolute decisecond elapsed time" = IC_PINTYPE_NUMBER - ) - activators = list("get time" = IC_PINTYPE_PULSE_IN, "on time got" = IC_PINTYPE_PULSE_OUT) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - power_draw_per_use = 2 - -/obj/item/integrated_circuit/time/clock/proc/get_time() - return world.time - -/obj/item/integrated_circuit/time/clock/do_work() - var/current_time = get_time() - set_pin_data(IC_OUTPUT, 1, time2text(current_time, "hh:mm:ss") ) - set_pin_data(IC_OUTPUT, 2, text2num(time2text(current_time, "hh") ) ) - set_pin_data(IC_OUTPUT, 3, text2num(time2text(current_time, "mm") ) ) - set_pin_data(IC_OUTPUT, 4, text2num(time2text(current_time, "ss") ) ) - set_pin_data(IC_OUTPUT, 5, current_time) - push_data() - activate_pin(2) - -/obj/item/integrated_circuit/time/clock/station - name = "integrated clock (Station Time)" - desc = "Tells you what the time is, in terms and adjusted for your local station or planet" - -/obj/item/integrated_circuit/time/clock/station/get_time() - return station_time() - -/obj/item/integrated_circuit/time/clock/bluespace - name = "integrated clock (Bluespace Absolute Time)" - desc = "Tells you what the time is, in Bluespace Absolute Time, unaffected by local time dilation or other phenomenon." - -/obj/item/integrated_circuit/time/clock/bluespace/get_time() - return REALTIMEOFDAY diff --git a/code/modules/integrated_electronics/subtypes/trig.dm b/code/modules/integrated_electronics/subtypes/trig.dm deleted file mode 100644 index cefa25e945193..0000000000000 --- a/code/modules/integrated_electronics/subtypes/trig.dm +++ /dev/null @@ -1,138 +0,0 @@ -//These circuits do not-so-simple math. -/obj/item/integrated_circuit/trig - complexity = 1 - inputs = list( - "A" = IC_PINTYPE_NUMBER, - "B" = IC_PINTYPE_NUMBER, - "C" = IC_PINTYPE_NUMBER, - "D" = IC_PINTYPE_NUMBER, - "E" = IC_PINTYPE_NUMBER, - "F" = IC_PINTYPE_NUMBER, - "G" = IC_PINTYPE_NUMBER, - "H" = IC_PINTYPE_NUMBER - ) - outputs = list("result" = IC_PINTYPE_NUMBER) - activators = list("compute" = IC_PINTYPE_PULSE_IN, "on computed" = IC_PINTYPE_PULSE_OUT) - category_text = "Trig" - extended_desc = "Input and output are in degrees." - power_draw_per_use = 1 // Still cheap math. - -// Sine // - -/obj/item/integrated_circuit/trig/sine - name = "sin circuit" - desc = "Only evil if you're allergic to math. Takes a degree and outputs the sine of said degree." - icon_state = "sine" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/trig/sine/do_work() - pull_data() - var/result = null - var/A = get_pin_data(IC_INPUT, 1) - if(!isnull(A)) - result = sin(A) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Cosine // - -/obj/item/integrated_circuit/trig/cosine - name = "cos circuit" - desc = "Takes a degree and outputs the cosine of said degree." - icon_state = "cosine" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/trig/cosine/do_work() - pull_data() - var/result = null - var/A = get_pin_data(IC_INPUT, 1) - if(!isnull(A)) - result = cos(A) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Tangent // - -/obj/item/integrated_circuit/trig/tangent - name = "tan circuit" - desc = "Takes a degree and outputs the tangent of said degree." - icon_state = "tangent" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/trig/tangent/do_work() - pull_data() - var/result = null - var/A = get_pin_data(IC_INPUT, 1) - if(!isnull(A)) - result = TAN(A) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Cosecant // - -/obj/item/integrated_circuit/trig/cosecant - name = "cosecant (CSC) circuit" - desc = "Takes a degree and outputs the cosecant of said degree." - icon_state = "cosecant" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/trig/cosecant/do_work() - pull_data() - var/result = null - var/A = get_pin_data(IC_INPUT, 1) - if(!isnull(A)) - result = CSC(A) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Secant // - -/obj/item/integrated_circuit/trig/secant - name = "secant (SEC) circuit" - desc = "Takes a degree and outputs the secant of said degree." - icon_state = "secant" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/trig/secant/do_work() - pull_data() - var/result = null - var/A = get_pin_data(IC_INPUT, 1) - if(!isnull(A)) - result = SEC(A) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) - -// Cotangent // - -/obj/item/integrated_circuit/trig/cotangent - name = "cotangent (COT) circuit" - desc = "Takes a degree and outputs the cotangent of said degree." - icon_state = "cotangent" - inputs = list("A" = IC_PINTYPE_NUMBER) - spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - -/obj/item/integrated_circuit/trig/cotangent/do_work() - pull_data() - var/result = null - var/A = get_pin_data(IC_INPUT, 1) - if(!isnull(A)) - result = COT(A) - - set_pin_data(IC_OUTPUT, 1, result) - push_data() - activate_pin(2) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 6e9e9a70b20d1..8f7a7f6da009c 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -129,21 +129,21 @@ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE) /proc/get_all_accesses() - return list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, + return list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_SEC_RECORDS, ACCESS_BRIG, ACCESS_BRIGPHYS, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, - ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, - ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, + ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_AUX_BASE, + ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_EXPLORATION, ACCESS_SURGERY, ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_APOTHECARY, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING) /proc/get_all_centcom_access() - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN) + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN, ACCESS_CENT_BAR) /proc/get_ert_access(class) switch(class) @@ -159,6 +159,12 @@ /proc/get_all_syndicate_access() return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) +/proc/get_all_away_access() + return list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_MED, ACCESS_AWAY_SEC, ACCESS_AWAY_ENGINE, ACCESS_AWAY_GENERIC1, ACCESS_AWAY_GENERIC2, ACCESS_AWAY_GENERIC3, ACCESS_AWAY_GENERIC4) + +/proc/get_every_access() + return get_all_accesses() + get_all_centcom_access() + get_all_syndicate_access() + get_all_away_access() + ACCESS_BLOODCULT + ACCESS_CLOCKCULT + /proc/get_region_accesses(code) switch(code) if(0) @@ -166,15 +172,15 @@ if(1) //station general return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER) if(2) //security - return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) + return list(ACCESS_SEC_DOORS, ACCESS_SEC_RECORDS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_BRIGPHYS, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) if(3) //medbay return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_APOTHECARY) if(4) //research return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK) if(5) //engineering and maintenance - return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MECH_ENGINE, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_CE) + return list(ACCESS_CONSTRUCTION, ACCESS_AUX_BASE, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MECH_ENGINE, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_CE) if(6) //supply - return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM, ACCESS_VAULT) + return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_EXPLORATION, ACCESS_QM, ACCESS_VAULT) if(7) //command return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HOP, ACCESS_CAPTAIN, ACCESS_VAULT) @@ -221,6 +227,8 @@ return "Toxins Lab" if(ACCESS_CHEMISTRY) return "Chemistry Lab" + if(ACCESS_BRIGPHYS) + return "Brig Physician" if(ACCESS_RD) return "RD Office" if(ACCESS_BAR) @@ -277,6 +285,8 @@ return "CMO Office" if(ACCESS_QM) return "Quartermaster" + if(ACCESS_EXPLORATION) + return "Exploration Dock" if(ACCESS_SURGERY) return "Surgery" if(ACCESS_THEATRE) @@ -311,6 +321,8 @@ return "Gateway" if(ACCESS_SEC_DOORS) return "Brig" + if(ACCESS_SEC_RECORDS) + return "Security Records" if(ACCESS_MINERAL_STOREROOM) return "Mineral Storage" if(ACCESS_MINISAT) @@ -331,6 +343,8 @@ return "Science Mech Access" if(ACCESS_MECH_ENGINE) return "Engineering Mech Access" + if(ACCESS_AUX_BASE) + return "Auxiliary Base" /proc/get_centcom_access_desc(A) switch(A) @@ -354,14 +368,24 @@ return "Code Scotch" /proc/get_all_jobs() - return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", - "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", - "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", - "Deputy", "Psychologist", "Barber") + return list("Captain", + // Service + "Assistant", "Head of Personnel", "Bartender", "Cook", "Botanist", "Janitor", "Curator", + "Chaplain", "Lawyer", "Clown", "Mime", "Barber", "Stage Magician", + // Cargo + "Quartermaster", "Cargo Technician","Shaft Miner", + // Engineering + "Chief Engineer", "Station Engineer", "Atmospheric Technician", + // R&D + "Research Director", "Scientist", "Roboticist", "Exploration Crew", + // Medical + "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Psychiatrist", + // Security + "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Deputy") + // Each job is supposed to be in their department due to the HoP console. -/proc/get_all_job_icons() //For all existing HUD icons - return get_all_jobs() + list("Prisoner", "King") +/proc/get_all_job_icons() //We need their HUD icons, but we don't want to give these jobs to people from the job list of HoP console. + return get_all_jobs() + list("Prisoner", "King", "VIP", "Debtor", "Acting Captain") /proc/get_all_centcom_jobs() return list("VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","CentCom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","CentCom Bartender","Comedy Response Officer", "HONK Squad Trooper") diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm index e021f47bfa693..508422246a702 100644 --- a/code/modules/jobs/job_exp.dm +++ b/code/modules/jobs/job_exp.dm @@ -1,7 +1,6 @@ GLOBAL_LIST_EMPTY(exp_to_update) GLOBAL_PROTECT(exp_to_update) - // Procs /datum/job/proc/required_playtime_remaining(client/C) if(!C) @@ -59,79 +58,11 @@ GLOBAL_PROTECT(exp_to_update) amount += explist[job] return amount -/client/proc/get_exp_report() - if(!CONFIG_GET(flag/use_exp_tracking)) - return "Tracking is disabled in the server configuration file." - var/list/play_records = prefs.exp - if(!play_records.len) - set_exp_from_db() - play_records = prefs.exp - if(!play_records.len) - return "[key] has no records." - var/return_text = list() - return_text += "
Jobs Unlocked: Jobs Not Unlocked: " + "[dat]", "window=book[window_size != null ? ";size=[window_size]" : ""]") - user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.") - SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd) onclose(user, "book") else to_chat(user, "This book is completely blank!") @@ -239,7 +242,7 @@ var/newtitle = reject_bad_text(stripped_input(user, "Write a new title:")) if(!user.canUseTopic(src, BE_CLOSE, literate)) return - if (length(newtitle) > 20) + if (length(newtitle) > 50) to_chat(user, "That title won't fit on the cover!") return if(!newtitle) @@ -301,7 +304,7 @@ scanner.computer.inventory.Add(src) to_chat(user, "[I]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'") - else if(istype(I, /obj/item/kitchen/knife) || I.tool_behaviour == TOOL_WIRECUTTER) + else if((istype(I, /obj/item/kitchen/knife) || I.tool_behaviour == TOOL_WIRECUTTER) && !(flags_1 & HOLOGRAM_1)) to_chat(user, "You begin to carve out [title]...") if(do_after(user, 30, target = src)) to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.") diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 2d52a48bb328b..606f4835a1f45 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -27,6 +27,7 @@ var/author var/SQLquery clockwork = TRUE //it'd look weird + broken_overlay_emissive = TRUE /obj/machinery/computer/libraryconsole/ui_interact(mob/user) . = ..() @@ -316,15 +317,19 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums popup.open() /obj/machinery/computer/libraryconsole/bookmanagement/proc/findscanner(viewrange) - for(var/obj/machinery/libraryscanner/S in range(viewrange, get_turf(src))) - return S - return null + return locate(/obj/machinery/libraryscanner) in range(viewrange, get_turf(src)) /obj/machinery/computer/libraryconsole/bookmanagement/proc/print_forbidden_lore(mob/user) - if (prob(50)) - new /obj/item/melee/cultblade/dagger(get_turf(src)) - to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a sinister dagger sitting on the desk. You don't even remember where it came from...") - + switch(rand(1,3)) + if(1) + new /obj/item/melee/cultblade/dagger(get_turf(src)) + to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a sinister dagger sitting on the desk. You don't even remember where it came from...") + if(2) + new /obj/item/clockwork/clockwork_slab(get_turf(src)) + to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a strange metal tablet sitting on the desk. You don't even remember where it came from...") + if(3) + new /obj/item/forbidden_book(get_turf(src)) + to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is an ominous book, bound by a chain, sitting on the desk. You don't even remember where it came from...") user.visible_message("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older.", 2) /obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/W, mob/user, params) diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm index 78212e4f92aa2..e25c4ed5a24e9 100644 --- a/code/modules/library/soapstone.dm +++ b/code/modules/library/soapstone.dm @@ -155,8 +155,6 @@ var/hash = rustg_hash_string(RUSTG_HASH_MD5, hidden_message) var/newcolor = copytext_char(hash, 1, 7) add_atom_colour("#[newcolor]", FIXED_COLOUR_PRIORITY) - light_color = "#[newcolor]" - set_light(1) /obj/structure/chisel_message/proc/pack() var/list/data = list() diff --git a/code/modules/lighting/emissive_blocker.dm b/code/modules/lighting/emissive_blocker.dm new file mode 100644 index 0000000000000..b69a474009ee8 --- /dev/null +++ b/code/modules/lighting/emissive_blocker.dm @@ -0,0 +1,44 @@ +/** + * Internal atom that copies an appearance on to the blocker plane + * + * Copies an appearance vis render_target and render_source on to the emissive blocking plane. + * This means that the atom in question will block any emissive sprites. + * This should only be used internally. If you are directly creating more of these, you're + * almost guaranteed to be doing something wrong. + */ +/atom/movable/emissive_blocker + name = "" + plane = EMISSIVE_BLOCKER_PLANE + layer = EMISSIVE_BLOCKER_LAYER + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + //Why? + //render_targets copy the transform of the target as well, but vis_contents also applies the transform + //to what's in it. Applying RESET_TRANSFORM here makes vis_contents not apply the transform. + //Since only render_target handles transform we don't get any applied transform "stacking" + appearance_flags = RESET_TRANSFORM + +/atom/movable/emissive_blocker/Initialize(mapload, source) + . = ..() + verbs.Cut() //Cargo culting from lighting object, this maybe affects memory usage? + + render_source = source + +/atom/movable/emissive_blocker/ex_act(severity) + return FALSE + +/atom/movable/emissive_blocker/singularity_act() + return + +/atom/movable/emissive_blocker/singularity_pull() + return + +/atom/movable/emissive_blocker/blob_act() + return + +/atom/movable/emissive_blocker/onTransitZ() + return + +//Prevents people from moving these after creation, because they shouldn't be. +/atom/movable/emissive_blocker/forceMove(atom/destination, no_tp=FALSE, harderforce = FALSE) + if(harderforce) + return ..() diff --git a/code/modules/lighting/lighting_area.dm b/code/modules/lighting/lighting_area.dm index 13676a5cb4f49..878d41aeee829 100644 --- a/code/modules/lighting/lighting_area.dm +++ b/code/modules/lighting/lighting_area.dm @@ -10,11 +10,20 @@ if (IS_DYNAMIC_LIGHTING(src)) cut_overlay(/obj/effect/fullbright) + if(lighting_overlay) + cut_overlay(lighting_overlay) + if(lighting_overlay_opacity && lighting_overlay_colour) + lighting_overlay = new /obj/effect/fullbright + lighting_overlay.color = lighting_overlay_colour + lighting_overlay.alpha = lighting_overlay_opacity + add_overlay(lighting_overlay) for (var/turf/T in src) if (IS_DYNAMIC_LIGHTING(T)) T.lighting_build_overlay() else + if(lighting_overlay) + cut_overlay(lighting_overlay) add_overlay(/obj/effect/fullbright) for (var/turf/T in src) if (T.lighting_object) @@ -27,4 +36,18 @@ if("dynamic_lighting") set_dynamic_lighting(var_value) return TRUE + if("lighting_overlay_colour") + ..() + if(lighting_overlay) + cut_overlay(lighting_overlay) + lighting_overlay.color = var_value + add_overlay(lighting_overlay) + return TRUE + if("lighting_overlay_opacity") + ..() + if(lighting_overlay) + cut_overlay(lighting_overlay) + lighting_overlay.alpha = var_value + add_overlay(lighting_overlay) + return TRUE return ..() diff --git a/code/modules/lighting/lighting_corner.dm b/code/modules/lighting/lighting_corner.dm index c18c7e831a476..be73c636f8a94 100644 --- a/code/modules/lighting/lighting_corner.dm +++ b/code/modules/lighting/lighting_corner.dm @@ -136,6 +136,6 @@ GLOBAL_LIST_INIT(LIGHTING_CORNER_DIAGONAL, list(NORTHEAST, SOUTHEAST, SOUTHWEST, if (!force) return QDEL_HINT_LETMELIVE - stack_trace("Ok, Look, /tg/, I need you to find whatever fucker decided to call qdel on a fucking lighting corner, then tell him very nicely and politely that he is 100% retarded and needs his head checked. Thanks. Send them my regards by the way.") + stack_trace("Ok, Look, /tg/, I need you to find whatever fucker decided to call qdel on a fucking lighting corner, then tell him very nicely and politely that he is 100% intellectually disabled and needs his head checked. Thanks. Send them my regards by the way.") return ..() diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm index 05e0cabe35bc9..d2fae0c1ca55f 100644 --- a/code/modules/lighting/lighting_object.dm +++ b/code/modules/lighting/lighting_object.dm @@ -16,7 +16,7 @@ /atom/movable/lighting_object/Initialize(mapload) . = ..() - verbs.Cut() + remove_verb(verbs) atom_colours.Cut() myturf = loc @@ -101,7 +101,7 @@ #if LIGHTING_SOFT_THRESHOLD != 0 var/set_luminosity = max > LIGHTING_SOFT_THRESHOLD #else - // Because of floating points?, it won't even be a flat 0. + // Because of floating points�?, it won't even be a flat 0. // This number is mostly arbitrary. var/set_luminosity = max > 1e-6 #endif diff --git a/code/modules/lighting/lighting_setup.dm b/code/modules/lighting/lighting_setup.dm index 5086b0c9d29c5..6cd25efe2b231 100644 --- a/code/modules/lighting/lighting_setup.dm +++ b/code/modules/lighting/lighting_setup.dm @@ -1,5 +1,5 @@ /proc/create_all_lighting_objects() - for(var/area/A in world) + for(var/area/A in GLOB.sortedAreas) if(!IS_DYNAMIC_LIGHTING(A)) continue diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index dc965bbe3e392..d12a129e89f24 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -63,7 +63,12 @@ if (needs_update) GLOB.lighting_update_lights -= src - . = ..() + top_atom = null + source_atom = null + source_turf = null + pixel_turf = null + + return ..() // Yes this doesn't align correctly on anything other than 4 width tabs. // If you want it to go switch everybody to elastic tab stops. @@ -234,13 +239,14 @@ var/oldlum = source_turf.luminosity source_turf.luminosity = CEILING(light_range, 1) for(T in view(CEILING(light_range, 1), source_turf)) - if((!IS_DYNAMIC_LIGHTING(T) && !T.light_sources) || T.has_opaque_atom) + if((!IS_DYNAMIC_LIGHTING(T) && !T.light_sources)) continue - if (!T.lighting_corners_initialised) - T.generate_missing_corners() - for (thing in T.corners) - C = thing - corners[C] = 0 + if(!T.has_opaque_atom) + if (!T.lighting_corners_initialised) + T.generate_missing_corners() + for (thing in T.corners) + C = thing + corners[C] = 0 turfs += T source_turf.luminosity = oldlum diff --git a/code/modules/mapexporting/mapexporter.dm b/code/modules/mapexporting/mapexporter.dm index a886db0636ec3..d71b94f89c72a 100644 --- a/code/modules/mapexporting/mapexporter.dm +++ b/code/modules/mapexporting/mapexporter.dm @@ -62,18 +62,19 @@ GLOBAL_LIST_INIT(save_file_chars, list( var/turf/place = sortedmap[x][y] var/area/location var/list/objects + var/area/AR = get_area(place) //If there is nothing there, save as a noop (For odd shapes) if(!place) place = /turf/template_noop location = /area/template_noop objects = list() //Ignore things in space, must be a space turf and the area has to be empty space - else if(istype(place, /turf/open/space) && get_area(place).type == /area/space && !(save_flag & SAVE_SPACE)) + else if(istype(place, /turf/open/space) && istype(AR, /area/space) && !(save_flag & SAVE_SPACE)) place = /turf/template_noop location = /area/template_noop //Stuff to add else - location = get_area(place).type + location = AR.type objects = place place = place.type //====Saving shuttles only / non shuttles only==== diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index 4294c4464b127..92ba6b5814054 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -7,7 +7,17 @@ var/datum/parsed_map/cached_map var/keep_cached_map = FALSE -/datum/map_template/New(path = null, rename = null, cache = FALSE) + ///if true, turfs loaded from this template are placed on top of the turfs already there, defaults to TRUE + var/should_place_on_top = TRUE + + ///if true, creates a list of all atoms created by this template loading, defaults to FALSE + var/returns_created_atoms = FALSE + + ///the list of atoms created by this template being loaded, only populated if returns_created_atoms is TRUE + var/list/created_atoms = list() + //make sure this list is accounted for/cleared if you request it from ssatoms! + +/datum/map_template/New(path = null, rename = null, cache = FALSE, admin_load = FALSE) if(path) mappath = path if(mappath) @@ -25,42 +35,80 @@ cached_map = parsed return bounds -/datum/parsed_map/proc/initTemplateBounds() +/datum/map_template/proc/initTemplateBounds(list/bounds, init_atmos = TRUE) + if (!bounds) //something went wrong + stack_trace("[name] template failed to initialize correctly!") + return + var/list/obj/machinery/atmospherics/atmos_machines = list() var/list/obj/structure/cable/cables = list() - var/list/atom/atoms = list() + var/list/atom/movable/movables = list() var/list/area/areas = list() - var/list/turfs = block( locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), - locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])) - var/list/border = block(locate(max(bounds[MAP_MINX]-1, 1), max(bounds[MAP_MINY]-1, 1), bounds[MAP_MINZ]), - locate(min(bounds[MAP_MAXX]+1, world.maxx), min(bounds[MAP_MAXY]+1, world.maxy), bounds[MAP_MAXZ])) - turfs - for(var/L in turfs) - var/turf/B = L - atoms += B - areas |= B.loc - for(var/A in B) - atoms += A - if(istype(A, /obj/structure/cable)) - cables += A + var/list/turfs = block( + locate( + bounds[MAP_MINX], + bounds[MAP_MINY], + bounds[MAP_MINZ] + ), + locate( + bounds[MAP_MAXX], + bounds[MAP_MAXY], + bounds[MAP_MAXZ] + ) + ) + for(var/turf/current_turf as anything in turfs) + var/area/current_turfs_area = current_turf.loc + areas |= current_turfs_area + if(!SSatoms.initialized) + continue + + for(var/movable_in_turf in current_turf) + movables += movable_in_turf + if(istype(movable_in_turf, /obj/structure/cable)) + cables += movable_in_turf continue - if(istype(A, /obj/machinery/atmospherics)) - atmos_machines += A - for(var/L in border) - var/turf/T = L - T.air_update_turf(TRUE) //calculate adjacent turfs along the border to prevent runtimes + if(istype(movable_in_turf, /obj/machinery/atmospherics)) + atmos_machines += movable_in_turf + // Not sure if there is some importance here to make sure the area is in z + // first or not. Its defined In Initialize yet its run first in templates + // BEFORE so... hummm SSmapping.reg_in_areas_in_z(areas) - SSatoms.InitializeAtoms(atoms) + if(!SSatoms.initialized) + return + + SSatoms.InitializeAtoms(areas + turfs + movables, returns_created_atoms ? created_atoms : null) + + // NOTE, now that Initialize and LateInitialize run correctly, do we really + // need these two below? SSmachines.setup_template_powernets(cables) SSair.setup_template_machinery(atmos_machines) -/datum/map_template/proc/load_new_z() + if(init_atmos) + //calculate all turfs inside the border + var/list/template_and_bordering_turfs = block( + locate( + max(bounds[MAP_MINX]-1, 1), + max(bounds[MAP_MINY]-1, 1), + bounds[MAP_MINZ] + ), + locate( + min(bounds[MAP_MAXX]+1, world.maxx), + min(bounds[MAP_MAXY]+1, world.maxy), + bounds[MAP_MAXZ] + ) + ) + for(var/turf/affected_turf as anything in template_and_bordering_turfs) + affected_turf.air_update_turf(TRUE) + affected_turf.levelupdate() + +/datum/map_template/proc/load_new_z(orbital_body_type, list/level_traits = list(ZTRAIT_AWAY = TRUE)) var/x = round((world.maxx - width)/2) var/y = round((world.maxy - height)/2) - var/datum/space_level/level = SSmapping.add_new_zlevel(name, list(ZTRAIT_AWAY = TRUE)) - var/datum/parsed_map/parsed = load_map(file(mappath), x, y, level.z_value, no_changeturf=(SSatoms.initialized == INITIALIZATION_INSSATOMS), placeOnTop=TRUE) + var/datum/space_level/level = SSmapping.add_new_zlevel(name, level_traits, orbital_body_type = orbital_body_type) + var/datum/parsed_map/parsed = load_map(file(mappath), x, y, level.z_value, no_changeturf=(SSatoms.initialized == INITIALIZATION_INSSATOMS), placeOnTop=should_place_on_top) var/list/bounds = parsed.bounds if(!bounds) return FALSE @@ -68,13 +116,13 @@ repopulate_sorted_areas() //initialize things that are normally initialized after map load - parsed.initTemplateBounds() + initTemplateBounds(bounds) smooth_zlevel(world.maxz) log_game("Z-level [name] loaded at [x],[y],[world.maxz]") return level -/datum/map_template/proc/load(turf/T, centered = FALSE) +/datum/map_template/proc/load(turf/T, centered = FALSE, init_atmos = TRUE) if(centered) T = locate(T.x - round(width/2) , T.y - round(height/2) , T.z) if(!T) @@ -84,11 +132,22 @@ if(T.y+height > world.maxy) return + var/list/border = block(locate(max(T.x, 1), max(T.y, 1), T.z), + locate(min(T.x+width, world.maxx), min(T.y+height, world.maxy), T.z)) + for(var/L in border) + var/turf/turf_to_disable = L + turf_to_disable.ImmediateDisableAdjacency() + // Accept cached maps, but don't save them automatically - we don't want // ruins clogging up memory for the whole round. var/datum/parsed_map/parsed = cached_map || new(file(mappath)) cached_map = keep_cached_map ? parsed : null - if(!parsed.load(T.x, T.y, T.z, cropMap=TRUE, no_changeturf=(SSatoms.initialized == INITIALIZATION_INSSATOMS), placeOnTop=TRUE)) + + var/list/turf_blacklist = list() + update_blacklist(T, turf_blacklist) + + parsed.turf_blacklist = turf_blacklist + if(!parsed.load(T.x, T.y, T.z, cropMap=TRUE, no_changeturf=(SSatoms.initialized == INITIALIZATION_INSSATOMS), placeOnTop=should_place_on_top)) return var/list/bounds = parsed.bounds if(!bounds) @@ -98,11 +157,14 @@ repopulate_sorted_areas() //initialize things that are normally initialized after map load - parsed.initTemplateBounds() + initTemplateBounds(bounds, init_atmos) log_game("[name] loaded at [T.x],[T.y],[T.z]") return bounds +/datum/map_template/proc/update_blacklist(turf/T, list/input_blacklist) + return + /datum/map_template/proc/get_affected_turfs(turf/T, centered = FALSE) var/turf/placement = T if(centered) @@ -114,6 +176,6 @@ //for your ever biggening badminnery kevinz000 //⤠- Cyberboss -/proc/load_new_z_level(var/file, var/name) +/proc/load_new_z_level(var/file, var/name, orbital_body_type) var/datum/map_template/template = new(file, name) - template.load_new_z() + template.load_new_z(orbital_body_type = orbital_body_type) diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 98c0ed209f7d5..9af886776a731 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -213,7 +213,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) if(target_type && !istype(A,target_type)) continue var/cargs = build_args() - A.AddComponent(arglist(cargs)) + A._AddComponent(cargs) qdel(src) return diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm index 79afa8c032506..d966d8c0410bc 100644 --- a/code/modules/mapping/preloader.dm +++ b/code/modules/mapping/preloader.dm @@ -37,3 +37,12 @@ GLOBAL_DATUM_INIT(_preloader, /datum/map_preloader, new) name = "Turf Passthrough" icon_state = "noop" bullet_bounce_sound = null + +//The following two turfs can be used to hint if any genturfs below should be generated as closed or open +/turf/template_noop/closed + name = "Area Passthrough (prefer closed)" + icon_state = "noop_closed" + +/turf/template_noop/open + name = "Area Passthrough (prefer open)" + icon_state = "noop_open" diff --git a/code/modules/mapping/random_rooms.dm b/code/modules/mapping/random_rooms.dm index dd37032bc16b0..d87be0728c9a0 100644 --- a/code/modules/mapping/random_rooms.dm +++ b/code/modules/mapping/random_rooms.dm @@ -689,7 +689,7 @@ template_height = 3 template_width = 3 weight = 3 - + /datum/map_template/random_room/sk_rdm082 name = "Maint Chemistry" room_id = "sk_rdm082_maintmedical" @@ -1161,25 +1161,6 @@ template_width = 10 weight = 3 - -/datum/map_template/random_room/sk_rdm135 //this room is fun. - name = "Cluwne Altar" - room_id = "sk_rdm135_cluwnealtar" - mappath = "_maps/RandomRooms/10x10/sk_rdm135_cluwnealtar.dmm" - centerspawner = FALSE - template_height = 10 - template_width = 10 - weight = 1 //rare - -/datum/map_template/random_room/sk_rdm136 //this room is fun as well - name = "Tiny Cluwne Altar" - room_id = "sk_rdm136_tinycluwnealtar" - mappath = "_maps/RandomRooms/5x4/sk_rdm136_tinycluwnealtar.dmm" - centerspawner = FALSE - template_height = 4 - template_width = 5 - weight = 1 - /datum/map_template/random_room/sk_rdm137 name = "Tiny psych ward" room_id = "sk_rdm137_tinyshrink" @@ -1198,7 +1179,7 @@ template_width = 5 weight = 4 -/datum/map_template/random_room/sk_rdm139 +/datum/map_template/random_room/sk_rdm139 name = "containment cell" room_id = "sk_rdm139_containmentcell" mappath = "_maps/RandomRooms/3x3/containmentcell.dmm" @@ -1214,4 +1195,157 @@ centerspawner = FALSE template_height = 5 template_width = 3 - weight = 2 \ No newline at end of file + weight = 2 + +/datum/map_template/random_room/sk_rdm141 + name = "the place 6 sectors down" + room_id = "sk_rdm141_6sectorsdown" + mappath = "_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 + weight = 2 + +/datum/map_template/random_room/sk_rdm142 + name = "old diner" + room_id = "sk_rdm142_olddiner" + mappath = "_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 + weight = 4 + +/datum/map_template/random_room/sk_rdm143 + name = "gamer cave" + room_id = "sk_rdm143_gamercave" + mappath = "_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 + weight = 3 + +/datum/map_template/random_room/sk_rdm144 //has Stage Magician Spawner + name = "small stage and bar" + room_id = "sk_rdm144_smallmagician" + mappath = "_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 + weight = 3 + +/datum/map_template/random_room/sk_rdm145 //has tela anchor + name = "lady tesla altar" + room_id = "sk_rdm145_ladytesla_altar" + mappath = "_maps/RandomRooms/10x10/sk_rdm145_ladytesla_altar.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 + weight = 1 //rare + +/datum/map_template/random_room/sk_rdm146 + name = "blastdoor interchange" + room_id = "sk_rdm146_blastdoor_interchange" + mappath = "_maps/RandomRooms/10x10/sk_rdm146_blastdoor_interchange.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 + weight = 4 //common + +/datum/map_template/random_room/sk_rdm147 + name = "advanced micro botany" + room_id = "sk_rdm147_advbotany" + mappath = "_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 + weight = 2 + +/datum/map_template/random_room/sk_rdm148 + name = "maintenance apiary" + room_id = "sk_rdm148_botany_apiary" + mappath = "_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 + weight = 2 + +/datum/map_template/random_room/sk_rdm149 + name = "space window with crates" + room_id = "sk_rdm149_cratewindow" + mappath = "_maps/RandomRooms/10x5/sk_rdm149_cratewindow.dmm" + centerspawner = FALSE + template_height = 5 + template_width = 10 + weight = 3 + +/datum/map_template/random_room/sk_rdm150 + name = "small medical lobby" + room_id = "sk_rdm150_smallmedlobby" + mappath = "_maps/RandomRooms/10x5/sk_rdm150_smallmedlobby.dmm" + centerspawner = FALSE + template_height = 5 + template_width = 10 + weight = 3 //common + +/datum/map_template/random_room/sk_rdm151 //delicious + name = "small medical lobby" + room_id = "sk_rdm151_ratburger" + mappath = "_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm" + centerspawner = FALSE + template_height = 5 + template_width = 10 + weight = 1 //rare + +/datum/map_template/random_room/sk_rdm152 + name = "old genetics office" + room_id = "sk_rdm152_geneticsoffice" + mappath = "_maps/RandomRooms/10x5/sk_rdm152_geneticsoffice.dmm" + centerspawner = FALSE + template_height = 5 + template_width = 10 + weight = 2 + +/datum/map_template/random_room/sk_rdm153 //its a hobo den featuring Peter the pet frog. Includes a debtor spawn + name = "peters room" + room_id = "sk_rdm153_hobowithpeter" + mappath = "_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm" + centerspawner = FALSE + template_height = 5 + template_width = 10 + weight = 2 + +/datum/map_template/random_room/sk_rdm154 //rare, has a cleaver. + name = "butchers den" + room_id = "sk_rdm154_butchersden" + mappath = "_maps/RandomRooms/10x5/sk_rdm154_butchersden.dmm" + centerspawner = FALSE + template_height = 5 + template_width = 10 + weight = 1 + +/datum/map_template/random_room/sk_rdm155 + name = "punji stick conveyor trap" + room_id = "sk_rdm155_punjiconveyor" + mappath = "_maps/RandomRooms/10x5/sk_rdm155_punjiconveyor.dmm" + centerspawner = FALSE + template_height = 5 + template_width = 10 + weight = 1 + +/datum/map_template/random_room/sk_rdm156 + name = "ancient interchange" + room_id = "sk_rdm156_oldairlock_interchange" + mappath = "_maps/RandomRooms/10x5/sk_rdm156_oldairlock_interchange.dmm" + centerspawner = FALSE + template_height = 5 + template_width = 10 + weight = 4 + stock = 2 + +/datum/map_template/random_room/sk_rdm157 + name = "Space Chess" + room_id = "sk_rdm157_chess" + mappath = "_maps/RandomRooms/10x10/sk_rdm157_chess.dmm" + centerspawner = FALSE + template_height = 10 + template_width = 10 diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm index 1beddbfdbbb21..9f73367f7aee2 100644 --- a/code/modules/mapping/reader.dm +++ b/code/modules/mapping/reader.dm @@ -23,6 +23,9 @@ var/list/bounds var/did_expand = FALSE + ///any turf in this list is skipped inside of build_coordinate + var/list/turf_blacklist = list() + // raw strings used to represent regexes more accurately // '' used to avoid confusing syntax highlighting var/static/regex/dmmRegex = new(@'"([a-zA-Z]+)" = \(((?:.|\n)*?)\)\n(?!\t)|\((\d+),(\d+),(\d+)\) = \{"([a-zA-Z\n]*)"\}', "g") @@ -52,7 +55,11 @@ /datum/parsed_map/New(tfile, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper=INFINITY, measureOnly=FALSE) if(isfile(tfile)) original_path = "[tfile]" + var/temp_hack_garbage = tfile tfile = rustg_file_read(tfile) + //This is hacky garbage + if(tfile == "") //Might be an upload, try raw loading it. + tfile = file2text(temp_hack_garbage) else if(isnull(tfile)) // create a new datum without loading a map return @@ -310,6 +317,13 @@ //Instanciation //////////////// + for (var/turf_in_blacklist in turf_blacklist) + if (crds == turf_in_blacklist) //if the given turf is blacklisted, dont do anything with it + return + + //Keep a reference to the original area in case we need to tell it to generate this turf later + var/area/orig_area = crds.loc + //The next part of the code assumes there's ALWAYS an /area AND a /turf on a given tile //first instance the /area and remove it from the members list index = members.len @@ -327,6 +341,8 @@ if(GLOB.use_preloader && instance) world.preloader_load(instance) + else + orig_area = null // We won't be messing with the old area, null it //then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect @@ -338,8 +354,23 @@ SSatoms.map_loader_begin() //instanciate the first /turf var/turf/T - if(members[first_turf_index] != /turf/template_noop) - T = instance_atom(members[first_turf_index],members_attributes[first_turf_index],crds,no_changeturf,placeOnTop) + if(ispath(members[first_turf_index], /turf/template_noop)) + if(istype(crds, /turf/open/genturf)) + var/turf/open/genturf/genturf = crds + //If the new area is different from the original area, ensure the new turfs are generated as part of the original area + if(orig_area && orig_area.type != members[index]) + LAZYADD(orig_area.additional_genturfs, crds) + //Cave generation checks current area flags for generation; ignore them + genturf.force_generation = TRUE + //Pass on any hints for whether the turf should be open or closed + if(ispath(members[first_turf_index], /turf/template_noop/closed)) + genturf.genturf_hint = GENTURF_HINT_CLOSED + else if(ispath(members[first_turf_index], /turf/template_noop/open)) + genturf.genturf_hint = GENTURF_HINT_OPEN + else + ///Disable placeOnTop for genturfs, instead making sure to replace them + var/shouldPlaceOnTop = placeOnTop && !istype(crds, /turf/open/genturf) + T = instance_atom(members[first_turf_index],members_attributes[first_turf_index],crds,no_changeturf,shouldPlaceOnTop) if(T) //if others /turf are presents, simulates the underlays piling effect @@ -480,4 +511,9 @@ /datum/parsed_map/Destroy() ..() + turf_blacklist.Cut() + parsed_bounds.Cut() + bounds.Cut() + grid_models.Cut() + gridSets.Cut() return QDEL_HINT_HARDDEL_NOW diff --git a/code/modules/mapping/ruins.dm b/code/modules/mapping/ruins.dm index fe2f0c65b7b73..eee1f635aa2f1 100644 --- a/code/modules/mapping/ruins.dm +++ b/code/modules/mapping/ruins.dm @@ -20,6 +20,8 @@ for(var/i in get_affected_turfs(central_turf, 1)) var/turf/T = i + for(var/obj/structure/spawner/nest in T) + qdel(nest) for(var/mob/living/simple_animal/monster in T) qdel(monster) for(var/obj/structure/flora/ash/plant in T) @@ -121,8 +123,6 @@ forced_ruins[linked] = forced_z ? forced_z : z_placed //I guess you might want a chain somehow if(PLACE_LAVA_RUIN) forced_ruins[linked] = pick(SSmapping.levels_by_trait(ZTRAIT_LAVA_RUINS)) - if(PLACE_SPACE_RUIN) - forced_ruins[linked] = pick(SSmapping.levels_by_trait(ZTRAIT_SPACE_RUINS)) if(PLACE_DEFAULT) forced_ruins[linked] = -1 forced_z = 0 diff --git a/code/modules/mapping/space_management/multiz_helpers.dm b/code/modules/mapping/space_management/multiz_helpers.dm index 74bd7c8782eff..fe5aa0b039151 100644 --- a/code/modules/mapping/space_management/multiz_helpers.dm +++ b/code/modules/mapping/space_management/multiz_helpers.dm @@ -45,4 +45,38 @@ else holder = UP dir |= holder - return dir \ No newline at end of file + return dir + +/proc/get_zs_in_range(z_level, max_z_range) + . = list(z_level) + if(max_z_range <= 0) + return + var/turf/center_turf = locate(world.maxx / 2, world.maxy / 2, z_level) + var/turf/temp = center_turf.above() + //Iterate upwards. + var/i = 0 + while(isturf(temp)) + . += temp + i ++ + if(i >= max_z_range) + break + temp = temp.above() + //Iterate downwards. + temp = center_turf.below() + i = 0 + while(isturf(temp)) + . += temp + i ++ + if(i >= max_z_range) + break + temp = temp.below() + +/proc/multi_z_dist(turf/T0, turf/T1) + if(T0.get_virtual_z_level() == T1.get_virtual_z_level()) + return get_dist(T0, T1) + if(is_station_level(T0.z) && is_station_level(T1.z)) + var/raw_dist = get_dist(T0, T1) + var/z_dist = abs(T0.z - T1.z) * MULTI_Z_DISTANCE + var/total_dist = raw_dist + z_dist + return total_dist + return INFINITY diff --git a/code/modules/mapping/space_management/space_level.dm b/code/modules/mapping/space_management/space_level.dm index cc9c6e11f173b..d696dfb47130f 100644 --- a/code/modules/mapping/space_management/space_level.dm +++ b/code/modules/mapping/space_management/space_level.dm @@ -6,9 +6,16 @@ var/linkage = SELFLOOPING var/xi var/yi //imaginary placements on the grid + //Z-levels orbital body + var/datum/orbital_object/z_linked/orbital_body + //Is something generating on this level? + var/generating = FALSE -/datum/space_level/New(new_z, new_name, list/new_traits = list()) +/datum/space_level/New(new_z, new_name, list/new_traits = list(), orbital_body_type) z_value = new_z name = new_name traits = new_traits set_linkage(new_traits[ZTRAIT_LINKAGE]) + if(orbital_body_type) + orbital_body = new orbital_body_type() + orbital_body.link_to_z(src) diff --git a/code/modules/mapping/space_management/zlevel_manager.dm b/code/modules/mapping/space_management/zlevel_manager.dm index 6129c5fd2b6a2..c50a2e60e3e7d 100644 --- a/code/modules/mapping/space_management/zlevel_manager.dm +++ b/code/modules/mapping/space_management/zlevel_manager.dm @@ -13,17 +13,18 @@ for (var/I in 1 to default_map_traits.len) var/list/features = default_map_traits[I] - var/datum/space_level/S = new(I, features[DL_NAME], features[DL_TRAITS]) + //All default levels are assumed to be phobos at this stage, since there is only 1. + var/datum/space_level/S = new(I, features[DL_NAME], features[DL_TRAITS], orbital_body_type = /datum/orbital_object/z_linked/phobos) z_list += S -/datum/controller/subsystem/mapping/proc/add_new_zlevel(name, traits = list(), z_type = /datum/space_level) +/datum/controller/subsystem/mapping/proc/add_new_zlevel(name, traits = list(), z_type = /datum/space_level, orbital_body_type) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_Z, args) var/new_z = z_list.len + 1 if (world.maxz < new_z) world.incrementMaxZ() CHECK_TICK // TODO: sleep here if the Z level needs to be cleared - var/datum/space_level/S = new z_type(new_z, name, traits) + var/datum/space_level/S = new z_type(new_z, name, traits, orbital_body_type) z_list += S return S diff --git a/code/modules/mentor/follow.dm b/code/modules/mentor/follow.dm index 7c53c5c0fb571..e5ec5adc90166 100644 --- a/code/modules/mentor/follow.dm +++ b/code/modules/mentor/follow.dm @@ -7,7 +7,7 @@ return mentor_datum.following = M usr.reset_perspective(M) - verbs += /client/proc/mentor_unfollow + add_verb(/client/proc/mentor_unfollow) to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is now following [key_name(M)]") to_chat(usr, "Click the \"Stop Following\" button in the Mentor tab to stop following [key_name(M)].") log_mentor("[key_name(usr)] began following [key_name(M)]") @@ -20,7 +20,7 @@ if(!is_mentor()) return usr.reset_perspective() - verbs -= /client/proc/mentor_unfollow + remove_verb(/client/proc/mentor_unfollow) to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is no longer following [key_name(mentor_datum.following)]") log_mentor("[key_name(usr)] stopped following [key_name(mentor_datum.following)]") mentor_datum.following = null diff --git a/code/modules/mentor/mentor_verbs.dm b/code/modules/mentor/mentor_verbs.dm index f7faa873eee54..7b3e5dd1d1b3a 100644 --- a/code/modules/mentor/mentor_verbs.dm +++ b/code/modules/mentor/mentor_verbs.dm @@ -6,7 +6,9 @@ GLOBAL_PROTECT(mentor_verbs) /client/proc/add_mentor_verbs() if(mentor_datum) - verbs += GLOB.mentor_verbs + add_verb(GLOB.mentor_verbs) + reset_badges() /client/proc/remove_mentor_verbs() - verbs -= GLOB.mentor_verbs + remove_verb(GLOB.mentor_verbs) + reset_badges() diff --git a/code/modules/mentor/mentorhelp.dm b/code/modules/mentor/mentorhelp.dm index f6be4410795b7..b90c95adc0394 100644 --- a/code/modules/mentor/mentorhelp.dm +++ b/code/modules/mentor/mentorhelp.dm @@ -10,9 +10,9 @@ if(!msg) return //remove out mentorhelp verb temporarily to prevent spamming of mentors. - verbs -= /client/verb/mentorhelp + remove_verb(/client/verb/mentorhelp) spawn(300) - verbs += /client/verb/mentorhelp // 30 second cool-down for mentorhelp + add_verb(/client/verb/mentorhelp) // 30 second cool-down for mentorhelp msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN)) if(!msg) return @@ -39,7 +39,7 @@ else .["present"]++ -/proc/key_name_mentor(var/whom, var/include_link = null, var/include_name = 0, var/include_follow = 0, var/char_name_only = 0) +/proc/key_name_mentor(var/whom, var/include_link = null, var/include_name = 0, var/char_name_only = 0) var/mob/M var/client/C var/key @@ -96,7 +96,4 @@ else . += "*no key*" - if(include_follow) - . += " (F)" - return . diff --git a/code/modules/mentor/mentorpm.dm b/code/modules/mentor/mentorpm.dm index 891daa9fb68fb..b2aa9ce4c0602 100644 --- a/code/modules/mentor/mentorpm.dm +++ b/code/modules/mentor/mentorpm.dm @@ -1,3 +1,5 @@ +//This file was ported from hippie, used to be indented with spaces, and is the single worst corner of this codebase next to voice radio. For the love of god please rewrite this. + //shows a list of clients we could send PMs to, then forwards our choice to cmd_Mentor_pm /client/proc/cmd_mentor_pm_panel() set category = "Mentor" @@ -24,11 +26,13 @@ C = M.client else if(istext(whom)) C = GLOB.directory[whom] - else if(istype(whom,/client)) + else if(istype(whom, /client)) C = whom if(!C) - if(is_mentor()) to_chat(src, "Error: Mentor-PM: Client not found.") - else mentorhelp(msg) //Mentor we are replying to left. Mentorhelp instead(check below) + if(is_mentor()) + to_chat(src, "Error: Mentor-PM: Client not found.") + else + mentorhelp(msg) //Mentor we are replying to left. Mentorhelp instead(check below) return //get message text, limit it's length.and clean/escape html @@ -43,7 +47,7 @@ to_chat(src, "Error: Mentor-PM: Client not found.") else mentorhelp(msg) //Mentor we are replying to has vanished, Mentorhelp instead (how the fuck does this work?let's hope it works,shrug) - return + return // Neither party is a mentor, they shouldn't be PMing! if (!C.is_mentor() && !is_mentor()) @@ -59,21 +63,21 @@ var/show_char = CONFIG_GET(flag/mentors_mobname_only) if(C.is_mentor()) if(is_mentor())//both are mentors - to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]") - to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]") + to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0)]: [msg]") + to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0)]: [msg]") else //recipient is an mentor but sender is not - to_chat(C, "Reply PM from-[key_name_mentor(src, C, 1, 0, show_char)]: [msg]") - to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]") + to_chat(C, "Reply PM from-[key_name_mentor(src, C, 1, show_char)]: [msg]") + to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0)]: [msg]") else if(is_mentor()) //sender is an mentor but recipient is not. - to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]") - to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, show_char)]: [msg]") + to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0)]: [msg]") + to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, show_char)]: [msg]") //we don't use message_Mentors here because the sender/receiver might get it too var/show_char_sender = !is_mentor() && CONFIG_GET(flag/mentors_mobname_only) var/show_char_recip = !C.is_mentor() && CONFIG_GET(flag/mentors_mobname_only) for(var/client/X in GLOB.mentors | GLOB.admins) if(X.key!=key && X.key!=C.key) //check client/X is an Mentor and isn't the sender or recipient - to_chat(X, "Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]->[key_name_mentor(C, X, 0, 0, show_char_recip)]: [msg]") //inform X + to_chat(X, "Mentor PM: [key_name_mentor(src, X, 0, show_char_sender)]->[key_name_mentor(C, X, 0, 0, show_char_recip)]: [msg]") //inform X diff --git a/code/modules/mentor/mentorsay.dm b/code/modules/mentor/mentorsay.dm index 17e24b4f5a01a..1143f95994200 100644 --- a/code/modules/mentor/mentorsay.dm +++ b/code/modules/mentor/mentorsay.dm @@ -1,6 +1,6 @@ /client/proc/cmd_mentor_say(msg as text) set category = "Mentor" - set name = "Msay" //Gave this shit a shorter name so you only have to time out "msay" rather than "mentor say" to use it --NeoFite + set name = "Msay" //Gave this shit a shorter name so you only have to type out "msay" rather than "mentor say" to use it --NeoFite set hidden = 1 if(!is_mentor()) return diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index e083e838507e0..843cc4e76c76c 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -3,7 +3,6 @@ /obj/structure/closet/crate/secure/loot name = "abandoned crate" desc = "What could be inside?" - icon_state = "securecrate" integrity_failure = 0 //no breaking open the crate var/code = null var/lastattempt = null @@ -172,6 +171,7 @@ locked = FALSE cut_overlays() add_overlay("securecrateg") + add_overlay("[icon_door || icon_state]_door") //needs to put the door overlayer back cause of this snowflake code tamperproof = 0 // set explosion chance to zero, so we dont accidently hit it with a multitool and instantly die else if(!input || !sanitycheck || length(sanitised) != codelen) to_chat(user, "You leave the crate alone.") @@ -242,3 +242,9 @@ /obj/structure/closet/crate/secure/loot/deconstruct(disassembled = TRUE) boom() + +/obj/structure/closet/crate/secure/loot/emp_act(severity) + if(locked) + boom() + else + ..() \ No newline at end of file diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 9ad890dbe2049..c311a5c4747ac 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -21,7 +21,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/launch_warning = TRUE var/list/turrets = list() //List of connected turrets - req_one_access = list(ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_HEADS, ACCESS_RESEARCH) + req_one_access = list(ACCESS_AUX_BASE, ACCESS_HEADS) var/possible_destinations clockwork = TRUE circuit = /obj/item/circuitboard/computer/auxillary_base diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 02c54ffbd36e1..fb710abf7e388 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -1,22 +1,22 @@ //Aux base construction console -/mob/camera/aiEye/remote/base_construction +/mob/camera/ai_eye/remote/base_construction name = "construction holo-drone" move_on_shuttle = 1 //Allows any curious crew to watch the base after it leaves. (This is safe as the base cannot be modified once it leaves) icon = 'icons/obj/mining.dmi' icon_state = "construction_drone" var/area/starting_area -/mob/camera/aiEye/remote/base_construction/Initialize() +/mob/camera/ai_eye/remote/base_construction/Initialize() . = ..() starting_area = get_area(loc) -/mob/camera/aiEye/remote/base_construction/setLoc(var/t) +/mob/camera/ai_eye/remote/base_construction/setLoc(var/t) var/area/curr_area = get_area(t) if(curr_area == starting_area || istype(curr_area, /area/shuttle/auxillary_base)) return ..() //While players are only allowed to build in the base area, but consoles starting outside the base can move into the base area to begin work. -/mob/camera/aiEye/remote/base_construction/relaymove(mob/user, direct) +/mob/camera/ai_eye/remote/base_construction/relaymove(mob/user, direct) dir = direct //This camera eye is visible as a drone, and needs to keep the dir updated ..() @@ -74,7 +74,7 @@ spawn_spot = src - eyeobj = new /mob/camera/aiEye/remote/base_construction(get_turf(spawn_spot)) + eyeobj = new /mob/camera/ai_eye/remote/base_construction(get_turf(spawn_spot)) eyeobj.origin = src @@ -130,7 +130,7 @@ /datum/action/innate/aux_base //Parent aux base action icon_icon = 'icons/mob/actions/actions_construction.dmi' var/mob/living/C //Mob using the action - var/mob/camera/aiEye/remote/base_construction/remote_eye //Console's eye mob + var/mob/camera/ai_eye/remote/base_construction/remote_eye //Console's eye mob var/obj/machinery/computer/camera_advanced/base_construction/B //Console itself /datum/action/innate/aux_base/Activate() @@ -202,27 +202,27 @@ name = "Select Airlock Type" button_icon_state = "airlock_select" -datum/action/innate/aux_base/airlock_type/Activate() +/datum/action/innate/aux_base/airlock_type/Activate() if(..()) return B.RCD.change_airlock_setting() -datum/action/innate/aux_base/window_type +/datum/action/innate/aux_base/window_type name = "Select Window Type" button_icon_state = "window_select" -datum/action/innate/aux_base/window_type/Activate() +/datum/action/innate/aux_base/window_type/Activate() if(..()) return B.RCD.toggle_window_type() -datum/action/innate/aux_base/place_fan +/datum/action/innate/aux_base/place_fan name = "Place Tiny Fan" button_icon_state = "build_fan" -datum/action/innate/aux_base/place_fan/Activate() +/datum/action/innate/aux_base/place_fan/Activate() if(..()) return @@ -244,11 +244,11 @@ datum/action/innate/aux_base/place_fan/Activate() to_chat(owner, "Tiny fan placed. [B.fans_remaining] remaining.") playsound(fan_turf, 'sound/machines/click.ogg', 50, 1) -datum/action/innate/aux_base/install_turret +/datum/action/innate/aux_base/install_turret name = "Install Plasma Anti-Wildlife Turret" button_icon_state = "build_turret" -datum/action/innate/aux_base/install_turret/Activate() +/datum/action/innate/aux_base/install_turret/Activate() if(..()) return diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index bcd5f599848fe..21a6dd55abe50 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -10,9 +10,11 @@ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT heat_protection = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/explorer - armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50) + armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50, "stamina" = 20) 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/pickaxe) resistance_flags = FIRE_PROOF + high_pressure_multiplier = 0.4 + flags_inv = HIDEJUMPSUIT /obj/item/clothing/head/hooded/explorer name = "explorer hood" @@ -22,8 +24,9 @@ flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT - armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50) + armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50, "stamina" = 20) resistance_flags = FIRE_PROOF + high_pressure_multiplier = 0.4 /obj/item/clothing/suit/hooded/explorer/Initialize() . = ..() @@ -37,11 +40,12 @@ name = "explorer gas mask" desc = "A military-grade gas mask that can be connected to an air supply." icon_state = "gas_mining" + flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS visor_flags_inv = HIDEFACIALHAIR - visor_flags_cover = MASKCOVERSMOUTH + visor_flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH actions_types = list(/datum/action/item_action/adjust) - armor = list("melee" = 10, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 20, "acid" = 40) + armor = list("melee" = 10, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 20, "acid" = 40, "stamina" = 10) resistance_flags = FIRE_PROOF /obj/item/clothing/mask/gas/explorer/attack_self(mob/user) @@ -49,7 +53,7 @@ /obj/item/clothing/mask/gas/explorer/adjustmask(user) ..() - w_class = mask_adjusted ? WEIGHT_CLASS_NORMAL : WEIGHT_CLASS_SMALL + w_class = mask_adjusted ? WEIGHT_CLASS_SMALL : WEIGHT_CLASS_NORMAL /obj/item/clothing/mask/gas/explorer/folded/Initialize() . = ..() @@ -64,8 +68,9 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | LAVA_PROOF slowdown = 0 - armor = list("melee" = 70, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) + armor = list("melee" = 70, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "stamina" = 40) 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/pickaxe) + high_pressure_multiplier = 0.6 /obj/item/clothing/suit/space/hostile_environment/Initialize() . = ..() @@ -76,10 +81,10 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/clothing/suit/space/hostile_environment/process() +/obj/item/clothing/suit/space/hostile_environment/process(delta_time) var/mob/living/carbon/C = loc - if(istype(C) && prob(2)) //cursed by bubblegum - if(prob(15)) + if(istype(C) && DT_PROB(1, delta_time)) //cursed by bubblegum + if(DT_PROB(7.5, delta_time)) new /datum/hallucination/oh_yeah(C) to_chat(C, "[pick("I AM IMMORTAL.","I SHALL TAKE BACK WHAT'S MINE.","I SEE YOU.","YOU CANNOT ESCAPE ME FOREVER.","DEATH CANNOT HOLD ME.")]") else @@ -93,8 +98,9 @@ w_class = WEIGHT_CLASS_NORMAL max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT clothing_flags = THICKMATERIAL // no space protection - armor = list("melee" = 70, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) + armor = list("melee" = 70, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "stamina" = 40) resistance_flags = FIRE_PROOF | LAVA_PROOF + high_pressure_multiplier = 0.6 /obj/item/clothing/head/helmet/space/hostile_environment/Initialize() . = ..() diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index a8b870d6aa255..a87023de5e524 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -1,5 +1,5 @@ /*********************Mining Hammer****************/ -/obj/item/twohanded/kinetic_crusher +/obj/item/kinetic_crusher icon = 'icons/obj/mining.dmi' icon_state = "crusher" item_state = "crusher0" @@ -11,8 +11,6 @@ force = 0 //You can't hit stuff unless wielded w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK - force_unwielded = 20 //It's never not wielded so these are the same - force_wielded = 0 throwforce = 5 block_upgrade_walk = 1 throw_speed = 4 @@ -30,15 +28,16 @@ var/light_on = FALSE var/brightness_on = 5 -/obj/item/twohanded/kinetic_crusher/Initialize() +/obj/item/kinetic_crusher/ComponentInitialize() . = ..() AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it + AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20) -/obj/item/twohanded/kinetic_crusher/Destroy() +/obj/item/kinetic_crusher/Destroy() QDEL_LIST(trophies) return ..() -/obj/item/twohanded/kinetic_crusher/examine(mob/living/user) +/obj/item/kinetic_crusher/examine(mob/living/user) . = ..() to_chat(user, "Mark a large creature with the destabilizing force, then hit them in melee to do [force + detonation_damage] damage.") to_chat(user, "Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage].") @@ -46,7 +45,7 @@ var/obj/item/crusher_trophy/T = t to_chat(user, "It has \a [T] attached, which causes [T.effect_desc()].") -/obj/item/twohanded/kinetic_crusher/attackby(obj/item/I, mob/living/user) +/obj/item/kinetic_crusher/attackby(obj/item/I, mob/living/user) if(I.tool_behaviour == TOOL_CROWBAR) if(LAZYLEN(trophies)) to_chat(user, "You remove [src]'s trophies.") @@ -62,8 +61,8 @@ else return ..() -/obj/item/twohanded/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user) - if(!wielded) +/obj/item/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user) + if(!ISWIELDED(src)) to_chat(user, "[src] is too heavy to use with one hand. You fumble and drop everything.") user.drop_all_held_items() return @@ -79,9 +78,9 @@ if(!QDELETED(C) && !QDELETED(target)) C.total_damage += target_health - target.health //we did some damage, but let's not assume how much we did -/obj/item/twohanded/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams) +/obj/item/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams) . = ..() - if(!wielded) + if(!ISWIELDED(src)) return if(!proximity_flag && charged)//Mark a target, or mine a tile. var/turf/proj_turf = user.loc @@ -128,26 +127,27 @@ C.total_damage += detonation_damage L.apply_damage(detonation_damage, BRUTE, blocked = def_check) -/obj/item/twohanded/kinetic_crusher/proc/Recharge() +/obj/item/kinetic_crusher/proc/Recharge() if(!charged) charged = TRUE update_icon() playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) -/obj/item/twohanded/kinetic_crusher/ui_action_click(mob/user, actiontype) +/obj/item/kinetic_crusher/ui_action_click(mob/user, actiontype) light_on = !light_on playsound(user, 'sound/weapons/empty.ogg', 100, TRUE) update_brightness(user) update_icon() -/obj/item/twohanded/kinetic_crusher/proc/update_brightness(mob/user = null) +/obj/item/kinetic_crusher/proc/update_brightness(mob/user = null) if(light_on) set_light(brightness_on) else set_light(0) -/obj/item/twohanded/kinetic_crusher/update_icon() +/obj/item/kinetic_crusher/update_icon() ..() + var/wielded = ISWIELDED(src) cut_overlays() if(!charged) add_overlay("[icon_state]_uncharged") @@ -169,7 +169,7 @@ flag = "bomb" range = 6 log_override = TRUE - var/obj/item/twohanded/kinetic_crusher/hammer_synced + var/obj/item/kinetic_crusher/hammer_synced /obj/item/projectile/destabilizer/Destroy() hammer_synced = null @@ -201,19 +201,19 @@ var/denied_type = /obj/item/crusher_trophy /obj/item/crusher_trophy/examine(mob/living/user) - ..() - to_chat(user, "Causes [effect_desc()] when attached to a kinetic crusher.") + . = ..() + . += "Causes [effect_desc()] when attached to a kinetic crusher." /obj/item/crusher_trophy/proc/effect_desc() return "errors" /obj/item/crusher_trophy/attackby(obj/item/A, mob/living/user) - if(istype(A, /obj/item/twohanded/kinetic_crusher)) + if(istype(A, /obj/item/kinetic_crusher)) add_to(A, user) else ..() -/obj/item/crusher_trophy/proc/add_to(obj/item/twohanded/kinetic_crusher/H, mob/living/user) +/obj/item/crusher_trophy/proc/add_to(obj/item/kinetic_crusher/H, mob/living/user) for(var/t in H.trophies) var/obj/item/crusher_trophy/T = t if(istype(T, denied_type) || istype(src, T.denied_type)) @@ -225,7 +225,7 @@ to_chat(user, "You attach [src] to [H].") return TRUE -/obj/item/crusher_trophy/proc/remove_from(obj/item/twohanded/kinetic_crusher/H, mob/living/user) +/obj/item/crusher_trophy/proc/remove_from(obj/item/kinetic_crusher/H, mob/living/user) forceMove(get_turf(H)) H.trophies -= src return TRUE @@ -312,12 +312,12 @@ /obj/item/crusher_trophy/legion_skull/effect_desc() return "a kinetic crusher to recharge [bonus_value*0.1] second\s faster" -/obj/item/crusher_trophy/legion_skull/add_to(obj/item/twohanded/kinetic_crusher/H, mob/living/user) +/obj/item/crusher_trophy/legion_skull/add_to(obj/item/kinetic_crusher/H, mob/living/user) . = ..() if(.) H.charge_time -= bonus_value -/obj/item/crusher_trophy/legion_skull/remove_from(obj/item/twohanded/kinetic_crusher/H, mob/living/user) +/obj/item/crusher_trophy/legion_skull/remove_from(obj/item/kinetic_crusher/H, mob/living/user) . = ..() if(.) H.charge_time += bonus_value @@ -370,21 +370,19 @@ /obj/item/crusher_trophy/demon_claws/effect_desc() return "melee hits to do [bonus_value * 0.2] more damage and heal you for [bonus_value * 0.1], with 5X effect on mark detonation" -/obj/item/crusher_trophy/demon_claws/add_to(obj/item/twohanded/kinetic_crusher/H, mob/living/user) +/obj/item/crusher_trophy/demon_claws/add_to(obj/item/kinetic_crusher/H, mob/living/user) . = ..() if(.) H.force += bonus_value * 0.2 - H.force_unwielded += bonus_value * 0.2 - H.force_wielded += bonus_value * 0.2 H.detonation_damage += bonus_value * 0.8 + AddComponent(/datum/component/two_handed, force_wielded=(20 + bonus_value * 0.2)) -/obj/item/crusher_trophy/demon_claws/remove_from(obj/item/twohanded/kinetic_crusher/H, mob/living/user) +/obj/item/crusher_trophy/demon_claws/remove_from(obj/item/kinetic_crusher/H, mob/living/user) . = ..() if(.) H.force -= bonus_value * 0.2 - H.force_unwielded -= bonus_value * 0.2 - H.force_wielded -= bonus_value * 0.2 H.detonation_damage -= bonus_value * 0.8 + AddComponent(/datum/component/two_handed, force_wielded=20) /obj/item/crusher_trophy/demon_claws/on_melee_hit(mob/living/target, mob/living/user) user.heal_ordered_damage(bonus_value * 0.1, damage_heal_order) diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index f4d1afd8b7306..a687b1b46e4f9 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -37,8 +37,8 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( /obj/item/stack/marker_beacon/examine(mob/user) . = ..() - . += {"Use in-hand to place a [singular_name].\n - Alt-click to select a color. Current color is [picked_color]."} + . += "Use in-hand to place a [singular_name].\n"+\ + "Alt-click to select a color. Current color is [picked_color]." /obj/item/stack/marker_beacon/update_icon() icon_state = "marker[lowertext(picked_color)]" @@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( icon = 'icons/obj/lighting.dmi' icon_state = "markerrandom" layer = BELOW_OPEN_DOOR_LAYER - armor = list("melee" = 50, "bullet" = 75, "laser" = 75, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 25, "acid" = 0) + armor = list("melee" = 50, "bullet" = 75, "laser" = 75, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 25, "acid" = 0, "stamina" = 0) max_integrity = 50 anchored = TRUE light_range = 2 @@ -135,7 +135,6 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( return ..() /obj/structure/marker_beacon/AltClick(mob/living/user) - ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) return var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index dadbdf2af3f69..46cf736273934 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -24,10 +24,12 @@ /obj/item/mining_scanner/admin /obj/item/mining_scanner/admin/attack_self(mob/user) - for(var/turf/closed/mineral/M in world) - if(M.scan_state) - M.icon_state = M.scan_state - qdel(src) + for(var/area/A as() in get_areas(/area, user.z)) + for(var/turf/closed/mineral/M in A) + if(M.scan_state) + var/obj/effect/temp_visual/mining_overlay/C = new /obj/effect/temp_visual/mining_overlay(M) + C.icon_state = M.scan_state + //qdel(src) /obj/item/t_scanner/adv_mining_scanner desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. This one has an extended range." @@ -61,17 +63,54 @@ mineral_scan_pulse(t, range) /proc/mineral_scan_pulse(turf/T, range = world.view) - var/list/minerals = list() - for(var/turf/closed/mineral/M in range(range, T)) - if(M.scan_state) - minerals += M - if(LAZYLEN(minerals)) - for(var/turf/closed/mineral/M in minerals) - var/obj/effect/temp_visual/mining_overlay/oldC = locate(/obj/effect/temp_visual/mining_overlay) in M - if(oldC) - qdel(oldC) - var/obj/effect/temp_visual/mining_overlay/C = new /obj/effect/temp_visual/mining_overlay(M) - C.icon_state = M.scan_state + var/list/parsedrange = getviewsize(range) + var/xrange = (parsedrange[1] - 1) / 2 + var/yrange = (parsedrange[2] - 1) / 2 + var/cx = T.x + var/cy = T.y + for(var/r in 1 to max(xrange, yrange)) + var/xr = min(xrange, r) + var/yr = min(yrange, r) + var/turf/TL = locate(cx - xr, cy + yr, T.z) + var/turf/BL = locate(cx - xr, cy - yr, T.z) + var/turf/TR = locate(cx + xr, cy + yr, T.z) + var/turf/BR = locate(cx + xr, cy - yr, T.z) + var/list/turfs = list() + turfs += block(TL, TR) + turfs += block(TL, BL) + turfs |= block(BL, BR) + turfs |= block(BR, TR) + for(var/turf/closed/mineral/M in turfs) + new /obj/effect/temp_visual/mining_scanner(M) + if(M.scan_state) + var/obj/effect/temp_visual/mining_overlay/oldC = locate(/obj/effect/temp_visual/mining_overlay) in M + if(oldC) + qdel(oldC) + var/obj/effect/temp_visual/mining_overlay/C = new /obj/effect/temp_visual/mining_overlay(M) + C.icon_state = M.scan_state + sleep(1) + +/proc/pulse_effect(turf/T, range = world.view) + var/list/parsedrange = getviewsize(range) + var/xrange = (parsedrange[1] - 1) / 2 + var/yrange = (parsedrange[2] - 1) / 2 + var/cx = T.x + var/cy = T.y + for(var/r in 1 to max(xrange, yrange)) + var/xr = min(xrange, r) + var/yr = min(yrange, r) + var/turf/TL = locate(cx - xr, cy + yr, T.z) + var/turf/BL = locate(cx - xr, cy - yr, T.z) + var/turf/TR = locate(cx + xr, cy + yr, T.z) + var/turf/BR = locate(cx + xr, cy - yr, T.z) + var/list/turfs = list() + turfs += block(TL, TR) + turfs += block(TL, BL) + turfs |= block(BL, BR) + turfs |= block(BR, TR) + for(var/turf/M in turfs) + new /obj/effect/temp_visual/mining_scanner(M) + sleep(1) /obj/effect/temp_visual/mining_overlay plane = FULLSCREEN_PLANE @@ -85,3 +124,18 @@ /obj/effect/temp_visual/mining_overlay/Initialize() . = ..() animate(src, alpha = 0, time = duration, easing = EASE_IN) + +/obj/effect/temp_visual/mining_scanner + plane = FULLSCREEN_PLANE + layer = FLASH_LAYER + icon = 'icons/effects/mining_scanner.dmi' + appearance_flags = 0 + pixel_x = -224 + pixel_y = -224 + duration = 3 + alpha = 100 + icon_state = "mining_scan" + +/obj/effect/temp_visual/mining_scanner/Initialize() + . = ..() + animate(src, alpha = 0, time = duration, easing = EASE_IN) diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index a14b17c0ba57b..1f6cd4d11221e 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -12,9 +12,12 @@ if(!istype(C, /obj/item/organ/regenerative_core)) to_chat(user, "The stabilizer only works on certain types of monster organs, generally regenerative in nature.") return ..() + if(C.preserved) + to_chat(user, "[M] is already stabilised.") + return C.preserved() - to_chat(user, "You inject the [M] with the stabilizer. It will no longer go inert.") + to_chat(user, "You inject [M] with the stabilizer. It will no longer go inert.") qdel(src) /************************Hivelord core*******************/ diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 5c68cdbcfb7a4..df2d72d1dc51b 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -5,7 +5,7 @@ dynamic_lighting = DYNAMIC_LIGHTING_FORCED requires_power = FALSE has_gravity = STANDARD_GRAVITY - valid_territory = FALSE + area_flags = BLOBS_ALLOWED | UNIQUE_AREA //Survival Capsule /obj/item/survivalcapsule @@ -33,8 +33,9 @@ /obj/item/survivalcapsule/examine(mob/user) . = ..() get_template() - . += "This capsule has the [template.name] stored." - . += template.description + if(template) + . += "This capsule has the [template.name] stored." + . += template.description /obj/item/survivalcapsule/attack_self() //Can't grab when capsule is New() because templates aren't loaded then @@ -91,14 +92,14 @@ icon_state = "capsulemed" icon = 'icons/obj/mining.dmi' template_id = "shelter_echo" - + /obj/item/survivalcapsule/space name = "space shelter capsule" desc = "A spaceworthy shelter designed for emergencies/construction in a bluespace capsule." icon_state = "capsuleeng" icon = 'icons/obj/mining.dmi' template_id = "shelter_eta" - + /obj/item/survivalcapsule/barricade name = "barricade capsule" desc = "A 3x3 glass barricade designed for security use with energy weapons." @@ -143,6 +144,7 @@ icon = 'icons/obj/doors/airlocks/survival/survival.dmi' overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_pod + anim_parts = "topbolts=0,6,0,3;bottombolts=0,-6,3,-6;top=0,4,0,2;bottom=0,-4,0,2;rightbolts=14,0,1.5,5;left=-15,0,1.5,5;right=14,0,1.5,5" /obj/machinery/door/airlock/survival_pod/glass opacity = FALSE @@ -349,7 +351,7 @@ /obj/item/energy_katana, /obj/item/hierophant_club, /obj/item/his_grace, - /obj/item/gun/ballistic/minigun, + /obj/item/gun/energy/minigun, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/gun/magic/staff/chaos, /obj/item/gun/magic/staff/spellblade, diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 1d769fa83cf34..07bd5b7d09443 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -58,7 +58,7 @@ var/mob/M = loc if(istype(M)) var/triggered = FALSE - if(M.get_item_by_slot(SLOT_BELT) == src) + if(M.get_item_by_slot(ITEM_SLOT_BELT) == src) if(power == 1) triggered = TRUE else if(power == 2 && prob(50)) @@ -70,7 +70,7 @@ activate(M) /obj/item/wormhole_jaunter/proc/chasm_react(mob/user) - if(user.get_item_by_slot(SLOT_BELT) == src) + if(user.get_item_by_slot(ITEM_SLOT_BELT) == src) to_chat(user, "Your [name] activates, saving you from the chasm!") SSblackbox.record_feedback("tally", "jaunter", 1, "Chasm") // chasm automatic activation activate(user, FALSE) diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index bbba80d85a2b2..bf33eecde43ef 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) if(isliving(A)) var/mob/living/M = A M.Paralyze(320) // Keep them from moving during the duration of the extraction - M.buckled = 0 // Unbuckle them to prevent anchoring problems + M.buckled?.unbuckle_mob(M, TRUE) // Unbuckle them to prevent anchoring problems else A.anchored = TRUE A.density = FALSE @@ -112,9 +112,9 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) L.SetSleeping(0) sleep(30) var/list/flooring_near_beacon = list() - for(var/turf/open/floor in orange(1, beacon)) + for(var/turf/open/floor in (RANGE_TURFS(1, beacon)-get_turf(beacon))) flooring_near_beacon += floor - holder_obj.forceMove(pick(flooring_near_beacon)) + do_teleport(holder_obj, pick(flooring_near_beacon), no_effects = TRUE, channel = TELEPORT_CHANNEL_FREE) animate(holder_obj, pixel_z = 10, time = 50) sleep(50) animate(holder_obj, pixel_z = 15, time = 10) @@ -169,7 +169,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/effect/extraction_holder name = "extraction holder" - desc = "you shouldnt see this" + desc = "you shouldn't see this" var/atom/movable/stored_obj /obj/item/extraction_pack/proc/check_for_living_mobs(atom/A) diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index dbe607f42fa35..c4ceb4d51a795 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -1,4 +1,4 @@ -/obj/machinery/computer/shuttle/labor +/obj/machinery/computer/shuttle_flight/labor name = "labor shuttle console" desc = "Used to call and send the labor camp shuttle." circuit = /obj/item/circuitboard/computer/labor_shuttle @@ -7,21 +7,9 @@ req_access = list(ACCESS_BRIG) -/obj/machinery/computer/shuttle/labor/one_way +/obj/machinery/computer/shuttle_flight/labor/one_way name = "prisoner shuttle console" desc = "A one-way shuttle console, used to summon the shuttle to the labor camp." - possible_destinations = "laborcamp_away" + recall_docking_port_id = "laborcamp_away" circuit = /obj/item/circuitboard/computer/labor_shuttle/one_way req_access = list( ) - -/obj/machinery/computer/shuttle/labor/one_way/Topic(href, href_list) - if(href_list["move"]) - var/obj/docking_port/mobile/M = SSshuttle.getShuttle("laborcamp") - if(!M) - to_chat(usr, "Cannot locate shuttle!") - return 0 - var/obj/docking_port/stationary/S = M.get_docked() - if(S && S.name == "laborcamp_away") - to_chat(usr, "Shuttle is already at the outpost!") - return 0 - ..() \ No newline at end of file diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index d179ab9a94373..250f35d82e5ce 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -18,9 +18,12 @@ GLOBAL_LIST(labor_sheet_values) /obj/machinery/mineral/labor_claim_console/Initialize() . = ..() - Radio = new/obj/item/radio(src) + Radio = new /obj/item/radio(src) Radio.listening = FALSE locate_stacking_machine() + //If we can't find a stacking machine end it all ok? + if(!stacking_machine) + return INITIALIZE_HINT_QDEL if(!GLOB.labor_sheet_values) var/sheet_list = list() @@ -31,6 +34,13 @@ GLOBAL_LIST(labor_sheet_values) sheet_list += list(list("ore" = initial(sheet.name), "value" = initial(sheet.point_value))) GLOB.labor_sheet_values = sortList(sheet_list, /proc/cmp_sheet_list) +/obj/machinery/mineral/labor_claim_console/Destroy() + QDEL_NULL(Radio) + if(stacking_machine) + stacking_machine.console = null + stacking_machine = null + return ..() + /proc/cmp_sheet_list(list/a, list/b) return a["value"] - b["value"] @@ -43,6 +53,7 @@ GLOBAL_LIST(labor_sheet_values) if(!ui) ui = new(user, src, "LaborClaimConsole") ui.open() + ui.set_autoupdate(TRUE) /obj/machinery/mineral/labor_claim_console/ui_static_data(mob/user) var/list/data = list() @@ -114,9 +125,7 @@ GLOBAL_LIST(labor_sheet_values) /obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine() stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) if(stacking_machine) - stacking_machine.CONSOLE = src - else - qdel(src) + stacking_machine.console = src /obj/machinery/mineral/labor_claim_console/emag_act(mob/user) if(!(obj_flags & EMAGGED)) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 8be7ce7ee3bed..85bb74c97f57c 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -18,6 +18,7 @@ var/harvest_message_low = "You pick a mushroom, but fail to collect many shavings from its cap." var/harvest_message_med = "You pick a mushroom, carefully collecting the shavings from its cap." var/harvest_message_high = "You harvest and collect shavings from several mushroom caps." + var/destroy_on_harvest = FALSE var/harvested = FALSE var/base_icon var/regrowth_time_low = 8 MINUTES @@ -44,6 +45,8 @@ for(var/i in 1 to rand_harvested) new harvest(get_turf(src)) + if(destroy_on_harvest) + Destroy() icon_state = "[base_icon]p" name = harvested_name desc = harvested_desc @@ -58,7 +61,7 @@ harvested = FALSE /obj/structure/flora/ash/attackby(obj/item/W, mob/user, params) - if(!harvested && needs_sharp_harvest && W.sharpness) + if(!harvested && needs_sharp_harvest && W.is_sharp()) user.visible_message("[user] starts to harvest from [src] with [W].","You begin to harvest from [src] with [W].") if(do_after(user, harvest_time, target = src)) harvest(user) @@ -141,6 +144,21 @@ regrowth_time_low = 4800 regrowth_time_high = 7200 + +/obj/structure/flora/ash/strange + icon_state = "xpod" + name = "strange plant" + desc = "An alient plant born under warming glow of space radiation. What mysteries does it hold? Botanist should know." + harvest = /obj/item/reagent_containers/food/snacks/grown/random + needs_sharp_harvest = FALSE + harvest_amount_high = 2 + harvest_time = 10 + harvest_message_low = "You bravely pick a strange plant." + harvest_message_high = "You bravely pick a pair of strange plant." + light_range = 1.5 + light_power = 2.1 + destroy_on_harvest = TRUE + /obj/structure/flora/ash/cacti/Initialize(mapload) . = ..() // min dmg 3, max dmg 6, prob(70) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index b55eb29de51ad..7066e45779616 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1,60 +1,59 @@ //The chests dropped by mob spawner tendrils. Also contains associated loot. -#define HIEROPHANT_CLUB_CARDINAL_DAMAGE 30 +#define HIEROPHANT_CLUB_CARDINAL_DAMAGE 15 /obj/structure/closet/crate/necropolis name = "necropolis chest" desc = "It's watching you closely." - icon_state = "necrocrate" + icon_state = "necro_crate" resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF + door_anim_time = 0 /obj/structure/closet/crate/necropolis/tendril desc = "It's watching you suspiciously." + ///prevents bust_open to fire + integrity_failure = 0 + /// var to check if it got opened by a key + var/spawned_loot = FALSE -/obj/structure/closet/crate/necropolis/tendril/PopulateContents() - var/loot = rand(1,30) +/obj/structure/closet/crate/necropolis/tendril/Initialize() + . = ..() + RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/try_spawn_loot) + +/obj/structure/closet/crate/necropolis/tendril/proc/try_spawn_loot(datum/source, obj/item/item, mob/user, params) ///proc that handles key checking and generating loot + SIGNAL_HANDLER + + if(!istype(item, /obj/item/skeleton_key) || spawned_loot) + return FALSE + var/loot = rand(1,25) switch(loot) - if(1) - new /obj/item/shared_storage/red(src) - if(2) - new /obj/item/clothing/suit/space/hardsuit/cult(src) - if(3) - new /obj/item/soulstone/anybody(src) - if(4) - new /obj/item/katana/cursed(src) - if(5) - new /obj/item/clothing/glasses/godeye(src) - if(6) - new /obj/item/reagent_containers/glass/bottle/potion/flight(src) - if(7) - new /obj/item/pickaxe/diamond(src) - if(8) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) - else - new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) + if(1 to 2) + new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) //Doubled chance to receive upgrade disk that is directly relevant to mining + if(3 to 4) + new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) + if(5 to 6) + new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) + if(7 to 8) + new /obj/item/disk/design_disk/modkit_disc/bounty(src) if(9) - new /obj/item/rod_of_asclepius(src) + new /obj/item/borg/upgrade/modkit/lifesteal(src) if(10) - new /obj/item/organ/heart/cursed/wizard(src) + new /obj/item/shared_storage/red(src) if(11) - new /obj/item/ship_in_a_bottle(src) + new /obj/item/clothing/glasses/godeye(src) if(12) - new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker(src) + new /obj/item/reagent_containers/glass/bottle/potion/flight(src) if(13) - new /obj/item/jacobs_ladder(src) + new /obj/item/pickaxe/diamond(src) //Ashwalkers exist. This is actually a great drop for them if(14) - new /obj/item/nullrod/scythe/talking(src) + new /obj/item/rod_of_asclepius(src) if(15) - new /obj/item/nullrod/armblade(src) + new /obj/item/organ/heart/cursed/wizard(src) if(16) - new /obj/item/guardiancreator/hive(src) + new /obj/item/ship_in_a_bottle(src) if(17) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) - else - new /obj/item/disk/design_disk/modkit_disc/bounty(src) + new /obj/item/jacobs_ladder(src) if(18) new /obj/item/warp_cube/red(src) if(19) @@ -64,25 +63,28 @@ if(21) new /obj/item/gun/magic/hook(src) if(22) - new /obj/item/voodoo(src) - if(23) - new /obj/item/grenade/clusterbuster/inferno(src) - if(24) - new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) - new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor(src) - if(25) - new /obj/item/book/granter/spell/summonitem(src) - if(26) new /obj/item/book_of_babel(src) - if(27) - new /obj/item/borg/upgrade/modkit/lifesteal(src) - new /obj/item/bedsheet/cult(src) - if(28) + if(23) new /obj/item/clothing/neck/necklace/memento_mori(src) - if(29) + if(24) new /obj/item/reagent_containers/glass/waterbottle/relic(src) - if(30) + if(25) new /obj/item/reagent_containers/glass/bottle/necropolis_seed(src) + spawned_loot = TRUE + qdel(item) + to_chat(user, "You disable the magic lock, revealing the loot.") + return TRUE + +/obj/structure/closet/crate/necropolis/tendril/can_open(mob/living/user, force = FALSE) + if(!spawned_loot) + return FALSE + return ..() + +/obj/structure/closet/crate/necropolis/tendril/examine(mob/user) + . = ..() + if(!spawned_loot) + . += "You need a skeleton key to open it." + //KA modkit design discs /obj/item/disk/design_disk/modkit_disc @@ -216,7 +218,7 @@ var/mob/living/carbon/human/active_owner /obj/item/clothing/neck/necklace/memento_mori/item_action_slot_check(slot) - return slot == SLOT_NECK + return slot == ITEM_SLOT_NECK /obj/item/clothing/neck/necklace/memento_mori/dropped(mob/user) ..() @@ -329,6 +331,8 @@ to_chat(orbits.parent, "Your vision returns to normal.") /obj/effect/wisp/proc/update_user_sight(mob/user) + SIGNAL_HANDLER + user.sight |= sight_flags if(!isnull(lighting_alpha)) user.lighting_alpha = min(user.lighting_alpha, lighting_alpha) @@ -357,15 +361,26 @@ var/obj/item/warp_cube/linked var/teleporting = FALSE +/obj/item/warp_cube/Destroy() + if(!QDELETED(linked)) + qdel(linked) + linked = null + return ..() + /obj/item/warp_cube/attack_self(mob/user) if(!linked) to_chat(user, "[src] fizzles uselessly.") return if(teleporting) return + var/turf/T = get_turf(src) + var/area/A1 = get_area(T) + var/area/A2 = get_area(linked) + if(A1.teleport_restriction || A2.teleport_restriction) + to_chat(user, "[src] fizzles gently as it fails to breach the bluespace veil.") + return teleporting = TRUE linked.teleporting = TRUE - var/turf/T = get_turf(src) new /obj/effect/temp_visual/warp_cube(T, user, teleport_color, TRUE) SSblackbox.record_feedback("tally", "warp_cube", 1, type) new /obj/effect/temp_visual/warp_cube(get_turf(linked), user, linked.teleport_color, FALSE) @@ -379,7 +394,7 @@ user.forceMove(get_turf(link_holder)) qdel(link_holder) return - link_holder.forceMove(get_turf(linked)) + do_teleport(link_holder, get_turf(linked), no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC) sleep(2.5) if(QDELETED(user)) qdel(link_holder) @@ -421,8 +436,8 @@ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' fire_sound = 'sound/weapons/batonextend.ogg' max_charges = 1 - item_flags = NEEDS_PERMIT | NOBLUDGEON - force = 18 + item_flags = NEEDS_PERMIT + force = 15 attack_weight = 2 /obj/item/ammo_casing/magic/hook @@ -437,11 +452,11 @@ icon_state = "hook" icon = 'icons/obj/lavaland/artefacts.dmi' pass_flags = PASSTABLE - damage = 25 + damage = 10 armour_penetration = 100 damage_type = BRUTE hitsound = 'sound/effects/splat.ogg' - paralyze = 30 + knockdown = 30 var/chain /obj/item/projectile/hook/fire(setAngle) @@ -692,13 +707,31 @@ ///Bosses +//Legion + +/obj/structure/closet/crate/necropolis/legion + name = "legion chest" + +/obj/structure/closet/crate/necropolis/legion/PopulateContents() + var/list/choices = subtypesof(/obj/machinery/anomalous_crystal) + var/random_crystal = pick(choices) + new random_crystal(src) + new /obj/effect/spawner/lootdrop/megafaunaore(src) + //Miniboss Miner +/obj/structure/closet/crate/necropolis/bdm + name = "blood-drunk miner chest" + +/obj/structure/closet/crate/necropolis/bdm/PopulateContents() + new /obj/item/melee/transforming/cleaving_saw(src) + new /obj/effect/spawner/lootdrop/megafaunaore(src) + /obj/item/melee/transforming/cleaving_saw name = "cleaving saw" desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force." - force = 12 - force_on = 20 //force when active + force = 8 + force_on = 15 //force when active throwforce = 20 throwforce_on = 20 icon = 'icons/obj/lavaland/artefacts.dmi' @@ -716,16 +749,16 @@ block_upgrade_walk = 1 w_class = WEIGHT_CLASS_BULKY sharpness = IS_SHARP - faction_bonus_force = 30 + faction_bonus_force = 45 nemesis_factions = list("mining", "boss") var/transform_cooldown var/swiping = FALSE /obj/item/melee/transforming/cleaving_saw/examine(mob/user) . = ..() - . += {"It is [active ? "open, will cleave enemies in a wide arc and deal additional damage to fauna":"closed, and can be used for rapid consecutive attacks that cause fauna to bleed"].\n - Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.\n - Transforming it immediately after an attack causes the next attack to come out faster."} + . += "It is [active ? "open, will cleave enemies in a wide arc and deal additional damage to fauna":"closed, and can be used for rapid consecutive attacks that cause fauna to bleed"].\n"+\ + "Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.\n"+\ + "Transforming it immediately after an attack causes the next attack to come out faster." /obj/item/melee/transforming/cleaving_saw/suicide_act(mob/user) user.visible_message("[user] is [active ? "closing [src] on [user.p_their()] neck" : "opening [src] into [user.p_their()] chest"]! It looks like [user.p_theyre()] trying to commit suicide!") @@ -792,24 +825,10 @@ name = "dragon chest" /obj/structure/closet/crate/necropolis/dragon/PopulateContents() - var/loot = rand(1,4) - switch(loot) - if(1) - new /obj/item/melee/ghost_sword(src) - if(2) - new /obj/item/lava_staff(src) - if(3) - new /obj/item/book/granter/spell/sacredflame(src) - new /obj/item/gun/magic/wand/fireball(src) - if(4) - new /obj/item/dragons_blood(src) + new /obj/effect/spawner/lootdrop/megafaunaore(src) + new /obj/item/dragons_blood(src) -/obj/structure/closet/crate/necropolis/dragon/crusher - name = "firey dragon chest" - -/obj/structure/closet/crate/necropolis/dragon/crusher/PopulateContents() - ..() - new /obj/item/crusher_trophy/tail_spike(src) +// Ghost Sword - left in for other references and admin shenanigans /obj/item/melee/ghost_sword name = "\improper spectral blade" @@ -919,7 +938,7 @@ return var/mob/living/carbon/human/H = user - var/random = rand(1,4) + var/random = rand(1,3) switch(random) if(1) @@ -931,11 +950,6 @@ to_chat(user, "Your flesh begins to melt! Miraculously, you seem fine otherwise.") H.set_species(/datum/species/skeleton) if(3) - to_chat(user, "Power courses through you! You can now shift your form at will.") - if(user.mind) - var/obj/effect/proc_holder/spell/targeted/shapeshift/dragon/D = new - user.mind.AddSpell(D) - if(4) to_chat(user, "You feel like you could walk straight through lava now.") H.weather_immunities |= "lava" @@ -949,7 +963,7 @@ agent = "dragon's blood" desc = "What do dragons have to do with Space Station 13?" stage_prob = 20 - severity = DISEASE_SEVERITY_BIOHAZARD + danger = DISEASE_BIOHAZARD visibility_flags = 0 stage1 = list("Your bones ache.") stage2 = list("Your skin feels scaly.") @@ -993,7 +1007,7 @@ if(is_type_in_typecache(target, banned_turfs)) return - if(target in view(user.client.view, get_turf(user))) + if(user in viewers(user.client.view, get_turf(target))) var/turf/open/T = get_turf(target) if(!istype(T)) @@ -1033,21 +1047,7 @@ /obj/structure/closet/crate/necropolis/bubblegum/PopulateContents() new /obj/item/clothing/suit/space/hostile_environment(src) new /obj/item/clothing/head/helmet/space/hostile_environment(src) - var/loot = rand(1,3) - switch(loot) - if(1) - new /obj/item/mayhem(src) - if(2) - new /obj/item/blood_contract(src) - if(3) - new /obj/item/gun/magic/staff/spellblade(src) - -/obj/structure/closet/crate/necropolis/bubblegum/crusher - name = "bloody bubblegum chest" - -/obj/structure/closet/crate/necropolis/bubblegum/crusher/PopulateContents() - ..() - new /obj/item/crusher_trophy/demon_claws(src) + new /obj/effect/spawner/lootdrop/megafaunaore(src) /obj/item/mayhem name = "mayhem in a bottle" @@ -1119,19 +1119,19 @@ return ..() /obj/structure/closet/crate/necropolis/colossus/PopulateContents() - var/list/choices = subtypesof(/obj/machinery/anomalous_crystal) - var/random_crystal = pick(choices) - new random_crystal(src) new /obj/item/organ/vocal_cords/colossus(src) + new /obj/effect/spawner/lootdrop/megafaunaore(src) -/obj/structure/closet/crate/necropolis/colossus/crusher - name = "angelic colossus chest" - -/obj/structure/closet/crate/necropolis/colossus/crusher/PopulateContents() - ..() - new /obj/item/crusher_trophy/blaster_tubes(src) //Hierophant + +/obj/structure/closet/crate/necropolis/hierophant + name = "hierophant chest" + +/obj/structure/closet/crate/necropolis/hierophant/PopulateContents() + new /obj/item/hierophant_club(src) + new /obj/effect/spawner/lootdrop/megafaunaore(src) + /obj/item/hierophant_club name = "hierophant club" desc = "The strange technology of this large club allows various nigh-magical feats. It used to beat you, but now you can set the beat." @@ -1144,7 +1144,7 @@ inhand_y_dimension = 64 slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY - force = 15 + force = 5 //Melee attacks also invoke a 15 burn damage AoE, for a total of 20 damage attack_verb = list("clubbed", "beat", "pummeled") hitsound = 'sound/weapons/sonic_jackhammer.ogg' actions_types = list(/datum/action/item_action/vortex_recall, /datum/action/item_action/toggle_unfriendly_fire) @@ -1171,7 +1171,7 @@ for(var/obj/item/I in user) if(I != src) user.dropItemToGround(I) - for(var/turf/T in RANGE_TURFS(1, user)) + for(var/turf/T as() in RANGE_TURFS(1, user)) var/obj/effect/temp_visual/hierophant/blast/B = new(T, user, TRUE) B.damage = 0 user.dropItemToGround(src) //Drop us last, so it goes on top of their stuff @@ -1191,12 +1191,12 @@ if(ismineralturf(target) && get_dist(user, target) < 6) //target is minerals, we can hit it(even if we can't see it) INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) timer = world.time + cooldown_time - else if(target in view(5, get_turf(user))) //if the target is in view, hit it + else if(user in viewers(5, get_turf(target))) //if the target is in view, hit it timer = world.time + cooldown_time if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one! chaser_timer = world.time + chaser_cooldown var/obj/effect/temp_visual/hierophant/chaser/C = new(get_turf(user), user, target, chaser_speed, friendly_fire_check) - C.damage = 30 + C.damage = 15 C.monster_damage_boost = FALSE log_combat(user, target, "fired a chaser at", src) else @@ -1316,13 +1316,13 @@ user.log_message("teleported self from [AREACOORD(source)] to [beacon]", LOG_GAME) new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user) new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user) - for(var/t in RANGE_TURFS(1, T)) + for(var/turf/t as() in RANGE_TURFS(1, T)) var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies B.damage = 30 - for(var/t in RANGE_TURFS(1, source)) + for(var/turf/t as() in RANGE_TURFS(1, source)) var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies B.damage = 30 - for(var/mob/living/L in range(1, source)) + for(var/mob/living/L in hearers(1, source)) INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along sleep(6) //at this point the blasts detonate if(beacon) @@ -1350,7 +1350,7 @@ sleep(2) if(!M) return - M.forceMove(turf_to_teleport_to) + do_teleport(M, turf_to_teleport_to, no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC) sleep(1) if(!M) return @@ -1399,17 +1399,27 @@ var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check) B.damage = 15 //keeps monster damage boost due to lower damage - //Just some minor stuff /obj/structure/closet/crate/necropolis/puzzle name = "puzzling chest" /obj/structure/closet/crate/necropolis/puzzle/PopulateContents() - var/loot = rand(1,3) + var/loot = rand(1,5) switch(loot) if(1) - new /obj/item/soulstone/anybody(src) + new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) if(2) - new /obj/item/wisp_lantern(src) + new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) if(3) - new /obj/item/prisoncube(src) + new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) + if(4) + new /obj/item/disk/design_disk/modkit_disc/bounty(src) + if(5) + new /obj/item/borg/upgrade/modkit/lifesteal(src) + +/obj/item/skeleton_key + name = "skeleton key" + desc = "An artifact usually found in the hands of the natives of lavaland, which NT now holds a monopoly on." + icon = 'icons/obj/lavaland/artefacts.dmi' + icon_state = "skeleton_key" + w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/mining/lavaland/ruins/gym.dm b/code/modules/mining/lavaland/ruins/gym.dm index d9cdf70ced234..d3a09764b8235 100644 --- a/code/modules/mining/lavaland/ruins/gym.dm +++ b/code/modules/mining/lavaland/ruins/gym.dm @@ -33,6 +33,9 @@ . = ..() if(.) return + if(!Adjacent(user)) + to_chat(user, "You're too far away to get swole!") + return if(obj_flags & IN_USE) to_chat(user, "It's already in use - wait a bit.") return @@ -51,10 +54,10 @@ user.pixel_y = 0 var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!") - + if (user.client) SSmedals.UnlockMedal(MEDAL_USE_WEIGHT_MACHINE,user.client) - + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise) icon_state = initial(icon_state) diff --git a/code/modules/mining/machine_bluespaceminer.dm b/code/modules/mining/machine_bluespaceminer.dm deleted file mode 100644 index 226e66bdf9907..0000000000000 --- a/code/modules/mining/machine_bluespaceminer.dm +++ /dev/null @@ -1,40 +0,0 @@ -/obj/machinery/mineral/bluespace_miner - name = "bluespace mining machine" - desc = "A machine that uses the magic of Bluespace to slowly generate materials and add them to a linked ore silo." - icon = 'icons/obj/machines/mining_machines.dmi' - icon_state = "bs_miner" - density = TRUE - circuit = /obj/item/circuitboard/machine/bluespace_miner - layer = BELOW_OBJ_LAYER - var/list/ore_rates = list(/datum/material/iron = 0.6, /datum/material/glass = 0.6, /datum/material/copper = 0.4, /datum/material/plasma = 0.2, /datum/material/silver = 0.2, /datum/material/gold = 0.1, /datum/material/titanium = 0.1, /datum/material/uranium = 0.1, /datum/material/diamond = 0.1) - var/datum/component/remote_materials/materials - -/obj/machinery/mineral/bluespace_miner/Initialize(mapload) - . = ..() - materials = AddComponent(/datum/component/remote_materials, "bsm", mapload) - -/obj/machinery/mineral/bluespace_miner/Destroy() - materials = null - return ..() - -/obj/machinery/mineral/bluespace_miner/multitool_act(mob/living/user, obj/item/multitool/M) - if(istype(M)) - if(!M.buffer || !istype(M.buffer, /obj/machinery/ore_silo)) - to_chat(user, "You need to multitool the ore silo first.") - return FALSE - -/obj/machinery/mineral/bluespace_miner/examine(mob/user) - . = ..() - if(!materials?.silo) - . += "No ore silo connected. Use a multi-tool to link an ore silo to this machine." - else if(materials?.on_hold()) - . += "Ore silo access is on hold, please contact the quartermaster." - -/obj/machinery/mineral/bluespace_miner/process() - if(!materials?.silo || materials?.on_hold()) - return - var/datum/component/material_container/mat_container = materials.mat_container - if(!mat_container || panel_open || !powered()) - return - var/datum/material/ore = pick(ore_rates) - mat_container.insert_amount_mat((ore_rates[ore] * 1000), ore) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 47096a9a601c2..e40a8ad72e5c0 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -1,11 +1,50 @@ -#define SMELT_AMOUNT 10 +/// Smelt amount per second +#define SMELT_AMOUNT 5 /**********************Mineral processing unit console**************************/ /obj/machinery/mineral + processing_flags = START_PROCESSING_MANUALLY + subsystem_type = /datum/controller/subsystem/processing/fastprocess + /// The current direction of `input_turf`, in relation to the machine. var/input_dir = NORTH + /// The current direction, in relation to the machine, that items will be output to. var/output_dir = SOUTH + /// The turf the machines listens to for items to pick up. Calls the `pickup_item()` proc. + var/turf/input_turf = null + /// Determines if this machine needs to pick up items. Used to avoid registering signals to `/mineral` machines that don't pickup items. + var/needs_item_input = FALSE +/obj/machinery/mineral/Initialize(mapload) + . = ..() + if(needs_item_input) + register_input_turf() + +/// Gets the turf in the `input_dir` direction adjacent to the machine, and registers signals for ATOM_ENTERED and ATOM_CREATED. Calls the `pickup_item()` proc when it recieves these signals. +/obj/machinery/mineral/proc/register_input_turf() + input_turf = get_step(src, input_dir) + if(input_turf) // make sure there is actually a turf + RegisterSignal(input_turf, list(COMSIG_ATOM_CREATED, COMSIG_ATOM_ENTERED), .proc/pickup_item) + +/// Unregisters signals that are registered the machine's input turf, if it has one. +/obj/machinery/mineral/proc/unregister_input_turf() + if(input_turf) + UnregisterSignal(input_turf, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_CREATED)) + +/** + Base proc for all `/mineral` subtype machines to use. Place your item pickup behavior in this proc when you override it for your specific machine. + Called when the COMSIG_ATOM_ENTERED and COMSIG_ATOM_CREATED signals are sent. + Arguments: + * source - the turf that is listening for the signals. + * target - the atom that just moved onto the `source` turf. + * oldLoc - the old location that `target` was at before moving onto `source`. +*/ +/obj/machinery/mineral/proc/pickup_item(datum/source, atom/movable/target, atom/oldLoc) + SIGNAL_HANDLER + + return + +/// Generic unloading proc. Takes an atom as an argument and forceMove's it to the turf adjacent to this machine in the `output_dir` direction. /obj/machinery/mineral/proc/unload_mineral(atom/movable/S) S.forceMove(drop_location()) var/turf/T = get_step(src,output_dir) @@ -19,7 +58,6 @@ density = TRUE var/obj/machinery/mineral/processing_unit/machine = null var/machinedir = EAST - speed_process = TRUE /obj/machinery/mineral/processing_unit_console/Initialize() . = ..() @@ -58,6 +96,7 @@ if(href_list["set_on"]) machine.on = (href_list["set_on"] == "on") + machine.begin_processing() updateUsrDialog() return @@ -75,6 +114,7 @@ icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "furnace" density = TRUE + needs_item_input = TRUE var/obj/machinery/mineral/CONSOLE = null var/on = FALSE var/datum/material/selected_material = null @@ -93,11 +133,9 @@ QDEL_NULL(stored_research) return ..() -/obj/machinery/mineral/processing_unit/HasProximity(atom/movable/AM) - if(istype(AM, /obj/item/stack/ore) && AM.loc == get_step(src, input_dir)) - process_ore(AM) - /obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/stack/ore/O) + if(QDELETED(O)) + return var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/material_amount = materials.get_item_material_amount(O) if(!materials.has_space(material_amount)) @@ -142,23 +180,31 @@ return dat -/obj/machinery/mineral/processing_unit/process() - if (on) +/obj/machinery/mineral/processing_unit/pickup_item(datum/source, atom/movable/target, atom/oldLoc) + if(QDELETED(target)) + return + if(istype(target, /obj/item/stack/ore)) + process_ore(target) + +/obj/machinery/mineral/processing_unit/process(delta_time) + if(on) if(selected_material) - smelt_ore() + smelt_ore(delta_time) else if(selected_alloy) - smelt_alloy() + smelt_alloy(delta_time) if(CONSOLE) CONSOLE.updateUsrDialog() + else + end_processing() -/obj/machinery/mineral/processing_unit/proc/smelt_ore() +/obj/machinery/mineral/processing_unit/proc/smelt_ore(delta_time = 2) var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/datum/material/mat = selected_material if(mat) - var/sheets_to_remove = (materials.materials[mat] >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT) ) ? SMELT_AMOUNT : round(materials.materials[mat] / MINERAL_MATERIAL_AMOUNT) + var/sheets_to_remove = (materials.materials[mat] >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT * delta_time) ) ? SMELT_AMOUNT * delta_time : round(materials.materials[mat] / MINERAL_MATERIAL_AMOUNT) if(!sheets_to_remove) on = FALSE else @@ -166,13 +212,13 @@ materials.retrieve_sheets(sheets_to_remove, mat, out) -/obj/machinery/mineral/processing_unit/proc/smelt_alloy() +/obj/machinery/mineral/processing_unit/proc/smelt_alloy(delta_time = 2) var/datum/design/alloy = stored_research.isDesignResearchedID(selected_alloy) //check if it's a valid design if(!alloy) on = FALSE return - var/amount = can_smelt(alloy) + var/amount = can_smelt(alloy, delta_time) if(!amount) on = FALSE @@ -183,11 +229,11 @@ generate_mineral(alloy.build_path) -/obj/machinery/mineral/processing_unit/proc/can_smelt(datum/design/D) +/obj/machinery/mineral/processing_unit/proc/can_smelt(datum/design/D, delta_time = 2) if(D.make_reagents.len) return FALSE - var/build_amount = SMELT_AMOUNT + var/build_amount = SMELT_AMOUNT * delta_time var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 47e537f7d08ec..42d6e8649c722 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -10,20 +10,19 @@ input_dir = NORTH output_dir = SOUTH req_access = list(ACCESS_MINERAL_STOREROOM) - speed_process = TRUE circuit = /obj/item/circuitboard/machine/ore_redemption - + needs_item_input = TRUE + processing_flags = START_PROCESSING_MANUALLY layer = BELOW_OBJ_LAYER var/obj/item/card/id/inserted_id var/points = 0 - var/ore_pickup_rate = 15 var/sheet_per_ore = 1 var/point_upgrade = 1 var/list/ore_values = list(/datum/material/iron = 1, /datum/material/glass = 1, /datum/material/copper = 5, /datum/material/plasma = 15, /datum/material/silver = 16, /datum/material/gold = 18, /datum/material/titanium = 30, /datum/material/uranium = 30, /datum/material/diamond = 50, /datum/material/bluespace = 50, /datum/material/bananium = 60) - var/message_sent = FALSE - var/list/ore_buffer = list() + /// Variable that holds a timer which is used for callbacks to `send_console_message()`. Used for preventing multiple calls to this proc while the ORM is eating a stack of ores. + var/console_notify_timer var/datum/techweb/stored_research var/obj/item/disk/design_disk/inserted_disk var/datum/component/remote_materials/materials @@ -39,39 +38,34 @@ return ..() /obj/machinery/mineral/ore_redemption/RefreshParts() - var/ore_pickup_rate_temp = 15 var/point_upgrade_temp = 1 var/sheet_per_ore_temp = 1 for(var/obj/item/stock_parts/matter_bin/B in component_parts) sheet_per_ore_temp = 0.65 + (0.35 * B.rating) - for(var/obj/item/stock_parts/manipulator/M in component_parts) - ore_pickup_rate_temp = 15 * M.rating for(var/obj/item/stock_parts/micro_laser/L in component_parts) point_upgrade_temp = 0.65 + (0.35 * L.rating) - ore_pickup_rate = ore_pickup_rate_temp point_upgrade = point_upgrade_temp sheet_per_ore = round(sheet_per_ore_temp, 0.01) /obj/machinery/mineral/ore_redemption/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Smelting [sheet_per_ore] sheet(s) per piece of ore. Reward point generation at [point_upgrade*100]%. Ore pickup speed at [ore_pickup_rate]." + . += "The status display reads: Smelting [sheet_per_ore] sheet(s) per piece of ore. Reward point generation at [point_upgrade*100]%." if(panel_open) . += "Alt-click to rotate the input and output direction." /obj/machinery/mineral/ore_redemption/proc/smelt_ore(obj/item/stack/ore/O) + if(QDELETED(O)) + return var/datum/component/material_container/mat_container = materials.mat_container if (!mat_container) return + console_notify_timer = null + if(O.refined_type == null) return - ore_buffer -= O - - if(O?.refined_type) - points += O.points * point_upgrade * O.amount - var/material_amount = mat_container.get_item_material_amount(O) if(!material_amount) @@ -81,6 +75,8 @@ unload_mineral(O) else + if(O?.refined_type) + points += O.points * point_upgrade * O.amount var/mats = O.materials & mat_container.materials var/amount = O.amount mat_container.insert_item(O, sheet_per_ore) //insert it @@ -114,17 +110,15 @@ return build_amount /obj/machinery/mineral/ore_redemption/proc/process_ores(list/ores_to_process) - var/current_amount = 0 for(var/ore in ores_to_process) - if(current_amount >= ore_pickup_rate) - break smelt_ore(ore) /obj/machinery/mineral/ore_redemption/proc/send_console_message() var/datum/component/material_container/mat_container = materials.mat_container if(!mat_container || !is_station_level(z)) return - message_sent = TRUE + + console_notify_timer = null var/area/A = get_area(src) var/msg = "Now available in [A]: " @@ -150,26 +144,34 @@ )) signal.send_to_receivers() -/obj/machinery/mineral/ore_redemption/process() +/obj/machinery/mineral/ore_redemption/pickup_item(datum/source, atom/movable/target, atom/oldLoc) + if(QDELETED(target)) + return if(!materials.mat_container || panel_open || !powered()) return - var/atom/input = get_step(src, input_dir) - var/obj/structure/ore_box/OB = locate() in input - if(OB) - input = OB - - for(var/obj/item/stack/ore/O in input) - if(QDELETED(O)) - continue - ore_buffer |= O - O.forceMove(src) - CHECK_TICK - - if(LAZYLEN(ore_buffer)) - message_sent = FALSE - process_ores(ore_buffer) - else if(!message_sent) - send_console_message() + + if(istype(target, /obj/structure/ore_box)) + var/obj/structure/ore_box/box = target + process_ores(box.contents) + box.ui_update() + else if(istype(target, /obj/item/stack/ore)) + var/obj/item/stack/ore/O = target + smelt_ore(O) + else + return + + if(!console_notify_timer) + // gives 5 seconds for a load of ores to be sucked up by the ORM before it sends out request console notifications. This should be enough time for most deposits that people make + console_notify_timer = addtimer(CALLBACK(src, .proc/send_console_message), 5 SECONDS) + +/obj/machinery/mineral/ore_redemption/default_unfasten_wrench(mob/user, obj/item/I) + . = ..() + if(!.) + return + if(anchored) + register_input_turf() // someone just wrenched us down, re-register the turf + else + unregister_input_turf() // someone just un-wrenched us, unregister the turf /obj/machinery/mineral/ore_redemption/attackby(obj/item/W, mob/user, params) if(default_unfasten_wrench(user, W)) @@ -197,13 +199,14 @@ return ..() /obj/machinery/mineral/ore_redemption/AltClick(mob/living/user) - ..() if(!user.canUseTopic(src, BE_CLOSE)) return - if (panel_open) + if(panel_open) input_dir = turn(input_dir, -90) output_dir = turn(output_dir, -90) to_chat(user, "You change [src]'s I/O settings, setting the input to [dir2text(input_dir)] and the output to [dir2text(output_dir)].") + unregister_input_turf() // someone just rotated the input and output directions, unregister the old turf + register_input_turf() // register the new one return TRUE @@ -215,6 +218,7 @@ if(!ui) ui = new(user, src, "OreRedemptionMachine") ui.open() + ui.set_autoupdate(TRUE) // Material amounts /obj/machinery/mineral/ore_redemption/ui_data(mob/user) var/list/data = list() @@ -234,6 +238,8 @@ for(var/v in stored_research.researched_designs) var/datum/design/D = SSresearch.techweb_design_by_id(v) data["alloys"] += list(list("name" = D.name, "id" = D.id, "amount" = can_smelt_alloy(D))) + else + data["alloys"] = null // In case we lose mat_container while UI is open somehow if (!mat_container) data["disconnected"] = "local mineral storage is unavailable" @@ -241,6 +247,8 @@ data["disconnected"] = "no ore silo connection is available; storing locally" else if (materials.on_hold()) data["disconnected"] = "mineral withdrawal is on hold" + else + data["disconnected"] = null data["diskDesigns"] = list() data["hasDisk"] = FALSE @@ -265,11 +273,11 @@ if(points) if(I?.mining_points += points) points = 0 + . = TRUE else to_chat(usr, "No ID detected.") else to_chat(usr, "No points to claim.") - return TRUE if("Release") if(!mat_container) return @@ -303,26 +311,26 @@ mats[mat] = MINERAL_MATERIAL_AMOUNT materials.silo_log(src, "released", -count, "sheets", mats) //Logging deleted for quick coding - return TRUE + . = TRUE if("diskInsert") var/obj/item/disk/design_disk/disk = usr.get_active_held_item() if(istype(disk)) if(!usr.transferItemToLoc(disk,src)) return inserted_disk = disk + . = TRUE else to_chat(usr, "Not a valid Design Disk!") - return TRUE if("diskEject") if(inserted_disk) usr.put_in_hands(inserted_disk) inserted_disk = null - return TRUE + . = TRUE if("diskUpload") var/n = text2num(params["design"]) if(inserted_disk && inserted_disk.blueprints && inserted_disk.blueprints[n]) stored_research.add_design(inserted_disk.blueprints[n]) - return TRUE + . = TRUE if("Smelt") if(!mat_container) return @@ -347,9 +355,9 @@ else output = new alloy.build_path(src) unload_mineral(output) + . = TRUE else to_chat(usr, "Required access not found.") - return TRUE /obj/machinery/mineral/ore_redemption/ex_act(severity, target) do_sparks(5, TRUE, src) diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index 61cb675cf057f..45cb07e25dad9 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -15,14 +15,22 @@ GLOBAL_LIST_EMPTY(silo_access_logs) /obj/machinery/ore_silo/Initialize(mapload) . = ..() - AddComponent(/datum/component/material_container, - list(/datum/material/iron, /datum/material/glass, /datum/material/copper, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace, /datum/material/plastic), - INFINITY, - FALSE, - /obj/item/stack, - null, - null, - TRUE) + var/static/list/materials_list = list( + /datum/material/iron, + /datum/material/glass, + /datum/material/copper, + /datum/material/silver, + /datum/material/gold, + /datum/material/diamond, + /datum/material/plasma, + /datum/material/uranium, + /datum/material/bananium, + /datum/material/titanium, + /datum/material/bluespace, + /datum/material/plastic, + ) + AddComponent(/datum/component/material_container, materials_list, INFINITY, allowed_types=/obj/item/stack, _disable_attackby=TRUE) + if (!GLOB.ore_silo_default && mapload && is_station_level(z)) GLOB.ore_silo_default = src @@ -43,6 +51,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) /obj/machinery/ore_silo/proc/remote_attackby(obj/machinery/M, mob/user, obj/item/stack/I) var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + // stolen from /datum/component/material_container/proc/OnAttackBy if(user.a_intent != INTENT_HELP) return @@ -62,8 +71,19 @@ GLOBAL_LIST_EMPTY(silo_access_logs) return TRUE /obj/machinery/ore_silo/attackby(obj/item/W, mob/user, params) - if (istype(W, /obj/item/stack)) + if(default_deconstruction_screwdriver(user, icon_state, icon_state, W)) + updateUsrDialog() + return + + if(default_deconstruction_crowbar(W)) + return + + if(!powered()) + return ..() + + if(istype(W, /obj/item/stack)) return remote_attackby(src, user, W) + return ..() /obj/machinery/ore_silo/ui_interact(mob/user) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 35ca8b8e2a8ee..b6575073bfa5b 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -14,7 +14,13 @@ . = ..() machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) if (machine) - machine.CONSOLE = src + machine.console = src + +/obj/machinery/mineral/stacking_unit_console/Destroy() + if(machine) + machine.console = null + machine = null + return ..() /obj/machinery/mineral/stacking_unit_console/ui_interact(mob/user) . = ..() @@ -74,7 +80,7 @@ circuit = /obj/item/circuitboard/machine/stacking_machine input_dir = EAST output_dir = WEST - var/obj/machinery/mineral/stacking_unit_console/CONSOLE + var/obj/machinery/mineral/stacking_unit_console/console var/stk_types = list() var/stk_amt = list() var/stack_list[0] //Key: Type. Value: Instance of type. @@ -88,23 +94,38 @@ materials = AddComponent(/datum/component/remote_materials, "stacking", mapload, FALSE, mapload && force_connect) /obj/machinery/mineral/stacking_machine/Destroy() - CONSOLE = null + if(console) + console.machine = null + console = null materials = null return ..() /obj/machinery/mineral/stacking_machine/HasProximity(atom/movable/AM) + if(QDELETED(AM)) + return if(istype(AM, /obj/item/stack/sheet) && AM.loc == get_step(src, input_dir)) - process_sheet(AM) + var/obj/effect/portal/P = locate() in AM.loc + if(P) + visible_message("[src] attempts to stack the portal!") + message_admins("Stacking machine exploded via [P.creator ? key_name(P.creator) : "UNKNOWN"]'s portal at [AREACOORD(src)]") + log_game("Stacking machine exploded via [P.creator ? key_name(P.creator) : "UNKNOWN"]'s portal at [AREACOORD(src)]") + explosion(src.loc, 0, 1, 2, 3) + if(!QDELETED(src)) + qdel(src) + else + process_sheet(AM) /obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/M) if(istype(M)) if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console)) - CONSOLE = M.buffer - CONSOLE.machine = src + console = M.buffer + console.machine = src to_chat(user, "You link [src] to the console in [M]'s buffer.") return TRUE /obj/machinery/mineral/stacking_machine/proc/process_sheet(obj/item/stack/sheet/inp) + if(QDELETED(inp)) + return var/key = inp.merge_type var/obj/item/stack/sheet/storage = stack_list[key] if(!storage) //It's the first of this sheet added diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm index cea90bfce029c..b8f3ed70fa647 100644 --- a/code/modules/mining/machine_unloading.dm +++ b/code/modules/mining/machine_unloading.dm @@ -8,24 +8,17 @@ density = TRUE input_dir = WEST output_dir = EAST - speed_process = TRUE + needs_item_input = TRUE + processing_flags = START_PROCESSING_MANUALLY -/obj/machinery/mineral/unloading_machine/process() - var/turf/T = get_step(src,input_dir) - if(T) - var/limit - for(var/obj/structure/ore_box/B in T) - for (var/obj/item/stack/ore/O in B) - B.contents -= O - unload_mineral(O) - limit++ - if (limit>=10) - return - CHECK_TICK - CHECK_TICK - for(var/obj/item/I in T) - unload_mineral(I) - limit++ - if (limit>=10) - return - CHECK_TICK \ No newline at end of file +/obj/machinery/mineral/unloading_machine/pickup_item(datum/source, atom/movable/target, atom/oldLoc) + if(QDELETED(target)) + return + if(istype(target, /obj/structure/ore_box)) + var/obj/structure/ore_box/box = target + for(var/obj/item/stack/ore/O in box) + unload_mineral(O) + box.ui_update() + else if(istype(target, /obj/item/stack/ore)) + var/obj/item/stack/ore/O = target + unload_mineral(O) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 070cfdf14124c..4d9fe0863b8f7 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -1,117 +1,53 @@ /**********************Mining Equipment Vendor**************************/ -/obj/machinery/mineral/equipment_vendor - name = "mining equipment vendor" - desc = "An equipment vendor for miners, points collected at an ore redemption machine can be spent here." - icon = 'icons/obj/machines/mining_machines.dmi' - icon_state = "mining" +/obj/machinery/vendor + name = "equipment vendor" + processing_flags = START_PROCESSING_MANUALLY + subsystem_type = /datum/controller/subsystem/processing/fastprocess density = TRUE - circuit = /obj/item/circuitboard/machine/mining_equipment_vendor - - var/icon_deny = "mining-deny" + var/icon_deny var/obj/item/card/id/inserted_id - var/list/prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. - new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10), - new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100), - new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300), - new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100), - new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100), - new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), - new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200), - new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300), - new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300), - new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 400), - new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 400), - new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400), - new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500), - new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500), - new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500), - new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 500), - new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 600), - new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600), - new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750), - new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/twohanded/kinetic_crusher, 750), - new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750), - new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), - new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800), - new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000), - new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000), - new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000), - new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000), - new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000), - new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), - new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), - new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), - new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500), - new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), - new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000), - new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 10000), - new /datum/data/mining_equipment("Mining Encampment Capsule", /obj/item/survivalcapsule/encampment, 5000), - new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), - new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400), - new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400), - new /datum/data/mining_equipment("Minebot Cooldown Upgrade", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600), - new /datum/data/mining_equipment("Minebot AI Upgrade", /obj/item/slimepotion/slime/sentience/mining, 1000), - new /datum/data/mining_equipment("KA Minebot Passthrough", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100), - new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100), - new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150), - new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), - new /datum/data/mining_equipment("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), - new /datum/data/mining_equipment("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), - new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), - new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), - new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000) - ) - -/datum/data/mining_equipment - var/equipment_name = "generic" - var/equipment_path = null - var/cost = 0 - -/datum/data/mining_equipment/New(name, path, cost) - src.equipment_name = name - src.equipment_path = path - src.cost = cost + var/list/prize_list = list() -/obj/machinery/mineral/equipment_vendor/Initialize() +/obj/machinery/vendor/Initialize() . = ..() build_inventory() -/obj/machinery/mineral/equipment_vendor/proc/build_inventory() +/obj/machinery/vendor/proc/build_inventory() for(var/p in prize_list) - var/datum/data/mining_equipment/M = p + var/datum/data/vendor_equipment/M = p GLOB.vending_products[M.equipment_path] = 1 -/obj/machinery/mineral/equipment_vendor/power_change() +/obj/machinery/vendor/power_change() ..() update_icon() -/obj/machinery/mineral/equipment_vendor/update_icon() +/obj/machinery/vendor/update_icon() if(powered()) icon_state = initial(icon_state) else icon_state = "[initial(icon_state)]-off" -/obj/machinery/mineral/equipment_vendor/ui_assets(mob/user) +/obj/machinery/vendor/ui_assets(mob/user) return list( get_asset_datum(/datum/asset/spritesheet/vending), ) -/obj/machinery/mineral/equipment_vendor/ui_state(mob/user) +/obj/machinery/vendor/ui_state(mob/user) return GLOB.default_state -/obj/machinery/mineral/equipment_vendor/ui_interact(mob/user, datum/tgui/ui) +/obj/machinery/vendor/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "MiningVendor") ui.open() -/obj/machinery/mineral/equipment_vendor/ui_static_data(mob/user) +/obj/machinery/vendor/ui_static_data(mob/user) . = list() .["product_records"] = list() - for(var/datum/data/mining_equipment/prize in prize_list) + for(var/datum/data/vendor_equipment/prize in prize_list) var/list/product_data = list( path = replacetext(replacetext("[prize.equipment_path]", "/obj/item/", ""), "/", "-"), name = prize.equipment_name, @@ -120,16 +56,17 @@ ) .["product_records"] += list(product_data) -/obj/machinery/mineral/equipment_vendor/ui_data(mob/user) +/obj/machinery/vendor/ui_data(mob/user) . = list() var/mob/living/carbon/human/H var/obj/item/card/id/C + .["user"] = null if(ishuman(user)) H = user C = H.get_idcard(TRUE) if(C) .["user"] = list() - .["user"]["points"] = C.mining_points + .["user"]["points"] = get_points(C) if(C.registered_account) .["user"]["name"] = C.registered_account.account_holder if(C.registered_account.account_job) @@ -137,7 +74,7 @@ else .["user"]["job"] = "No Job" -/obj/machinery/mineral/equipment_vendor/ui_act(action, params) +/obj/machinery/vendor/ui_act(action, params) if(..()) return @@ -149,32 +86,123 @@ to_chat(usr, "Error: An ID is required!") flick(icon_deny, src) return - var/datum/data/mining_equipment/prize = locate(params["ref"]) in prize_list + var/datum/data/vendor_equipment/prize = locate(params["ref"]) in prize_list if(!prize || !(prize in prize_list)) to_chat(usr, "Error: Invalid choice!") flick(icon_deny, src) return - if(prize.cost > I.mining_points) + if(prize.cost > get_points(I)) to_chat(usr, "Error: Insufficient points for [prize.equipment_name] on [I]!") flick(icon_deny, src) return - I.mining_points -= prize.cost + subtract_points(I, prize.cost) to_chat(usr, "[src] clanks to life briefly before vending [prize.equipment_name]!") new prize.equipment_path(loc) SSblackbox.record_feedback("nested tally", "mining_equipment_bought", 1, list("[type]", "[prize.equipment_path]")) . = TRUE -/obj/machinery/mineral/equipment_vendor/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/mining_voucher)) - RedeemVoucher(I, user) - return +/obj/machinery/vendor/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "mining-open", "mining", I)) return if(default_deconstruction_crowbar(I)) return return ..() -/obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/mining_voucher/voucher, mob/redeemer) +/obj/machinery/vendor/ex_act(severity, target) + do_sparks(5, TRUE, src) + if(prob(50 / severity) && severity < 3) + qdel(src) + +/obj/machinery/vendor/proc/subtract_points(obj/item/card/id/I, amount) + I.mining_points -= amount + +/obj/machinery/vendor/proc/get_points(obj/item/card/id/I) + return I.mining_points + +/obj/machinery/vendor/mining + name = "mining equipment vendor" + desc = "An equipment vendor for miners, points collected at an ore redemption machine can be spent here." + icon = 'icons/obj/machines/mining_machines.dmi' + icon_state = "mining" + density = TRUE + circuit = /obj/item/circuitboard/machine/mining_equipment_vendor + + icon_deny = "mining-deny" + prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. + new /datum/data/vendor_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 5), + new /datum/data/vendor_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 75), + new /datum/data/vendor_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 150), + new /datum/data/vendor_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400), + new /datum/data/vendor_equipment("Regen. Core Stabilizer", /obj/item/hivelordstabilizer, 400), + new /datum/data/vendor_equipment("Skeleton Key", /obj/item/skeleton_key, 750), + new /datum/data/vendor_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 500), + new /datum/data/vendor_equipment("Brute Healing Kit", /obj/item/storage/firstaid/brute, 600), + new /datum/data/vendor_equipment("Burn Healing Kit", /obj/item/storage/firstaid/fire, 600), + new /datum/data/vendor_equipment("Advanced Healing Kit", /obj/item/storage/firstaid/advanced, 1200), + new /datum/data/vendor_equipment("Fulton Beacon", /obj/item/fulton_core, 500), + new /datum/data/vendor_equipment("Fulton Extraction Pack", /obj/item/extraction_pack, 1000), + new /datum/data/vendor_equipment("Jaunter", /obj/item/wormhole_jaunter, 750), + new /datum/data/vendor_equipment("Advanced Ore Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), + new /datum/data/vendor_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500), + new /datum/data/vendor_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2000), + new /datum/data/vendor_equipment("Proto-Kinetic Crusher", /obj/item/kinetic_crusher, 800), + new /datum/data/vendor_equipment("Proto-Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 500), + new /datum/data/vendor_equipment("Resonator", /obj/item/resonator, 750), + new /datum/data/vendor_equipment("Upgraded Resonator", /obj/item/resonator/upgraded, 1500), + new /datum/data/vendor_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 500), + new /datum/data/vendor_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 1000), + new /datum/data/vendor_equipment("Mining Bot Companion", /mob/living/simple_animal/hostile/mining_drone, 800), + new /datum/data/vendor_equipment("Minebot Upgrade: Melee", /obj/item/mine_bot_upgrade, 400), + new /datum/data/vendor_equipment("Minebot Upgrade: Armor", /obj/item/mine_bot_upgrade/health, 400), + new /datum/data/vendor_equipment("Minebot Upgrade: Cooldown", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600), + new /datum/data/vendor_equipment("Minebot Upgrade: A.I.", /obj/item/slimepotion/slime/sentience/mining, 1000), + new /datum/data/vendor_equipment("P-KA Upgrade: Bot-Friendly", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100), + new /datum/data/vendor_equipment("P-KA Upgrade: Tracer Shots", /obj/item/borg/upgrade/modkit/tracer, 200), + new /datum/data/vendor_equipment("P-KA Upgrade: Adj. T. Shots", /obj/item/borg/upgrade/modkit/tracer/adjustable, 300), + new /datum/data/vendor_equipment("P-KA Upgrade: Range", /obj/item/borg/upgrade/modkit/range, 1000), + new /datum/data/vendor_equipment("P-KA Upgrade: Damage", /obj/item/borg/upgrade/modkit/damage, 1000), + new /datum/data/vendor_equipment("P-KA Upgrade: Cooldown", /obj/item/borg/upgrade/modkit/cooldown, 1000), + new /datum/data/vendor_equipment("P-KA Upgrade: Damage Radius", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), + new /datum/data/vendor_equipment("P-KA Cosmetic Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 200), + new /datum/data/vendor_equipment("P-KA Cosmetic Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 200), + new /datum/data/vendor_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), + new /datum/data/vendor_equipment("Expanded E. Oxygen Tank", /obj/item/tank/internals/emergency_oxygen/engi, 1000), + new /datum/data/vendor_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000), + new /datum/data/vendor_equipment("Survival Knife", /obj/item/kitchen/knife/combat/survival, 1000), + new /datum/data/vendor_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 1000), + new /datum/data/vendor_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500), + new /datum/data/vendor_equipment("GAR Mesons", /obj/item/clothing/glasses/meson/gar, 500), + new /datum/data/vendor_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000), + new /datum/data/vendor_equipment("Mining Outpost Capsule", /obj/item/survivalcapsule/encampment, 5000), + new /datum/data/vendor_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 10000), + new /datum/data/vendor_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000), + new /datum/data/vendor_equipment("1000 Space Cash", /obj/item/stack/spacecash/c1000, 2000), + new /datum/data/vendor_equipment("Pizza", /obj/item/pizzabox/margherita, 200), + new /datum/data/vendor_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100), + new /datum/data/vendor_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100), + new /datum/data/vendor_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), + new /datum/data/vendor_equipment("Soap", /obj/item/soap/nanotrasen, 200), + new /datum/data/vendor_equipment("Laser Pointer", /obj/item/laser_pointer, 300), + new /datum/data/vendor_equipment("Toy Alien", /obj/item/clothing/mask/facehugger/toy, 300), + ) + +/datum/data/vendor_equipment + var/equipment_name = "generic" + var/equipment_path = null + var/cost = 0 + +/datum/data/vendor_equipment/New(name, path, cost) + src.equipment_name = name + src.equipment_path = path + src.cost = cost + +/obj/machinery/vendor/mining/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/mining_voucher)) + RedeemVoucher(I, user) + return + return ..() + +/obj/machinery/vendor/mining/proc/RedeemVoucher(obj/item/mining_voucher/voucher, mob/redeemer) var/items = list("Survival Capsule and Explorer's Webbing", "Resonator Kit", "Minebot Kit", "Extraction and Rescue Kit", "Crusher Kit", "Mining Conscription Kit") var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in sortList(items) @@ -198,36 +226,31 @@ new /obj/item/stack/marker_beacon/thirty(drop_location) if("Crusher Kit") new /obj/item/extinguisher/mini(drop_location) - new /obj/item/twohanded/kinetic_crusher(drop_location) + new /obj/item/kinetic_crusher(drop_location) if("Mining Conscription Kit") new /obj/item/storage/backpack/duffelbag/mining_conscript(drop_location) SSblackbox.record_feedback("tally", "mining_voucher_redeemed", 1, selection) qdel(voucher) -/obj/machinery/mineral/equipment_vendor/ex_act(severity, target) - do_sparks(5, TRUE, src) - if(prob(50 / severity) && severity < 3) - qdel(src) - /****************Golem Point Vendor**************************/ -/obj/machinery/mineral/equipment_vendor/golem +/obj/machinery/vendor/mining/golem name = "golem ship equipment vendor" circuit = /obj/item/circuitboard/machine/mining_equipment_vendor/golem -/obj/machinery/mineral/equipment_vendor/golem/Initialize() +/obj/machinery/vendor/mining/golem/Initialize() . = ..() desc += "\nIt seems a few selections have been added." prize_list += list( - new /datum/data/mining_equipment("Extra Id", /obj/item/card/id/mining, 250), - new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), - new /datum/data/mining_equipment("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 300), - new /datum/data/mining_equipment("Toolbelt", /obj/item/storage/belt/utility, 350), - new /datum/data/mining_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500), - new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), - new /datum/data/mining_equipment("Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1700), - new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/storage/box/rndboards, 2000) + new /datum/data/vendor_equipment("Extra Id", /obj/item/card/id/mining, 250), + new /datum/data/vendor_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), + new /datum/data/vendor_equipment("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 300), + new /datum/data/vendor_equipment("Toolbelt", /obj/item/storage/belt/utility, 350), + new /datum/data/vendor_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500), + new /datum/data/vendor_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), + new /datum/data/vendor_equipment("P-KA Upgrade: Trigger Mod", /obj/item/borg/upgrade/modkit/trigger_guard, 1000), + new /datum/data/vendor_equipment("The Liberator's Legacy", /obj/item/storage/box/rndboards, 2000) ) /**********************Mining Equipment Vendor Items**************************/ @@ -261,27 +284,14 @@ ..() /obj/item/card/mining_point_card/examine(mob/user) - ..() - to_chat(user, "There's [points] point\s on the card.") + . = ..() + . += "There's [points] point\s on the card." ///Conscript kit -/obj/item/card/mining_access_card +/obj/item/card/id/pass/mining_access_card name = "mining access card" desc = "A small card, that when used on any ID, will add mining access." - icon_state = "data_1" - -/obj/item/card/mining_access_card/afterattack(atom/movable/AM, mob/user, proximity) - . = ..() - if(istype(AM, /obj/item/card/id) && proximity) - var/obj/item/card/id/I = AM - I.access |= ACCESS_MINING - I.access |= ACCESS_MINING_STATION - I.access |= ACCESS_MECH_MINING - I.access |= ACCESS_MINERAL_STOREROOM - I.access |= ACCESS_CARGO - to_chat(user, "You upgrade [I] with mining access.") - log_id("[key_name(user)] added mining access to '[I]' using [src] at [AREACOORD(user)].") - qdel(src) + access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO) /obj/item/storage/backpack/duffelbag/mining_conscript name = "mining conscription kit" @@ -295,4 +305,4 @@ new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/encryptionkey/headset_cargo(src) new /obj/item/clothing/mask/gas/explorer(src) - new /obj/item/card/mining_access_card(src) + new /obj/item/card/id/pass/mining_access_card(src) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index fa1e641a8190b..3dc17909227d4 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -71,17 +71,17 @@ /**********************Shuttle Computer**************************/ -/obj/machinery/computer/shuttle/mining +/obj/machinery/computer/shuttle_flight/mining name = "mining shuttle console" desc = "Used to call and send the mining shuttle." circuit = /obj/item/circuitboard/computer/mining_shuttle shuttleId = "mining" possible_destinations = "mining_home;mining_away;landing_zone_dock;mining_public" - no_destination_swap = 1 + req_access = list(ACCESS_MINING) var/static/list/dumb_rev_heads = list() //ATTACK HAND IGNORING PARENT RETURN VALUE -/obj/machinery/computer/shuttle/mining/attack_hand(mob/user) +/obj/machinery/computer/shuttle_flight/mining/attack_hand(mob/user) if(is_station_level(user.z) && user.mind && is_head_revolutionary(user) && !(user.mind in dumb_rev_heads)) to_chat(user, "You get a feeling that leaving the station might be a REALLY dumb idea...") dumb_rev_heads += user.mind @@ -89,13 +89,12 @@ . = ..() //It is on lavaland, soooo.... -/obj/machinery/computer/shuttle/science +/obj/machinery/computer/shuttle_flight/science name = "science outpost shuttle console" desc = "Used to call and send the science shuttle." circuit = /obj/item/circuitboard/computer/science_shuttle shuttleId = "science" possible_destinations = "science_station;science_outpost" - no_destination_swap = 1 /**********************Mining car (Crate like thing, not the rail car)**************************/ @@ -103,3 +102,4 @@ desc = "A mining car. This one doesn't work on rails, but has to be dragged." name = "Mining car (not for rails)" icon_state = "miningcar" + door_anim_time = 0 diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index d752467f2aa72..e70887698008f 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -3,7 +3,7 @@ #define MINEDRONE_ATTACK 2 /mob/living/simple_animal/hostile/mining_drone - name = "nanotrasen minebot" + name = "\improper Nanotrasen minebot" desc = "The instructions printed on the side read: This is a small robot used to support miners, can be set to search and collect loose ore, or to help fend off wildlife." gender = NEUTER icon = 'icons/mob/aibots.dmi' diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 4d44e66c503dd..5dc2bbd05a450 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -7,6 +7,7 @@ icon_state = "coinpress0" density = TRUE input_dir = EAST + needs_item_input = TRUE var/obj/item/storage/bag/money/bag_to_use @@ -31,16 +32,21 @@ chosen = getmaterialref(chosen) -/obj/machinery/mineral/mint/process() - var/turf/T = get_step(src, input_dir) +/obj/machinery/mineral/mint/pickup_item(datum/source, atom/movable/target, atom/oldLoc) + if(QDELETED(target)) + return + if(!istype(target, /obj/item/stack)) + return + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) + var/obj/item/stack/S = target - for(var/obj/item/stack/O in T) - var/inserted = materials.insert_item(O) - if(inserted) - qdel(O) + if(materials.insert_item(S)) + qdel(S) +/obj/machinery/mineral/mint/process() if(processing) + var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/datum/material/M = chosen if(!M) @@ -68,6 +74,7 @@ if(!found_new) processing = FALSE else + end_processing() icon_state = "coinpress0" @@ -79,6 +86,7 @@ if(!ui) ui = new(user, src, "Mint") ui.open() + ui.set_autoupdate(TRUE) // Coins pressed (could be refactored to ui_update), material amounts /obj/machinery/mineral/mint/ui_data() var/list/data = list() @@ -114,13 +122,18 @@ if (!processing) produced_coins = 0 processing = TRUE + begin_processing() + . = TRUE if ("stoppress") processing = FALSE + end_processing() + . = TRUE if ("changematerial") var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) for(var/datum/material/mat in materials.materials) if (params["material_name"] == mat.name) chosen = mat + . = TRUE /obj/machinery/mineral/mint/proc/create_coins() var/turf/T = get_step(src,output_dir) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 7c07bc065d942..f5e800dc07f7d 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -18,6 +18,8 @@ var/refined_type = null //What this ore defaults to being refined into novariants = TRUE // Ore stacks handle their icon updates themselves to keep the illusion that there's more going var/list/stack_overlays + var/scan_state = "" //Used by mineral turfs for their scan overlay. + var/spreadChance = 0 //Also used by mineral turfs for spreading veins /obj/item/stack/ore/update_icon() var/difference = min(ORESTACK_OVERLAYS_MAX, amount) - (LAZYLEN(stack_overlays)+1) @@ -71,6 +73,8 @@ points = 30 materials = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/uranium + scan_state = "rock_Uranium" + spreadChance = 5 /obj/item/stack/ore/iron name = "iron ore" @@ -80,6 +84,8 @@ points = 1 materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/iron + scan_state = "rock_Iron" + spreadChance = 20 /obj/item/stack/ore/glass name = "sand pile" @@ -132,6 +138,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ points = 15 materials = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/plasma + scan_state = "rock_Plasma" + spreadChance = 8 /obj/item/stack/ore/plasma/welder_act(mob/living/user, obj/item/I) to_chat(user, "You can't hit a high enough temperature to smelt [src] properly!") @@ -145,6 +153,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ points = 5 materials = list(/datum/material/copper=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/copper + scan_state = "rock_Copper" + spreadChance = 5 /obj/item/stack/ore/silver name = "silver ore" @@ -154,6 +164,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ points = 16 materials = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/silver + scan_state = "rock_Silver" + spreadChance = 5 /obj/item/stack/ore/gold name = "gold ore" @@ -163,6 +175,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ points = 18 materials = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/gold + scan_state = "rock_Gold" + spreadChance = 5 /obj/item/stack/ore/diamond name = "diamond ore" @@ -172,6 +186,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ points = 50 materials = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/diamond + scan_state = "rock_Diamond" /obj/item/stack/ore/bananium name = "bananium ore" @@ -181,6 +196,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ points = 60 materials = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/bananium + scan_state = "rock_Bananium" /obj/item/stack/ore/titanium name = "titanium ore" @@ -190,6 +206,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ points = 50 materials = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/titanium + scan_state = "rock_Titanium" + spreadChance = 5 /obj/item/stack/ore/slag name = "slag" @@ -198,7 +216,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ item_state = "slag" singular_name = "slag chunk" -/obj/item/twohanded/required/gibtonite +/obj/item/gibtonite name = "gibtonite ore" desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under space law." icon = 'icons/obj/mining.dmi' @@ -212,12 +230,16 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ var/attacher = "UNKNOWN" var/det_timer -/obj/item/twohanded/required/gibtonite/Destroy() +/obj/item/gibtonite/ComponentInitialize() + . = ..() + AddComponent(/datum/component/two_handed, require_twohands=TRUE) + +/obj/item/gibtonite/Destroy() qdel(wires) wires = null return ..() -/obj/item/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params) +/obj/item/gibtonite/attackby(obj/item/I, mob/user, params) if(!wires && istype(I, /obj/item/assembly/igniter)) user.visible_message("[user] attaches [I] to [src].", "You attach [I] to [src].") wires = new /datum/wires/explosive/gibtonite(src) @@ -245,20 +267,20 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ return ..() -/obj/item/twohanded/required/gibtonite/attack_self(user) +/obj/item/gibtonite/attack_self(user) if(wires) wires.interact(user) else ..() -/obj/item/twohanded/required/gibtonite/bullet_act(obj/item/projectile/P) +/obj/item/gibtonite/bullet_act(obj/item/projectile/P) GibtoniteReaction(P.firer) . = ..() -/obj/item/twohanded/required/gibtonite/ex_act() +/obj/item/gibtonite/ex_act() GibtoniteReaction(null, 1) -/obj/item/twohanded/required/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0) +/obj/item/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0) if(!primed) primed = TRUE playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1) @@ -281,7 +303,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ log_bomber(user, "has primed a", src, "for detonation", notify_admins) det_timer = addtimer(CALLBACK(src, .proc/detonate, notify_admins), det_time, TIMER_STOPPABLE) -/obj/item/twohanded/required/gibtonite/proc/detonate(notify_admins) +/obj/item/gibtonite/proc/detonate(notify_admins) if(primed) switch(quality) if(GIBTONITE_QUALITY_HIGH) diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index f48df08b00805..8f837880ef7d5 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -8,16 +8,21 @@ desc = "A heavy wooden box, which can be filled with a lot of ores." density = TRUE pressure_resistance = 5*ONE_ATMOSPHERE + var/static/list/typecache_to_take - - +/obj/structure/ore_box/Initialize() + . = ..() + if(!typecache_to_take) + typecache_to_take = typecacheof(/obj/item/stack/ore) /obj/structure/ore_box/attackby(obj/item/W, mob/user, params) if (istype(W, /obj/item/stack/ore)) user.transferItemToLoc(W, src) + ui_update() else if(SEND_SIGNAL(W, COMSIG_CONTAINS_STORAGE)) - SEND_SIGNAL(W, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/stack/ore, src) + SEND_SIGNAL(W, COMSIG_TRY_STORAGE_TAKE_TYPE, typecache_to_take, src) to_chat(user, "You empty the ore in [W] into \the [src].") + ui_update() else return ..() @@ -84,14 +89,12 @@ /obj/structure/ore_box/ui_act(action, params) if(..()) return - if(!Adjacent(usr)) - return - add_fingerprint(usr) - usr.set_machine(src) + switch(action) if("removeall") dump_box_contents() to_chat(usr, "You open the release hatch on the box..") + . = TRUE /obj/structure/ore_box/deconstruct(disassembled = TRUE, mob/user) var/obj/item/stack/sheet/mineral/wood/WD = new (loc, 4) diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index 6dcdd076357c2..7f5b31ac3987e 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -12,13 +12,14 @@ INITIALIZE_IMMEDIATE(/mob/dead) stack_trace("Warning: [src]([type]) initialized multiple times!") flags_1 |= INITIALIZED_1 tag = "mob_[next_mob_id++]" - GLOB.mob_list += src + add_to_mob_list() prepare_huds() - if(length(CONFIG_GET(keyed_list/cross_server))) - verbs += /mob/dead/proc/server_hop + if(length(CONFIG_GET(keyed_list/server_hop))) + add_verb(/mob/dead/proc/server_hop) set_focus(src) + become_hearing_sensitive() return INITIALIZE_HINT_NORMAL /mob/dead/canUseStorage() @@ -39,27 +40,26 @@ INITIALIZE_IMMEDIATE(/mob/dead) loc = destination Moved(oldloc, NONE, TRUE) -/mob/dead/Stat() - ..() +/mob/dead/get_stat_tab_status() + var/list/tab_data = ..() - if(!statpanel("Status")) - return - stat(null, "Game Mode: [SSticker.hide_mode ? "Secret" : "[GLOB.master_mode]"]") + tab_data["Game Mode"] = GENERATE_STAT_TEXT("[SSticker.hide_mode ? "Secret" : "[GLOB.master_mode]"]") if(SSticker.HasRoundStarted()) - return + return tab_data var/time_remaining = SSticker.GetTimeLeft() if(time_remaining > 0) - stat(null, "Time To Start: [round(time_remaining/10)]s") + tab_data["Time To Start"] = GENERATE_STAT_TEXT("[round(time_remaining/10)]s") else if(time_remaining == -10) - stat(null, "Time To Start: DELAYED") + tab_data["Time To Start"] = GENERATE_STAT_TEXT("DELAYED") else - stat(null, "Time To Start: SOON") + tab_data["Time To Start"] = GENERATE_STAT_TEXT("SOON") - stat(null, "Players: [SSticker.totalPlayers]") + tab_data["Players"] = GENERATE_STAT_TEXT("[SSticker.totalPlayers]") if(client.holder) - stat(null, "Players Ready: [SSticker.totalPlayersReady]") + tab_data["Players Ready"] = GENERATE_STAT_TEXT("[SSticker.totalPlayersReady]") + return tab_data /mob/dead/proc/server_hop() set category = "OOC" @@ -67,11 +67,11 @@ INITIALIZE_IMMEDIATE(/mob/dead) set desc= "Jump to the other server" if(notransform) return - var/list/csa = CONFIG_GET(keyed_list/cross_server) + var/list/csa = CONFIG_GET(keyed_list/server_hop) var/pick switch(csa.len) if(0) - verbs -= /mob/dead/proc/server_hop + remove_verb(/mob/dead/proc/server_hop) to_chat(src, "Server Hop has been disabled.") if(1) pick = csa[1] @@ -88,7 +88,7 @@ INITIALIZE_IMMEDIATE(/mob/dead) var/client/C = client to_chat(C, "Sending you to [pick].") - new /obj/screen/splash(C) + new /atom/movable/screen/splash(C) notransform = TRUE sleep(29) //let the animation play diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index 887556500cba7..97e97bb31e0e6 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -4,21 +4,21 @@ client.set_db_player_flags() if(!mind) mind = new /datum/mind(key) - mind.active = 1 - mind.current = src + mind.active = TRUE + mind.set_current(src) ..() var/motd = global.config.motd if(motd) - to_chat(src, " [motd] ", handle_whitespace=FALSE)
+ to_chat(src, "[motd] ", handle_whitespace=FALSE, allow_linkify = TRUE)
if(GLOB.admin_notice)
to_chat(src, "Admin Notice:\n \t [GLOB.admin_notice]")
var/spc = CONFIG_GET(number/soft_popcap)
if(spc && living_player_count() >= spc)
- to_chat(src, "Server Notice:\n \t [CONFIG_GET(string/soft_popcap_message)]")
+ to_chat(src, "Server Notice:\n \t [CONFIG_GET(string/soft_popcap_message)]", allow_linkify = TRUE)
sight |= SEE_TURFS
diff --git a/code/modules/mob/dead/new_player/logout.dm b/code/modules/mob/dead/new_player/logout.dm
index a70800d35b535..b2f37376a3c62 100644
--- a/code/modules/mob/dead/new_player/logout.dm
+++ b/code/modules/mob/dead/new_player/logout.dm
@@ -3,5 +3,6 @@
..()
if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
key = null//We null their key before deleting the mob, so they are properly kicked out.
+ QDEL_NULL(mind) //Clean out mind, yes this fucking sucks
qdel(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 6491c692ebdd9..e47c097febdde 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -15,7 +15,7 @@
/mob/dead/new_player/Initialize()
if(client && SSticker.state == GAME_STATE_STARTUP)
- var/obj/screen/splash/S = new(client, TRUE, TRUE)
+ var/atom/movable/screen/splash/S = new(client, TRUE, TRUE)
S.Fade(TRUE)
if(length(GLOB.newplayer_start))
@@ -140,8 +140,8 @@
LateChoices()
return
- if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in GLOB.admin_datums)))
- if(IS_PATRON(src.ckey))
+ if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap))
+ if(IS_PATRON(src.ckey) || (client in GLOB.admins))
LateChoices()
return
to_chat(usr, "[CONFIG_GET(string/hard_popcap_message)]")
@@ -169,7 +169,7 @@
to_chat(usr, "There is an administrative lock on entering the game!")
return
- if(SSticker.queued_players.len && !(ckey(key) in GLOB.admin_datums))
+ if(SSticker.queued_players.len && !(ckey(key) in GLOB.admin_datums) && !IS_PATRON(ckey(key)))
if((living_player_count() >= relevant_cap) || (src != SSticker.queued_players[1]))
to_chat(usr, "Server is full.")
return
@@ -193,12 +193,14 @@
vote_on_poll_handler(poll, href_list)
//When you cop out of the round (NB: this HAS A SLEEP FOR PLAYER INPUT IN IT)
-/mob/dead/new_player/proc/make_me_an_observer()
+/mob/dead/new_player/proc/make_me_an_observer(force_observe=FALSE)
if(QDELETED(src) || !src.client)
ready = PLAYER_NOT_READY
return FALSE
- var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No")
+ var/this_is_like_playing_right = "Yes"
+ if(!force_observe)
+ this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No")
if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes")
ready = PLAYER_NOT_READY
@@ -308,9 +310,9 @@
if(job && !job.override_latejoin_spawn(character))
SSjob.SendToLateJoin(character)
if(!arrivals_docked)
- var/obj/screen/splash/Spl = new(character.client, TRUE)
+ var/atom/movable/screen/splash/Spl = new(character.client, TRUE)
Spl.Fade(TRUE)
- character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
+ character.playsound_local(get_turf(character), 'sound/voice/welcomeBee.ogg', 50)
character.update_parallax_teleport()
@@ -382,7 +384,7 @@
SSjob.prioritized_jobs -= prioritized_job
dat += "
| ||||||||||||||||||||||||||||||||||||||||||
- 
The scientist must utilize his console and science tool, set to marking mode, to send down the agent, go down himself, mark the target, retrieve it, mark the agent through the console and retrieve him too.
After that, he must do the experimentation surgery.
The agent must be sent down by the scientist to stun and cuff a target and drag it into a hidden spot and await the scientist.
- 
Node blobs slowly expand around them, heal other blobs, and activate blob factories and resource nodes.
Power is crucial to your success as it allows you to expand outwards. To create more power, place Resource blobs.
Summon Blob Spores using Factory Blobs. Blob spores attack nearby humans, and transform corpses into Blob Zombies.
- 
Changelings can anonymously communicate with one another over a hivemind channel by using 'say :g' before their speech.
Use the DNA Extraction Sting and sting a target to stealthily steal their DNA. This will count towards your objective.
Alternatively, you can absorb humans to drain their DNA. Have them in an aggressive grab and click the absorb button on the top left of the screen.
Use the Cellular Emporium to acquire special abilities which will help you achieve your objectives.
Work together with the other changelings to complete your objectives, but be cautious. Other changelings could have an objective to absorb you.
- 
Use your Ritual Dagger to create runes. Each rune has a unique function.
Use the Runed Metal to create cult structures which will produce powerful equipment.
To begin, you should gather converts by placing them over an Offering Rune.
- 
You must detonate the nuclear bomb from your ship on Space Station 13. To do that, you must get the nuclear disk.
or the Energy Shield
.
- 
To utilize your PDA uplink, enter the messenger tab and set the ringtone as the code you have been provided.
To utilize your Headset uplink, change its frequency to the frequency provided.
To utilize the pen uplink, twist it to the first setting, then to the second one.
- 
You have been granted a spellbook with 10 spellpoints that you can spend to buy new spells. It can only be used on board of the Wizard's den.
Use your scroll of teleportation to get to the station.
- 
If you are the first xenomorph on the station, you must evolve into a queen to lay facehugger eggs.
As a xenomorph larva, you must grow to full size before you can evolve. To evolve to queen, choose Drone, then Praetorian, and finally Queen.
Your objectives are to survive and create more xenomorphs. To do so, bring live hosts to the queen where they can be impregnated by facehuggers.
-