")]") @@ -136,3 +147,11 @@ candidates[scf] = scf.weight var/datum/terminal_skill_fail/chosen = pickweight(candidates) return chosen.execute(src) + +// Returns the computer used for the terminal's account +/datum/terminal/proc/get_account_computer() + return computer + +/datum/terminal/proc/get_access(mob/user) + var/datum/extension/interactive/os/account_computer = get_account_computer() + return(account_computer.get_access(user)) \ No newline at end of file diff --git a/code/modules/modular_computers/terminal/terminal_commands.dm b/code/modules/modular_computers/terminal/terminal_commands.dm index 1ed922f8288..609deacc48f 100644 --- a/code/modules/modular_computers/terminal/terminal_commands.dm +++ b/code/modules/modular_computers/terminal/terminal_commands.dm @@ -22,8 +22,8 @@ var/global/list/terminal_commands regex = new (pattern, regex_flags) ..() -/datum/terminal_command/proc/check_access(mob/user) - return has_access(req_access, user.GetAccess()) +/datum/terminal_command/proc/check_access(list/access) + return has_access(req_access, access) /datum/terminal_command/proc/get_nid(text) if(!nid_regex) @@ -41,7 +41,7 @@ var/global/list/terminal_commands return if(!user.skill_check(core_skill, skill_needed)) return skill_fail_message() - if(!check_access(user)) + if(!check_access(terminal.get_access(user))) return "[name]: ACCESS DENIED" if(needs_network && !terminal.computer.get_network_status()) return "NETWORK ERROR: Check connection and try again." @@ -287,7 +287,7 @@ Subtypes var/datum/extension/network_device/mainframe/M = network.get_device_by_tag(network_tag) if(!istype(M)) return "cd: Could not locate file server with tag [network_tag]." - if(!M.has_access(user)) + if(!M.has_access(terminal.get_access(user))) return "cd: Access denied to file server with tag [network_tag]" terminal.current_disk = terminal.disks[/datum/file_storage/network] if(!terminal.current_disk) @@ -336,15 +336,15 @@ Subtypes var/file_name = copytext(text, 4) - var/deleted = terminal.current_disk.delete_file(file_name) + var/deleted = terminal.current_disk.delete_file(file_name, terminal.get_access(user), user) if(deleted) return "rm: Removed file [file_name]." else - return "rm: Failed to remove file [file_name]." + return "rm: Failed to remove file [file_name]. Additional access may be required." /datum/terminal_command/move name = "mv" - man_entry = list("Format: mv \[file name\] \[destination\]", "Moves a file in the current disk to another.") + man_entry = list("Format: mv \[file name\] \[destination\] \[copying (0/1) \]", "Moves a file in the current disk to another.") pattern = @"^mv" /datum/terminal_command/move/proper_input_entered(text, mob/user, datum/terminal/terminal) @@ -353,11 +353,17 @@ Subtypes var/list/mv_args = get_arguments(text) if(length(mv_args) < 2) - return "mv: Improper syntax, use mv \[file name\] \[destination\]." + return "mv: Improper syntax, use mv \[file name\] \[destination\] \[copying (0/1) \]." var/datum/computer_file/F = terminal.current_disk.get_file(mv_args[1]) if(!F) return "mv: Could not find file with name [mv_args[1]]." - + var/copying = length(mv_args > 2) ? text2num(mv_args[3]) : FALSE + if(copying == TRUE) + if(!(F.get_file_perms(terminal.get_access(user), user) & OS_READ_ACCESS)) + return "mv: You do not have read access to this file." + else + if(!(F.get_file_perms(terminal.get_access(user), user) & OS_WRITE_ACCESS)) + return "mv: You do not have write access to this file. Write access is required when not copying files with mv" // Find the destination. var/datum/file_storage/dest var/target = uppertext(mv_args[2]) @@ -383,7 +389,7 @@ Subtypes var/datum/extension/network_device/mainframe/M = network.get_device_by_tag(target) if(!istype(M)) return "mv: Could not locate destination with tag [target]." - if(!M.has_access(user)) + if(!M.has_access(terminal.get_access(user))) return "mv: Access denied to destination with tag [target]" dest = terminal.disks[/datum/file_storage/network] if(!dest) @@ -398,7 +404,7 @@ Subtypes if(!dest) return "mv: Could not locate file destination." - terminal.current_move = new(terminal.current_disk, dest, F) + terminal.current_move = new(terminal.current_disk, dest, F, copying) return "mv: Beginning file move..." /datum/terminal_command/copy @@ -462,6 +468,106 @@ Subtypes terminal.network_target = uppertext(target_args[1]) return "target: Changed network target to [terminal.network_target]." +/datum/terminal_command/login + name = "login" + man_entry = list("Format: login \[account login\] \[account password\]", "Logs in to the given user account.") + pattern = @"^login" + needs_network = TRUE + +/datum/terminal_command/login/proper_input_entered(text, mob/user, datum/terminal/terminal) + + var/list/login_args = get_arguments(text) + + if(length(login_args) < 2) + return "login: Improper syntax, use login \[account login\] \[account password\]." + + var/datum/extension/interactive/os/account_computer = terminal.get_account_computer() + var/login_success = account_computer.login_account(login_args[1], login_args[2]) + if(login_success) + return "login: Login successful. Welcome [login_args[1]]!" + return "login: Could not log in to account [login_args[1]]. Check password or network connectivity." + +/datum/terminal_command/logout + name = "logout" + man_entry = list("Format: logout", "Logs out of the current user account.") + pattern = @"^logout" + needs_network = TRUE + +/datum/terminal_command/logout/proper_input_entered(text, mob/user, datum/terminal/terminal) + var/datum/extension/interactive/os/account_computer = terminal.get_account_computer() + account_computer.logout_account() + return "logout: Log out successful." + +/datum/terminal_command/permmod + name = "permmod" + man_entry = list("Format: permmod \[file name\] \[access key\] \[permission mod flags\]", "Modifies or lists the permissions of the given file. Do not pass an access key to list permissions.", + "Supported flags are as follows:", + "'+/-' - Add or Remove access requirement", + "'r/w/m' - Target read/write/modification access", + "'u/g' - Add group or individual user access requirement", + "For example, the command 'permmod TestFile bronte.lowe +ru' would add bronte.lowe to the read permissions list of the file TestFile." + ) // TODO: Add an actual flags option for terminal commands in addition to arguments + pattern = @"^permmod" + needs_network = TRUE + +/datum/terminal_command/permmod/proper_input_entered(text, mob/user, datum/terminal/terminal) + + if(!terminal.current_disk) + return "permmod: No disk selected." + + var/list/permmod_args = get_arguments(text) + if(!length(permmod_args)) + return "permmod: Improper syntax, use permmod \[file name\] \[access key\] \[permission mod flags\]." + + var/datum/computer_file/F = terminal.current_disk.get_file(permmod_args[1]) + if(!F) + return "permmod: Could not find file with name [permmod_args[1]]." + + if(length(permmod_args) < 3) + return F.get_perms_readable() + + var/flags = permmod_args[3] + var/mode + var/access_key + var/perm + if(findtext(flags, "-")) + mode = "-" + else if(findtext(flags, "+")) + mode = "+" + if(!mode) + return "permmod: Invalid flag syntax. Use man command to learn more about permmod flag syntax." + + if(findtext(flags, "r")) + perm = OS_READ_ACCESS + else if(findtext(flags, "w")) + perm = OS_WRITE_ACCESS + else if(findtext(flags, "m")) + perm = OS_MOD_ACCESS + else + return "permmod: Invalid flag syntax. Use man command to learn more about permmod flag syntax." + var/datum/computer_network/network = terminal.computer.get_network() + if(findtext(flags, "u")) + var/account_login = permmod_args[2] + if(!network.find_account_by_login(account_login)) + return "permmod: No user account with login '[account_login]' found." + access_key = "[account_login]@[network.network_id]" + else if(findtext(flags, "g")) + var/group_name = permmod_args[2] + var/datum/extension/network_device/acl/acl = network.access_controller + if(!istype(acl)) + return "permmod: No active ACL could be located on the network." + if(!(group_name in acl.get_all_groups())) + return "permmod: No group with name '[group_name]' found." + access_key = "[group_name].[network.network_id]" + else + return "permmod: Invalid flag syntax. Use man command to learn more about permmod flag syntax." + + var/success = F.change_perms(mode, perm, access_key, terminal.get_access(user)) + if(success) + return "permmod: Successfully changed permissions for [F.filename]." + else + return "permmod: Could not change permissions for [F.filename]. You may lack permission modification access." + // Terminal commands for passing information to public variables and methods follows /datum/terminal_command/com name = "com" @@ -510,7 +616,7 @@ Subtypes else if(length(com_args) == 2) called_args = com_args[2] - return D.on_command(com_args[1], called_args, user) + return D.on_command(com_args[1], called_args, terminal.get_access(user)) // Lists the commands available on the target device. /datum/terminal_command/listcom diff --git a/code/modules/modular_computers/terminal/terminal_remote.dm b/code/modules/modular_computers/terminal/terminal_remote.dm index 9cf9740ea53..e74f04f7191 100644 --- a/code/modules/modular_computers/terminal/terminal_remote.dm +++ b/code/modules/modular_computers/terminal/terminal_remote.dm @@ -25,4 +25,7 @@ if(!origin_computer.get_network_status() || !computer.get_network_status()) return FALSE - return TRUE \ No newline at end of file + return TRUE + +/datum/terminal/remote/get_account_computer() + return origin_computer \ No newline at end of file diff --git a/code/modules/modular_computers/terminal/terminal_skill_fail.dm b/code/modules/modular_computers/terminal/terminal_skill_fail.dm index dd596e75cd4..0f1ffccc8bf 100644 --- a/code/modules/modular_computers/terminal/terminal_skill_fail.dm +++ b/code/modules/modular_computers/terminal/terminal_skill_fail.dm @@ -41,8 +41,10 @@ var/global/list/terminal_fails var/fulldata = "" for(var/datum/computer_file/data/L in logs) fulldata += L.generate_file_data() - var/datum/computer_file/data/email_account/server = network.find_email_by_name(EMAIL_DOCUMENTS) - for(var/datum/computer_file/data/email_account/email in network.get_email_addresses()) + var/datum/computer_file/data/account/server = network.find_account_by_login(EMAIL_DOCUMENTS) + if(!server) + return + for(var/datum/computer_file/data/account/email in network.get_accounts_unsorted()) if(!email.can_login || email.suspended) continue var/datum/computer_file/data/email_message/message = new() diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/ladder.dm similarity index 75% rename from code/modules/multiz/structures.dm rename to code/modules/multiz/ladder.dm index 73b2d03185e..8422de3bc85 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/ladder.dm @@ -1,7 +1,3 @@ -////////////////////////////// -//Contents: Ladders, Stairs.// -////////////////////////////// - /obj/structure/ladder name = "ladder" desc = "A ladder. You can climb it up and down." @@ -111,7 +107,7 @@ return ..() /obj/structure/ladder/attackby(obj/item/I, mob/user) - . = ..() + . = !istype(I, /obj/item/grab) && ..() if(!.) climb(user, I) @@ -167,16 +163,11 @@ add_fingerprint(M) - for(var/obj/item/grab/G in M.get_active_grabs()) - G.adjust_position() - var/direction = target_ladder == target_up ? "up" : "down" M.visible_message(SPAN_NOTICE("\The [M] begins climbing [direction] \the [src].")) target_ladder.audible_message(SPAN_NOTICE("You hear something coming [direction] \the [src].")) if(do_after(M, climb_time, src)) climbLadder(M, target_ladder, I) - for (var/obj/item/grab/G in M) - G.adjust_position(force = 1) /obj/structure/ladder/attack_ghost(var/mob/M) instant_climb(M) @@ -225,13 +216,15 @@ if(incapacitated()) to_chat(src, SPAN_WARNING("You are physically unable to climb \the [ladder].")) return FALSE - var/carry_count = 0 + + var/can_carry = can_pull_size + if(loc?.has_gravity()) + can_carry = FLOOR(can_carry * 0.75) for(var/obj/item/grab/G in get_active_grabs()) - to_chat(src, SPAN_WARNING("You can't carry \the [G.affecting] up \the [ladder].")) - return FALSE - if(carry_count > 1) - to_chat(src, SPAN_WARNING("You can't carry more than one person up \the [ladder].")) - return FALSE + can_carry -= G.affecting.get_object_size() + if(can_carry < 0) + to_chat(src, SPAN_WARNING("You can't carry \the [G.affecting] up \the [ladder].")) + return FALSE return TRUE @@ -246,14 +239,14 @@ //We cannot use the ladder, but we probably can remove the obstruction var/atom/movable/M = A if(istype(M) && M.movable_flags & MOVABLE_FLAG_Z_INTERACT) - if(isnull(I)) + if(isnull(I) || istype(I, /obj/item/grab)) M.attack_hand(user) else M.attackby(I, user) return FALSE playsound(src, pick(climbsounds), 50) playsound(target_ladder, pick(climbsounds), 50) - return user.Move(T) + return user.Move(T, (loc.z > T.z) ? DOWN : UP) /obj/structure/ladder/CanPass(obj/mover, turf/source, height, airflow) return airflow || !density @@ -270,79 +263,3 @@ underlays = list(I) else underlays.Cut() - -/obj/structure/stairs - name = "stairs" - desc = "Stairs leading to another deck. Not too useful if the gravity goes out." - icon = 'icons/obj/stairs.dmi' - density = 0 - opacity = 0 - anchored = 1 - layer = RUNE_LAYER - -/obj/structure/stairs/Initialize() - for(var/turf/turf in locs) - var/turf/above = GetAbove(turf) - if(!istype(above)) - warning("Stair created without level above: ([loc.x], [loc.y], [loc.z])") - return INITIALIZE_HINT_QDEL - if(!above.is_open()) - above.ChangeTurf(/turf/simulated/open) - . = ..() - -/obj/structure/stairs/CheckExit(atom/movable/mover, turf/target) - if(get_dir(loc, target) == dir && upperStep(mover.loc)) - return FALSE - return ..() - -/obj/structure/stairs/Bumped(atom/movable/A) - var/turf/target = get_step(GetAbove(A), dir) - var/turf/source = A.loc - var/turf/above = GetAbove(A) - if(above.CanZPass(source, UP) && target.Enter(A, src)) - A.forceMove(target) - if(isliving(A)) - var/mob/living/L = A - for(var/obj/item/grab/G in L.get_active_grabs()) - G.affecting.forceMove(target) - if(ishuman(A)) - var/mob/living/carbon/human/H = A - if(H.has_footsteps()) - playsound(source, 'sound/effects/stairs_step.ogg', 50) - playsound(target, 'sound/effects/stairs_step.ogg', 50) - else - to_chat(A, SPAN_WARNING("Something blocks the path.")) - -/obj/structure/stairs/proc/upperStep(var/turf/T) - return (T == loc) - -/obj/structure/stairs/CanPass(obj/mover, turf/source, height, airflow) - return airflow || !density - -// type paths to make mapping easier. -/obj/structure/stairs/north - dir = NORTH - bound_height = 64 - bound_y = -32 - pixel_y = -32 - -/obj/structure/stairs/south - dir = SOUTH - bound_height = 64 - -/obj/structure/stairs/east - dir = EAST - bound_width = 64 - bound_x = -32 - pixel_x = -32 - -/obj/structure/stairs/west - dir = WEST - bound_width = 64 - -/obj/structure/stairs/short - bound_height = 32 - bound_width = 32 - -/obj/structure/stairs/short/west - dir = WEST \ No newline at end of file diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 1360d30d76a..c0bed448fb5 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -188,7 +188,7 @@ /atom/movable/proc/handle_fall(var/turf/landing) var/turf/previous = get_turf(loc) - forceMove(landing) + Move(landing, get_dir(previous, landing)) if(locate(/obj/structure/stairs) in landing) return 1 if(landing.get_fluid_depth() >= FLUID_DEEP) @@ -228,6 +228,8 @@ return BASE_STORAGE_COST(w_class) /mob/living/carbon/human/apply_fall_damage(var/turf/landing) + if(status_flags & GODMODE) + return if(species && species.handle_fall_special(src, landing)) return var/min_damage = 7 @@ -246,7 +248,7 @@ var/list/victims = list() for(var/tag in list(BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM)) var/obj/item/organ/external/E = get_organ(tag) - if(E && !E.is_stump() && !E.dislocated && !BP_IS_PROSTHETIC(E)) + if(E && !E.is_stump() && !E.is_dislocated() && (E.limb_flags & ORGAN_FLAG_CAN_DISLOCATE) && !BP_IS_PROSTHETIC(E)) victims += E if(victims.len) var/obj/item/organ/external/victim = pick(victims) @@ -323,7 +325,7 @@ /mob/living/simple_animal/aquatic/can_float() return TRUE - + /mob/living/simple_animal/hostile/aquatic/can_float() return TRUE @@ -392,4 +394,4 @@ return /atom/movable/z_observer/singuloCanEat() - return \ No newline at end of file + return diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm new file mode 100644 index 00000000000..f37d3e8c4ce --- /dev/null +++ b/code/modules/multiz/stairs.dm @@ -0,0 +1,67 @@ +/obj/structure/stairs + name = "stairs" + desc = "Stairs leading to another deck. Not too useful if the gravity goes out." + icon = 'icons/obj/stairs.dmi' + density = FALSE + opacity = FALSE + anchored = TRUE + layer = RUNE_LAYER + +/obj/structure/stairs/Initialize() + for(var/turf/turf in locs) + var/turf/above = GetAbove(turf) + if(!istype(above)) + warning("Stair created without level above: ([loc.x], [loc.y], [loc.z])") + return INITIALIZE_HINT_QDEL + if(!above.is_open()) + above.ChangeTurf(/turf/simulated/open) + . = ..() + +/obj/structure/stairs/CheckExit(atom/movable/mover, turf/target) + if((get_dir(loc, target) == dir) && (get_turf(mover) == loc)) + return FALSE + return ..() + +/obj/structure/stairs/Bumped(atom/movable/A) + var/turf/target = get_step(GetAbove(A), dir) + var/turf/source = get_turf(A) + var/turf/above = GetAbove(A) + if(above.CanZPass(source, UP) && target.Enter(A, src)) + A.forceMove(target) + if(isliving(A)) + var/mob/living/L = A + for(var/obj/item/grab/G in L.get_active_grabs()) + G.affecting.forceMove(target) + if(ishuman(A)) + var/mob/living/carbon/human/H = A + if(H.has_footsteps()) + playsound(source, 'sound/effects/stairs_step.ogg', 50) + playsound(target, 'sound/effects/stairs_step.ogg', 50) + else + to_chat(A, SPAN_WARNING("Something blocks the path.")) + +/obj/structure/stairs/CanPass(obj/mover, turf/source, height, airflow) + return airflow || !density + +// type paths to make mapping easier. + +/obj/structure/stairs/long + icon = 'icons/obj/stairs_64.dmi' + bound_height = 64 + +/obj/structure/stairs/long/north + dir = NORTH + bound_y = -32 + pixel_y = -32 + +/obj/structure/stairs/long/east + dir = EAST + bound_width = 64 + bound_height = 32 + bound_x = -32 + pixel_x = -32 + +/obj/structure/stairs/long/west + dir = WEST + bound_width = 64 + bound_height = 32 diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index 725f3a5037e..432248dead2 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -16,6 +16,9 @@ return 0 return 1 +//////////////////////////////// +// Open SIMULATED +//////////////////////////////// /turf/simulated/open name = "open space" icon = 'icons/turf/space.dmi' @@ -24,6 +27,10 @@ pathweight = 100000 //Seriously, don't try and path over this one numbnuts z_flags = ZM_MIMIC_DEFAULTS | ZM_MIMIC_OVERWRITE | ZM_MIMIC_NO_AO | ZM_ALLOW_ATMOS +/turf/simulated/open/flooded + name = "open water" + flooded = TRUE + /turf/simulated/open/CanZPass(atom/A, direction) if(locate(/obj/structure/catwalk, src)) if(z == A.z) @@ -105,9 +112,7 @@ return TRUE //To lay cable. - if(isCoil(C)) - var/obj/item/stack/cable_coil/coil = C - coil.turf_place(src, user) + if(isCoil(C) && try_build_cable(C, user)) return TRUE for(var/atom/movable/M in below) @@ -121,13 +126,14 @@ //Most things use is_plating to test if there is a cover tile on top (like regular floors) /turf/simulated/open/is_plating() - return 1 + return TRUE -/turf/simulated/open/flooded - name = "open water" - flooded = TRUE +/turf/simulated/open/cannot_build_cable() + return 0 -// Whole lot of copypaste below sorry. +//////////////////////////////// +// Open EXTERIOR +//////////////////////////////// /turf/exterior/open name = "open space" icon = 'icons/turf/space.dmi' @@ -205,16 +211,17 @@ return TRUE //To lay cable. - if(isCoil(C)) - var/obj/item/stack/cable_coil/coil = C - coil.turf_place(src, user) + if(isCoil(C) && try_build_cable(C, user)) return TRUE for(var/atom/movable/M in below) if(M.movable_flags & MOVABLE_FLAG_Z_INTERACT) return M.attackby(C, user) -/turf/simulated/open/attack_hand(mob/user) +/turf/exterior/open/attack_hand(mob/user) for(var/atom/movable/M in below) if(M.movable_flags & MOVABLE_FLAG_Z_INTERACT) return M.attack_hand(user) + +/turf/exterior/open/cannot_build_cable() + return 0 diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm index 3c00638f3b6..307134c5b5e 100644 --- a/code/modules/nano/interaction/default.dm +++ b/code/modules/nano/interaction/default.dm @@ -25,7 +25,7 @@ var/global/datum/topic_state/default/default_topic_state = new return // robots can interact with things they can see within their view range - if((src_object in view(src)) && get_dist(src_object, src) <= get_effective_view(client)) + if((src_object in view(client?.view || world.view, src)) && get_dist(src_object, src) <= get_effective_view(client)) return STATUS_INTERACTIVE // interactive (green visibility) return STATUS_DISABLED // no updates, completely disabled (red visibility) @@ -42,7 +42,7 @@ var/global/datum/topic_state/default/default_topic_state = new return STATUS_CLOSE // If an object is in view then we can interact with it - if(src_object in view(get_effective_view(client), src)) + if(src_object in view(client.view, src)) return STATUS_INTERACTIVE // If we're installed in a chassi, rather than transfered to an inteliCard or other container, then check if we have camera view diff --git a/code/modules/nano/interaction/view.dm b/code/modules/nano/interaction/view.dm index 72c1ba2a7e9..328d83f20fa 100644 --- a/code/modules/nano/interaction/view.dm +++ b/code/modules/nano/interaction/view.dm @@ -9,7 +9,7 @@ var/global/datum/topic_state/view/view_topic_state = new /mob/proc/view_can_use_topic(src_object) if(!client) return STATUS_CLOSE - if(src_object in view(get_effective_view(client), src)) + if(src_object in view(client.view, src)) return shared_nano_interaction(src_object) return STATUS_CLOSE diff --git a/code/modules/nano/modules/nano_module.dm b/code/modules/nano/modules/nano_module.dm index 6fd4e7b05ea..299b7d6f85a 100644 --- a/code/modules/nano/modules/nano_module.dm +++ b/code/modules/nano/modules/nano_module.dm @@ -26,11 +26,11 @@ //returns a list. /datum/nano_module/proc/get_access(mob/user) - . = using_access - if(istype(user)) + . = using_access.Copy() + if(user) // Insist on scanning ID again to make things a little less clunky. var/obj/item/card/id/I = user.GetIdCard() if(I) - . |= I.access + . |= I.GetAccess() /datum/nano_module/proc/check_access(var/mob/user, var/access) if(!access) diff --git a/code/modules/organs/ailments/ailments_medical.dm b/code/modules/organs/ailments/ailments_medical.dm index 694165ff25f..16571b88324 100644 --- a/code/modules/organs/ailments/ailments_medical.dm +++ b/code/modules/organs/ailments/ailments_medical.dm @@ -111,7 +111,7 @@ /datum/ailment/sore_joint/can_apply_to(obj/item/organ/_organ) var/obj/item/organ/external/E = _organ - . = ..() && !isnull(E.joint) && E.dislocated > -1 + . = ..() && !isnull(E.joint) && (E.limb_flags & ORGAN_FLAG_CAN_DISLOCATE) /datum/ailment/sore_back name = "sore back" diff --git a/code/modules/organs/external/_external.dm b/code/modules/organs/external/_external.dm index acb4f95c323..b4c25bf7001 100644 --- a/code/modules/organs/external/_external.dm +++ b/code/modules/organs/external/_external.dm @@ -26,7 +26,7 @@ var/pain_disability_threshold // Point at which a limb becomes unusable due to pain. // A bitfield for a collection of limb behavior flags. - var/limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_BREAK + var/limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE // Appearance vars. var/icon_name = null // Icon state base. @@ -58,7 +58,6 @@ // Joint/state stuff. var/joint = "joint" // Descriptive string used in dislocation. var/amputation_point // Descriptive string used in amputation. - var/dislocated = 0 // If you target a joint, you can dislocate the limb, causing temporary damage to the organ. var/encased // Needs to be opened with a saw to access the organs. var/artery_name = "artery" // Flavour text for cartoid artery, aorta, etc. var/arterial_bleed_severity = 1 // Multiplier for bleeding in a limb. @@ -100,34 +99,26 @@ F.completeness = rand(10,90) forensics.add_data(/datum/forensics/fingerprints, F) -/obj/item/organ/external/Initialize(mapload, material_key, datum/dna/given_dna) +/obj/item/organ/external/Initialize(mapload, material_key, datum/dna/given_dna) . = ..() - if(. == INITIALIZE_HINT_QDEL) - return - if(isnull(pain_disability_threshold)) - pain_disability_threshold = (max_damage * 0.75) + if(. != INITIALIZE_HINT_QDEL && isnull(pain_disability_threshold)) + pain_disability_threshold = (max_damage * 0.75) /obj/item/organ/external/Destroy() - - if(wounds) - for(var/datum/wound/wound in wounds) - qdel(wound) - - if(parent) - LAZYREMOVE(parent.children, src) - parent = null - QDEL_NULL_LIST(children) - QDEL_NULL_LIST(internal_organs) - + //Update the hierarchy BEFORE clearing all the vars and refs + . = ..() + //Clear all leftover refs + splinted = null //Splints got deleted in parent proc + parent = null applied_pressure = null - if(splinted && splinted.loc == src) - qdel(splinted) - splinted = null - + QDEL_NULL_LIST(wounds) LAZYCLEARLIST(autopsy_data) - QDEL_NULL_LIST(implants) + LAZYCLEARLIST(children) + LAZYCLEARLIST(internal_organs) + LAZYCLEARLIST(implants) - return ..() + if(owner) + LAZYREMOVE(owner.bad_external_organs, src) /obj/item/organ/external/set_species(specie_name) . = ..() @@ -239,10 +230,11 @@ if(loc != E) return - LAZYDISTINCTADD(E.children, src) - parent = E - owner = E.owner - status &= ~ORGAN_CUT_AWAY + if(istype(E.owner)) + E.owner.add_organ(src, E) + else + do_install(null, E) + combined = TRUE else if(E.parent_organ == organ_tag) @@ -254,10 +246,11 @@ if(!user.unEquip(E, src)) return - LAZYDISTINCTADD(children, E) - E.parent = src - E.owner = owner - E.status &= ~ORGAN_CUT_AWAY + if(istype(E.owner)) + E.owner.add_organ(E, src) + else + E.do_install(null, src) + combined = TRUE else @@ -272,42 +265,77 @@ E.update_icon() return + //Remove sub-limbs + if(W.get_tool_quality(TOOL_SAW) && LAZYLEN(children) && try_saw_off_child(W, user)) + return + //Remove internal items/organs/implants + if(try_remove_internal_item(W, user)) + return + ..() + +//Handles removing internal organs/implants/items still in the detached limb. +/obj/item/organ/external/proc/try_remove_internal_item(var/obj/item/W, var/mob/user) switch(stage) if(0) if(W.sharp) - user.visible_message("[user] cuts [src] open with [W]!") + user.visible_message(SPAN_DANGER("[user] cuts [src] open with [W]!")) stage++ - return + return TRUE if(1) if(istype(W)) - user.visible_message("[user] cracks [src] open like an egg with [W]!") + user.visible_message(SPAN_DANGER("[user] cracks [src] open like an egg with [W]!")) stage++ - return + return TRUE if(2) if(W.sharp || istype(W,/obj/item/hemostat) || isWirecutter(W)) - var/list/organs = get_contents_recursive() - if(LAZYLEN(organs)) - var/obj/item/removing = pick(organs) - var/obj/item/organ/external/current_child = removing.loc - - LAZYREMOVE(current_child.implants, removing) - LAZYREMOVE(current_child.internal_organs, removing) - - status |= ORGAN_CUT_AWAY - if(istype(removing, /obj/item/organ/internal/mmi_holder)) - var/obj/item/organ/internal/mmi_holder/O = removing - removing = O.transfer_and_delete() + var/list/radial_buttons = make_item_radial_menu_choices(get_contents_recursive()) + if(LAZYLEN(radial_buttons)) + var/obj/item/removing = show_radial_menu(user, src, radial_buttons, radius = 42, require_near = TRUE, use_labels = TRUE, check_locs = list(src)) + if(removing) + if(istype(removing, /obj/item/organ)) + var/obj/item/organ/O = removing + O.do_uninstall() + removing.forceMove(get_turf(user)) + + if(user.get_empty_hand_slot()) + user.put_in_hands(removing) + user.visible_message(SPAN_DANGER("[user] extracts [removing] from [src] with [W]!")) + else + user.visible_message(SPAN_DANGER("[user] fishes around fruitlessly in [src] with [W].")) + return TRUE + return FALSE - removing.forceMove(get_turf(user)) +//Handles removing child limbs from the detached limb. +/obj/item/organ/external/proc/try_saw_off_child(var/obj/item/W, var/mob/user) - if(user.get_empty_hand_slot()) - user.put_in_hands(removing) - user.visible_message("[user] extracts [removing] from [src] with [W]!") - else - user.visible_message("[user] fishes around fruitlessly in [src] with [W].") - return - ..() + //Add icons to radial menu + var/list/radial_buttons = make_item_radial_menu_choices(get_limbs_recursive(TRUE)) + if(!LAZYLEN(radial_buttons)) + return + //Display radial menu + var/obj/item/organ/external/removing = show_radial_menu(user, src, radial_buttons, radius = 42, require_near = TRUE, use_labels = TRUE, check_locs = list(src)) + if(!istype(removing)) + return TRUE + + var/cutting_result = !W.do_tool_interaction(TOOL_SAW, user, src, 3 SECONDS, "cutting \the [removing] off") + //Check if the limb is still in the hierarchy + if(cutting_result == 1 || !(removing in get_limbs_recursive(TRUE))) + if(cutting_result != -1) + user.visible_message(SPAN_DANGER("[user] stops trying to cut \the [removing].")) + return TRUE + + //Actually remove it + removing.do_uninstall() + removing.forceMove(get_turf(user)) + compile_icon() + update_icon() + removing.compile_icon() + removing.update_icon() + if(user.get_empty_hand_slot()) + user.put_in_hands(removing) + user.visible_message(SPAN_DANGER("[user] cuts off \the [removing] from [src] with [W]!")) + return TRUE /** * Get a list of contents of this organ and all the child organs @@ -325,20 +353,27 @@ return all_items +/obj/item/organ/external/proc/get_limbs_recursive(var/no_stumps = FALSE) + var/list/all_limbs = list() + for(var/obj/item/organ/external/child in children) + if(no_stumps && child.is_stump()) + continue + all_limbs += child + var/list/sublimbs = child.get_limbs_recursive(no_stumps) + if(sublimbs) + all_limbs += sublimbs + return all_limbs + /obj/item/organ/external/proc/is_dislocated() - if(dislocated > 0) - return 1 - if(is_parent_dislocated()) - return 1//if any parent is dislocated, we are considered dislocated as well - return 0 + return (status & ORGAN_DISLOCATED) || is_parent_dislocated() //if any parent is dislocated, we are considered dislocated as well /obj/item/organ/external/proc/is_parent_dislocated() var/obj/item/organ/external/O = parent - while(O && O.dislocated != -1) - if(O.dislocated == 1) - return 1 + while(O && (O.limb_flags & ORGAN_FLAG_CAN_DISLOCATE)) + if(O.status & ORGAN_DISLOCATED) + return TRUE O = O.parent - return 0 + return FALSE /obj/item/organ/external/proc/update_internal_organs_cost() internal_organs_size = 0 @@ -346,24 +381,31 @@ internal_organs_size += org.get_storage_cost() /obj/item/organ/external/proc/dislocate() - if(dislocated == -1) + if(owner && (owner.status_flags & GODMODE)) + return + if(!(limb_flags & ORGAN_FLAG_CAN_DISLOCATE)) return - dislocated = 1 + status |= ORGAN_DISLOCATED if(owner) + if(can_feel_pain()) + add_pain(20) + owner.apply_effect(5, STUN) owner.verbs |= /mob/living/carbon/human/proc/undislocate -/obj/item/organ/external/proc/undislocate() - if(dislocated == -1) +/obj/item/organ/external/proc/undislocate(var/skip_pain = FALSE) + if(!(limb_flags & ORGAN_FLAG_CAN_DISLOCATE)) return - dislocated = 0 + status &= (~ORGAN_DISLOCATED) if(owner) - owner.shock_stage += 20 + if(!skip_pain && can_feel_pain()) + add_pain(20) + owner.apply_effect(2, STUN) //check to see if we still need the verb for(var/obj/item/organ/external/limb in owner.get_external_organs()) - if(limb.dislocated == 1) + if(limb.is_dislocated()) return owner.verbs -= /mob/living/carbon/human/proc/undislocate @@ -372,37 +414,39 @@ return //If "in_place" is TRUE will make organs skip their install/uninstall effects and the sub-limbs and internal organs -/obj/item/organ/external/do_install(mob/living/carbon/human/target, obj/item/organ/external/affected, in_place, update_icon) +/obj/item/organ/external/do_install(mob/living/carbon/human/target, obj/item/organ/external/affected, in_place, update_icon, detached) if(!(. = ..())) return //If attached to an owner mob if(istype(owner)) //If we expect a parent organ set it up here - if(!parent && parent_organ) - parent = affected? affected : owner.get_organ(parent_organ) + if(!affected && parent_organ) + parent = owner.get_organ(parent_organ) + else + parent = affected // //If we contain any child organs add them to the owner // for(var/obj/item/organ/organ in internal_organs) - owner.add_organ(organ, src, in_place, update_icon) + owner.add_organ(organ, src, in_place, update_icon, detached) for(var/obj/item/organ/external/organ in children) - owner.add_organ(organ, src, in_place, update_icon) + owner.add_organ(organ, src, in_place, update_icon, detached) // //Add any existing organs in the owner that have us as parent // for(var/obj/item/organ/internal/I in owner.get_internal_organs()) if(I.parent_organ == organ_tag) - LAZYDISTINCTADD(I, internal_organs) + LAZYDISTINCTADD(internal_organs, I) update_internal_organs_cost() for(var/obj/item/organ/external/E in owner.get_external_organs()) if(E.parent_organ == organ_tag) E.parent = src - LAZYDISTINCTADD(E, children) + LAZYDISTINCTADD(children, E) //Add any existing implants that should be refering us for(var/obj/implant in implants) @@ -416,18 +460,32 @@ //Handle installing into a stand-alone parent limb to keep dropped limbs in some kind of coherent state if(!affected) affected = loc - if(istype(affected) && parent_type == affected.organ_tag) - parent = affected + if(istype(affected)) + if(parent_organ != affected.organ_tag) + log_warning("obj/item/organ/external/do_install(): The parent organ in the parameters '[affected]'('[affected.organ_tag]') doesn't match the expected parent organ ('[parent_organ]') for '[src]'!") + parent = affected + + //When no owner, make sure we update all our children. Everything else should be implicitely at the right place + for(var/obj/item/organ/external/organ in children) + organ.do_install(null, src, in_place, update_icon, detached) + + //This proc refers to owner's species and all kind of risky stuff, so it cannot be done in_place + if(!in_place) + update_wounds() //Parent hieracrchy handling if(parent) - LAZYDISTINCTADD(parent.children, src) - //Remove all stump wounds since limb is not missing anymore + //Add ourselves to our parent organ's data + LAZYDISTINCTADD(parent.children, src) //Even when detached the limb has to be in the children list, because of the way limbs icon are handled + + //Remove any stump wound for this slot for(var/datum/wound/lost_limb/W in parent.wounds) - //#FIXME: this only remove one random wound.. If there's more than one removed organ, it probably won't work visually? - qdel(W) - break - parent.update_damages() + if(W.limb_tag == organ_tag) + qdel(W) //Removes itself from parent.wounds + break + + if(!in_place) + parent.update_wounds() /obj/item/organ/external/proc/drop_equipped_clothing() if(!owner) @@ -494,18 +552,23 @@ This function completely restores a damaged organ to perfect condition. */ /obj/item/organ/external/rejuvenate(var/ignore_prosthetic_prefs) - damage_state = "00" + damage_state = "00" status = 0 brute_dam = 0 + brute_ratio = 0 burn_dam = 0 + burn_ratio = 0 germ_level = 0 - pain = 0 genetic_degradation = 0 + for(var/datum/wound/wound in wounds) qdel(wound) number_wounds = 0 + damage = 0 + pain = 0 + // handle internal organs for(var/obj/item/organ/current_organ in internal_organs) current_organ.rejuvenate(ignore_prosthetic_prefs) @@ -522,6 +585,8 @@ This function completely restores a damaged organ to perfect condition. aspect.apply(owner) owner.updatehealth() + undislocate(TRUE) + if(!QDELETED(src) && species) species.post_organ_rejuvenate(src, owner) @@ -598,7 +663,7 @@ This function completely restores a damaged organ to perfect condition. var/wound_type = get_wound_type(type, damage) if(wound_type) - var/datum/wound/W = new wound_type(damage, src) + var/datum/wound/W = new wound_type(damage, src, surgical) //Check whether we can add the wound to an existing wound if(surgical) @@ -774,7 +839,7 @@ Note that amputating the affected organ does in fact remove the infection from t // slow healing var/heal_amt = 0 // if damage >= 50 AFTER treatment then it's probably too severe to heal within the timeframe of a round. - if (!GET_CHEMICAL_EFFECT(owner, CE_TOXIN) && W.can_autoheal() && W.wound_damage() && brute_ratio < 0.5 && burn_ratio < 0.5) + if (owner && !GET_CHEMICAL_EFFECT(owner, CE_TOXIN) && W.can_autoheal() && W.wound_damage() && brute_ratio < 0.5 && burn_ratio < 0.5) heal_amt += 0.5 //we only update wounds once in [wound_update_accuracy] ticks so have to emulate realtime @@ -788,7 +853,7 @@ Note that amputating the affected organ does in fact remove the infection from t var/dam_type = BRUTE if(W.damage_type == BURN) dam_type = BURN - if(owner.can_autoheal(dam_type)) + if(owner?.can_autoheal(dam_type)) W.heal_damage(heal_amt) // sync the organ's damage with its wounds @@ -950,7 +1015,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(istype(last_owner) && !QDELETED(last_owner) && LAZYLEN(last_owner.get_external_organs()) <= 1) last_owner.physically_destroyed(FALSE, disintegrate) - if(QDELETED(src)) + if(QDELETED(src) || is_stump()) return if(original_parent) @@ -958,6 +1023,7 @@ Note that amputating the affected organ does in fact remove the infection from t var/obj/item/organ/external/damaged_organ = original_parent if(!clean) var/obj/item/organ/external/stump/stump = new (victim, 0, src) + victim.add_organ(stump, damaged_organ) stump.add_pain(max_damage) damaged_organ = stump if(disintegrate != DISMEMBER_METHOD_BURN) @@ -1008,17 +1074,17 @@ Note that amputating the affected organ does in fact remove the infection from t G.basecolor = use_blood_color G.update_icon() - gore.throw_at(get_edge_target_turf(src,pick(global.alldirs)),rand(1,3),30) + gore.throw_at(get_edge_target_turf(src,pick(global.alldirs)), rand(1,3), THROWFORCE_GIBS) for(var/obj/item/organ/I in internal_organs) I.do_uninstall() //No owner so run uninstall directly I.dropInto(get_turf(loc)) if(!QDELETED(I) && isturf(loc)) - I.throw_at(get_edge_target_turf(src,pick(global.alldirs)),rand(1,3),30) + I.throw_at(get_edge_target_turf(src,pick(global.alldirs)), rand(1,3), THROWFORCE_GIBS) for(var/obj/item/I in src) I.dropInto(loc) - I.throw_at(get_edge_target_turf(src,pick(global.alldirs)),rand(1,3),30) + I.throw_at(get_edge_target_turf(src,pick(global.alldirs)), rand(1,3), THROWFORCE_GIBS) qdel(src) @@ -1026,9 +1092,6 @@ Note that amputating the affected organ does in fact remove the infection from t HELPERS ****************************************************/ -/obj/item/organ/external/proc/is_stump() - return 0 - /obj/item/organ/external/proc/release_restraints(var/mob/living/carbon/human/holder) if(!holder) holder = owner @@ -1189,17 +1252,26 @@ Note that amputating the affected organ does in fact remove the infection from t /obj/item/organ/external/setup_as_prosthetic() . = ..(model ? model : /decl/prosthetics_manufacturer) -/obj/item/organ/external/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics = 0, var/keep_organs = 0, var/apply_material = /decl/material/solid/metal/steel) +/obj/item/organ/external/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics = 0, var/keep_organs = 0, var/apply_material = /decl/material/solid/metal/steel, var/check_bodytype, var/check_species) . = ..() slowdown = 0 - if(!ispath(company, /decl/prosthetics_manufacturer)) - PRINT_STACK_TRACE("Limb [type] robotize() was supplied a null or non-decl manufacturer: '[company]'") + var/decl/prosthetics_manufacturer/R + if(istype(company, /decl/prosthetics_manufacturer)) + //Handling for decl + R = company + company = R.type + else + //Handling for paths + if(!ispath(company)) + PRINT_STACK_TRACE("Limb [type] robotize() was supplied a null or non-decl manufacturer: '[company]'") + company = /decl/prosthetics_manufacturer + R = GET_DECL(company) + + //If can't install fallback to default + if(!R.check_can_install(organ_tag, (check_bodytype || owner?.get_bodytype_category() || global.using_map.default_bodytype), (check_species || owner?.get_species_name() || global.using_map.default_species))) company = /decl/prosthetics_manufacturer - - var/decl/prosthetics_manufacturer/R = GET_DECL(company) - if(!R.check_can_install(organ_tag, (owner?.get_bodytype_category() || global.using_map.default_bodytype), (owner?.get_species_name() || global.using_map.default_species))) R = GET_DECL(/decl/prosthetics_manufacturer) model = company @@ -1209,7 +1281,8 @@ Note that amputating the affected organ does in fact remove the infection from t slowdown = R.movement_slowdown max_damage *= R.hardiness min_broken_damage *= R.hardiness - dislocated = -1 + status &= (~ORGAN_DISLOCATED) + limb_flags &= (~ORGAN_FLAG_CAN_DISLOCATE) remove_splint() update_icon(1) unmutate() @@ -1285,8 +1358,9 @@ Note that amputating the affected organ does in fact remove the infection from t W.forceMove(owner) /obj/item/organ/external/do_uninstall(in_place, detach, ignore_children, update_icon) - var/mob/living/carbon/human/victim = owner - . = ..() + var/mob/living/carbon/human/victim = owner //parent proc clears owner + if(!(. = ..())) + return if(victim) if(in_place) @@ -1305,33 +1379,42 @@ Note that amputating the affected organ does in fact remove the infection from t for(var/atom/movable/implant in implants) //large items and non-item objs fall to the floor, everything else stays var/obj/item/I = implant + if(QDELETED(implant)) + LAZYREMOVE(implants, implant) + continue if(istype(I) && I.w_class < ITEM_SIZE_NORMAL) + if(istype(I, /obj/item/implant)) + var/obj/item/implant/imp = I + imp.removed() implant.forceMove(src) else + //Dumpt the rest on the turf LAZYREMOVE(implants, implant) implant.forceMove(get_turf(src)) if(!ignore_children) //Move our chilren limb into our contents for(var/obj/item/organ/external/O in children) - victim.remove_organ(O, drop_organ = FALSE, ignore_children = TRUE) + victim.remove_organ(O, FALSE, FALSE, FALSE, in_place, update_icon) if(QDELETED(O)) + LAZYREMOVE(children, O) continue - // if we didn't lose the organ we still want it as a child - O.forceMove(src) - LAZYDISTINCTADD(children, O) - O.parent = src + O.do_install(null, src, FALSE, update_icon, FALSE) //Forcemove the organ and properly set it up in our internal data // Grab all the children internal organs - for(var/obj/item/organ/organ in internal_organs) - victim.remove_organ(organ, FALSE, FALSE, FALSE, in_place, update_icon) // Organ stays inside and connected - if(!QDELETED(organ)) - organ.forceMove(src) + for(var/obj/item/organ/internal/organ in internal_organs) + victim.remove_organ(organ, FALSE, FALSE, FALSE, in_place, update_icon) + if(QDELETED(organ)) + LAZYREMOVE(internal_organs, organ) + continue + organ.do_install(null, src, FALSE, update_icon, FALSE) //Forcemove the organ and properly set it up in our internal data + + //Note that we don't need to change our own hierarchy when not removing from a mob // Remove parent references if(parent) LAZYREMOVE(parent.children, src) - parent = null + parent = null /obj/item/organ/external/on_remove_effects(mob/living/last_owner) . = ..() @@ -1401,8 +1484,9 @@ Note that amputating the affected organ does in fact remove the infection from t if(encased && (status & ORGAN_BROKEN)) . = SURGERY_ENCASED else - var/smol_threshold = min_broken_damage * 0.4 - var/beeg_threshold = min_broken_damage * 0.6 + var/total_health_coefficient = scale_max_damage_to_species_health ? (species.total_health / DEFAULT_SPECIES_HEALTH) : 1 + var/smol_threshold = max(1, FLOOR(min_broken_damage * 0.4 * total_health_coefficient)) + var/beeg_threshold = max(1, FLOOR(min_broken_damage * 0.6 * total_health_coefficient)) if(!incision.autoheal_cutoff == 0) //not clean incision smol_threshold *= 1.5 beeg_threshold = max(beeg_threshold, min(beeg_threshold * 1.5, incision.damage_list[1])) //wounds can't achieve bigger @@ -1479,13 +1563,15 @@ Note that amputating the affected organ does in fact remove the infection from t /obj/item/organ/external/add_ailment(var/datum/ailment/ailment) . = ..() if(. && owner) - owner.bad_external_organs |= src + LAZYDISTINCTADD(owner.bad_external_organs, src) /obj/item/organ/external/die() //External organs dying on a dime causes some real issues in combat if(!BP_IS_PROSTHETIC(src) && !BP_IS_CRYSTAL(src)) var/decay_rate = damage/(max_damage*2) germ_level += round(rand(decay_rate,decay_rate*1.5)) //So instead, we're going to say the damage is so severe its functions are slowly failing due to the extensive damage - else + else //TODO: more advanced system for synths + if(istype(src,/obj/item/organ/external/chest) || istype(src,/obj/item/organ/external/groin)) + return status |= ORGAN_DEAD if(status & ORGAN_DEAD) //The organic dying part is covered in germ handling STOP_PROCESSING(SSobj, src) @@ -1494,3 +1580,10 @@ Note that amputating the affected organ does in fact remove the infection from t /obj/item/organ/external/is_internal() return FALSE + +/obj/item/organ/external/get_contained_external_atoms() + . = ..() + //Prevent stumps and things that shouldn't be dropped from getting dumped out + for(var/obj/item/organ/O in .) + if(!O.is_droppable()) + . -= O diff --git a/code/modules/organs/external/diagnostics.dm b/code/modules/organs/external/diagnostics.dm index a6eb88e1e2a..37eb71784f0 100644 --- a/code/modules/organs/external/diagnostics.dm +++ b/code/modules/organs/external/diagnostics.dm @@ -84,7 +84,7 @@ . += "[capitalize(artery_name)] ruptured" if(status & ORGAN_TENDON_CUT) . += "Severed [tendon_name]" - if(dislocated == 2) // non-magical constants when + if(is_dislocated()) . += "Dislocated" if(splinted) . += "Splinted" @@ -163,7 +163,7 @@ if(status & ORGAN_TENDON_CUT) to_chat(user, "The tendons in [name] are severed!") - if(dislocated == 2) + if(is_dislocated()) to_chat(user, "The [joint] is dislocated!") return 1 diff --git a/code/modules/organs/external/head.dm b/code/modules/organs/external/head.dm index 8b116205194..489af427207 100644 --- a/code/modules/organs/external/head.dm +++ b/code/modules/organs/external/head.dm @@ -15,7 +15,7 @@ artery_name = "carotid artery" cavity_name = "cranial" - limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_HEALS_OVERKILL | ORGAN_FLAG_CAN_BREAK + limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_HEALS_OVERKILL | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE var/draw_eyes = TRUE var/glowing_eyes = FALSE @@ -76,8 +76,8 @@ /obj/item/organ/external/head/get_agony_multiplier() return (owner && owner.headcheck(organ_tag)) ? 1.50 : 1 -/obj/item/organ/external/head/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics, var/keep_organs, var/apply_material = /decl/material/solid/metal/steel) - . = ..(company, skip_prosthetics, 1) +/obj/item/organ/external/head/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics = 0, var/keep_organs = 1, var/apply_material = /decl/material/solid/metal/steel, var/check_bodytype, var/check_species) + . = ..() has_lips = null if(model) var/decl/prosthetics_manufacturer/R = GET_DECL(model) diff --git a/code/modules/organs/external/standard.dm b/code/modules/organs/external/standard.dm index eddfcc498b6..fd5da9c8f9b 100644 --- a/code/modules/organs/external/standard.dm +++ b/code/modules/organs/external/standard.dm @@ -16,7 +16,6 @@ vital = 1 amputation_point = "spine" joint = "neck" - dislocated = -1 parent_organ = null encased = "ribcage" artery_name = "aorta" @@ -38,6 +37,10 @@ return . = ..() +//Can't drop root limb +/obj/item/organ/external/chest/is_droppable() + return FALSE + /obj/item/organ/external/groin name = "lower body" organ_tag = BP_GROIN @@ -50,7 +53,6 @@ parent_organ = BP_CHEST amputation_point = "lumbar" joint = "hip" - dislocated = -1 artery_name = "iliac artery" cavity_name = "abdominal" limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_BREAK @@ -75,7 +77,7 @@ tendon_name = "palmaris longus tendon" artery_name = "basilic vein" arterial_bleed_severity = 0.75 - limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK + limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE /obj/item/organ/external/arm/right organ_tag = BP_R_ARM @@ -100,7 +102,7 @@ tendon_name = "cruciate ligament" artery_name = "femoral artery" arterial_bleed_severity = 0.75 - limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK + limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE /obj/item/organ/external/leg/right organ_tag = BP_R_LEG @@ -125,7 +127,7 @@ amputation_point = "left ankle" tendon_name = "Achilles tendon" arterial_bleed_severity = 0.5 - limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK + limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE /obj/item/organ/external/foot/right organ_tag = BP_R_FOOT @@ -151,12 +153,12 @@ amputation_point = "left wrist" tendon_name = "carpal ligament" arterial_bleed_severity = 0.5 - limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_FINGERPRINT | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK + limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_FINGERPRINT | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE var/gripper_ui_label = "L" var/gripper_ui_loc = ui_lhand var/overlay_slot_id = BP_L_HAND -/obj/item/organ/external/hand/do_install(mob/living/carbon/human/target, affected, in_place, update_icon) +/obj/item/organ/external/hand/do_install(mob/living/carbon/human/target, affected, in_place, update_icon, detached) if(!(. = ..())) return owner?.add_held_item_slot(organ_tag, gripper_ui_loc, overlay_slot_id, gripper_ui_label) diff --git a/code/modules/organs/external/stump.dm b/code/modules/organs/external/stump.dm index 8ae5e37f0fd..3c12fe4ae0b 100644 --- a/code/modules/organs/external/stump.dm +++ b/code/modules/organs/external/stump.dm @@ -1,12 +1,7 @@ /obj/item/organ/external/stump name = "limb stump" icon_name = "" - dislocated = -1 - -/obj/item/organ/external/stump/on_remove_effects(mob/living/last_owner) - if(!(. = ..())) - return - qdel(src) + limb_flags = ORGAN_FLAG_CAN_AMPUTATE //Needs this for limb replacement surgery. Since you need to remove stumps first /obj/item/organ/external/stump/Initialize(mapload, var/internal, var/obj/item/organ/external/limb) if(istype(limb)) @@ -27,4 +22,19 @@ status |= ORGAN_CRYSTAL // Likewise with crystalline limbs. /obj/item/organ/external/stump/is_stump() - return 1 + return TRUE + +//Don't let stumps be dropped +/obj/item/organ/external/stump/is_droppable() + return FALSE + +//Stumps don't generate droplimb messages +/obj/item/organ/external/stump/get_droplimb_messages_for(droptype, clean) + return + +//Warn on dropping a stump. +/obj/item/organ/external/stump/dropInto(atom/destination) + . = ..() + //QDeleted stumps will be dropped due to how items works. But otherwise make sure to make a stack trace + if(!QDELETED(src)) + CRASH("[src] was dropped into the world!") \ No newline at end of file diff --git a/code/modules/organs/external/tail.dm b/code/modules/organs/external/tail.dm index 1bca218536e..90111c3d2d6 100644 --- a/code/modules/organs/external/tail.dm +++ b/code/modules/organs/external/tail.dm @@ -12,7 +12,7 @@ amputation_point = "tail" artery_name = "vein" arterial_bleed_severity = 0.3 - limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_BREAK + limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE var/tail // Name of tail state in species effects icon file. var/tail_animation // If set, the icon to obtain tail animation states from. @@ -29,7 +29,7 @@ if(update_icon && !istype(H) && H != owner) H.update_tail_showing(FALSE) -/obj/item/organ/external/tail/do_install(mob/living/carbon/human/target, affected, in_place, update_icon) +/obj/item/organ/external/tail/do_install(mob/living/carbon/human/target, affected, in_place, update_icon, detached) . = ..() if(update_icon && istype(owner)) owner.update_tail_showing(FALSE) diff --git a/code/modules/organs/external/unbreakable.dm b/code/modules/organs/external/unbreakable.dm index 43261f3dcd8..c390b07dfc3 100644 --- a/code/modules/organs/external/unbreakable.dm +++ b/code/modules/organs/external/unbreakable.dm @@ -1,55 +1,44 @@ // Slime/xeno limbs. /obj/item/organ/external/chest/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = 0 /obj/item/organ/external/groin/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE /obj/item/organ/external/arm/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE /obj/item/organ/external/arm/right/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE /obj/item/organ/external/leg/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND /obj/item/organ/external/leg/right/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE /obj/item/organ/external/foot/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND /obj/item/organ/external/foot/right/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE /obj/item/organ/external/hand/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE /obj/item/organ/external/hand/right/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE /obj/item/organ/external/head/unbreakable - dislocated = -1 arterial_bleed_severity = 0 limb_flags = ORGAN_FLAG_CAN_AMPUTATE diff --git a/code/modules/organs/external/wounds/wound.dm b/code/modules/organs/external/wounds/wound.dm index 8f8cc9f0546..47e239bc8d8 100644 --- a/code/modules/organs/external/wounds/wound.dm +++ b/code/modules/organs/external/wounds/wound.dm @@ -29,7 +29,7 @@ var/tmp/list/desc_list = list() var/tmp/list/damage_list = list() -/datum/wound/New(var/damage, var/obj/item/organ/external/organ = null) +/datum/wound/New(var/damage, var/obj/item/organ/external/organ = null, var/surgical) created = world.time @@ -39,6 +39,10 @@ desc_list += V damage_list += stages[V] + // Surgical wounds need to be at minimum big enough to be considered open, which is max_bleeding_stage. + if(surgical) + damage = max(damage, damage_list[Clamp(max_bleeding_stage, 1, length(damage_list))]+1) + src.damage = damage // initialize with the appropriate stage diff --git a/code/modules/organs/external/wounds/wound_types.dm b/code/modules/organs/external/wounds/wound_types.dm index 86556090e23..e2c538a45b9 100644 --- a/code/modules/organs/external/wounds/wound_types.dm +++ b/code/modules/organs/external/wounds/wound_types.dm @@ -269,10 +269,12 @@ /** EXTERNAL ORGAN LOSS **/ /datum/wound/lost_limb + var/limb_tag /datum/wound/lost_limb/New(var/obj/item/organ/external/lost_limb, var/losstype, var/clean) var/damage_amt = lost_limb.max_damage if(clean) damage_amt /= 2 + limb_tag = lost_limb.organ_tag switch(losstype) if(DISMEMBER_METHOD_EDGE, DISMEMBER_METHOD_BLUNT) diff --git a/code/modules/organs/internal/_internal.dm b/code/modules/organs/internal/_internal.dm index c096f544092..f047eb7867b 100644 --- a/code/modules/organs/internal/_internal.dm +++ b/code/modules/organs/internal/_internal.dm @@ -15,8 +15,6 @@ /obj/item/organ/internal/Initialize(mapload, material_key, datum/dna/given_dna) if(!alive_icon) alive_icon = initial(icon_state) - if(max_damage) - min_bruised_damage = FLOOR(max_damage / 4) . = ..() /obj/item/organ/internal/set_species(species_name) @@ -24,38 +22,46 @@ if(species.organs_icon) icon = species.organs_icon -//disconnected the organ from it's owner but does not remove it, instead it becomes an implant that can be removed with implant surgery -//TODO move this to organ/internal once the FPB port comes through -/obj/item/organ/proc/cut_away(var/mob/living/user) - var/obj/item/organ/external/parent = owner.get_organ(parent_organ) - if(istype(parent)) //TODO ensure that we don't have to check this. - do_uninstall(detach = TRUE) // - LAZYADD(parent.implants, src) +/obj/item/organ/internal/do_install(mob/living/carbon/human/target, obj/item/organ/external/affected, in_place, update_icon, detached) + . = ..() -/obj/item/organ/internal/do_install(mob/living/carbon/human/target, obj/item/organ/external/affected, in_place) - if(status & ORGAN_CUT_AWAY || !(. = ..())) - return + if(!affected) + log_warning("'[src]' called obj/item/organ/internal/do_install(), but its expected parent organ is null!") - STOP_PROCESSING(SSobj, src) - LAZYDISTINCTADD(affected.internal_organs, src) - affected.cavity_max_w_class = max(affected.cavity_max_w_class, w_class) - affected.update_internal_organs_cost() + //The organ may only update and etc if its being attached, or isn't cut away. + //Calls up the chain should have set the CUT_AWAY flag already + if(status & ORGAN_CUT_AWAY) + LAZYDISTINCTADD(affected.implants, src) //Add us to the detached organs list + LAZYREMOVE(affected.internal_organs, src) + else + STOP_PROCESSING(SSobj, src) + LAZYREMOVE(affected.implants, src) //Make sure we're not in the implant list anymore + LAZYDISTINCTADD(affected.internal_organs, src) + affected.cavity_max_w_class = max(affected.cavity_max_w_class, w_class) + affected.update_internal_organs_cost() -/obj/item/organ/internal/do_uninstall(in_place, detach, ignore_children) +/obj/item/organ/internal/do_uninstall(in_place, detach, ignore_children, update_icon) //Make sure we're removed from whatever parent organ we have, either in a mob or not - var/obj/item/organ/external/P = null + var/obj/item/organ/external/affected if(owner) - P = owner.get_organ(parent_organ) + affected = owner.get_organ(parent_organ) else if(istype(loc, /obj/item/organ/external)) var/obj/item/organ/external/E = loc if(E.organ_tag == parent_organ) - P = E - - if(P) - LAZYREMOVE(P.internal_organs, src) - P.update_internal_organs_cost() + affected = E + //We can be removed from a mob even if we have no parents, if we're in a detached state + if(affected) + LAZYREMOVE(affected.internal_organs, src) + affected.update_internal_organs_cost() . = ..() + //Remove it from the implants if we are fully removing, or add it to the implants if we are detaching + if(affected) + if(status & ORGAN_CUT_AWAY) + LAZYDISTINCTADD(affected.implants, src) + else + LAZYREMOVE(affected.implants, src) + //#TODO: Remove rejuv hacks /obj/item/organ/internal/remove_rejuv() do_uninstall() @@ -64,8 +70,8 @@ /obj/item/organ/internal/is_usable() return ..() && !is_broken() -/obj/item/organ/internal/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics, var/keep_organs, var/apply_material = /decl/material/solid/metal/steel) - ..() +/obj/item/organ/internal/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics = 0, var/keep_organs = 0, var/apply_material = /decl/material/solid/metal/steel, var/check_bodytype, var/check_species) + . = ..() min_bruised_damage += 5 min_broken_damage += 10 @@ -151,7 +157,7 @@ heal_damage(damage) /obj/item/organ/internal/proc/get_scarring_level() - . = (initial(max_damage) - max_damage)/initial(max_damage) + . = (absolute_max_damage - max_damage)/absolute_max_damage /obj/item/organ/internal/get_scan_results() . = ..() diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index b5497469ff8..ec288a3cd09 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -23,7 +23,7 @@ var/healed_threshold = 1 var/oxygen_reserve = 6 -/obj/item/organ/internal/brain/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics, var/keep_organs, var/apply_material = /decl/material/solid/metal/steel) +/obj/item/organ/internal/brain/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics = 0, var/keep_organs = 0, var/apply_material = /decl/material/solid/metal/steel, var/check_bodytype, var/check_species) replace_self_with(/obj/item/organ/internal/posibrain) /obj/item/organ/internal/brain/mechassist() @@ -37,7 +37,7 @@ owner.remove_organ(src, FALSE, FALSE, TRUE, TRUE, FALSE) qdel(src) if(tmp_owner) - var/obj/item/organ/org = new replace_path(tmp_owner, given_dna = dna) + var/obj/item/organ/org = new replace_path(tmp_owner, null, dna) tmp_owner.add_organ(org, tmp_owner.get_organ(org.parent_organ), TRUE, TRUE) tmp_owner = null @@ -78,17 +78,17 @@ else to_chat(user, "This one seems particularly lifeless. Perhaps it will regain some of its luster later..") -/obj/item/organ/internal/brain/do_install(mob/living/carbon/target, affected, in_place, update_icon) +/obj/item/organ/internal/brain/do_install(mob/living/carbon/target, affected, in_place, update_icon, detached) if(!(. = ..())) return if(istype(owner)) SetName(initial(name)) //Reset the organ's name to stay coherent if we're putting it back into someone's skull /obj/item/organ/internal/brain/do_uninstall(in_place, detach, ignore_children, update_icon) - if(!(. = ..())) - return if(!in_place && istype(owner) && name == initial(name)) SetName("\the [owner.real_name]'s [initial(name)]") + if(!(. = ..())) + return /obj/item/organ/internal/brain/on_remove_effects() if(istype(owner)) diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm index f8847baaedc..c40ec28e3eb 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -83,7 +83,7 @@ /obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity) return -1 -/obj/item/organ/internal/eyes/do_install(mob/living/carbon/human/target, affected, in_place, update_icon) +/obj/item/organ/internal/eyes/do_install(mob/living/carbon/human/target, affected, in_place, update_icon, detached) // Apply our eye colour to the target. if(istype(target) && eye_colour) target.eye_colour = eye_colour @@ -98,8 +98,8 @@ verbs -= /obj/item/organ/internal/eyes/proc/change_eye_color verbs -= /obj/item/organ/internal/eyes/proc/toggle_eye_glow -/obj/item/organ/internal/eyes/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics, var/keep_organs, var/apply_material = /decl/material/solid/metal/steel) - ..() +/obj/item/organ/internal/eyes/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics = 0, var/keep_organs = 0, var/apply_material = /decl/material/solid/metal/steel, var/check_bodytype, var/check_species) + . = ..() name = "optical sensor" icon = 'icons/obj/robot_component.dmi' diff --git a/code/modules/organs/internal/heart.dm b/code/modules/organs/internal/heart.dm index 2416b75701c..d58df75f2e1 100644 --- a/code/modules/organs/internal/heart.dm +++ b/code/modules/organs/internal/heart.dm @@ -214,4 +214,11 @@ . = "[pulsesound] pulse" /obj/item/organ/internal/heart/get_mechanical_assisted_descriptor() - return "pacemaker-assisted [name]" \ No newline at end of file + return "pacemaker-assisted [name]" + +/obj/item/organ/internal/heart/rejuvenate(ignore_prosthetic_prefs) + . = ..() + if(!BP_IS_PROSTHETIC(src)) + pulse = PULSE_NORM + else + pulse = PULSE_NONE \ No newline at end of file diff --git a/code/modules/organs/internal/posibrain.dm b/code/modules/organs/internal/posibrain.dm index 56d5fdf4684..a529eb8fc8a 100644 --- a/code/modules/organs/internal/posibrain.dm +++ b/code/modules/organs/internal/posibrain.dm @@ -176,8 +176,8 @@ transfer_identity(owner) return ..() -/obj/item/organ/internal/posibrain/do_install(var/mob/living/target) - if(!(. = ..())) +/obj/item/organ/internal/posibrain/do_install(mob/living/carbon/human/target, obj/item/organ/external/affected, in_place, update_icon, detached) + if(!(. = ..())) return if(istype(owner)) SetName(initial(name)) //Reset the organ's name to stay coherent if we're put back into someone's skull @@ -248,7 +248,7 @@ return 0 return cell && cell.use(amount) -/obj/item/organ/internal/cell/proc/get_power_drain() +/obj/item/organ/internal/cell/proc/get_power_drain() var/damage_factor = 1 + 10 * damage/max_damage return servo_cost * damage_factor @@ -321,10 +321,13 @@ /obj/item/organ/internal/mmi_holder/Destroy() stored_mmi = null + persistantMind = null return ..() -/obj/item/organ/internal/mmi_holder/Initialize(mapload, var/internal) - . = ..() +/obj/item/organ/internal/mmi_holder/do_install(mob/living/carbon/human/target, obj/item/organ/external/affected, in_place) + if(status & ORGAN_CUT_AWAY || !(. = ..())) + return + if(!stored_mmi) stored_mmi = new(src) update_from_mmi() @@ -355,14 +358,6 @@ owner.switch_from_dead_to_living_mob_list() owner.visible_message("\The [owner] twitches visibly!") -/obj/item/organ/internal/mmi_holder/cut_away(var/mob/living/user) - var/obj/item/organ/external/parent = owner.get_organ(parent_organ) - if(istype(parent)) - do_uninstall(detach = TRUE) //#TODO: detach proc for organs/mobs so we have less args to pass.. - var/brain = transfer_and_delete() - if(brain) - LAZYADD(parent.implants, brain) - /obj/item/organ/internal/mmi_holder/on_remove_effects(mob/living/last_owner) if(last_owner && last_owner.mind) persistantMind = last_owner.mind @@ -380,4 +375,10 @@ var/response = input(find_dead_player(ownerckey, 1), "Your [initial(stored_mmi.name)] has been removed from your body. Do you wish to return to life?", "Robotic Rebirth") as anything in list("Yes", "No") if(response == "Yes") persistantMind.transfer_to(stored_mmi.brainmob) - qdel(src) \ No newline at end of file + qdel(src) + +//Since the mmi_holder is an horrible hacky pos we turn it into a mmi on drop, since it shouldn't exist outside a mob +/obj/item/organ/internal/mmi_holder/dropInto(atom/destination) + . = ..() + if (!QDELETED(src)) + transfer_and_delete() diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 2f02f7d0dd3..076243b47a2 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -26,18 +26,21 @@ // Damage vars. var/damage = 0 // Current damage to the organ var/min_broken_damage = 30 // Damage before becoming broken - var/max_damage = 30 // Damage cap + var/max_damage = 30 // Damage cap, including scarring + var/absolute_max_damage = 0 // Lifetime damage cap, ignoring scarring. var/rejecting // Is this organ already being rejected? - var/death_time // world.time at moment of death. + var/death_time // REALTIMEOFDAY at moment of death. var/scale_max_damage_to_species_health // Whether or not we should scale the damage values of this organ to the owner species. /obj/item/organ/Destroy() if(owner) - owner.remove_organ(src, FALSE, FALSE, TRUE, TRUE, FALSE) //Tell our parent we're unisntalling silently + owner.remove_organ(src, FALSE, FALSE, TRUE, TRUE, FALSE) //Tell our parent we're unisntalling in place else do_uninstall(TRUE, FALSE, FALSE, FALSE) //Don't ignore children here since we might own/contain them owner = null dna = null + species = null + bodytype = null QDEL_NULL_LIST(ailments) return ..() @@ -56,38 +59,30 @@ //Third rgument may be a dna datum; if null will be set to holder's dna. /obj/item/organ/Initialize(mapload, material_key, var/datum/dna/given_dna) . = ..(mapload, material_key) - if(. == INITIALIZE_HINT_QDEL) - return - - if(max_damage) - min_broken_damage = FLOOR(max_damage / 2) - else - max_damage = min_broken_damage * 2 - - if(!BP_IS_PROSTHETIC(src)) - setup_as_organic(given_dna) - else - setup_as_prosthetic() - - update_icon() + if(. != INITIALIZE_HINT_QDEL) + if(!BP_IS_PROSTHETIC(src)) + setup_as_organic(given_dna) + else + setup_as_prosthetic() /obj/item/organ/proc/setup_as_organic(var/datum/dna/given_dna) //Null DNA setup if(!given_dna) if(dna) given_dna = dna //Use existing if possible - else if(owner) - if(owner.dna) + else if(owner) + if(owner.dna) given_dna = owner.dna //Grab our owner's dna if we don't have any, and they have else //The owner having no DNA can be a valid reason to keep our dna null in some cases - dna = null + log_debug("obj/item/organ/setup_as_organic(): [src] had null dna, with a owner with null dna!") + dna = null //#TODO: Not sure that's really legal return else //If we have NO OWNER and given_dna, just make one up for consistency given_dna = new/datum/dna() given_dna.check_integrity() //Defaults everything - + set_dna(given_dna) setup_reagents() return TRUE @@ -103,7 +98,7 @@ if(istype(material)) robotize(forced_model, apply_material = material.type) - else + else robotize(forced_model) return TRUE @@ -115,8 +110,7 @@ reagents.add_reagent(/decl/material/liquid/nutriment/protein, reagents.maximum_volume) /obj/item/organ/proc/set_dna(var/datum/dna/new_dna) - if(!new_dna) - return + QDEL_NULL(dna) dna = new_dna.Clone() if(!blood_DNA) blood_DNA = list() @@ -128,21 +122,29 @@ if(istext(specie_name)) species = get_species_by_key(specie_name) else - species = specie_name + species = specie_name if(!species) species = get_species_by_key(global.using_map.default_species) PRINT_STACK_TRACE("Invalid species. Expected a valid species name as string, was: [log_info_line(specie_name)]") + bodytype = owner?.bodytype || species.default_bodytype species.resize_organ(src) // Adjust limb health proportinate to total species health. var/total_health_coefficient = scale_max_damage_to_species_health ? (species.total_health / DEFAULT_SPECIES_HEALTH) : 1 - if(max_damage) - max_damage = max(1, FLOOR(max_damage * total_health_coefficient)) - min_broken_damage = max(1, FLOOR(max_damage * 0.5)) + + //Use initial value to prevent scaling down each times we change the species during init + absolute_max_damage = initial(absolute_max_damage) + min_broken_damage = initial(min_broken_damage) + max_damage = initial(max_damage) + + if(absolute_max_damage) + absolute_max_damage = max(1, FLOOR(absolute_max_damage * total_health_coefficient)) + min_broken_damage = max(1, FLOOR(absolute_max_damage * 0.5)) else min_broken_damage = max(1, FLOOR(min_broken_damage * total_health_coefficient)) - max_damage = max(1, FLOOR(min_broken_damage * 2)) + absolute_max_damage = max(1, FLOOR(min_broken_damage * 2)) + max_damage = absolute_max_damage // resets scarring, but ah well /obj/item/organ/proc/die() damage = max_damage @@ -156,7 +158,7 @@ /obj/item/organ/Process() - if(loc != owner) + if(loc != owner) //#FIXME: looks like someone was trying to hide a bug :P That probably could break organs placed inside a wrapper though owner = null //dead already, no need for more processing @@ -319,7 +321,7 @@ if (can_recover()) damage = between(0, damage - round(amount, 0.1), max_damage) -/obj/item/organ/proc/robotize(var/company, var/skip_prosthetics = 0, var/keep_organs = 0, var/apply_material = /decl/material/solid/metal/steel) +/obj/item/organ/proc/robotize(var/company = /decl/prosthetics_manufacturer, var/skip_prosthetics = 0, var/keep_organs = 0, var/apply_material = /decl/material/solid/metal/steel, var/check_bodytype, var/check_species) status = ORGAN_PROSTHETIC QDEL_NULL(dna) reagents?.clear_reagents() @@ -488,24 +490,32 @@ var/global/list/ailment_reference_cache = list() //if we're an internal organ, having a null "target" is legal if we have an "affected" //CASES: // 1. When creating organs and running their init this is called to properly set them up -// 2. When installing an organ through surgery via replaced this is called. +// 2. When installing an organ through surgery this is called. +// 3. When attaching a detached organ through surgery this is called. // The organ may be inside an external organ that's not inside a mob, or inside a mob -/obj/item/organ/proc/do_install(var/mob/living/carbon/human/target, var/obj/item/organ/external/affected, var/in_place = FALSE, var/update_icon = TRUE) +//detached : If true, the organ will be installed in a detached state, otherwise it will be added in an attached state +/obj/item/organ/proc/do_install(var/mob/living/carbon/human/target, var/obj/item/organ/external/affected, var/in_place = FALSE, var/update_icon = TRUE, var/detached = FALSE) + //Make sure to force the flag accordingly + set_detached(detached) + owner = target action_button_name = initial(action_button_name) if(owner) forceMove(owner) - for(var/datum/ailment/ailment in ailments) - ailment.begin_ailment_event() + if(!(status & ORGAN_CUT_AWAY)) //Don't run ailments if we're still detached + for(var/datum/ailment/ailment in ailments) + ailment.begin_ailment_event() else if(affected) forceMove(affected) //When installed in a limb with no owner return src //Handles uninstalling the organ from its owner and parent limb, without triggering effects or deep updates //CASES: -// 1. Before deletion to clear our references. +// 1. Before deletion to clear our references. // 2. Called through removal on surgery or dismemberement // 3. Called when we're changing a mob's species. +//detach: If detach is true, we're going to set the organ to detached, and add it to the detached organs list, and remove it from processing lists. +// If its false, we just remove the organ from all lists /obj/item/organ/proc/do_uninstall(var/in_place = FALSE, var/detach = FALSE, var/ignore_children = FALSE, var/update_icon = TRUE) action_button_name = null screen_loc = null @@ -515,6 +525,8 @@ var/global/list/ailment_reference_cache = list() if(ailment.timer_id) deltimer(ailment.timer_id) ailment.timer_id = null + + //When we detach, we set the ORGAN_CUT_AWAY flag on, depending on whether the organ supports it or not if(detach) set_detached(TRUE) return src @@ -538,3 +550,10 @@ var/global/list/ailment_reference_cache = list() /obj/item/organ/proc/is_internal() return FALSE +//Used to tell stumps from other organs. Stumps don't behave like regular organs, and require special handling. +/obj/item/organ/proc/is_stump() + return FALSE + +//Used to override organ drop behavior, so we don't drop organs that shouldn't be dropped into the world, like stumps and root limbs, or wrappers +/obj/item/organ/proc/is_droppable() + return TRUE diff --git a/code/modules/overmap/contacts/_contacts.dm b/code/modules/overmap/contacts/_contacts.dm index acdb52aa31e..ba45493b57c 100644 --- a/code/modules/overmap/contacts/_contacts.dm +++ b/code/modules/overmap/contacts/_contacts.dm @@ -66,8 +66,8 @@ var/obj/effect/overmap/visitable/visitable_effect = effect if(!visitable_effect || !istype(visitable_effect)) return FALSE - for(var/thing in visitable_effect.get_linked_machines_of_type(/obj/machinery/power/shield_generator)) - var/obj/machinery/power/shield_generator/S = thing + for(var/thing in visitable_effect.get_linked_machines_of_type(/obj/machinery/shield_generator)) + var/obj/machinery/shield_generator/S = thing if(S.running == SHIELD_RUNNING) return TRUE return FALSE diff --git a/code/modules/overmap/events/event.dm b/code/modules/overmap/events/event.dm index d3a9289811d..e3ac5c555f4 100644 --- a/code/modules/overmap/events/event.dm +++ b/code/modules/overmap/events/event.dm @@ -14,7 +14,7 @@ // Acquire the list of not-yet utilized overmap turfs on this Z-level var/list/candidate_turfs = block(locate(OVERMAP_EDGE, OVERMAP_EDGE, overmap.assigned_z),locate(overmap.map_size_x - OVERMAP_EDGE, overmap.map_size_y - OVERMAP_EDGE, overmap.assigned_z)) - candidate_turfs = where(candidate_turfs, /proc/can_not_locate, /obj/effect/overmap/visitable) + candidate_turfs = where(candidate_turfs, /proc/can_not_locate, /obj/effect/overmap) for(var/i = 1 to overmap.event_areas) if(!candidate_turfs.len) diff --git a/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm b/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm index 3278bd7564c..26a263a566d 100644 --- a/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm +++ b/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm @@ -37,6 +37,8 @@ var/list/all_materials = decls_repository.get_decls_of_subtype(/decl/material) for(var/mat_type in all_materials) var/decl/material/mat = all_materials[mat_type] + if(mat.is_abstract()) + continue if(mat.exoplanet_rarity == MAT_RARITY_NOWHERE) continue if(isnull(mat.boiling_point) || mat.boiling_point > target_temp) diff --git a/code/modules/overmap/ftl_shunt/core.dm b/code/modules/overmap/ftl_shunt/core.dm index afe4d1b34b3..668d94a837e 100644 --- a/code/modules/overmap/ftl_shunt/core.dm +++ b/code/modules/overmap/ftl_shunt/core.dm @@ -95,7 +95,7 @@ power_channel = EQUIP idle_power_usage = 1600 light_color = COLOR_BLUE - + stock_part_presets = list(/decl/stock_part_preset/terminal_setup) //Base procs /obj/machinery/ftl_shunt/core/Initialize(mapload, d, populate_parts) @@ -111,7 +111,7 @@ conduits.icon_state = "conduits" portal = new portal.icon_state = "loop-base" - charge_indicator = new + charge_indicator = new charge_indicator.icon_state = null pumps = new pumps.icon_state = "coolant_pumps_composite_off" @@ -154,11 +154,11 @@ if(chargepercent == 0 || isnull(chargepercent)) new_charge_color ="#fa0a0a" else - #if DM_VERSION > 513 + #if DM_VERSION > 513 new_charge_color = gradient("#fa0a0a", "#0de405", clamp(chargepercent/100, 0, 100)) #endif #if DM_VERSION < 514 - new_charge_color = HSVtoRGB(RotateHue(hsv(0, 255, 255), 120 * (1 - chargepercent/100))) + new_charge_color = HSVtoRGB(RotateHue(hsv(0, 255, 255), 120 * (1 - chargepercent/100))) #endif animate(charge_indicator, color = new_charge_color, 1 SECOND) @@ -359,9 +359,9 @@ continue if(H.skill_check(SKILL_ENGINES, SKILL_EXPERT)) to_chat(H, SPAN_DANGER("The deck vibrates with a harmonic that sets your teeth on edge and fills you with dread.")) - + var/announcetxt = replacetext(shunt_start_text, "%%TIME%%", "[round(jump_delay/600)] minutes.") - + ftl_announcement.Announce(announcetxt, "FTL Shunt Management System", new_sound = sound('sound/misc/notice2.ogg')) cached_security_level = security_state.current_security_level @@ -645,7 +645,7 @@ if(!use_power_oneoff(input,EQUIP)) last_power_drawn = input accumulated_charge += input * CELLRATE - + return TRUE else return FALSE @@ -671,9 +671,9 @@ shake_camera(M, rand(1,2), rand(1,2)) last_stress_sound = world.time -// +// // Construction MacGuffins down here. -// +// /obj/item/stock_parts/circuitboard/ftl_shunt name = "circuit board (superluminal shunt)" diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index 1c6f6b034bc..89a5ac137b7 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -14,8 +14,11 @@ var/global/list/known_overmap_sectors var/list/restricted_waypoints = list() //waypoints for specific shuttle types var/docking_codes - var/start_x //Coordinates for self placing - var/start_y //will use random values if unset + // Custom spawn coordinates. Will pick random place if one of them or both not set. + /// Custom X coordinate to spawn. Require `start_y` set to work. + var/start_x + /// Custom Y coordinate to spawn. Require `start_x` set to work. + var/start_y var/sector_flags = OVERMAP_SECTOR_IN_SPACE @@ -96,9 +99,24 @@ var/global/list/known_overmap_sectors /obj/effect/overmap/visitable/proc/move_to_starting_location() var/datum/overmap/overmap = global.overmaps_by_name[overmap_id] - start_x = start_x || rand(OVERMAP_EDGE, overmap.map_size_x - OVERMAP_EDGE) - start_y = start_y || rand(OVERMAP_EDGE, overmap.map_size_y - OVERMAP_EDGE) - forceMove(locate(start_x, start_y, overmap.assigned_z)) + var/location + + if(start_x && start_y) + location = locate(start_x, start_y, overmap.assigned_z) + else + var/list/candidate_turfs = block( + locate(OVERMAP_EDGE, OVERMAP_EDGE, overmap.assigned_z), + locate(overmap.map_size_x - OVERMAP_EDGE, overmap.map_size_y - OVERMAP_EDGE, overmap.assigned_z) + ) + + candidate_turfs = where(candidate_turfs, /proc/can_not_locate, /obj/effect/overmap) + location = SAFEPICK(candidate_turfs) || locate( + rand(OVERMAP_EDGE, overmap.map_size_x - OVERMAP_EDGE), + rand(OVERMAP_EDGE, overmap.map_size_y - OVERMAP_EDGE), + overmap.assigned_z + ) + + forceMove(location) //This is called later in the init order by SSshuttle to populate sector objects. Importantly for subtypes, shuttles will be created by then. /obj/effect/overmap/visitable/proc/populate_sector_objects() diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index 015580998c3..915dc88f5b7 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -60,7 +60,11 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov if(linked) user.reset_view(linked) if(user.client) - user.client.view = world.view + extra_view + if(istext(user.client.view)) + var/list/retrieved_view = splittext(user.client.view, "x") + user.client.view = "[text2num(retrieved_view[1]) + extra_view]x[text2num(retrieved_view[2]) + extra_view]" + else + user.client.view = user.client.view + extra_view if(linked) for(var/obj/machinery/computer/ship/sensors/sensor in linked.get_linked_machines_of_type(/obj/machinery/computer/ship)) sensor.reveal_contacts(user) @@ -75,9 +79,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov /obj/machinery/computer/ship/proc/unlook(var/mob/user) user.reset_view() if(user.client) - user.client.view = world.view user.client.OnResize() - user.reset_view() if(linked) for(var/obj/machinery/computer/ship/sensors/sensor in linked.get_linked_machines_of_type(/obj/machinery/computer/ship)) sensor.hide_contacts(user) diff --git a/code/modules/overmap/ships/machines/fusion_thruster.dm b/code/modules/overmap/ships/machines/fusion_thruster.dm index a9373ef5034..1dc0d773847 100644 --- a/code/modules/overmap/ships/machines/fusion_thruster.dm +++ b/code/modules/overmap/ships/machines/fusion_thruster.dm @@ -7,7 +7,7 @@ idle_power_usage = 13600 var/initial_id_tag - var/obj/machinery/power/fusion_core/harvest_from + var/obj/machinery/fusion_core/harvest_from /obj/machinery/atmospherics/unary/engine/fusion/Initialize() ..() @@ -30,7 +30,7 @@ var/datum/local_network/lan = lanm.get_local_network() if(lan) - var/list/fusion_cores = lan.get_devices(/obj/machinery/power/fusion_core) + var/list/fusion_cores = lan.get_devices(/obj/machinery/fusion_core) if(fusion_cores && fusion_cores.len) harvest_from = fusion_cores[1] return harvest_from diff --git a/code/modules/overmap/ships/machines/gas_thruster.dm b/code/modules/overmap/ships/machines/gas_thruster.dm index 3666da36ff1..226f693e528 100644 --- a/code/modules/overmap/ships/machines/gas_thruster.dm +++ b/code/modules/overmap/ships/machines/gas_thruster.dm @@ -14,7 +14,7 @@ base_type = /obj/machinery/atmospherics/unary/engine use_power = POWER_USE_OFF power_channel = EQUIP - idle_power_usage = 11600 + idle_power_usage = 2320 var/engine_extension = /datum/extension/ship_engine/gas /obj/machinery/atmospherics/unary/engine/Initialize() @@ -89,4 +89,4 @@ // This comes with an additional terminal component and tries to set it up on init (you should map a terminal beneath it). This is for mapping only. /obj/machinery/atmospherics/unary/engine/terminal uncreated_component_parts = list(/obj/item/stock_parts/power/terminal/buildable) - stock_part_presets = list(/decl/stock_part_preset/terminal_setup) + stock_part_presets = list(/decl/stock_part_preset/terminal_connect) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 62c8c556bf3..e072d871be2 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -152,7 +152,7 @@ else user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \ "You begin to wipe off [H]'s lipstick.") - if(do_after(user, 10, H) && do_after(H, 10, needhand = 0)) //user needs to keep their active hand, H does not. + if(do_after(user, 10, H) && do_after(H, 10, check_holding = 0)) //user needs to keep their active hand, H does not. user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \ "You wipe off [H]'s lipstick.") H.lip_style = null diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 1631ff94409..cb52bfce618 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -148,12 +148,14 @@ var/global/photo_count = 0 var/icon_on = "camera" var/icon_off = "camera_off" var/size = 3 + /obj/item/camera/on_update_icon() var/datum/extension/base_icon_state/bis = get_extension(src, /datum/extension/base_icon_state) if(on) icon_state = "[bis.base_icon_state]" else icon_state = "[bis.base_icon_state]_off" + /obj/item/camera/Initialize() set_extension(src, /datum/extension/base_icon_state, icon_state) update_icon() @@ -249,7 +251,7 @@ var/global/photo_count = 0 var/x_c = target.x - (size-1)/2 var/y_c = target.y - (size-1)/2 var/z_c = target.z - var/icon/photoimage = generate_image(x_c, y_c, z_c, size, CAPTURE_MODE_REGULAR, user, 0) + var/icon/photoimage = create_area_image(x_c, y_c, z_c, size, TRUE, user) var/obj/item/photo/p = new() p.img = photoimage diff --git a/code/modules/pointdefense/pointdefense.dm b/code/modules/pointdefense/pointdefense.dm index 6d6e42f6f3c..641e57fb90b 100644 --- a/code/modules/pointdefense/pointdefense.dm +++ b/code/modules/pointdefense/pointdefense.dm @@ -109,7 +109,7 @@ idle_power_usage = 0.1 KILOWATTS construct_state = /decl/machine_construction/default/panel_closed base_type = /obj/machinery/pointdefense - stock_part_presets = list(/decl/stock_part_preset/terminal_setup) + stock_part_presets = list(/decl/stock_part_preset/terminal_connect) uncreated_component_parts = null appearance_flags = PIXEL_SCALE | LONG_GLIDE var/active = TRUE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 98a72f48766..682f00bbc68 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -147,6 +147,7 @@ var/global/list/all_apcs = list() uncreated_component_parts = list( /obj/item/cell/apc ) + stock_part_presets = list(/decl/stock_part_preset/terminal_setup) /obj/machinery/power/apc/buildable uncreated_component_parts = null @@ -190,11 +191,10 @@ var/global/list/all_apcs = list() . = ..() - if (populate_parts) - init_round_start() - else + if(!populate_parts) operating = 0 - queue_icon_update() + + queue_icon_update() if(operating) force_update_channels() @@ -230,11 +230,6 @@ var/global/list/all_apcs = list() playsound(src, 'sound/machines/apc_nopower.ogg', 75, 0) failure_timer = max(failure_timer, round(duration)) -/obj/machinery/power/apc/proc/init_round_start() - var/obj/item/stock_parts/power/terminal/term = get_component_of_type(/obj/item/stock_parts/power/terminal) - term.make_terminal(src) // intentional crash if there is no terminal - queue_icon_update() - /obj/machinery/power/apc/proc/terminal(var/functional_only) var/obj/item/stock_parts/power/terminal/term = get_component_of_type(/obj/item/stock_parts/power/terminal) if(term && (!functional_only || term.is_functional())) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index d25b64c507c..025af3c9864 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -87,9 +87,9 @@ By design, d1 is the smallest direction and d2 is the highest user.examinate(src) // following code taken from attackby (multitool) if(powernet && (powernet.avail > 0)) - to_chat(user, "[get_wattage()] in power network.") + to_chat(user, SPAN_WARNING("[get_wattage()] in power network.")) else - to_chat(user, "The cable is not powered.") + to_chat(user, SPAN_WARNING("\The [src] is not powered.")) return /////////////////////////////////// @@ -97,10 +97,10 @@ By design, d1 is the smallest direction and d2 is the highest /////////////////////////////////// /obj/structure/cable/proc/get_wattage() - if(powernet.avail >= 1000000000) - return "[round(powernet.avail/1000000, 0.01)] MW" - if(powernet.avail >= 1000000) - return "[round(powernet.avail/1000, 0.01)] kW" + if(powernet.avail >= 1 GIGAWATTS) + return "[round(powernet.avail/(1 MEGAWATTS), 0.01)] MW" + if(powernet.avail >= 1 MEGAWATTS) + return "[round(powernet.avail/(1 KILOWATTS), 0.01)] kW" return "[round(powernet.avail)] W" //If underfloor, hide the cable @@ -153,10 +153,10 @@ By design, d1 is the smallest direction and d2 is the highest else if(isMultitool(W)) if(powernet && (powernet.avail > 0)) // is it powered? - to_chat(user, "[get_wattage()] in power network.") + to_chat(user, SPAN_WARNING("[get_wattage()] in power network.")) else - to_chat(user, "The cable is not powered.") + to_chat(user, SPAN_WARNING("\The [src] is not powered.")) shock(user, 5, 0.2) @@ -166,10 +166,10 @@ By design, d1 is the smallest direction and d2 is the highest var/delay_holder if(W.force < 5) - visible_message("[user] starts sawing away roughly at the cable with \the [W].") + visible_message(SPAN_WARNING("[user] starts sawing away roughly at \the [src] with \the [W].")) delay_holder = 8 SECONDS else - visible_message("[user] begins to cut through the cable with \the [W].") + visible_message(SPAN_WARNING("[user] begins to cut through \the [src] with \the [W].")) delay_holder = 3 SECONDS if(user.do_skilled(delay_holder, SKILL_ELECTRICAL, src)) @@ -177,7 +177,7 @@ By design, d1 is the smallest direction and d2 is the highest if(W.obj_flags & OBJ_FLAG_CONDUCTIBLE) shock(user, 66, 0.7) else - visible_message("[user] stops cutting before any damage is done.") + visible_message(SPAN_WARNING("[user] stops cutting before any damage is done.")) src.add_fingerprint(user) @@ -187,11 +187,11 @@ By design, d1 is the smallest direction and d2 is the highest return if(d1 == UP || d2 == UP) - to_chat(user, "You must cut this cable from above.") + to_chat(user, SPAN_WARNING("You must cut this [name] from above.")) return if(breaker_box) - to_chat(user, "This cable is connected to a nearby breaker box. Use the breaker box to interact with it.") + to_chat(user, SPAN_WARNING("This [name] is connected to a nearby breaker box. Use the breaker box to interact with it.")) return if (shock(user, 50)) @@ -199,7 +199,7 @@ By design, d1 is the smallest direction and d2 is the highest new/obj/item/stack/cable_coil(T, (src.d1 ? 2 : 1), color) - visible_message("[user] cuts the cable.") + visible_message(SPAN_WARNING("[user] cuts \the [src].")) if(HasBelow(z)) for(var/turf/turf in GetBelow(src)) @@ -535,7 +535,7 @@ By design, d1 is the smallest direction and d2 is the highest return ..() if(BP_IS_BRITTLE(S)) - to_chat(user, "\The [H]'s [S.name] is hard and brittle - \the [src] cannot repair it.") + to_chat(user, SPAN_WARNING("\The [H]'s [S.name] is hard and brittle - \the [src] cannot repair it.")) return 1 var/use_amt = min(src.amount, CEILING(S.burn_dam/3), 5) @@ -573,7 +573,7 @@ By design, d1 is the smallest direction and d2 is the highest selected_color = "Red" final_color = possible_cable_colours[selected_color] color = final_color - to_chat(user, "You change \the [src]'s color to [lowertext(selected_color)].") + to_chat(user, SPAN_NOTICE("You change \the [src]'s color to [lowertext(selected_color)].")) /obj/item/stack/cable_coil/proc/update_wclass() if(amount == 1) @@ -587,11 +587,11 @@ By design, d1 is the smallest direction and d2 is the highest return if(get_amount() == 1) - to_chat(user, "A short piece of power cable.") + to_chat(user, "A [singular_name] of cable.") else if(get_amount() == 2) - to_chat(user, "A piece of power cable.") + to_chat(user, "Two [plural_name] of cable.") else - to_chat(user, "A coil of power cable. There are [get_amount()] lengths of cable in the coil.") + to_chat(user, "A coil of power cable. There are [get_amount()] [plural_name] of cable in the coil.") /obj/item/stack/cable_coil/verb/make_restraint() @@ -602,13 +602,13 @@ By design, d1 is the smallest direction and d2 is the highest if(ishuman(M) && !M.incapacitated()) if(!isturf(usr.loc)) return if(!src.use(15)) - to_chat(usr, "You need at least 15 lengths to make restraints!") + to_chat(usr, SPAN_WARNING("You need at least 15 [plural_name] of cable to make restraints!")) return var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc) B.color = color - to_chat(usr, "You wind some cable together to make some restraints.") + to_chat(usr, SPAN_NOTICE("You wind some [plural_name] of cable together to make some restraints.")) else - to_chat(usr, "You cannot do that.") + to_chat(usr, SPAN_NOTICE("You cannot do that.")) /obj/item/stack/cable_coil/cyborg/verb/set_colour() set name = "Change Colour" @@ -644,15 +644,15 @@ By design, d1 is the smallest direction and d2 is the highest return if(get_amount() < 1) // Out of cable - to_chat(user, "There is no cable left.") + to_chat(user, SPAN_WARNING("There is no [plural_name] of cable left.")) return if(get_dist(F,user) > 1) // Too far - to_chat(user, "You can't lay cable at a place that far away.") + to_chat(user, SPAN_WARNING("You can't lay cable at a place that far away.")) return if(!F.is_plating()) // Ff floor is intact, complain - to_chat(user, "You can't lay cable there unless the floor tiles are removed.") + to_chat(user, SPAN_WARNING("You can't lay cable there unless the floor tiles are removed.")) return var/dirn @@ -664,18 +664,19 @@ By design, d1 is the smallest direction and d2 is the highest var/end_dir = 0 if(istype(F) && F.is_open()) if(!can_use(2)) - to_chat(user, "You don't have enough cable to do this!") + to_chat(user, SPAN_WARNING("You don't have enough [plural_name] of cable to do this!")) return end_dir = DOWN for(var/obj/structure/cable/LC in F) if((LC.d1 == dirn && LC.d2 == end_dir ) || ( LC.d2 == dirn && LC.d1 == end_dir)) - to_chat(user, "There's already a cable at that position.") + to_chat(user, SPAN_WARNING("There's already a cable at that position.")) return put_cable(F, user, end_dir, dirn) if(end_dir == DOWN) put_cable(GetBelow(F), user, UP, 0) + return TRUE // called when cable_coil is click on an installed obj/cable // or click on a turf that already contains a "node" cable @@ -690,19 +691,18 @@ By design, d1 is the smallest direction and d2 is the highest return if(get_dist(C, user) > 1) // make sure it's close enough - to_chat(user, "You can't lay cable at a place that far away.") + to_chat(user, SPAN_WARNING("You can't lay cable at a place that far away.")) return if(U == T) //if clicked on the turf we're standing on, try to put a cable in the direction we're facing - turf_place(T,user) - return + return turf_place(T,user) var/dirn = get_dir(C, user) // one end of the clicked cable is pointing towards us if(C.d1 == dirn || C.d2 == dirn) if(!U.is_plating()) // can't place a cable if the floor is complete - to_chat(user, "You can't lay cable there unless the floor tiles are removed.") + to_chat(user, SPAN_WARNING("You can't lay cable there unless the floor tiles are removed.")) return else // cable is pointing at us, we're standing on an open tile @@ -712,10 +712,10 @@ By design, d1 is the smallest direction and d2 is the highest for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already if(LC.d1 == fdirn || LC.d2 == fdirn) - to_chat(user, "There's already a cable at that position.") + to_chat(user, SPAN_WARNING("There's already a cable at that position.")) return put_cable(U,user,0,fdirn) - return + return TRUE // exisiting cable doesn't point at our position, so see if it's a stub else if(C.d1 == 0) @@ -733,7 +733,7 @@ By design, d1 is the smallest direction and d2 is the highest if(LC == C) // skip the cable we're interacting with continue if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction - to_chat(user, "There's already a cable at that position.") + to_chat(user, SPAN_WARNING("There's already a cable at that position.")) return @@ -765,11 +765,17 @@ By design, d1 is the smallest direction and d2 is the highest return C.denode()// this call may have disconnected some cables that terminated on the centre of the turf, if so split the powernets. - return + return TRUE + + else if(C.d1 == UP) //Special cases for zcables, since they behave weirdly + . = turf_place(T, user) + if(.) + to_chat(user, SPAN_NOTICE("You connect the cable hanging from the ceiling.")) + return . /obj/item/stack/cable_coil/proc/put_cable(turf/F, mob/user, d1, d2) if(!istype(F)) - return + return FALSE var/obj/structure/cable/C = new(F) C.cableColor(color) @@ -792,11 +798,12 @@ By design, d1 is the smallest direction and d2 is the highest if(C.d2 & (C.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions C.mergeDiagonalsNetworks(C.d2) - use(1) + . = use(1) if (C.shock(user, 50)) if (prob(50)) //fail new/obj/item/stack/cable_coil(C.loc, 1, C.color) qdel(C) + return FALSE ////////////////////////////// // Misc. diff --git a/code/modules/power/fission/core.dm b/code/modules/power/fission/core.dm index d56c2da7247..8af642d5c9a 100644 --- a/code/modules/power/fission/core.dm +++ b/code/modules/power/fission/core.dm @@ -221,7 +221,7 @@ . = ..() /obj/machinery/atmospherics/unary/fission_core/proc/jump_start() - if((stat & (BROKEN|NOPOWER)) || can_use_power_oneoff(5 KILOWATTS)) + if((stat & (BROKEN|NOPOWER)) || (can_use_power_oneoff(5 KILOWATTS) <= 0)) visible_message("\The [src] flashes an 'Insufficient Power' error.") return use_power_oneoff(5 KILOWATTS) diff --git a/code/modules/power/fusion/_setup.dm b/code/modules/power/fusion/_setup.dm index 25020bc624d..d6a1fde3058 100644 --- a/code/modules/power/fusion/_setup.dm +++ b/code/modules/power/fusion/_setup.dm @@ -17,7 +17,7 @@ to_chat(usr, "Error: you are not an admin!") return - if(!(locate(/obj/machinery/power/fusion_core/mapped) in SSmachines.machinery)) + if(!(locate(/obj/machinery/fusion_core/mapped) in SSmachines.machinery)) to_chat(usr, "This map is not appropriate for this verb.") return @@ -31,14 +31,14 @@ log_and_message_admins("## FUSION CORE SETUP - Setup initiated by [usr].") - var/obj/machinery/power/fusion_core/mapped/core = locate() in SSmachines.machinery + var/obj/machinery/fusion_core/mapped/core = locate() in SSmachines.machinery if(core.jumpstart(15000)) for(var/obj/machinery/fusion_fuel_injector/mapped/injector in SSmachines.machinery) injector.cur_assembly = new /obj/item/fuel_assembly/deuterium(injector) injector.BeginInjecting() - for(var/obj/machinery/power/emitter/gyrotron/gyro in SSmachines.machinery) + for(var/obj/machinery/emitter/gyrotron/gyro in SSmachines.machinery) gyro.activate(usr) var/list/delayed_objects = list() diff --git a/code/modules/power/fusion/consoles/core_control.dm b/code/modules/power/fusion/consoles/core_control.dm index c6c013e0c42..4c5e4d38a99 100644 --- a/code/modules/power/fusion/consoles/core_control.dm +++ b/code/modules/power/fusion/consoles/core_control.dm @@ -5,7 +5,7 @@ /obj/machinery/computer/fusion/core_control/OnTopic(var/mob/user, var/href_list, var/datum/topic_state/state) if(href_list["toggle_active"] || href_list["str"]) - var/obj/machinery/power/fusion_core/C = locate(href_list["machine"]) + var/obj/machinery/fusion_core/C = locate(href_list["machine"]) if(!istype(C)) return TOPIC_NOACTION @@ -13,7 +13,7 @@ if(!lan || !lan.is_connected(C)) return TOPIC_NOACTION - if(!C.check_core_status()) + if(C.stat & BROKEN) return TOPIC_NOACTION if(href_list["toggle_active"]) @@ -38,10 +38,11 @@ var/datum/local_network/lan = fusion.get_local_network() var/list/cores = list() if(lan) - var/list/fusion_cores = lan.get_devices(/obj/machinery/power/fusion_core) + var/list/fusion_cores = lan.get_devices(/obj/machinery/fusion_core) for(var/i = 1 to LAZYLEN(fusion_cores)) var/list/core = list() - var/obj/machinery/power/fusion_core/C = fusion_cores[i] + var/obj/machinery/fusion_core/C = fusion_cores[i] + var/datum/powernet/p_network = C.get_powernet() core["id"] = "#[i]" core["ref"] = "\ref[C]" core["field"] = !isnull(C.owned_field) @@ -49,7 +50,7 @@ core["size"] = C.owned_field ? "[C.owned_field.size] meter\s" : "Field offline." core["instability"] = C.owned_field ? "[C.owned_field.percent_unstable * 100]%" : "Field offline." core["temperature"] = C.owned_field ? "[C.owned_field.plasma_temperature + 295]K" : "Field offline." - core["powerstatus"] = "[C.avail()]/[C.active_power_usage] W" + core["powerstatus"] = "[p_network ? p_network.avail : 0]/[C.active_power_usage] W" var/fuel_string = "
| Account Login | Real Name + {{for data.accounts}} + |
|---|---|
| {{:helper.link(value.account, '', {'select_account' : value.account})}} + | {{:value.fullname}} + {{/for}} + |
Modifying account for {{:data.account_name}}:
+Viewing parent groups. Group sub management is {{:data.sub_management ? 'enabled' : 'disabled'}}.
+| Parent Group | Membership + {{for data.parent_groups}} + |
|---|---|
| {{:helper.link(value.name, '', {'select_parent_group' : value.name})}} + | {{:helper.link(value.member ? 'Member' : 'Not a member', '', {'mod_group' : value.name})}} + {{/for}} + |
Modifying account for {{:data.account_name}}:
+Viewing child groups of {{:data.parent_group}}. Group sub management is {{:data.sub_management ? 'enabled' : 'disabled'}}.
+| Child Group | Membership + {{for data.child_groups}} + |
|---|---|
| {{:value.name}} + | {{:helper.link(value.member ? 'Member' : 'Not a member', '', {'mod_group' : value.name})}} + {{/for}} + |
Available records:
| {{:helper.link(value.login, null, {'viewaccount' : value.uid})}} + |
| {{:helper.link(value.login, null, {'viewaccount' : value.login})}} {{/for}} |
MANUAL SYSTEM ACCESS
-{{:helper.link('ACTIVATE TERMINAL', null, {'PC_terminal' : 1})}} {{/if}} \ No newline at end of file diff --git a/nano/templates/email_client.tmpl b/nano/templates/email_client.tmpl index a6c5f4da88f..8f25f4a2630 100644 --- a/nano/templates/email_client.tmpl +++ b/nano/templates/email_client.tmpl @@ -27,14 +27,12 @@ {{else data.current_account}} Welcome to your account, {{:data.current_account}}{{:helper.link('New Message', 'mail-closed', {'new_message' : 1})}} - {{:helper.link('Change Password', 'locked', {'changepassword' : 1})}} {{:helper.link('Set notification', 'alert', {'set_notification' : 1})}} {{if data.notification_mute}} - {{:helper.link('Unmute', 'volume-on', {'mute' : 1})}} + {{:helper.link('Unmute', 'volume-off', {'mute' : 1})}} {{else}} - {{:helper.link('Mute', 'volume-off', {'mute' : 1})}} - {{/if}} - {{:helper.link('Log Out', 'key', {'logout' : 1})}}
+ {{:helper.link('Mute', 'volume-on', {'mute' : 1})}} + {{/if}}
{{if data.addressbook}} {{:helper.link('Back', null, {'close_addressbook' : 1})}} {{:helper.link('Enter Email', 'pencil', {'edit_recipient' : 1})}} @@ -42,7 +40,7 @@
| Address book: {{for data.accounts}} - | ||
| {{:value.name}} | {{:value.job}} | {{:helper.link(value.login, null, {'set_recipient' : value.login})}} + |
| {{:value.name}} | {{:value.job}} | {{:helper.link(value.address, null, {'set_recipient' : value.address})}} {{/for}} |
-
{{/if}}
\ No newline at end of file
diff --git a/nano/templates/fabricator.tmpl b/nano/templates/fabricator.tmpl
index 8d9ec5549fb..bdca3f6087a 100644
--- a/nano/templates/fabricator.tmpl
+++ b/nano/templates/fabricator.tmpl
@@ -1,132 +1,27 @@
-{{if data.functional}}
-
- Email address:
-
-
- {{:data.stored_login}}
-
-
- Password:
-
-
- {{:data.stored_password}}
-
-
- Options:
-
-
- {{:helper.link('Enter Login', null, {'edit_login' : 1})}}
- {{:helper.link('Enter Password', null, {'edit_password' : 1})}}
- {{:helper.link('Log In', null, {'login' : 1})}}
-
- | - Color - | -- {{:helper.link('(Set)', null, {'color_select' : 1})}} - | -|||||||||||||
| - Connected to local network. - | - {{:helper.link(data.network, null, { 'settings': 1 }, null)}} - -- | |||||||||||||
-
|
- ||||||||||||||
-
|
-
-
|
- |||||||||||||
|
+
+{{#def.fab_shared}}
+
+
+
+{{ fab_header( data.network, data.network_id ); }}
-
-
+{{if data.functional}}
+
+
- Category
-
-
- {{:helper.link(data.category, null, {'change_category' : 1})}}
-
-
-
+
+ {{ fab_build_options( data.build_options ); }}
-
- Filter
-
-
- {{:helper.link(data.filtering, null, {'set_filter' : 1})}}
-
- | ||||||||||||||
-
|
- ||||||||||||||
FABRICATOR OFFLINE. CONTACT SYSTEM ADMINISTRATOR.
+ {{/if}} diff --git a/nano/templates/fabricator_bioprinter.tmpl b/nano/templates/fabricator_bioprinter.tmpl new file mode 100644 index 00000000000..a6937ffe9f9 --- /dev/null +++ b/nano/templates/fabricator_bioprinter.tmpl @@ -0,0 +1,93 @@ + +{{#def.fab_shared}} + + + + + +{{function display_dna(dna) { }} +-
+
- UE: {{:dna.UE}} +
- Name: {{:dna.real_name}} +
- Specie: {{:dna.species}} +
- Blood Type: {{:dna.btype}} +
+ {{if dna}}
+
+ {{/if}}
+
+ {{:helper.link('DNA:', 'trash', {'flush_dna' : 1} ) }}
+ {{display_dna(dna);}}
+ {{else}}
+ DNA:
+ No DNA sample loaded.
-
+ {{ fab_resources_table( data.expand_resources, data.material_storage ); }}
+ {{ fab_construction_queue( data.expand_queue, data.build_queue, data.current_build ); }}
+ {{ fab_organ_config( data.dna, data.expand_config ); }}
+
FABRICATOR OFFLINE. CONTACT SYSTEM ADMINISTRATOR.
+{{/if}} diff --git a/nano/templates/fabricator_robot.tmpl b/nano/templates/fabricator_robot.tmpl new file mode 100644 index 00000000000..644cb5c9ffe --- /dev/null +++ b/nano/templates/fabricator_robot.tmpl @@ -0,0 +1,62 @@ + +{{#def.fab_shared}} + + + + + {{function fab_limb_config_summary(species) { + let summary = " ["; + + if(species != undefined) { + summary += species; + } else { + summary += "!! No species !! "; + }; + + return summary + "]"; +} }} + +{{function fab_limb_config( species, expand_config) { }} +
+
+ Current Species:
+ {{:helper.link( species, null, {'pick_species' : 1} ) }}
+ -
+ {{ fab_resources_table( data.expand_resources, data.material_storage ); }}
+ {{ fab_construction_queue( data.expand_queue, data.build_queue, data.current_build ); }}
+ {{ fab_limb_config( data.species, data.expand_config ); }}
+ {{ fab_display_filter( data.category, data.filtering, data.hide_categories ); }}
+
FABRICATOR OFFLINE. CONTACT SYSTEM ADMINISTRATOR.
+{{/if}} \ No newline at end of file diff --git a/nano/templates/fabricator_shared.tmpl b/nano/templates/fabricator_shared.tmpl new file mode 100644 index 00000000000..404024b2061 --- /dev/null +++ b/nano/templates/fabricator_shared.tmpl @@ -0,0 +1,414 @@ + +{{#def.net_shared}} + + + + + + + +{{function get_longest_material_name(material_storage){ + let longest = 0; + for(let item in material_storage){ + if(material_storage[item].name.length > longest){ + longest = material_storage[item].name.length; + }; + }; + return longest; +} }} + + +{{function shorten_number(amount, fixed) { + var billions = amount / 1000000000; + var millions = amount / 1000000; + var thousands = amount / 1000; + + if(billions >= 1){ + return String(fixed? billions.toFixed(3) : billions) + 'G'; + } + else if(millions >= 1){ + return String(fixed? millions.toFixed(3) : millions) + 'M'; + } + else if(thousands >= 1){ + return String(fixed? thousands.toFixed(3) : thousands) + 'K'; + } + + return String((fixed? amount.toFixed(3) : amount)); +} }} + + +{{function pad_string(str, padlength, padchar) { + let padding = ''; + let strlen = str.length; + if(padlength > strlen){ + for(let i = 0; i < (padlength - strlen); i++) { + padding += padchar; + }; + }; + return str + padding; +} }} + + +{{function make_list_toggle_prefix(shown, list_name) { + return (shown? '-' : '+') + ' ' + list_name; +} }} + + +{{function fab_header(network, network_id) { }} + {{net_connection_settings(network, network_id);}} +{{ } }} + + + + + {{function make_material_list_summary(material_storage) { + let summary = ''; + if(material_storage){ + let nbempty = 0; + for(let item in material_storage){ + let current = material_storage[item].name.substr(0,2) + ':' + shorten_number(material_storage[item].stored, true) + ' '; + if(material_storage[item].stored <= 0){ + nbempty += 1; + }; + }; + if(nbempty >= material_storage.length){ + summary = "Materials Depleted!"; + } + else if(nbempty > 0) { + summary = '' + nbempty + ' depleted material(s)'; + }; + } + if(summary.length){ + summary = ' [ ' + summary + ']'; + } + return summary; +} }} + + +{{function fab_resources_table_entry(name, amount, max, unit, longestNameLen, ejectKey) { }} +
+
+ {{/if}}
+{{ } }}
+
+{{function fab_configuration(skip_config, expand_config, data) { }}
+ {{if !skip_config}}
+
+ Color:
+
+
+ {{draw_colored_square(color);}} {{:helper.link( 'set', null, {'color_select' : 1}) }}
+
+
+
+ {{/if}}
+
+ Category
+
+
+ {{:helper.link(category, null, {'change_category' : 1})}}
+
+
+
+
+ Filter
+
+
+ {{:helper.link(filtering, null, {'set_filter' : 1})}}
+
+ -
+ {{if !materials}}
+
- -- + {{else}} + {{for materials :valMat :valIdx}} +
- + {{if !valMat.has_enough}} {{/if}} + {{:shorten_number(valMat.amount)}} {{:valMat.name}} + {{if !valMat.has_enough}} {{/if}} + + {{/for}} + {{/if}} +
+
| Design | +Cost | ++ |
|---|---|---|
| {{ fab_make_option_title(value.name, value.illegal); }} | + +{{ fab_make_cost_list(value.materials); }} | + +{{ fab_make_multiplier_buttons(value.unavailable, value.reference, value.multiplier); }} | +
- Email login:
+ Network account login:
- {{:helper.link(data.id_email_login, 'pencil', {'action' : 'edit', 'elogin' : 1})}}
+ {{:helper.link(data.network_account_login, 'pencil', {'action' : 'edit', 'alogin' : 1})}}
- Email password:
+ Network account password:
- {{:helper.link(data.id_email_password, 'pencil', {'action' : 'edit', 'epswd' : 1})}}
+ {{:helper.link(data.network_account_password, 'pencil', {'action' : 'edit', 'apswd' : 1})}}
+ Welcome to the Network Access Controller system. Please consult your system administrator if you have any questions about your device.
{{:helper.link("NETWORK SETTINGS", null, { "settings" : 1 })}}
{{if !data.connected}}
Disconnected from network.
+ {{else !data.current_group}} +Network Group Settings:
+| Setting | Toggle | Info + |
|---|---|---|
| PARENT GROUP SUBMANAGEMENT + | {{:helper.link(data.allow_submanagement ? 'ON' : 'OFF', null, { "toggle_submanagement" : 1 })}} + | {{:helper.link('?', null, { "info" : "submanagement"})}} + |
| PARENT ACCOUNT CREATION + | {{:helper.link(data.parent_account_creation ? 'ON' : 'OFF', null, { "toggle_parent_account_creation" : 1 })}} + | {{:helper.link('?', null, { "info" : "parent_account_creation"})}} + |
Viewing Parent Groups:
+| Group + | Operations + {{for data.parent_groups}} + |
|---|---|
| {{:helper.link(value.group_name, null, {"view_child_groups" : value.group_name})}} + | + {{:helper.link('Remove', null, { "remove_group" : value.group_name})}} + {{/for}} + |
Viewing File System:
-
- {{:helper.link(data.file_server, null, { "change_file_server" : 1 })}}
-
- {{if data.editing_user}} -
Viewing User Record: {{:data.desired_name}}
-
-
- NAME:
- {{:data.desired_name}}
-
-
- USER ID:
- {{:data.user_id}}
-
-
- GRANT COUNT:
- {{:data.grant_count}}
-
-
- RECORD SIZE:
- {{:data.size}}GQ
-
- {{:helper.link('CREATE GRANT', null, { "create_grant" : data.user_id })}}
- {{if data.is_admin}}
- {{:helper.link('REMOVE ADMIN', null, { "remove_admin": 1})}}
- {{else}}
- {{:helper.link('GRANT ADMIN', null, { "add_admin": 1})}}
- {{/if}}
- {{:helper.link('WRITE ID', null, { "write_id": 1}, !data.card_inserted ? 'disabled' : null)}}
- {{:helper.link('EJECT ID', null, { "eject_id": 1}, !data.card_inserted ? 'disabled' : null)}}
-
- -
| Grant - | Operations - {{for data.grants}} - |
|---|---|
| {{:value.grant_name}} - | - {{if value.assigned}} - {{:helper.link('REMOVE', null, { "remove_grant" : value.grant_name })}} - {{else}} - {{:helper.link('ASSIGN', null, { "assign_grant" : value.grant_name })}} - {{/if}} - {{:helper.link('DELETE', null, { "delete_grant" : value.grant_name })}} - {{/for}} - |
Editing Program: {{:data.program_name}}
--
| Grant - | Operations - {{for data.grants}} - |
|---|---|
| {{:value.grant_name}} - | - {{if value.assigned}} - {{:helper.link('REMOVE', null, { "remove_grant" : value.grant_name })}} - {{else}} - {{:helper.link('ASSIGN', null, { "assign_grant" : value.grant_name })}} - {{/if}} - {{/for}} - |
Available Users ({{:data.file_server}}):
-| User ID - | Grants - | File size (GQ) - | Operations - {{for data.users}} - |
|---|---|---|---|
| {{:value.desired_name}} - | {{:value.grant_count}} - | {{:value.size}}GQ - | - {{:helper.link('VIEW', null, { "view_user" : value.user_id })}} - {{/for}} - |
-
Available Programs:
- {{if data.program_control}} - {{:helper.link('DISABLE PROGRAM ACCESS CONTROL', null, { "toggle_program_control" : 1})}} -| Program - | Grants - | Access - {{for data.programs}} - |
|---|---|---|
| {{:value.name}} - | {{:value.grants}} - | - {{:helper.link('EDIT', null, { "view_program" : value.name})}} - {{/for}} - |
Parent Group: {{:data.current_group}}
++
| Group + | Operations + {{for data.child_groups}} + |
|---|---|
| {{:value.group_name}} + | + {{:helper.link('Remove', null, { "remove_group" : value.group_name})}} + {{/for}} + |
+ {{:helper.link("NETWORK SETTINGS", null, { "settings" : 1 })}}
+
++
+
+Login:
+
+ {{:helper.link(data.login, null, { "change_login" : 1 })}}
+
+
+
+Password:
+
+ {{:helper.link(data.password, null, { "change_password" : 1 })}}
+
+
+ {{:helper.link('Login', null, { "login_account" : 1 })}}
+
\ No newline at end of file
diff --git a/nano/templates/network_lock.tmpl b/nano/templates/network_lock.tmpl
index e6e8ce1d56f..319618960fc 100644
--- a/nano/templates/network_lock.tmpl
+++ b/nano/templates/network_lock.tmpl
@@ -20,19 +20,63 @@
-
Grants:
| Grant + | ||
|---|---|---|
| Pattern + | Groups | Operations - {{for data.grants}} - |
| {{:value.grant_name}} - | - {{if value.assigned}} - {{:helper.link('REMOVE', null, { "remove_grant" : value.grant_name })}} - {{else}} - {{:helper.link('ASSIGN', null, { "assign_grant" : value.grant_name })}} - {{/if}} + {{for data.patterns}} + | |
| {{:helper.link("Pattern " + value.index, null, { "select_pattern" : value.index}, (data.selected_pattern == value.index) ? 'selected' : null)}} + | {{:value.groups}} + | {{:helper.link('Delete pattern', null, { "remove_pattern" : value.index})}} {{/for}} |
+ {{:helper.link('Add pattern', null, { "add_pattern" : 1}, null)}} + {{:helper.link('?', null, { "info" : "pattern" }, null)}} +
+ {{if data.parent_groups}} +
Parent Groups:
+ {{:helper.link('?', null, { "info" : "parent_groups" }, null)}} +| Group + | Operations + {{for data.parent_groups}} + |
|---|---|
| {{:helper.link(value.parent_group, null, { "select_parent_group" : value.parent_group })}} + | + {{if value.assigned}} + {{:helper.link('REMOVE', null, { "remove_group" : value.parent_group })}} + {{else}} + {{:helper.link('ASSIGN', null, { "assign_group" : value.parent_group })}} + {{/if}} + {{/for}} + |
Viewing Child Groups for: {{:data.selected_parent_group}}
+ {{if data.child_groups}} +Child Groups:
+| Group + | Operations + {{for data.child_groups}} + |
|---|---|
| {{:value.child_group}} + | + {{if value.assigned}} + {{:helper.link('REMOVE', null, { "remove_group" : value.child_group })}} + {{else}} + {{:helper.link('ASSIGN', null, { "assign_group" : value.child_group })}} + {{/if}} + {{/for}} + |
+ {{:helper.link('Back to parent group listing', null, { "select_parent_group" : null })}}
+
+ {{else}}
+ {{if data.selected_pattern}}
+ No groups found on network!
+ {{/if}}
+ {{/if}}
{{/if}}
{{/if}}
\ No newline at end of file
diff --git a/nano/templates/network_router.tmpl b/nano/templates/network_router.tmpl
index 740382aa17f..464b4e51451 100644
--- a/nano/templates/network_router.tmpl
+++ b/nano/templates/network_router.tmpl
@@ -30,6 +30,14 @@
BACKUP ROUTER / RELAY
{{/if}}
+ {{if data.reconnect}}
+
+ CONNECTION LOST, ATTEMPTING RECONNECT IN {{:data.reconnect}}s
+
+
+ {{:helper.link("RECONNECT NOW", null, { "reconnect" : 1 })}}
+
+ {{/if}}
Wi-Fi Connections:
diff --git a/nano/templates/network_shared.tmpl b/nano/templates/network_shared.tmpl
new file mode 100644
index 00000000000..3be2c10a429
--- /dev/null
+++ b/nano/templates/network_shared.tmpl
@@ -0,0 +1,25 @@
+
+
+
+
+{{function net_connection_settings(network, network_id) { }}
+
+
+ {{:helper.link(network ? (network + '.' + network_id) : '---', network? 'signal-diag': 'close', { 'network_settings': 1 }, null)}}
+ +{{ } }} \ No newline at end of file diff --git a/nebula.dme b/nebula.dme index 7cef8cb42c8..aed9a1fe2c2 100644 --- a/nebula.dme +++ b/nebula.dme @@ -85,6 +85,7 @@ #include "code\__defines\tools.dm" #include "code\__defines\topic.dm" #include "code\__defines\turfs.dm" +#include "code\__defines\unit_tests.dm" #include "code\__defines\webhooks.dm" #include "code\__defines\xenoarcheaology.dm" #include "code\__defines\ZAS.dm" @@ -163,7 +164,6 @@ #include "code\_onclick\hud\gun_mode.dm" #include "code\_onclick\hud\hud.dm" #include "code\_onclick\hud\human.dm" -#include "code\_onclick\hud\movable_screen_objects.dm" #include "code\_onclick\hud\other_mobs.dm" #include "code\_onclick\hud\pai.dm" #include "code\_onclick\hud\radial.dm" @@ -1276,10 +1276,11 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\service.dm" #include "code\game\objects\structures\doors\_door.dm" -#include "code\game\objects\structures\stool_bed_chair_nest\bed.dm" -#include "code\game\objects\structures\stool_bed_chair_nest\chairs.dm" -#include "code\game\objects\structures\stool_bed_chair_nest\stools.dm" -#include "code\game\objects\structures\stool_bed_chair_nest\wheelchair.dm" +#include "code\game\objects\structures\stool_bed_chair_nest_sofa\bed.dm" +#include "code\game\objects\structures\stool_bed_chair_nest_sofa\chairs.dm" +#include "code\game\objects\structures\stool_bed_chair_nest_sofa\sofa.dm" +#include "code\game\objects\structures\stool_bed_chair_nest_sofa\stools.dm" +#include "code\game\objects\structures\stool_bed_chair_nest_sofa\wheelchair.dm" #include "code\game\turfs\simulated.dm" #include "code\game\turfs\turf.dm" #include "code\game\turfs\turf_ao.dm" @@ -1727,6 +1728,7 @@ #include "code\modules\codex\categories\category_cultures.dm" #include "code\modules\codex\categories\category_fusion_reaction.dm" #include "code\modules\codex\categories\category_languages.dm" +#include "code\modules\codex\categories\category_phenomena.dm" #include "code\modules\codex\categories\category_reactions.dm" #include "code\modules\codex\categories\category_recipes.dm" #include "code\modules\codex\categories\category_skills.dm" @@ -1747,7 +1749,6 @@ #include "code\modules\codex\entries\misc.dm" #include "code\modules\codex\entries\mobs.dm" #include "code\modules\codex\entries\paperwork.dm" -#include "code\modules\codex\entries\spells.dm" #include "code\modules\codex\entries\stacks.dm" #include "code\modules\codex\entries\storage.dm" #include "code\modules\codex\entries\structures.dm" @@ -1765,6 +1766,7 @@ #include "code\modules\crafting\crafting_recipes\gun_crafting\crafting_cannon.dm" #include "code\modules\crafting\crafting_recipes\gun_crafting\crafting_coilgun.dm" #include "code\modules\crafting\crafting_recipes\gun_crafting\crafting_zipgun.dm" +#include "code\modules\crafting\crafting_recipes\improvised_crafting\crafting_buckler.dm" #include "code\modules\crafting\crafting_recipes\improvised_crafting\crafting_butterflyknife.dm" #include "code\modules\crafting\crafting_recipes\improvised_crafting\crafting_crossbow.dm" #include "code\modules\crafting\crafting_recipes\improvised_crafting\crafting_spear_prod.dm" @@ -1908,6 +1910,7 @@ #include "code\modules\fabrication\designs\imprinter\designs_exosuit_software.dm" #include "code\modules\fabrication\designs\imprinter\designs_misc_circuits.dm" #include "code\modules\fabrication\designs\industrial\_designs_industrial.dm" +#include "code\modules\fabrication\designs\industrial\designs_armour.dm" #include "code\modules\fabrication\designs\industrial\designs_exosuit_components.dm" #include "code\modules\fabrication\designs\meat\_designs_meat.dm" #include "code\modules\fabrication\designs\meat\designs_organs.dm" @@ -2059,7 +2062,6 @@ #include "code\modules\keybindings\admin.dm" #include "code\modules\keybindings\bindings_atom.dm" #include "code\modules\keybindings\bindings_client.dm" -#include "code\modules\keybindings\carbon.dm" #include "code\modules\keybindings\client.dm" #include "code\modules\keybindings\communication.dm" #include "code\modules\keybindings\human.dm" @@ -2533,7 +2535,6 @@ #include "code\modules\modular_computers\computers\subtypes\preset_telescreen.dm" #include "code\modules\modular_computers\file_system\computer_file.dm" #include "code\modules\modular_computers\file_system\data.dm" -#include "code\modules\modular_computers\file_system\grant.dm" #include "code\modules\modular_computers\file_system\manifest.dm" #include "code\modules\modular_computers\file_system\program.dm" #include "code\modules\modular_computers\file_system\program_events.dm" @@ -2541,6 +2542,7 @@ #include "code\modules\modular_computers\file_system\programs\antagonist\hacked_camera.dm" #include "code\modules\modular_computers\file_system\programs\antagonist\revelation.dm" #include "code\modules\modular_computers\file_system\programs\antagonist\uplink.dm" +#include "code\modules\modular_computers\file_system\programs\command\accounts.dm" #include "code\modules\modular_computers\file_system\programs\command\card.dm" #include "code\modules\modular_computers\file_system\programs\command\comm.dm" #include "code\modules\modular_computers\file_system\programs\engineering\alarm_monitor.dm" @@ -2599,6 +2601,9 @@ #include "code\modules\modular_computers\networking\_network.dm" #include "code\modules\modular_computers\networking\network_cable.dm" #include "code\modules\modular_computers\networking\network_files.dm" +#include "code\modules\modular_computers\networking\accounts\_network_accounts.dm" +#include "code\modules\modular_computers\networking\accounts\account.dm" +#include "code\modules\modular_computers\networking\accounts\email_message.dm" #include "code\modules\modular_computers\networking\device_types\_network_device.dm" #include "code\modules\modular_computers\networking\device_types\acl.dm" #include "code\modules\modular_computers\networking\device_types\broadcaster.dm" @@ -2606,9 +2611,6 @@ #include "code\modules\modular_computers\networking\device_types\relay.dm" #include "code\modules\modular_computers\networking\device_types\router.dm" #include "code\modules\modular_computers\networking\device_types\stock_part.dm" -#include "code\modules\modular_computers\networking\emails\_network_email.dm" -#include "code\modules\modular_computers\networking\emails\email_account.dm" -#include "code\modules\modular_computers\networking\emails\email_message.dm" #include "code\modules\modular_computers\networking\machinery\_network_machine.dm" #include "code\modules\modular_computers\networking\machinery\acl.dm" #include "code\modules\modular_computers\networking\machinery\mainframe.dm" @@ -2631,12 +2633,13 @@ #include "code\modules\modular_computers\terminal\terminal_skill_fail.dm" #include "code\modules\multiz\basic.dm" #include "code\modules\multiz\hoist.dm" +#include "code\modules\multiz\ladder.dm" #include "code\modules\multiz\level_data.dm" #include "code\modules\multiz\map_data.dm" #include "code\modules\multiz\mobile_ladder.dm" #include "code\modules\multiz\movement.dm" #include "code\modules\multiz\pipes.dm" -#include "code\modules\multiz\structures.dm" +#include "code\modules\multiz\stairs.dm" #include "code\modules\multiz\turf.dm" #include "code\modules\multiz\zmimic\mimic_common.dm" #include "code\modules\multiz\zmimic\mimic_movable.dm" @@ -3386,6 +3389,7 @@ #include "code\unit_tests\chemistry_tests.dm" #include "code\unit_tests\closets.dm" #include "code\unit_tests\clothing.dm" +#include "code\unit_tests\codex.dm" #include "code\unit_tests\culture.dm" #include "code\unit_tests\decls.dm" #include "code\unit_tests\economics.dm" diff --git a/test/check-paths.sh b/test/check-paths.sh index 5e2265ea09a..f92a2f59f91 100755 --- a/test/check-paths.sh +++ b/test/check-paths.sh @@ -23,7 +23,7 @@ exactly() { # exactly N name search [mode] [filter] # With the potential exception of << if you increase any of these numbers you're probably doing it wrong # Additional exception August 2020: \b is a regex symbol as well as a BYOND macro. -exactly 1 "escapes" '\\\\(red|blue|green|black|b|i[^mc])' +exactly 4 "escapes" '\\\\(red|blue|green|black|b|i[^mc])' "-Eo" exactly 4 "Del()s" '\WDel\(' exactly 2 "/atom text paths" '"/atom' exactly 2 "/area text paths" '"/area' @@ -32,12 +32,12 @@ exactly 2 "/mob text paths" '"/mob' exactly 6 "/obj text paths" '"/obj' exactly 8 "/turf text paths" '"/turf' exactly 1 "world<< uses" 'world<<|world[[:space:]]<<' -exactly 91 "'in world' uses" 'in world' +exactly 93 "'in world' uses" 'in world' exactly 1 "world.log<< uses" 'world.log<<|world.log[[:space:]]<<' exactly 18 "<< uses" '(?> uses" '>>(?!>)' -P exactly 0 "incorrect indentations" '^( {4,})' -P -exactly 20 "text2path uses" 'text2path' +exactly 22 "text2path uses" 'text2path' exactly 4 "update_icon() override" '/update_icon\((.*)\)' -P exactly 0 "goto uses" 'goto ' exactly 6 "atom/New uses" '^/(obj|atom|area|mob|turf).*/New\('