"
else
dat+="None"
- dat+="" + var/dat = list("Superluminal Artillery Control:
") dat += "Locked on
" - dat += "Charge progress: [reload]/180:
" + dat += "Charge progress: [round(100 - ((reload_cooldown - world.time) / time_to_reload))]%
" dat += "Open Fire
" dat += "Deployment of weapon authorized by
[global.using_map.company_name] Naval Command
Remember, friendly fire is grounds for termination of your contract and life.
" - show_browser(user, dat, "window=scroll") - onclose(user, "scroll") - -/obj/machinery/artillerycontrol/Topic(href, href_list, state = global.physical_topic_state) - if(..()) - return 1 - - if ((usr.contents.Find(src) || (in_range(src, usr) && isturf(src.loc))) || (issilicon(usr))) - var/area/thearea = input("Area to jump bombard", "Open Fire") as null|anything in teleportlocs - thearea = thearea ? teleportlocs[thearea] : thearea - if (!thearea || CanUseTopic(usr, global.physical_topic_state) != STATUS_INTERACTIVE) - return - if (src.reload < 180) - return - if ((usr.contents.Find(src) || (in_range(src, usr) && isturf(src.loc))) || (issilicon(usr))) - command_announcement.Announce("Wormhole artillery fire detected. Brace for impact.") - log_and_message_admins("has launched an artillery strike.", 1) - var/list/L = list() - for(var/turf/T in get_area_turfs(thearea)) - L+=T - var/loc = pick(L) - explosion(loc,2,5,11) - reload = 0 + show_browser(user, JOINTEXT(dat), "window=superlumcontrol") + onclose(user, "superlumcontrol") + +/obj/machinery/artillerycontrol/OnTopic(mob/user, href_list) + if((. = ..())) + return + + var/area/thearea = input("Area to jump bombard", "Open Fire") as null|anything in teleportlocs + thearea = thearea ? teleportlocs[thearea] : null + if (!thearea) + return + if (world.time < reload_cooldown) + return + command_announcement.Announce("Wormhole artillery fire detected. Brace for impact.") + log_and_message_admins("has launched an artillery strike.", user, get_turf(src)) + var/list/turf/candidates = list() + // this is slow (in world loop) but we don't have a better way unless we pre-register a list of areas -> z-levels + // and this code isn't hot code at all + for(var/turf/tile in thearea) + candidates += tile + var/turf/target_loc = pick(candidates) + explosion(target_loc, 2, 5, 11) + reload_cooldown = world.time + time_to_reload diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm index c97ef5ee9035..49dbb1237f44 100644 --- a/code/modules/awaymissions/pamphlet.dm +++ b/code/modules/awaymissions/pamphlet.dm @@ -8,7 +8,7 @@ winning dental plan- but that's not all the Gateway project has to offer.
\
Because we care about you, we feel it is only fair to make sure you know the risks \ before you commit to joining the Gateway project. All away destinations have \ - been fully scanned by a expeditionary team, and are certified to be 100% safe. \ + been fully scanned by an expeditionary team, and are certified to be 100% safe. \ We've even left a case of space beer along with the basic materials you'll need to expand \ the Project's operational area and start your new life.
\ Gateway Operation Basics
\ diff --git a/code/modules/barricade_tape/barricade_tape.dm b/code/modules/barricade_tape/barricade_tape.dm new file mode 100644 index 000000000000..b0f81d840a3f --- /dev/null +++ b/code/modules/barricade_tape/barricade_tape.dm @@ -0,0 +1,252 @@ +#define MAX_BARRICADE_TAPE_LENGTH 32 //Maximum length of a continuous line of tape someone can place down. +#define TAPE_BARRICADE_V_NEIGHBORS (NORTH | SOUTH) +#define TAPE_BARRICADE_H_NEIGHBORS (EAST | WEST) +#define TAPE_BARRICADE_IS_CORNER_NEIGHBORS(X) ((X ^ TAPE_BARRICADE_V_NEIGHBORS) && (X ^ TAPE_BARRICADE_H_NEIGHBORS)) +#define TAPE_BARRICADE_IS_V_NEIGHBORS(X) ((X & TAPE_BARRICADE_V_NEIGHBORS) == TAPE_BARRICADE_V_NEIGHBORS && !((X & TAPE_BARRICADE_H_NEIGHBORS) == TAPE_BARRICADE_H_NEIGHBORS)) //Check we have neighbors connection on the vertical plane +#define TAPE_BARRICADE_IS_H_NEIGHBORS(X) ((X & TAPE_BARRICADE_H_NEIGHBORS) == TAPE_BARRICADE_H_NEIGHBORS && !((X & TAPE_BARRICADE_V_NEIGHBORS) == TAPE_BARRICADE_V_NEIGHBORS)) //Check we have neighbors connection on the horizontal plane +#define TAPE_BARRICADE_IS_3W_V_NEIGHBORS(X) (TAPE_BARRICADE_IS_V_NEIGHBORS(X) && ((X & TAPE_BARRICADE_H_NEIGHBORS) > 0)) +#define TAPE_BARRICADE_IS_3W_H_NEIGHBORS(X) (TAPE_BARRICADE_IS_H_NEIGHBORS(X) && ((X & TAPE_BARRICADE_V_NEIGHBORS) > 0)) +#define TAPE_BARRICADE_IS_4W_NEIGHBORS(X) (((X & TAPE_BARRICADE_V_NEIGHBORS) == TAPE_BARRICADE_V_NEIGHBORS) && ((X & TAPE_BARRICADE_H_NEIGHBORS) == TAPE_BARRICADE_H_NEIGHBORS)) +#define CONNECTION_BITS_TO_TEXT(X) "[(X & WEST) > 0][(X & EAST) > 0][(X & SOUTH) > 0][(X & NORTH) > 0]" +#define TAPE_BARRICADE_GET_NB_NEIGHBORS(X) (((X & NORTH) > 0) + ((X & SOUTH) > 0) + ((X & EAST) > 0) + ((X & WEST) > 0)) + +var/global/list/image/hazard_overlays //Cached hazard floor overlays for the barricade tape + +//////////////////////////////////////////////////////////////////// +// Tape Line Barricade +//////////////////////////////////////////////////////////////////// +/obj/structure/tape_barricade + name = "tape line" + desc = "A line of barricade tape." + icon = 'icons/policetape.dmi' + icon_state = "tape_2w_0" + dir = SOUTH //This structure will try to turn its icon depending on what neighbors it has + layer = ABOVE_DOOR_LAYER + pass_flags = PASS_FLAG_TABLE //About the height of table + anchored = TRUE + material = /decl/material/solid/organic/plastic + current_health = 5 + var/neighbors = 0 //Contains all the direction flags of all the neighboring tape_barricades + var/is_lifted = 0 //Whether the tape is lifted and we're allowing everyone passage. + var/is_crumpled = 0 //Whether the tape was damaged + var/decl/barricade_tape_template/tape_template //Details about the behavior and looks of the barricade + +/obj/structure/tape_barricade/Initialize(ml, _mat, _reinf_mat, var/decl/barricade_tape_template/_tape_template) + . = ..() + if(!hazard_overlays) + hazard_overlays = list() + hazard_overlays["[NORTH]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "N") + hazard_overlays["[EAST]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "E") + hazard_overlays["[SOUTH]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "S") + hazard_overlays["[WEST]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "W") + set_tape_template(_tape_template) + +/obj/structure/tape_barricade/LateInitialize() + . = ..() + build_connection_bits() + update_neighbors() + +/obj/structure/tape_barricade/Destroy() + var/turf/old_loc = get_turf(src) + . = ..() + if(istype(old_loc)) + update_neighbors(old_loc) + +/obj/structure/tape_barricade/proc/set_tape_template(var/decl/barricade_tape_template/tmpl) + if(tmpl) + tape_template = tmpl + if(ispath(tape_template)) + tape_template = GET_DECL(tape_template) + if(!tape_template) + return + + SetName("[tape_template.tape_kind] tape line") + desc = tape_template.tape_desc + icon = tape_template.icon_file + req_access = tape_template.req_access + set_color(tape_template.tape_color) + update_icon() + +/**Cause neighbors to update their icon. */ +/obj/structure/tape_barricade/proc/update_neighbors(var/location = loc) + for (var/look_dir in global.cardinal) + var/obj/structure/tape_barricade/B = locate(/obj/structure/tape_barricade, get_step(location, look_dir)) + if(!QDELETED(B)) + B.update_icon() + + if(!QDELETED(src)) + update_icon() + +/**Updates our connection bits to keep track of the things we're connected to */ +/obj/structure/tape_barricade/proc/build_connection_bits() + neighbors = 0 + for (var/look_dir in global.cardinal) + var/turf/target_turf = get_step(src, look_dir) + if(target_turf) + var/obj/structure/tape_barricade/B = locate(/obj/structure/tape_barricade) in target_turf + //We connect to walls and other tape_barricades + if((B && !QDELETED(B)) || (!B && target_turf.is_wall())) + neighbors |= look_dir + +/**Allow sutypes to override with their own forced icon state name.*/ +/obj/structure/tape_barricade/proc/icon_name_override() + return + +/obj/structure/tape_barricade/on_update_icon() + . = ..() + if(isnull(tape_template) || ispath(tape_template)) + return + //Look up our neighbors + build_connection_bits() + + var/icon_name = icon_name_override() + if(!icon_name) + //Build the icon state from whethere we've got a right angle with out neighbors or not + if(TAPE_BARRICADE_IS_4W_NEIGHBORS(neighbors)) + set_dir(SOUTH) + icon_name = "4w" + + //3 Ways + else if(TAPE_BARRICADE_IS_3W_H_NEIGHBORS(neighbors)) + set_dir(neighbors & TAPE_BARRICADE_V_NEIGHBORS) + icon_name = "3w" + else if(TAPE_BARRICADE_IS_3W_V_NEIGHBORS(neighbors)) + set_dir(neighbors & TAPE_BARRICADE_H_NEIGHBORS) + icon_name = "3w" + + //Lines + else if(TAPE_BARRICADE_IS_H_NEIGHBORS(neighbors)) + set_dir(EAST) + icon_name = "2w" + else if(TAPE_BARRICADE_IS_V_NEIGHBORS(neighbors)) + set_dir(SOUTH) + icon_name = "2w" + + //Endpoints/corners + else + if(neighbors > 0) + set_dir(neighbors) //Make sure if we have no connections we don't set a bad dir + icon_name = "dir" + + icon_state = "[tape_template.base_icon_state]_[icon_name]_[is_crumpled]" + + //Overlays + if(tape_template.detail_overlay) + var/image/ovr = overlay_image(icon, "[tape_template.base_icon_state]_[icon_name]_[tape_template.detail_overlay]", tape_template.detail_color, RESET_COLOR) + ovr.dir = dir + add_overlay(ovr) + +/obj/structure/tape_barricade/attack_hand(mob/user) + + if(user.check_intent(I_FLAG_HARM)) + user.visible_message(SPAN_DANGER("\The [user] tears \the [src]!")) + physically_destroyed() + return TRUE + + if (!user.check_intent(I_FLAG_HELP) || !allowed(user) || !user.check_dexterity(DEXTERITY_SIMPLE_MACHINES, TRUE)) + return ..() + + if(TAPE_BARRICADE_IS_CORNER_NEIGHBORS(neighbors) || (TAPE_BARRICADE_GET_NB_NEIGHBORS(neighbors) > 2)) + to_chat(user, SPAN_WARNING("You can't lift up the pole. Try lifting the line itself.")) + return TRUE + + if(!allowed(user)) + user.visible_message(SPAN_NOTICE("\The [user] carelessly pulls \the [src] out of the way.")) + crumple() + else + user.visible_message(SPAN_NOTICE("\The [user] lifts \the [src], officially allowing passage.")) + + for(var/obj/structure/tape_barricade/B in get_tape_line()) + B.lift(10 SECONDS) //~10 seconds + return TRUE + +/obj/structure/tape_barricade/dismantle_structure(mob/user) + for (var/obj/structure/tape_barricade/B in get_tape_line()) + if(B == src || QDELETED(B)) + continue + if(B.neighbors & get_dir(B, src)) + B.physically_destroyed() + . = ..() + +/obj/structure/tape_barricade/CanPass(atom/movable/mover, turf/target, height, air_group) + if(!is_lifted && ismob(mover)) + var/mob/M = mover + if (!allowed(M) && M.check_intent(I_FLAG_HELP)) + return FALSE + return ..() + +/obj/structure/tape_barricade/Crossed(atom/movable/AM) + . = ..() + if(is_lifted || !isliving(AM)) + return + var/mob/living/M = AM + add_fingerprint(M) + shake_animation(2) + if (!allowed(M)) //only select few learn art of not crumpling the tape + to_chat(M, SPAN_NOTICE("You are not supposed to go past \the [src]...")) + if(!M.check_intent(I_FLAG_HELP)) + crumple() + +/obj/structure/tape_barricade/proc/crumple() + if(!is_crumpled) + playsound(src, 'sound/effects/rip1.ogg', 60, TRUE) + take_damage(5) + is_crumpled = TRUE + update_icon() + +/**Temporarily lifts the tape line, allowing passage to anyone for the specified time, until the timer expires. */ +/obj/structure/tape_barricade/proc/lift(var/time) + if(!is_lifted) + is_lifted = TRUE + layer = ABOVE_HUMAN_LAYER + pass_flags = PASS_FLAG_MOB + pixel_y += 8 + addtimer(CALLBACK(src, PROC_REF(on_unlift)), time, TIMER_UNIQUE) + playsound(src, 'sound/effects/pageturn2.ogg', 50, TRUE) + +/**Called by timer when the tape line falls back in place. */ +/obj/structure/tape_barricade/proc/on_unlift() + is_lifted = FALSE + pass_flags = initial(pass_flags) + reset_plane_and_layer() + pixel_y -= 8 + playsound(src, 'sound/effects/pageturn2.ogg', 20, TRUE) + +// Returns a list of all tape objects connected to src, including itself. +/obj/structure/tape_barricade/proc/get_tape_line(var/list/ignored, var/line_index = 0) + //Don't include more in the line than this + if(line_index >= MAX_BARRICADE_TAPE_LENGTH) + return list() + + var/list/dirs = list() + if(neighbors & NORTH) + dirs += NORTH + if(neighbors & SOUTH) + dirs += SOUTH + if(neighbors & WEST) + dirs += WEST + if(neighbors & EAST) + dirs += EAST + + //Grab all cached connected neighbors + LAZYDISTINCTADD(ignored, src) + var/list/obj/structure/tape_barricade/tapeline = list(src) + for(var/look_dir in dirs) + var/turf/T = get_step(src, look_dir) + var/obj/structure/tape_barricade/B = locate() in T + if(!QDELETED(B) && !(B in ignored)) + if(TAPE_BARRICADE_IS_CORNER_NEIGHBORS(neighbors) || (TAPE_BARRICADE_GET_NB_NEIGHBORS(neighbors) > 2)) + continue //We stop at intersections, and corners + tapeline += B.get_tape_line(ignored, line_index + 1) //Pass us to prevent infinite loops, and adding us to the resulting line + return tapeline + +#undef TAPE_BARRICADE_IS_CORNER_NEIGHBORS +#undef TAPE_BARRICADE_V_NEIGHBORS +#undef TAPE_BARRICADE_H_NEIGHBORS +#undef TAPE_BARRICADE_IS_V_NEIGHBORS +#undef TAPE_BARRICADE_IS_H_NEIGHBORS +#undef TAPE_BARRICADE_IS_3W_V_NEIGHBORS +#undef TAPE_BARRICADE_IS_3W_H_NEIGHBORS +#undef TAPE_BARRICADE_IS_4W_NEIGHBORS +#undef CONNECTION_BITS_TO_TEXT +#undef TAPE_BARRICADE_GET_NB_NEIGHBORS \ No newline at end of file diff --git a/code/modules/barricade_tape/barricade_tape_roll.dm b/code/modules/barricade_tape/barricade_tape_roll.dm new file mode 100644 index 000000000000..6ebf3b5d5d6b --- /dev/null +++ b/code/modules/barricade_tape/barricade_tape_roll.dm @@ -0,0 +1,151 @@ +//////////////////////////////////////////////////////////////////// +// Barricade Tape Roll +//////////////////////////////////////////////////////////////////// +/obj/item/stack/tape_roll/barricade_tape + name = "barricade tape roll" + desc = "A roll of high visibility, non-sticky barricade tape. Used to deter passersby from crossing it." + icon = 'icons/policetape.dmi' + icon_state = "tape" + w_class = ITEM_SIZE_SMALL + var/tmp/turf/start //The turf we started unrolling from + var/tmp/weakref/unroller //The mob currently unrolling us + var/decl/barricade_tape_template/tape_template //Template containing details on how the tape roll will look and behave, along with what it will place down + +/obj/item/stack/tape_roll/barricade_tape/Initialize() + . = ..() + apply_template() + +/obj/item/stack/tape_roll/barricade_tape/Destroy() + stop_unrolling() + return ..() + +/**Update our appearence and data to match the specified tape template. */ +/obj/item/stack/tape_roll/barricade_tape/proc/apply_template() + if(ispath(tape_template)) + tape_template = GET_DECL(tape_template) + if(!tape_template) + return + + SetName("[tape_template.tape_kind] tape roll") + desc = tape_template.roll_desc + icon = tape_template.icon_file + set_color(tape_template.tape_color) + update_icon() + +/obj/item/stack/tape_roll/barricade_tape/on_update_icon() + . = ..() + if(ismob(loc)) + add_overlay(overlay_image(icon, start? "stop" : "start", flags = RESET_COLOR)) + +/obj/item/stack/tape_roll/barricade_tape/dropped(mob/user) + stop_unrolling() + update_icon() + return ..() + +/obj/item/stack/tape_roll/barricade_tape/on_picked_up(mob/user) + stop_unrolling() + update_icon() + return ..() + +/obj/item/stack/tape_roll/barricade_tape/attack_hand() + . = ..() + if(. && !QDELETED(src)) + update_icon() + +/**Callback used when whoever holds us moved to a new turf. */ +/obj/item/stack/tape_roll/barricade_tape/proc/user_moved_unrolling(var/mob/M, var/atom/old_loc, var/atom/new_loc) + if(QDELETED(src)) + return //Destructor will handle the rest + if(QDELETED(M) || !can_use(1) || M.incapacitated()) + stop_unrolling() + return + + if((old_loc.x != new_loc.x && old_loc.y != new_loc.y) || old_loc.z != new_loc.z) + to_chat(M, SPAN_WARNING("\The [src] can only be laid horizontally or vertically.")) + stop_unrolling() + return + //Use a length of tape and place a barricade line + if(!place_line(M, new_loc, get_dir(old_loc, new_loc))) + stop_unrolling() + return + if(get_dist(start, new_loc) >= MAX_BARRICADE_TAPE_LENGTH) + to_chat(M, SPAN_WARNING("You've stretched this line of tape to the maximum!")) + stop_unrolling() + return + +/obj/item/stack/tape_roll/barricade_tape/proc/stop_unrolling() + if(!start && !unroller) + return + var/mob/_uroller = unroller.resolve() + if(_uroller) + events_repository.unregister(/decl/observ/moved, _uroller, src, PROC_REF(user_moved_unrolling)) + unroller = null + start = null + slowdown_general = initial(slowdown_general) + if(_uroller) + to_chat(_uroller, SPAN_NOTICE("You stop unrolling \the [src].")) + if(!QDELETED(src)) + update_icon() + return TRUE + +/obj/item/stack/tape_roll/barricade_tape/proc/start_unrolling(var/mob/user) + if(start && unroller) + return + start = get_turf(src) + unroller = weakref(user) + slowdown_general = initial(slowdown_general) + 2 //While unrolling you're slightly slower + events_repository.unregister(/decl/observ/moved, user, src, PROC_REF(user_moved_unrolling)) + events_repository.register(/decl/observ/moved, user, src, PROC_REF(user_moved_unrolling)) + to_chat(user, SPAN_NOTICE("You start unrolling \the [src].")) + //Place the first one immediately + place_line(user, get_turf(user), user.dir) + update_icon() + return TRUE + +/**Place a tape line on the current turf. */ +/obj/item/stack/tape_roll/barricade_tape/proc/place_line(var/mob/user, var/turf/T, var/pdir) + if(!T || T.is_open() || T.is_wall()) + to_chat(user, SPAN_WARNING("You can't place tape here!")) + return + if(locate(/obj/structure/tape_barricade) in T) + return //Can't place 2 on the same tile! + + if(!can_use(1)) + to_chat(user, SPAN_WARNING("You are out of [tape_template.tape_kind] tape!")) + return + use(1) + playsound(user, 'sound/effects/pageturn2.ogg', 50, TRUE) + + var/obj/structure/tape_barricade/barricade = tape_template.make_line_barricade(user, T, pdir) + if(barricade) + barricade.matter = matter_per_piece?.Copy() + barricade.update_neighbors() + return barricade + +/obj/item/stack/tape_roll/barricade_tape/attack_self(mob/user) + if(start) + stop_unrolling() + return + if(!can_use(1)) + return //This shouldn't happen, but if it does, don't let them exploit it + + start_unrolling(user) + +/obj/item/stack/tape_roll/barricade_tape/afterattack(var/atom/A, mob/user, proximity) + if(!proximity) + return + + if (istype(A, /obj/machinery/door/airlock)) + if(!can_use(4)) + to_chat(user, SPAN_WARNING("There isn't enough [plural_name] in \the [src] to barricade \the [A]. You need at least 4 [plural_name].")) + return + + var/obj/structure/tape_barricade/door/bar = tape_template.make_door_barricade(user, A) + if(bar) + bar.matter = matter_per_piece?.Copy() + if(bar.matter) + for(var/mat in bar.matter) + bar.matter[mat] = round(bar.matter[mat] * 4) + + to_chat(user, SPAN_NOTICE("You finish placing \the [src].")) + use(4) \ No newline at end of file diff --git a/code/modules/barricade_tape/barricade_tape_subtypes.dm b/code/modules/barricade_tape/barricade_tape_subtypes.dm new file mode 100644 index 000000000000..44cf66cef298 --- /dev/null +++ b/code/modules/barricade_tape/barricade_tape_subtypes.dm @@ -0,0 +1,136 @@ +//////////////////////////////////////////////////////////////////// +// Door Tape Barricade +//////////////////////////////////////////////////////////////////// + +//Barricade over a single door +/obj/structure/tape_barricade/door + icon_state = "tape_door_0" + layer = ABOVE_DOOR_LAYER + +/obj/structure/tape_barricade/door/update_neighbors() + //We completely ignore neighbors + neighbors = 0 + +/obj/structure/tape_barricade/door/icon_name_override() + return "door" //Override the icon picking to pick this icon label instead + +//////////////////////////////////////////////////////////////////// +// Police Tape +//////////////////////////////////////////////////////////////////// +/decl/barricade_tape_template/police + tape_kind = "police" + tape_desc = "A length of police tape. Do not cross." + roll_desc = "A roll of police tape used to block off crime scenes from the public." + tape_color = COLOR_RED + req_access = list(access_security) + +/obj/item/stack/tape_roll/barricade_tape/police + tape_template = /decl/barricade_tape_template/police + +//mapper type +/obj/structure/tape_barricade/police + icon_state = "tape_door_0" + color = COLOR_RED + tape_template = /decl/barricade_tape_template/police + +//////////////////////////////////////////////////////////////////// +// Engineering Tape +//////////////////////////////////////////////////////////////////// +/decl/barricade_tape_template/engineering + tape_kind = "engineering" + tape_desc = "A length of engineering tape. Better not cross it." + roll_desc = "A roll of engineering tape used to block off working areas from the public." + tape_color = COLOR_ORANGE + req_access = list(list(access_engine,access_atmospherics)) + +/obj/item/stack/tape_roll/barricade_tape/engineering + tape_template = /decl/barricade_tape_template/engineering + +//mapper type +/obj/structure/tape_barricade/engineering + icon_state = "stripetape_door_0" + color = COLOR_ORANGE + tape_template = /decl/barricade_tape_template/engineering + +//////////////////////////////////////////////////////////////////// +// Atmospheric Tape +//////////////////////////////////////////////////////////////////// +/decl/barricade_tape_template/atmos + tape_kind = "atmospherics" + tape_desc = "A length of atmospherics tape. Better not cross it." + roll_desc = "A roll of atmospherics tape used to block off working areas from the public." + tape_color = COLOR_BLUE_LIGHT + req_access = list(list(access_engine,access_atmospherics)) + base_icon_state = "stripetape" + detail_overlay = "stripes" + detail_color = COLOR_YELLOW + +/obj/item/stack/tape_roll/barricade_tape/atmos + tape_template = /decl/barricade_tape_template/atmos + +//mapper type +/obj/structure/tape_barricade/atmos + icon_state = "stripetape_h_0" + color = COLOR_BLUE_LIGHT + tape_template = /decl/barricade_tape_template/atmos + +//////////////////////////////////////////////////////////////////// +// Research Tape +//////////////////////////////////////////////////////////////////// +/decl/barricade_tape_template/research + tape_kind = "research" + tape_desc = "A length of research tape. Better not cross it." + roll_desc = "A roll of research tape used to block off working areas from the public." + tape_color = COLOR_WHITE + req_access = list(access_research) + +/obj/item/stack/tape_roll/barricade_tape/research + tape_template = /decl/barricade_tape_template/research + +//mapper type +/obj/structure/tape_barricade/research + color = COLOR_WHITE + tape_template = /decl/barricade_tape_template/research + +//////////////////////////////////////////////////////////////////// +// Medical Tape +//////////////////////////////////////////////////////////////////// +/decl/barricade_tape_template/medical + tape_kind = "medical" + tape_desc = "A length of medical tape. Better not cross it." + roll_desc = "A roll of medical tape used to block off working areas from the public." + tape_color = COLOR_PALE_BLUE_GRAY + req_access = list(access_medical) + base_icon_state = "stripetape" + detail_overlay = "stripes" + detail_color = COLOR_PALE_BLUE_GRAY + +/obj/item/stack/tape_roll/barricade_tape/medical + tape_template = /decl/barricade_tape_template/medical + +//mapper type +/obj/structure/tape_barricade/medical + icon_state = "stripetape_h_0" + color = COLOR_PALE_BLUE_GRAY + tape_template = /decl/barricade_tape_template/medical + +//////////////////////////////////////////////////////////////////// +// Bureacratic Tape +//////////////////////////////////////////////////////////////////// +/decl/barricade_tape_template/bureaucracy + tape_kind = "red" + tape_desc = "A length of bureaucratic red tape. Safely ignored, but darn obstructive sometimes." + roll_desc = "A roll of bureaucratic red tape used to block any meaningful work from being done." + tape_color = COLOR_RED + base_icon_state = "stripetape" + detail_overlay = "stripes" + detail_color = COLOR_RED + +/obj/item/stack/tape_roll/barricade_tape/bureaucracy + tape_template = /decl/barricade_tape_template/bureaucracy + +//mapper type +/obj/structure/tape_barricade/bureaucracy + icon_state = "stripetape_h_0" + color = COLOR_RED + tape_template = /decl/barricade_tape_template/bureaucracy \ No newline at end of file diff --git a/code/modules/barricade_tape/barricade_tape_template.dm b/code/modules/barricade_tape/barricade_tape_template.dm new file mode 100644 index 000000000000..2b386b4dc4db --- /dev/null +++ b/code/modules/barricade_tape/barricade_tape_template.dm @@ -0,0 +1,26 @@ +//////////////////////////////////////////////////////////////////// +// Barricade Tape Template +//////////////////////////////////////////////////////////////////// +//Singletons with data on the various templates of barricade tape +/decl/barricade_tape_template + var/tape_kind = "barricade" //Used as a prefix to the word "tape" when refering to the tape and roll + var/tape_desc = "A tape barricade." //Description for the tape barricade + var/roll_desc = "A roll of barricade tape." //Description for the tape roll + var/icon_file = 'icons/policetape.dmi' //Icon file used for both the tape and roll + var/base_icon_state = "tape" //For the barricade. Icon state used to fetch the applied tape directional icons for various states + var/list/req_access //Access required to automatically pass through tape barricades + var/tape_color //Color of the tape + var/detail_overlay //Overlay for the applied tape + var/detail_color //Color for the detail overlay + +/decl/barricade_tape_template/proc/make_line_barricade(var/mob/user, var/turf/T, var/pdir) + var/obj/structure/tape_barricade/bar = new(T,,,src) + bar.add_fingerprint(user) + return bar + +/decl/barricade_tape_template/proc/make_door_barricade(var/mob/user, var/obj/door) + var/obj/structure/tape_barricade/door/bar = new(get_turf(door)) + bar.set_tape_template(src) + bar.set_dir(door.dir) + bar.add_fingerprint(user) + return bar \ No newline at end of file diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index 5de1ac052b18..5780a8f2ca98 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -12,19 +12,19 @@ layer = BLOB_SHIELD_LAYER - max_health = 30 + max_health = 15 - var/regen_rate = 5 - var/brute_resist = 4.3 - var/fire_resist = 0.8 - var/laser_resist = 2 // Special resist for laser based weapons - Emitters or handheld energy weaponry. Damage is divided by this and THEN by fire_resist. + var/regen_rate = 2.5 + var/brute_damage_divisor = 4.3 + var/fire_damage_divisor = 1.1 + var/laser_damage_divisor = 2 // Special resist for laser based weapons - Emitters or handheld energy weaponry. Damage is divided by this and THEN by fire_damage_divisor. var/expandType = /obj/effect/blob - var/secondary_core_growth_chance = 5 //% chance to grow a secondary blob core instead of whatever was suposed to grown. Secondary cores are considerably weaker, but still nasty. + var/secondary_core_growth_chance = 2.5 //% chance to grow a secondary blob core instead of whatever was suposed to grown. Secondary cores are considerably weaker, but still nasty. var/damage_min = 15 var/damage_max = 30 var/pruned = FALSE var/product = /obj/item/blob_tendril - var/attack_freq = 5 //see proc/attempt_attack; lower is more often, min 1 + var/attack_freq = 7.5 //see proc/attempt_attack; lower is more often, min 1 /obj/effect/blob/Initialize() . = ..() @@ -42,7 +42,7 @@ /obj/effect/blob/explosion_act(var/severity) SHOULD_CALL_PARENT(FALSE) - take_damage(rand(140 - (severity * 40), 140 - (severity * 20)) / brute_resist) + take_damage(rand(140 - (severity * 40), 140 - (severity * 20)) / brute_damage_divisor) /obj/effect/blob/on_update_icon() if(current_health > get_max_health() / 2) @@ -123,7 +123,7 @@ /obj/effect/blob/proc/do_pulse(var/forceLeft, var/list/dirs) set waitfor = FALSE - sleep(4) + sleep(8) var/pushDir = pick(dirs) var/turf/T = get_step(src, pushDir) var/obj/effect/blob/B = (locate() in T) @@ -156,9 +156,9 @@ switch(Proj.atom_damage_type) if(BRUTE) - take_damage(Proj.damage / brute_resist, Proj.atom_damage_type) + take_damage(Proj.damage / brute_damage_divisor, Proj.atom_damage_type) if(BURN) - take_damage((Proj.damage / laser_resist) / fire_resist, Proj.atom_damage_type) + take_damage((Proj.damage / laser_damage_divisor) / fire_damage_divisor, Proj.atom_damage_type) return 0 /obj/effect/blob/attackby(var/obj/item/W, var/mob/user) @@ -182,11 +182,11 @@ var/damage = 0 switch(W.atom_damage_type) if(BURN) - damage = (W.expend_attack_force(user) / fire_resist) + damage = (W.expend_attack_force(user) / fire_damage_divisor) if(IS_WELDER(W)) playsound(loc, 'sound/items/Welder.ogg', 100, 1) if(BRUTE) - damage = (W.expend_attack_force(user) / brute_resist) + damage = (W.expend_attack_force(user) / brute_damage_divisor) take_damage(damage, W.atom_damage_type) return TRUE @@ -195,7 +195,7 @@ name = "master nucleus" desc = "A massive, fragile nucleus guarded by a shield of thick tendrils." icon_state = "blob_core" - max_health = 450 + max_health = 225 damage_min = 30 damage_max = 40 expandType = /obj/effect/blob/shield @@ -216,28 +216,28 @@ regen() will cover update_icon() for this proc /obj/effect/blob/core/proc/process_core_health() switch(get_health_percent()) if(75 to INFINITY) - brute_resist = 3.5 - fire_resist = 2 + brute_damage_divisor = 3.5 + fire_damage_divisor = 2.5 attack_freq = 5 regen_rate = 2 times_to_pulse = 4 if(reported_low_damage) report_shield_status("high") if(50 to 74) - brute_resist = 2.5 - fire_resist = 1.5 + brute_damage_divisor = 2.5 + fire_damage_divisor = 2 attack_freq = 4 regen_rate = 3 times_to_pulse = 3 if(34 to 49) - brute_resist = 1 - fire_resist = 0.8 + brute_damage_divisor = 1 + fire_damage_divisor = 1.1 attack_freq = 3 regen_rate = 4 times_to_pulse = 2 if(-INFINITY to 33) - brute_resist = 0.5 - fire_resist = 0.3 + brute_damage_divisor = 0.5 + fire_damage_divisor = 0.35 regen_rate = 5 times_to_pulse = 1 if(!reported_low_damage) @@ -278,7 +278,7 @@ regen() will cover update_icon() for this proc name = "auxiliary nucleus" desc = "An interwoven mass of tendrils. A glowing nucleus pulses at its center." icon_state = "blob_node" - max_health = 125 + max_health = 65 regen_rate = 1 damage_min = 15 damage_max = 20 @@ -296,10 +296,10 @@ regen() will cover update_icon() for this proc name = "shielding mass" desc = "A pulsating mass of interwoven tendrils. These seem particularly robust, but not quite as active." icon_state = "blob_idle" - max_health = 120 + max_health = 60 damage_min = 13 damage_max = 25 - attack_freq = 7 + attack_freq = 8 regen_rate = 4 expandType = /obj/effect/blob/ravaging light_color = BLOB_COLOR_SHIELD @@ -328,7 +328,7 @@ regen() will cover update_icon() for this proc /obj/effect/blob/ravaging name = "ravaging mass" desc = "A mass of interwoven tendrils. They thrash around haphazardly at anything in reach." - max_health = 20 + max_health = 10 damage_min = 27 damage_max = 36 attack_freq = 3 diff --git a/code/modules/bodytype/bodytype_quadruped.dm b/code/modules/bodytype/bodytype_quadruped.dm index ab5bbdd75e6f..359a7d0d28a9 100644 --- a/code/modules/bodytype/bodytype_quadruped.dm +++ b/code/modules/bodytype/bodytype_quadruped.dm @@ -16,12 +16,12 @@ BP_L_FOOT = list("path" = /obj/item/organ/external/foot/quadruped), BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/quadruped) ) - var/ridable = TRUE + var/rideable = TRUE var/riding_offset = @"{'x':0,'y':0,'z':8}" /decl/bodytype/quadruped/apply_appearance(var/mob/living/human/H) . = ..() - H.can_buckle = ridable + H.can_buckle = rideable H.buckle_pixel_shift = riding_offset /decl/bodytype/quadruped/get_ignited_icon_state(mob/living/victim) diff --git a/code/modules/butchery/butchery_products.dm b/code/modules/butchery/butchery_products.dm index d12b2980a3af..f4e76d9af464 100644 --- a/code/modules/butchery/butchery_products.dm +++ b/code/modules/butchery/butchery_products.dm @@ -128,7 +128,7 @@ /obj/item/food/butchery/offal name = "offal" - desc = "An assortmant of organs and lumps of unidentified gristle. Packed with nutrients and bile." + desc = "An assortment of organs and lumps of unidentified gristle. Packed with nutrients and bile." icon = 'icons/obj/food/butchery/offal.dmi' material = /decl/material/solid/organic/meat/gut nutriment_amt = 15 diff --git a/code/modules/butchery/butchery_products_meat.dm b/code/modules/butchery/butchery_products_meat.dm index aa4cdbd9a514..9907f21994ce 100644 --- a/code/modules/butchery/butchery_products_meat.dm +++ b/code/modules/butchery/butchery_products_meat.dm @@ -30,7 +30,7 @@ return ..() /obj/item/food/butchery/meat/syntiflesh - desc = "A slab of flesh synthetized from reconstituted biomass or artificially grown from chemicals." + desc = "A slab of flesh synthesized from reconstituted biomass or artificially grown from chemicals." meat_name = "synthetic" // Seperate definitions because some food likes to know if it's human. @@ -60,7 +60,7 @@ butchery_data = /decl/butchery_data/animal/small/fowl /obj/item/food/butchery/meat/corgi - desc = "Tastes like... well you know..." + desc = "Tastes like... well, you know..." butchery_data = /decl/butchery_data/animal/corgi /obj/item/food/butchery/meat/xeno diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index f83344b4841e..b27ec40f29d6 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -122,7 +122,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the //all of our asset datums, used for referring to these later var/global/list/asset_datums = list() -//get a assetdatum or make a new one +//get an assetdatum or make a new one /proc/get_asset_datum(var/type) if (!(type in asset_datums)) return new type() diff --git a/code/modules/client/ui_styles/_helpers.dm b/code/modules/client/ui_styles/_helpers.dm index 97d99ab4f2fa..c7c7cc06da71 100644 --- a/code/modules/client/ui_styles/_helpers.dm +++ b/code/modules/client/ui_styles/_helpers.dm @@ -5,9 +5,10 @@ if(!ui.restricted || !filter_available) LAZYADD(., ui) -/proc/get_default_ui_icon(ui_key) - return get_ui_icon(global.using_map.default_ui_style, ui_key) +/proc/get_ui_icon(decl/ui_style/ui_style, ui_key) -/proc/get_ui_icon(ui_style, ui_key) - var/decl/ui_style/style = GET_DECL(ui_style) - return style?.get_icon(ui_key) || get_default_ui_icon(ui_key) + if(ispath(ui_style)) + ui_style = GET_DECL(ui_style) + if(!istype(ui_style)) + ui_style = GET_DECL(global.using_map.default_ui_style) + return ui_style.get_icon(ui_key) diff --git a/code/modules/client/ui_styles/_ui_style.dm b/code/modules/client/ui_styles/_ui_style.dm index d7a51a45f87c..808709107dcd 100644 --- a/code/modules/client/ui_styles/_ui_style.dm +++ b/code/modules/client/ui_styles/_ui_style.dm @@ -7,22 +7,29 @@ var/name /// Associative mapping of UI icon key to icon file. var/list/icons = list( - UI_ICON_ATTACK = 'icons/mob/screen/styles/midnight/attack_selector.dmi', - UI_ICON_FIRE_INTENT = 'icons/mob/screen/styles/midnight/fire_intent.dmi', - UI_ICON_HANDS = 'icons/mob/screen/styles/midnight/hands.dmi', - UI_ICON_HEALTH = 'icons/mob/screen/styles/health.dmi', - UI_ICON_CRIT_MARKER = 'icons/mob/screen/styles/crit_markers.dmi', - UI_ICON_HYDRATION = 'icons/mob/screen/styles/hydration.dmi', - UI_ICON_INTERACTION = 'icons/mob/screen/styles/midnight/interaction.dmi', - UI_ICON_INTERNALS = 'icons/mob/screen/styles/internals.dmi', - UI_ICON_INVENTORY = 'icons/mob/screen/styles/midnight/inventory.dmi', - UI_ICON_MOVEMENT = 'icons/mob/screen/styles/midnight/movement.dmi', - UI_ICON_NUTRITION = 'icons/mob/screen/styles/nutrition.dmi', - UI_ICON_STATUS_FIRE = 'icons/mob/screen/styles/status_fire.dmi', - UI_ICON_STATUS = 'icons/mob/screen/styles/status.dmi', - UI_ICON_UP_HINT = 'icons/mob/screen/styles/midnight/uphint.dmi', - UI_ICON_ZONE_SELECT = 'icons/mob/screen/styles/midnight/zone_selector.dmi', - UI_ICON_CHARGE = 'icons/mob/screen/styles/charge.dmi' + (HUD_ATTACK) = 'icons/mob/screen/styles/midnight/attack_selector.dmi', + (HUD_FIRE_INTENT) = 'icons/mob/screen/styles/midnight/fire_intent.dmi', + (HUD_HANDS) = 'icons/mob/screen/styles/midnight/hands.dmi', + (HUD_HEALTH) = 'icons/mob/screen/styles/health.dmi', + (HUD_CRIT_MARKER) = 'icons/mob/screen/styles/crit_markers.dmi', + (HUD_HYDRATION) = 'icons/mob/screen/styles/hydration.dmi', + (HUD_RESIST) = 'icons/mob/screen/styles/midnight/interaction_resist.dmi', + (HUD_THROW) = 'icons/mob/screen/styles/midnight/interaction_throw.dmi', + (HUD_DROP) = 'icons/mob/screen/styles/midnight/interaction_drop.dmi', + (HUD_MANEUVER) = 'icons/mob/screen/styles/midnight/interaction_maneuver.dmi', + (HUD_INTERNALS) = 'icons/mob/screen/styles/internals.dmi', + (HUD_INVENTORY) = 'icons/mob/screen/styles/midnight/inventory.dmi', + (HUD_MOVEMENT) = 'icons/mob/screen/styles/midnight/movement.dmi', + (HUD_NUTRITION) = 'icons/mob/screen/styles/nutrition.dmi', + (HUD_FIRE) = 'icons/mob/screen/styles/status_fire.dmi', + (HUD_PRESSURE) = 'icons/mob/screen/styles/status_pressure.dmi', + (HUD_BODYTEMP) = 'icons/mob/screen/styles/status_bodytemp.dmi', + (HUD_TOX) = 'icons/mob/screen/styles/status_tox.dmi', + (HUD_OXY) = 'icons/mob/screen/styles/status_oxy.dmi', + (HUD_UP_HINT) = 'icons/mob/screen/styles/midnight/uphint.dmi', + (HUD_ZONE_SELECT) = 'icons/mob/screen/styles/midnight/zone_selector.dmi', + (HUD_CHARGE) = 'icons/mob/screen/styles/charge.dmi', + (HUD_INTENT) = 'icons/screen/intents.dmi' ) /// A subset of UI keys to icon files used to override the above. var/list/override_icons @@ -68,4 +75,4 @@ . += "icon [check_icon] for key [ui_key] is missing states: '[jointext(missing_states, "', '")]'" /decl/ui_style/proc/get_icon(var/ui_key) - return istext(ui_key) && length(icons) ? icons[ui_key] : null + return (!isnull(ui_key) && !isnum(ui_key) && length(icons)) ? icons[ui_key] : null diff --git a/code/modules/client/ui_styles/_ui_style_states.dm b/code/modules/client/ui_styles/_ui_style_states.dm index 881a423335e8..480ae2158929 100644 --- a/code/modules/client/ui_styles/_ui_style_states.dm +++ b/code/modules/client/ui_styles/_ui_style_states.dm @@ -1,19 +1,26 @@ var/global/list/_ui_all_keys = list( - UI_ICON_INTERACTION, - UI_ICON_ZONE_SELECT, - UI_ICON_MOVEMENT, - UI_ICON_INVENTORY, - UI_ICON_ATTACK, - UI_ICON_HANDS, - UI_ICON_INTERNALS, - UI_ICON_HEALTH, - UI_ICON_NUTRITION, - UI_ICON_HYDRATION, - UI_ICON_FIRE_INTENT, - UI_ICON_UP_HINT, - UI_ICON_STATUS, - UI_ICON_STATUS_FIRE, - UI_ICON_CHARGE + (HUD_DROP), + (HUD_RESIST), + (HUD_ZONE_SELECT), + (HUD_MOVEMENT), + (HUD_INVENTORY), + (HUD_ATTACK), + (HUD_HANDS), + (HUD_INTERNALS), + (HUD_HEALTH), + (HUD_NUTRITION), + (HUD_HYDRATION), + (HUD_FIRE_INTENT), + (HUD_UP_HINT), + (HUD_PRESSURE), + (HUD_BODYTEMP), + (HUD_TOX), + (HUD_OXY), + (HUD_FIRE), + (HUD_CHARGE), + (HUD_THROW), + (HUD_MANEUVER), + (HUD_INTENT) ) var/global/list/_ui_expected_states @@ -26,10 +33,21 @@ var/global/list/_ui_expected_states // Set hardcoded strings. global._ui_expected_states = list( - UI_ICON_ATTACK = list( + (HUD_INTENT) = list( + "blank", + "intent_harm", + "intent_grab", + "intent_help", + "intent_disarm", + "intent_harm_off", + "intent_grab_off", + "intent_help_off", + "intent_disarm_off" + ), + (HUD_ATTACK) = list( "attack_none" ), - UI_ICON_FIRE_INTENT = list( + (HUD_FIRE_INTENT) = list( "no_walk0", "no_walk1", "no_run0", @@ -41,14 +59,14 @@ var/global/list/_ui_expected_states "gun0", "gun1" ), - UI_ICON_HANDS = list( + (HUD_HANDS) = list( "hand_base", "hand_selected", "act_equip", "hand1", "hand2" ), - UI_ICON_HEALTH = list( + (HUD_HEALTH) = list( "health0", "health1", "health2", @@ -59,48 +77,67 @@ var/global/list/_ui_expected_states "health7", "health_numb" ), - UI_ICON_CRIT_MARKER = list( + (HUD_CRIT_MARKER) = list( "softcrit", "hardcrit", "fullhealth", "burning" ), - UI_ICON_HYDRATION = list( + (HUD_HYDRATION) = list( "hydration0", "hydration1", "hydration2", "hydration3", "hydration4" ), - UI_ICON_INTERACTION = list( - "act_resist", + (HUD_RESIST) = list( + "act_resist" + ), + (HUD_THROW) = list( "act_throw_off", "act_throw_on", - "act_drop", + ), + (HUD_DROP) = list( + "act_drop" + ), + (HUD_MANEUVER) = list( "maneuver_off", "maneuver_on" ), - UI_ICON_INTERNALS = list( + (HUD_INTERNALS) = list( "internal0", "internal1" ), - UI_ICON_INVENTORY = list( + (HUD_INVENTORY) = list( "other" ), - UI_ICON_MOVEMENT = list(), - UI_ICON_NUTRITION = list( + (HUD_MOVEMENT) = list( + "creeping", + "walking", + "running" + ), + (HUD_NUTRITION) = list( "nutrition0", "nutrition1", "nutrition2", "nutrition3", "nutrition4" ), - UI_ICON_STATUS_FIRE = list( + (HUD_FIRE) = list( "fire0", "fire1", "fire2" ), - UI_ICON_STATUS = list( + (HUD_OXY) = list( + "oxy0", + "oxy1", + "oxy2" + ), + (HUD_TOX) = list( + "tox0", + "tox1" + ), + (HUD_BODYTEMP) = list( "temp-4", "temp-3", "temp-2", @@ -109,32 +146,34 @@ var/global/list/_ui_expected_states "temp1", "temp2", "temp3", - "temp4", - "tox0", - "tox1", - "oxy0", - "oxy1", - "oxy2", + "temp4" + ), + (HUD_PRESSURE) = list( "pressure-2", "pressure-1", "pressure0", "pressure1", "pressure2" ), - UI_ICON_UP_HINT = list( + (HUD_UP_HINT) = list( "uphint0", "uphint1" ), - UI_ICON_ZONE_SELECT = list( + (HUD_ZONE_SELECT) = list( "zone_sel_tail" ), - UI_ICON_CHARGE = list( + (HUD_CHARGE) = list( "charge0", "charge1", "charge2", "charge3", "charge4", - "charge-empty" + "charge-empty", + "blank" + ), + (HUD_THROW) = list( + "act_throw_on", + "act_throw_off" ) ) @@ -143,25 +182,25 @@ var/global/list/_ui_expected_states for(var/attack_type in all_attacks) var/decl/natural_attack/attack = all_attacks[attack_type] if(attack.selector_icon_state) - global._ui_expected_states[UI_ICON_ATTACK] |= attack.selector_icon_state + global._ui_expected_states[HUD_ATTACK] |= attack.selector_icon_state // Collect hand slot sates. for(var/slot in global.all_hand_slots) - global._ui_expected_states[UI_ICON_HANDS] |= "hand_[slot]" + global._ui_expected_states[HUD_HANDS] |= "hand_[slot]" for(var/gripper_type in subtypesof(/datum/inventory_slot/gripper)) var/datum/inventory_slot/gripper/gripper = gripper_type if(TYPE_IS_ABSTRACT(gripper)) continue var/ui_label = initial(gripper.ui_label) if(ui_label) - global._ui_expected_states[UI_ICON_HANDS] |= "hand_[ui_label]" + global._ui_expected_states[HUD_HANDS] |= "hand_[ui_label]" // Collect movement intent states. var/list/all_movement = decls_repository.get_decls_of_subtype(/decl/move_intent) for(var/movement_type in all_movement) var/decl/move_intent/movement = all_movement[movement_type] if(movement.hud_icon_state) - global._ui_expected_states[UI_ICON_MOVEMENT] |= movement.hud_icon_state + global._ui_expected_states[HUD_MOVEMENT] |= movement.hud_icon_state // Collect inventory slot states. for(var/inventory_slot_type in subtypesof(/datum/inventory_slot)) @@ -170,6 +209,6 @@ var/global/list/_ui_expected_states continue var/slot_string = initial(slot.slot_state) if(slot_string) - global._ui_expected_states[UI_ICON_INVENTORY] |= slot_string + global._ui_expected_states[HUD_INVENTORY] |= slot_string return global._ui_expected_states diff --git a/code/modules/client/ui_styles/ui_style_subtypes.dm b/code/modules/client/ui_styles/ui_style_subtypes.dm index 7b1f311ebd71..f80a00d7b8b1 100644 --- a/code/modules/client/ui_styles/ui_style_subtypes.dm +++ b/code/modules/client/ui_styles/ui_style_subtypes.dm @@ -7,56 +7,68 @@ name = "Orange" uid = "ui_style_orange" override_icons = list( - (UI_ICON_ATTACK) = 'icons/mob/screen/styles/orange/attack_selector.dmi', - (UI_ICON_FIRE_INTENT) = 'icons/mob/screen/styles/orange/fire_intent.dmi', - (UI_ICON_HANDS) = 'icons/mob/screen/styles/orange/hands.dmi', - (UI_ICON_INTERACTION) = 'icons/mob/screen/styles/orange/interaction.dmi', - (UI_ICON_INVENTORY) = 'icons/mob/screen/styles/orange/inventory.dmi', - (UI_ICON_MOVEMENT) = 'icons/mob/screen/styles/orange/movement.dmi', - (UI_ICON_UP_HINT) = 'icons/mob/screen/styles/orange/uphint.dmi', - (UI_ICON_ZONE_SELECT) = 'icons/mob/screen/styles/orange/zone_selector.dmi' + (HUD_ATTACK) = 'icons/mob/screen/styles/orange/attack_selector.dmi', + (HUD_FIRE_INTENT) = 'icons/mob/screen/styles/orange/fire_intent.dmi', + (HUD_HANDS) = 'icons/mob/screen/styles/orange/hands.dmi', + (HUD_DROP) = 'icons/mob/screen/styles/orange/interaction_drop.dmi', + (HUD_THROW) = 'icons/mob/screen/styles/orange/interaction_throw.dmi', + (HUD_RESIST) = 'icons/mob/screen/styles/orange/interaction_resist.dmi', + (HUD_MANEUVER) = 'icons/mob/screen/styles/orange/interaction_maneuver.dmi', + (HUD_INVENTORY) = 'icons/mob/screen/styles/orange/inventory.dmi', + (HUD_MOVEMENT) = 'icons/mob/screen/styles/orange/movement.dmi', + (HUD_UP_HINT) = 'icons/mob/screen/styles/orange/uphint.dmi', + (HUD_ZONE_SELECT) = 'icons/mob/screen/styles/orange/zone_selector.dmi' ) /decl/ui_style/old name = "Old" uid = "ui_style_old" override_icons = list( - (UI_ICON_ATTACK) = 'icons/mob/screen/styles/old/attack_selector.dmi', - (UI_ICON_FIRE_INTENT) = 'icons/mob/screen/styles/old/fire_intent.dmi', - (UI_ICON_HANDS) = 'icons/mob/screen/styles/old/hands.dmi', - (UI_ICON_INTERACTION) = 'icons/mob/screen/styles/old/interaction.dmi', - (UI_ICON_INVENTORY) = 'icons/mob/screen/styles/old/inventory.dmi', - (UI_ICON_MOVEMENT) = 'icons/mob/screen/styles/old/movement.dmi', - (UI_ICON_UP_HINT) = 'icons/mob/screen/styles/old/uphint.dmi', - (UI_ICON_ZONE_SELECT) = 'icons/mob/screen/styles/old/zone_selector.dmi' + (HUD_ATTACK) = 'icons/mob/screen/styles/old/attack_selector.dmi', + (HUD_FIRE_INTENT) = 'icons/mob/screen/styles/old/fire_intent.dmi', + (HUD_HANDS) = 'icons/mob/screen/styles/old/hands.dmi', + (HUD_DROP) = 'icons/mob/screen/styles/old/interaction_drop.dmi', + (HUD_THROW) = 'icons/mob/screen/styles/old/interaction_throw.dmi', + (HUD_RESIST) = 'icons/mob/screen/styles/old/interaction_resist.dmi', + (HUD_MANEUVER) = 'icons/mob/screen/styles/old/interaction_maneuver.dmi', + (HUD_INVENTORY) = 'icons/mob/screen/styles/old/inventory.dmi', + (HUD_MOVEMENT) = 'icons/mob/screen/styles/old/movement.dmi', + (HUD_UP_HINT) = 'icons/mob/screen/styles/old/uphint.dmi', + (HUD_ZONE_SELECT) = 'icons/mob/screen/styles/old/zone_selector.dmi' ) /decl/ui_style/old_noborder name = "Old (no border)" uid = "ui_style_old_noborder" override_icons = list( - (UI_ICON_ATTACK) = 'icons/mob/screen/styles/old/attack_selector.dmi', - (UI_ICON_FIRE_INTENT) = 'icons/mob/screen/styles/old/fire_intent.dmi', - (UI_ICON_HANDS) = 'icons/mob/screen/styles/old/hands.dmi', - (UI_ICON_INTERACTION) = 'icons/mob/screen/styles/old/interaction.dmi', - (UI_ICON_INVENTORY) = 'icons/mob/screen/styles/old_noborder/inventory.dmi', - (UI_ICON_MOVEMENT) = 'icons/mob/screen/styles/old/movement.dmi', - (UI_ICON_UP_HINT) = 'icons/mob/screen/styles/old_noborder/uphint.dmi', - (UI_ICON_ZONE_SELECT) = 'icons/mob/screen/styles/old_noborder/zone_selector.dmi' + (HUD_ATTACK) = 'icons/mob/screen/styles/old/attack_selector.dmi', + (HUD_FIRE_INTENT) = 'icons/mob/screen/styles/old/fire_intent.dmi', + (HUD_HANDS) = 'icons/mob/screen/styles/old/hands.dmi', + (HUD_DROP) = 'icons/mob/screen/styles/old/interaction_drop.dmi', + (HUD_THROW) = 'icons/mob/screen/styles/old/interaction_throw.dmi', + (HUD_RESIST) = 'icons/mob/screen/styles/old/interaction_resist.dmi', + (HUD_MANEUVER) = 'icons/mob/screen/styles/old/interaction_maneuver.dmi', + (HUD_INVENTORY) = 'icons/mob/screen/styles/old_noborder/inventory.dmi', + (HUD_MOVEMENT) = 'icons/mob/screen/styles/old/movement.dmi', + (HUD_UP_HINT) = 'icons/mob/screen/styles/old_noborder/uphint.dmi', + (HUD_ZONE_SELECT) = 'icons/mob/screen/styles/old_noborder/zone_selector.dmi' ) /decl/ui_style/white name = "White" uid = "ui_style_white" override_icons = list( - (UI_ICON_ATTACK) = 'icons/mob/screen/styles/white/attack_selector.dmi', - (UI_ICON_FIRE_INTENT) = 'icons/mob/screen/styles/white/fire_intent.dmi', - (UI_ICON_HANDS) = 'icons/mob/screen/styles/white/hands.dmi', - (UI_ICON_INTERACTION) = 'icons/mob/screen/styles/white/interaction.dmi', - (UI_ICON_INVENTORY) = 'icons/mob/screen/styles/white/inventory.dmi', - (UI_ICON_MOVEMENT) = 'icons/mob/screen/styles/white/movement.dmi', - (UI_ICON_UP_HINT) = 'icons/mob/screen/styles/white/uphint.dmi', - (UI_ICON_ZONE_SELECT) = 'icons/mob/screen/styles/white/zone_selector.dmi' + (HUD_ATTACK) = 'icons/mob/screen/styles/white/attack_selector.dmi', + (HUD_FIRE_INTENT) = 'icons/mob/screen/styles/white/fire_intent.dmi', + (HUD_HANDS) = 'icons/mob/screen/styles/white/hands.dmi', + (HUD_DROP) = 'icons/mob/screen/styles/white/interaction_drop.dmi', + (HUD_THROW) = 'icons/mob/screen/styles/white/interaction_throw.dmi', + (HUD_RESIST) = 'icons/mob/screen/styles/white/interaction_resist.dmi', + (HUD_MANEUVER) = 'icons/mob/screen/styles/white/interaction_maneuver.dmi', + (HUD_INVENTORY) = 'icons/mob/screen/styles/white/inventory.dmi', + (HUD_MOVEMENT) = 'icons/mob/screen/styles/white/movement.dmi', + (HUD_UP_HINT) = 'icons/mob/screen/styles/white/uphint.dmi', + (HUD_ZONE_SELECT) = 'icons/mob/screen/styles/white/zone_selector.dmi' ) use_overlay_color = TRUE use_ui_color = TRUE @@ -65,14 +77,17 @@ name = "Minimalist" uid = "ui_style_minimalist" override_icons = list( - (UI_ICON_ATTACK) = 'icons/mob/screen/styles/minimalist/attack_selector.dmi', - (UI_ICON_FIRE_INTENT) = 'icons/mob/screen/styles/minimalist/fire_intent.dmi', - (UI_ICON_HANDS) = 'icons/mob/screen/styles/minimalist/hands.dmi', - (UI_ICON_INTERACTION) = 'icons/mob/screen/styles/minimalist/interaction.dmi', - (UI_ICON_INVENTORY) = 'icons/mob/screen/styles/minimalist/inventory.dmi', - (UI_ICON_MOVEMENT) = 'icons/mob/screen/styles/minimalist/movement.dmi', - (UI_ICON_UP_HINT) = 'icons/mob/screen/styles/minimalist/uphint.dmi', - (UI_ICON_ZONE_SELECT) = 'icons/mob/screen/styles/minimalist/zone_selector.dmi' + (HUD_ATTACK) = 'icons/mob/screen/styles/minimalist/attack_selector.dmi', + (HUD_FIRE_INTENT) = 'icons/mob/screen/styles/minimalist/fire_intent.dmi', + (HUD_HANDS) = 'icons/mob/screen/styles/minimalist/hands.dmi', + (HUD_DROP) = 'icons/mob/screen/styles/minimalist/interaction_drop.dmi', + (HUD_RESIST) = 'icons/mob/screen/styles/minimalist/interaction_resist.dmi', + (HUD_THROW) = 'icons/mob/screen/styles/minimalist/interaction_throw.dmi', + (HUD_MANEUVER) = 'icons/mob/screen/styles/minimalist/interaction_maneuver.dmi', + (HUD_INVENTORY) = 'icons/mob/screen/styles/minimalist/inventory.dmi', + (HUD_MOVEMENT) = 'icons/mob/screen/styles/minimalist/movement.dmi', + (HUD_UP_HINT) = 'icons/mob/screen/styles/minimalist/uphint.dmi', + (HUD_ZONE_SELECT) = 'icons/mob/screen/styles/minimalist/zone_selector.dmi' ) use_overlay_color = TRUE use_ui_color = TRUE @@ -81,23 +96,18 @@ name = "Underworld" uid = "ui_style_underworld" restricted = FALSE - icons = list( - (UI_ICON_ATTACK) = 'icons/mob/screen/styles/underworld/attack_selector.dmi', - (UI_ICON_FIRE_INTENT) = 'icons/mob/screen/styles/underworld/fire_intent.dmi', - (UI_ICON_HANDS) = 'icons/mob/screen/styles/underworld/hands.dmi', - (UI_ICON_HEALTH) = 'icons/mob/screen/styles/health.dmi', - (UI_ICON_CRIT_MARKER) = 'icons/mob/screen/styles/crit_markers.dmi', - (UI_ICON_HYDRATION) = 'icons/mob/screen/styles/hydration.dmi', - (UI_ICON_INTERACTION) = 'icons/mob/screen/styles/underworld/interaction.dmi', - (UI_ICON_INTERNALS) = 'icons/mob/screen/styles/internals.dmi', - (UI_ICON_INVENTORY) = 'icons/mob/screen/styles/underworld/inventory.dmi', - (UI_ICON_MOVEMENT) = 'icons/mob/screen/styles/underworld/movement.dmi', - (UI_ICON_NUTRITION) = 'icons/mob/screen/styles/nutrition.dmi', - (UI_ICON_STATUS_FIRE) = 'icons/mob/screen/styles/status_fire.dmi', - (UI_ICON_STATUS) = 'icons/mob/screen/styles/status.dmi', - (UI_ICON_UP_HINT) = 'icons/mob/screen/styles/underworld/uphint.dmi', - (UI_ICON_ZONE_SELECT) = 'icons/mob/screen/styles/underworld/zone_selector.dmi', - (UI_ICON_CHARGE) = 'icons/mob/screen/styles/charge.dmi' + override_icons = list( + (HUD_ATTACK) = 'icons/mob/screen/styles/underworld/attack_selector.dmi', + (HUD_FIRE_INTENT) = 'icons/mob/screen/styles/underworld/fire_intent.dmi', + (HUD_HANDS) = 'icons/mob/screen/styles/underworld/hands.dmi', + (HUD_DROP) = 'icons/mob/screen/styles/underworld/interaction_drop.dmi', + (HUD_RESIST) = 'icons/mob/screen/styles/underworld/interaction_resist.dmi', + (HUD_THROW) = 'icons/mob/screen/styles/underworld/interaction_throw.dmi', + (HUD_MANEUVER) = 'icons/mob/screen/styles/underworld/interaction_maneuver.dmi', + (HUD_INVENTORY) = 'icons/mob/screen/styles/underworld/inventory.dmi', + (HUD_MOVEMENT) = 'icons/mob/screen/styles/underworld/movement.dmi', + (HUD_UP_HINT) = 'icons/mob/screen/styles/underworld/uphint.dmi', + (HUD_ZONE_SELECT) = 'icons/mob/screen/styles/underworld/zone_selector.dmi' ) use_overlay_color = TRUE use_ui_color = TRUE diff --git a/code/modules/clothing/_clothing.dm b/code/modules/clothing/_clothing.dm index b6cc37b0adae..032f327ee0fa 100644 --- a/code/modules/clothing/_clothing.dm +++ b/code/modules/clothing/_clothing.dm @@ -285,7 +285,7 @@ update_wearer_vision() return ..() -/obj/item/clothing/proc/refit_for_bodytype(var/target_bodytype) +/obj/item/clothing/proc/refit_for_bodytype(target_bodytype, skip_rename = FALSE) bodytype_equip_flags = 0 decls_repository.get_decls_of_subtype(/decl/bodytype) // Make sure they're prefetched so the below list is populated @@ -297,6 +297,9 @@ if(species_icon && (check_state_in_icon(ICON_STATE_INV, species_icon) || check_state_in_icon(ICON_STATE_WORLD, species_icon))) icon = species_icon + if(!skip_rename) + SetName("refitted [initial(name)]") + if(last_icon != icon) reconsider_single_icon() update_clothing_icon() diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 4a85cb47cef1..39ea1c743a97 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -190,7 +190,7 @@ /obj/item/clothing/shoes/chameleon name = "black shoes" icon = 'icons/clothing/feet/colored_shoes.dmi' - desc = "They're comfy black shoes, with clever cloaking technology built in. It seems to have a small dial on the back of each shoe." + desc = "They're comfy black shoes, with clever cloaking technology built-in. It seems to have a small dial on the back of each shoe." origin_tech = @'{"esoteric":3}' item_flags = ITEM_FLAG_INVALID_FOR_CHAMELEON bodytype_equip_flags = null @@ -284,7 +284,7 @@ /obj/item/clothing/mask/chameleon name = "gas mask" icon = 'icons/clothing/mask/gas_mask_full.dmi' - desc = "It looks like a plain gask mask, but on closer inspection, it seems to have a small dial inside." + desc = "It looks like a plain gas mask, but on closer inspection, it seems to have a small dial inside." origin_tech = @'{"esoteric":3}' item_flags = ITEM_FLAG_INVALID_FOR_CHAMELEON bodytype_equip_flags = null diff --git a/code/modules/clothing/costumes/misc.dm b/code/modules/clothing/costumes/misc.dm index 13495b75d2f8..b44cfb42bc78 100644 --- a/code/modules/clothing/costumes/misc.dm +++ b/code/modules/clothing/costumes/misc.dm @@ -77,7 +77,7 @@ /obj/item/clothing/costume/oldman name = "old man's suit" - desc = "A classic suit for the older gentleman with built in back support." + desc = "A classic suit for the older gentleman with built-in back support." icon = 'icons/clothing/costumes/uniform_lawyer_old.dmi' /obj/item/clothing/costume/lawyer diff --git a/code/modules/clothing/dresses/misc.dm b/code/modules/clothing/dresses/misc.dm index 20085a74b6cb..49c74faa645e 100644 --- a/code/modules/clothing/dresses/misc.dm +++ b/code/modules/clothing/dresses/misc.dm @@ -1,6 +1,6 @@ /obj/item/clothing/dress/green name = "green dress" - desc = "A simple, tight fitting green dress." + desc = "A simple, tight-fitting green dress." icon = 'icons/clothing/dresses/dress_green.dmi' /obj/item/clothing/dress/yellow @@ -15,28 +15,28 @@ /obj/item/clothing/dress/pink name = "pink dress" - desc = "A simple, tight fitting pink dress." + desc = "A simple, tight-fitting pink dress." icon = 'icons/clothing/dresses/dress_pink.dmi' /obj/item/clothing/dress/purple name = "purple dress" - desc= "A simple, tight fitting purple dress." + desc= "A simple, tight-fitting purple dress." icon = 'icons/clothing/dresses/dress_purple.dmi' /obj/item/clothing/dress/saloon name = "saloon girl dress" - desc = "A old western inspired gown for the girl who likes to drink." + desc = "An old western-inspired gown for the girl who likes to drink." icon = 'icons/clothing/dresses/dress_saloon.dmi' /obj/item/clothing/dress/cap name = "captain's dress uniform" - desc = "Feminine fashion for the style concious captain." + desc = "Feminine fashion for the style-conscious captain." icon = 'icons/clothing/dresses/uniform_captain_dress.dmi' body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_ARMS /obj/item/clothing/dress/hop name = "head of personnel dress uniform" - desc = "Feminine fashion for the style concious HoP." + desc = "Feminine fashion for the style-conscious HoP." icon = 'icons/clothing/dresses/dress_hop.dmi' body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_ARMS diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 17022402e0aa..5341391d4d38 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -87,7 +87,7 @@ /obj/item/clothing/glasses/threedglasses name = "3D glasses" - desc = "A long time ago, people used these glasses to makes images from screens threedimensional." + desc = "A long time ago, people used these glasses to makes images from screens three-dimensional." icon = 'icons/clothing/eyes/glasses_3d.dmi' body_parts_covered = 0 diff --git a/code/modules/clothing/glasses/sunglasses.dm b/code/modules/clothing/glasses/sunglasses.dm index c31ff5ec7554..7cb0c0d47084 100644 --- a/code/modules/clothing/glasses/sunglasses.dm +++ b/code/modules/clothing/glasses/sunglasses.dm @@ -1,6 +1,6 @@ /obj/item/clothing/glasses/sunglasses name = "sunglasses" - desc = "Glasses with treated lenses to prevent glare. They provide some rudamentary protection from dazzling attacks." + desc = "Glasses with treated lenses to prevent glare. They provide some rudimentary protection from dazzling attacks." icon = 'icons/clothing/eyes/sunglasses.dmi' darkness_view = -1 flash_protection = FLASH_PROTECTION_NONE diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index ae91f9dcc1f0..9b94599c1820 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -35,10 +35,10 @@ else if(!on && light_applied) set_light(0) light_applied = 0 - update_icon(user) + update_icon() user.update_action_buttons() -/obj/item/clothing/head/on_update_icon(var/mob/user) +/obj/item/clothing/head/on_update_icon() . = ..() update_clothing_icon() if(on) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 4c51dbe3bb9a..d5918f6a7a2e 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -7,8 +7,8 @@ armor = null /obj/item/clothing/head/collectable/petehat - name = "ultra rare hat" - desc = "an ultra rare hat. It commands a certain respect." + name = "ultra-rare hat" + desc = "An ultra-rare hat. It commands a certain respect." icon = 'icons/clothing/head/pete.dmi' /obj/item/clothing/head/collectable/xenom diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 42e08ecd5fe3..3e71ff98b2c1 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -82,7 +82,7 @@ to_chat(user, "You lower the visor on \the [src].") update_icon() -/obj/item/clothing/head/helmet/riot/on_update_icon(mob/user) +/obj/item/clothing/head/helmet/riot/on_update_icon() . = ..() icon_state = get_world_inventory_state() if(up && check_state_in_icon("[icon_state]_up", icon)) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index a435e585d3c5..dd2a2d3cac89 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -33,7 +33,7 @@ /obj/item/clothing/head/that name = "top-hat" - desc = "It's an amish looking hat." + desc = "It's an Amish-looking hat." icon = 'icons/clothing/head/tophat.dmi' siemens_coefficient = 0.9 @@ -78,7 +78,7 @@ /obj/item/clothing/head/rabbitears name = "rabbit ears" - desc = "Wearing these makes you looks useless, and only good for your sex appeal." + desc = "Wearing these makes you look useless, and only good for your sex appeal." icon = 'icons/clothing/head/bunny.dmi' body_parts_covered = 0 flags_inv = 0 @@ -109,6 +109,7 @@ name = "green bandana" desc = "It's a green bandana with some fine nanotech lining." icon = 'icons/clothing/head/bandana/green.dmi' + /obj/item/clothing/head/bandana/orange //themij: Taryn Kifer name = "orange bandana" desc = "An orange piece of cloth, worn on the head." @@ -220,7 +221,7 @@ /obj/item/clothing/head/tank name = "padded cap" - desc = "A padded skullcup for those prone to bumping their heads against hard surfaces." + desc = "A padded skullcap for those prone to bumping their head against hard surfaces." icon = 'icons/clothing/head/tank.dmi' flags_inv = BLOCK_HEAD_HAIR color = "#5f5f5f" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 01d01335e585..b4ffdd62b8f6 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -84,7 +84,7 @@ /obj/item/clothing/head/welding/knight name = "knightly welding helmet" - desc = "A painted welding helmet, this one looks like a knights helmet." + desc = "A painted welding helmet, this one looks like a knight's helmet." icon = 'icons/clothing/head/welding/knight.dmi' /obj/item/clothing/head/welding/fancy @@ -214,7 +214,7 @@ . = ..() update_icon() -/obj/item/clothing/head/cakehat/on_update_icon(mob/user) +/obj/item/clothing/head/cakehat/on_update_icon() . = ..() z_flags &= ~ZMM_MANGLE_PLANES if(is_on_fire() && check_state_in_icon("[icon_state]-flame", icon)) @@ -224,7 +224,7 @@ add_overlay(emissive_overlay(icon, "[icon_state]-flame")) z_flags |= ZMM_MANGLE_PLANES -// Overidable so species with limited headspace in the sprite bounding area can offset it (scavs) +// Overrideable so species with limited headspace in the sprite bounding area can offset it (scavs) /obj/item/clothing/head/cakehat/proc/get_mob_flame_overlay(var/image/overlay, var/bodytype) if(overlay && check_state_in_icon("[overlay.icon_state]-flame", overlay.icon)) return emissive_overlay(overlay.icon, "[overlay.icon_state]-flame") diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 885b9195403b..d90327115d41 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -80,7 +80,7 @@ /obj/item/clothing/head/soft/sec name = "security cap" - desc = "It's a field cap in tasteful red color." + desc = "It's a field cap." color = COLOR_NT_RED /obj/item/clothing/head/soft/black diff --git a/code/modules/clothing/jumpsuits/job.dm b/code/modules/clothing/jumpsuits/job.dm index 90eb1ae24bbe..5c637e6e892e 100644 --- a/code/modules/clothing/jumpsuits/job.dm +++ b/code/modules/clothing/jumpsuits/job.dm @@ -144,7 +144,7 @@ ) /obj/item/clothing/jumpsuit/psych - desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." + desc = "A basic white jumpsuit. It has turquoise markings that denote the wearer as a psychiatrist." name = "psychiatrist's jumpsuit" icon = 'icons/clothing/jumpsuits/jumpsuit_psych.dmi' diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 06d78421b29e..e20814e2ec38 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -22,12 +22,12 @@ permeability_coefficient = 0.01 /obj/item/clothing/mask/breath/emergency - desc = "A close-fitting mask that is used by the wallmounted emergency oxygen pump." + desc = "A close-fitting mask that is used by the wall-mounted emergency oxygen pump." name = "emergency mask" permeability_coefficient = 0.50 /obj/item/clothing/mask/breath/scba - desc = "A close-fitting self contained breathing apparatus mask. Can be connected to an air supply." + desc = "A close-fitting self-contained breathing apparatus mask. Can be connected to an air supply." name = "\improper SCBA mask" icon = 'icons/clothing/mask/breath_scuba.dmi' item_flags = ITEM_FLAG_AIRTIGHT|ITEM_FLAG_FLEXIBLEMATERIAL diff --git a/code/modules/clothing/masks/chewable.dm b/code/modules/clothing/masks/chewable.dm index 84d490148fb9..682c68bc51fd 100644 --- a/code/modules/clothing/masks/chewable.dm +++ b/code/modules/clothing/masks/chewable.dm @@ -1,6 +1,6 @@ /obj/item/clothing/mask/chewable + abstract_type = /obj/item/clothing/mask/chewable name = "chewable item master" - desc = "You're not sure what this is. You should probably ahelp it." icon = 'icons/clothing/mask/chewables/lollipop.dmi' body_parts_covered = 0 bodytype_equip_flags = null @@ -55,7 +55,7 @@ /obj/item/clothing/mask/chewable/tobacco name = "wad" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it doesn't taste like a ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ashtray when you stuff it into your face." throw_speed = 0.5 icon = 'icons/clothing/mask/chewables/chew.dmi' type_butt = /obj/item/trash/cigbutt/spitwad @@ -89,14 +89,14 @@ /obj/item/clothing/mask/chewable/tobacco/lenni name = "chewing tobacco" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it tastes less like a ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it tastes less like an ashtray when you stuff it into your face." /obj/item/clothing/mask/chewable/tobacco/lenni/populate_reagents() add_to_reagents(/decl/material/solid/tobacco, 2) /obj/item/clothing/mask/chewable/tobacco/redlady name = "chewing tobacco" - desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrups so it doesn't taste like a ash-tray when you stuff it into your face" + desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ashtray when you stuff it into your face" /obj/item/clothing/mask/chewable/tobacco/redlady/populate_reagents() add_to_reagents(/decl/material/solid/tobacco/fine, 2) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 7ceb955904cb..afabff1f337f 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -146,7 +146,7 @@ /obj/item/clothing/mask/rubber/barros name = "Amaya Barros mask" - desc = "Current Secretary-General of Sol Cental Government. Not that the real thing would visit this pigsty." + desc = "Current Secretary-General of Sol Central Government. Not that the real thing would visit this pigsty." icon = 'icons/clothing/mask/barros.dmi' visible_name = "Amaya Barros" diff --git a/code/modules/clothing/masks/smokable.dm b/code/modules/clothing/masks/smokable.dm index 675783b875e1..4aa4fd8cb5ef 100644 --- a/code/modules/clothing/masks/smokable.dm +++ b/code/modules/clothing/masks/smokable.dm @@ -1,6 +1,6 @@ /obj/item/clothing/mask/smokable + abstract_type = /obj/item/clothing/mask/smokable name = "smokable item" - desc = "You're not sure what this is. You should probably ahelp it." icon = 'icons/clothing/mask/smokables/cigarette.dmi' body_parts_covered = 0 bodytype_equip_flags = null @@ -492,7 +492,7 @@ ///////////////// /obj/item/clothing/mask/smokable/pipe name = "smoking pipe" - desc = "A pipe, for smoking. Probably made of meershaum or something." + desc = "A pipe, for smoking. Probably made of meerschaum or something." icon = 'icons/clothing/mask/smokables/pipe.dmi' w_class = ITEM_SIZE_TINY smoketime = 0 diff --git a/code/modules/clothing/neck/ties.dm b/code/modules/clothing/neck/ties.dm index 2d25065164bb..faada300effc 100644 --- a/code/modules/clothing/neck/ties.dm +++ b/code/modules/clothing/neck/ties.dm @@ -34,6 +34,10 @@ name = "long yellow tie" color = "#c4c83d" +/obj/item/clothing/neck/tie/long/blue + name = "long blue tie" + color = "#3d62c8" + /obj/item/clothing/neck/tie/navy name = "navy tie" color = "#182e44" diff --git a/code/modules/clothing/pants/detective.dm b/code/modules/clothing/pants/detective.dm index 13d85c27507e..5fa9349d8f6d 100644 --- a/code/modules/clothing/pants/detective.dm +++ b/code/modules/clothing/pants/detective.dm @@ -16,3 +16,10 @@ /obj/item/clothing/neck/tie/long/red, /obj/item/clothing/suit/jacket/vest/black ) + +/obj/item/clothing/pants/slacks/outfit/detective_grey + starting_accessories = list( + /obj/item/clothing/shirt/button, + /obj/item/clothing/neck/tie/long/blue, + /obj/item/clothing/suit/jacket/vest/gray + ) diff --git a/code/modules/clothing/pants/misc.dm b/code/modules/clothing/pants/misc.dm index 766522826607..9fa43b93a094 100644 --- a/code/modules/clothing/pants/misc.dm +++ b/code/modules/clothing/pants/misc.dm @@ -1,6 +1,6 @@ /obj/item/clothing/pants/fire_overpants name = "fire overpants" - desc = "some overpants made of fire-resistant synthetic fibers. To be worn over the uniform." + desc = "Some overpants made of fire-resistant synthetic fibers, worn over one's uniform." icon = 'icons/clothing/pants/overpants.dmi' gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 diff --git a/code/modules/clothing/shirts/sweaters.dm b/code/modules/clothing/shirts/sweaters.dm index 1e19f372e890..5065789b2ed0 100644 --- a/code/modules/clothing/shirts/sweaters.dm +++ b/code/modules/clothing/shirts/sweaters.dm @@ -4,6 +4,6 @@ icon = 'icons/clothing/shirts/uniform_turtleneck.dmi' /obj/item/clothing/shirt/sweater/turquoise - name = "turqouise turtleneck" - desc = "A turqouise sweater and a pair of dark blue slacks." + name = "turquoise turtleneck" + desc = "A turquoise sweater and a pair of dark blue slacks." icon = 'icons/clothing/shirts/uniform_turtleneck_blue.dmi' diff --git a/code/modules/clothing/shirts/syndicate.dm b/code/modules/clothing/shirts/syndicate.dm index ab2498cc055b..a131a36a7e79 100644 --- a/code/modules/clothing/shirts/syndicate.dm +++ b/code/modules/clothing/shirts/syndicate.dm @@ -1,6 +1,6 @@ /obj/item/clothing/shirt/syndicate name = "tactical turtleneck" - desc = "It's some non-descript, slightly suspicious looking, turtleneck sweater." + desc = "It's some nondescript, slightly suspicious looking, turtleneck sweater." icon = 'icons/clothing/shirts/sweater_tactical.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_SMALL, diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index cbf5a0a004e7..2ca4054eebf9 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -1,4 +1,3 @@ -//Note that despite the use of the NOSLIP flag, magboots are still hardcoded to prevent spaceslipping in Check_Shoegrip(). /obj/item/clothing/shoes/magboots name = "magboots" desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. They're large enough to be worn over other footwear." @@ -31,12 +30,14 @@ /obj/item/clothing/shoes/magboots/attack_self(mob/user) if(magpulse) item_flags &= ~ITEM_FLAG_NOSLIP + item_flags &= ~ITEM_FLAG_MAGNETISED magpulse = 0 set_slowdown() set_base_attack_force(3) to_chat(user, "You disable the mag-pulse traction system.") else item_flags |= ITEM_FLAG_NOSLIP + item_flags |= ITEM_FLAG_MAGNETISED magpulse = 1 set_slowdown() set_base_attack_force(5) @@ -115,6 +116,6 @@ /obj/item/clothing/shoes/magboots/examine(mob/user) . = ..() var/state = "disabled" - if(item_flags & ITEM_FLAG_NOSLIP) + if(item_flags & ITEM_FLAG_MAGNETISED) state = "enabled" to_chat(user, "Its mag-pulse traction system appears to be [state].") diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 53579e0dd79a..a2d298807ddb 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -153,7 +153,7 @@ /obj/item/clothing/shoes/athletic name = "athletic shoes" - desc = "A pair of sleek atheletic shoes. Made by and for the sporty types." + desc = "A pair of sleek athletic shoes. Made by and for the sporty types." icon = 'icons/clothing/feet/sports.dmi' /obj/item/clothing/shoes/dress/sneakies diff --git a/code/modules/clothing/skirts/job.dm b/code/modules/clothing/skirts/job.dm index 11cbba468ba5..2f4dd7a17c0b 100644 --- a/code/modules/clothing/skirts/job.dm +++ b/code/modules/clothing/skirts/job.dm @@ -1,6 +1,6 @@ /obj/item/clothing/skirt/research_director name = "chief science officer dress uniform" - desc = "Feminine fashion for the style concious CSO. Its fabric provides minor protection from biological contaminants." + desc = "Feminine fashion for the style-conscious CSO. Its fabric provides minor protection from biological contaminants." icon = 'icons/clothing/dresses/dress_rd.dmi' armor = list( ARMOR_BIO = ARMOR_BIO_MINOR diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index e37955054baa..75ba84eb56bc 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -1,7 +1,7 @@ //Orange emergency space suit /obj/item/clothing/head/helmet/space/emergency name = "emergency space helmet" - desc = "A simple helmet with a built in light, smells like mothballs." + desc = "A simple helmet with a built-in light, smells like mothballs." flash_protection = FLASH_PROTECTION_NONE /obj/item/clothing/suit/space/emergency diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index f6a35661567b..6ba6b837d81c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -200,7 +200,7 @@ /obj/item/rig_module/mounted name = "mounted gun" - desc = "Somesort of mounted gun." + desc = "Some sort of mounted gun." selectable = 1 usable = 1 module_cooldown = 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index c263a126afda..5536a7500307 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -104,7 +104,7 @@ if(!card) card = new /obj/item/aicard(src) - // Terminal interaction only works with an inteliCarded AI. + // Terminal interaction only works with an intelliCarded AI. if(!istype(card)) return 0 @@ -328,7 +328,7 @@ /obj/item/rig_module/power_sink name = "hardsuit power sink" - desc = "An heavy-duty power sink." + desc = "A heavy-duty power sink." icon_state = "powersink" toggleable = 1 activates_on_touch = 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 893ec665f882..a616b18c7574 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -10,7 +10,7 @@ /obj/item/rig_module name = "hardsuit upgrade" - desc = "It looks pretty sciency." + desc = "It looks pretty science-y." icon = 'icons/obj/rig_modules.dmi' icon_state = "module" material = /decl/material/solid/metal/steel diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f9f4f356c2bb..719db3034b77 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -183,7 +183,7 @@ set_extension(piece, armor_type, armor, armor_degradation_speed) set_slowdown_and_vision(!offline) - update_icon(1) + update_icon() /obj/item/rig/Destroy() QDEL_NULL(gloves) @@ -232,7 +232,7 @@ piece.max_pressure_protection = initial(piece.max_pressure_protection) piece.min_pressure_protection = initial(piece.min_pressure_protection) piece.item_flags &= ~ITEM_FLAG_AIRTIGHT - update_icon(1) + update_icon() /obj/item/rig/proc/toggle_seals(var/mob/initiator,var/instant) @@ -346,7 +346,7 @@ canremove = !seal_target if(airtight) update_component_sealed() - update_icon(1) + update_icon() return 0 // Success! @@ -363,7 +363,7 @@ module.deactivate() if(airtight) update_component_sealed() - update_icon(1) + update_icon() /obj/item/rig/proc/update_component_sealed() @@ -386,7 +386,7 @@ helmet.flags_inv &= ~(HIDEMASK) else helmet.flags_inv |= HIDEMASK - update_icon(1) + update_icon() /obj/item/rig/Process() @@ -444,7 +444,7 @@ return 1 return 0 -/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconcious, var/obj/item/rig_module/mod, var/user_is_ai) +/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconscious, var/obj/item/rig_module/mod, var/user_is_ai) if(!istype(user)) return 0 @@ -457,7 +457,7 @@ fail_msg = "You must be wearing \the [src] to do this." if(sealing) fail_msg = "The hardsuit is in the process of adjusting seals and cannot be activated." - else if(!fail_msg && ((use_unconcious && user.stat > 1) || (!use_unconcious && user.stat))) + else if(!fail_msg && ((use_unconscious && user.stat > 1) || (!use_unconscious && user.stat))) fail_msg = "You are in no fit state to do that." else if(!cell) fail_msg = "There is no cell installed in the suit." diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index a5a4899da019..82834970b6d5 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -23,10 +23,11 @@ light_wedge = LIGHT_WIDE bodytype_equip_flags = null -/obj/item/clothing/head/helmet/space/rig/on_update_icon(mob/user) +/obj/item/clothing/head/helmet/space/rig/on_update_icon() . = ..() icon_state = get_world_inventory_state() - if(user?.check_rig_status() && check_state_in_icon("[icon_state]-sealed", icon)) + var/mob/mob_loc = loc + if(istype(mob_loc) && mob_loc.check_rig_status() && check_state_in_icon("[icon_state]-sealed", icon)) icon_state = "[icon_state]-sealed" /obj/item/clothing/head/helmet/space/rig/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE) @@ -43,10 +44,11 @@ bodytype_equip_flags = null gender = PLURAL -/obj/item/clothing/gloves/rig/on_update_icon(mob/user) +/obj/item/clothing/gloves/rig/on_update_icon() . = ..() icon_state = get_world_inventory_state() - if(user?.check_rig_status() && check_state_in_icon("[icon_state]-sealed", icon)) + var/mob/mob_loc = loc + if(istype(mob_loc) && mob_loc.check_rig_status() && check_state_in_icon("[icon_state]-sealed", icon)) icon_state = "[icon_state]-sealed" /obj/item/clothing/gloves/rig/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE) @@ -63,10 +65,11 @@ bodytype_equip_flags = null gender = PLURAL -/obj/item/clothing/shoes/magboots/rig/on_update_icon(mob/user) +/obj/item/clothing/shoes/magboots/rig/on_update_icon() . = ..() icon_state = get_world_inventory_state() - if(user?.check_rig_status() && check_state_in_icon("[icon_state]-sealed", icon)) + var/mob/mob_loc = loc + if(istype(mob_loc) && mob_loc.check_rig_status() && check_state_in_icon("[icon_state]-sealed", icon)) icon_state = "[icon_state]-sealed" /obj/item/clothing/shoes/magboots/rig/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE) @@ -89,10 +92,11 @@ can_breach = 1 var/list/supporting_limbs = list() //If not-null, automatically splints breaks. Checked when removing the suit. -/obj/item/clothing/suit/space/rig/on_update_icon(mob/user) +/obj/item/clothing/suit/space/rig/on_update_icon() . = ..() icon_state = get_world_inventory_state() - if(user?.check_rig_status() && check_state_in_icon("[icon_state]-sealed", icon)) + var/mob/mob_loc = loc + if(istype(mob_loc) && mob_loc.check_rig_status() && check_state_in_icon("[icon_state]-sealed", icon)) icon_state = "[icon_state]-sealed" /obj/item/clothing/suit/space/rig/adjust_mob_overlay(mob/living/user_mob, bodytype, image/overlay, slot, bodypart, use_fallback_if_icon_missing = TRUE) diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index 61612dc84e6a..d36aa54c14dc 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -47,7 +47,7 @@ icon = 'icons/clothing/rigs/rig_hacker.dmi' req_access = list(access_hacked) airtight = 0 - seal_delay = 5 //not being vaccum-proof has an upside I guess + seal_delay = 5 //not being vacuum-proof has an upside I guess helmet = /obj/item/clothing/head/lightrig/hacker chest = /obj/item/clothing/suit/lightrig/hacker @@ -74,7 +74,7 @@ icon = 'icons/clothing/rigs/chests/chest_hacker.dmi' /obj/item/clothing/shoes/lightrig/hacker siemens_coefficient = 0.2 - item_flags = ITEM_FLAG_NOSLIP //All the other rigs have magboots anyways, hopefully gives the hacker suit something more going for it. + item_flags = ITEM_FLAG_NOSLIP | ITEM_FLAG_MAGNETISED //All the other rigs have magboots anyways, hopefully gives the hacker suit something more going for it. icon = 'icons/clothing/rigs/boots/boots_hacker.dmi' /obj/item/clothing/gloves/lightrig/hacker siemens_coefficient = 0 diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 4d6c335a8c02..fe48b0e24b0d 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -389,7 +389,7 @@ /obj/item/clothing/head/helmet/space/rig/zero camera = null - desc = "A bubble helmet that maximizes the field of view. A state of the art holographic display provides a stream of information" + desc = "A bubble helmet that maximizes the field of view. A state-of-the-art holographic display provides a stream of information" icon = 'icons/clothing/rigs/helmets/helmet_null.dmi' /obj/item/clothing/suit/space/rig/zero diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 896bd3db2416..3c7ecb38b48b 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -103,7 +103,7 @@ overlay.icon_state = "[overlay.icon_state]_dark" . = ..() -/obj/item/clothing/head/helmet/space/on_update_icon(mob/user) +/obj/item/clothing/head/helmet/space/on_update_icon() . = ..() var/base_icon_state = get_world_inventory_state() if(!base_icon_state) diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index f420dc44078a..74a7ace494e3 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -323,7 +323,7 @@ //Atmospherics /obj/item/clothing/head/helmet/space/void/atmos/alt - name = "heavy duty atmospherics voidsuit helmet" + name = "heavy-duty atmospherics voidsuit helmet" desc = "A voidsuit helmet plated with an expensive heat and radiation resistant ceramic." icon = 'icons/clothing/spacesuit/void/atmos_alt/helmet.dmi' armor = list( @@ -336,7 +336,7 @@ ) /obj/item/clothing/suit/space/void/atmos/alt - name = "heavy duty atmos voidsuit" + name = "heavy-duty atmos voidsuit" desc = "An expensive voidsuit, rated to withstand extreme heat and even minor radiation without exceeding room temperature within." icon = 'icons/clothing/spacesuit/void/atmos_alt/suit.dmi' armor = list( @@ -388,9 +388,9 @@ //Pilot /obj/item/clothing/head/helmet/space/void/expedition - desc = "An atmos resistant helmet for space and planet exploration." - name = "pilot voidsuit helmet" - icon = 'icons/clothing/spacesuit/void/pilot/helmet.dmi' + desc = "An atmos-resistant helmet for space and planet exploration." + name = "expedition voidsuit helmet" + icon = 'icons/clothing/spacesuit/void/expedition/helmet.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_KNIVES, ARMOR_BULLET = ARMOR_BALLISTIC_MINOR, @@ -400,9 +400,9 @@ ) /obj/item/clothing/suit/space/void/expedition - desc = "An atmos resistant voidsuit for space and planet exploration." - name = "pilot voidsuit" - icon = 'icons/clothing/spacesuit/void/pilot/suit.dmi' + desc = "An atmos-resistant voidsuit for space and planet exploration." + name = "expedition voidsuit" + icon = 'icons/clothing/spacesuit/void/expedition/suit.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_KNIVES, ARMOR_BULLET = ARMOR_BALLISTIC_MINOR, diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 7f2d8ecfe174..d0836d07b4cb 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -93,12 +93,12 @@ else if(##equipment_var) {\ if(tank && distance <= 1) to_chat(user, "The wrist-mounted pressure gauge reads [max(round(tank.air_contents.return_pressure()),0)] kPa remaining in \the [tank].") -/obj/item/clothing/suit/space/void/refit_for_bodytype(var/target_bodytype) +/obj/item/clothing/suit/space/void/refit_for_bodytype(target_bodytype, skip_rename = FALSE) ..() if(istype(helmet)) - helmet.refit_for_bodytype(target_bodytype) + helmet.refit_for_bodytype(target_bodytype, skip_rename) if(istype(boots)) - boots.refit_for_bodytype(target_bodytype) + boots.refit_for_bodytype(target_bodytype, skip_rename) /obj/item/clothing/suit/space/void/equipped(mob/M) ..() diff --git a/code/modules/clothing/suits/armor/merc.dm b/code/modules/clothing/suits/armor/merc.dm index a138ef7b732a..7d8c6ea3bf05 100644 --- a/code/modules/clothing/suits/armor/merc.dm +++ b/code/modules/clothing/suits/armor/merc.dm @@ -9,7 +9,7 @@ /obj/item/clothing/armor_attachment/plate/merc name = "heavy armor plate" - desc = "A diamond-reinforced titanium armor plate, providing state of the art protection. Attaches to a plate carrier." + desc = "A diamond-reinforced titanium armor plate, providing state-of-the-art protection. Attaches to a plate carrier." icon = 'icons/clothing/accessories/armor/armor_merc.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_RESISTANT, diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 4c8fba5849f8..bce77c8c0725 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -2,7 +2,7 @@ /obj/item/clothing/head/bio_hood name = "bio hood" icon = 'icons/clothing/head/biosuit/_biosuit.dmi' - desc = "A hood that protects the head and face from biological comtaminants." + desc = "A hood that protects the head and face from biological contaminants." permeability_coefficient = 0 armor = list( ARMOR_BIO = ARMOR_BIO_SHIELDED, diff --git a/code/modules/clothing/suits/dashiki.dm b/code/modules/clothing/suits/dashiki.dm index c61e603a7ae9..70dafd614fa2 100644 --- a/code/modules/clothing/suits/dashiki.dm +++ b/code/modules/clothing/suits/dashiki.dm @@ -1,16 +1,16 @@ /obj/item/clothing/suit/dashiki name = "black dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is green and black." + desc = "An ornately embroidered pullover garment sporting a V-shaped collar. This one is green and black." icon = 'icons/clothing/suits/dashiki/dashiki.dmi' slot_flags = SLOT_OVER_BODY accessory_slot = ACCESSORY_SLOT_DECOR /obj/item/clothing/suit/dashiki/red name = "red dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is red." + desc = "An ornately embroidered pullover garment sporting a V-shaped collar. This one is red." icon = 'icons/clothing/suits/dashiki/dashiki_red.dmi' /obj/item/clothing/suit/dashiki/blue name = "blue dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is blue." + desc = "An ornately embroidered pullover garment sporting a V-shaped collar. This one is blue." icon = 'icons/clothing/suits/dashiki/dashiki_blue.dmi' diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index f617d8bbc165..fd5da2f0d8fd 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -21,7 +21,7 @@ /obj/item/clothing/suit/apron/colourable desc = "A basic apron, good for protecting your clothes." icon = 'icons/clothing/suits/apron_colourable.dmi' - color = null + paint_color = null material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC //Captain diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 24f7d5f0a72c..764b696000de 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -39,7 +39,7 @@ /obj/item/clothing/suit/toggle/labcoat/mad name = "The Mad's labcoat" - desc = "It makes you look capable of konking someone on the noggin and shooting them into space." + desc = "It makes you look capable of conking someone on the noggin and shooting them into space." color = COLOR_GREEN /obj/item/clothing/suit/toggle/labcoat/chemist diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 900580dffe8e..25aa1a94bbdd 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -87,9 +87,10 @@ body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS|SLOT_FEET|SLOT_ARMS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT +// todo: remove 40k reference? /obj/item/clothing/suit/imperium_monk name = "Imperium monk" - desc = "Have YOU killed a xenos today?" + desc = "Have YOU killed a xeno today?" icon = 'icons/clothing/suits/w40k.dmi' body_parts_covered = SLOT_HEAD|SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS|SLOT_FEET|SLOT_ARMS flags_inv = HIDESHOES|HIDEJUMPSUIT diff --git a/code/modules/clothing/suits/robes.dm b/code/modules/clothing/suits/robes.dm index eabd216c555a..c401e157ee00 100644 --- a/code/modules/clothing/suits/robes.dm +++ b/code/modules/clothing/suits/robes.dm @@ -7,6 +7,7 @@ body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC slot_flags = SLOT_UPPER_BODY | SLOT_OVER_BODY + valid_accessory_slots = UNIFORM_DEFAULT_ACCESSORIES accessory_slot = ACCESSORY_SLOT_DECOR /obj/item/clothing/suit/robe/sleeved diff --git a/code/modules/clothing/suits/wizard.dm b/code/modules/clothing/suits/wizard.dm index c8f0208fb4d5..d302f06103f5 100644 --- a/code/modules/clothing/suits/wizard.dm +++ b/code/modules/clothing/suits/wizard.dm @@ -7,7 +7,7 @@ /obj/item/clothing/suit/wizrobe/red name = "red wizard robe" - desc = "A rather ratty red robe." + desc = "A rather ratty red robe." icon = 'icons/clothing/suits/wizard/red.dmi' /obj/item/clothing/suit/wizrobe/marisa diff --git a/code/modules/clothing/tail/_tail.dm b/code/modules/clothing/tail/_tail.dm new file mode 100644 index 000000000000..19c7294be60e --- /dev/null +++ b/code/modules/clothing/tail/_tail.dm @@ -0,0 +1,7 @@ +// Tail accessories. Currently only used by Scavstation for tailbells and tailgloves. +/obj/item/clothing/tail + abstract_type = /obj/item/clothing/tail + w_class = ITEM_SIZE_SMALL + accessory_slot = ACCESSORY_SLOT_MEDAL + fallback_slot = slot_w_uniform_str + slot_flags = SLOT_UPPER_BODY diff --git a/code/modules/clothing/webbing/misc.dm b/code/modules/clothing/webbing/misc.dm index 74d41a0c4913..c390a9bf2edf 100644 --- a/code/modules/clothing/webbing/misc.dm +++ b/code/modules/clothing/webbing/misc.dm @@ -6,7 +6,7 @@ /obj/item/clothing/webbing/bandolier name = "bandolier" - desc = "A lightweight synthethic bandolier with straps for holding ammunition or other small objects." + desc = "A lightweight synthetic bandolier with straps for holding ammunition or other small objects." icon = 'icons/obj/items/bandolier.dmi' storage = /datum/storage/pockets/bandolier diff --git a/code/modules/codex/categories/category_reactions.dm b/code/modules/codex/categories/category_reactions.dm index c46829e0dfa7..913e1469029a 100644 --- a/code/modules/codex/categories/category_reactions.dm +++ b/code/modules/codex/categories/category_reactions.dm @@ -19,7 +19,7 @@ /decl/codex_category/materials/chemistry/compounds name = "Compounds" - desc = "Chemical reactions with non-medical, mundane, interesting or spectacular effects." + desc = "Chemical reactions with nonmedical, mundane, interesting or spectacular effects." guide_name = "Compounds" reaction_category = REACTION_TYPE_COMPOUND diff --git a/code/modules/codex/categories/category_surgery.dm b/code/modules/codex/categories/category_surgery.dm index 7bf78fccfc73..df818b89c80d 100644 --- a/code/modules/codex/categories/category_surgery.dm +++ b/code/modules/codex/categories/category_surgery.dm @@ -26,7 +26,7 @@
Closing an incision
diff --git a/code/modules/codex/entries/guides.dm b/code/modules/codex/entries/guides.dm index 747a279d6915..7f3ec5d857f5 100644 --- a/code/modules/codex/entries/guides.dm +++ b/code/modules/codex/entries/guides.dm @@ -559,7 +559,7 @@A note on terms
-
-
- Mass spectrometry - MS is the procedure used used to measure and quantify the components of matter. The most prized tool in the field of +
- Mass spectrometry - MS is the procedure used to measure and quantify the components of matter. The most prized tool in the field of 'Materials analysis.'
- Radiometric dating - MS applied using the right carrier reagents can be used to accurately determine the age of a sample.
- Dissonance ratio - This is a pseudoarbitrary value indicating the overall presence of a particular element in a greater composite.
diff --git a/code/modules/codex/entries/medical.dm b/code/modules/codex/entries/medical.dm
index 69add447b6a7..0ab7f3ca37e3 100644
--- a/code/modules/codex/entries/medical.dm
+++ b/code/modules/codex/entries/medical.dm
@@ -43,8 +43,8 @@
deprivation, irradiation, shock, and chemicals inside the occupant, at least until the bag is opened again.
\
\ Stasis bags can only be used once, and are rather costly, so use them well. They are ideal for situations where someone may die \ - before being able to bring them back to safety, or if they are in a hostile enviroment, such as in vacuum or in a toxins leak, as \ - the bag will protect the occupant from most outside enviromental hazards. If you open a bag by mistake, closing the bag with no \ + before being able to bring them back to safety, or if they are in a hostile environment, such as in vacuum or in a toxins leak, as \ + the bag will protect the occupant from most outside environmental hazards. If you open a bag by mistake, closing the bag with no \ occupant will not use up the bag, and you can pick it back up.
\
\ You can use a health analyzer to scan the occupant's vitals without opening the bag by clicking the occupied bag with the analyzer." diff --git a/code/modules/crafting/forging/bellows.dm b/code/modules/crafting/forging/bellows.dm index 3402f4c2cfa7..4a3afdfe1838 100644 --- a/code/modules/crafting/forging/bellows.dm +++ b/code/modules/crafting/forging/bellows.dm @@ -24,7 +24,7 @@ to_chat(user, SPAN_NOTICE("You begin working \the [src], stoking \the [stoking] to a hotter flame.")) start_working() while(user.do_skilled(3 SECONDS, work_skill, src)) - if(QDELETED(src) || QDELETED(user) || user.get_stamina() <= 0) + if(QDELETED(src) || QDELETED(user) || user.get_stamina() < 25 || !user.get_empty_hand_slot()) break stoking = locate() in get_step(loc, EAST) if(!istype(stoking) || !stoking.lit) diff --git a/code/modules/crafting/stack_recipes/_recipe.dm b/code/modules/crafting/stack_recipes/_recipe.dm index 7c481de823a3..527af535c37f 100644 --- a/code/modules/crafting/stack_recipes/_recipe.dm +++ b/code/modules/crafting/stack_recipes/_recipe.dm @@ -342,10 +342,7 @@ else . = jointext(list() + material_strings + name, " ") if(apply_article) - if(gender == PLURAL) - . = "some [.]" - else - . = ADD_ARTICLE(.) + . = ADD_ARTICLE_GENDER(., gender) /decl/stack_recipe/proc/req_mat_to_type(decl/material/mat, mat_req) if(mat_req != MATERIAL_FORBIDDEN) diff --git a/code/modules/crafting/stack_recipes/recipes_cardstock.dm b/code/modules/crafting/stack_recipes/recipes_cardstock.dm index d15f0f027e2a..30e9e6f5e3a4 100644 --- a/code/modules/crafting/stack_recipes/recipes_cardstock.dm +++ b/code/modules/crafting/stack_recipes/recipes_cardstock.dm @@ -1,7 +1,7 @@ /decl/stack_recipe/cardstock abstract_type = /decl/stack_recipe/cardstock craft_stack_types = /obj/item/stack/material/cardstock - available_to_map_tech_level = MAP_TECH_LEVEL_SPACE // not exactly high tech, but donuts etc are not medieval + available_to_map_tech_level = MAP_TECH_LEVEL_SPACE // not exactly high-tech, but donuts etc are not medieval /decl/stack_recipe/cardstock/box result_type = /obj/item/box diff --git a/code/modules/crafting/stack_recipes/recipes_soft.dm b/code/modules/crafting/stack_recipes/recipes_soft.dm index 32422a175490..27f9c6328ceb 100644 --- a/code/modules/crafting/stack_recipes/recipes_soft.dm +++ b/code/modules/crafting/stack_recipes/recipes_soft.dm @@ -44,6 +44,12 @@ result_type = /obj/item/stack/material/brick test_result_type = /obj/item/stack/material/brick/clay +/decl/stack_recipe/soft/bar + name = "bar" + name_plural = "bars" + result_type = /obj/item/stack/material/bar + test_result_type = /obj/item/stack/material/bar/wax + /decl/stack_recipe/soft/stack/spawn_result(mob/user, location, amount, decl/material/mat, decl/material/reinf_mat, paint_color, spent_type, spent_amount = 1) var/obj/item/stack/S = ..() if(istype(S)) diff --git a/code/modules/crafting/stack_recipes/recipes_textiles.dm b/code/modules/crafting/stack_recipes/recipes_textiles.dm index 3f39d08385e6..4b49616eef76 100644 --- a/code/modules/crafting/stack_recipes/recipes_textiles.dm +++ b/code/modules/crafting/stack_recipes/recipes_textiles.dm @@ -157,6 +157,6 @@ available_to_map_tech_level = MAP_TECH_LEVEL_MEDIEVAL /decl/stack_recipe/textiles/rag - result_type = /obj/item/chems/glass/rag + result_type = /obj/item/chems/rag crafting_extra_cost_factor = 1 // whatever you produce is going to be a rag, there's no wastage difficulty = MAT_VALUE_TRIVIAL_DIY diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 964b8c2f2e34..f49762151815 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -1,7 +1,7 @@ //DNA machine /obj/machinery/forensic/dnascanner name = "DNA analyzer" - desc = "A high tech machine that is designed to read DNA samples properly." + desc = "A high-tech machine that is designed to read DNA samples properly." icon = 'icons/obj/forensics.dmi' icon_state = "dna_open" anchored = TRUE diff --git a/code/modules/detectivework/tools/crimekit.dm b/code/modules/detectivework/tools/crimekit.dm index c3756e4e01a7..4dc2965ca768 100644 --- a/code/modules/detectivework/tools/crimekit.dm +++ b/code/modules/detectivework/tools/crimekit.dm @@ -1,7 +1,7 @@ //crime scene kit /obj/item/briefcase/crimekit name = "crime scene kit" - desc = "A stainless steel-plated carrycase for all your forensic needs. Feels heavy." + desc = "A stainless steel-plated carrying case for all your forensic needs. Feels heavy." icon = 'icons/obj/items/storage/crime_kit.dmi' material = /decl/material/solid/organic/leather/synth matter = list(/decl/material/solid/metal/stainlesssteel = MATTER_AMOUNT_REINFORCEMENT) diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 0068fd756616..3bfc7ebe8944 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -1,4 +1,4 @@ -/obj/item/chems/glass/rag +/obj/item/chems/rag name = "rag" desc = "For cleaning up messes, you suppose." w_class = ITEM_SIZE_TINY @@ -15,20 +15,14 @@ VAR_PRIVATE/_on_fire = 0 VAR_PRIVATE/burn_time = 20 //if the rag burns for too long it turns to ashes -/obj/item/chems/glass/rag/get_edible_material_amount(mob/eater) +/obj/item/chems/rag/get_edible_material_amount(mob/eater) return 0 -/obj/item/chems/glass/rag/get_utensil_food_type() - return null - -/obj/item/chems/glass/rag/get_atoms_can_be_placed_into() - return null - -/obj/item/chems/glass/rag/Initialize() +/obj/item/chems/rag/Initialize() . = ..() update_name() -/obj/item/chems/glass/rag/Destroy() +/obj/item/chems/rag/Destroy() var/obj/item/chems/drinks/bottle/bottle = loc if(istype(bottle) && bottle.rag == src) bottle.rag = null @@ -36,10 +30,10 @@ STOP_PROCESSING(SSobj, src) //so we don't continue turning to ash while gc'd . = ..() -/obj/item/chems/glass/rag/is_on_fire() +/obj/item/chems/rag/is_on_fire() return _on_fire -/obj/item/chems/glass/rag/attack_self(mob/user) +/obj/item/chems/rag/attack_self(mob/user) if(is_on_fire() && user.try_unequip(src)) user.visible_message(SPAN_NOTICE("\The [user] stamps out [src]."), SPAN_NOTICE("You stamp out [src].")) extinguish_fire() @@ -51,7 +45,7 @@ return ..() -/obj/item/chems/glass/rag/attackby(obj/item/W, mob/user) +/obj/item/chems/rag/attackby(obj/item/W, mob/user) if(W.isflamesource()) if(is_on_fire()) to_chat(user, SPAN_WARNING("\The [src] is already blazing merrily!")) @@ -65,7 +59,7 @@ return TRUE return ..() -/obj/item/chems/glass/rag/update_name() +/obj/item/chems/rag/update_name() if(is_on_fire()) name_prefix = "burning" else if(reagents && reagents.total_volume) @@ -74,14 +68,14 @@ name_prefix = "dry" . = ..() -/obj/item/chems/glass/rag/on_update_icon() +/obj/item/chems/rag/on_update_icon() . = ..() icon_state = "rag[is_on_fire()? "lit" : ""]" var/obj/item/chems/drinks/bottle/B = loc if(istype(B)) B.update_icon() -/obj/item/chems/glass/rag/proc/remove_contents(mob/user, atom/trans_dest = null) +/obj/item/chems/rag/proc/remove_contents(mob/user, atom/trans_dest = null) if(!trans_dest && !user.loc) return if(reagents?.total_volume <= 0) @@ -103,7 +97,7 @@ ) update_name() -/obj/item/chems/glass/rag/proc/wipe_down(atom/target, mob/user) +/obj/item/chems/rag/proc/wipe_down(atom/target, mob/user) if(!reagents?.total_volume) to_chat(user, SPAN_WARNING("The [initial(name)] is dry.")) @@ -114,7 +108,7 @@ user.visible_message(SPAN_NOTICE("\The [user] finishes wiping off \the [target].")) reagents.touch_atom(target) -/obj/item/chems/glass/rag/use_on_mob(mob/living/target, mob/living/user, animate = TRUE) +/obj/item/chems/rag/use_on_mob(mob/living/target, mob/living/user, animate = TRUE) if(is_on_fire()) user.visible_message( @@ -159,28 +153,23 @@ return ..() -/obj/item/chems/glass/rag/afterattack(atom/A, mob/user, proximity) - if(!proximity) - return - - if(istype(A, /obj/structure/reagent_dispensers)) - if(!REAGENTS_FREE_SPACE(reagents)) - to_chat(user, "\The [src] is already soaked.") - return +/obj/item/chems/rag/afterattack(atom/target, mob/user, proximity) + if(!proximity || !istype(target)) + return FALSE - if(A.reagents && A.reagents.trans_to_obj(src, reagents.maximum_volume)) - user.visible_message("\The [user] soaks [src] using [A].", "You soak [src] using [A].") - update_name() - return + if(standard_dispenser_refill(user, target)) //Are they clicking a water tank/some dispenser? + update_name() + return TRUE - if(!is_on_fire() && istype(A) && (src in user)) - if(ATOM_IS_OPEN_CONTAINER(A) && !isturf(A) && !(A in user)) - remove_contents(user, A) - else if(!ismob(A)) //mobs are handled in use_on_mob() - this prevents us from wiping down people while smothering them. - wipe_down(A, user) - return + if(!is_on_fire() && (src in user)) + if(ATOM_IS_OPEN_CONTAINER(target) && !isturf(target) && !(target in user)) + remove_contents(user, target) + else if(!ismob(target)) //mobs are handled in use_on_mob() - this prevents us from wiping down people while smothering them. + wipe_down(target, user) // todo: test if this check is necessary, smothering returns TRUE which should prevent afterattack + return TRUE + return FALSE -/obj/item/chems/glass/rag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/item/chems/rag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature >= 50 + T0C) ignite_fire() if(exposed_temperature >= 900 + T0C) @@ -191,7 +180,7 @@ //rag must have a minimum of 2 units welder fuel and at least 80% of the reagents must be welder fuel. //maybe generalize flammable reagents someday -/obj/item/chems/glass/rag/can_ignite() +/obj/item/chems/rag/can_ignite() var/total_fuel = 0 var/total_volume = 0 if(reagents) @@ -201,7 +190,7 @@ total_fuel += REAGENT_VOLUME(reagents, rtype) * R.accelerant_value . = (total_fuel >= 2 && total_fuel >= total_volume*0.5) -/obj/item/chems/glass/rag/ignite_fire() +/obj/item/chems/rag/ignite_fire() if(is_on_fire()) return if(!can_ignite()) @@ -212,7 +201,7 @@ update_name() update_icon() -/obj/item/chems/glass/rag/extinguish_fire(mob/user, no_message = FALSE) +/obj/item/chems/rag/extinguish_fire(mob/user, no_message = FALSE) STOP_PROCESSING(SSobj, src) set_light(0) _on_fire = FALSE @@ -223,10 +212,11 @@ visible_message("\The [src] falls apart!") new /obj/effect/decal/cleanable/ash(get_turf(src)) qdel(src) + return update_name() update_icon() -/obj/item/chems/glass/rag/Process() +/obj/item/chems/rag/Process() if(!can_ignite()) visible_message("\The [src] burns out.") extinguish_fire() diff --git a/code/modules/economy/cael/ATM.dm b/code/modules/economy/cael/ATM.dm index 2af8810c19cb..c2e50a639305 100644 --- a/code/modules/economy/cael/ATM.dm +++ b/code/modules/economy/cael/ATM.dm @@ -248,28 +248,29 @@ else return -/obj/machinery/atm/Topic(var/href, var/href_list) +/obj/machinery/atm/OnTopic(mob/user, href_list) if((. = ..())) return if(href_list["choice"]) + . = TOPIC_REFRESH switch(href_list["choice"]) if("transfer") if(authenticated_account) var/transfer_amount = text2num(href_list["funds_amount"]) transfer_amount = round(transfer_amount, 0.01) if(transfer_amount <= 0) - alert("That is not a valid amount.") + alert(user, "That is not a valid amount.") else if(transfer_amount <= authenticated_account.money) var/target_account_number = text2num(href_list["target_acc_number"]) var/transfer_purpose = href_list["purpose"] var/datum/money_account/target_account = get_account(target_account_number) if(target_account && authenticated_account.transfer(target_account, transfer_amount, transfer_purpose)) - to_chat(usr, "[html_icon(src)]Funds transfer successful.") + to_chat(user, "[html_icon(src)]Funds transfer successful.") else - to_chat(usr, "[html_icon(src)]Funds transfer failed.") + to_chat(user, "[html_icon(src)]Funds transfer failed.") else - to_chat(usr, "[html_icon(src)]You don't have enough funds to do that!") + to_chat(user, "[html_icon(src)]You don't have enough funds to do that!") if("view_screen") view_screen = text2num(href_list["view_screen"]) if("change_security_level") @@ -283,7 +284,7 @@ if(held_card) login_card = held_card else - login_card = scan_user(usr) + login_card = scan_user(user) if(!ticks_left_locked_down) var/tried_account_num = text2num(href_list["account_num"]) @@ -317,11 +318,11 @@ if(failed_account) failed_account.log_msg("Unauthorized login attempt", machine_id) else - to_chat(usr, "[html_icon(src)] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.") + to_chat(user, "[html_icon(src)] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.") previous_account_number = tried_account_num playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) else - to_chat(usr, "[html_icon(src)] Unable to log in to account, additional information may be required.") + to_chat(user, "[html_icon(src)] Unable to log in to account, additional information may be required.") number_incorrect_tries = 0 else playsound(src, 'sound/machines/twobeep.ogg', 50, 1) @@ -331,7 +332,7 @@ //create a transaction log entry authenticated_account.log_msg("Remote terminal access", machine_id) - to_chat(usr, "[html_icon(src)] Access granted. Welcome user '[authenticated_account.owner_name].'") + to_chat(user, "[html_icon(src)] Access granted. Welcome user '[authenticated_account.owner_name].'") previous_account_number = tried_account_num if("e_withdrawal") @@ -339,10 +340,10 @@ amount = round(amount, 0.01) var/obj/item/charge_stick/E = charge_stick_type if(amount <= 0) - alert("That is not a valid amount.") + alert(user, "That is not a valid amount.") else if(amount > initial(E.max_worth)) var/decl/currency/cur = GET_DECL(initial(E.currency) || global.using_map.default_currency) - alert("That amount exceeds the maximum amount holdable by charge sticks from this machine ([cur.format_value(initial(E.max_worth))]).") + alert(user, "That amount exceeds the maximum amount holdable by charge sticks from this machine ([cur.format_value(initial(E.max_worth))]).") else if(authenticated_account && amount > 0) //create an entry in the account transaction log if(authenticated_account.withdraw(amount, "Credit withdrawal", machine_id)) @@ -350,27 +351,26 @@ E = new charge_stick_type(loc) E.adjust_worth(amount) E.creator = authenticated_account.owner_name - usr.put_in_hands(E) + user.put_in_hands(E) else - to_chat(usr, "[html_icon(src)]You don't have enough funds to do that!") + to_chat(user, "[html_icon(src)]You don't have enough funds to do that!") if("withdrawal") var/amount = max(text2num(href_list["funds_amount"]),0) amount = round(amount, 0.01) if(amount <= 0) - alert("That is not a valid amount.") + alert(user, "That is not a valid amount.") else if(authenticated_account && amount > 0) //remove the money - // TODO: Jesus Christ why does this entire proc use usr if(authenticated_account.withdraw(amount, "Credit withdrawal", machine_id)) playsound(src, 'sound/machines/chime.ogg', 50, 1) - var/cash_turf = get_turf(usr) + var/cash_turf = get_turf(user) var/obj/item/cash/cash = new(cash_turf, null, amount) if(QDELETED(cash)) cash = locate() in cash_turf if(cash) - usr.put_in_hands(cash) + user.put_in_hands(cash) else - to_chat(usr, "[html_icon(src)]You don't have enough funds to do that!") + to_chat(user, "[html_icon(src)]You don't have enough funds to do that!") if("balance_statement") if(authenticated_account) var/txt @@ -428,20 +428,20 @@ if(!held_card) //this might happen if the user had the browser window open when somebody emagged it if(emagged > 0) - to_chat(usr, "[html_icon(src)] The ATM card reader rejected your ID because this machine has been sabotaged!") + to_chat(user, "[html_icon(src)] The ATM card reader rejected your ID because this machine has been sabotaged!") else - var/obj/item/I = usr.get_active_held_item() + var/obj/item/I = user.get_active_held_item() if (istype(I, /obj/item/card/id)) - if(!usr.try_unequip(I, src)) + if(!user.try_unequip(I, src)) return held_card = I else - release_held_id(usr) + release_held_id(user) if("logout") authenticated_account = null account_security_level = 0 - - interact(usr) + else + . = TOPIC_NOACTION // Unhandled, href hack or just a subtype's command? /obj/machinery/atm/proc/scan_user(mob/living/human/human_user) if(!authenticated_account) diff --git a/code/modules/economy/cael/Accounts_DB.dm b/code/modules/economy/cael/Accounts_DB.dm index 2fa3a9c13d8c..8d8b7f4c8a5b 100644 --- a/code/modules/economy/cael/Accounts_DB.dm +++ b/code/modules/economy/cael/Accounts_DB.dm @@ -85,13 +85,12 @@ ui.set_initial_data(data) ui.open() -/obj/machinery/computer/account_database/Topic(href, href_list) - if(..()) - return 1 - - var/datum/nanoui/ui = SSnano.get_open_ui(usr, src, "main") +/obj/machinery/computer/account_database/OnTopic(mob/user, href_list) + if((. = ..())) + return if(href_list["choice"]) + . = TOPIC_REFRESH switch(href_list["choice"]) if("create_account") creating_new_account = 1 @@ -117,24 +116,22 @@ new_account.deposit(starting_funds, "New account activation", machine_id) creating_new_account = 0 - ui.close() + . = TOPIC_CLOSE creating_new_account = 0 if("insert_card") if(held_card) held_card.dropInto(loc) - if(ishuman(usr) && !usr.get_active_held_item()) - usr.put_in_hands(held_card) + if(ishuman(user) && !user.get_active_held_item()) + user.put_in_hands(held_card) held_card = null - SSnano.update_uis(src) else - var/obj/item/I = usr.get_active_held_item() + var/obj/item/I = user.get_active_held_item() if (istype(I, /obj/item/card/id)) - if(!usr.try_unequip(I, src)) + if(!user.try_unequip(I, src)) return held_card = I - SSnano.update_uis(src) if("view_account_detail") var/index = text2num(href_list["account_index"]) @@ -227,6 +224,6 @@ "} P.info = text - state("The terminal prints out a report.") - - return 1 + visible_message(SPAN_NOTICE("[html_icon(src)] \The [src] prints out \the [P].")) + else + . = TOPIC_NOACTION diff --git a/code/modules/economy/worth_items.dm b/code/modules/economy/worth_items.dm index ce2d11ae8be7..3c754456b70e 100644 --- a/code/modules/economy/worth_items.dm +++ b/code/modules/economy/worth_items.dm @@ -60,7 +60,7 @@ additional_value += (25 * total_coverage) if(item_flags) - for(var/flag in list(ITEM_FLAG_PADDED, ITEM_FLAG_NOSLIP, ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT, ITEM_FLAG_SILENT, ITEM_FLAG_NOCUFFS)) + for(var/flag in list(ITEM_FLAG_PADDED, ITEM_FLAG_NOSLIP, ITEM_FLAG_MAGNETISED, ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT, ITEM_FLAG_SILENT, ITEM_FLAG_NOCUFFS)) if(item_flags & flag) additional_value += 15 diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index 739666996062..521a4bbb2f2c 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -431,7 +431,7 @@ var/global/list/meteors_major = list( //Missiles, for events and so on /obj/effect/meteor/destroyer/missile name = "photon torpedo" - desc = "An advanded warhead designed to tactically destroy space installations." + desc = "An advanced warhead designed to tactically destroy space installations." icon = 'icons/obj/missile.dmi' icon_state = "photon" meteordrop = null diff --git a/code/modules/events/money_lotto.dm b/code/modules/events/money_lotto.dm index 0cd4a07d1fbb..7760e51327f6 100644 --- a/code/modules/events/money_lotto.dm +++ b/code/modules/events/money_lotto.dm @@ -20,7 +20,7 @@ var/channel = "Nyx Daily" var/decl/currency/cur = GET_DECL(winner_account?.currency || global.using_map.default_currency) - var/body = "Nyx Daily wishes to congratulate [winner_name] for recieving the Nyx Stellar Slam Lottery, and receiving the out of this world sum of [cur.format_value(winner_sum)]!" + var/body = "Nyx Daily wishes to congratulate [winner_name] for receiving the Nyx Stellar Slam Lottery, and receiving the out of this world sum of [cur.format_value(winner_sum)]!" if(!deposit_success) body += "
Unfortunately, we were unable to verify the account details provided, so we were unable to transfer the money. In order to have your winnings re-sent, send a cheque containing a processing fee of [cur.format_value(5000)] to the ND 'Stellar Slam' office on the Nyx gateway with your updated details." winner_account = null diff --git a/code/modules/fabrication/_fabricator.dm b/code/modules/fabrication/_fabricator.dm index b7c4f920ca22..43ae48853311 100644 --- a/code/modules/fabrication/_fabricator.dm +++ b/code/modules/fabrication/_fabricator.dm @@ -1,6 +1,6 @@ /obj/machinery/fabricator name = "autolathe" - desc = "It produces common day to day items from a variety of materials." + desc = "It produces common day-to-day items from a variety of materials." icon = 'icons/obj/machines/fabricators/autolathe.dmi' icon_state = "autolathe" density = TRUE diff --git a/code/modules/fabrication/designs/general/designs_general.dm b/code/modules/fabrication/designs/general/designs_general.dm index fda6ce15bad0..4e09933a75e8 100644 --- a/code/modules/fabrication/designs/general/designs_general.dm +++ b/code/modules/fabrication/designs/general/designs_general.dm @@ -244,5 +244,5 @@ /datum/fabricator_recipe/chipboard/yew/get_resources() resources = list( /decl/material/solid/organic/wood/yew = ceil((SHEET_MATERIAL_AMOUNT * FABRICATOR_EXTRA_COST_FACTOR)/2), - /decl/material/solid/organic/plastic = ceil((SHEET_MATERIAL_AMOUNT * FABRICATOR_EXTRA_COST_FACTOR)/2) + /decl/material/solid/organic/plastic = ceil((SHEET_MATERIAL_AMOUNT * FABRICATOR_EXTRA_COST_FACTOR)/2) ) diff --git a/code/modules/fabrication/designs/industrial/designs_exosuit_components.dm b/code/modules/fabrication/designs/industrial/designs_exosuit_components.dm index f2cb06e60801..af7684561604 100644 --- a/code/modules/fabrication/designs/industrial/designs_exosuit_components.dm +++ b/code/modules/fabrication/designs/industrial/designs_exosuit_components.dm @@ -102,6 +102,9 @@ /datum/fabricator_recipe/industrial/exosuit_gear/drill path = /obj/item/mech_equipment/drill +/datum/fabricator_recipe/industrial/exosuit_gear/ionjets + path = /obj/item/mech_equipment/ionjets + /datum/fabricator_recipe/industrial/exosuit_gear/mounted path = /obj/item/mech_equipment/mounted_system/taser diff --git a/code/modules/fabrication/designs/pipe/device_pipe_datums.dm b/code/modules/fabrication/designs/pipe/device_pipe_datums.dm index 829699096898..87d1753cbe2f 100644 --- a/code/modules/fabrication/designs/pipe/device_pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/device_pipe_datums.dm @@ -4,7 +4,6 @@ pipe_color = PIPE_COLOR_WHITE name = "connector" - desc = "a connector for canisters." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "connector" constructed_path = /obj/machinery/atmospherics/portables_connector @@ -13,7 +12,6 @@ /datum/fabricator_recipe/pipe/device/adapter name = "universal pipe adapter" - desc = "an adapter designed to fit any type of pipe." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER|CONNECT_TYPE_FUEL|CONNECT_TYPE_HE build_icon_state = "universal" constructed_path = /obj/machinery/atmospherics/pipe/simple/hidden/universal @@ -22,7 +20,6 @@ /datum/fabricator_recipe/pipe/device/unaryvent name = "unary vent" - desc = "a unary vent" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_FUEL build_icon_state = "uvent" constructed_path = /obj/machinery/atmospherics/unary/vent_pump @@ -30,12 +27,10 @@ /datum/fabricator_recipe/pipe/device/unaryvent/large name = "high volume unary vent" - desc = "a high volume unary vent" constructed_path = /obj/machinery/atmospherics/unary/vent_pump/high_volume /datum/fabricator_recipe/pipe/device/gaspump name = "gas pump" - desc = "a pump. For gasses." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "pump" constructed_path = /obj/machinery/atmospherics/binary/pump @@ -43,7 +38,6 @@ /datum/fabricator_recipe/pipe/device/pressureregulator name = "pressure regulator" - desc = "a device that regulates pressure." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "passivegate" constructed_path = /obj/machinery/atmospherics/binary/passive_gate @@ -51,7 +45,6 @@ /datum/fabricator_recipe/pipe/device/hpgaspump name = "high powered gas pump" - desc = "a high powered pump. For gasses." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "volumepump" constructed_path = /obj/machinery/atmospherics/binary/pump/high_power @@ -59,7 +52,6 @@ /datum/fabricator_recipe/pipe/device/scrubber name = "scrubber" - desc = "scrubs out undesirable gasses" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SCRUBBER build_icon_state = "scrubber" constructed_path = /obj/machinery/atmospherics/unary/vent_scrubber @@ -67,7 +59,6 @@ /datum/fabricator_recipe/pipe/device/meter name = "meter" - desc = "a meter that monitors pressure and temperature on the attached pipe." path = /obj/item/machine_chassis/pipe_meter pipe_color = null connect_types = null @@ -78,7 +69,6 @@ /datum/fabricator_recipe/pipe/device/omnimixer name = "omni gas mixer" - desc = "a device that takes in two or three gasses and mixes them into a precise output." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "omni_mixer" constructed_path = /obj/machinery/atmospherics/omni/mixer @@ -86,7 +76,6 @@ /datum/fabricator_recipe/pipe/device/omnifilter name = "omni gas filter" - desc = "a device that filters out undesireable elements" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "omni_filter" constructed_path = /obj/machinery/atmospherics/omni/filter @@ -94,7 +83,6 @@ /datum/fabricator_recipe/pipe/device/manualvalve name = "manual valve" - desc = "a valve that has to be manipulated by hand" build_icon_state = "mvalve" constructed_path = /obj/machinery/atmospherics/valve pipe_class = PIPE_CLASS_BINARY @@ -103,7 +91,6 @@ /datum/fabricator_recipe/pipe/device/digitalvalve name = "digital valve" - desc = "a valve controlled electronically" build_icon_state = "dvalve" constructed_path = /obj/machinery/atmospherics/valve/digital pipe_class = PIPE_CLASS_BINARY @@ -112,7 +99,6 @@ /datum/fabricator_recipe/pipe/device/autoshutoff name = "automatic shutoff valve" - desc = "a valve that can automatically shut itself off" build_icon_state = "svalve" constructed_path = /obj/machinery/atmospherics/valve/shutoff pipe_class = PIPE_CLASS_BINARY @@ -121,7 +107,6 @@ /datum/fabricator_recipe/pipe/device/mtvalve name = "manual t-valve" - desc = "a three-way valve. T-shaped." build_icon_state = "mtvalve" constructed_path = /obj/machinery/atmospherics/tvalve pipe_class = PIPE_CLASS_TRINARY @@ -129,7 +114,6 @@ /datum/fabricator_recipe/pipe/device/mtvalvem name = "manual t-valve (mirrored)" - desc = "a three-way valve. T-shaped." build_icon_state = "mtvalvem" constructed_path = /obj/machinery/atmospherics/tvalve/mirrored pipe_class = PIPE_CLASS_TRINARY @@ -137,7 +121,6 @@ /datum/fabricator_recipe/pipe/device/dtvalve name = "digital t-valve" - desc = "a three-way valve. T-shaped. This one can be controlled electronically." build_icon = 'icons/atmos/digital_tvalve.dmi' build_icon_state = "map_tvalve0" constructed_path = /obj/machinery/atmospherics/tvalve/digital @@ -146,7 +129,6 @@ /datum/fabricator_recipe/pipe/device/dtvalvem name = "digital t-valve (mirrored)" - desc = "a three-way valve. T-shaped. This one can be controlled electronically." build_icon = 'icons/atmos/digital_tvalve.dmi' build_icon_state = "map_tvalvem0" constructed_path = /obj/machinery/atmospherics/tvalve/mirrored/digital @@ -155,7 +137,6 @@ /datum/fabricator_recipe/pipe/device/air_sensor name = "gas sensor" - desc = "a sensor. It detects gasses." path = /obj/item/machine_chassis/air_sensor build_icon_state = "gsensor1" build_icon = 'icons/obj/machines/gas_sensor.dmi' @@ -167,7 +148,6 @@ /datum/fabricator_recipe/pipe/device/outlet_injector name = "injector outlet" - desc = "Passively injects gas into its surroundings. Has a valve attached to it that can control flow rate." build_icon = 'icons/atmos/injector.dmi' build_icon_state = "map_injector" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL @@ -178,7 +158,6 @@ /datum/fabricator_recipe/pipe/device/drain name = "gutter" - desc = "You probably can't get sucked down the plughole." build_icon = 'icons/obj/drain.dmi' build_icon_state = "drain" path = /obj/item/drain @@ -190,7 +169,6 @@ /datum/fabricator_recipe/pipe/device/drain/bath name = "sealable gutter" - desc = "You probably can't get sucked down the plughole. Specially not when it's closed!" build_icon = 'icons/obj/drain.dmi' build_icon_state = "drain_bath" path = /obj/item/drain/bath @@ -202,7 +180,6 @@ /datum/fabricator_recipe/pipe/device/tank name = "pressure tank" - desc = "A large vessel containing pressurized gas." build_icon = 'icons/atmos/tank.dmi' build_icon_state = "air" path = /obj/item/pipe/tank @@ -213,7 +190,6 @@ /datum/fabricator_recipe/pipe/device/plate name = "thermal plate" - desc = "A device which transfers heat to and from an area." build_icon = 'icons/obj/atmospherics/cold_sink.dmi' build_icon_state = "exposed" path = /obj/item/pipe @@ -223,7 +199,6 @@ /datum/fabricator_recipe/pipe/device/igniter name = "igniter" - desc = "A device which will ignite surrounding gasses." build_icon = 'icons/obj/machines/igniter.dmi' build_icon_state = "igniter1" path = /obj/item/machine_chassis/igniter diff --git a/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm b/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm index 0340a6c60f43..57c4aa6220fb 100644 --- a/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm @@ -7,7 +7,6 @@ var/turn = DISPOSAL_FLIP_FLIP name = "disposal pipe segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon = 'icons/obj/pipes/disposal_pipe.dmi' build_icon_state = "pipe-s" path = /obj/structure/disposalconstruct @@ -17,56 +16,48 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/bent name = "bent disposal pipe segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-c" turn = DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/segment/bent /datum/fabricator_recipe/pipe/disposal_dispenser/junction name = "disposal pipe junction" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j1" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/junction /datum/fabricator_recipe/pipe/disposal_dispenser/junctionm name = "disposal pipe junction (mirrored)" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j2" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/junction/mirrored /datum/fabricator_recipe/pipe/disposal_dispenser/yjunction name = "disposal pipe y-junction" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-y" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/junction /datum/fabricator_recipe/pipe/disposal_dispenser/trunk name = "disposal pipe trunk" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-t" constructed_path = /obj/structure/disposalpipe/trunk turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/up name = "disposal pipe upwards segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-u" constructed_path = /obj/structure/disposalpipe/up turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/down name = "disposal pipe downwards segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-d" constructed_path = /obj/structure/disposalpipe/down turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/device name = "disposal bin" - desc = "A bin used to dispose of trash." build_icon = 'icons/obj/pipes/disposal_bin.dmi' build_icon_state = "disposal" path = /obj/structure/disposalconstruct/machine @@ -75,7 +66,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/outlet name = "disposal outlet" - desc = "an outlet that ejects things from a disposal network." build_icon = 'icons/obj/pipes/disposal_outlet.dmi' build_icon_state = "outlet" path = /obj/structure/disposalconstruct/machine/outlet @@ -83,7 +73,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/chute name = "disposal chute" - desc = "A chute to put things into a disposal network." build_icon = 'icons/obj/pipes/disposal_chute.dmi' build_icon_state = "chute" constructed_path = /obj/machinery/disposal/deliveryChute @@ -91,7 +80,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting name = "disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction @@ -99,7 +87,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/wildcard name = "wildcard disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/wildcard @@ -107,7 +94,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/untagged name = "untagged disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/untagged @@ -115,7 +101,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sortingm name = "disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/flipped @@ -123,7 +108,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/wildcardm name = "wildcard disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/wildcard/flipped @@ -131,7 +115,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/untaggedm name = "untagged disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/untagged/flipped @@ -139,7 +122,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/tagger name = "disposal tagger" - desc = "It tags things." build_icon_state = "pipe-tagger" turn = DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/tagger @@ -147,7 +129,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/tagger/partial name = "disposal partial tagger" - desc = "It tags things." build_icon_state = "pipe-tagger-partial" turn = DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/tagger/partial @@ -155,7 +136,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/diversion name = "disposal diverter" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_FLIP | DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/diversion_junction diff --git a/code/modules/fabrication/designs/pipe/pipe_datum_base.dm b/code/modules/fabrication/designs/pipe/pipe_datum_base.dm index 8d3c48485e8c..75c5b9e1773b 100644 --- a/code/modules/fabrication/designs/pipe/pipe_datum_base.dm +++ b/code/modules/fabrication/designs/pipe/pipe_datum_base.dm @@ -18,6 +18,12 @@ ) max_amount = 10 +/datum/fabricator_recipe/pipe/New() + . = ..() + if(isnull(desc) && ispath(constructed_path)) + var/obj/constructed_obj = constructed_path + desc = initial(constructed_obj.desc) + /datum/fabricator_recipe/pipe/get_resources() resources = list() var/list/building_cost = atom_info_repository.get_matter_for(constructed_path) diff --git a/code/modules/fabrication/designs/pipe/pipe_datums.dm b/code/modules/fabrication/designs/pipe/pipe_datums.dm index 58ca5c3bde85..70f0a7c6320c 100644 --- a/code/modules/fabrication/designs/pipe/pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/pipe_datums.dm @@ -2,19 +2,16 @@ #define PIPE_BENT 5 /datum/fabricator_recipe/pipe - name = "a pipe fitting" - desc = "a straight pipe segment." + name = "pipe fitting" rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/bent name = "bent pipe fitting" - desc = "a bent pipe segment" dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/manifold name = "pipe manifold fitting" - desc = "a pipe manifold segment" build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden pipe_class = PIPE_CLASS_TRINARY @@ -22,7 +19,6 @@ /datum/fabricator_recipe/pipe/manifold4w name = "four-way pipe manifold fitting" - desc = "a four-way pipe manifold segment" build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden pipe_class = PIPE_CLASS_QUATERNARY @@ -30,7 +26,6 @@ /datum/fabricator_recipe/pipe/cap name = "pipe cap fitting" - desc = "a pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden pipe_class = PIPE_CLASS_UNARY @@ -38,7 +33,6 @@ /datum/fabricator_recipe/pipe/up name = "upward pipe fitting" - desc = "an upward pipe." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up rotate_class = PIPE_ROTATE_STANDARD @@ -46,7 +40,6 @@ /datum/fabricator_recipe/pipe/down name = "downward pipe fitting" - desc = "a downward pipe." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down rotate_class = PIPE_ROTATE_STANDARD @@ -61,18 +54,15 @@ pipe_class = PIPE_CLASS_BINARY name = "supply pipe fitting" - desc = "a straight supply pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/bent name = "bent supply pipe fitting" - desc = "a bent supply pipe segment" dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/manifold name = "supply pipe manifold fitting" - desc = "a supply pipe manifold segment" build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/supply pipe_class = PIPE_CLASS_TRINARY @@ -80,7 +70,6 @@ /datum/fabricator_recipe/pipe/supply/manifold4w name = "four-way supply pipe manifold fitting" - desc = "a four-way supply pipe manifold segment" build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply pipe_class = PIPE_CLASS_QUATERNARY @@ -88,7 +77,6 @@ /datum/fabricator_recipe/pipe/supply/cap name = "supply pipe cap fitting" - desc = "a pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/supply pipe_class = PIPE_CLASS_UNARY @@ -96,14 +84,12 @@ /datum/fabricator_recipe/pipe/supply/up name = "upward supply pipe fitting" - desc = "an upward supply pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/supply rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/supply/down name = "downward supply pipe fitting" - desc = "a downward supply pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/supply rotate_class = PIPE_ROTATE_STANDARD @@ -117,18 +103,15 @@ pipe_class = PIPE_CLASS_BINARY name = "scrubber pipe fitting" - desc = "a straight scrubber pipe segment" rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/scrubber/bent name = "bent scrubber pipe fitting" - desc = "a bent scrubber pipe segment" rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/scrubber/manifold name = "scrubber pipe manifold fitting" - desc = "a scrubber pipe manifold segment" build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers pipe_class = PIPE_CLASS_TRINARY @@ -136,7 +119,6 @@ /datum/fabricator_recipe/pipe/scrubber/manifold4w name = "four-way scrubber pipe manifold fitting" - desc = "a four-way scrubber pipe manifold segment" build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers pipe_class = PIPE_CLASS_QUATERNARY @@ -144,7 +126,6 @@ /datum/fabricator_recipe/pipe/scrubber/cap name = "scrubber pipe cap fitting" - desc = "a pipe cap for a scrubber pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers pipe_class = PIPE_CLASS_UNARY @@ -152,14 +133,12 @@ /datum/fabricator_recipe/pipe/scrubber/up name = "upward scrubber pipe fitting" - desc = "an upward scrubber pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/scrubber/down name = "downward scrubber pipe fitting" - desc = "a downward scrubber pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers rotate_class = PIPE_ROTATE_STANDARD @@ -173,18 +152,15 @@ pipe_class = PIPE_CLASS_BINARY name = "fuel pipe fitting" - desc = "a striaght fuel pipe segment" rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/fuel/bent name = "bent fuel pipe fitting" - desc = "a bent fuel pipe segment" rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/fuel/manifold name = "fuel pipe manifold fitting" - desc = "a fuel pipe manifold segment" build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/fuel pipe_class = PIPE_CLASS_TRINARY @@ -192,7 +168,6 @@ /datum/fabricator_recipe/pipe/fuel/manifold4w name = "four-way supply pipe manifold fitting" - desc = "a four-way fuel pipe manifold segment" build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel pipe_class = PIPE_CLASS_QUATERNARY @@ -200,7 +175,6 @@ /datum/fabricator_recipe/pipe/fuel/cap name = "fuel pipe cap fitting" - desc = "a pipe cap for a fuel pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/fuel pipe_class = PIPE_CLASS_UNARY @@ -208,14 +182,12 @@ /datum/fabricator_recipe/pipe/fuel/up name = "upward fuel pipe fitting" - desc = "an upward fuel pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/fuel rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/fuel/down name = "downward fuel pipe fitting" - desc = "a downward fuel pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/fuel rotate_class = PIPE_ROTATE_STANDARD @@ -229,13 +201,11 @@ pipe_class = PIPE_CLASS_BINARY name = "heat exchanger pipe fitting" - desc = "a heat exchanger pipe segment" build_icon_state = "he" rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/he/bent name = "bent heat exchanger pipe fitting" - desc = "a bent heat exchanger pipe segment" connect_types = CONNECT_TYPE_HE rotate_class = PIPE_ROTATE_TWODIR build_icon_state = "he" @@ -243,7 +213,6 @@ /datum/fabricator_recipe/pipe/he/junction name = "heat exchanger junction" - desc = "a heat exchanger junction" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_HE|CONNECT_TYPE_FUEL build_icon_state = "junction" constructed_path = /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction @@ -251,7 +220,6 @@ /datum/fabricator_recipe/pipe/he/exchanger name = "heat exchanger" - desc = "a heat exchanger" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "heunary" constructed_path = /obj/machinery/atmospherics/unary/heat_exchanger diff --git a/code/modules/fluids/fluid_mapped.dm b/code/modules/fluids/fluid_mapped.dm index 5ea97d7a585f..3a286cf7b36c 100644 --- a/code/modules/fluids/fluid_mapped.dm +++ b/code/modules/fluids/fluid_mapped.dm @@ -25,12 +25,25 @@ /obj/abstract/landmark/mapped_fluid/Initialize() ..() - var/turf/my_turf = get_turf(src) - if(my_turf) - my_turf.add_to_reagents(fluid_type, fluid_initial) - return INITIALIZE_HINT_QDEL + return INITIALIZE_HINT_LATELOAD + +/obj/abstract/landmark/mapped_fluid/LateInitialize() + ..() + if(fluid_initial > 0) + var/turf/my_turf = get_turf(src) + if(my_turf) + my_turf.add_to_reagents(fluid_type, fluid_initial) + qdel(src) /obj/abstract/landmark/mapped_fluid/fuel name = "spilled fuel" fluid_type = /decl/material/liquid/fuel fluid_initial = 10 + +/obj/abstract/landmark/mapped_fluid/fill + name = "mapped fluid fill" + +/obj/abstract/landmark/mapped_fluid/fill/LateInitialize() + var/turf/my_turf = get_turf(loc) + fluid_initial = -(my_turf.get_physical_height()) + ..() diff --git a/code/modules/food/plates/plate_tray.dm b/code/modules/food/plates/plate_tray.dm index 2b05fabfbf85..5bc0488090ce 100644 --- a/code/modules/food/plates/plate_tray.dm +++ b/code/modules/food/plates/plate_tray.dm @@ -157,10 +157,10 @@ TRAY TYPES GO HERE /obj/item/plate/tray/metal/silver name = "platter" - desc = "You lazy bum." + desc = "The new generation is so lazy, they expect everything to be handed to them on this." material = /decl/material/solid/metal/silver /obj/item/plate/tray/metal/gold name = "platter" - desc = "A gold tray to serve food on. But oh sofancy." + desc = "A gold tray to serve food on. Heavy, but oh-so-fancy." material = /decl/material/solid/metal/gold \ No newline at end of file diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index 5c7765027cb7..4aa01e0697da 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -1,6 +1,6 @@ /obj/item/board name = "board" - desc = "A standard 16\" checkerboard. Well used." //Goddamn imperial system. + desc = "A standard 16\" checkerboard. Well-used." //Goddamn imperial system. icon = 'icons/obj/pieces.dmi' icon_state = "board" material = /decl/material/solid/organic/wood/oak @@ -236,7 +236,7 @@ /obj/item/checker/bishop name = "bishop" - desc = "What corruption occured, urging holy men to fight?" + desc = "What corruption occurred, urging holy men to fight?" /obj/item/checker/bishop/red piece_color ="red" diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 8084a66d09df..cd9bf8848097 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -106,7 +106,7 @@ var/global/list/card_decks = list() /obj/item/deck/compact name = "compact deck of cards" - desc = "A deck of playing cards. Looks like this one hasn't numbers from two to five, and jokers." + desc = "A deck of playing cards. Looks like this one is missing numbers from two to five, and both jokers." icon_state = "deck" /obj/item/deck/compact/generate_cards() @@ -266,7 +266,7 @@ var/global/list/card_decks = list() /obj/item/pack name = "card pack" - desc = "For those with disposible income." + desc = "For those with disposable income." icon_state = "card_pack" icon = 'icons/obj/items/playing_cards.dmi' w_class = ITEM_SIZE_SMALL @@ -292,7 +292,10 @@ var/global/list/card_decks = list() icon_state = "empty" w_class = ITEM_SIZE_TINY material = /decl/material/solid/organic/cardboard + dir = NORTH // our default dir is expected to be north, e.g. we've been placed by someone facing north var/concealed = 0 + /// Whether or not we should shift our icons according to our dir or not. + var/is_on_table = FALSE var/list/datum/playingcard/cards = list() /obj/item/hand/attack_self(var/mob/user) @@ -337,43 +340,42 @@ var/global/list/card_decks = list() for(var/datum/playingcard/P in cards) to_chat(user, "\The [APPEND_FULLSTOP_IF_NEEDED(P.name)]") -/obj/item/hand/on_update_icon(var/direction = 0) +/obj/item/hand/on_update_icon() . = ..() - if(!cards.len) - qdel(src) - return - else if(cards.len > 1) - name = "hand of cards" - desc = "Some playing cards." - else if(concealed) - name = "single playing card" - desc = "An unknown playing card, concealed." - else - var/datum/playingcard/P = cards[1] - name = "[P.name]" - desc = "[P.desc]" - - overlays.Cut() - - if(cards.len == 1) - var/datum/playingcard/P = cards[1] - var/image/I = P.card_image(concealed, src.icon) - I.pixel_x += (-5+rand(10)) - I.pixel_y += (-5+rand(10)) - overlays += I - return + var/card_count = length(cards) + switch(card_count) + if(0) + qdel(src) + return + if(1) + var/datum/playingcard/top_card = cards[1] + if(concealed) + name = "single playing card" + desc = "An unknown playing card, concealed." + else + name = top_card.name + desc = top_card.desc + var/image/I = top_card.card_image(concealed, src.icon) + I.pixel_x += (-5+rand(10)) + I.pixel_y += (-5+rand(10)) + add_overlay(I) + compile_overlays() + return + else + name = "hand of cards" + desc = "Some playing cards." - var/offset = floor(20/cards.len) + var/offset = floor(20/card_count) var/matrix/M = matrix() - if(direction) - switch(direction) + if(is_on_table) + switch(dir) if(NORTH) - M.Translate( 0, 0) + M.Translate( 0, 0) // Technically redundant but it makes the logic clearer. if(SOUTH) M.Translate( 0, 4) if(WEST) - M.Turn(90) + M.Turn(-90) M.Translate( 3, 0) if(EAST) M.Turn(90) @@ -381,29 +383,36 @@ var/global/list/card_decks = list() var/i = 0 for(var/datum/playingcard/P in cards) var/image/I = P.card_image(concealed, src.icon) - //I.pixel_x = origin+(offset*i) - switch(direction) + switch(dir) if(SOUTH) I.pixel_x = 8-(offset*i) if(WEST) I.pixel_y = -6+(offset*i) if(EAST) I.pixel_y = 8-(offset*i) - else + if(NORTH) I.pixel_x = -7+(offset*i) + // other dirs are explicitly unsupported! I.transform = M - overlays += I + add_overlay(I) i++ + compile_overlays() // these should be as responsive as possible /obj/item/hand/dropped(mob/user) ..() - if(locate(/obj/structure/table, loc)) - src.update_icon(user.dir) + if(locate(/obj/structure/table) in loc) + is_on_table = TRUE + set_dir(user.dir) else - update_icon() + is_on_table = FALSE + set_dir(initial(dir)) + update_icon() /obj/item/hand/on_picked_up(mob/user) - src.update_icon() + ..() + is_on_table = FALSE + set_dir(initial(dir)) + update_icon() /*** A special thing that steals a card from a deck, probably lost in maint somewhere. ***/ /obj/item/hand/missing_card diff --git a/code/modules/gemstones/gemstone_cuts.dm b/code/modules/gemstones/gemstone_cuts.dm index 4b8b15fb7d84..a880d09644f6 100644 --- a/code/modules/gemstones/gemstone_cuts.dm +++ b/code/modules/gemstones/gemstone_cuts.dm @@ -66,7 +66,7 @@ /decl/gemstone_cut/octagon name = "octagon" adjective = "octagon-cut" - desc = "A octagon-cut gemstone." + desc = "An octagon-cut gemstone." icon = 'icons/obj/items/gemstones/octagon.dmi' /decl/gemstone_cut/round diff --git a/code/modules/genetics/plants/trait_biolum.dm b/code/modules/genetics/plants/trait_biolum.dm index 26c5d38b69d5..a4b8e623e183 100644 --- a/code/modules/genetics/plants/trait_biolum.dm +++ b/code/modules/genetics/plants/trait_biolum.dm @@ -5,4 +5,4 @@ /decl/plant_trait/biolum/get_extended_data(val, datum/seed/grown_seed) if(val) - return "It is [grown_seed?.get_trait(TRAIT_BIOLUM_COLOUR) ? "bio-luminescent" : "bio-luminescent"]." + return "It is [grown_seed?.get_trait(TRAIT_BIOLUM_COLOUR) ? "bioluminescent" : "bioluminescent"]." diff --git a/code/modules/goals/definitions/personal_achievement.dm b/code/modules/goals/definitions/personal_achievement.dm index bf83f3303e92..12849c7f7851 100644 --- a/code/modules/goals/definitions/personal_achievement.dm +++ b/code/modules/goals/definitions/personal_achievement.dm @@ -32,5 +32,5 @@ completion_message = "Yeah! Smash the state!" /datum/goal/achievement/newshound - description = "Catch up on the news with a newspaper, none of that new-fangled digital media." + description = "Catch up on the news with a newspaper, none of that newfangled digital media." completion_message = "You feel much more in-the-know." \ No newline at end of file diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 843d0ed4d48f..f5db252b01db 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -100,40 +100,37 @@ onclose(user, "computer") return -/obj/machinery/computer/holodeck_control/Topic(href, href_list) - if(..()) - return 1 - if((usr.contents.Find(src) || (in_range(src, usr) && isturf(src.loc))) || (issilicon(usr))) - usr.set_machine(src) - - if(href_list["program"]) - var/prog = href_list["program"] - if(prog in global.using_map.holodeck_programs) - loadProgram(global.using_map.holodeck_programs[prog]) - - else if(href_list["AIoverride"]) - if(!issilicon(usr)) - return +/obj/machinery/computer/holodeck_control/OnTopic(mob/user, href_list) + if((. = ..())) + return + if(href_list["program"]) + var/prog = href_list["program"] + if(prog in global.using_map.holodeck_programs) + loadProgram(global.using_map.holodeck_programs[prog]) + . = TOPIC_REFRESH - if(safety_disabled && emagged) - return //if a traitor has gone through the trouble to emag the thing, let them keep it. + else if(href_list["AIoverride"]) + if(!issilicon(usr)) + return TOPIC_HANDLED - safety_disabled = !safety_disabled - update_projections() - if(safety_disabled) - log_and_message_admins("overrode the holodeck's safeties") - else - log_and_message_admins("restored the holodeck's safeties") + if(safety_disabled && emagged) + return TOPIC_HANDLED //if a traitor has gone through the trouble to emag the thing, let them keep it. - else if(href_list["gravity"]) - toggleGravity(linkedholodeck) + safety_disabled = !safety_disabled + update_projections() + if(safety_disabled) + log_and_message_admins("overrode the holodeck's safeties") + else + log_and_message_admins("restored the holodeck's safeties") + . = TOPIC_REFRESH - else if(href_list["togglehololock"]) - togglelock(usr) + else if(href_list["gravity"]) + toggleGravity(linkedholodeck) + . = TOPIC_REFRESH - src.add_fingerprint(usr) - src.updateUsrDialog() - return + else if(href_list["togglehololock"]) + togglelock(usr) + . = TOPIC_REFRESH /obj/machinery/computer/holodeck_control/emag_act(var/remaining_charges, var/mob/user) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) diff --git a/code/modules/hud/_hud_condition.dm b/code/modules/hud/_hud_condition.dm deleted file mode 100644 index ce592c6918fc..000000000000 --- a/code/modules/hud/_hud_condition.dm +++ /dev/null @@ -1,15 +0,0 @@ -// decl stubs for future implementation work. -/decl/hud_element - abstract_type = /decl/hud_element -/decl/hud_element/condition - abstract_type = /decl/hud_element/condition - -/decl/hud_element/condition/pressure - -/decl/hud_element/condition/fire - -/decl/hud_element/condition/oxygen - -/decl/hud_element/condition/toxins - -/decl/hud_element/condition/carbon_dioxide diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 3e145679b348..7083722c41ca 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -183,11 +183,10 @@ return var/mob/living/M = AM - if(M.buckled || MOVING_DELIBERATELY(M)) + if(MOVING_DELIBERATELY(M)) return - var/obj/item/shoes = M.get_equipped_item(slot_shoes_str) - if(shoes && shoes.item_flags & ITEM_FLAG_NOSLIP) + if(!M.can_slip() || M.immune_to_floor_hazards()) return to_chat(M, SPAN_DANGER("You slipped on \the [src]!")) diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 418afb41d29c..17fbe753529f 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -153,13 +153,12 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/botany/Topic(href, href_list) - - if(..()) - return 1 +/obj/machinery/botany/OnTopic(mob/user, href_list) + if((. = ..())) + return if(href_list["eject_packet"]) - if(!seed) return + if(!seed) return TOPIC_REFRESH // You must be mistaken! We have no seed. seed.dropInto(loc) if(seed.seed.name == "new line" || isnull(SSplants.seeds[seed.seed.name])) @@ -168,76 +167,59 @@ SSplants.seeds[seed.seed.name] = seed.seed seed.update_seed() - visible_message("[html_icon(src)] [src] beeps and spits out [seed].") + visible_message("[html_icon(src)] \The [src] beeps and spits out [seed].") seed = null + . = TOPIC_REFRESH if(href_list["eject_disk"]) - if(!loaded_disk) return + if(!loaded_disk) return TOPIC_REFRESH loaded_disk.dropInto(loc) - visible_message("[html_icon(src)] [src] beeps and spits out [loaded_disk].") + visible_message("[html_icon(src)] \The [src] beeps and spits out [loaded_disk].") loaded_disk = null + . = TOPIC_REFRESH - usr.set_machine(src) - src.add_fingerprint(usr) - -/obj/machinery/botany/extractor/Topic(href, href_list) - - if(..()) - return 1 - - var/mob/user = usr - user.set_machine(src) - src.add_fingerprint(user) +/obj/machinery/botany/extractor/OnTopic(mob/user, href_list) + if((. = ..())) + return if(href_list["scan_genome"]) - - if(!seed) return - + if(!seed) return TOPIC_REFRESH last_action = world.time - active = 1 - - if(seed && seed.seed) - if(prob(user.skill_fail_chance(SKILL_BOTANY, 100, SKILL_ADEPT))) - failed_task = 1 - else - genetics = seed.seed - degradation = 0 + active = TRUE + if(prob(user.skill_fail_chance(SKILL_BOTANY, 100, SKILL_ADEPT))) + failed_task = TRUE + else + genetics = seed.seed + degradation = 0 - qdel(seed) - seed = null + QDEL_NULL(seed) if(href_list["get_gene"]) - if(!genetics || !loaded_disk) - return + return TOPIC_REFRESH var/decl/plant_gene/gene_master = locate(href_list["get_gene"]) if(ispath(gene_master)) gene_master = GET_DECL(gene_master) if(!istype(gene_master)) - return + return TOPIC_HANDLED // Potential href hacking? last_action = world.time - active = 1 - + active = TRUE loaded_disk.genes += new /datum/plantgene(gene_master, genetics) - loaded_disk.genesource = "[genetics.display_name]" if(!genetics.roundstart) loaded_disk.genesource += " (variety #[genetics.uid])" - loaded_disk.name += " ([gene_master.name], #[genetics.uid])" loaded_disk.desc += " The label reads \'gene [gene_master.name], sampled from [genetics.display_name]\'." - eject_disk = 1 - + eject_disk = TRUE degradation += rand(20,60) + user.skill_fail_chance(SKILL_BOTANY, 100, SKILL_ADEPT) var/expertise = max(0, user.get_skill_value(SKILL_BOTANY) - SKILL_ADEPT) degradation = max(0, degradation - 10*expertise) - if(degradation >= 100) - failed_task = 1 + failed_task = TRUE genetics = null degradation = 0 @@ -296,30 +278,24 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/botany/editor/Topic(href, href_list) - - if(..()) - return 1 +/obj/machinery/botany/editor/OnTopic(mob/user, href_list) + if((. = ..())) + return if(href_list["apply_gene"]) - if(!loaded_disk || !seed) return - - var/mob/user = usr + if(!loaded_disk || !seed) return TOPIC_REFRESH last_action = world.time - active = 1 + active = TRUE if(!isnull(SSplants.seeds[seed.seed.name])) seed.seed = seed.seed.diverge(1) seed.update_seed() if(prob(seed.modified)) - failed_task = 1 + failed_task = TRUE seed.modified = 101 for(var/datum/plantgene/gene in loaded_disk.genes) seed.seed.apply_gene(gene) var/expertise = max(user.get_skill_value(SKILL_BOTANY) - SKILL_ADEPT) seed.modified += rand(5,10) + min(-5, 30 * expertise) - - usr.set_machine(src) - src.add_fingerprint(usr) diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index bee76cb91f76..6aa7d2372d15 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -286,8 +286,8 @@ show_browser(user, dat, "window=seedstorage;size=800x500") onclose(user, "seedstorage") -/obj/machinery/seed_storage/Topic(var/href, var/list/href_list) - if (..()) +/obj/machinery/seed_storage/OnTopic(mob/user, href_list) + if((. = ..())) return var/task = href_list["task"] var/id = text2num(href_list["id"]) @@ -304,13 +304,14 @@ qdel(our_pile) flick("[initial(icon_state)]-vend", src) O.dropInto(loc) + . = TOPIC_REFRESH if ("purge") QDEL_LIST(our_pile.seeds) our_pile.seeds.Cut() + . = TOPIC_REFRESH if(!length(our_pile.seeds)) piles -= our_pile QDEL_NULL(our_pile) - updateUsrDialog() /obj/machinery/seed_storage/attackby(var/obj/item/O, var/mob/user) diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm index 5848a943ac70..1eaa5fba5651 100644 --- a/code/modules/hydroponics/spreading/spreading_response.dm +++ b/code/modules/hydroponics/spreading/spreading_response.dm @@ -78,8 +78,7 @@ if(H.species.species_flags & SPECIES_FLAG_NO_TANGLE) return - var/obj/item/clothing/shoes/magboots/magboots = H.get_equipped_item(slot_shoes_str) - if(victim.loc != loc && istype(magboots) && (magboots.item_flags & ITEM_FLAG_NOSLIP) || H.species.check_no_slip(H)) + if(victim.loc != loc && victim.can_slip()) visible_message("Tendrils lash to drag \the [victim] but \the [src] can't pull them across the ground!") return diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/modules/implants/implant.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implant.dm rename to code/modules/implants/implant.dm diff --git a/code/game/objects/items/weapons/implants/implants/adrenaline.dm b/code/modules/implants/implant_types/adrenaline.dm similarity index 84% rename from code/game/objects/items/weapons/implants/implants/adrenaline.dm rename to code/modules/implants/implant_types/adrenaline.dm index 7c3f0036fa7c..e93b99158db2 100644 --- a/code/game/objects/items/weapons/implants/implants/adrenaline.dm +++ b/code/modules/implants/implant_types/adrenaline.dm @@ -31,8 +31,8 @@ imp_in.set_status(STAT_PARA, 0) /obj/item/implant/adrenalin/implanted(mob/source) - source.StoreMemory("A implant can be activated by using the pale emote, say *pale to attempt to activate.", /decl/memory_options/system) - to_chat(source, "The implanted freedom implant can be activated by using the pale emote, say *pale to attempt to activate.") + source.StoreMemory("\A [src] can be activated by using the pale emote, say *pale to attempt to activate.", /decl/memory_options/system) + to_chat(source, "\The [src] can be activated by using the pale emote, say *pale to attempt to activate.") return TRUE /obj/item/implanter/adrenalin diff --git a/code/game/objects/items/weapons/implants/implants/chem.dm b/code/modules/implants/implant_types/chem.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implants/chem.dm rename to code/modules/implants/implant_types/chem.dm diff --git a/code/game/objects/items/weapons/implants/implants/compressed.dm b/code/modules/implants/implant_types/compressed.dm similarity index 88% rename from code/game/objects/items/weapons/implants/implants/compressed.dm rename to code/modules/implants/implant_types/compressed.dm index e9872331439e..ad6dee6983b1 100644 --- a/code/game/objects/items/weapons/implants/implants/compressed.dm +++ b/code/modules/implants/implant_types/compressed.dm @@ -27,8 +27,8 @@ /obj/item/implant/compressed/implanted(mob/source) src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") if (source.mind) - source.StoreMemory("Compressed matter implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) - to_chat(source, "The implanted compressed matter implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") + source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) + to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") return TRUE /obj/item/implanter/compressed diff --git a/code/game/objects/items/weapons/implants/implants/death_alarm.dm b/code/modules/implants/implant_types/death_alarm.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implants/death_alarm.dm rename to code/modules/implants/implant_types/death_alarm.dm diff --git a/code/game/objects/items/weapons/implants/implants/explosive.dm b/code/modules/implants/implant_types/explosive.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implants/explosive.dm rename to code/modules/implants/implant_types/explosive.dm diff --git a/code/game/objects/items/weapons/implants/implants/freedom.dm b/code/modules/implants/implant_types/freedom.dm similarity index 85% rename from code/game/objects/items/weapons/implants/implants/freedom.dm rename to code/modules/implants/implant_types/freedom.dm index 720acd8685f4..2ec9c0890aed 100644 --- a/code/game/objects/items/weapons/implants/implants/freedom.dm +++ b/code/modules/implants/implant_types/freedom.dm @@ -50,8 +50,8 @@ /obj/item/implant/freedom/implanted(mob/living/source) src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") - source.StoreMemory("Freedom implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) - to_chat(source, "The implanted freedom implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") + source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) + to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") return TRUE /obj/item/implanter/freedom diff --git a/code/game/objects/items/weapons/implants/implants/imprinting.dm b/code/modules/implants/implant_types/imprinting.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implants/imprinting.dm rename to code/modules/implants/implant_types/imprinting.dm diff --git a/code/game/objects/items/weapons/implants/implants/loyalty.dm b/code/modules/implants/implant_types/loyalty.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implants/loyalty.dm rename to code/modules/implants/implant_types/loyalty.dm diff --git a/code/game/objects/items/weapons/implants/implants/tracking.dm b/code/modules/implants/implant_types/tracking.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implants/tracking.dm rename to code/modules/implants/implant_types/tracking.dm diff --git a/code/game/objects/items/weapons/implants/implants/translator.dm b/code/modules/implants/implant_types/translator.dm similarity index 93% rename from code/game/objects/items/weapons/implants/implants/translator.dm rename to code/modules/implants/implant_types/translator.dm index 90220204ae8b..f4c540ddb7d4 100644 --- a/code/game/objects/items/weapons/implants/implants/translator.dm +++ b/code/modules/implants/implant_types/translator.dm @@ -41,7 +41,7 @@ /obj/item/implant/translator/natural name = "lingophagic node" - desc = "A chunk of what could be discolored crystalized brain matter. It seems to pulse occasionally." + desc = "A chunk of what could be discolored crystallized brain matter. It seems to pulse occasionally." icon_state = "implant_melted" origin_tech = @'{"biotech":5}' learning_threshold = 10 diff --git a/code/game/objects/items/weapons/implants/implants/uplink.dm b/code/modules/implants/implant_types/uplink.dm similarity index 77% rename from code/game/objects/items/weapons/implants/implants/uplink.dm rename to code/modules/implants/implant_types/uplink.dm index fece5d1fc373..27e733c583aa 100644 --- a/code/game/objects/items/weapons/implants/implants/uplink.dm +++ b/code/modules/implants/implant_types/uplink.dm @@ -13,8 +13,8 @@ /obj/item/implant/uplink/implanted(mob/source) var/emote_options = list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") activation_emote = source.client ? (input(source, "Choose activation emote:", "Uplink Implant Setup") in emote_options) : emote_options[1] - source.StoreMemory("Uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) - to_chat(source, "The implanted uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") + source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) + to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") hidden_uplink.uplink_owner = source.mind return TRUE diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/modules/implants/implantcase.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implantcase.dm rename to code/modules/implants/implantcase.dm diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/modules/implants/implantchair.dm similarity index 86% rename from code/game/objects/items/weapons/implants/implantchair.dm rename to code/modules/implants/implantchair.dm index 7d2dfe25367c..6bfe7ff3b67c 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/modules/implants/implantchair.dm @@ -9,13 +9,13 @@ opacity = FALSE anchored = TRUE - var/ready = 1 + var/ready = TRUE var/list/obj/item/implant/loyalty/implant_list = list() var/max_implants = 5 var/injection_cooldown = 600 var/replenish_cooldown = 6000 var/mob/living/occupant = null - var/injecting = 0 + var/injecting = FALSE /obj/machinery/implantchair/Initialize() . = ..() @@ -47,26 +47,24 @@ onclose(user, "implant") -/obj/machinery/implantchair/Topic(href, href_list) +/obj/machinery/implantchair/OnTopic(mob/user, href_list) if((. = ..())) return - if((get_dist(src, usr) <= 1) || isAI(usr)) - if(href_list["implant"]) - if(src.occupant) - injecting = 1 - go_out() - ready = 0 - spawn(injection_cooldown) - ready = 1 - - if(href_list["replenish"]) - ready = 0 - spawn(replenish_cooldown) - add_implants() - ready = 1 - - src.updateUsrDialog() - src.add_fingerprint(usr) + if(!ready) // avoid topic hacking + return TOPIC_NOACTION + if(href_list["implant"] && occupant) + injecting = TRUE + go_out() + ready = FALSE + addtimer(CALLBACK(src, PROC_REF(make_ready)), injection_cooldown) + + if(href_list["replenish"]) + ready = 0 + addtimer(CALLBACK(src, PROC_REF(add_implants)), replenish_cooldown) + addtimer(CALLBACK(src, PROC_REF(make_ready)), replenish_cooldown) + +/obj/machinery/implantchair/proc/make_ready() + ready = TRUE /obj/machinery/implantchair/grab_attack(obj/item/grab/grab, mob/user) var/mob/living/victim = grab.get_affecting_mob() @@ -87,7 +85,7 @@ occupant.dropInto(loc) if(injecting) implant(src.occupant) - injecting = 0 + injecting = FALSE src.occupant = null icon_state = "implantchair" return diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/modules/implants/implanter.dm similarity index 100% rename from code/game/objects/items/weapons/implants/implanter.dm rename to code/modules/implants/implanter.dm diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/modules/implants/implantpad.dm similarity index 97% rename from code/game/objects/items/weapons/implants/implantpad.dm rename to code/modules/implants/implantpad.dm index 7f1226b1eaea..a2b1afb11fb4 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/modules/implants/implantpad.dm @@ -1,6 +1,6 @@ /obj/item/implantpad name = "implant pad" - desc = "Used to reprogramm implants." + desc = "Used to reprogram implants." icon = 'icons/obj/items/implant/implantpad.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_SMALL diff --git a/code/modules/integrated_electronics/subtypes/access.dm b/code/modules/integrated_electronics/subtypes/access.dm index ef601575bd94..8d65f2c31da6 100644 --- a/code/modules/integrated_electronics/subtypes/access.dm +++ b/code/modules/integrated_electronics/subtypes/access.dm @@ -1,6 +1,6 @@ /obj/item/integrated_circuit/input/card_reader name = "ID card reader" //To differentiate it from the data card reader - desc = "A circuit that can read the registred name, assignment, and PassKey string from an ID card." + desc = "A circuit that can read the registered name, assignment, and PassKey string from an ID card." icon_state = "card_reader" complexity = 4 @@ -43,7 +43,7 @@ /obj/item/integrated_circuit/output/access_displayer name = "access circuit" - desc = "broadcasts access for your assembly via a passkey." + desc = "A circuit that broadcasts access for your assembly via a passkey." extended_desc = "Useful for moving drones through airlocks." complexity = 4 diff --git a/code/modules/integrated_electronics/subtypes/converters.dm b/code/modules/integrated_electronics/subtypes/converters.dm index 1d125d29c248..2b91f12b1ec4 100644 --- a/code/modules/integrated_electronics/subtypes/converters.dm +++ b/code/modules/integrated_electronics/subtypes/converters.dm @@ -109,6 +109,7 @@ /obj/item/integrated_circuit/converter/lowercase name = "lowercase string converter" + // i'm not fixing the capitalization here to fit style guides because it's funny actually desc = "this circuit will cause a string to come out in all lowercase." icon_state = "lowercase" inputs = list("input" = IC_PINTYPE_STRING) @@ -128,6 +129,7 @@ /obj/item/integrated_circuit/converter/uppercase name = "uppercase string converter" + // see capitalization note above desc = "THIS WILL CAUSE A STRING TO COME OUT IN ALL UPPERCASE." icon_state = "uppercase" inputs = list("input" = IC_PINTYPE_STRING) @@ -392,7 +394,7 @@ /obj/item/integrated_circuit/converter/hsv2hex name = "hsv to hexadecimal" - desc = "This circuit can convert a HSV (Hue, Saturation, and Value) color to a Hexadecimal RGB color." + desc = "This circuit can convert an HSV (Hue, Saturation, and Value) color to a Hexadecimal RGB color." extended_desc = "The first pin controls tint (0-359), the second pin controls how intense the tint is (0-255), and the third controls how bright the tint is (0 for black, 127 for normal, 255 for white)." icon_state = "hsv-hex" inputs = list( @@ -418,7 +420,7 @@ /obj/item/integrated_circuit/converter/rgb2hex name = "rgb to hexadecimal" - desc = "This circuit can convert a RGB (Red, Green, Blue) color to a Hexadecimal RGB color." + desc = "This circuit can convert an RGB (Red, Green, Blue) color to a Hexadecimal RGB color." extended_desc = "The first pin controls red amount, the second pin controls green amount, and the third controls blue amount. They all go from 0-255." icon_state = "rgb-hex" inputs = list( diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index 0fd000025760..82449cc6ab6f 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -537,7 +537,7 @@ /obj/item/integrated_circuit/manipulation/wormhole name = "wormhole generator" desc = "This powerful circuit can open micro-length wormholes between two points in space." - extended_desc = "If a valid teleporter console is supplied as input then its selected teleporter beacon will be used as destination point, \ + extended_desc = "If a valid teleporter console is supplied as input then its selected teleporter beacon will be used as the destination point, \ and if not an undefined destination point is selected. \ Rift direction is a cardinal value determening in which direction the rift will be opened, relative the local north. \ A direction value of 0 will open the rift on top of the assembly, and any other non-cardinal values will open the rift in the assembly's current facing." @@ -593,7 +593,7 @@ /obj/item/integrated_circuit/manipulation/ai name = "integrated intelligence control circuit" - desc = "Similar in structure to a intellicard, this circuit allows the AI to pulse four different activators for control of a circuit." + desc = "Similar in structure to a intelliCard, this circuit allows the AI to pulse four different activators for control of a circuit." extended_desc = "Loading an AI is easy, all that is required is to insert the container into the device's slot. Unloading is a similar process, simply press\ down on the device in question and the device/card should pop out (if applicable)." icon_state = "ai" diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 5255d8469c87..777bc82a7b46 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -343,7 +343,7 @@ /obj/item/integrated_circuit/reagent/storage/grinder name = "reagent grinder" - desc = "This is a reagent grinder. It accepts a ref to something, and refines it into reagents. It cannot grind materials. It can store up to 100u." + desc = "This is a reagent grinder. It accepts a ref to something and refines it into reagents. It cannot grind materials and can store up to 100u." icon_state = "blender" extended_desc = "" inputs = list( diff --git a/code/modules/integrated_electronics/subtypes/smart.dm b/code/modules/integrated_electronics/subtypes/smart.dm index f92af368dcd8..4f2781f5c11f 100644 --- a/code/modules/integrated_electronics/subtypes/smart.dm +++ b/code/modules/integrated_electronics/subtypes/smart.dm @@ -4,7 +4,7 @@ /obj/item/integrated_circuit/smart/basic_pathfinder name = "basic pathfinder" desc = "This complex circuit is able to determine what direction a given target is." - extended_desc = "This circuit uses a miniturized integrated camera to determine where the target is. If the machine \ + extended_desc = "This circuit uses a miniaturized integrated camera to determine where the target is. If the machine \ cannot see the target, it will not be able to calculate the correct direction." icon_state = "numberpad" complexity = 5 diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm index 30d2a47b29b5..c7fae9674340 100644 --- a/code/modules/lighting/lighting_overlay.dm +++ b/code/modules/lighting/lighting_overlay.dm @@ -146,7 +146,7 @@ SHOULD_CALL_PARENT(FALSE) return -/atom/movable/lighting_overlay/can_fall() +/atom/movable/lighting_overlay/can_fall(anchor_bypass = FALSE, turf/location_override = loc) return FALSE // Override here to prevent things accidentally moving around overlays. diff --git a/code/modules/locks/lock_construct.dm b/code/modules/locks/lock_construct.dm index a1060c0063db..0a27464efde2 100644 --- a/code/modules/locks/lock_construct.dm +++ b/code/modules/locks/lock_construct.dm @@ -1,6 +1,6 @@ /obj/item/lock_construct name = "lock" - desc = "a simple tumbler lock and bolt, suitable for affixing to a door or closet." + desc = "A simple tumbler lock and bolt, suitable for affixing to a door or closet." icon = 'icons/obj/items/doorlock.dmi' icon_state = "lock_construct" w_class = ITEM_SIZE_TINY diff --git a/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm b/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm index 5b201f4509da..4ef94c9de02c 100644 --- a/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm +++ b/code/modules/maps/template_types/random_exoplanet/planet_types/shrouded.dm @@ -4,7 +4,7 @@ /obj/effect/overmap/visitable/sector/planetoid/exoplanet/shrouded name = "shrouded exoplanet" - desc = "An exoplanet shrouded in a perpetual storm of bizzare, light absorbing particles." + desc = "An exoplanet shrouded in a perpetual storm of bizarre, light-absorbing particles." color = "#783ca4" /obj/effect/overmap/visitable/sector/planetoid/exoplanet/shrouded/get_atmosphere_color() diff --git a/code/modules/maps/template_types/random_exoplanet/planetoid_data.dm b/code/modules/maps/template_types/random_exoplanet/planetoid_data.dm index 83421bfc4168..8947d15a5de3 100644 --- a/code/modules/maps/template_types/random_exoplanet/planetoid_data.dm +++ b/code/modules/maps/template_types/random_exoplanet/planetoid_data.dm @@ -132,7 +132,7 @@ //Always keep the overmap marker in sync if we have one set already try_update_overmap_marker() -// ** Bunch of overridables below ** +// ** Bunch of overrideables below ** ///Sets the name of the planetoid, and causes updates to happen to anything linked to us. /datum/planetoid_data/proc/SetName(var/newname) diff --git a/code/modules/materials/_materials.dm b/code/modules/materials/_materials.dm index 6617c5c2a1e5..d5965e1caa12 100644 --- a/code/modules/materials/_materials.dm +++ b/code/modules/materials/_materials.dm @@ -193,6 +193,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/gas_overlay) var/max_fluid_opacity = FLUID_MAX_ALPHA /// Point at which the fluid will proc turf interaction logic. Workaround for mops being ruined forever by 1u of anything else being added. var/turf_touch_threshold = FLUID_QDEL_POINT + /// Whether or not billets of this material will glow with heat. + var/glows_with_heat = FALSE // Damage values. var/hardness = MAT_VALUE_HARD // Used for edge damage in weapons. @@ -303,7 +305,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/gas_overlay) var/scent //refer to _scent.dm var/scent_intensity = /decl/scent_intensity/normal - var/scent_descriptor = SCENT_DESC_SMELL + var/scent_descriptor = "smell" var/scent_range = 1 var/list/neutron_interactions // Associative List of potential neutron interactions for the material to undergo, corresponding to the ideal @@ -366,11 +368,17 @@ INITIALIZE_IMMEDIATE(/obj/effect/gas_overlay) /// If an item has a null paint_verb, it automatically sets it based on material. var/paint_verb = "painted" + /// What word is used to describe an item covered in/stained by this by default? + /// Can be overridden by get_coated_adjective(). + var/coated_adjective = "stained" + /// Chance of a natural wall made of this material dropping a gemstone, if the gemstone_types list is populated. var/gemstone_chance = 5 /// Assoc weighted list of gemstone material types to weighting. var/list/gemstone_types + var/forgable = FALSE // Can this material be forged in bar/billet form? + // Placeholders for light tiles and rglass. /decl/material/proc/reinforce(var/mob/user, var/obj/item/stack/material/used_stack, var/obj/item/stack/material/target_stack, var/use_sheets = 1) if(!used_stack.can_use(use_sheets)) @@ -444,6 +452,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/gas_overlay) burn_product = null vapor_products = null compost_value = 0 + forgable = FALSE else if(isnull(temperature_damage_threshold)) var/new_temperature_damage_threshold = max(melting_point, boiling_point, heating_point) // Don't let the threshold be lower than the ignition point. @@ -1215,3 +1224,28 @@ INITIALIZE_IMMEDIATE(/obj/effect/gas_overlay) /// If any value below 0 is returned, it doesn't start processing. /decl/material/proc/get_time_to_dry_stain(obj/effect/decal/cleanable/blood/stain) return initial(stain.time_to_dry) + +// TODO: Maybe make this use a strengths system like taste? +/// Returns a string to describe an item coated with this reagent (and others). +/// Receives the coating reagent holder as an argument, so coating.my_atom is accessible +/// and it can also conditionally use a different string for primary/non-primary materials, or +/// if another liquid is present, e.g. 'wet bloody muddy shoes'. +/decl/material/proc/get_coated_adjective(datum/reagents/coating) + var/used_color = get_reagent_color(coating) + if(get_config_value(/decl/config/enum/colored_coating_names) == CONFIG_COATING_COLOR_COMPONENTS) + return FONT_COLORED(used_color, coated_adjective) + return coated_adjective + +/// Gets the name used to describe a coating with this material as its primary reagent. +/// This is mostly for handling special cases like mud. +/decl/material/proc/get_primary_coating_name(datum/reagents/coating) + // this should probably respect current phase/solution/etc better, but coating sure doesn't + return get_reagent_name(coating, phase_at_temperature()) + +/// Builds a string to describe a coating made up of this reagent (and others). +/// This reagent will never be the primary reagent, however; that's handled in get_primary_coating_name. +/// Receives the coating as an argument like get_coated_adjective, but also receives the accumulator list +/// for more complex behaviors like adding to the start. It can't reliably handle things like removing +/// another entry because ordering is not guaranteed, so beware if you need something like that. +/decl/material/proc/build_coated_name(datum/reagents/coating, list/accumulator) + accumulator |= get_coated_adjective(coating) diff --git a/code/modules/materials/definitions/gasses/material_gas_mundane.dm b/code/modules/materials/definitions/gasses/material_gas_mundane.dm index 394b1580c170..9ed5c8ded417 100644 --- a/code/modules/materials/definitions/gasses/material_gas_mundane.dm +++ b/code/modules/materials/definitions/gasses/material_gas_mundane.dm @@ -1,7 +1,7 @@ /decl/material/gas/oxygen name = "oxygen" uid = "gas_oxygen" - lore_text = "An ubiquitous oxidizing agent." + lore_text = "A ubiquitous oxidizing agent." flags = MAT_FLAG_FUSION_FUEL gas_specific_heat = 20 molar_mass = 0.032 @@ -72,19 +72,15 @@ warning_prob = 15 M.take_damage(10, OXY,20) if(istype(H)) - SET_HUD_ALERT(H, /decl/hud_element/condition/carbon_dioxide, 1) + SET_HUD_ALERT(H, HUD_OXY, 1) else if(dosage >= 1.5) warning_message = pick("dizzy","short of breath","faint","momentarily confused") M.take_damage(3, OXY,5) if(istype(H)) - SET_HUD_ALERT(H, /decl/hud_element/condition/carbon_dioxide, 1) + SET_HUD_ALERT(H, HUD_OXY, 1) else if(dosage >= 0.25) warning_message = pick("a little dizzy","short of breath") warning_prob = 10 - if(istype(H)) - SET_HUD_ALERT(H, /decl/hud_element/condition/carbon_dioxide, 0) - else if(istype(H)) - SET_HUD_ALERT(H, /decl/hud_element/condition/carbon_dioxide, 0) if(istype(H) && dosage > 1 && H.ticks_since_last_successful_breath < 15) H.ticks_since_last_successful_breath++ if(warning_message && prob(warning_prob)) @@ -153,7 +149,7 @@ /decl/material/gas/nitrogen name = "nitrogen" uid = "gas_nitrogen" - lore_text = "An ubiquitous noble gas." + lore_text = "A ubiquitous noble gas." gas_specific_heat = 20 molar_mass = 0.028 latent_heat = 199 diff --git a/code/modules/materials/definitions/liquids/materials_liquid_chemistry.dm b/code/modules/materials/definitions/liquids/materials_liquid_chemistry.dm index bb527d7123d3..f7d289cc8693 100644 --- a/code/modules/materials/definitions/liquids/materials_liquid_chemistry.dm +++ b/code/modules/materials/definitions/liquids/materials_liquid_chemistry.dm @@ -1,7 +1,7 @@ /decl/material/liquid/surfactant // Foam precursor name = "surfactant" uid = "liquid_surfactant" - lore_text = "A isocyanate liquid that forms a foam when mixed with water." + lore_text = "An isocyanate liquid that forms a foam when mixed with water." taste_description = "metal" color = "#9e6b38" value = 0.1 @@ -10,7 +10,7 @@ /decl/material/liquid/foaming_agent // Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. name = "foaming agent" uid = "liquid_foaming_agent" - lore_text = "A agent that yields metallic foam when mixed with light metal and a strong acid." + lore_text = "An agent that yields metallic foam when mixed with light metal and a strong acid." taste_description = "metal" color = "#664b63" value = 0.1 @@ -25,6 +25,7 @@ value = 0.1 slipperiness = 80 exoplanet_rarity_gas = MAT_RARITY_EXOTIC + coated_adjective = "oily" // Prevent oil stains from drying. /decl/material/liquid/lube/get_time_to_dry_stain(obj/effect/decal/cleanable/blood/stain) diff --git a/code/modules/materials/definitions/liquids/materials_liquid_solvents.dm b/code/modules/materials/definitions/liquids/materials_liquid_solvents.dm index ec78c02b460f..58d11660565d 100644 --- a/code/modules/materials/definitions/liquids/materials_liquid_solvents.dm +++ b/code/modules/materials/definitions/liquids/materials_liquid_solvents.dm @@ -31,7 +31,7 @@ /decl/material/liquid/acid/polyacid name = "polytrinic acid" uid = "liquid_polytrinic_acid" - lore_text = "Polytrinic acid is a an extremely corrosive chemical substance." + lore_text = "Polytrinic acid is an extremely corrosive chemical substance." taste_description = "acid" color = "#8e18a9" solvent_power = MAT_SOLVENT_STRONGEST diff --git a/code/modules/materials/definitions/liquids/materials_liquid_toxins.dm b/code/modules/materials/definitions/liquids/materials_liquid_toxins.dm index 3b42ee375e46..08eaa22b0c95 100644 --- a/code/modules/materials/definitions/liquids/materials_liquid_toxins.dm +++ b/code/modules/materials/definitions/liquids/materials_liquid_toxins.dm @@ -210,7 +210,9 @@ /decl/material/liquid/tar name = "tar" + solid_name = "asphalt" uid = "liquid_tar" + coated_adjective = "tarry" lore_text = "A dark, viscous liquid." taste_description = "petroleum" color = "#140b30" diff --git a/code/modules/materials/definitions/liquids/materials_liquid_water.dm b/code/modules/materials/definitions/liquids/materials_liquid_water.dm index efb84cdf8e7f..099b762761fb 100644 --- a/code/modules/materials/definitions/liquids/materials_liquid_water.dm +++ b/code/modules/materials/definitions/liquids/materials_liquid_water.dm @@ -31,6 +31,28 @@ ) temperature_burn_milestone_material = /decl/material/liquid/water can_boil_to_gas = TRUE + coated_adjective = "wet" + +/decl/material/liquid/water/build_coated_name(datum/reagents/coating, list/accumulator) + if(length(coating.reagent_volumes) > 1) + accumulator.Insert(1, "dilute") // dilute always comes first! also this is intentionally not colored in component color mode + return // don't insert 'wet' + ..() + +// make salty water named saltwater +/decl/material/liquid/water/get_reagent_name(datum/reagents/holder, phase = MAT_PHASE_LIQUID) + if(phase == MAT_PHASE_LIQUID && holder?.get_primary_reagent_decl() == src) + if(REAGENT_VOLUME(holder, /decl/material/solid/sodiumchloride)) + return "saltwater" + return ..() // just use the default handling + +// make pure water named fresh water +/decl/material/liquid/water/get_reagent_name(datum/reagents/holder, phase = MAT_PHASE_LIQUID) + . = ..() + // length == 1 implies primary reagent, so checking both is redundant + if(phase == MAT_PHASE_LIQUID && length(holder?.reagent_volumes) == 1) + return "fresh [.]" + return /decl/material/liquid/water/affect_blood(var/mob/living/M, var/removed, var/datum/reagents/holder) ..() diff --git a/code/modules/materials/definitions/solids/materials_solid_ice.dm b/code/modules/materials/definitions/solids/materials_solid_ice.dm index b37ec038e84c..a86600f193db 100644 --- a/code/modules/materials/definitions/solids/materials_solid_ice.dm +++ b/code/modules/materials/definitions/solids/materials_solid_ice.dm @@ -35,6 +35,7 @@ solid_name = "snow" gas_name = "steam" adjective_name = "snow" + coated_adjective = "snowy" color = COLOR_WHITE codex_name = null uid = "solid_snow" diff --git a/code/modules/materials/definitions/solids/materials_solid_metal.dm b/code/modules/materials/definitions/solids/materials_solid_metal.dm index 1b22aae712d7..51f1a2db4bfd 100644 --- a/code/modules/materials/definitions/solids/materials_solid_metal.dm +++ b/code/modules/materials/definitions/solids/materials_solid_metal.dm @@ -20,6 +20,8 @@ icon_reinf = 'icons/turf/walls/reinforced_metal.dmi' exoplanet_rarity_gas = MAT_RARITY_NOWHERE tensile_strength = 0.8 // metal wire is probably better than plastic? + forgable = TRUE + glows_with_heat = TRUE /decl/material/solid/metal/uranium name = "uranium" diff --git a/code/modules/materials/definitions/solids/materials_solid_mineral.dm b/code/modules/materials/definitions/solids/materials_solid_mineral.dm index bd0b1ca1ad4d..9b619de94902 100644 --- a/code/modules/materials/definitions/solids/materials_solid_mineral.dm +++ b/code/modules/materials/definitions/solids/materials_solid_mineral.dm @@ -279,6 +279,17 @@ /decl/flooring/mud, /decl/flooring/dirt ) + solution_name = "mud" + coated_adjective = "muddy" + +// todo: make mud either its own material or a mix of dirt and water +// or let dirt be in the liquid volumes list for mud? +// would a ball of mud just be a ball of dirt coated with water? +// or would water be part of its matter? +// well anyway. +// for now, at least, we assume dirt coatings are always mud. +/decl/material/solid/soil/get_primary_coating_name(datum/reagents/coating) + return solution_name /decl/material/solid/hematite name = "hematite" diff --git a/code/modules/materials/material_sheets_mapping.dm b/code/modules/materials/material_sheets_mapping.dm index 1e17f9f3851f..49be21fa79f4 100644 --- a/code/modules/materials/material_sheets_mapping.dm +++ b/code/modules/materials/material_sheets_mapping.dm @@ -122,6 +122,9 @@ STACK_SUBTYPES(titanium, "titanium", solid/metal/tita STACK_SUBTYPES(cotton, "cotton", solid/organic/cloth, thread, null) STACK_SUBTYPES(dried_gut, "dried gut", solid/organic/leather/gut, thread, null) +STACK_SUBTYPES(iron, "iron", solid/metal/iron, bar, null) +STACK_SUBTYPES(copper, "copper", solid/metal/copper, bar, null) + STACK_SUBTYPES(chipboard_oak, "oak chipboard", solid/organic/wood/chipboard, sheet, null) STACK_SUBTYPES(chipboard_maple, "maple chipboard", solid/organic/wood/chipboard/maple, sheet, null) STACK_SUBTYPES(chipboard_mahogany, "mahogany chipboard", solid/organic/wood/chipboard/mahogany, sheet, null) @@ -129,4 +132,5 @@ STACK_SUBTYPES(chipboard_ebony, "ebony chipboard", solid/organic/wood/chip STACK_SUBTYPES(chipboard_walnut, "walnut chipboard", solid/organic/wood/chipboard/walnut, sheet, null) STACK_SUBTYPES(chipboard_yew, "yew chipboard", solid/organic/wood/chipboard/yew, sheet, null) + #undef STACK_SUBTYPES \ No newline at end of file diff --git a/code/modules/mechs/components/armour.dm b/code/modules/mechs/components/armour.dm index b86d67295dc3..a5c122dfadea 100644 --- a/code/modules/mechs/components/armour.dm +++ b/code/modules/mechs/components/armour.dm @@ -17,7 +17,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/radproof name = "radiation-proof armour plating" - desc = "A fully enclosed radiation hardened shell designed to protect the pilot from radiation" + desc = "A fully enclosed radiation hardened shell designed to protect the pilot from radiation." armor = list( ARMOR_MELEE = ARMOR_MELEE_RESISTANT, ARMOR_BULLET = ARMOR_BALLISTIC_PISTOL, @@ -32,7 +32,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/em name = "EM-shielded armour plating" - desc = "A shielded plating that sorrounds the eletronics and protects them from electromagnetic radiation" + desc = "A shielded plating that surrounds sensitive electronic components and protects them from electromagnetic radiation." armor = list( ARMOR_MELEE = ARMOR_MELEE_RESISTANT , ARMOR_BULLET = ARMOR_BALLISTIC_SMALL, @@ -48,7 +48,7 @@ /obj/item/robot_parts/robot_component/armour/exosuit/combat name = "heavy combat plating" - desc = "Plating designed to deflect incoming attacks and explosions" + desc = "Plating designed to deflect incoming attacks and explosions." armor = list( ARMOR_MELEE = ARMOR_MELEE_MAJOR, ARMOR_BULLET = ARMOR_BALLISTIC_RESISTANT, diff --git a/code/modules/mechs/equipment/medical.dm b/code/modules/mechs/equipment/medical.dm index 4aadea64370d..b9f6b5da59b6 100644 --- a/code/modules/mechs/equipment/medical.dm +++ b/code/modules/mechs/equipment/medical.dm @@ -1,6 +1,6 @@ /obj/item/mech_equipment/sleeper name = "\improper exosuit sleeper" - desc = "An exosuit-mounted sleeper designed to mantain patients stabilized on their way to medical facilities." + desc = "An exosuit-mounted sleeper designed to maintain patients stabilized on their way to medical facilities." icon_state = "mech_sleeper" restricted_hardpoints = list(HARDPOINT_BACK) restricted_software = list(MECH_SOFTWARE_MEDICAL) @@ -65,6 +65,9 @@ add_reagent_canister(null, new /obj/item/chems/chem_disp_cartridge/antitoxins()) add_reagent_canister(null, new /obj/item/chems/chem_disp_cartridge/oxy_meds()) +/obj/machinery/sleeper/mounted/DefaultTopicState() + return global.mech_topic_state + /obj/machinery/sleeper/mounted/ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = global.mech_topic_state) . = ..() diff --git a/code/modules/mechs/equipment/utility.dm b/code/modules/mechs/equipment/utility.dm index b5fb55b0461e..02bd1abf172a 100644 --- a/code/modules/mechs/equipment/utility.dm +++ b/code/modules/mechs/equipment/utility.dm @@ -572,7 +572,7 @@ /obj/item/gun/energy/plasmacutter/mounted/mech/auto charge_cost = 13 name = "rotatory plasma cutter" - desc = "A state of the art rotating, variable intensity, sequential-cascade plasma cutter. Resist the urge to aim this at your coworkers." + desc = "A state-of-the-art rotating, variable intensity, sequential-cascade plasma cutter. Resist the urge to aim this at your coworkers." max_shots = 15 firemodes = list( list(mode_name="single shot", autofire_enabled=0, burst=1, fire_delay=6, dispersion = list(0.0)), @@ -604,17 +604,14 @@ QDEL_NULL(ion_trail) return ..() -/obj/item/mech_equipment/ionjets/proc/allowSpaceMove() - if (!active) +/obj/item/mech_equipment/ionjets/proc/provides_thrust() + if(!active) return FALSE - - var/obj/item/cell/C = owner.get_cell() - if (istype(C)) - if (C.checked_use(movement_power * CELLRATE)) + var/obj/item/cell/cell = owner?.get_cell() + if(istype(cell)) + if(cell.checked_use(movement_power * CELLRATE)) return TRUE - else - deactivate() - + deactivate() return FALSE /obj/item/mech_equipment/ionjets/attack_self(mob/user) diff --git a/code/modules/mechs/interface/_interface.dm b/code/modules/mechs/interface/_interface.dm index 6395e7d10d82..e314bcf27a81 100644 --- a/code/modules/mechs/interface/_interface.dm +++ b/code/modules/mechs/interface/_interface.dm @@ -23,8 +23,7 @@ /obj/screen/zone_selector/exosuit requires_ui_style = FALSE -/mob/living/exosuit/InitializeHud() - zone_sel = new /obj/screen/zone_selector/exosuit(null, src) +/mob/living/exosuit/initialize_hud() if(!LAZYLEN(hud_elements)) var/i = 1 for(var/hardpoint in hardpoints) diff --git a/code/modules/mechs/mech.dm b/code/modules/mechs/mech.dm index 809f205d2bdc..899c1d05203f 100644 --- a/code/modules/mechs/mech.dm +++ b/code/modules/mechs/mech.dm @@ -128,7 +128,7 @@ desc = "[desc] It has been built with [english_list(component_descriptions)]." // Create HUD. - InitializeHud() + initialize_hud() // Build icon. queue_icon_update() diff --git a/code/modules/mechs/mech_interaction.dm b/code/modules/mechs/mech_interaction.dm index 1a8c959d3ffd..f67589fa7a40 100644 --- a/code/modules/mechs/mech_interaction.dm +++ b/code/modules/mechs/mech_interaction.dm @@ -134,10 +134,8 @@ // User is not necessarily the exosuit, or the same person, so update intent. if(user != src) set_intent(user.get_intent()) - if(user.zone_sel) - zone_sel.set_selected_zone(user.get_target_zone()) - else - zone_sel.set_selected_zone(BP_CHEST) + set_target_zone(user.get_target_zone()) + // You may attack the target with your exosuit FIST if you're malfunctioning. var/atom/movable/AM = A var/fail_prob = (user != src && istype(AM) && AM.loc != src) ? (user.skill_check(SKILL_MECH, HAS_PERK) ? 0: 15 ) : 0 diff --git a/code/modules/mechs/mech_movement.dm b/code/modules/mechs/mech_movement.dm index 3fc3f1c25376..790bce7f715c 100644 --- a/code/modules/mechs/mech_movement.dm +++ b/code/modules/mechs/mech_movement.dm @@ -12,7 +12,7 @@ if(!isspaceturf(loc)) playsound(src.loc, mech_step_sound, 40, 1) for(var/mob/pilot as anything in pilots) - pilot.up_hint?.update_icon() + pilot.refresh_hud_element(HUD_UP_HINT) //Inertia drift making us face direction makes exosuit flight a bit difficult, plus newtonian flight model yo /mob/living/exosuit/set_dir(ndir) @@ -20,9 +20,9 @@ return ..(dir) return ..(ndir) -/mob/living/exosuit/can_fall(var/anchor_bypass = FALSE, var/turf/location_override = src.loc) +/mob/living/exosuit/can_fall(anchor_bypass = FALSE, turf/location_override = loc) //mechs are always anchored, so falling should always ignore it - if(..(TRUE, location_override)) + if((. = ..(TRUE, location_override))) return !(can_overcome_gravity()) //For swimming @@ -116,7 +116,7 @@ // Space movement /datum/movement_handler/mob/space/exosuit/DoMove(direction, mob/mover, is_external) - if(!mob.has_gravity() && (!allow_move || (allow_move == -1 && mob.handle_spaceslipping()))) + if(!mob.has_gravity() && (last_space_move_result == SPACE_MOVE_FORBIDDEN || (last_space_move_result == SPACE_MOVE_SUPPORTED && mob.handle_spaceslipping()))) return MOVEMENT_HANDLED mob.inertia_dir = 0 @@ -125,53 +125,46 @@ return MOVEMENT_PROCEED if(!mob.has_gravity()) - allow_move = mob.Process_Spacemove(1) - if(!allow_move) + last_space_move_result = mob.is_space_movement_permitted(allow_movement = TRUE) + if(last_space_move_result == SPACE_MOVE_FORBIDDEN) return MOVEMENT_STOP return MOVEMENT_PROCEED -/mob/living/exosuit/Check_Shoegrip()//mechs are always magbooting +/mob/living/exosuit/has_non_slip_footing() return TRUE -/mob/living/exosuit/Process_Spacemove(allow_movement) - //Regardless of modules, emp prevents control +/mob/living/exosuit/has_magnetised_footing() + return TRUE - if(has_gravity() || throwing || !isturf(loc) || length(grabbed_by) || check_space_footing() || locate(/obj/structure/lattice) in range(1, get_turf(src))) +/mob/living/exosuit/is_space_movement_permitted(allow_movement = FALSE) + . = SPACE_MOVE_FORBIDDEN + anchored = FALSE + //Regardless of modules, emp prevents control + if(has_gravity() || throwing || !isturf(loc) || length(grabbed_by) || !can_slip(magboots_only = TRUE) || locate(/obj/structure/lattice) in range(1, get_turf(src))) + . = SPACE_MOVE_PERMITTED + else + var/obj/item/mech_equipment/ionjets/J = hardpoints[HARDPOINT_BACK] + if(istype(J) && ((allow_movement || J.stabilizers) && J.provides_thrust())) + . = SPACE_MOVE_PERMITTED + if(. == SPACE_MOVE_PERMITTED) anchored = TRUE - return TRUE - var/obj/item/mech_equipment/ionjets/J = hardpoints[HARDPOINT_BACK] - if(istype(J) && ((allow_movement || J.stabilizers) && J.allowSpaceMove())) - return TRUE - - anchored = FALSE - return FALSE - -/mob/living/exosuit/check_space_footing() //mechs can't push off things to move around in space, they stick to hull or float away - if(has_gravity()) - return TRUE - for(var/thing in RANGE_TURFS(src, 1)) - var/turf/T = thing - if(T.density || T.is_wall() || T.is_floor()) - return T - -/mob/living/exosuit/space_do_move(allow_move) - if(allow_move == 1) +/mob/living/exosuit/try_space_move(space_move_result, direction) + if(space_move_result == SPACE_MOVE_PERMITTED) if(emp_damage >= EMP_MOVE_DISRUPT && prob(25)) var/obj/item/mech_equipment/ionjets/J = hardpoints[HARDPOINT_BACK] - if(istype(J) && J.allowSpaceMove()) + if(istype(J) && J.provides_thrust()) to_chat(src, SPAN_WARNING("\The [J] misfire, drifting \the [src] off course!")) SetMoveCooldown(15) //2 seconds of random rando panic drifting step(src, pick(global.alldirs)) - return 0 - - . = ..() + return FALSE + return ..() /mob/living/exosuit/overmap_can_discard() for(var/atom/movable/AM in contents) if(!AM.overmap_can_discard()) return FALSE - return !pilots.len + return LAZYLEN(pilots) <= 0 /mob/living/exosuit/fall_damage() return 175 //Exosuits are big and heavy diff --git a/code/modules/mechs/mech_wreckage.dm b/code/modules/mechs/mech_wreckage.dm index eb23590ea088..3f0c08020156 100644 --- a/code/modules/mechs/mech_wreckage.dm +++ b/code/modules/mechs/mech_wreckage.dm @@ -1,6 +1,6 @@ /obj/structure/mech_wreckage name = "wreckage" - desc = "It might have some salvagable parts." + desc = "It might have some salvageable parts." density = TRUE opacity = TRUE anchored = TRUE diff --git a/code/modules/mechs/premade/_premade.dm b/code/modules/mechs/premade/_premade.dm index 77914bfc25d1..6498521605a7 100644 --- a/code/modules/mechs/premade/_premade.dm +++ b/code/modules/mechs/premade/_premade.dm @@ -40,7 +40,7 @@ /mob/living/exosuit/premade/random name = "mismatched exosuit" - desc = "It seems to have been roughly thrown together and then spraypainted a single colour." + desc = "It seems to have been roughly thrown together and then spray-painted a single colour." /mob/living/exosuit/premade/random/Initialize(mapload, var/obj/structure/heavy_vehicle_frame/source_frame, var/super_random = FALSE, var/using_boring_colours = FALSE) var/list/use_colours diff --git a/code/modules/merchant/merchant_guns.dm b/code/modules/merchant/merchant_guns.dm index e41d3d480e9d..939a570aab1f 100644 --- a/code/modules/merchant/merchant_guns.dm +++ b/code/modules/merchant/merchant_guns.dm @@ -12,5 +12,5 @@ return ..() /obj/item/gun/projectile/automatic/smg/usi - desc = "A cheap mass produced SMG. This one looks especially run-down. Uses pistol rounds." + desc = "A cheap mass-produced SMG. This one looks especially run-down. Uses pistol rounds." jam_chance = 20 \ No newline at end of file diff --git a/code/modules/mining/machinery/material_smelter.dm b/code/modules/mining/machinery/material_smelter.dm index 263e0f797c75..3d54d262330b 100644 --- a/code/modules/mining/machinery/material_smelter.dm +++ b/code/modules/mining/machinery/material_smelter.dm @@ -96,8 +96,9 @@ SSmaterials.create_object(mtype, output_turf, samt) remove_from_reagents(mtype, ramt) -/obj/machinery/material_processing/smeltery/Topic(var/user, var/list/href_list) - . = ..() +/obj/machinery/material_processing/smeltery/OnTopic(mob/user, href_list) + if((. = ..())) + return if(href_list["toggle_alloying"]) if(atom_flags & ATOM_FLAG_NO_REACT) diff --git a/code/modules/mining/machinery/material_stacker.dm b/code/modules/mining/machinery/material_stacker.dm index 4db34e69b37f..593137e6e404 100644 --- a/code/modules/mining/machinery/material_stacker.dm +++ b/code/modules/mining/machinery/material_stacker.dm @@ -44,9 +44,11 @@ qdel(S) if(emagged) - for(var/mob/living/M in input_turf) - visible_message(SPAN_DANGER("\The [src] squashes \the [src] with its stacking mechanism!")) - M.take_overall_damage(rand(10, 20), 0) + for(var/mob/living/victim in input_turf) + if(!victim.simulated) + continue + visible_message(SPAN_DANGER("\The [src] squashes \the [victim] with its stacking mechanism!")) + victim.take_overall_damage(rand(10, 20), 0) break if(output_turf) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 7621e897fc81..5836b2ed9796 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -29,7 +29,7 @@ // Flags. /obj/item/stack/flag name = "beacon" - desc = "Some deployable high-visibilty beacons." + desc = "Some deployable high-visibility beacons." singular_name = "beacon" icon_state = "folded" amount = 10 diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm index 2933c0b83fc4..574b2f558962 100644 --- a/code/modules/mob/animations.dm +++ b/code/modules/mob/animations.dm @@ -11,7 +11,7 @@ stop_floating() return - if(check_space_footing()) + if(!can_slip(magboots_only = TRUE)) stop_floating() return diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index 4986952e1305..0ae0efae9437 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -102,15 +102,6 @@ SSstatistics.report_death(src) - //TODO: Change death state to health_dead for all these icon files. This is a stop gap. - if(healths) - healths.overlays.Cut() // This is specific to humans but the relevant code is here; shouldn't mess with other mobs. - if("health7" in icon_states(healths.icon)) - healths.icon_state = "health7" - else - healths.icon_state = "health6" - log_debug("[src] ([src.type]) died but does not have a valid health7 icon_state (using health6 instead). report this error to Ccomp5950 or your nearest Developer") - timeofdeath = world.time if(mind) mind.StoreMemory("Time of death: [stationtime2text()]", /decl/memory_options/system) diff --git a/code/modules/mob/grab/grab_object.dm b/code/modules/mob/grab/grab_object.dm index 8efb2c19fb99..d5a9c3c8705c 100644 --- a/code/modules/mob/grab/grab_object.dm +++ b/code/modules/mob/grab/grab_object.dm @@ -55,8 +55,9 @@ update_icon() events_repository.register(/decl/observ/moved, affecting, src, PROC_REF(on_affecting_move)) - if(assailant.zone_sel) - events_repository.register(/decl/observ/zone_selected, assailant.zone_sel, src, PROC_REF(on_target_change)) + var/obj/screen/zone_selector/zone_selector = assailant.get_hud_element(HUD_ZONE_SELECT) + if(zone_selector) + events_repository.register(/decl/observ/zone_selected, zone_selector, src, PROC_REF(on_target_change)) var/obj/item/organ/O = get_targeted_organ() var/decl/pronouns/pronouns = assailant.get_pronouns() @@ -138,8 +139,9 @@ affecting.reset_plane_and_layer() affecting = null if(assailant) - if(assailant.zone_sel) - events_repository.unregister(/decl/observ/zone_selected, assailant.zone_sel, src) + var/obj/screen/zone_selector/zone_selector = assailant.get_hud_element(HUD_ZONE_SELECT) + if(zone_selector) + events_repository.unregister(/decl/observ/zone_selected, zone_selector, src) assailant = null . = ..() if(old_affecting) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index f4482ab7e987..a1f9db81bd94 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -451,7 +451,7 @@ /mob/proc/item_should_have_screen_presence(obj/item/item, slot) if(!slot || !istype(hud_used)) return FALSE - if(hud_used.inventory_shown) + if(hud_used.is_inventory_shown()) return TRUE var/datum/inventory_slot/inv_slot = get_inventory_slot_datum(slot) return !(inv_slot?.can_be_hidden) @@ -466,7 +466,8 @@ return /mob/proc/select_held_item_slot(var/slot) - return + SHOULD_CALL_PARENT(TRUE) + clear_available_intents() /mob/proc/get_inventory_slots() return diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm index 99fc6d544994..6f8a751bcac5 100644 --- a/code/modules/mob/language/synthetic.dm +++ b/code/modules/mob/language/synthetic.dm @@ -1,7 +1,7 @@ /decl/language/machine name = "Encoded Audio Language" shorthand = "EAL" - desc = "A efficient language of encoded tones used by synthetics." + desc = "An efficient language of encoded tones used by synthetics." speech_verb = "whistles" ask_verb = "chirps" exclaim_verb = "whistles loudly" diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 8a31af021dc1..3665f8d4c729 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -11,9 +11,11 @@ stop_aiming(no_message=1) if(istype(ai)) ai.handle_death(gibbed) + handle_regular_hud_updates() // Update health icon etc. var/decl/species/my_species = get_species() if(my_species) if(!gibbed && my_species.death_sound) playsound(loc, my_species.death_sound, 80, 1, 1) my_species.handle_death(src) + diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index 6aba0abfb624..4a7384299ea2 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -25,10 +25,6 @@ to_chat(src, "You will now speak whatever your standard default language is if you do not specify one when speaking.") default_language = language?.type -// Silicons can't neccessarily speak everything in their languages list -/mob/living/silicon/set_default_language(language) - ..() - /mob/living/verb/check_default_language() set name = "Check Default Language" set category = "IC" diff --git a/code/modules/mob/living/human/human.dm b/code/modules/mob/living/human/human.dm index 095c0b5067c8..7d6a018fa64b 100644 --- a/code/modules/mob/living/human/human.dm +++ b/code/modules/mob/living/human/human.dm @@ -37,7 +37,6 @@ LAZYCLEARLIST(smell_cooldown) - QDEL_NULL(attack_selector) QDEL_NULL(vessel) QDEL_NULL(touching) diff --git a/code/modules/mob/living/human/human_attackhand.dm b/code/modules/mob/living/human/human_attackhand.dm index d32ec613162e..490e3d5f3dae 100644 --- a/code/modules/mob/living/human/human_attackhand.dm +++ b/code/modules/mob/living/human/human_attackhand.dm @@ -409,7 +409,7 @@ var/image/radial_button = new radial_button.name = capitalize(u_attack.name) LAZYSET(choices, u_attack, radial_button) - var/decl/natural_attack/new_attack = show_radial_menu(src, (attack_selector || src), choices, radius = 42, use_labels = RADIAL_LABELS_OFFSET) + var/decl/natural_attack/new_attack = show_radial_menu(src, src, choices, radius = 42, use_labels = RADIAL_LABELS_OFFSET) if(QDELETED(src) || !istype(new_attack) || !(new_attack in get_mob_natural_attacks())) return default_attack = new_attack @@ -418,7 +418,7 @@ var/summary = default_attack.summarize() if(summary) to_chat(src, SPAN_NOTICE(summary)) - attack_selector?.update_icon() + refresh_hud_element(HUD_ATTACK) /mob/living/human/UnarmedAttack(atom/A, proximity_flag) // Hackfix for humans trying to attack someone without hands. diff --git a/code/modules/mob/living/human/human_defines.dm b/code/modules/mob/living/human/human_defines.dm index be736a3eb0d7..8108d6b8d3ee 100644 --- a/code/modules/mob/living/human/human_defines.dm +++ b/code/modules/mob/living/human/human_defines.dm @@ -14,7 +14,6 @@ var/damage_multiplier = 1 var/list/worn_underwear = list() var/list/background_info = list() - var/obj/screen/default_attack_selector/attack_selector var/icon/stand_icon = null /// Instead of new say code calling GetVoice() over and over and over, we're just going to ask this variable, which gets updated in Life() var/voice = "" diff --git a/code/modules/mob/living/human/human_internals.dm b/code/modules/mob/living/human/human_internals.dm index f77c5000586f..cbfe23386d37 100644 --- a/code/modules/mob/living/human/human_internals.dm +++ b/code/modules/mob/living/human/human_internals.dm @@ -4,5 +4,4 @@ /mob/living/human/set_internals(obj/item/tank/source, source_string) ..() internal = source - if(internals) - internals.icon_state = "internal[!!internal]" + refresh_hud_element(HUD_INTERNALS) diff --git a/code/modules/mob/living/human/human_movement.dm b/code/modules/mob/living/human/human_movement.dm index 39f3c3a28416..a3af65028c19 100644 --- a/code/modules/mob/living/human/human_movement.dm +++ b/code/modules/mob/living/human/human_movement.dm @@ -65,41 +65,19 @@ . = ..() . += species.strength -/mob/living/human/space_do_move(var/allow_move, var/direction) - if(allow_move == 1) +/mob/living/human/try_space_move(space_move_result, direction) + if(space_move_result == SPACE_MOVE_PERMITTED) var/obj/item/tank/jetpack/thrust = get_jetpack() if(thrust && thrust.on && prob(skill_fail_chance(SKILL_EVA, 10, SKILL_ADEPT))) - to_chat(src, "You fumble with [thrust] controls!") + to_chat(src, SPAN_WARNING("You fumble with the controls of \the [thrust]!")) if(prob(50)) thrust.toggle() if(prob(50)) thrust.stabilization_on = 0 SetMoveCooldown(15) //2 seconds of random rando panic drifting step(src, pick(global.alldirs)) - return 0 - - . = ..() - -/mob/living/human/slip_chance(var/prob_slip = 5) - if(!..()) - return 0 - //Check hands and mod slip - for(var/hand_slot in get_held_item_slots()) - var/datum/inventory_slot/inv_slot = get_inventory_slot_datum(hand_slot) - var/obj/item/held = inv_slot?.get_equipped_item() - if(!held) - prob_slip -= 2 - else if(held.w_class <= ITEM_SIZE_SMALL) - prob_slip -= 1 - return prob_slip - -/mob/living/human/Check_Shoegrip() - if(species.check_no_slip(src)) - return 1 - var/obj/item/shoes = get_equipped_item(slot_shoes_str) - if(shoes && (shoes.item_flags & ITEM_FLAG_NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots)) //magboots + dense_object = no floating - return 1 - return 0 + return FALSE + return ..() /mob/living/human/Move() . = ..() @@ -117,8 +95,6 @@ handle_leg_damage() species.handle_post_move(src) - if(client) - up_hint.update_icon() /mob/living/human/proc/handle_leg_damage() if(!can_feel_pain()) diff --git a/code/modules/mob/living/human/human_species.dm b/code/modules/mob/living/human/human_species.dm index c499bbb2da2e..90977e6035a7 100644 --- a/code/modules/mob/living/human/human_species.dm +++ b/code/modules/mob/living/human/human_species.dm @@ -56,7 +56,7 @@ /mob/living/human/dummy/mannequin/fully_replace_character_name(new_name, in_depth = TRUE) ..("[new_name] (mannequin)", FALSE) -/mob/living/human/dummy/mannequin/InitializeHud() +/mob/living/human/dummy/mannequin/initialize_hud() return // Mannequins don't get HUDs /mob/living/human/monkey diff --git a/code/modules/mob/living/human/human_verbs.dm b/code/modules/mob/living/human/human_verbs.dm index a43f889eb110..6eb933776124 100644 --- a/code/modules/mob/living/human/human_verbs.dm +++ b/code/modules/mob/living/human/human_verbs.dm @@ -270,7 +270,7 @@ usr.setClickCooldown(20) if(usr.stat > 0) - to_chat(usr, "You are unconcious and cannot do that!") + to_chat(usr, "You are unconscious and cannot do that!") return if(usr.restrained()) diff --git a/code/modules/mob/living/human/life.dm b/code/modules/mob/living/human/life.dm index ebc47ef12025..b8de66f65755 100644 --- a/code/modules/mob/living/human/life.dm +++ b/code/modules/mob/living/human/life.dm @@ -49,8 +49,8 @@ add_stressor(/datum/stressor/fatigued, 5 MINUTES) if(MOVING_QUICKLY(src)) set_moving_slowly() - if(last_stamina != stamina && istype(hud_used)) - hud_used.update_stamina() + if(last_stamina != stamina) + refresh_hud_element(HUD_STAMINA) /mob/living/human/proc/handle_stamina() if((world.time - last_quick_move_time) > 5 SECONDS) @@ -85,7 +85,7 @@ return pressure_adjustment_coefficient -// Calculate how much of the enviroment pressure-difference affects the human. +// Calculate how much of the environment pressure-difference affects the human. /mob/living/human/calculate_affecting_pressure(var/pressure) var/pressure_difference @@ -181,7 +181,7 @@ var/loc_temp = environment.temperature if(adjusted_pressure < species.get_warning_high_pressure(src) && adjusted_pressure > species.get_warning_low_pressure(src) && abs(loc_temp - bodytemperature) < 20 && bodytemperature < get_mob_temperature_threshold(HEAT_LEVEL_1) && bodytemperature > get_mob_temperature_threshold(COLD_LEVEL_1) && species.body_temperature) - SET_HUD_ALERT(src, /decl/hud_element/condition/pressure, 0) + SET_HUD_ALERT(src, HUD_PRESSURE, 0) return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp //Body temperature adjusts depending on surrounding atmosphere based on your thermal protection (convection) @@ -210,10 +210,10 @@ else burn_dam = HEAT_DAMAGE_LEVEL_3 take_overall_damage(burn=burn_dam, used_weapon = "High Body Temperature") - SET_HUD_ALERT_MAX(src, /decl/hud_element/condition/fire, 2) + SET_HUD_ALERT_MAX(src, HUD_FIRE, 2) else if(bodytemperature <= get_mob_temperature_threshold(COLD_LEVEL_1)) - SET_HUD_ALERT_MAX(src, /decl/hud_element/condition/fire, 1) + SET_HUD_ALERT_MAX(src, HUD_FIRE, 1) if(status_flags & GODMODE) return 1 //godmode var/burn_dam = 0 @@ -227,7 +227,7 @@ set_stasis(get_cryogenic_factor(bodytemperature), STASIS_COLD) if(!has_chemical_effect(CE_CRYO, 1)) take_overall_damage(burn=burn_dam, used_weapon = "Low Body Temperature") - SET_HUD_ALERT_MAX(src, /decl/hud_element/condition/fire, 1) + SET_HUD_ALERT_MAX(src, HUD_FIRE, 1) // Account for massive pressure differences. Done by Polymorph // Made it possible to actually have something that can protect against high pressure... Done by Errorage. Polymorph now has an axe sticking from his head for his previous hardcoded nonsense! @@ -237,13 +237,13 @@ if(adjusted_pressure >= high_pressure) var/pressure_damage = min( ( (adjusted_pressure / high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) take_overall_damage(brute=pressure_damage, used_weapon = "High Pressure") - SET_HUD_ALERT(src, /decl/hud_element/condition/pressure, 2) + SET_HUD_ALERT(src, HUD_PRESSURE, 2) else if(adjusted_pressure >= species.get_warning_high_pressure(src)) - SET_HUD_ALERT(src, /decl/hud_element/condition/pressure, 1) + SET_HUD_ALERT(src, HUD_PRESSURE, 1) else if(adjusted_pressure >= species.get_warning_low_pressure(src)) - SET_HUD_ALERT(src, /decl/hud_element/condition/pressure, 0) + SET_HUD_ALERT(src, HUD_PRESSURE, 0) else if(adjusted_pressure >= species.get_hazard_low_pressure(src)) - SET_HUD_ALERT(src, /decl/hud_element/condition/pressure, -1) + SET_HUD_ALERT(src, HUD_PRESSURE, -1) else var/list/obj/item/organ/external/parts = get_damageable_organs() for(var/obj/item/organ/external/O in parts) @@ -253,7 +253,7 @@ O.take_external_damage(brute = LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") if(getOxyLossPercent() < 55) // 11 OxyLoss per 4 ticks when wearing internals; unconsciousness in 16 ticks, roughly half a minute take_damage(4) // 16 OxyLoss per 4 ticks when no internals present; unconsciousness in 13 ticks, OXY, roughly twenty seconds - SET_HUD_ALERT(src, /decl/hud_element/condition/pressure, -2) + SET_HUD_ALERT(src, HUD_PRESSURE, -2) return @@ -464,130 +464,6 @@ else clear_fullscreen("brute") - if(healths) - - var/mutable_appearance/healths_ma = new(healths) - healths_ma.icon_state = "blank" - healths_ma.overlays = null - - if(has_chemical_effect(CE_PAINKILLER, 100)) - healths_ma.icon_state = "health_numb" - else - // Generate a by-limb health display. - var/no_damage = 1 - var/trauma_val = 0 // Used in calculating softcrit/hardcrit indicators. - if(can_feel_pain()) - trauma_val = max(shock_stage,get_shock())/(species.total_health-100) - // Collect and apply the images all at once to avoid appearance churn. - var/list/health_images = list() - for(var/obj/item/organ/external/E in get_external_organs()) - if(no_damage && (E.brute_dam || E.burn_dam)) - no_damage = 0 - var/damage_image = E.get_damage_hud_image() - if(damage_image) - health_images += damage_image - - - // Apply a fire overlay if we're burning. - var/crit_markers = get_ui_icon(client?.prefs?.UI_style, UI_ICON_CRIT_MARKER) - if(is_on_fire()) - health_images += image(crit_markers, "burning") - - // Show a general pain/crit indicator if needed. - if(is_asystole()) - health_images += image(crit_markers, "hardcrit") - else if(trauma_val) - if(can_feel_pain()) - if(trauma_val > 0.7) - health_images += image(crit_markers, "softcrit") - if(trauma_val >= 1) - health_images += image(crit_markers, "hardcrit") - else if(no_damage) - health_images += image(crit_markers, "fullhealth") - healths_ma.overlays += health_images - healths.appearance = healths_ma - - if(nutrition_icon) - switch(nutrition) - if(450 to INFINITY) nutrition_icon.icon_state = "nutrition0" - if(350 to 450) nutrition_icon.icon_state = "nutrition1" - if(250 to 350) nutrition_icon.icon_state = "nutrition2" - if(150 to 250) nutrition_icon.icon_state = "nutrition3" - else nutrition_icon.icon_state = "nutrition4" - - if(hydration_icon) - switch(hydration) - if(450 to INFINITY) hydration_icon.icon_state = "hydration0" - if(350 to 450) hydration_icon.icon_state = "hydration1" - if(250 to 350) hydration_icon.icon_state = "hydration2" - if(150 to 250) hydration_icon.icon_state = "hydration3" - else hydration_icon.icon_state = "hydration4" - - if(isSynthetic()) - var/obj/item/organ/internal/cell/C = get_organ(BP_CELL, /obj/item/organ/internal/cell) - if(C) - var/chargeNum = clamp(ceil(C.percent()/25), 0, 4) //0-100 maps to 0-4, but give it a paranoid clamp just in case. - cells.icon_state = "charge[chargeNum]" - else - cells.icon_state = "charge-empty" - - if(pressure) - pressure.icon_state = "pressure[GET_HUD_ALERT(src, /decl/hud_element/condition/pressure)]" - if(toxin) - toxin.icon_state = "tox[GET_HUD_ALERT(src, /decl/hud_element/condition/toxins)]" - if(oxygen) - oxygen.icon_state = "oxy[GET_HUD_ALERT(src, /decl/hud_element/condition/oxygen)]" - if(fire) - fire.icon_state = "fire[GET_HUD_ALERT(src, /decl/hud_element/condition/fire)]" - - if(bodytemp) - if (!species) - switch(bodytemperature) //310.055 optimal body temp - if(370 to INFINITY) bodytemp.icon_state = "temp4" - if(350 to 370) bodytemp.icon_state = "temp3" - if(335 to 350) bodytemp.icon_state = "temp2" - if(320 to 335) bodytemp.icon_state = "temp1" - if(300 to 320) bodytemp.icon_state = "temp0" - if(295 to 300) bodytemp.icon_state = "temp-1" - if(280 to 295) bodytemp.icon_state = "temp-2" - if(260 to 280) bodytemp.icon_state = "temp-3" - else bodytemp.icon_state = "temp-4" - else - var/heat_1 = get_mob_temperature_threshold(HEAT_LEVEL_1) - var/cold_1 = get_mob_temperature_threshold(COLD_LEVEL_1) - //TODO: precalculate all of this stuff when the species datum is created - var/base_temperature = species.body_temperature - if(base_temperature == null) //some species don't have a set metabolic temperature - base_temperature = (heat_1 + cold_1)/2 - - var/temp_step - if (bodytemperature >= base_temperature) - temp_step = (heat_1 - base_temperature)/4 - - if (bodytemperature >= heat_1) - bodytemp.icon_state = "temp4" - else if (bodytemperature >= base_temperature + temp_step*3) - bodytemp.icon_state = "temp3" - else if (bodytemperature >= base_temperature + temp_step*2) - bodytemp.icon_state = "temp2" - else if (bodytemperature >= base_temperature + temp_step*1) - bodytemp.icon_state = "temp1" - else - bodytemp.icon_state = "temp0" - - else if (bodytemperature < base_temperature) - temp_step = (base_temperature - cold_1)/4 - - if (bodytemperature <= cold_1) - bodytemp.icon_state = "temp-4" - else if (bodytemperature <= base_temperature - temp_step*3) - bodytemp.icon_state = "temp-3" - else if (bodytemperature <= base_temperature - temp_step*2) - bodytemp.icon_state = "temp-2" - else if (bodytemperature <= base_temperature - temp_step*1) - bodytemp.icon_state = "temp-1" - else - bodytemp.icon_state = "temp0" return 1 /mob/living/human/handle_random_events() diff --git a/code/modules/mob/living/human/update_icons.dm b/code/modules/mob/living/human/update_icons.dm index eafc3556942a..ff824d2389b8 100644 --- a/code/modules/mob/living/human/update_icons.dm +++ b/code/modules/mob/living/human/update_icons.dm @@ -356,5 +356,5 @@ Please contact me on #coderbus IRC. ~Carn x set_current_mob_overlay(HO_CONDITION_LAYER, condition_overlays, update_icons) /mob/living/human/hud_reset(full_reset = FALSE) - if((. = ..()) && internals && internal) - internals.icon_state = "internal1" + if((. = ..())) + refresh_hud_element(HUD_INTERNALS) diff --git a/code/modules/mob/living/inventory.dm b/code/modules/mob/living/inventory.dm index f0ab7bdc92eb..cbfd9853c9cc 100644 --- a/code/modules/mob/living/inventory.dm +++ b/code/modules/mob/living/inventory.dm @@ -58,12 +58,12 @@ queue_hand_rebuild() /mob/living/select_held_item_slot(var/slot) + . = ..() var/last_slot = get_active_held_item_slot() if(slot != last_slot && (slot in get_held_item_slots())) _held_item_slot_selected = slot if(istype(hud_used)) - for(var/atom/hand as anything in hud_used.hand_hud_objects) - hand.update_icon() + hud_used.update_hand_elements() var/obj/item/I = get_active_held_item() if(istype(I)) I.on_active_hand() diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 05d2002770b4..7c8dd1bf7c89 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -448,6 +448,10 @@ SHOULD_CALL_PARENT(TRUE) if(!should_do_hud_updates()) return FALSE + + if(istype(hud_used)) + hud_used.handle_life_hud_update() + handle_hud_icons() handle_vision() handle_low_light_vision() @@ -554,12 +558,9 @@ if(prob(current_size*5) && hand.w_class >= (11-current_size)/2 && try_unequip(hand)) to_chat(src, SPAN_WARNING("\The [S] pulls \the [hand] from your grip!")) hand.singularity_pull(S, current_size) - var/obj/item/shoes = get_equipped_item(slot_shoes_str) - if(!current_posture.prone && !(shoes?.item_flags & ITEM_FLAG_NOSLIP)) - var/decl/species/my_species = get_species() - if(!my_species?.check_no_slip(src) && prob(current_size*5)) - to_chat(src, SPAN_DANGER("A strong gravitational force slams you to the ground!")) - SET_STATUS_MAX(src, STAT_WEAK, current_size) + if(prob(current_size*5) && can_slip()) + to_chat(src, SPAN_DANGER("A strong gravitational force slams you to the ground!")) + SET_STATUS_MAX(src, STAT_WEAK, current_size) apply_damage(current_size * 3, IRRADIATE, damage_flags = DAM_DISPERSED) return ..() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index dcbc0d2917ea..44e8324fcc03 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -351,7 +351,7 @@ default behaviour is: switch_from_dead_to_living_mob_list() timeofdeath = 0 - // restore us to conciousness + // restore us to consciousness set_stat(CONSCIOUS) // make the icons look correct @@ -521,6 +521,7 @@ default behaviour is: var/turf/old_loc = loc . = ..() if(.) + refresh_hud_element(HUD_UP_HINT) handle_grabs_after_move(old_loc, Dir) if(active_storage && !active_storage.can_view(src)) active_storage.close(src) @@ -646,7 +647,7 @@ default behaviour is: set category = "IC" // No posture, no adjustment. - if(length(get_available_postures()) <= 1 || incapacitated(INCAPACITATION_KNOCKOUT) || !canClick()) + if(length(get_available_postures()) <= 1 || incapacitated(INCAPACITATION_KNOCKDOWN) || !canClick()) return var/list/selectable_postures = get_selectable_postures() @@ -667,18 +668,18 @@ default behaviour is: selected_posture = selectable_postures[1] else selected_posture = input(src, "Which posture do you wish to adopt?", "Change Posture", current_posture) as null|anything in selectable_postures - if(!selected_posture || length(get_available_postures()) <= 1 || incapacitated(INCAPACITATION_KNOCKOUT) || !canClick()) + if(!selected_posture || length(get_available_postures()) <= 1 || incapacitated(INCAPACITATION_KNOCKDOWN) || !canClick()) return if(current_posture == selected_posture || !(selected_posture in get_selectable_postures())) return setClickCooldown(3) - to_chat(src, SPAN_NOTICE("You are now [selected_posture.posture_change_message].")) if(current_posture.prone && !selected_posture.prone) - if(!do_after(src, 2 SECONDS, src, incapacitation_flags = ~INCAPACITATION_FORCELYING)) + if(!do_after(src, 2 SECONDS, src, incapacitation_flags = INCAPACITATION_KNOCKDOWN)) return if(current_posture == selected_posture || !(selected_posture in get_selectable_postures())) return + to_chat(src, SPAN_NOTICE("You are now [selected_posture.posture_change_message].")) set_posture(selected_posture) //called when the mob receives a bright flash @@ -699,27 +700,13 @@ default behaviour is: . = ..() || is_floating /mob/living/proc/slip(slipped_on, stun_duration = 8) - - if(immune_to_floor_hazards()) - return FALSE - - var/decl/species/my_species = get_species() - if(my_species?.check_no_slip(src)) - return FALSE - - var/obj/item/shoes = get_equipped_item(slot_shoes_str) - if(shoes && (shoes.item_flags & ITEM_FLAG_NOSLIP)) - return FALSE - - if(has_gravity() && !buckled && !current_posture?.prone) + if(can_slip()) to_chat(src, SPAN_DANGER("You slipped on [slipped_on]!")) playsound(loc, 'sound/misc/slip.ogg', 50, 1, -3) SET_STATUS_MAX(src, STAT_WEAK, stun_duration) return TRUE - return FALSE - /mob/living/human/canUnEquip(obj/item/I) . = ..() && !(I in get_organs()) @@ -1084,7 +1071,7 @@ default behaviour is: if(user.mob_size >= exosuit.body.min_pilot_size && user.mob_size <= exosuit.body.max_pilot_size) exosuit.enter(src) else - to_chat(user, SPAN_WARNING("You cannot pilot a exosuit of this size.")) + to_chat(user, SPAN_WARNING("You cannot pilot an exosuit of this size.")) return TRUE . = ..() @@ -1134,20 +1121,21 @@ default behaviour is: if(A.CheckRemoval(src)) A.Remove(src) for(var/obj/item/I in src) - if(I.action_button_name) - if(!I.action) - I.action = new I.default_action_type - I.action.name = I.action_button_name - I.action.desc = I.action_button_desc - I.action.SetTarget(I) - I.action.Grant(src) + if(QDELETED(I)) + continue + if(!I.action_button_name) + continue + I.action ||= new I.default_action_type + I.action.name = I.action_button_name + I.action.desc = I.action_button_desc + I.action.SetTarget(I) + I.action.Grant(src) return /mob/living/update_action_buttons() if(!istype(hud_used) || !client) return - - if(hud_used.hud_shown != 1) //Hud toggled to minimal + if(!hud_used.is_hud_shown()) //Hud toggled to minimal return client.screen -= hud_used.hide_actions_toggle @@ -1181,13 +1169,14 @@ default behaviour is: client.screen += hud_used.hide_actions_toggle /mob/living/handle_fall_effect(var/turf/landing) - ..() - if(istype(landing) && !landing.is_open()) - apply_fall_damage(landing) - if(client) - var/area/A = get_area(landing) - if(A) - A.alert_on_fall(src) + if(!(. = ..()) || !istype(landing)) + return + apply_fall_damage(landing) + if(!client) + return + var/area/landing_area = get_area(landing) + if(landing_area) + landing_area.alert_on_fall(src) /mob/living/proc/apply_fall_damage(var/turf/landing) take_damage(rand(max(1, ceil(mob_size * 0.33)), max(1, ceil(mob_size * 0.66))) * get_fall_height()) @@ -2025,6 +2014,10 @@ default behaviour is: update_equipment_overlay(slot_shoes_str) return TRUE +/mob/living/get_cell() + var/obj/item/organ/internal/cell/cell = get_organ(BP_CELL, /obj/item/organ/internal/cell) + return istype(cell) ? cell.cell : null + /mob/living/verb/pull_punches() set name = "Switch Stance" set desc = "Try not to hurt them." @@ -2032,3 +2025,4 @@ default behaviour is: if(!incapacitated()) pulling_punches = !pulling_punches to_chat(src, SPAN_NOTICE("You are now [pulling_punches ? "pulling your punches" : "not pulling your punches"].")) + diff --git a/code/modules/mob/living/living_breath.dm b/code/modules/mob/living/living_breath.dm index 01d9ecc93b4c..164a8503215e 100644 --- a/code/modules/mob/living/living_breath.dm +++ b/code/modules/mob/living/living_breath.dm @@ -106,8 +106,7 @@ else check_for_airtight_internals() var/obj/item/tank/new_internals = get_internals() - if(internals && old_internals != new_internals) - internals.icon_state = "internal[!!new_internals]" + refresh_hud_element(HUD_INTERNALS) if(istype(new_internals)) return new_internals.remove_air_volume(volume_needed) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index fc07b274edcf..f6b7d220a18d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -244,7 +244,7 @@ if(anchored || buckled) return 0 . = (AM.get_mass()*TT.speed)/(get_mass()*min(AM.throw_speed,2)) - if(has_gravity() || check_space_footing()) + if(!can_slip(magboots_only = TRUE)) . *= 0.5 /mob/living/proc/try_embed_in_mob(mob/living/user, obj/O, def_zone, embed_damage = 0, dtype = BRUTE, datum/wound/supplied_wound, obj/item/organ/external/affecting, direction) diff --git a/code/modules/mob/living/living_maneuvers.dm b/code/modules/mob/living/living_maneuvers.dm index 2afaa16ad4c0..8e925ee5cce8 100644 --- a/code/modules/mob/living/living_maneuvers.dm +++ b/code/modules/mob/living/living_maneuvers.dm @@ -25,13 +25,13 @@ forceMove(get_turf(origin)) prepared_maneuver.perform(src, check, get_acrobatics_multiplier(prepared_maneuver), reflexively = TRUE) prepared_maneuver = null - maneuver_icon?.update_icon() + refresh_hud_element(HUD_MANEUVER) /mob/living/proc/try_maneuver(var/atom/target) if(prepared_maneuver && (isturf(target) || isturf(target.loc))) // Avoid trying to jump at your backpack contents. prepared_maneuver.perform(src, get_turf(target), get_acrobatics_multiplier(prepared_maneuver)) prepared_maneuver = null - maneuver_icon?.update_icon() + refresh_hud_element(HUD_MANEUVER) return TRUE return FALSE @@ -63,14 +63,14 @@ else prepared_maneuver = null to_chat(src, SPAN_NOTICE("You are no longer preparing to perform a maneuver.")) - maneuver_icon?.update_icon() + refresh_hud_element(HUD_MANEUVER) /mob/living/proc/perform_maneuver(var/maneuver, var/atom/target) var/decl/maneuver/performing_maneuver = ispath(maneuver) ? GET_DECL(maneuver) : maneuver if(istype(performing_maneuver)) . = performing_maneuver.perform(src, target, get_acrobatics_multiplier(performing_maneuver)) prepared_maneuver = null - maneuver_icon?.update_icon() + refresh_hud_element(HUD_MANEUVER) /mob/living/proc/get_acrobatics_multiplier(var/decl/maneuver/attempting_maneuver) return 1 diff --git a/code/modules/mob/living/living_throw.dm b/code/modules/mob/living/living_throw.dm index b65ec9889e96..9fc36c7b2aa5 100644 --- a/code/modules/mob/living/living_throw.dm +++ b/code/modules/mob/living/living_throw.dm @@ -90,7 +90,7 @@ //actually throw it! visible_message(SPAN_WARNING(message), range = min(itemsize*2,world.view)) lastarea = lastarea || get_area(loc) - if(!check_space_footing() && prob((itemsize * itemsize * 10) * MOB_SIZE_MEDIUM/mob_size)) + if(can_slip(magboots_only = TRUE) && prob((itemsize * itemsize * 10) * MOB_SIZE_MEDIUM/mob_size)) var/direction = get_dir(target, src) step(src, direction) space_drift(direction) diff --git a/code/modules/mob/living/silicon/ai/ai_radio.dm b/code/modules/mob/living/silicon/ai/ai_radio.dm index c9a32ee9cd33..7a195abc9bac 100644 --- a/code/modules/mob/living/silicon/ai/ai_radio.dm +++ b/code/modules/mob/living/silicon/ai/ai_radio.dm @@ -2,7 +2,7 @@ name = "\improper AI subspace transceiver" desc = "Integrated AI radio transceiver." encryption_keys = list(/obj/item/encryptionkey/heads/ai_integrated) - var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via inteliCard menu. + var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intelliCard menu. /obj/item/radio/headset/heads/ai_integrated/get_accessible_channel_descriptions(mob/user) . = ..() diff --git a/code/modules/mob/living/silicon/ai/power.dm b/code/modules/mob/living/silicon/ai/power.dm index 9d9206348df5..1785b37ecb5c 100644 --- a/code/modules/mob/living/silicon/ai/power.dm +++ b/code/modules/mob/living/silicon/ai/power.dm @@ -85,7 +85,7 @@ -// Handles all necessary power checks: Area power, inteliCard and Malf AI APU power and manual override. +// Handles all necessary power checks: Area power, intelliCard and Malf AI APU power and manual override. /mob/living/silicon/ai/proc/has_power(var/respect_override = 1) if(psupply && !(psupply.stat & NOPOWER)) return 1 @@ -214,7 +214,7 @@ update_use_power(get_power_state()) /obj/machinery/ai_powersupply/proc/get_power_state() - // Dead, powered by APU, admin power, or inside an item (inteliCard/IIS). No power usage. + // Dead, powered by APU, admin power, or inside an item (intelliCard/IIS). No power usage. if(!powered_ai.stat == DEAD || powered_ai.admin_powered || istype(powered_ai.loc, /obj/item/)) return 0 // Normal power usage. diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index 606dbce9d2b0..689e7211132a 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -57,7 +57,7 @@ user.show_message(text("\t []: [][] - [] - [] - []", \ capitalize(org.name), \ (org.installed == -1) ? "DESTROYED " :"",\ - (org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \ + (org.burn_damage > 0) ? "[org.burn_damage]" :0, \ (org.brute_damage > 0) ? "[org.brute_damage]" :0, \ (org.toggled) ? "Toggled ON" : "Toggled OFF",\ (org.powered) ? "Power ON" : "Power OFF"),1) diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index bab525146e14..137c8c9fd44d 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -1,21 +1,23 @@ // TODO: remove the robot.central_processor and robot.cell variables and completely rely on the robot component system - -/datum/robot_component/var/name -/datum/robot_component/var/installed = 0 -/datum/robot_component/var/powered = 0 -/datum/robot_component/var/toggled = 1 -/datum/robot_component/var/brute_damage = 0 -/datum/robot_component/var/electronics_damage = 0 -/datum/robot_component/var/idle_usage = 0 // Amount of power used every MC tick. In joules. -/datum/robot_component/var/active_usage = 0 // Amount of power used for every action. Actions are module-specific. Actuator for each tile moved, etc. -/datum/robot_component/var/max_damage = 30 // HP of this component. -/datum/robot_component/var/mob/living/silicon/robot/owner - -// The actual device object that has to be installed for this. -/datum/robot_component/var/external_type = null - -// The wrapped device(e.g. radio), only set if external_type isn't null -/datum/robot_component/var/obj/item/wrapped = null +/datum/robot_component + var/name + /// Installation status; not a bool, may be -1, 0 or 1. + var/installed = 0 + var/powered = FALSE + var/toggled = TRUE + var/brute_damage = 0 + var/burn_damage = 0 + /// Amount of power used every MC tick. In joules. + var/idle_usage = 0 + /// Amount of power used for every action. Actions are module-specific. Actuator for each tile moved, etc. + var/active_usage = 0 + /// HP of this component. + var/max_damage = 30 + var/mob/living/silicon/robot/owner + /// The actual device object that has to be installed for this. + var/external_type + /// The wrapped device(e.g. radio), only set if external_type isn't null + var/obj/item/wrapped /datum/robot_component/New(mob/living/silicon/robot/R) src.owner = R @@ -56,9 +58,9 @@ if(installed != 1) return brute_damage += brute - electronics_damage += electronics + burn_damage += electronics - if(brute_damage + electronics_damage >= max_damage) destroy() + if(brute_damage + burn_damage >= max_damage) destroy() /datum/robot_component/proc/heal_damage(brute, electronics) if(installed != 1) @@ -66,10 +68,10 @@ return 0 brute_damage = max(0, brute_damage - brute) - electronics_damage = max(0, electronics_damage - electronics) + burn_damage = max(0, burn_damage - electronics) /datum/robot_component/proc/is_powered() - return (installed == 1) && (brute_damage + electronics_damage < max_damage) && (!idle_usage || powered) + return (installed == 1) && (brute_damage + burn_damage < max_damage) && (!idle_usage || powered) /datum/robot_component/proc/update_power_state() if(toggled == 0) @@ -111,7 +113,7 @@ //A fixed and much cleaner implementation of /tg/'s special snowflake code. /datum/robot_component/actuator/is_powered() - return (installed == 1) && (brute_damage + electronics_damage < max_damage) + return (installed == 1) && (brute_damage + burn_damage < max_damage) // POWER CELL diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 90516b063816..e01e0ad52802 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -241,10 +241,6 @@ if(amount && should_be_dead() && stat == DEAD && !QDELETED(src)) gib() -//DRONE MOVEMENT. -/mob/living/silicon/robot/drone/slip_chance(var/prob_slip) - return 0 - //CONSOLE PROCS /mob/living/silicon/robot/drone/proc/law_resync() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 41ef351a6119..7c6bfc00f010 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -37,79 +37,71 @@ return -/obj/machinery/computer/drone_control/Topic(href, href_list) +/obj/machinery/computer/drone_control/OnTopic(mob/user, href_list) if((. = ..())) return - if(!allowed(usr)) - to_chat(usr, "Access denied.") - return - - if ((usr.contents.Find(src) || (in_range(src, usr) && isturf(src.loc))) || (issilicon(usr))) - usr.set_machine(src) + if(!allowed(user)) + to_chat(user, "Access denied.") + return TOPIC_HANDLED if (href_list["setarea"]) - //Probably should consider using another list, but this one will do. var/t_area = input("Select the area to ping.", "Set Target Area", null) as null|anything in global.tagger_locations - if(!t_area) - return - + return TOPIC_HANDLED drone_call_area = t_area - to_chat(usr, "You set the area selector to [drone_call_area].") + to_chat(user, "You set the area selector to [drone_call_area].") + . = TOPIC_REFRESH else if (href_list["ping"]) - - to_chat(usr, "You issue a maintenance request for all active drones, highlighting [drone_call_area].") + to_chat(user, "You issue a maintenance request for all active drones, highlighting [drone_call_area].") for(var/mob/living/silicon/robot/drone/D in global.silicon_mob_list) if(D.client && D.stat == CONSCIOUS) to_chat(D, "-- Maintenance drone presence requested in: [drone_call_area].") + . = TOPIC_REFRESH else if (href_list["resync"]) - var/mob/living/silicon/robot/drone/D = locate(href_list["resync"]) - + . = TOPIC_HANDLED if(D.stat != DEAD) - to_chat(usr, "You issue a law synchronization directive for the drone.") + to_chat(user, "You issue a law synchronization directive for the drone.") D.law_resync() + . = TOPIC_REFRESH else if (href_list["shutdown"]) - var/mob/living/silicon/robot/drone/D = locate(href_list["shutdown"]) - + . = TOPIC_HANDLED if(D.stat != DEAD) - to_chat(usr, "You issue a kill command for the unfortunate drone.") - message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.") - log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.") + to_chat(user, "You issue a kill command for the unfortunate drone.") + message_admins("[key_name_admin(user)] issued kill order for drone [key_name_admin(D)] from control console.") + log_game("[key_name(user)] issued kill order for [key_name(src)] from control console.") D.shut_down() + . = TOPIC_REFRESH else if (href_list["search_fab"]) if(dronefab) - return + return TOPIC_HANDLED for(var/obj/machinery/drone_fabricator/fab in oview(3,src)) - if(fab.stat & NOPOWER) continue - dronefab = fab - to_chat(usr, "Drone fabricator located.") - return + to_chat(user, "Drone fabricator located.") + return TOPIC_REFRESH - to_chat(usr, "Unable to locate drone fabricator.") + to_chat(user, "Unable to locate drone fabricator.") + . = TOPIC_HANDLED else if (href_list["toggle_fab"]) - if(!dronefab) - return + return TOPIC_HANDLED if(get_dist(src,dronefab) > 3) dronefab = null - to_chat(usr, "Unable to locate drone fabricator.") - return + to_chat(user, "Unable to locate drone fabricator.") + return TOPIC_REFRESH dronefab.produce_drones = !dronefab.produce_drones - to_chat(usr, "You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.") - - src.updateUsrDialog() + to_chat(user, "You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.") + . = TOPIC_REFRESH diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm index c547137d1250..e4d40ac20dfe 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm @@ -21,7 +21,7 @@ if(istype(L)) return L.broadcast(src,trim(copytext(message,2))) - //Must be concious to speak + //Must be conscious to speak if (stat) return 0 diff --git a/code/modules/mob/living/silicon/robot/flying/flying.dm b/code/modules/mob/living/silicon/robot/flying/flying.dm index 42d6b717d938..7733ed989851 100644 --- a/code/modules/mob/living/silicon/robot/flying/flying.dm +++ b/code/modules/mob/living/silicon/robot/flying/flying.dm @@ -1,5 +1,5 @@ /mob/living/silicon/robot/flying - desc = "A utility robot with an anti-gravity hover unit and a lightweight frame." + desc = "A utility robot with an antigravity hover unit and a lightweight frame." icon = 'icons/mob/robots/flying/flying.dmi' module_category = ROBOT_MODULE_TYPE_FLYING dismantle_type = /obj/item/robot_parts/robot_suit/flyer @@ -43,11 +43,11 @@ if(. && !gibbed) stop_flying() -/mob/living/silicon/robot/flying/Process_Spacemove() - return (pass_flags & PASS_FLAG_TABLE) || ..() +/mob/living/silicon/robot/flying/is_space_movement_permitted(allow_movement = FALSE) + return (pass_flags & PASS_FLAG_TABLE) ? SPACE_MOVE_PERMITTED : ..() -/mob/living/silicon/robot/flying/can_fall(var/anchor_bypass = FALSE, var/turf/location_override = loc) - return !Process_Spacemove() +/mob/living/silicon/robot/flying/can_fall(anchor_bypass = FALSE, turf/location_override = loc) + return is_space_movement_permitted() == SPACE_MOVE_FORBIDDEN /mob/living/silicon/robot/flying/can_overcome_gravity() - return Process_Spacemove() + return is_space_movement_permitted() != SPACE_MOVE_FORBIDDEN diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 4e2bc0fe3cf5..ea41b012d303 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -100,89 +100,6 @@ if (MED_HUD) process_med_hud(src,0,network = get_computer_network()) - if(length(get_active_grabs())) - ui_drop_grab.set_invisibility(INVISIBILITY_NONE) - ui_drop_grab.alpha = 255 - else - ui_drop_grab.set_invisibility(INVISIBILITY_ABSTRACT) - ui_drop_grab.alpha = 0 - - if (src.healths) - if (src.stat != DEAD) - if(isdrone(src)) - switch(current_health) - if(35 to INFINITY) - src.healths.icon_state = "health0" - if(25 to 34) - src.healths.icon_state = "health1" - if(15 to 24) - src.healths.icon_state = "health2" - if(5 to 14) - src.healths.icon_state = "health3" - if(0 to 4) - src.healths.icon_state = "health4" - if(-35 to 0) - src.healths.icon_state = "health5" - else - src.healths.icon_state = "health6" - else - switch(current_health) - if(200 to INFINITY) - src.healths.icon_state = "health0" - if(150 to 200) - src.healths.icon_state = "health1" - if(100 to 150) - src.healths.icon_state = "health2" - if(50 to 100) - src.healths.icon_state = "health3" - if(0 to 50) - src.healths.icon_state = "health4" - else - if(current_health > get_config_value(/decl/config/num/health_health_threshold_dead)) - src.healths.icon_state = "health5" - else - src.healths.icon_state = "health6" - else - src.healths.icon_state = "health7" - - if (src.cells) - if (src.cell) - var/chargeNum = clamp(ceil(cell.percent()/25), 0, 4) //0-100 maps to 0-4, but give it a paranoid clamp just in case. - src.cells.icon_state = "charge[chargeNum]" - else - src.cells.icon_state = "charge-empty" - - if(bodytemp) - switch(src.bodytemperature) //310.055 optimal body temp - if(335 to INFINITY) - src.bodytemp.icon_state = "temp2" - if(320 to 335) - src.bodytemp.icon_state = "temp1" - if(300 to 320) - src.bodytemp.icon_state = "temp0" - if(260 to 300) - src.bodytemp.icon_state = "temp-1" - else - src.bodytemp.icon_state = "temp-2" - - var/datum/gas_mixture/environment = loc?.return_air() - if(fire && environment) - switch(environment.temperature) - if(-INFINITY to T100C) - src.fire.icon_state = "fire0" - else - src.fire.icon_state = "fire1" - if(oxygen && environment) - var/decl/species/species = all_species[global.using_map.default_species] - if(!species.breath_type || environment.gas[species.breath_type] >= species.breath_pressure) - src.oxygen.icon_state = "oxy0" - for(var/gas in species.poison_types) - if(environment.gas[gas]) - src.oxygen.icon_state = "oxy1" - break - else - src.oxygen.icon_state = "oxy1" - if(stat != DEAD) if(is_blind()) overlay_fullscreen("blind", /obj/screen/fullscreen/blind) diff --git a/code/modules/mob/living/silicon/robot/modules/_module.dm b/code/modules/mob/living/silicon/robot/modules/_module.dm index ee0046ef2ae5..7bd571e00d42 100644 --- a/code/modules/mob/living/silicon/robot/modules/_module.dm +++ b/code/modules/mob/living/silicon/robot/modules/_module.dm @@ -16,7 +16,10 @@ ) var/list/module_sprites = list() var/can_be_pushed = 1 - var/no_slip = 0 + // Equivalent to shoes with ITEM_FLAG_NOSLIP + var/has_nonslip_feet = FALSE + // Equivalent to shoes with ITEM_FLAG_MAGNETIZED + var/has_magnetic_feet = FALSE var/obj/item/borg/upgrade/jetpack = null var/list/subsystems = list() var/list/obj/item/borg/upgrade/supported_upgrades = list() diff --git a/code/modules/mob/living/silicon/robot/modules/module_engineering.dm b/code/modules/mob/living/silicon/robot/modules/module_engineering.dm index d0b1f9456e3d..fb3406b346d2 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_engineering.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_engineering.dm @@ -19,7 +19,8 @@ "Landmate" = 'icons/mob/robots/robot_engineer.dmi', "Landmate - Treaded" = 'icons/mob/robots/robot_engineer_treaded.dmi' ) - no_slip = 1 + has_nonslip_feet = TRUE + has_magnetic_feet = TRUE equipment = list( /obj/item/flash, /obj/item/borg/sight/meson, diff --git a/code/modules/mob/living/silicon/robot/modules/module_illegal.dm b/code/modules/mob/living/silicon/robot/modules/module_illegal.dm index 5ca5cfe98db7..e899ec1a2221 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_illegal.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_illegal.dm @@ -27,7 +27,7 @@ equipment += id /obj/item/robot_module/syndicate/finalize_equipment(var/mob/living/silicon/robot/R) - R.internals = locate(/obj/item/tank/jetpack/carbondioxide) in equipment + R.set_internals(locate(/obj/item/tank/jetpack/carbondioxide) in equipment) . = ..() /obj/item/robot_module/syndicate/Destroy() diff --git a/code/modules/mob/living/silicon/robot/modules/module_maintenance_drone.dm b/code/modules/mob/living/silicon/robot/modules/module_maintenance_drone.dm index b9456bc2050c..6d683809f001 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_maintenance_drone.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_maintenance_drone.dm @@ -1,8 +1,9 @@ /obj/item/robot_module/drone name = "drone module" - hide_on_manifest = 1 - no_slip = 1 - camera_channels = list( + hide_on_manifest = 1 + has_nonslip_feet = TRUE + has_magnetic_feet = TRUE + camera_channels = list( CAMERA_CAMERA_CHANNEL_ENGINEERING ) languages = list( @@ -60,7 +61,7 @@ /obj/item/robot_module/drone/finalize_equipment(var/mob/living/silicon/robot/R) . = ..() if(istype(R)) - R.internals = locate(/obj/item/tank/jetpack/carbondioxide) in equipment + R.set_internals(locate(/obj/item/tank/jetpack/carbondioxide) in equipment) /obj/item/robot_module/drone/finalize_emag() . = ..() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e3572786bbaf..2a481872bb61 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -35,13 +35,13 @@ /// If icon selection has been completed yet var/icon_selected = TRUE /// Hud stuff - var/obj/screen/robot_module/one/inv1 - var/obj/screen/robot_module/two/inv2 - var/obj/screen/robot_module/three/inv3 - var/obj/screen/robot_drop_grab/ui_drop_grab + var/obj/screen/robot/module/one/inv1 + var/obj/screen/robot/module/two/inv2 + var/obj/screen/robot/module/three/inv3 + /// Used to determine whether they have the module menu shown or not var/shown_robot_modules = 0 - var/obj/screen/robot_modules_background/robot_modules_background + var/obj/screen/robot/modules_background/robot_modules_background /// 3 Modules can be activated at any one time. var/obj/item/robot_module/module = null var/obj/item/module_active @@ -199,8 +199,7 @@ if(shown_robot_modules) hud_used.toggle_show_robot_modules() modtype = initial(modtype) - if(hands) - hands.icon_state = initial(hands.icon_state) + refresh_hud_element(HUD_ROBOT_MODULE) // If the robot had a module and this wasn't an uncertified change, let the AI know. if(module) if (!suppress_alert) @@ -236,9 +235,7 @@ return new module_type(src) - - if(hands) - hands.icon_state = lowertext(modtype) + refresh_hud_element(HUD_ROBOT_MODULE) SSstatistics.add_field("cyborg_[lowertext(modtype)]",1) updatename() recalculate_synth_capacities() @@ -314,7 +311,7 @@ var/dat = "[src.name] Self-Diagnosis Report \n" for (var/V in components) var/datum/robot_component/C = components[V] - dat += "[C.name]Brute Damage: [C.brute_damage] Electronics Damage: [C.electronics_damage] Powered: [(!C.idle_usage || C.is_powered()) ? "Yes" : "No"] Toggled: [ C.toggled ? "Yes" : "No"]
" + dat += "[C.name]Brute Damage: [C.brute_damage] Electronics Damage: [C.burn_damage] Powered: [(!C.idle_usage || C.is_powered()) ? "Yes" : "No"] Toggled: [ C.toggled ? "Yes" : "No"]
" return dat @@ -446,7 +443,7 @@ var/obj/item/robot_parts/robot_component/WC = W if(istype(WC)) C.brute_damage = WC.brute_damage - C.electronics_damage = WC.burn_damage + C.burn_damage = WC.burn_damage to_chat(user, "You install the [W.name].") return TRUE @@ -524,7 +521,7 @@ var/obj/item/robot_parts/robot_component/I = C.wrapped if(istype(I)) I.set_bruteloss(C.brute_damage) - I.set_burnloss(C.electronics_damage) + I.set_burnloss(C.burn_damage) removed_item = I if(C.installed == 1) @@ -563,7 +560,7 @@ C.install() // This means that removing and replacing a power cell will repair the mount. C.brute_damage = 0 - C.electronics_damage = 0 + C.burn_damage = 0 return TRUE else if(IS_WIRECUTTER(W) || IS_MULTITOOL(W)) if (wiresexposed) @@ -631,7 +628,6 @@ else if (H.wrapped == W) H.wrapped = null - /mob/living/silicon/robot/try_awaken(mob/user) return user?.attempt_hug(src) @@ -808,16 +804,11 @@ /mob/living/silicon/robot/Move(a, b, flag) . = ..() - if(.) - - if(module && isturf(loc)) - var/obj/item/ore/orebag = locate() in list(module_state_1, module_state_2, module_state_3) - if(orebag) - loc.attackby(orebag, src) - module.handle_turf(loc, src) - - if(client) - up_hint.update_icon() + if(. && module && isturf(loc)) + var/obj/item/ore/orebag = locate() in list(module_state_1, module_state_2, module_state_3) + if(orebag) + loc.attackby(orebag, src) + module.handle_turf(loc, src) /mob/living/silicon/robot/proc/UnlinkSelf() disconnect_from_ai() diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index da95094c6766..6723fd88775f 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -9,7 +9,7 @@ var/amount = 0 for(var/V in components) var/datum/robot_component/C = components[V] - if(C.installed != 0) amount += C.electronics_damage + if(C.installed != 0) amount += C.burn_damage return amount /mob/living/silicon/robot/adjustBruteLoss(var/amount, var/do_update_health = TRUE) @@ -30,7 +30,7 @@ for(var/V in components) var/datum/robot_component/C = components[V] if(C.installed == 1 || (C.installed == -1 && destroyed)) - if((brute && C.brute_damage) || (burn && C.electronics_damage) || (!C.toggled) || (!C.powered && C.toggled)) + if((brute && C.brute_damage) || (burn && C.burn_damage) || (!C.toggled) || (!C.powered && C.toggled)) parts += C return parts @@ -93,12 +93,12 @@ var/datum/robot_component/picked = pick(parts) var/brute_was = picked.brute_damage - var/burn_was = picked.electronics_damage + var/burn_was = picked.burn_damage picked.heal_damage(brute,burn) brute -= (brute_was-picked.brute_damage) - burn -= (burn_was-picked.electronics_damage) + burn -= (burn_was-picked.burn_damage) parts -= picked @@ -130,10 +130,10 @@ while(parts.len && (brute>0 || burn>0) ) var/datum/robot_component/picked = pick(parts) var/brute_was = picked.brute_damage - var/burn_was = picked.electronics_damage + var/burn_was = picked.burn_damage picked.take_component_damage(brute,burn) brute -= (picked.brute_damage - brute_was) - burn -= (picked.electronics_damage - burn_was) + burn -= (picked.burn_damage - burn_was) parts -= picked update_health() diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 59ead6d32d8b..71c952c9dbde 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -87,7 +87,7 @@ //A harvest item for serviceborgs. /obj/item/robot_harvester name = "auto harvester" - desc = "A hand-held harvest tool that resembles a sickle. It uses energy to cut plant matter very efficently." + desc = "A hand-held harvest tool that resembles a sickle. It uses energy to cut plant matter very efficiently." icon = 'icons/obj/items/borg_module/autoharvester.dmi' icon_state = "autoharvester" max_health = ITEM_HEALTH_NO_DAMAGE diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index 0ff911e5d0e5..55cfd8753368 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -1,12 +1,8 @@ -/mob/living/silicon/robot/slip_chance(var/prob_slip) - if(module && module.no_slip) - return 0 - ..(prob_slip) +/mob/living/silicon/robot/has_non_slip_footing(obj/item/shoes) + return module?.has_nonslip_feet -/mob/living/silicon/robot/Check_Shoegrip() - if(module && module.no_slip) - return 1 - return 0 +/mob/living/silicon/robot/has_magnetised_footing(obj/item/shoes) + return module?.has_magnetic_feet /mob/living/silicon/robot/get_jetpack() return locate(/obj/item/tank/jetpack) in module?.equipment @@ -20,4 +16,4 @@ if(module_active && istype(module_active,/obj/item/borg/combat/mobility)) tally-=3 - return tally+get_config_value(/decl/config/num/movement_robot) \ No newline at end of file + return tally+get_config_value(/decl/config/num/movement_robot) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 81d21611390b..5fe858b67a56 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -457,3 +457,4 @@ /mob/living/silicon/handle_stance() stance_damage = 0 return + diff --git a/code/modules/mob/living/simple_animal/_simple_animal.dm b/code/modules/mob/living/simple_animal/_simple_animal.dm index 8d2d7af52642..0b7d78e11bf0 100644 --- a/code/modules/mob/living/simple_animal/_simple_animal.dm +++ b/code/modules/mob/living/simple_animal/_simple_animal.dm @@ -12,11 +12,16 @@ icon_state = ICON_STATE_WORLD buckle_pixel_shift = @"{'x':0,'y':0,'z':8}" + hud_used = /datum/hud/animal + move_intents = list( /decl/move_intent/walk/animal, /decl/move_intent/run/animal ) + // Set to TRUE to ignore slipping while EVA + var/skip_spacemove = FALSE + /// Added to the delay expected from movement decls. var/base_movement_delay = 0 @@ -274,13 +279,13 @@ var/global/list/simplemob_icon_bitflag_cache = list() bodytemperature += ((environment.temperature - bodytemperature) / 5) if(bodytemperature < minbodytemp) - SET_HUD_ALERT(src, /decl/hud_element/condition/fire, 2) + SET_HUD_ALERT(src, HUD_FIRE, 2) take_damage(cold_damage_per_tick, BURN) else if(bodytemperature > maxbodytemp) - SET_HUD_ALERT(src, /decl/hud_element/condition/fire, 1) + SET_HUD_ALERT(src, HUD_FIRE, 1) take_damage(heat_damage_per_tick, BURN) else - SET_HUD_ALERT(src, /decl/hud_element/condition/fire, 0) + SET_HUD_ALERT(src, HUD_FIRE, 0) if(!atmos_suitable) take_damage(unsuitable_atmos_damage) @@ -590,3 +595,6 @@ var/global/list/simplemob_icon_bitflag_cache = list() /mob/living/simple_animal/set_stat(var/new_stat) if((. = ..())) queue_icon_update() + +/mob/living/simple_animal/is_space_movement_permitted(allow_movement = FALSE) + return skip_spacemove ? SPACE_MOVE_PERMITTED : ..() diff --git a/code/modules/mob/living/simple_animal/crow/crow.dm b/code/modules/mob/living/simple_animal/crow/crow.dm index 66428209454e..1c780c3299aa 100644 --- a/code/modules/mob/living/simple_animal/crow/crow.dm +++ b/code/modules/mob/living/simple_animal/crow/crow.dm @@ -80,7 +80,7 @@ /mob/living/simple_animal/crow/cyber name = "cybercrow" - desc = "A large cybercrow. k4w k4w." + desc = "A large cybercrow. K4w k4w." speak_emote = list("beeps") /mob/living/simple_animal/crow/cyber/on_update_icon() diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 8eaa3d916813..9d63b3a9b810 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -3,21 +3,22 @@ desc = "A ferocious, fang-bearing creature that resembles a fish." icon = 'icons/mob/simple_animal/space_carp.dmi' - max_health = 50 - harm_intent_damage = 8 - natural_weapon = /obj/item/natural_weapon/bite + max_health = 50 + harm_intent_damage = 8 + natural_weapon = /obj/item/natural_weapon/bite base_movement_delay = 2 //Space carp aren't affected by atmos. - min_gas = null - max_gas = null - minbodytemp = 0 - faction = "carp" - bleed_colour = "#5d0d71" - pass_flags = PASS_FLAG_TABLE - butchery_data = /decl/butchery_data/animal/fish/space_carp - ai = /datum/mob_controller/aggressive/carp + min_gas = null + max_gas = null + minbodytemp = 0 + faction = "carp" + bleed_colour = "#5d0d71" + pass_flags = PASS_FLAG_TABLE + butchery_data = /decl/butchery_data/animal/fish/space_carp + ai = /datum/mob_controller/aggressive/carp ability_handlers = list(/datum/ability_handler/predator) + skip_spacemove = TRUE var/carp_color = COLOR_PURPLE @@ -57,6 +58,3 @@ var/image/I = image(icon, "[icon_state]-eyes") I.appearance_flags |= RESET_COLOR add_overlay(I) - -/mob/living/simple_animal/hostile/carp/Process_Spacemove() - return 1 //No drifting in space for space carp! //original comments do not steal diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm b/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm index 1145b90b6e8b..330f1afffc4d 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/hostile/commanded/nanomachine name = "swarm" - desc = "a cloud of tiny, tiny robots." + desc = "A cloud of tiny, tiny robots." icon = 'icons/mob/simple_animal/nanomachines.dmi' natural_weapon = /obj/item/natural_weapon/nanomachine max_health = 10 diff --git a/code/modules/mob/living/simple_animal/hostile/faithful_hound.dm b/code/modules/mob/living/simple_animal/hostile/faithful_hound.dm index 345b7137994b..3e5bb0112dbf 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithful_hound.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithful_hound.dm @@ -65,9 +65,6 @@ new /obj/item/ectoplasm(get_turf(src)) qdel(src) -/mob/living/simple_animal/faithful_hound/Destroy() - return ..() - /mob/living/simple_animal/faithful_hound/hear_say(var/message, var/verb = "says", var/decl/language/language = null, var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol) set waitfor = FALSE if(!ai?.check_memory(speaker, message)) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index c8de00b79d20..662a6058c3d5 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -1,38 +1,39 @@ //malfunctioning combat drones /mob/living/simple_animal/hostile/malf_drone - name = "combat drone" - desc = "An automated combat drone armed with state of the art weaponry and shielding." - icon = 'icons/mob/simple_animal/drone_combat.dmi' - burst_projectile = 0 - max_health = 300 - move_intents = list( + name = "combat drone" + desc = "An automated combat drone armed with state of the art weaponry and shielding." + icon = 'icons/mob/simple_animal/drone_combat.dmi' + burst_projectile = 0 + max_health = 300 + move_intents = list( /decl/move_intent/walk/animal_slow, /decl/move_intent/run/animal_slow ) - projectiletype = /obj/item/projectile/beam/drone - projectilesound = 'sound/weapons/laser3.ogg' - gene_damage = -1 - butchery_data = /decl/butchery_data/synthetic - bleed_colour = SYNTH_BLOOD_COLOR + projectiletype = /obj/item/projectile/beam/drone + projectilesound = 'sound/weapons/laser3.ogg' + gene_damage = -1 + butchery_data = /decl/butchery_data/synthetic + bleed_colour = SYNTH_BLOOD_COLOR + ai = /datum/mob_controller/aggressive/malf_drone base_movement_delay = 2 - ai = /datum/mob_controller/aggressive/malf_drone //Drones aren't affected by atmos. - min_gas = null - max_gas = null - minbodytemp = 0 - faction = "malf_drone" + min_gas = null + max_gas = null + minbodytemp = 0 + faction = "malf_drone" + skip_spacemove = TRUE - var/has_loot = 1 var/datum/effect/effect/system/trail/ion_trail + var/has_loot = 1 var/explode_chance = 1 - var/disabled = 0 - var/exploding = 0 + var/disabled = 0 + var/exploding = 0 var/static/list/debris = list( - /decl/material/solid/glass = /obj/item/shard, - /decl/material/solid/metal/steel = /obj/item/stack/material/rods, + /decl/material/solid/glass = /obj/item/shard, + /decl/material/solid/metal/steel = /obj/item/stack/material/rods, /decl/material/solid/metal/plasteel = null ) @@ -86,9 +87,6 @@ QDEL_NULL(ion_trail) return ..() -/mob/living/simple_animal/hostile/malf_drone/Process_Spacemove() - return 1 - /mob/living/simple_animal/hostile/malf_drone/proc/Haywire() var/datum/mob_controller/aggressive/malf_drone/drone_ai = ai if(prob(disabled ? 0 : 1) && istype(drone_ai) && drone_ai.malfunctioning) @@ -202,10 +200,6 @@ if(. && !gibbed) physically_destroyed() -/mob/living/simple_animal/hostile/malf_drone/Destroy() - QDEL_NULL(ion_trail) - return ..() - /mob/living/simple_animal/hostile/malf_drone/physically_destroyed(skip_qdel) //some random debris left behind if(has_loot) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm index d8443751980f..17b7b6976f2d 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm @@ -89,7 +89,7 @@ /mob/living/simple_animal/hostile/beast/shantak name = "shantak" - desc = "A piglike creature with a bright iridiscent mane that sparkles as though lit by an inner light. Don't be fooled by its beauty though." + desc = "A piglike creature with a bright iridescent mane that sparkles as though lit by an inner light. Don't be fooled by its beauty though." faction = "shantak" icon = 'icons/mob/simple_animal/shantak.dmi' move_intents = list( diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm index faae358b3884..63f5255223b1 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm @@ -27,30 +27,31 @@ //the king and his court /mob/living/simple_animal/hostile/goat/king - name = "king of goats" - desc = "The oldest and wisest of goats; king of his race, peerless in dignity and power. His golden fleece radiates nobility." - icon = 'icons/mob/simple_animal/goat_king.dmi' - speak_emote = list("brays in a booming voice") - ai = /datum/mob_controller/aggressive/goat/king - response_harm = "assaults" - max_health = 500 - mob_size = MOB_SIZE_LARGE - mob_bump_flag = HEAVY - move_intents = list( + name = "king of goats" + desc = "The oldest and wisest of goats; king of his race, peerless in dignity and power. His golden fleece radiates nobility." + icon = 'icons/mob/simple_animal/goat_king.dmi' + speak_emote = list("brays in a booming voice") + ai = /datum/mob_controller/aggressive/goat/king + response_harm = "assaults" + max_health = 500 + mob_size = MOB_SIZE_LARGE + mob_bump_flag = HEAVY + move_intents = list( /decl/move_intent/walk/animal, /decl/move_intent/run/animal ) - min_gas = null - max_gas = null - minbodytemp = 0 - flash_protection = FLASH_PROTECTION_MAJOR - natural_weapon = /obj/item/natural_weapon/goatking - var/current_damtype = BRUTE + min_gas = null + max_gas = null + minbodytemp = 0 + flash_protection = FLASH_PROTECTION_MAJOR + natural_weapon = /obj/item/natural_weapon/goatking + skip_spacemove = TRUE + var/current_damtype = BRUTE + var/stun_chance = 5 //chance per attack to Weaken target var/list/elemental_weapons = list( BURN = /obj/item/natural_weapon/goatking/fire, ELECTROCUTE = /obj/item/natural_weapon/goatking/lightning ) - var/stun_chance = 5 //chance per attack to Weaken target /mob/living/simple_animal/hostile/goat/king/proc/OnDeath() visible_message(SPAN_CULT_ANNOUNCE("\The [src] lets loose a terrific wail as its wounds close shut with a flash of light, and its eyes glow even brighter than before!")) @@ -69,9 +70,6 @@ ADJ_STATUS(target, STAT_CONFUSE, 1) visible_message(SPAN_WARNING("\The [target] is bowled over by the impact of [src]'s attack!")) -/mob/living/simple_animal/hostile/goat/king/Process_Spacemove() - return 1 - /mob/living/simple_animal/hostile/goat/king/get_natural_weapon() if(!(current_damtype in elemental_weapons)) return ..() @@ -148,7 +146,7 @@ boss_theme = play_looping_sound(src, sound_id, 'sound/music/Visager-Battle.ogg', volume = 10, range = 7, falloff = 4, prefer_mute = TRUE) update_icon() -/mob/living/simple_animal/hostile/retaliate/goat/guard +/mob/living/simple_animal/hostile/goat/guard name = "honour guard" desc = "A very handsome and noble beast." icon = 'icons/mob/simple_animal/goat_guard.dmi' @@ -161,7 +159,7 @@ _base_attack_force = 15 sharp = TRUE -/mob/living/simple_animal/hostile/retaliate/goat/guard/master +/mob/living/simple_animal/hostile/goat/guard/master name = "master of the guard" desc = "A very handsome and noble beast - the most trusted of all the king's men." icon = 'icons/mob/simple_animal/goat_master.dmi' diff --git a/code/modules/mob/living/simple_animal/hostile/revenant.dm b/code/modules/mob/living/simple_animal/hostile/revenant.dm index 0c5dddceaee1..ec429d2a63c8 100644 --- a/code/modules/mob/living/simple_animal/hostile/revenant.dm +++ b/code/modules/mob/living/simple_animal/hostile/revenant.dm @@ -1,22 +1,20 @@ /mob/living/simple_animal/hostile/revenant - name = "revenant" - desc = "A flickering humanoid shadow that exudes a palpable sense of mance." - icon = 'icons/mob/simple_animal/revenant.dmi' - response_help_1p = "You wave your hand through $TARGET$." - response_help_3p = "$USER$ waves $USER_THEIR$ hand through $TARGET$." - max_health = 80 - gene_damage = -1 - ai = /datum/mob_controller/aggressive/revenant - + name = "revenant" + desc = "A flickering humanoid shadow that exudes a palpable sense of mance." + icon = 'icons/mob/simple_animal/revenant.dmi' + response_help_1p = "You wave your hand through $TARGET$." + response_help_3p = "$USER$ waves $USER_THEIR$ hand through $TARGET$." + max_health = 80 + gene_damage = -1 + ai = /datum/mob_controller/aggressive/revenant harm_intent_damage = 10 - natural_weapon = /obj/item/natural_weapon/revenant - - min_gas = null - max_gas = null - minbodytemp = 0 - - faction = "revenants" - supernatural = 1 + natural_weapon = /obj/item/natural_weapon/revenant + min_gas = null + max_gas = null + minbodytemp = 0 + skip_spacemove = TRUE + faction = "revenants" + supernatural = TRUE /datum/mob_controller/aggressive/revenant speak_chance = 0 @@ -34,9 +32,6 @@ atom_damage_type = BURN _base_attack_force = 15 -/mob/living/simple_animal/hostile/revenant/Process_Spacemove() - return 1 - /mob/living/simple_animal/hostile/revenant/apply_attack_effects(mob/living/target) . = ..() if(prob(12)) diff --git a/code/modules/mob/living/simple_animal/hostile/shark.dm b/code/modules/mob/living/simple_animal/hostile/shark.dm new file mode 100644 index 000000000000..b39c15e7a0c7 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/shark.dm @@ -0,0 +1,58 @@ +/mob/living/simple_animal/hostile/carp/shark // generally stronger version of a carp that doesn't die from a mean look. Fance new sprites included, credits to F-Tang Steve + name = "cosmoshark" + desc = "Enormous creature that resembles a shark with magenta glowing lines along its body and set of long deep-purple teeth." + icon = 'maps/away/errant_pisces/icons/cosmoshark.dmi' + butchery_data = /decl/butchery_data/animal/fish/space_carp/shark + max_health = 100 + natural_weapon = /obj/item/natural_weapon/bite/strong + faction = "shark" + ai = /datum/mob_controller/aggressive/carp/shark + +/datum/mob_controller/aggressive/carp/shark + break_stuff_probability = 35 + turns_per_wander = 10 + +/mob/living/simple_animal/hostile/carp/shark/carp_randomify() + return + +/mob/living/simple_animal/hostile/carp/shark/death(gibbed) + . = ..() + if(. && !gibbed) + var/datum/gas_mixture/environment = loc.return_air() + if (environment) + var/datum/gas_mixture/sharkmaw_chlorine = new + sharkmaw_chlorine.adjust_gas(/decl/material/gas/chlorine, 10) + environment.merge(sharkmaw_chlorine) + visible_message(SPAN_WARNING("\The [src]'s body releases some gas from the gills with a quiet fizz!")) + +/mob/living/simple_animal/hostile/carp/shark/apply_attack_effects(mob/living/target) + . =..() + var/mob/living/L = target + if(istype(L)) + if(prob(25))//if one is unlucky enough, they get tackled few tiles away + L.visible_message("\The [src] tackles [L]!") + var/tackle_length = rand(3,5) + for (var/i = 1 to tackle_length) + var/turf/T = get_step(L.loc, dir)//on a first step of tackling standing mob would block movement so let's check if there's something behind it. Works for consequent moves too + if (T.density || LinkBlocked(L.loc, T) || TurfBlockedNonWindow(T) || DirBlocked(T, global.flip_dir[dir])) + break + sleep(2) + forceMove(T)//maybe there's better manner then just forceMove() them + L.forceMove(T) + visible_message("\The [src] releases [L].") + +/decl/butchery_data/animal/fish/space_carp/shark + meat_type = /obj/item/food/butchery/meat/fish/shark + must_use_hook = TRUE + +/obj/item/food/butchery/meat/fish/shark + desc = "A fillet of cosmoshark meat." + meat_name = "cosmoshark" + color = "#cecece" + center_of_mass = @'{"x":17,"y":13}' + bitesize = 8 + +/obj/item/food/butchery/meat/fish/shark/populate_reagents() + . = ..() + add_to_reagents(/decl/material/liquid/psychoactives, 1) + add_to_reagents(/decl/material/gas/chlorine, 1) diff --git a/code/modules/mob/living/simple_animal/hostile/vagrant.dm b/code/modules/mob/living/simple_animal/hostile/vagrant.dm index 8fd2a41379c9..2724d98aede4 100644 --- a/code/modules/mob/living/simple_animal/hostile/vagrant.dm +++ b/code/modules/mob/living/simple_animal/hostile/vagrant.dm @@ -1,39 +1,37 @@ /mob/living/simple_animal/hostile/vagrant - name = "creature" - desc = "You get the feeling you should run." - icon = 'icons/mob/simple_animal/vagrant.dmi' - max_health = 60 - move_intents = list( + name = "creature" + desc = "You get the feeling you should run." + icon = 'icons/mob/simple_animal/vagrant.dmi' + max_health = 60 + move_intents = list( /decl/move_intent/walk/animal_fast, /decl/move_intent/run/animal_fast ) - faction = "vagrant" - harm_intent_damage = 3 - natural_weapon = /obj/item/natural_weapon/bite/weak - light_color = "#8a0707" - min_gas = null - max_gas = null - minbodytemp = 0 - gene_damage = -1 - pass_flags = PASS_FLAG_TABLE - bleed_colour = "#aad9de" - nutrition = 100 - ai = /datum/mob_controller/aggressive/vagrant + faction = "vagrant" + harm_intent_damage = 3 + natural_weapon = /obj/item/natural_weapon/bite/weak + light_color = "#8a0707" + min_gas = null + max_gas = null + minbodytemp = 0 + gene_damage = -1 + pass_flags = PASS_FLAG_TABLE + bleed_colour = "#aad9de" + nutrition = 100 + ai = /datum/mob_controller/aggressive/vagrant base_movement_delay = 2 + skip_spacemove = TRUE - var/cloaked = 0 - var/mob/living/human/gripping = null - var/blood_per_tick = 3 + var/cloaked = 0 + var/blood_per_tick = 3 var/health_per_tick = 0.8 + var/mob/living/human/gripping /datum/mob_controller/aggressive/vagrant speak_chance = 0 turns_per_wander = 8 break_stuff_probability = 0 -/mob/living/simple_animal/hostile/vagrant/Process_Spacemove() - return 1 - /mob/living/simple_animal/hostile/vagrant/bullet_act(var/obj/item/projectile/Proj) var/oldhealth = current_health . = ..() diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 3bd462aca867..a66a1b4f79a3 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -103,7 +103,7 @@ client.images = null //remove the images such as AIs being unable to see runes client.screen = list() //remove hud items just in case client.set_right_click_menu_mode(shift_to_open_context_menu) - InitializeHud() + initialize_hud() else refresh_lighting_master() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ad15792b151c..e10cf8f47e54 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -24,7 +24,6 @@ if(istype(ai)) QDEL_NULL(ai) QDEL_NULL(lighting_master) - remove_screen_obj_references() if(client) for(var/atom/movable/AM in client.screen) var/obj/screen/screenobj = AM @@ -37,26 +36,6 @@ ghostize() return ..() -/mob/proc/remove_screen_obj_references() - QDEL_NULL_SCREEN(internals) - QDEL_NULL_SCREEN(oxygen) - QDEL_NULL_SCREEN(toxin) - QDEL_NULL_SCREEN(fire) - QDEL_NULL_SCREEN(bodytemp) - QDEL_NULL_SCREEN(healths) - QDEL_NULL_SCREEN(throw_icon) - QDEL_NULL_SCREEN(maneuver_icon) - QDEL_NULL_SCREEN(nutrition_icon) - QDEL_NULL_SCREEN(hydration_icon) - QDEL_NULL_SCREEN(pressure) - QDEL_NULL_SCREEN(pain) - QDEL_NULL_SCREEN(up_hint) - QDEL_NULL_SCREEN(item_use_icon) - QDEL_NULL_SCREEN(radio_use_icon) - QDEL_NULL_SCREEN(gun_move_icon) - QDEL_NULL_SCREEN(gun_setting_icon) - QDEL_NULL_SCREEN(zone_sel) - /mob/Initialize() if(ispath(skillset)) skillset = new skillset(src) @@ -780,7 +759,7 @@ usr.setClickCooldown(20) if(usr.stat == UNCONSCIOUS) - to_chat(usr, "You are unconcious and cannot do that!") + to_chat(usr, "You are unconscious and cannot do that!") return if(usr.restrained()) @@ -890,7 +869,7 @@ /mob/proc/toggle_throw_mode(force_set) in_throw_mode = isnull(force_set) ? !in_throw_mode : force_set - throw_icon?.update_icon() + refresh_hud_element(HUD_THROW) /mob/proc/toggle_antag_pool() set name = "Toggle Add-Antag Candidacy" @@ -908,12 +887,10 @@ to_chat(usr, "The game is not currently looking for antags.") else to_chat(usr, "You must be observing or in the lobby to join the antag pool.") + /mob/proc/is_invisible_to(var/mob/viewer) return (!alpha || !mouse_opacity || viewer.see_invisible < invisibility) -/client/proc/check_has_body_select() - return mob && mob.hud_used && istype(mob.zone_sel, /obj/screen/zone_selector) - /client/verb/body_toggle_head() set name = "body-toggle-head" set hidden = 1 @@ -950,10 +927,7 @@ toggle_zone_sel(list(BP_L_LEG,BP_L_FOOT)) /client/proc/toggle_zone_sel(list/zones) - if(!check_has_body_select()) - return - var/obj/screen/zone_selector/selector = mob.zone_sel - selector.set_selected_zone(next_in_list(mob.get_target_zone(), zones)) + mob.set_target_zone(next_in_list(mob.get_target_zone(), zones)) /mob/proc/has_admin_rights() return check_rights(R_ADMIN, 0, src) @@ -968,7 +942,7 @@ return gender /mob/try_fluid_push(volume, strength) - if(..() && !buckled && (current_posture.prone || !Check_Shoegrip()) && (strength >= mob_size * (current_posture.prone ? 5 : 10))) + if(..() && can_slip() && (strength >= mob_size * (current_posture.prone ? 5 : 10))) if(!current_posture.prone) SET_STATUS_MAX(src, STAT_WEAK, 1) if(current_posture.prone && prob(10)) @@ -1251,12 +1225,16 @@ return /mob/proc/set_target_zone(new_zone) - if(zone_sel) - return zone_sel?.set_selected_zone(new_zone) - return FALSE + if(new_zone == selected_zone) + return + var/old_zone = selected_zone + selected_zone = new_zone + var/obj/screen/zone_selector/selector = get_hud_element(HUD_ZONE_SELECT) + if(selector) + selector.set_selected_zone(new_zone, old_zone) /mob/proc/get_target_zone() - return zone_sel?.selecting || BP_CHEST + return selected_zone /mob/proc/get_default_temperature_threshold(threshold) switch(threshold) @@ -1387,11 +1365,93 @@ /// THIS DOES NOT RELATE TO HELD ITEM SLOTS. It is very specifically a functional BP_L_HAND or BP_R_HAND organ, not necessarily a gripper. /mob/proc/get_usable_hand_slot_organ() - var/obj/item/organ/external/paw = GET_EXTERNAL_ORGAN(src, BP_L_HAND) - if(!istype(paw) && !paw.is_usable()) - paw = GET_EXTERNAL_ORGAN(src, BP_R_HAND) - if(istype(paw) && paw.is_usable()) - return paw + var/static/list/hand_slots = list(BP_L_HAND, BP_R_HAND) + for(var/slot in shuffle(hand_slots)) + var/obj/item/organ/external/hand = GET_EXTERNAL_ORGAN(src, slot) + if(istype(hand) && hand.is_usable()) + return hand + +/mob/proc/get_solid_footing() + + if(!loc) + return src // this is a bit weird but we shouldn't slip in nullspace probably + + // Check for dense turfs. + var/turf/my_turf = loc + if(!istype(my_turf)) + return my_turf + + if(my_turf.is_wall() || my_turf.is_floor()) + return my_turf + + // Check for catwalks and lattices. + var/atom/platform = my_turf.get_supporting_platform() || (locate(/obj/structure/lattice) in my_turf) + if(platform) + return platform + + // Check for supportable nearby atoms. + for(var/turf/neighbor in RANGE_TURFS(my_turf, 1)) + if(neighbor == my_turf) + continue + if(neighbor.contains_dense_objects(exceptions = src)) + return neighbor + platform = neighbor.get_supporting_platform() || (locate(/obj/structure/lattice) in neighbor) + if(platform) + return platform + + // Find something we are grabbing onto for support. + for(var/atom/movable/thing in range(1, my_turf)) + if(thing == src || thing == inertia_ignore || !thing.simulated || thing == buckled) + continue + if(isturf(thing)) + continue // We checked turfs when using magboots above. + else if(ismob(thing)) + var/mob/victim = thing + if(victim.buckled) + continue + else if(thing.CanPass(src)) + continue + if(thing.anchored) + return thing + var/is_being_grabbed = FALSE + for(var/obj/item/grab/grab in get_active_grabs()) + if(thing == grab.affecting) + is_being_grabbed = TRUE + break + if(!is_being_grabbed) + . = thing + +/mob/proc/can_slip(magboots_only = FALSE) + + // Are we immune to everything? + if(status_flags & GODMODE) + return FALSE + + // Quick basic checks. + if(!simulated || !isturf(loc) || buckled || current_posture?.prone || throwing) + return FALSE + + // Species flag/proc check. + if(get_species()?.check_no_slip(src, magboots_only)) + return FALSE + + // Check footwear. + if(!magboots_only && has_non_slip_footing()) + return FALSE + + if((has_gravity() || has_magnetised_footing()) && get_solid_footing()) + return FALSE + + // Slip! + return TRUE + +/mob/proc/has_non_slip_footing() + var/obj/item/shoes = get_equipped_item(slot_shoes_str) + return istype(shoes) && (shoes.item_flags & ITEM_FLAG_NOSLIP) + +/mob/proc/has_magnetised_footing() + var/obj/item/shoes = get_equipped_item(slot_shoes_str) + return istype(shoes) && (shoes.item_flags & ITEM_FLAG_MAGNETISED) // Called when using the shredding behavior. /mob/proc/can_shred(var/mob/living/human/H, var/ignore_intent, var/ignore_antag) @@ -1413,3 +1473,4 @@ var/list/limb_unarmed_attacks = limb.get_natural_attacks() if(istype(limb_unarmed_attacks, /decl/natural_attack) || (islist(limb_unarmed_attacks) && length(limb_unarmed_attacks))) LAZYDISTINCTADD(., limb_unarmed_attacks) + diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 88da01483aaf..a383f3b30fca 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -41,33 +41,12 @@ var/stat = CONSCIOUS //Whether a mob is alive or dead. TODO: Move this to living - Nodrak - var/obj/screen/robot_module/select/hands - var/obj/screen/warning_cells/cells - var/obj/screen/internals/internals - var/obj/screen/oxygen/oxygen - var/obj/screen/toxins/toxin - var/obj/screen/fire_warning/fire - var/obj/screen/bodytemp/bodytemp - var/obj/screen/health_warning/healths - var/obj/screen/throw_toggle/throw_icon - var/obj/screen/maneuver/maneuver_icon - var/obj/screen/food/nutrition_icon - var/obj/screen/drink/hydration_icon - var/obj/screen/pressure/pressure - var/obj/screen/fullscreen/pain/pain - var/obj/screen/up_hint/up_hint - var/obj/screen/gun/item/item_use_icon - var/obj/screen/gun/radio/radio_use_icon - var/obj/screen/gun/move/gun_move_icon - var/obj/screen/gun/mode/gun_setting_icon - /*A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob. A variable should only be globally attached to turfs/objects/whatever, when it is in fact needed as such. The current method unnecessarily clusters up the variable list, especially for humans (although rearranging won't really clean it up a lot but the difference will be noticable for other mobs). I'll make some notes on where certain variable defines should probably go. Changing this around would probably require a good look-over the pre-existing code. */ - var/obj/screen/zone_selector/zone_sel = null var/damageoverlaytemp = 0 var/obj/machinery/machine = null @@ -157,5 +136,8 @@ var/offset_overhead_text_x = 0 var/offset_overhead_text_y = 0 + /// What bodypart are we currently targetting? + var/selected_zone = BP_CHEST + /// Are you trying not to hurt your opponent? var/pulling_punches diff --git a/code/modules/mob/mob_intent.dm b/code/modules/mob/mob_intent.dm index b55b2342ed84..37bf6fa6d50b 100644 --- a/code/modules/mob/mob_intent.dm +++ b/code/modules/mob/mob_intent.dm @@ -35,6 +35,10 @@ var/icon = 'icons/screen/intents.dmi' /// State used to update intent selector. var/icon_state + /// Whether or not this intent is available if you have an item in your hand. + var/requires_empty_hand + /// Intents to be removed from the available list if this intent is present. + var/list/blocks_other_intents /decl/intent/validate() . = ..() @@ -83,20 +87,10 @@ icon_state = "intent_disarm" sort_order = 2 // Corresponding to hotkey order. -// Used by nymphs. -/decl/intent/harm/binary - icon = 'icons/screen/intents_wide.dmi' - uid = "intent_harm_simple" - intent_flags = (I_FLAG_HARM|I_FLAG_DISARM) - -/decl/intent/help/binary - icon = 'icons/screen/intents_wide.dmi' - uid = "intent_help_simple" - intent_flags = (I_FLAG_HARM|I_FLAG_GRAB) - /mob /// Decl for current 'intent' of mob; hurt, harm, etc. Initialized by get_intent(). - var/decl/intent/_a_intent + VAR_PRIVATE/decl/intent/_a_intent + VAR_PRIVATE/list/_available_intents /mob/proc/check_intent(checking_intent) var/decl/intent/intent = get_intent() // Ensures intent has been initalised. @@ -112,21 +106,30 @@ if(!isnum(new_intent)) new_intent = resolve_intent(new_intent) else // Retrieve intent decl based on flag. - for(var/decl/intent/intent as anything in get_available_intents()) + for(var/decl/intent/intent as anything in get_available_intents(skip_update = TRUE)) if(intent.intent_flags & new_intent) new_intent = intent break if(istype(new_intent) && get_intent() != new_intent) _a_intent = new_intent - if(istype(hud_used) && hud_used.action_intent) - hud_used.action_intent.update_icon() + if(istype(hud_used)) + hud_used.refresh_element(HUD_INTENT) return TRUE return FALSE /mob/proc/get_intent() RETURN_TYPE(/decl/intent) + var/list/available_intents = get_available_intents() + if(length(available_intents) && (!_a_intent || !(_a_intent in available_intents))) + var/new_intent + if(_a_intent) + for(var/decl/intent/intent in available_intents) + if(_a_intent.intent_flags & intent.intent_flags) + new_intent = intent + break + _a_intent = new_intent || available_intents[1] if(!_a_intent) _a_intent = get_default_intent() return _a_intent @@ -134,25 +137,59 @@ /mob/proc/get_default_intent() return GET_DECL(/decl/intent/help) -/mob/proc/get_available_intents() - var/static/list/available_intents - if(!available_intents) - available_intents = list( +/mob/proc/get_default_intents() + var/static/list/default_intents + if(!default_intents) + default_intents = list( GET_DECL(/decl/intent/help), GET_DECL(/decl/intent/disarm), GET_DECL(/decl/intent/grab), GET_DECL(/decl/intent/harm) ) - available_intents = sortTim(available_intents, /proc/cmp_decl_sort_value_asc) - return available_intents + return default_intents + +/mob/proc/clear_available_intents(skip_update, skip_sleep) + set waitfor = FALSE + if(!skip_sleep) + sleep(0) + if(QDELETED(src)) + return + _available_intents = null + if(!skip_update) + refresh_hud_element(HUD_INTENT) + +/mob/proc/get_available_intents(skip_update, force) + var/obj/item/held = get_active_held_item() + if(!held) + _available_intents = get_default_intents() + else if(force || !_available_intents) + // Grab all relevant intents. + _available_intents = list() + for(var/decl/intent/intent as anything in get_default_intents()) + if(intent.requires_empty_hand) + continue + _available_intents += intent + // Add inhand intents. + var/list/held_intents = held.get_provided_intents(src) + if(length(held_intents)) + _available_intents |= held_intents + // Trim blocked intents. + for(var/decl/intent/intent as anything in _available_intents) + _available_intents -= intent.blocks_other_intents + // Sort by hotkey order. + _available_intents = sortTim(_available_intents, /proc/cmp_decl_sort_value_asc) + // Update our HUD immediately. + if(!skip_update) + refresh_hud_element(HUD_INTENT) + return _available_intents /mob/proc/cycle_intent(input) set name = "a-intent" set hidden = TRUE switch(input) if(INTENT_HOTKEY_RIGHT) - return set_intent(next_in_list(get_intent(), get_available_intents())) + return set_intent(next_in_list(get_intent(), get_available_intents(skip_update = TRUE))) if(INTENT_HOTKEY_LEFT) - return set_intent(previous_in_list(get_intent(), get_available_intents())) + return set_intent(previous_in_list(get_intent(), get_available_intents(skip_update = TRUE))) else // Fallback, should just use set_intent() directly return set_intent(input) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index a934d39d2e38..99f0b0fe161b 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -134,105 +134,71 @@ return mob.SelfMove(direction) -/mob/Process_Spacemove(var/allow_movement) - . = ..() - if(.) +/mob/is_space_movement_permitted(allow_movement = FALSE) + if((. = ..())) return + var/atom/movable/footing = get_solid_footing() + if(footing) + if(istype(footing) && allow_movement) + return footing + return SPACE_MOVE_SUPPORTED - var/atom/movable/backup = get_spacemove_backup() - if(backup) - if(istype(backup) && allow_movement) - return backup - return -1 - -/mob/living/Process_Spacemove(allow_movement) +/mob/living/is_space_movement_permitted(allow_movement = FALSE) var/obj/item/tank/jetpack/thrust = get_jetpack() if(thrust?.on && (allow_movement || thrust.stabilization_on) && thrust.allow_thrust(0.01, src)) - return TRUE + return SPACE_MOVE_PERMITTED return ..() -/mob/proc/space_do_move(var/allow_move, var/direction) - if(ismovable(allow_move))//push off things in space - handle_space_pushoff(allow_move, direction) - allow_move = -1 - - if(allow_move == -1 && handle_spaceslipping()) - return 0 - - return 1 +// space_move_result can be: +// - SPACE_MOVE_FORBIDDEN, +// - SPACE_MOVE_PERMITTED, +// - SPACE_MOVE_SUPPORTED (for non-movable atoms), +// - or an /atom/movable that provides footing. +/mob/proc/try_space_move(space_move_result, direction) + if(ismovable(space_move_result))//push off things in space + handle_space_pushoff(space_move_result, direction) + space_move_result = SPACE_MOVE_SUPPORTED + return space_move_result != SPACE_MOVE_SUPPORTED || !handle_spaceslipping() /mob/proc/handle_space_pushoff(var/atom/movable/AM, var/direction) if(AM.anchored) return - if(ismob(AM)) var/mob/M = AM - if(M.check_space_footing()) + if(!M.can_slip(magboots_only = TRUE)) return - AM.inertia_ignore = src if(step(AM, turn(direction, 180))) - to_chat(src, "You push off of [AM] to propel yourself.") + to_chat(src, SPAN_INFO("You push off of \the [AM] to propel yourself.")) inertia_ignore = AM -/mob/proc/get_spacemove_backup()//rename this - var/shoegrip = Check_Shoegrip() - - for(var/thing in RANGE_TURFS(src, 1))//checks for walls or grav turf first - var/turf/T = thing - if(T.density || T.is_wall() || (T.is_floor() && (shoegrip || T.has_gravity()))) - return T - - var/obj/item/grab/grab = locate() in src - for(var/A in range(1, get_turf(src))) - if(istype(A,/atom/movable)) - var/atom/movable/AM = A - if(AM == src || AM == inertia_ignore || !AM.simulated || !AM.mouse_opacity || AM == buckled) //mouse_opacity is hacky as hell, need better solution - continue - if(ismob(AM)) - var/mob/M = AM - if(M.buckled) - continue - if(AM.density || !AM.CanPass(src)) - if(AM.anchored) - return AM - if(grab && AM == grab.affecting) - continue - . = AM - -/mob/proc/check_space_footing() //checks for gravity or maglockable turfs to prevent space related movement - if(has_gravity() || anchored || buckled) - return 1 - - if(Check_Shoegrip()) - for(var/thing in RANGE_TURFS(src, 1)) //checks for turfs that one can maglock to - var/turf/T = thing - if(T.density || T.is_wall() || T.is_floor()) - return 1 - - return 0 - -/mob/proc/Check_Shoegrip() - return 0 - //return 1 if slipped, 0 otherwise /mob/proc/handle_spaceslipping() - if(prob(skill_fail_chance(SKILL_EVA, slip_chance(10), SKILL_EXPERT))) - to_chat(src, "You slipped!") + if(prob(skill_fail_chance(SKILL_EVA, get_eva_slip_prob(), SKILL_EXPERT))) + to_chat(src, SPAN_DANGER("You slipped!")) step(src,turn(last_move, pick(45,-45))) - return 1 - return 0 - -/mob/proc/slip_chance(var/prob_slip = 10) - if(stat) - return 0 - if(buckled) - return 0 - if(Check_Shoegrip()) - return 0 - if(MOVING_DELIBERATELY(src)) - prob_slip *= 0.5 - return prob_slip + return TRUE + return FALSE + +/mob/proc/get_eva_slip_prob(var/prob_slip = 10) + // General slip check. + if((has_gravity() || has_magnetised_footing()) && get_solid_footing()) + . = 0 + else + //Check hands and mod slip + for(var/hand_slot in get_held_item_slots()) + var/datum/inventory_slot/inv_slot = get_inventory_slot_datum(hand_slot) + var/obj/item/held = inv_slot?.get_equipped_item() + if(!held) + prob_slip -= 2 + else if(held.w_class <= ITEM_SIZE_SMALL) + prob_slip -= 1 + // If we're walking carefully, lower the chance. + if(MOVING_DELIBERATELY(src)) + prob_slip *= 0.5 + . = prob_slip + // Avoid negative probs. + . = max(0, .) #define DO_MOVE(this_dir) var/final_dir = turn(this_dir, -dir2angle(dir)); Move(get_step(mob, final_dir), final_dir); @@ -268,8 +234,7 @@ /mob/proc/set_move_intent(var/decl/move_intent/next_intent) if(next_intent && move_intent != next_intent && next_intent.can_be_used_by(src)) move_intent = next_intent - if(istype(hud_used) && hud_used.move_intent) - hud_used.move_intent.update_icon() + refresh_hud_element(HUD_MOVEMENT) return TRUE return FALSE diff --git a/code/modules/mob/observer/eye/freelook/chunk.dm b/code/modules/mob/observer/eye/freelook/chunk.dm index 97c869dfc190..090b232c7390 100644 --- a/code/modules/mob/observer/eye/freelook/chunk.dm +++ b/code/modules/mob/observer/eye/freelook/chunk.dm @@ -128,7 +128,7 @@ if(seenby.len) updating = TRUE spawn(UPDATE_BUFFER) // Batch large changes, such as many doors opening or closing at once - if(updating) // Check if we're still updating, a forced update may have occured. + if(updating) // Check if we're still updating, a forced update may have occurred. update() else dirty = TRUE // If this chunk is seen by noone, simply mark it as dirty and do nothing diff --git a/code/modules/mob/observer/observer.dm b/code/modules/mob/observer/observer.dm index 94db42cade22..e76f34229eb2 100644 --- a/code/modules/mob/observer/observer.dm +++ b/code/modules/mob/observer/observer.dm @@ -41,6 +41,9 @@ var/global/const/GHOST_IMAGE_ALL = ~GHOST_IMAGE_NONE SSghost_images.queue_global_image_update() . = ..() +/mob/observer/can_slip(magboots_only = FALSE) + return FALSE + /mob/observer/get_movement_delay(travel_dir) return 1 diff --git a/code/modules/mob/skills/skill.dm b/code/modules/mob/skills/skill.dm index 87cad27fdb3d..9d75a5d591e3 100644 --- a/code/modules/mob/skills/skill.dm +++ b/code/modules/mob/skills/skill.dm @@ -331,7 +331,7 @@ category = /decl/skill_category/engineering uid = "skill_electrical" fallback_key = "/decl/hierarchy/skill/engineering/electrical" - desc = "This skill describes your knowledge of electronics and the underlying physics. A low level of this skill implies you know how to lay out wiring and configure powernets, a high level of this skill is required for working complex electronic devices such as circuits or bots." + desc = "This skill describes your knowledge of electronics and the underlying physics. A low level of this skill implies you know how to lay out wiring and configure power networks, a high level of this skill is required for working complex electronic devices such as circuits or bots." levels = list( "Unskilled" = "You know that electrical wires are dangerous and getting shocked is bad; you can see and report electrical malfunctions such as broken wires or malfunctioning APCs. You can change a light bulb, and you know how to replace a battery or charge up the equipment you normally use.
- Every time you open the hacking panel, wires are randomized.
- Every time you pulse a wire, there is a chance you pulse a different one.
- Every time you cut a wire, there is a chance you cut/mend extra ones.
- You can misconnect remote signalling devices.", "Basic" = "You can do basic wiring; you can lay cable for solars or the engine. You can repair broken wiring and build simple electrical equipment like light fixtures or APCs. You know the basics of circuits and understand how to protect yourself from electrical shock. You can probably hack a vending machine.
- Every time you open the hacking panel, some wires might be duplicated.", diff --git a/code/modules/mob/skills/skill_verbs.dm b/code/modules/mob/skills/skill_verbs.dm index 36be6e7adfec..fc051b139594 100644 --- a/code/modules/mob/skills/skill_verbs.dm +++ b/code/modules/mob/skills/skill_verbs.dm @@ -88,7 +88,7 @@ Robots and antags can instruct. return if(target.too_many_buffs(/datum/skill_buff/instruct)) var/decl/pronouns/pronouns = target.get_pronouns(ignore_coverings = TRUE) - to_chat(src, SPAN_WARNING("\The [target] [pronouns.is] exhausted from all the training [pronouns.he] recieved.")) + to_chat(src, SPAN_WARNING("\The [target] [pronouns.is] exhausted from all the training [pronouns.he] received.")) return if(!get_options) diff --git a/code/modules/mob_holder/_holder.dm b/code/modules/mob_holder/_holder.dm index 002814c0c09a..18a1f358dd90 100644 --- a/code/modules/mob_holder/_holder.dm +++ b/code/modules/mob_holder/_holder.dm @@ -46,7 +46,8 @@ icon = initial(icon) /obj/item/holder/Exited(atom/movable/am, atom/new_loc) - am.vis_flags = initial(am.vis_flags) + if(!(locate(/mob) in contents)) + am.vis_flags = initial(am.vis_flags) . = ..() /obj/item/holder/proc/destroy_all() @@ -72,15 +73,15 @@ update_state() /obj/item/holder/dropped() - ..() + . = ..() update_state(1) /obj/item/holder/throw_impact(atom/hit_atom, datum/thrownthing/TT) - ..() + . = ..() update_state(1) /obj/item/holder/proc/update_state(var/delay) - set waitfor = 0 + set waitfor = FALSE for(var/mob/M in contents) unregister_all_movement(last_holder, M) @@ -97,11 +98,13 @@ mob_container.dropInto(loc) M.reset_view() qdel(src) - else if(last_holder != loc) + return + + if(last_holder != loc) for(var/mob/M in contents) register_all_movement(loc, M) update_icon() - last_holder = loc + last_holder = loc /obj/item/holder/onDropInto(var/atom/movable/AM) if(ismob(loc)) // Bypass our holding mob and drop directly to its loc diff --git a/code/modules/modular_computers/computers/subtypes/dev_holo.dm b/code/modules/modular_computers/computers/subtypes/dev_holo.dm index f2460d4efdf2..838bce869e9a 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_holo.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_holo.dm @@ -1,6 +1,6 @@ /obj/item/modular_computer/holotablet name = "holotablet" - desc = "An holoemitter-fitted device designed for writing reports and notes." + desc = "A holoemitter-fitted device designed for writing reports and notes." icon = 'icons/obj/modular_computers/holo/basic.dmi' icon_state = ICON_STATE_WORLD diff --git a/code/modules/modular_computers/file_system/programs/generic/supply.dm b/code/modules/modular_computers/file_system/programs/generic/supply.dm index 39f092d64a6a..b0f425734159 100644 --- a/code/modules/modular_computers/file_system/programs/generic/supply.dm +++ b/code/modules/modular_computers/file_system/programs/generic/supply.dm @@ -395,7 +395,7 @@ return var/t = "" - t += "[global.using_map.station_name] Supply Requisition Reciept
" + t += "[global.using_map.station_name] Supply Requisition Receipt
" t += "INDEX: #[O.ordernum]
" t += "REQUESTED BY: [O.orderedby]
" t += "ASSIGNMENT: [O.orderedrank]
" diff --git a/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm b/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm index 8683438c0726..a1b613ac1ced 100644 --- a/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm +++ b/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm @@ -4,7 +4,7 @@ program_icon_state = "generic" program_key_state = "mining_key" program_menu_icon = "person" - extended_desc = "This program is capable of reconstructing damaged AI systems. It can also be used to upload basic laws to the AI. Requires direct AI connection via inteliCard slot." + extended_desc = "This program is capable of reconstructing damaged AI systems. It can also be used to upload basic laws to the AI. Requires direct AI connection via intelliCard slot." size = 12 read_access = list(access_bridge) requires_access_to_run = 0 diff --git a/code/modules/modular_computers/file_system/reports/report.dm b/code/modules/modular_computers/file_system/reports/report.dm index efb782c507fc..7d391fbb982c 100644 --- a/code/modules/modular_computers/file_system/reports/report.dm +++ b/code/modules/modular_computers/file_system/reports/report.dm @@ -143,7 +143,7 @@ no_html will strip any html, possibly killing useful formatting in the process. if(no_html) . = html2pencode(.) -//recipient reports have a designated recipients field, for recieving submitted reports. +//recipient reports have a designated recipients field, for receiving submitted reports. /datum/computer_file/report/recipient var/datum/report_field/people/list_from_manifest/recipients diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm index c25e0abb1d5b..72345bf49394 100644 --- a/code/modules/modular_computers/hardware/ai_slot.dm +++ b/code/modules/modular_computers/hardware/ai_slot.dm @@ -1,7 +1,7 @@ -// A wrapper that allows the computer to contain an inteliCard. +// A wrapper that allows the computer to contain an intelliCard. /obj/item/stock_parts/computer/ai_slot - name = "inteliCard slot" - desc = "An IIS interlink with connection uplinks that allow the device to interface with most common inteliCard models. Too large to fit into tablets. Uses a lot of power when active." + name = "intelliCard slot" + desc = "An IIS interlink with connection uplinks that allow the device to interface with most common intelliCard models. Too large to fit into tablets. Uses a lot of power when active." icon_state = "aislot" hardware_size = 1 critical = 0 @@ -58,7 +58,7 @@ device = locate() in src if(!device.stored_card) - to_chat(user, "There is no intellicard connected to \the [src].") + to_chat(user, "There is no intelliCard connected to \the [src].") return device.do_eject_ai(user) diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm index 7c47bf5a7ba4..52f0b478b337 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -2,7 +2,7 @@ // have tremendeous capacity in comparsion. Higher tier cells would provide your device with nearly infinite battery life, which is something i want to avoid. /obj/item/stock_parts/computer/battery_module name = "standard battery" - desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops. It's rating is 75 Wh." + desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops. Its rating is 75 Wh." icon_state = "battery_normal" critical = 1 origin_tech = @'{"powerstorage":1,"engineering":1}' @@ -35,7 +35,7 @@ /obj/item/stock_parts/computer/battery_module/advanced name = "advanced battery" - desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. It's rating is 110 Wh." + desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. Its rating is 110 Wh." icon_state = "battery_advanced" origin_tech = @'{"powerstorage":2,"engineering":2}' hardware_size = 2 @@ -44,7 +44,7 @@ /obj/item/stock_parts/computer/battery_module/super name = "super battery" - desc = "A very advanced power cell, often used in high-end devices, or as uninterruptable power supply for important consoles or servers. It's rating is 150 Wh." + desc = "A very advanced power cell, often used in high-end devices, or as uninterruptible power supply for important consoles or servers. Its rating is 150 Wh." icon_state = "battery_super" origin_tech = @'{"powerstorage":3,"engineering":3}' hardware_size = 2 @@ -53,7 +53,7 @@ /obj/item/stock_parts/computer/battery_module/ultra name = "ultra battery" - desc = "A very advanced large power cell. It's often used as uninterruptable power supply for critical consoles or servers. It's rating is 200 Wh." + desc = "A very advanced large power cell. It's often used as an uninterruptible power supply for critical consoles or servers. Its rating is 200 Wh." icon_state = "battery_ultra" origin_tech = @'{"powerstorage":5,"engineering":4}' hardware_size = 3 @@ -62,7 +62,7 @@ /obj/item/stock_parts/computer/battery_module/micro name = "micro battery" - desc = "A small power cell, commonly seen in most portable microcomputers. It's rating is 50 Wh." + desc = "A small power cell, commonly seen in most portable microcomputers. Its rating is 50 Wh." icon_state = "battery_micro" origin_tech = @'{"powerstorage":2,"engineering":2}' battery_rating = 50 @@ -70,7 +70,7 @@ /obj/item/stock_parts/computer/battery_module/nano name = "nano battery" - desc = "A tiny power cell, commonly seen in low-end portable microcomputers. It's rating is 30 Wh." + desc = "A tiny power cell, commonly seen in low-end portable microcomputers. Its rating is 30 Wh." icon_state = "battery_nano" battery_rating = 30 material = /decl/material/solid/metal/steel diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 562ea9a221aa..7915dc05bac3 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -31,7 +31,7 @@ /obj/item/stock_parts/computer/network_card/advanced name = "advanced network card" - desc = "An advanced network card for usage with standard network protocols. It's transmitter is strong enough to connect even when far away." + desc = "An advanced network card for usage with standard network protocols. Its transmitter is strong enough to connect even when far away." long_range = 1 origin_tech = @'{"programming":4,"engineering":2}' power_usage = 100 // Better range but higher power usage. diff --git a/code/modules/modular_computers/hardware/processor_unit.dm b/code/modules/modular_computers/hardware/processor_unit.dm index 95cf5d8525d1..9c803c2c2ad2 100644 --- a/code/modules/modular_computers/hardware/processor_unit.dm +++ b/code/modules/modular_computers/hardware/processor_unit.dm @@ -25,7 +25,7 @@ /obj/item/stock_parts/computer/processor_unit/photonic name = "photonic processor" - desc = "An advanced experimental CPU that uses photonic core instead of regular circuitry. It is more power efficient than its elecron analog." + desc = "An advanced experimental CPU that uses photonic core instead of regular circuitry. It is more power efficient than its electron analogue." icon_state = "cpu_normal_photonic" hardware_size = 2 power_usage = 50 @@ -36,7 +36,7 @@ /obj/item/stock_parts/computer/processor_unit/photonic/small name = "photonic microprocessor" - desc = "An advanced miniaturised CPU for use in portable devices. It uses photonic core instead of regular circuitry. It is more power efficient than its elecron analog." + desc = "An advanced miniaturised CPU for use in portable devices. It uses photonic core instead of regular circuitry. It is more power efficient than its electron analogue." icon_state = "cpu_small_photonic" hardware_size = 1 power_usage = 10 diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index f4de33b53613..00f823ff9fba 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -14,19 +14,40 @@ var/obj/item/modular_computer/tablet/fabricated_tablet = null // Utility vars - var/state = 0 // 0: Select device type, 1: Select loadout, 2: Payment, 3: Thankyou screen - var/devtype = 0 // 0: None(unselected), 1: Laptop, 2: Tablet - var/total_price = 0 // Price of currently vended device. + var/const/STATE_DEVICE_SEL = 0 + var/const/STATE_LOADOUT_SEL = 1 + var/const/STATE_PAYMENT = 2 + var/const/STATE_THANK_YOU = 3 + var/state = STATE_DEVICE_SEL + var/const/DEVICE_TYPE_NONE = 0 + var/const/DEVICE_TYPE_LAPTOP = 1 + var/const/DEVICE_TYPE_TABLET = 2 + var/devtype = DEVICE_TYPE_NONE + /// The calculated price of the currently vended device. + var/total_price = 0 // Device loadout - var/dev_cpu = 1 // 1: Default, 2: Upgraded - var/dev_battery = 1 // 1: Default, 2: Upgraded, 3: Advanced - var/dev_disk = 1 // 1: Default, 2: Upgraded, 3: Advanced - var/dev_netcard = 0 // 0: None, 1: Basic, 2: Long-Range - var/dev_tesla = 0 // 0: None, 1: Standard - var/dev_nanoprint = 0 // 0: None, 1: Standard - var/dev_card = 0 // 0: None, 1: Standard - var/dev_aislot = 0 // 0: None, 1: Standard + var/const/COMPONENT_NONE = 0 + var/const/COMPONENT_PRESENT = 1 + var/const/COMPONENT_BASIC = 1 + var/const/COMPONENT_UPGRADED = 2 + var/const/COMPONENT_ADVANCED = 3 + /// What kind of CPU are we adding? Valid states: COMPONENT_BASIC, COMPONENT_UPGRADED + var/dev_cpu = COMPONENT_BASIC + /// What kind of battery are we adding? Valid states: COMPONENT_BASIC, COMPONENT_UPGRADED, COMPONENT_ADVANCED + var/dev_battery = COMPONENT_BASIC + /// What kind of battery are we adding? Valid states: COMPONENT_BASIC, COMPONENT_UPGRADED, COMPONENT_ADVANCED + var/dev_disk = COMPONENT_BASIC + /// What kind of network card are we adding? Valid states: COMPONENT_NONE, COMPONENT_BASIC, COMPONENT_UPGRADED + var/dev_netcard = COMPONENT_NONE + /// Are we adding a tesla relay? Valid states: COMPONENT_NONE, COMPONENT_PRESENT + var/dev_tesla = COMPONENT_NONE + /// Are we adding a printer? Valid states: COMPONENT_NONE, COMPONENT_PRESENT + var/dev_nanoprint = COMPONENT_NONE + /// Are we adding a card reader? Valid states: COMPONENT_NONE, COMPONENT_PRESENT + var/dev_card = COMPONENT_NONE + /// Are we adding an AI slot? Valid states: COMPONENT_NONE, COMPONENT_PRESENT + var/dev_aislot = COMPONENT_NONE /obj/machinery/lapvend/on_update_icon() if(stat & BROKEN) @@ -38,92 +59,91 @@ // Removes all traces of old order and allows you to begin configuration from scratch. /obj/machinery/lapvend/proc/reset_order() - state = 0 - devtype = 0 - if(fabricated_laptop) - qdel(fabricated_laptop) - fabricated_laptop = null - if(fabricated_tablet) - qdel(fabricated_tablet) - fabricated_tablet = null - dev_cpu = 1 - dev_battery = 1 - dev_disk = 1 - dev_netcard = 0 - dev_tesla = 0 - dev_nanoprint = 0 - dev_card = 0 - dev_aislot = 0 + state = STATE_DEVICE_SEL + devtype = DEVICE_TYPE_NONE + QDEL_NULL(fabricated_laptop) + QDEL_NULL(fabricated_tablet) + dev_cpu = COMPONENT_BASIC + dev_battery = COMPONENT_BASIC + dev_disk = COMPONENT_BASIC + dev_netcard = COMPONENT_NONE + dev_tesla = COMPONENT_NONE + dev_nanoprint = COMPONENT_NONE + dev_card = COMPONENT_NONE + dev_aislot = COMPONENT_NONE // Recalculates the price and optionally even fabricates the device. -/obj/machinery/lapvend/proc/fabricate_and_recalc_price(var/fabricate = 0) +/obj/machinery/lapvend/proc/fabricate_and_recalc_price(var/fabricate = FALSE) total_price = 0 - if(devtype == 1) // Laptop, generally cheaper to make it accessible for most station roles + if(devtype == DEVICE_TYPE_LAPTOP) // Laptop, generally cheaper to make it accessible for most station roles var/datum/extension/assembly/modular_computer/assembly if(fabricate) fabricated_laptop = new(src) assembly = get_extension(fabricated_laptop, /datum/extension/assembly) - total_price = 99 + total_price = atom_info_repository.get_single_worth_for(/obj/item/modular_computer/laptop) switch(dev_cpu) - if(1) + if(COMPONENT_BASIC) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/processor_unit/small) if(fabricate) assembly.add_replace_component(null, PART_CPU, new/obj/item/stock_parts/computer/processor_unit/small(fabricated_laptop)) - if(2) + if(COMPONENT_UPGRADED) if(fabricate) assembly.add_replace_component(null, PART_CPU, new/obj/item/stock_parts/computer/processor_unit(fabricated_laptop)) - total_price += 299 + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/processor_unit) switch(dev_battery) - if(1) // Basic(750C) + if(COMPONENT_BASIC) // Basic(750C) if(fabricate) assembly.add_replace_component(null, PART_BATTERY, new/obj/item/stock_parts/computer/battery_module(fabricated_laptop)) - if(2) // Upgraded(1100C) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/battery_module) + if(COMPONENT_UPGRADED) // Upgraded(1100C) if(fabricate) assembly.add_replace_component(null, PART_BATTERY, new/obj/item/stock_parts/computer/battery_module/advanced(fabricated_laptop)) - total_price += 199 - if(3) // Advanced(1500C) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/battery_module/advanced) + if(COMPONENT_ADVANCED) // Advanced(1500C) if(fabricate) assembly.add_replace_component(null, PART_BATTERY, new/obj/item/stock_parts/computer/battery_module/super(fabricated_laptop)) - total_price += 499 + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/battery_module/super) switch(dev_disk) - if(1) // Basic(128GQ) + if(COMPONENT_BASIC) // Basic(128GQ) if(fabricate) assembly.add_replace_component(null, PART_HDD, new/obj/item/stock_parts/computer/hard_drive(fabricated_laptop)) - if(2) // Upgraded(256GQ) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/hard_drive) + if(COMPONENT_UPGRADED) // Upgraded(256GQ) if(fabricate) assembly.add_replace_component(null, PART_HDD, new/obj/item/stock_parts/computer/hard_drive/advanced(fabricated_laptop)) - total_price += 99 - if(3) // Advanced(512GQ) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/hard_drive/advanced) + if(COMPONENT_ADVANCED) // Advanced(512GQ) if(fabricate) assembly.add_replace_component(null, PART_HDD, new/obj/item/stock_parts/computer/hard_drive/super(fabricated_laptop)) - total_price += 299 + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/hard_drive/super) switch(dev_netcard) - if(1) // Basic(Short-Range) + if(COMPONENT_BASIC) // Basic(Short-Range) if(fabricate) assembly.add_replace_component(null, PART_NETWORK, new/obj/item/stock_parts/computer/network_card(fabricated_laptop)) - total_price += 99 - if(2) // Advanced (Long Range) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/network_card) + if(COMPONENT_UPGRADED) // Advanced (Long Range) if(fabricate) assembly.add_replace_component(null, PART_NETWORK, new/obj/item/stock_parts/computer/network_card/advanced(fabricated_laptop)) - total_price += 299 + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/network_card/advanced) if(dev_tesla) - total_price += 399 if(fabricate) assembly.add_replace_component(null, PART_TESLA, new/obj/item/stock_parts/computer/tesla_link(fabricated_laptop)) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/tesla_link) if(dev_nanoprint) - total_price += 99 if(fabricate) assembly.add_replace_component(null, PART_PRINTER, new/obj/item/stock_parts/computer/nano_printer(fabricated_laptop)) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/nano_printer) if(dev_card) - total_price += 199 if(fabricate) assembly.add_replace_component(null, PART_CARD, new/obj/item/stock_parts/computer/card_slot(fabricated_laptop)) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/card_slot) if(dev_aislot) - total_price += 499 if(fabricate) assembly.add_replace_component(null, PART_AI, new/obj/item/stock_parts/computer/ai_slot(fabricated_laptop)) + total_price += atom_info_repository.get_single_worth_for(/obj/item/stock_parts/computer/ai_slot) return total_price - else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this. + else if(devtype == DEVICE_TYPE_TABLET) // Tablet, more expensive, not everyone could probably afford this. var/datum/extension/assembly/modular_computer/assembly if(fabricate) fabricated_tablet = new(src) @@ -131,35 +151,35 @@ assembly.add_replace_component(null, PART_CPU, new/obj/item/stock_parts/computer/processor_unit/small(fabricated_tablet)) total_price = 199 switch(dev_battery) - if(1) // Basic(300C) + if(COMPONENT_BASIC) // Basic(300C) if(fabricate) assembly.add_replace_component(null, PART_BATTERY, new/obj/item/stock_parts/computer/battery_module/nano(fabricated_tablet)) - if(2) // Upgraded(500C) + if(COMPONENT_UPGRADED) // Upgraded(500C) if(fabricate) assembly.add_replace_component(null, PART_BATTERY, new/obj/item/stock_parts/computer/battery_module/micro(fabricated_tablet)) total_price += 199 - if(3) // Advanced(750C) + if(COMPONENT_ADVANCED) // Advanced(750C) if(fabricate) assembly.add_replace_component(null, PART_BATTERY, new/obj/item/stock_parts/computer/battery_module(fabricated_tablet)) total_price += 499 switch(dev_disk) - if(1) // Basic(32GQ) + if(COMPONENT_BASIC) // Basic(32GQ) if(fabricate) assembly.add_replace_component(null, PART_HDD, new/obj/item/stock_parts/computer/hard_drive/micro(fabricated_tablet)) - if(2) // Upgraded(64GQ) + if(COMPONENT_UPGRADED) // Upgraded(64GQ) if(fabricate) assembly.add_replace_component(null, PART_HDD, new/obj/item/stock_parts/computer/hard_drive/small(fabricated_tablet)) total_price += 99 - if(3) // Advanced(128GQ) + if(COMPONENT_ADVANCED) // Advanced(128GQ) if(fabricate) assembly.add_replace_component(null, PART_HDD, new/obj/item/stock_parts/computer/hard_drive(fabricated_tablet)) total_price += 299 switch(dev_netcard) - if(1) // Basic(Short-Range) + if(COMPONENT_BASIC) // Basic(Short-Range) if(fabricate) assembly.add_replace_component(null, PART_NETWORK, new/obj/item/stock_parts/computer/network_card(fabricated_tablet)) total_price += 99 - if(2) // Advanced (Long Range) + if(COMPONENT_UPGRADED) // Advanced (Long Range) if(fabricate) assembly.add_replace_component(null, PART_NETWORK, new/obj/item/stock_parts/computer/network_card/advanced(fabricated_tablet)) total_price += 299 @@ -182,76 +202,75 @@ return total_price return 0 - - - - -/obj/machinery/lapvend/Topic(href, href_list) - if(..()) - return 1 +/obj/machinery/lapvend/OnTopic(mob/user, href_list) + if((. = ..())) + return if(href_list["pick_device"]) if(state) // We've already picked a device type - return 0 + return TOPIC_REFRESH // Your UI must be out of date (or you're trying to href hack...) devtype = text2num(href_list["pick_device"]) - state = 1 - fabricate_and_recalc_price(0) - return 1 + state = STATE_LOADOUT_SEL + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH if(href_list["clean_order"]) reset_order() - return 1 - if((state != 1) && devtype) // Following IFs should only be usable when in the Select Loadout mode - return 0 + return TOPIC_REFRESH + // Following IFs should only be usable when in the Select Loadout mode. + if(state != STATE_LOADOUT_SEL) + return TOPIC_NOACTION + // Proceed to payment if(href_list["confirm_order"]) - state = 2 // Wait for ID swipe for payment processing - fabricate_and_recalc_price(0) - return 1 + state = STATE_PAYMENT // Wait for ID swipe for payment processing + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH + // Hardware selection if(href_list["hw_cpu"]) dev_cpu = text2num(href_list["hw_cpu"]) - fabricate_and_recalc_price(0) - return 1 + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH if(href_list["hw_battery"]) dev_battery = text2num(href_list["hw_battery"]) - fabricate_and_recalc_price(0) - return 1 + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH if(href_list["hw_disk"]) dev_disk = text2num(href_list["hw_disk"]) - fabricate_and_recalc_price(0) - return 1 + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH if(href_list["hw_netcard"]) dev_netcard = text2num(href_list["hw_netcard"]) - fabricate_and_recalc_price(0) - return 1 + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH if(href_list["hw_tesla"]) dev_tesla = text2num(href_list["hw_tesla"]) - fabricate_and_recalc_price(0) - return 1 + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH if(href_list["hw_nanoprint"]) dev_nanoprint = text2num(href_list["hw_nanoprint"]) - fabricate_and_recalc_price(0) - return 1 + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH if(href_list["hw_card"]) dev_card = text2num(href_list["hw_card"]) - fabricate_and_recalc_price(0) - return 1 + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH if(href_list["hw_aislot"]) dev_aislot = text2num(href_list["hw_aislot"]) - fabricate_and_recalc_price(0) - return 1 - return 0 + fabricate_and_recalc_price(FALSE) + return TOPIC_REFRESH + return TOPIC_NOACTION /obj/machinery/lapvend/interface_interact(var/mob/user) ui_interact(user) return TRUE /obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - if(stat & (BROKEN | NOPOWER | MAINT)) + if(inoperable(MAINT)) if(ui) ui.close() - return 0 - var/list/data[0] + return + var/list/data = list() data["state"] = state - if(state == 1) + if(state == STATE_LOADOUT_SEL) data["devtype"] = devtype data["hw_battery"] = dev_battery data["hw_disk"] = dev_disk @@ -261,7 +280,7 @@ data["hw_card"] = dev_card data["hw_cpu"] = dev_cpu data["hw_aislot"] = dev_aislot - if(state == 1 || state == 2) + if(state == STATE_LOADOUT_SEL || state == STATE_PAYMENT) var/decl/currency/cur = GET_DECL(global.using_map.default_currency) data["totalprice"] = cur.format_value(total_price) @@ -273,29 +292,26 @@ ui.set_auto_update(1) -/obj/machinery/lapvend/attackby(obj/item/W as obj, mob/user as mob) - // Awaiting payment state - if(state == 2) - if(process_payment(W)) - fabricate_and_recalc_price(1) - flick("world-vend", src) - if((devtype == 1) && fabricated_laptop) - fabricated_laptop.forceMove(src.loc) - fabricated_laptop.update_icon() - fabricated_laptop.update_verbs() - fabricated_laptop = null - else if((devtype == 2) && fabricated_tablet) - fabricated_tablet.forceMove(src.loc) - fabricated_tablet.update_verbs() - fabricated_tablet = null - ping("Enjoy your new product!") - state = 3 - return 1 - return 0 +/obj/machinery/lapvend/attackby(obj/item/held_item as obj, mob/user as mob) + if(state == STATE_PAYMENT && process_payment(held_item)) + fabricate_and_recalc_price(TRUE) + flick("world-vend", src) + if((devtype == DEVICE_TYPE_LAPTOP) && fabricated_laptop) + fabricated_laptop.forceMove(src.loc) + fabricated_laptop.update_icon() + fabricated_laptop.update_verbs() + fabricated_laptop = null + else if((devtype == DEVICE_TYPE_TABLET) && fabricated_tablet) + fabricated_tablet.forceMove(src.loc) + fabricated_tablet.update_verbs() + fabricated_tablet = null + ping("Enjoy your new product!") + state = STATE_THANK_YOU + return TRUE return ..() -// Simplified payment processing, returns 1 on success. +// Simplified payment processing, returns TRUE on success. /obj/machinery/lapvend/proc/process_payment(var/obj/item/charge_stick/I) if(!istype(I)) ping("Invalid payment format.") diff --git a/code/modules/modular_computers/terminal/terminal.dm b/code/modules/modular_computers/terminal/terminal.dm index dec38ed92f15..02f13da48bc2 100644 --- a/code/modules/modular_computers/terminal/terminal.dm +++ b/code/modules/modular_computers/terminal/terminal.dm @@ -266,4 +266,4 @@ if(OS_NETWORK_ERROR) return "Unable to connect to the network" - return "An unspecified error occured." \ No newline at end of file + return "An unspecified error occurred." \ No newline at end of file diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 573c28223f17..802d6782d279 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -111,7 +111,7 @@ moving = FALSE //For children to override -/atom/movable/proc/can_fall(var/anchor_bypass = FALSE, var/turf/location_override = loc) +/atom/movable/proc/can_fall(anchor_bypass = FALSE, turf/location_override = loc) if(immune_to_floor_hazards()) return FALSE @@ -137,16 +137,16 @@ return TRUE -/obj/can_fall(var/anchor_bypass = FALSE, var/turf/location_override = loc) - return ..(anchor_fall) +/obj/can_fall(anchor_bypass = FALSE, turf/location_override = loc) + return ..(anchor_fall, location_override) -/obj/effect/can_fall(var/anchor_bypass = FALSE, var/turf/location_override = loc) +/obj/effect/can_fall(anchor_bypass = FALSE, turf/location_override = loc) return FALSE -/obj/effect/decal/cleanable/can_fall(var/anchor_bypass = FALSE, var/turf/location_override = loc) +/obj/effect/decal/cleanable/can_fall(anchor_bypass = FALSE, turf/location_override = loc) return TRUE -/obj/item/pipe/can_fall(var/anchor_bypass = FALSE, var/turf/location_override = loc) +/obj/item/pipe/can_fall(anchor_bypass = FALSE, turf/location_override = loc) var/turf/open/below = loc below = below.below @@ -158,18 +158,21 @@ if((locate(/obj/structure/disposalpipe/up) in below) || locate(/obj/machinery/atmospherics/pipe/zpipe/up) in below) return FALSE -/mob/living/can_fall(var/anchor_bypass = FALSE, var/turf/location_override = loc) +/mob/living/can_fall(anchor_bypass = FALSE, turf/location_override = loc) if((. = ..())) var/decl/species/my_species = get_species() if(my_species) return my_species.can_fall(src) /atom/movable/proc/protected_from_fall_damage(var/turf/landing) - if(!!(locate(/obj/structure/stairs) in landing)) - return TRUE - var/turf/wall/natural/ramp = landing - if(istype(ramp) && ramp.ramp_slope_direction) // walking down a ramp - return TRUE + // Stairs and ramps will not save you from a high drop. + if(get_fall_height() <= 1) + if(!!(locate(/obj/structure/stairs) in landing)) + return TRUE + var/turf/wall/natural/ramp = landing + if(istype(ramp) && ramp.ramp_slope_direction) // walking down a ramp + return TRUE + return FALSE /mob/protected_from_fall_damage(var/turf/landing) . = ..() @@ -213,10 +216,16 @@ /atom/movable/proc/handle_fall_effect(var/turf/landing) SHOULD_CALL_PARENT(TRUE) - if(istype(landing) && landing.is_open()) - visible_message("\The [src] falls through \the [landing]!", "You hear a whoosh of displaced air.") + if(istype(landing) && can_fall() && landing.CanZPass(src, DOWN)) + visible_message( + SPAN_NOTICE("\The [src] falls through \the [landing]!"), + "You hear a whoosh of displaced air." + ) else - visible_message("\The [src] slams into \the [landing]!", "You hear something slam into the [global.using_map.ground_noun].") + visible_message( + SPAN_DANGER("\The [src] slams into [landing.is_open() ? "\the [landing]" : "an obstacle"]!"), + "You hear something slam into the [global.using_map.ground_noun]." + ) var/fall_damage = fall_damage() * get_fall_height() if(fall_damage > 0) for(var/mob/living/M in landing.contents) @@ -421,7 +430,7 @@ owner = null . = ..() -/atom/movable/z_observer/can_fall() +/atom/movable/z_observer/can_fall(anchor_bypass = FALSE, turf/location_override = loc) return FALSE /atom/movable/z_observer/explosion_act() diff --git a/code/modules/multiz/zmimic/mimic_movable.dm b/code/modules/multiz/zmimic/mimic_movable.dm index 04644bcdde71..2cbf1c065f4e 100644 --- a/code/modules/multiz/zmimic/mimic_movable.dm +++ b/code/modules/multiz/zmimic/mimic_movable.dm @@ -49,7 +49,7 @@ mouse_opacity = FALSE abstract_type = /atom/movable/openspace // unsure if this is valid, check with Lohi -- Yes, it's valid. -/atom/movable/openspace/can_fall() +/atom/movable/openspace/can_fall(anchor_bypass = FALSE, turf/location_override = loc) return FALSE // No blowing up abstract objects. diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm index 4e1f89bb2d45..51a7a6eca757 100644 --- a/code/modules/nano/interaction/default.dm +++ b/code/modules/nano/interaction/default.dm @@ -45,13 +45,13 @@ var/global/datum/topic_state/default/default_topic_state = new 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 + // If we're installed in a chassi, rather than transfered to an intelliCard or other container, then check if we have camera view if(is_in_chassis()) //stop AIs from leaving windows open and using then after they lose vision if(cameranet && !cameranet.is_turf_visible(get_turf(src_object))) return STATUS_CLOSE return STATUS_INTERACTIVE - else if(get_dist(src_object, src) <= get_effective_view(client)) // View does not return what one would expect while installed in an inteliCard + else if(get_dist(src_object, src) <= get_effective_view(client)) // View does not return what one would expect while installed in an intelliCard return STATUS_INTERACTIVE return STATUS_CLOSE diff --git a/code/modules/nano/interaction/hands.dm b/code/modules/nano/interaction/hands.dm index fe9a3df4c4fd..3122925e2cc0 100644 --- a/code/modules/nano/interaction/hands.dm +++ b/code/modules/nano/interaction/hands.dm @@ -1,6 +1,7 @@ -/* - This state only checks if user is conscious. -*/ +/** + This state checks if src_object is held in the user's hands (or a cyborg gripper), + as well as the default NanoUI interaction. +**/ var/global/datum/topic_state/hands/hands_topic_state = new /datum/topic_state/hands/can_use_topic(src_object, mob/user) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index e315b28c5809..f2125ae38e31 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -388,7 +388,7 @@ nanoui is used to open and update nano browser uis diff --git a/code/modules/organs/external/_external.dm b/code/modules/organs/external/_external.dm index c65f7e18f4d9..a249ef857038 100644 --- a/code/modules/organs/external/_external.dm +++ b/code/modules/organs/external/_external.dm @@ -148,7 +148,7 @@ if(bodytype != old_bodytype && apply_to_internal_organs) bodytype.rebuild_internal_organs(src, override_material) if(.) - update_icon(TRUE) + update_icon() /obj/item/organ/external/copy_from_mob_snapshot(datum/mob_snapshot/supplied_appearance) _icon_cache_key = null diff --git a/code/modules/organs/external/_external_icons.dm b/code/modules/organs/external/_external_icons.dm index 8f9b601a8c55..61ed76c361c8 100644 --- a/code/modules/organs/external/_external_icons.dm +++ b/code/modules/organs/external/_external_icons.dm @@ -43,7 +43,7 @@ var/global/list/limb_icon_cache = list() if(eyes) eyes.update_colour() /obj/item/organ/external/head/on_remove_effects(mob/living/last_owner) - update_icon(1) + update_icon() if(last_owner) SetName("[last_owner.real_name]'s head") addtimer(CALLBACK(last_owner, TYPE_PROC_REF(/mob, update_hair)), 1, TIMER_UNIQUE) diff --git a/code/modules/organs/internal/brain_computer.dm b/code/modules/organs/internal/brain_computer.dm index 78d419590260..919b10e056d7 100644 --- a/code/modules/organs/internal/brain_computer.dm +++ b/code/modules/organs/internal/brain_computer.dm @@ -1,7 +1,7 @@ // Robobrain. /obj/item/organ/internal/brain/robotic name = "computer intelligence core" - desc = "The pinnacle of artifical intelligence technology, conveniently stored in a fist-sized cube." + desc = "The pinnacle of artificial intelligence technology, conveniently stored in a fist-sized cube." icon = 'icons/obj/items/brain_interface_robotic.dmi' origin_tech = @'{"engineering":4,"materials":4,"wormholes":2,"programming":4}' material = /decl/material/solid/metal/steel diff --git a/code/modules/organs/internal/lungs.dm b/code/modules/organs/internal/lungs.dm index 7a9b0cb81803..2cfdb5d8fa1e 100644 --- a/code/modules/organs/internal/lungs.dm +++ b/code/modules/organs/internal/lungs.dm @@ -199,12 +199,12 @@ to_chat(owner, SPAN_NOTICE("It gets easier to breathe.")) breath_fail_ratio = clamp(0,breath_fail_ratio-0.05,1) - SET_HUD_ALERT(owner, /decl/hud_element/condition/oxygen, (failed_inhale * 2)) + SET_HUD_ALERT(owner, HUD_OXY, (failed_inhale * 2)) var/inhaled_gas_used = inhaling / 4 breath.adjust_gas(breath_type, -inhaled_gas_used, update = 0) //update afterwards - SET_HUD_ALERT(owner, /decl/hud_element/condition/toxins, 0) // Reset our toxins alert for now. + SET_HUD_ALERT(owner, HUD_TOX, 0) // Reset our toxins alert for now. if(!failed_inhale) // Enough gas to tell we're being poisoned via chemical burns or whatever. var/poison_total = 0 if(poison_types) @@ -212,7 +212,7 @@ if(poison_types[gname]) poison_total += breath.gas[gname] if(((poison_total/breath.total_moles)*breath_pressure) > safe_toxins_max) - SET_HUD_ALERT(owner, /decl/hud_element/condition/toxins, 1) + SET_HUD_ALERT(owner, HUD_TOX, 1) // Pass reagents from the gas into our body. // Presumably if you breathe it you have a specialized metabolism for it, so we drop/ignore breath_type. Also avoids @@ -252,7 +252,7 @@ if(failed_breath) handle_failed_breath() else - SET_HUD_ALERT(owner, /decl/hud_element/condition/oxygen, 0) + SET_HUD_ALERT(owner, HUD_OXY, 0) return failed_breath /obj/item/organ/internal/lungs/proc/handle_failed_breath() @@ -266,7 +266,7 @@ if(damage || GET_CHEMICAL_EFFECT(owner, CE_BREATHLOSS) || world.time > last_successful_breath + 2 MINUTES) owner.take_damage(HUMAN_MAX_OXYLOSS*breath_fail_ratio, OXY) - SET_HUD_ALERT_MAX(owner, /decl/hud_element/condition/oxygen, 2) + SET_HUD_ALERT_MAX(owner, HUD_OXY, 2) last_int_pressure = 0 /obj/item/organ/internal/lungs/proc/handle_temperature_effects(datum/gas_mixture/breath) @@ -289,7 +289,7 @@ owner.apply_damage(damage, BURN, BP_HEAD, used_weapon = "Excessive Cold") else src.damage += damage - SET_HUD_ALERT(owner, /decl/hud_element/condition/fire, 1) + SET_HUD_ALERT(owner, HUD_FIRE, 1) else if(breath.temperature >= heat_1) if(prob(20)) to_chat(owner, "You feel your face burning and a searing heat in your lungs!") @@ -305,7 +305,7 @@ owner.apply_damage(damage, BURN, BP_HEAD, used_weapon = "Excessive Heat") else src.damage += damage - SET_HUD_ALERT(owner, /decl/hud_element/condition/fire, 2) + SET_HUD_ALERT(owner, HUD_FIRE, 2) //breathing in hot/cold air also heats/cools you a bit var/temp_adj = breath.temperature - owner.bodytemperature diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 84d4cbc4155e..9fb1bec56819 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -57,7 +57,8 @@ return /obj/item/organ/proc/refresh_action_button() - return action + if(!QDELETED(src) && istype(action)) + return action /obj/item/organ/attack_self(var/mob/user) return (owner && loc == owner && owner == user) @@ -632,7 +633,7 @@ var/global/list/ailment_reference_cache = list() STOP_PROCESSING(SSobj, src) vital_to_owner = null -//Since some types of organs completely ignore being detached, moved it to an overridable organ proc for external prosthetics +//Since some types of organs completely ignore being detached, moved it to an overrideable organ proc for external prosthetics /obj/item/organ/proc/set_detached(var/is_detached) if(is_detached) status |= ORGAN_CUT_AWAY diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 1f8f233fc7ce..141643e41cc5 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -1,3 +1,14 @@ +/mob + var/obj/screen/fullscreen/pain/pain + +/mob/Initialize() + pain = new(null, src) + . = ..() + +/mob/Destroy() + QDEL_NULL(pain) + . = ..() + /mob/proc/flash_pain(var/target) if(pain) var/matrix/M diff --git a/code/modules/overmap/ftl_shunt/core.dm b/code/modules/overmap/ftl_shunt/core.dm index 269e858851fb..c497e066fdab 100644 --- a/code/modules/overmap/ftl_shunt/core.dm +++ b/code/modules/overmap/ftl_shunt/core.dm @@ -374,7 +374,7 @@ A.overload_lighting(50) /obj/machinery/ftl_shunt/core/proc/handle_spacefloat(var/mob/living/human/H) - if(!H.check_space_footing()) + if(H.can_slip(magboots_only = TRUE)) //Flip a coin ... to_chat(H, SPAN_WARNING("Being untethered from a ship entering FTL is a bad idea, but you roll the dice...")) if(prob(50)) diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index cfbf0ad897dc..d1a572768517 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -257,4 +257,4 @@ /obj/machinery/shipsensors/weak heat_reduction = 0.2 - desc = "Miniturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." + desc = "Miniaturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." diff --git a/code/modules/overmap/ships/machines/fusion_thruster.dm b/code/modules/overmap/ships/machines/fusion_thruster.dm index c8e10e58d04b..0f4b673554c1 100644 --- a/code/modules/overmap/ships/machines/fusion_thruster.dm +++ b/code/modules/overmap/ships/machines/fusion_thruster.dm @@ -1,6 +1,6 @@ /obj/machinery/atmospherics/unary/engine/fusion name = "fusion nozzle" - desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propell the ship." + desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propel the ship." base_type = /obj/machinery/atmospherics/unary/engine/fusion engine_extension = /datum/extension/ship_engine/gas/fusion diff --git a/code/modules/overmap/ships/machines/gas_thruster.dm b/code/modules/overmap/ships/machines/gas_thruster.dm index 7650eb31085d..4d744491d3a2 100644 --- a/code/modules/overmap/ships/machines/gas_thruster.dm +++ b/code/modules/overmap/ships/machines/gas_thruster.dm @@ -1,6 +1,6 @@ /obj/machinery/atmospherics/unary/engine name = "rocket nozzle" - desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propell the ship." + desc = "Simple rocket nozzle, expelling gas at hypersonic velocities to propel the ship." icon = 'icons/obj/ship_engine.dmi' icon_state = "nozzle" layer = STRUCTURE_LAYER diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index a7d1cda991a9..d886c4defe19 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -57,7 +57,7 @@ text = "
" text += "This transmission is intended only for the addressee and may contain confidential information. Any unauthorized disclosure is strictly prohibited.
" - text += "If this transmission is recieved in error, please notify both the sender and the office of [global.using_map.boss_name] Internal Affairs immediately so that corrective action may be taken." + text += "If this transmission is received in error, please notify both the sender and the office of [global.using_map.boss_name] Internal Affairs immediately so that corrective action may be taken." text += "Failure to comply is a breach of regulation and may be prosecuted to the fullest extent of the law, where applicable." text += "" diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index a5008f8e2256..a6a51a71675b 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -11,6 +11,8 @@ pickup_sound = 'sound/foley/paperpickup2.ogg' material = /decl/material/solid/organic/cardboard item_flags = ITEM_FLAG_CAN_TAPE + /// If true, add a cosmetic overlay when we have contents. + var/has_paper_overlay = TRUE /obj/item/folder/blue desc = "A blue folder." @@ -28,9 +30,9 @@ desc = "A cyan folder." icon_state = "folder_cyan" -/obj/item/folder/on_update_icon(var/paper_overlay = TRUE) +/obj/item/folder/on_update_icon() . = ..() - if(paper_overlay && length(contents)) + if(has_paper_overlay && length(contents)) add_overlay("folder_paper") /obj/item/folder/attackby(obj/item/W, mob/user) @@ -88,10 +90,11 @@ name = "envelope" desc = "A thick envelope. You can't see what's inside." icon_state = "envelope_sealed" + has_paper_overlay = FALSE var/sealed = 1 /obj/item/folder/envelope/on_update_icon() - . = ..(paper_overlay = FALSE) + . = ..() if(sealed) icon_state = "envelope_sealed" else diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index eb9bbb76a03b..6bd2a2524065 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -219,6 +219,10 @@ . = ..() update_icon() +/obj/item/camera/loaded/Initialize() + . = ..() + film = new /obj/item/camera_film(src) + /obj/item/camera/on_update_icon() . = ..() var/datum/extension/base_icon_state/bis = get_extension(src, /datum/extension/base_icon_state) diff --git a/code/modules/paperwork/printer.dm b/code/modules/paperwork/printer.dm index 0f91439ab58b..cfb02e78a147 100644 --- a/code/modules/paperwork/printer.dm +++ b/code/modules/paperwork/printer.dm @@ -5,7 +5,7 @@ //////////////////////////////////////////////////////////////////////////////////////// /obj/item/stock_parts/printer name = "printer" - desc = "A full fledged laser printer. This one is meant to be installed inside another machine. Comes with its own paper feeder and toner slot." + desc = "A full-fledged laser printer. This one is meant to be installed inside another machine. Comes with its own paper feeder and toner slot." icon = 'icons/obj/items/stock_parts/modular_components.dmi' icon_state = "printer" randpixel = 5 diff --git a/code/game/objects/effects/decals/posters/_poster.dm b/code/modules/posters/_poster.dm similarity index 100% rename from code/game/objects/effects/decals/posters/_poster.dm rename to code/modules/posters/_poster.dm diff --git a/code/game/objects/effects/decals/posters/_poster_design.dm b/code/modules/posters/_poster_design.dm similarity index 100% rename from code/game/objects/effects/decals/posters/_poster_design.dm rename to code/modules/posters/_poster_design.dm diff --git a/code/game/objects/effects/decals/posters/bs12.dm b/code/modules/posters/bs12.dm similarity index 100% rename from code/game/objects/effects/decals/posters/bs12.dm rename to code/modules/posters/bs12.dm diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6e2b63b82fa9..11e314053cea 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -6,7 +6,7 @@ var/global/list/all_apcs = list() // Requires a wire connection to a power network through a terminal // Generates a terminal based on the direction of the APC on spawn -// There are three different power channels, lighting, equipment, and enviroment +// There are three different power channels, lighting, equipment, and environment // Each may have one of the following states // Power channels set to Auto change when power levels rise or drop below a threshold diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index ec8e3abac1c0..27524a6eb2c4 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -249,36 +249,34 @@ /obj/machinery/power/smes/batteryrack/outputting() return -/obj/machinery/power/smes/batteryrack/Topic(href, href_list) +/obj/machinery/power/smes/batteryrack/OnTopic(mob/user, href_list) // ..() would respond to those topic calls, but we don't want to use them at all. // Calls to these shouldn't occur anyway, due to usage of different nanoUI, but // it's here in case someone decides to try hrefhacking/modified templates. if(href_list["input"] || href_list["output"]) - return 1 - - if(..()) - return 1 + return TOPIC_HANDLED + if((. = ..())) + return if( href_list["disable"] ) update_io(0) - return 1 + return TOPIC_REFRESH else if( href_list["enable"] ) update_io(clamp(text2num(href_list["enable"]), 1, 3)) - return 1 + return TOPIC_REFRESH else if( href_list["equaliseon"] ) equalise = 1 - return 1 + return TOPIC_REFRESH else if( href_list["equaliseoff"] ) equalise = 0 - return 1 + return TOPIC_REFRESH else if( href_list["ejectcell"] ) var/slot_number = text2num(href_list["ejectcell"]) if(slot_number != clamp(round(slot_number), 1, length(internal_cells))) - return 1 + return TOPIC_HANDLED var/obj/item/cell/C = internal_cells[slot_number] C.dropInto(loc) internal_cells -= C - update_icon() RefreshParts() update_maxcharge() - return 1 \ No newline at end of file + return TOPIC_REFRESH \ No newline at end of file diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index bf0c3c7fc75b..5cb140c727e3 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -8,7 +8,7 @@ name = "breaker box" icon = 'icons/obj/power.dmi' icon_state = "bbox_off" - desc = "A large machine with heavy duty switching circuits used for advanced grid control." + desc = "A large machine with heavy-duty switching circuits used for advanced grid control." //directwired = 0 var/icon_state_on = "bbox_on" var/icon_state_off = "bbox_off" diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 655e27664973..0aa55c1c1e15 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -82,8 +82,20 @@ By design, d1 is the smallest direction and d2 is the highest color = COLOR_SILVER paint_color = COLOR_SILVER +/obj/structure/cable/proc/canonize_cable_dirs() + // ensure d1 & d2 reflect the icon_state for entering and exiting cable + var/dir_components = splittext(icon_state, "-") + if(length(dir_components) < 2) + CRASH("Cable segment updating dirs with invalid icon_state: [d1], [d2]") + d1 = text2num(dir_components[1]) + d2 = text2num(dir_components[2]) + if(!(d1 in global.cabledirs) || !(d2 in global.cabledirs)) + CRASH("Cable segment updating dirs with invalid values: [d1], [d2]") + /obj/structure/cable/Initialize(var/ml) // ensure d1 & d2 reflect the icon_state for entering and exiting cable + if(isnull(d1) || isnull(d2)) + canonize_cable_dirs() . = ..(ml) var/turf/T = src.loc // hide if turf is not intact if(level == LEVEL_BELOW_PLATING && T) @@ -129,18 +141,10 @@ By design, d1 is the smallest direction and d2 is the highest /obj/structure/cable/on_update_icon() ..() - // It is really gross to do this here but the order of icon updates to init seems - // unreliable and I have now had to spend hours across two PRs chasing down - // cable node weirdness due to the way this was handled previously. NO MORE. + // this should be less necessary now but it might still be just in case a subtype calls update_icon() in Initialize prior to its parent call + // which... don't do that, but better safe than sorry. if(isnull(d1) || isnull(d2)) - var/dir_components = splittext(icon_state, "-") - if(length(dir_components) < 2) - CRASH("Cable segment updating dirs with invalid icon_state: [d1], [d2]") - d1 = text2num(dir_components[1]) - d2 = text2num(dir_components[2]) - if(!(d1 in global.cabledirs) || !(d2 in global.cabledirs)) - CRASH("Cable segment updating dirs with invalid values: [d1], [d2]") - + canonize_cable_dirs() icon_state = "[d1]-[d2]" alpha = invisibility ? 127 : 255 @@ -509,7 +513,7 @@ By design, d1 is the smallest direction and d2 is the highest max_amount = MAXCOIL color = COLOR_MAROON paint_color = COLOR_MAROON - desc = "A coil of wiring, suitable for both delicate electronics and heavy duty power supply." + desc = "A coil of wiring, suitable for both delicate electronics and heavy-duty power supply." singular_name = "length" w_class = ITEM_SIZE_NORMAL throw_speed = 2 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index a60fab7f939a..f6dada5b25d4 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -1,7 +1,7 @@ // Power Cells /obj/item/cell name = "power cell" - desc = "A rechargable electrochemical power cell." + desc = "A rechargeable electrochemical power cell." icon = 'icons/obj/power.dmi' icon_state = "cell" item_state = "cell" @@ -315,13 +315,13 @@ /obj/item/cell/potato name = "potato battery" - desc = "A rechargable starch based power cell." + desc = "A rechargeable starch based power cell." origin_tech = @'{"powerstorage":1}' icon = 'icons/obj/power.dmi' icon_state = "potato_cell" maxcharge = 20 -//Generic battery cell for guns with rechargable batteries. +//Generic battery cell for guns with rechargeable batteries. /obj/item/cell/gun name = "weapon energy cell" desc = "A military grade high-density battery, expected to deplete after tens of thousands of complete charge cycles." diff --git a/code/modules/power/floorlamp.dm b/code/modules/power/floorlamp.dm index 39ff3b57c3a4..62d4208e5905 100644 --- a/code/modules/power/floorlamp.dm +++ b/code/modules/power/floorlamp.dm @@ -23,12 +23,14 @@ if(istype(held_item, /obj/item/lampshade)) lampshade = held_item user.drop_from_inventory(held_item, src) - update_icon(0) + update_light_status(FALSE) + update_icon() return TRUE else if(held_item.do_tool_interaction(TOOL_SCREWDRIVER, user, src, 1 SECOND, "unscrewing", "unscrewing")) lampshade.dropInto(loc) lampshade = null - update_icon(0) + update_light_status(FALSE) + update_icon() return TRUE return ..() diff --git a/code/modules/power/fusion/core/_core.dm b/code/modules/power/fusion/core/_core.dm index 3f667ebaa7d6..31a3fff21fa3 100644 --- a/code/modules/power/fusion/core/_core.dm +++ b/code/modules/power/fusion/core/_core.dm @@ -43,15 +43,16 @@ else owned_field.handle_tick() -/obj/machinery/fusion_core/Topic(href, href_list) - if(..()) - return 1 +/obj/machinery/fusion_core/OnTopic(mob/user, href_list) + if((. = ..())) + return if(href_list["str"]) var/dif = text2num(href_list["str"]) field_strength = min(max(field_strength + dif, MIN_FIELD_STR), MAX_FIELD_STR) change_power_consumption(500 * field_strength, POWER_USE_ACTIVE) if(owned_field) owned_field.ChangeFieldStrength(field_strength) + return TOPIC_REFRESH /obj/machinery/fusion_core/update_use_power(new_use_power) . = ..() diff --git a/code/modules/power/fusion/gyrotron/gyrotron.dm b/code/modules/power/fusion/gyrotron/gyrotron.dm index db11e44f9b12..afb22c62b68d 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron.dm @@ -3,7 +3,7 @@ /obj/machinery/emitter/gyrotron name = "gyrotron" icon = 'icons/obj/machines/power/fusion.dmi' - desc = "It is a heavy duty industrial gyrotron suited for powering fusion reactors." + desc = "It is a heavy-duty industrial gyrotron suited for powering fusion reactors." icon_state = "emitter-off" initial_access = list(access_engine) use_power = POWER_USE_IDLE diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 4fbd6dea4679..fa8764e8dc6d 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -11,7 +11,7 @@ /obj/machinery/gravity_generator/ name = "Gravitational Generator" - desc = "A device which produces a gravaton field when set up." + desc = "A device which produces a graviton field when set up." icon = 'icons/obj/singularity.dmi' icon_state = "TheSingGen" anchored = TRUE @@ -85,13 +85,12 @@ onclose(user, "gravgen") -/obj/machinery/computer/gravity_control_computer/Topic(href, href_list) - set background = 1 +/obj/machinery/computer/gravity_control_computer/OnTopic(user, href_list) if((. = ..())) - close_browser(usr, "window=air_alarm") return if(href_list["gentoggle"]) + . = TOPIC_REFRESH if(gravity_generator.on) gravity_generator.on = 0 @@ -102,9 +101,9 @@ break if(!G) A.gravitychange(0) + CHECK_TICK else for(var/area/A in gravity_generator.localareas) gravity_generator.on = 1 A.gravitychange(1) - - src.updateUsrDialog() + CHECK_TICK diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 624425a51215..76c85e46b822 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -43,6 +43,8 @@ var/flickering = 0 var/light_type = /obj/item/light/tube // the type of light item var/accepts_light_type = /obj/item/light/tube + /// A debounce var to prevent lights from causing infinite loops due to machinery power updates. + var/currently_updating = FALSE var/obj/item/light/lightbulb @@ -54,7 +56,8 @@ /obj/machinery/light/set_color(color) . = lightbulb?.set_color(color) if(.) - queue_icon_update() + update_light_status(TRUE) + update_icon() // the smaller bulb light fixture /obj/machinery/light/small @@ -100,15 +103,43 @@ broken(1) on = expected_to_be_on() - queue_icon_update(0) + update_light_status(FALSE) + update_icon() /obj/machinery/light/Destroy() QDEL_NULL(lightbulb) . = ..() -/obj/machinery/light/on_update_icon(var/trigger = 1) - atom_flags = atom_flags & ~ATOM_FLAG_CAN_BE_PAINTED +/// Handles light updates that were formerly done in update_icon. +/// * trigger (BOOL): if TRUE, this can trigger effects like burning out, rigged light explosions, etc. +/obj/machinery/light/proc/update_light_status(trigger = TRUE) + if(currently_updating) // avoid infinite loops during power usage updates + return + currently_updating = TRUE + if(get_status() == LIGHT_OK) // we can't reuse this value later because update_use_power might change our status + atom_flags |= ATOM_FLAG_CAN_BE_PAINTED + else + atom_flags &= ~ATOM_FLAG_CAN_BE_PAINTED + on = FALSE + if(on) + update_use_power(POWER_USE_ACTIVE) + if(current_mode && (current_mode in lightbulb.lighting_modes)) + set_light(arglist(lightbulb.lighting_modes[current_mode])) + else + set_light(lightbulb.b_range, lightbulb.b_power, lightbulb.b_color) + if(trigger && get_status() == LIGHT_OK) + switch_check() + else + update_use_power(POWER_USE_OFF) + set_light(0) + change_power_consumption((light_range * light_power) * LIGHTING_POWER_FACTOR, POWER_USE_ACTIVE) + currently_updating = FALSE + +/obj/machinery/light/update_use_power(new_use_power) + . = ..() + update_light_status(TRUE) +/obj/machinery/light/on_update_icon() // Update icon state cut_overlays() if(istype(construct_state)) @@ -127,15 +158,10 @@ switch(get_status()) // set icon_states if(LIGHT_OK) _state = "[base_state][on]" - atom_flags |= ATOM_FLAG_CAN_BE_PAINTED - if(LIGHT_EMPTY) - on = 0 if(LIGHT_BURNED) _state = "[base_state]_burned" - on = 0 if(LIGHT_BROKEN) _state = "[base_state]_broken" - on = 0 if(istype(lightbulb, /obj/item/light)) var/image/I = image(icon, _state) @@ -145,21 +171,6 @@ if(on) compile_overlays() // force a compile so that we update prior to the light being set - update_use_power(POWER_USE_ACTIVE) - - var/changed = 0 - if(current_mode && (current_mode in lightbulb.lighting_modes)) - changed = set_light(arglist(lightbulb.lighting_modes[current_mode])) - else - changed = set_light(lightbulb.b_range, lightbulb.b_power, lightbulb.b_color) - - if(trigger && changed && get_status() == LIGHT_OK) - switch_check() - else - update_use_power(POWER_USE_OFF) - set_light(0) - change_power_consumption((light_range * light_power) * LIGHTING_POWER_FACTOR, POWER_USE_ACTIVE) - /obj/machinery/light/proc/get_status() if(!lightbulb) return LIGHT_EMPTY @@ -174,7 +185,8 @@ /obj/machinery/light/proc/set_mode(var/new_mode) if(current_mode != new_mode) current_mode = new_mode - update_icon(0) + update_light_status(FALSE) + update_icon() /obj/machinery/light/proc/get_mode_color() if (current_mode && (current_mode in lightbulb.lighting_modes)) @@ -199,7 +211,8 @@ // will not switch on if broken/burned/empty /obj/machinery/light/proc/seton(var/state) on = (state && get_status() == LIGHT_OK) - queue_icon_update() + update_light_status(TRUE) + update_icon() // examine verb /obj/machinery/light/examine(mob/user) @@ -226,6 +239,7 @@ lightbulb = L on = expected_to_be_on() + update_light_status(TRUE) update_icon() /obj/machinery/light/proc/remove_bulb() @@ -233,6 +247,7 @@ lightbulb.dropInto(loc) lightbulb.update_icon() lightbulb = null + update_light_status(TRUE) update_icon() /obj/machinery/light/cannot_transition_to(state_path, mob/user) @@ -298,10 +313,11 @@ for(var/i = 0; i < amount; i++) if(get_status() != LIGHT_OK) break on = !on - update_icon(0) + update_light_status(FALSE) sleep(rand(5, 15)) on = (get_status() == LIGHT_OK) - update_icon(0) + update_light_status(FALSE) + update_icon() flickering = 0 // ai attack - make lights flicker, because why not @@ -367,13 +383,15 @@ if(on) spark_at(src, cardinal_only = TRUE) lightbulb.status = LIGHT_BROKEN + update_light_status(TRUE) update_icon() /obj/machinery/light/proc/fix() if(get_status() == LIGHT_OK || !lightbulb) return lightbulb.status = LIGHT_OK - on = 1 + on = TRUE + update_light_status(TRUE) update_icon() // explosion effect diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 4f5e0eb41cc8..d869748a7b40 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -377,33 +377,35 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/port_gen/pacman/Topic(href, href_list) - if(..()) +/obj/machinery/port_gen/pacman/OnTopic(mob/user, href_list) + if((. = ..())) return - src.add_fingerprint(usr) if(href_list["action"]) if(href_list["action"] == "enable") if(!active && HasFuel() && !IsBroken()) - active = 1 - update_icon() + active = TRUE + . = TOPIC_REFRESH if(href_list["action"] == "disable") if (active) - active = 0 - update_icon() + active = FALSE + . = TOPIC_REFRESH if(href_list["action"] == "eject") if(!active) DropFuel() + . = TOPIC_REFRESH if(href_list["action"] == "lower_power") if (power_output > 1) power_output-- + . = TOPIC_REFRESH if (href_list["action"] == "higher_power") if (power_output < max_power_output || (emagged && power_output < round(max_power_output*2.5))) power_output++ + . = TOPIC_REFRESH /obj/machinery/port_gen/pacman/super name = "portable fission generator" - desc = "A power generator that utilizes uranium sheets as fuel. Can run for much longer than the standard portabke generators. Rated for 80 kW max safe output." + desc = "A power generator that utilizes uranium sheets as fuel. Can run for much longer than the standard portable generators. Rated for 80 kW max safe output." icon_state = "portgen1" sheet_path = /obj/item/stack/material/puck sheet_material = /decl/material/solid/metal/uranium diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm index 8a02779ed2a5..6a0134664cd3 100644 --- a/code/modules/power/sensors/powernet_sensor.dm +++ b/code/modules/power/sensors/powernet_sensor.dm @@ -9,7 +9,7 @@ /obj/machinery/power/sensor name = "powernet sensor" - desc = "Small machine which transmits data about specific powernet." + desc = "A sensor that records and transmits data about its connected power network." anchored = TRUE density = FALSE level = LEVEL_BELOW_PLATING diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 4f3f45ee9313..c267422e0893 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -74,35 +74,35 @@ return /obj/machinery/particle_accelerator/control_box/Topic(href, href_list) - ..() - //Ignore input if we are broken, !silicon guy cant touch us, or nonai controlling from super far away - if(stat & (BROKEN|NOPOWER) || (get_dist(src, usr) > 1 && !issilicon(usr)) || (get_dist(src, usr) > 8 && !isAI(usr))) - usr.unset_machine() + . = ..() + if(. == TOPIC_CLOSE) close_browser(usr, "window=pacontrol") - return - if( href_list["close"] ) - close_browser(usr, "window=pacontrol") - usr.unset_machine() +/obj/machinery/particle_accelerator/control_box/OnTopic(href, href_list) + if((. = ..())) return - + if(inoperable()) + return TOPIC_CLOSE + if(href_list["close"]) + return TOPIC_CLOSE if(href_list["togglep"]) - if(!wires.IsIndexCut(PARTICLE_TOGGLE_WIRE)) - src.toggle_power() + if(wires.IsIndexCut(PARTICLE_TOGGLE_WIRE)) + return TOPIC_HANDLED + toggle_power() + return TOPIC_REFRESH else if(href_list["scan"]) - src.part_scan() - + part_scan() + return TOPIC_REFRESH else if(href_list["strengthup"]) - if(!wires.IsIndexCut(PARTICLE_STRENGTH_WIRE)) - add_strength() - + if(wires.IsIndexCut(PARTICLE_STRENGTH_WIRE)) + return TOPIC_HANDLED + add_strength() + return TOPIC_REFRESH else if(href_list["strengthdown"]) - if(!wires.IsIndexCut(PARTICLE_STRENGTH_WIRE)) - remove_strength() - - src.updateDialog() - src.update_icon() - return + if(wires.IsIndexCut(PARTICLE_STRENGTH_WIRE)) + return TOPIC_HANDLED + remove_strength() + return TOPIC_REFRESH /obj/machinery/particle_accelerator/control_box/proc/strength_change() for(var/obj/structure/particle_accelerator/part in connected_parts) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index c1c8ea8295ec..97a0d08fa836 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -55,8 +55,8 @@ var/global/list/singularities = list() STOP_PROCESSING(SSobj, src) . = ..() -/obj/effect/singularity/Process_Spacemove(allow_movement) - return TRUE +/obj/effect/singularity/is_space_movement_permitted(allow_movement = FALSE) + return SPACE_MOVE_PERMITTED /obj/effect/singularity/proc/consume(atom/A) energy += A.singularity_act(src, current_stage.stage_size) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 50c22d1479ea..2201e1fc430b 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -263,22 +263,19 @@ return 0 return round(100.0*charge/capacity, 0.1) -/obj/machinery/power/smes/Topic(href, href_list) - if(..()) - return 1 +/obj/machinery/power/smes/OnTopic(mob/user, href_list) + if((. = ..())) + return if( href_list["cmode"] ) inputting(!input_attempt) - update_icon() - return 1 + . = TOPIC_REFRESH else if( href_list["online"] ) outputting(!output_attempt) - update_icon() - return 1 + . = TOPIC_REFRESH else if( href_list["reboot"] ) failure_timer = 0 - update_icon() - return 1 + . = TOPIC_REFRESH else if( href_list["input"] ) switch( href_list["input"] ) if("min") @@ -288,7 +285,7 @@ if("set") input_level = (input(usr, "Enter new input level (0-[input_level_max/1000] kW)", "SMES Input Power Control", input_level/1000) as num) * 1000 input_level = max(0, min(input_level_max, input_level)) // clamp to range - return 1 + . = TOPIC_REFRESH else if( href_list["output"] ) switch( href_list["output"] ) if("min") @@ -298,7 +295,7 @@ if("set") output_level = (input(usr, "Enter new output level (0-[output_level_max/1000] kW)", "SMES Output Power Control", output_level/1000) as num) * 1000 output_level = max(0, min(output_level_max, output_level)) // clamp to range - return 1 + . = TOPIC_REFRESH /obj/machinery/power/smes/proc/energy_fail(var/duration) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 59665f270cb1..cccc10631e3f 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -37,7 +37,7 @@ // 500% Charge Capacity, 40% I/O Capacity. Holds a lot of energy, but charges slowly if not combined with other coils. Ideal for backup storage. /obj/item/stock_parts/smes_coil/super_capacity name = "superconductive capacitance coil" - desc = "Specialised version of standard superconductive magnetic coil. This one has significantly stronger containment field, allowing for significantly larger power storage. It's IO rating is much lower, however." + desc = "Specialised version of standard superconductive magnetic coil. This one has significantly stronger containment field, allowing for significantly larger power storage. Its IO rating is much lower, however." icon_state = "smes_coil_capacitance" ChargeCapacity = 250 KILOWATTS IOCapacity = 100 KILOWATTS @@ -76,7 +76,7 @@ maximum_component_parts = list(/obj/item/stock_parts/smes_coil = 6, /obj/item/stock_parts = 15) interact_offline = TRUE var/safeties_enabled = 1 // If 0 modifications can be done without discharging the SMES, at risk of critical failure. - var/failing = 0 // If 1 critical failure has occured and SMES explosion is imminent. + var/failing = 0 // If 1 critical failure has occurred and SMES explosion is imminent. var/grounding = 1 // Cut to quickly discharge, at cost of "minor" electrical issues in output powernet. var/RCon = 1 // Cut to disable AI and remote control. var/RCon_tag = "NO_TAG" // RCON tag, change to show it on SMES Remote control console. diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index a941debb006a..23e5f846473c 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -107,7 +107,7 @@ var/global/list/solars_list = list() set_dir(angle2dir(adir)) return -//calculates the fraction of the sunlight that the panel recieves +//calculates the fraction of the sunlight that the panel receives /obj/machinery/power/solar/proc/update_solar_exposure() var/datum/sun/sun = get_best_sun() @@ -125,7 +125,7 @@ var/global/list/solars_list = list() return sunfrac = cos(p_angle) ** 2 - //isn't the power recieved from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? + //isn't the power received from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? /obj/machinery/power/solar/Process() if(stat & BROKEN) @@ -427,14 +427,15 @@ var/global/list/solars_list = list() updateDialog() /obj/machinery/power/solar_control/Topic(href, href_list) - if(..()) - close_browser(usr, "window=solcon") - usr.unset_machine() - return 0 - if(href_list["close"] ) + . = ..() + if(. == TOPIC_CLOSE) close_browser(usr, "window=solcon") - usr.unset_machine() - return 0 + +/obj/machinery/power/solar_control/OnTopic(mob/user, href_list) + if((. = ..())) + return + if(href_list["close"]) + return TOPIC_CLOSE if(href_list["rate control"]) if(href_list["cdir"]) @@ -442,11 +443,11 @@ var/global/list/solars_list = list() targetdir = cdir if(track == 2) //manual update, so losing auto-tracking track = 0 - spawn(1) - set_panels(cdir) + addtimer(CALLBACK(src, PROC_REF(set_panels), cdir), 1) if(href_list["tdir"]) trackrate = clamp(trackrate+text2num(href_list["tdir"]), -7200, 7200) if(trackrate) nexttime = world.time + 36000/abs(trackrate) + return TOPIC_REFRESH if(href_list["track"]) track = text2num(href_list["track"]) @@ -459,6 +460,7 @@ var/global/list/solars_list = list() targetdir = cdir if(trackrate) nexttime = world.time + 36000/abs(trackrate) set_panels(targetdir) + return TOPIC_REFRESH if(href_list["search_connected"]) search_for_connected() @@ -466,9 +468,7 @@ var/global/list/solars_list = list() if(connected_tracker && track == 2 && sun) connected_tracker.set_angle(sun.angle) set_panels(cdir) - - interact(usr) - return 1 + return TOPIC_REFRESH //rotates the panel to the passed angle /obj/machinery/power/solar_control/proc/set_panels(var/cdir) diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 7966b8e04f9b..26090dff1d98 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -99,7 +99,7 @@ /obj/item/ammo_casing/shotgun/pellet name = "shotgun shell" - desc = "A shotshell." + desc = "A shotgun shell." icon_state = "gshell" spent_icon = "gshell-spent" projectile_type = /obj/item/projectile/bullet/pellet/shotgun diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index d99abdef1e63..bb477976f9d3 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -418,12 +418,11 @@ for(var/obj/item/rig_module/stealth_field/S in rig.installed_modules) S.deactivate() - if(space_recoil) - if(!user.check_space_footing()) - var/old_dir = user.dir - user.inertia_ignore = projectile - step(user,get_dir(target,user)) - user.set_dir(old_dir) + if(space_recoil && user.can_slip(magboots_only = TRUE)) + var/old_dir = user.dir + user.inertia_ignore = projectile + step(user,get_dir(target,user)) + user.set_dir(old_dir) update_icon() diff --git a/code/modules/projectiles/guns/energy/capacitor.dm b/code/modules/projectiles/guns/energy/capacitor.dm index 1232ef3e8f39..f0ac3df942ae 100644 --- a/code/modules/projectiles/guns/energy/capacitor.dm +++ b/code/modules/projectiles/guns/energy/capacitor.dm @@ -147,9 +147,6 @@ var/global/list/laser_wavelengths update_icon() return TRUE -/obj/item/gun/energy/capacitor/Process() - . = ..() - /obj/item/gun/energy/capacitor/proc/charge(var/mob/user) . = FALSE if(!charging && istype(user)) @@ -259,7 +256,7 @@ var/global/list/laser_wavelengths // Subtypes. /obj/item/gun/energy/capacitor/rifle name = "capacitor rifle" - desc = "A heavy, unwieldly directed energy weapon that uses a linear capacitor array to charge a powerful beam." + desc = "A heavy, unwieldy directed energy weapon that uses a linear capacitor array to charge a powerful beam." max_capacitors = 4 icon = 'icons/obj/guns/capacitor_rifle.dmi' slot_flags = SLOT_BACK diff --git a/code/modules/projectiles/guns/energy/secure.dm b/code/modules/projectiles/guns/energy/secure.dm index 64d4cf57727a..c8df1f2ea053 100644 --- a/code/modules/projectiles/guns/energy/secure.dm +++ b/code/modules/projectiles/guns/energy/secure.dm @@ -34,7 +34,7 @@ /obj/item/gun/energy/laser/secure name = "laser carbine" - desc = "A G40E carbine, designed to kill with concentrated energy blasts. Fitted with an NT1019 chip to make sure killcount is tracked appropriately." + desc = "A G40E carbine, designed to kill with concentrated energy blasts. Fitted with an NT1019 chip to make sure kill count is tracked appropriately." req_access = list(list(access_brig, access_bridge)) /obj/item/gun/energy/laser/secure/on_update_icon() diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm index 933c6d2fff63..414aa4a3ccdb 100644 --- a/code/modules/projectiles/guns/energy/temperature.dm +++ b/code/modules/projectiles/guns/energy/temperature.dm @@ -48,8 +48,8 @@ show_browser(user, dat, "window=freezegun;size=450x300;can_resize=1;can_close=1;can_minimize=1") onclose(user, "window=freezegun", src) -/obj/item/gun/energy/temperature/Topic(user, href_list, state = global.inventory_topic_state) - ..() +/obj/item/gun/energy/temperature/DefaultTopicState() + return global.inventory_topic_state /obj/item/gun/energy/temperature/OnTopic(user, href_list) if(href_list["temp"]) diff --git a/code/modules/projectiles/guns/launcher/foam_gun.dm b/code/modules/projectiles/guns/launcher/foam_gun.dm index 33eaae8345c6..8bdb703a1a1d 100644 --- a/code/modules/projectiles/guns/launcher/foam_gun.dm +++ b/code/modules/projectiles/guns/launcher/foam_gun.dm @@ -80,10 +80,24 @@ if(distance <= 1) to_chat(user, "The hammer is a lot more resistant than you'd expect.") +/obj/item/gun/launcher/foam/machine_gun + name = "foam machine gun" + desc = "The Jorf machine gun, hose the competition down and hate yourself while you spend forever reloading! It holds 30 darts." + icon = 'icons/obj/guns/foam/machine_gun.dmi' + w_class = ITEM_SIZE_NORMAL + fire_delay = 0 + autofire_enabled = 1 + one_hand_penalty = 3 + max_darts = 30 + burst_delay = 1 + burst = 3 + burst_accuracy = list(0,-1,-1) + dispersion = list(0.0, 0.6, 1.0) + //the projectile /obj/item/foam_dart name = "foam dart" - desc = "An offical Jorf brand foam dart, for use only with offical Jorf brand foam dart launching products." + desc = "An official Jorf brand foam dart, for use only with official Jorf brand foam dart launching products." icon = 'icons/obj/guns/foam/dart.dmi' icon_state = "dart" w_class = ITEM_SIZE_TINY @@ -114,7 +128,7 @@ //boxes of the projectile /obj/item/box/foam_darts name = "box of foam darts" - desc = "It's a box of offical Jorf brand foam darts, for use only with offical Jorf brand products." + desc = "It's a box of official Jorf brand foam darts, for use only with official Jorf brand products." icon = 'icons/obj/guns/foam/boxes.dmi' icon_state = "dart_box" diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 69fa0078472d..2750cecee523 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -71,7 +71,7 @@ /obj/item/gun/launcher/syringe name = "syringe gun" - desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance." + desc = "A spring-loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance." icon = 'icons/obj/guns/launcher/syringe.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_LARGE @@ -152,7 +152,7 @@ /obj/item/gun/launcher/syringe/disguised name = "deluxe electronic cigarette" - desc = "A premium model eGavana MK3 electronic cigarette, shaped like a cigar." + desc = "A premium model eHavana MK3 electronic cigarette, shaped like a cigar." icon = 'icons/clothing/mask/smokables/cigarette_electronic_deluxe.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_SMALL diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 0021fc7522b5..217d232ba35b 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/shotgun/pump name = "shotgun" - desc = "The mass-produced W-T Remmington 29x shotgun is a favourite of police and security forces on many worlds. Useful for sweeping alleys." + desc = "The mass-produced W-T Remington 29x shotgun is a favourite of police and security forces on many worlds. Useful for sweeping alleys." icon = 'icons/obj/guns/shotgun/pump.dmi' icon_state = ICON_STATE_WORLD max_shells = 4 @@ -114,4 +114,20 @@ bulk = 2 /obj/item/gun/projectile/shotgun/doublebarrel/sawn/empty - starts_loaded = FALSE \ No newline at end of file + starts_loaded = FALSE + +/obj/item/gun/projectile/shotgun/doublebarrel/quad + name = "quad-barreled shotgun" + desc = "A true classic - but doubled. Firing it has a heck of a kick - knocks the air right out of you." + icon = 'icons/obj/guns/shotgun/quadbarrel.dmi' + max_shells = 4 + w_class = ITEM_SIZE_HUGE + origin_tech = @'{"combat":6,"materials":3,"esoteric":9}' + firemodes = list( + list(mode_name="fire one barrel at a time", burst=1), + list(mode_name="fire two barrels at once", burst=2), + list(mode_name="fire all barrels at once", burst=4) + ) + +/obj/item/gun/projectile/shotgun/doublebarrel/quad/empty + starts_loaded = FALSE diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 152cb7a6ab55..365338cf6cac 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -141,7 +141,7 @@ if(!AM.anchored && !AM.has_gravity()) if(ismob(AM)) var/mob/M = AM - if(M.check_space_footing()) + if(!M.can_slip(magboots_only = TRUE)) return var/old_dir = AM.dir step(AM,get_dir(firer,AM)) @@ -376,12 +376,12 @@ /obj/item/projectile/get_autopsy_descriptors() return list(name) -/obj/item/projectile/Process_Spacemove() +/obj/item/projectile/is_space_movement_permitted(allow_movement = FALSE) //Deletes projectiles that aren't supposed to be in vacuum if they leave pressurised areas if (is_below_sound_pressure(get_turf(src)) && !vacuum_traversal) qdel(src) return - return TRUE //Bullets don't drift in space + return SPACE_MOVE_PERMITTED //Bullets don't drift in space /obj/item/projectile/proc/fire(angle, atom/direct_target) //If no Angle needs to resolve it from xo/yo! diff --git a/code/game/objects/effects/projectile/projectile_effects.dm b/code/modules/projectiles/projectile/effects/projectile_effects.dm similarity index 100% rename from code/game/objects/effects/projectile/projectile_effects.dm rename to code/modules/projectiles/projectile/effects/projectile_effects.dm diff --git a/code/game/objects/effects/projectile/projectile_impact.dm b/code/modules/projectiles/projectile/effects/projectile_impact.dm similarity index 100% rename from code/game/objects/effects/projectile/projectile_impact.dm rename to code/modules/projectiles/projectile/effects/projectile_impact.dm diff --git a/code/game/objects/effects/projectile/projectile_muzzle.dm b/code/modules/projectiles/projectile/effects/projectile_muzzle.dm similarity index 100% rename from code/game/objects/effects/projectile/projectile_muzzle.dm rename to code/modules/projectiles/projectile/effects/projectile_muzzle.dm diff --git a/code/game/objects/effects/projectile/projectile_tracer.dm b/code/modules/projectiles/projectile/effects/projectile_tracer.dm similarity index 100% rename from code/game/objects/effects/projectile/projectile_tracer.dm rename to code/modules/projectiles/projectile/effects/projectile_tracer.dm diff --git a/code/modules/projectiles/targeting/targeting_client.dm b/code/modules/projectiles/targeting/targeting_client.dm deleted file mode 100644 index 082471448a5c..000000000000 --- a/code/modules/projectiles/targeting/targeting_client.dm +++ /dev/null @@ -1,11 +0,0 @@ -//These are called by the on-screen buttons, adjusting what the victim can and cannot do. -/client/proc/add_gun_icons() - if(!mob.item_use_icon) return 1 // This can runtime if someone manages to throw a gun out of their hand before the proc is called. - screen |= mob.item_use_icon - screen |= mob.gun_move_icon - screen |= mob.radio_use_icon - -/client/proc/remove_gun_icons() - screen -= mob.item_use_icon - screen -= mob.gun_move_icon - screen -= mob.radio_use_icon diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index 7210efedb4c4..c0bb7ce8a7bf 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -32,26 +32,8 @@ target_permissions |= perm // Update HUD icons. - if(owner.gun_move_icon) - if(!(target_permissions & TARGET_CAN_MOVE)) - owner.gun_move_icon.SetName("Allow Movement") - else - owner.gun_move_icon.SetName("Disallow Movement") - owner.gun_move_icon.update_icon() - - if(owner.item_use_icon) - if(!(target_permissions & TARGET_CAN_CLICK)) - owner.item_use_icon.SetName("Allow Item Use") - else - owner.item_use_icon.SetName("Disallow Item Use") - owner.item_use_icon.update_icon() - - if(owner.radio_use_icon) - if(!(target_permissions & TARGET_CAN_RADIO)) - owner.radio_use_icon.SetName("Allow Radio Use") - else - owner.radio_use_icon.SetName("Disallow Radio Use") - owner.radio_use_icon.update_icon() + if(istype(owner?.hud_used, /datum/hud)) + owner.hud_used.update_gun_mode_icons(target_permissions) var/message = "no longer permitted to " var/use_span = "warning" @@ -154,8 +136,9 @@ else owner.visible_message(SPAN_DANGER("\The [owner] aims \the [thing] at \the [target]!")) - if(owner.client) - owner.client.add_gun_icons() + if(istype(owner.hud_used) && owner.client) + owner.hud_used.add_gun_icons() + var/decl/pronouns/pronouns = owner.get_pronouns() to_chat(target, FONT_LARGE(SPAN_DANGER("\The [owner] [pronouns.is] menacing you with \a [thing]. No sudden moves!"))) aiming_with = thing @@ -194,16 +177,15 @@ if(!active) cancel_aiming(no_message) - if(owner.client) + if(owner.client && istype(owner.hud_used)) if(active) if(!no_message) to_chat(owner, "You will now aim rather than fire.") - owner.client.add_gun_icons() + owner.hud_used.add_gun_icons() else if(!no_message) to_chat(owner, "You will no longer aim rather than fire.") - owner.client.remove_gun_icons() - owner.gun_setting_icon.update_icon() + owner.hud_used.remove_gun_icons() /obj/aiming_overlay/proc/cancel_aiming(var/no_message = 0) if(!aiming_with || !aiming_at) diff --git a/code/modules/reagents/Chemistry-Grinder.dm b/code/modules/reagents/Chemistry-Grinder.dm index 987f641fa246..b798bf9e4e6d 100644 --- a/code/modules/reagents/Chemistry-Grinder.dm +++ b/code/modules/reagents/Chemistry-Grinder.dm @@ -242,9 +242,9 @@ else user.take_blood(beaker, dam) SET_STATUS_MAX(user, STAT_STUN, 2) - shake(user, 40) + shake_target(user, 4 SECONDS) -/obj/machinery/reagentgrinder/proc/shake(mob/living/user, duration) +/obj/machinery/reagentgrinder/proc/shake_target(mob/living/user, duration) if(!user) return for(var/i = 1 to duration) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 9b76b5dec22e..9c2063ed6cb3 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -186,7 +186,7 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new if((check_flags & ATOM_FLAG_NO_REACT) && (check_flags & ATOM_FLAG_NO_PHASE_CHANGE) && (check_flags & ATOM_FLAG_NO_DISSOLVE)) return 0 - var/reaction_occured = FALSE + var/reaction_occurred = FALSE var/list/eligible_reactions = list() var/temperature = location?.temperature || T20C @@ -228,7 +228,7 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new clear_reagent(R.type) for(var/product in replace_self_with) add_reagent(product, replace_self_with[product] * replace_amount) - reaction_occured = TRUE + reaction_occurred = TRUE if(location) if(replace_message) @@ -245,7 +245,7 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new for(var/decl/chemical_reaction/reaction in eligible_reactions) if(reaction.can_happen(src)) active_reactions[reaction] = 1 // The number is going to be 1/(fraction of remaining reagents we are allowed to use), computed below - reaction_occured = 1 + reaction_occurred = 1 var/list/used_reagents = list() // if two reactions share a reagent, each is allocated half of it, so we compute this here @@ -273,10 +273,10 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new update_total() - if(reaction_occured) + if(reaction_occurred) HANDLE_REACTIONS(src) // Check again in case the new reagents can react again - return reaction_occured + return reaction_occurred /* Holder-to-chemical */ /datum/reagents/proc/handle_update(var/safety) @@ -925,14 +925,60 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new return trans_to_holder(target.reagents, amount, multiplier, copy, defer_update = defer_update, transferred_phases = transferred_phases) -/* Atom reagent creation - use it all the time */ - /datum/reagents/proc/get_skimmable_reagents() for(var/mat in reagent_volumes) var/decl/material/reagent = GET_DECL(mat) if(reagent.skimmable) LAZYADD(., mat) +/// Used to return strings like "dilute blood" for use in phrases like "It's covered in dilute oily slimy bloody mud!" +/// This is explicitly inspired by Caves of Qud, by the way. +/datum/reagents/proc/get_coated_name() + /// arbitrary number, number of words that will be included in the name. will always have primary in addition + var/const/MAX_COATING_NAMES = 4 + if(!total_volume) + return null + // sort reagents from low to high, so largest reagent comes last (feels most impactful? idk, it's arbitrary) + var/list/volumes_temp = sortTim(reagent_volumes.Copy(), /proc/cmp_numeric_asc, associative = TRUE) + var/list/accumulator = list() + var/decl/material/primary_reagent_decl = get_primary_reagent_decl() // this also sets src.primary_reagent to the typepath + for(var/reagent_type in volumes_temp) + if(reagent_type == primary_reagent) + continue // added later + var/decl/material/reagent = GET_DECL(reagent_type) + reagent.build_coated_name(src, accumulator) + if(length(accumulator) >= MAX_COATING_NAMES) + break + var/primary_name = primary_reagent_decl.get_primary_coating_name(src) + if(get_config_value(/decl/config/enum/colored_coating_names) == CONFIG_COATING_COLOR_COMPONENTS) + var/primary_color = primary_reagent_decl.get_reagent_color(src) + primary_name = FONT_COLORED(primary_color, primary_name) + accumulator += primary_name // add primary to the end + . = jointext(accumulator, " ") // dilute oily slimy bloody mud + if(get_config_value(/decl/config/enum/colored_coating_names) == CONFIG_COATING_COLOR_MIXTURE) + . = FONT_COLORED(get_color(), .) + +/// Used to return strings like "inky bloody muddy snowy oily wet" for use in phrases like "You are wearing some inky bloody muddy snowy oily wet leather boots." +/// This is explicitly inspired by Caves of Qud, by the way. +/datum/reagents/proc/get_coated_adjectives() + var/const/MAX_COATING_ADJECTIVES = 5 // arbitrary number, limit how many reagents will show up in the name on examine + if(!total_volume) + return null + // sort reagents from low to high, so primary reagent comes last (feels most impactful? idk, it's arbitrary) + // todo: maybe at some point we could make staining have some kind of priority to sort by? + var/list/volumes_temp = sortTim(reagent_volumes.Copy(), /proc/cmp_numeric_asc, associative = TRUE) + var/list/accumulator = list() + for(var/reagent_type in volumes_temp) + var/decl/material/reagent = GET_DECL(reagent_type) + var/coated_name = reagent.get_coated_adjective(src) + accumulator |= coated_name + if(length(accumulator) >= MAX_COATING_ADJECTIVES) + break + . = jointext(accumulator, " ") // bloody muddy inky slimy wet + if(get_config_value(/decl/config/enum/colored_coating_names) == CONFIG_COATING_COLOR_MIXTURE) + . = FONT_COLORED(get_color(), .) + +/* Atom reagent creation - use it all the time */ /atom/proc/create_reagents(var/max_vol) if(reagents) log_debug("Attempted to create a new reagents holder when already referencing one: [log_info_line(src)]") diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index e304fbec91e0..d7c1f8cc4081 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -71,28 +71,56 @@ return ..() -/obj/machinery/chem_master/Topic(href, href_list, state) - if(..()) - return 1 - var/mob/user = usr +/obj/machinery/chem_master/Topic(href, href_list) + . = ..() + if(. == TOPIC_CLOSE) + close_browser(usr, "window=chem_master") +/obj/machinery/chem_master/OnTopic(mob/user, href_list, state) + if((. = ..())) + return if (href_list["ejectp"]) if(loaded_pill_bottle) loaded_pill_bottle.dropInto(loc) loaded_pill_bottle = null else if(href_list["close"]) - show_browser(user, null, "window=chem_master") - user.unset_machine() - return + return TOPIC_CLOSE if(beaker) + // The custom ones modify our href_list. + if (href_list["addcustom"]) + var/decl/material/their_reagent = locate(href_list["addcustom"]) + if(their_reagent) + useramount = input("Select the amount to transfer.", 30, useramount) as null|num + if(useramount) + useramount = clamp(useramount, 0, 200) + href_list["amount"] = num2text(useramount) + href_list["add"] = href_list["addcustom"] + href_list -= "addcustom" + else + return TOPIC_HANDLED + else + return TOPIC_REFRESH // Tried to move a nonexistent reagent, maybe their UI is stale? + else if(href_list["removecustom"]) + var/decl/material/my_reagents = locate(href_list["removecustom"]) + if(my_reagents) + useramount = input("Select the amount to transfer.", 30, useramount) as null|num + if(useramount) + useramount = clamp(useramount, 0, 200) + href_list["amount"] = num2text(useramount) + href_list["remove"] = href_list["removecustom"] + href_list -= "removecustom" + else + return TOPIC_HANDLED + + // DO NOT use else if here, we want these to run even if the custom ones do var/datum/reagents/R = beaker.reagents if (href_list["analyze"]) var/decl/material/reagent = locate(href_list["analyze"]) var/dat = get_chem_info(reagent) if(dat && REAGENT_VOLUME(beaker.reagents, reagent.type)) show_browser(user, dat, "window=chem_master;size=575x400") - return + return TOPIC_HANDLED else if (href_list["add"]) if(href_list["amount"]) @@ -107,16 +135,7 @@ else mult -= 0.4 * (SKILL_MAX - user.get_skill_value(core_skill))/(SKILL_MAX-SKILL_MIN) //10% loss per skill level down from max R.trans_type_to(src, their_reagent.type, amount, mult) - - - - else if (href_list["addcustom"]) - var/decl/material/their_reagent = locate(href_list["addcustom"]) - if(their_reagent) - useramount = input("Select the amount to transfer.", 30, useramount) as null|num - if(useramount) - useramount = clamp(useramount, 0, 200) - src.Topic(href, list("amount" = "[useramount]", "add" = href_list["addcustom"]), state) + return TOPIC_REFRESH else if (href_list["remove"]) if(href_list["amount"]) @@ -132,52 +151,44 @@ remove_from_reagents(my_reagents.type, amount) for(var/decl/material/reagent in contaminants) remove_from_reagents(reagent.type, round(rand()*amount, 0.1)) - - else if (href_list["removecustom"]) - var/decl/material/my_reagents = locate(href_list["removecustom"]) - if(my_reagents) - useramount = input("Select the amount to transfer.", 30, useramount) as null|num - if(useramount) - useramount = clamp(useramount, 0, 200) - src.Topic(href, list("amount" = "[useramount]", "remove" = href_list["removecustom"]), state) + return TOPIC_REFRESH else if (href_list["toggle"]) mode = !mode + return TOPIC_REFRESH else if (href_list["toggle_sloppy"]) sloppy = !sloppy + return TOPIC_REFRESH else if (href_list["main"]) - interact(user) - return + return TOPIC_REFRESH else if (href_list["eject"]) beaker.forceMove(loc) beaker = null reagents.clear_reagents() icon_state = "mixer0" + return TOPIC_REFRESH else if (href_list["createpill"] || href_list["createpill_multiple"]) var/count = 1 if(reagents.total_volume/count < 1) //Sanity checking. - return + return TOPIC_HANDLED if (href_list["createpill_multiple"]) count = input("Select the number of pills to make.", "Max [max_pill_count]", pillamount) as num if(!CanInteract(user, state)) - return + return TOPIC_HANDLED count = clamp(count, 1, max_pill_count) - if(reagents.total_volume/count < 1) //Sanity checking. - return - - var/amount_per_pill = reagents.total_volume/count - if (amount_per_pill > 30) amount_per_pill = 30 + var/amount_per_pill = min(reagents.total_volume/count, 30) + if(amount_per_pill < 1) // Sanity checking. + return TOPIC_HANDLED var/name = sanitize_safe(input(usr,"Name:","Name your pill!","[reagents.get_primary_reagent_name()] ([amount_per_pill]u)"), MAX_NAME_LEN) if(!CanInteract(user, state)) - return - + return TOPIC_HANDLED if(reagents.total_volume/count < 1) //Sanity checking. - return + return TOPIC_HANDLED while (count-- && count >= 0) var/obj/item/chems/pill/dispensed/P = new(loc) if(!name) name = reagents.get_primary_reagent_name() @@ -187,9 +198,11 @@ P.update_icon() if(loaded_pill_bottle && loaded_pill_bottle.storage && loaded_pill_bottle.contents.len < loaded_pill_bottle.storage.max_storage_space) P.forceMove(loaded_pill_bottle) + return TOPIC_REFRESH else if (href_list["createbottle"]) create_bottle(user) + return TOPIC_REFRESH else if(href_list["change_pill"]) #define MAX_PILL_SPRITE 25 //max icon state of the pill sprites var/dat = "" @@ -197,15 +210,16 @@ dat += "
" show_browser(user, dat, "window=chem_master") - return + return TOPIC_HANDLED else if(href_list["pill_sprite"]) pillsprite = href_list["pill_sprite"] + return TOPIC_REFRESH else if(href_list["label_color"]) bottle_label_color = input(usr, "Pick new bottle label color", "Label color", bottle_label_color) as color + return TOPIC_REFRESH else if(href_list["lid_color"]) bottle_lid_color = input(usr, "Pick new bottle lid color", "Lid color", bottle_lid_color) as color - - updateUsrDialog() + return TOPIC_REFRESH /obj/machinery/chem_master/proc/fetch_contaminants(mob/user, datum/reagents/reagents, decl/material/main_reagent) . = list() diff --git a/code/modules/reagents/chems/chems_alcohol.dm b/code/modules/reagents/chems/chems_alcohol.dm index 44384d64365f..505354b4d30f 100644 --- a/code/modules/reagents/chems/chems_alcohol.dm +++ b/code/modules/reagents/chems/chems_alcohol.dm @@ -121,7 +121,7 @@ /decl/material/liquid/alcohol/ale name = "ale" - lore_text = "A dark alchoholic beverage made by malted barley and yeast." + lore_text = "A dark alcoholic beverage made by malted barley and yeast." taste_description = "hearty barley ale" color = "#4c3100" strength = 50 @@ -174,7 +174,7 @@ /decl/material/liquid/alcohol/cognac name = "cognac" - lore_text = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." + lore_text = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. Classy as fornication." taste_description = "rich and smooth alcohol" taste_mult = 1.1 color = "#ab3c05" @@ -199,7 +199,7 @@ glass_name = "gin" glass_desc = "A crystal clear glass of Griffeater gin." -//Base type for alchoholic drinks containing coffee +//Base type for alcoholic drinks containing coffee /decl/material/liquid/alcohol/coffee name = "coffee liqueur" lore_text = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" @@ -362,7 +362,7 @@ /decl/material/liquid/alcohol/wine name = "red wine" - lore_text = "An premium alchoholic beverage made from distilled grape juice." + lore_text = "An premium alcoholic beverage made from distilled grape juice." taste_description = "bitter sweetness" color = "#7e4043" // rgb: 126, 64, 67 strength = 15 @@ -375,7 +375,7 @@ /decl/material/liquid/alcohol/wine/premium name = "white wine" - lore_text = "An exceptionally expensive alchoholic beverage made from distilled white grapes." + lore_text = "An exceptionally expensive alcoholic beverage made from distilled white grapes." taste_description = "white velvet" color = "#ffddaa" // rgb: 255, 221, 170 - a light cream strength = 20 diff --git a/code/modules/reagents/chems/chems_blood.dm b/code/modules/reagents/chems/chems_blood.dm index ab5f8e6dd8ec..3af88ab10719 100644 --- a/code/modules/reagents/chems/chems_blood.dm +++ b/code/modules/reagents/chems/chems_blood.dm @@ -10,6 +10,7 @@ taste_mult = 1.3 glass_name = "tomato juice" glass_desc = "Are you sure this is tomato juice?" + coated_adjective = "bloody" value = 2.5 opacity = TRUE min_fluid_opacity = FLUID_MAX_ALPHA diff --git a/code/modules/reagents/chems/chems_cleaner.dm b/code/modules/reagents/chems/chems_cleaner.dm index 6b9108b98ef4..d14189ec1813 100644 --- a/code/modules/reagents/chems/chems_cleaner.dm +++ b/code/modules/reagents/chems/chems_cleaner.dm @@ -19,7 +19,7 @@ touch_met = 5 toxicity = 5 scent = "clean linen" - scent_descriptor = SCENT_DESC_FRAGRANCE + scent_descriptor = "fragrance" value = 0.25 dirtiness = DIRTINESS_DECONTAMINATE decontamination_dose = 5 diff --git a/code/modules/reagents/chems/chems_compounds.dm b/code/modules/reagents/chems/chems_compounds.dm index 468300ba1720..45a828e3a60c 100644 --- a/code/modules/reagents/chems/chems_compounds.dm +++ b/code/modules/reagents/chems/chems_compounds.dm @@ -49,6 +49,14 @@ value = 0.1 uid = "chem_blackpepper" +/decl/material/solid/cinnamon + name = "cinnamon" + lore_text = "A powder used to flavor food and drinks. Unpleasant to eat a full spoonful of." + taste_description = "cinnamon" + color = "#a34b0d" + value = 0.2 + uid = "chem_cinnamon" + /decl/material/liquid/enzyme name = "universal enzyme" uid = "chem_enzyme" @@ -315,7 +323,7 @@ color = "#684b3c" scannable = 1 scent = "cigarette smoke" - scent_descriptor = SCENT_DESC_ODOR + scent_descriptor = "odour" scent_range = 4 hidden_from_codex = TRUE uid = "chem_tobacco" @@ -331,7 +339,7 @@ taste_description = "fine tobacco" value = 1.5 scent = "fine tobacco smoke" - scent_descriptor = SCENT_DESC_FRAGRANCE + scent_descriptor = "fragrance" uid = "chem_tobacco_fine" /decl/material/solid/tobacco/bad @@ -340,7 +348,7 @@ value = 0.5 scent = "acrid tobacco smoke" scent_intensity = /decl/scent_intensity/strong - scent_descriptor = SCENT_DESC_ODOR + scent_descriptor = "odour" uid = "chem_tobacco_terrible" /decl/material/solid/tobacco/liquid diff --git a/code/modules/reagents/chems/chems_drinks.dm b/code/modules/reagents/chems/chems_drinks.dm index eca5276b785f..51539ecf078e 100644 --- a/code/modules/reagents/chems/chems_drinks.dm +++ b/code/modules/reagents/chems/chems_drinks.dm @@ -580,6 +580,11 @@ glass_special = list(DRINK_FIZZ) allergen_flags = ALLERGEN_CAFFEINE | ALLERGEN_STIMULANT +/decl/material/liquid/drink/cola/build_presentation_name_from_reagents(var/obj/item/prop, var/supplied) + if(prop.reagents.has_reagent(/decl/material/liquid/drink/milk)) + . = "pilk" + . = ..(prop, .) + /decl/material/liquid/drink/citrussoda name = "citrus soda" lore_text = "Fizzy and tangy." @@ -718,9 +723,9 @@ /decl/material/liquid/drink/tea/black/build_presentation_name_from_reagents(var/obj/item/prop, var/supplied) if(prop.reagents.has_reagent(/decl/material/liquid/drink/juice/orange)) - if(prop.reagents.has_reagent(/decl/material/liquid/drink/milk)) + if(prop.reagents.has_reagent(/decl/material/liquid/drink/milk) && prop.reagents.has_reagent(/decl/material/liquid/drink/syrup/vanilla)) //real london fogs need vanilla syrup . = "London Fog" - else if(prop.reagents.has_reagent(/decl/material/liquid/drink/milk/soymilk)) + else if(prop.reagents.has_reagent(/decl/material/liquid/drink/milk/soymilk) && prop.reagents.has_reagent(/decl/material/liquid/drink/syrup/vanilla)) . = "soy London Fog" else . = "Baron Grey" @@ -846,6 +851,19 @@ glass_name = "pumpkin spice syrup" glass_desc = "Thick spiced pumpkin syrup used to flavor drinks." +/decl/material/liquid/drink/syrup/lavender + name = "lavender syrup" + lore_text = "Thick lavender syrup used to flavor drinks." + taste_description = "lavender" + color = "#c38be7" + coffee_priority = 1 + exoplanet_rarity_plant = MAT_RARITY_NOWHERE + exoplanet_rarity_gas = MAT_RARITY_NOWHERE + uid = "chem_drink_lavendersyrup" + + glass_name = "lavender syrup" + glass_desc = "Thick lavender syrup used to flavor drinks." + /decl/material/liquid/drink/gingerbeer name = "ginger beer" lore_text = "A hearty, non-alcoholic beverage brewed from ginger." @@ -903,3 +921,15 @@ glass_name = "Compote" glass_desc = "Traditional dessert drink made from fruits or berries. Grandma would be proud." allergen_flags = ALLERGEN_FRUIT + +/decl/material/liquid/drink/horchata + name = "horchata" + lore_text = "A traditional Mexican drink made from rice, milk, vanilla, and cinnamon." + taste_description = "refreshing vanilla and cinnamon" + color = "#d6c9be" + exoplanet_rarity_plant = MAT_RARITY_NOWHERE + exoplanet_rarity_gas = MAT_RARITY_NOWHERE + uid = "chem_drink_horchata" + + glass_name = "Horchata" + glass_desc = "A traditional Mexican drink made from rice, milk, vanilla, and cinnamon." diff --git a/code/modules/reagents/chems/chems_fuel.dm b/code/modules/reagents/chems/chems_fuel.dm index 0c532bd6711e..7853f2f5579a 100644 --- a/code/modules/reagents/chems/chems_fuel.dm +++ b/code/modules/reagents/chems/chems_fuel.dm @@ -38,7 +38,7 @@ /decl/material/liquid/fuel/hydrazine name = "hydrazine" - lore_text = "A toxic, colorless, flammable liquid with a strong ammonia-like odor, in hydrate form." + lore_text = "A toxic, colorless, flammable liquid with a strong ammonia-like odour, in hydrate form." taste_description = "sweet tasting metal" color = "#808080" metabolism = REM * 0.2 diff --git a/code/modules/reagents/chems/chems_nutriment.dm b/code/modules/reagents/chems/chems_nutriment.dm index cc0774431ca6..efe6040294cd 100644 --- a/code/modules/reagents/chems/chems_nutriment.dm +++ b/code/modules/reagents/chems/chems_nutriment.dm @@ -32,7 +32,6 @@ lore_text = "Mollusc meat, or slug meat - something slimy, anyway." scannable = 1 taste_description = "cold, bitter slime" - overdose = 10 hydration_factor = 6 uid = "chem_nutriment_slime" allergen_flags = ALLERGEN_MEAT | ALLERGEN_FISH diff --git a/code/modules/reagents/chems/chems_oil.dm b/code/modules/reagents/chems/chems_oil.dm index ad359dd61ca4..e540efb9844b 100644 --- a/code/modules/reagents/chems/chems_oil.dm +++ b/code/modules/reagents/chems/chems_oil.dm @@ -17,6 +17,7 @@ affect_blood_on_ingest = 0 affect_blood_on_inhale = 0 slipperiness = 8 + coated_adjective = "oily" /decl/material/liquid/oil/plant name = "plant oil" diff --git a/code/modules/reagents/cocktails.dm b/code/modules/reagents/cocktails.dm index 166d689541b1..1815fa6e998b 100644 --- a/code/modules/reagents/cocktails.dm +++ b/code/modules/reagents/cocktails.dm @@ -236,7 +236,7 @@ /decl/cocktail/beepsky_smash name = "Beepsky Smash" - description = "A cocktail originating with stationside security forces. Rumoured to take the edge off being stunned with your own baton." + description = "A cocktail originating with station-side security forces. Rumoured to take the edge off being stunned with your own baton." ratios = list( /decl/material/liquid/alcohol/whiskey = 2, /decl/material/liquid/drink/juice/lime = 1, @@ -560,7 +560,7 @@ /decl/cocktail/rewriter name = "Rewriter" - description = "A sickly concotion that college students and academics swear by for getting you through an all-nighter or six." + description = "A sickly concoction that college students and academics swear by for getting you through an all-nighter or six." ratios = list( /decl/material/liquid/drink/coffee = 1, /decl/material/liquid/drink/citrussoda = 1 diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm index fadf1e191872..79d763d1f945 100644 --- a/code/modules/reagents/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/dispenser/cartridge_presets.dm @@ -73,6 +73,8 @@ DEFINE_CARTRIDGE_FOR_CHEM(syrup_chocolate, /decl/material/liquid/drink/syrup/cho DEFINE_CARTRIDGE_FOR_CHEM(syrup_caramel, /decl/material/liquid/drink/syrup/caramel) DEFINE_CARTRIDGE_FOR_CHEM(syrup_vanilla, /decl/material/liquid/drink/syrup/vanilla) DEFINE_CARTRIDGE_FOR_CHEM(syrup_pumpkin, /decl/material/liquid/drink/syrup/pumpkin) +DEFINE_CARTRIDGE_FOR_CHEM(syrup_lavender, /decl/material/liquid/drink/syrup/lavender) +DEFINE_CARTRIDGE_FOR_CHEM(cinnamon, /decl/material/solid/cinnamon) // Bar, coffee DEFINE_CARTRIDGE_FOR_CHEM(coffee, /decl/material/liquid/drink/coffee) diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm index a42e49a4ae41..0336edaecb5a 100644 --- a/code/modules/reagents/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/dispenser/dispenser_presets.dm @@ -151,7 +151,9 @@ /obj/item/chems/chem_disp_cartridge/syrup_chocolate, /obj/item/chems/chem_disp_cartridge/syrup_caramel, /obj/item/chems/chem_disp_cartridge/syrup_vanilla, - /obj/item/chems/chem_disp_cartridge/syrup_pumpkin + /obj/item/chems/chem_disp_cartridge/syrup_pumpkin, + /obj/item/chems/chem_disp_cartridge/syrup_lavender, + /obj/item/chems/chem_disp_cartridge/cinnamon ) buildable = FALSE \ No newline at end of file diff --git a/code/modules/reagents/reactions/reaction_recipe.dm b/code/modules/reagents/reactions/reaction_recipe.dm index a113d821cc58..f7cd8bb17a5e 100644 --- a/code/modules/reagents/reactions/reaction_recipe.dm +++ b/code/modules/reagents/reactions/reaction_recipe.dm @@ -119,3 +119,10 @@ result_amount = 6 mix_message = "The broth of the noodles takes on a hellish red gleam." hidden_from_codex = TRUE + +/decl/chemical_reaction/recipe/horchata + name = "Horchata" + result = /decl/material/liquid/drink/horchata + required_reagents = list(/decl/material/liquid/nutriment/rice = 2, /decl/material/liquid/drink/milk = 2, /decl/material/liquid/drink/syrup/vanilla = 1, /decl/material/solid/cinnamon = 1) + result_amount = 6 + mix_message = "The ingredients combine to create a refreshing white beverage." diff --git a/code/modules/reagents/reagent_containers/beaker.dm b/code/modules/reagents/reagent_containers/beaker.dm index ab42e686e931..3a769fdec137 100644 --- a/code/modules/reagents/reagent_containers/beaker.dm +++ b/code/modules/reagents/reagent_containers/beaker.dm @@ -164,7 +164,7 @@ material_alteration = MAT_FLAG_ALTERATION_NONE lid_color = COLOR_GRAY40 -/obj/item/chems/glass/beaker/insulated/get_thermal_mass_coefficient() +/obj/item/chems/glass/beaker/insulated/get_thermal_mass_coefficient(delta) return 0.1 // Hack around reagent temp changes. diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 658b68dddf7c..862b3d655059 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -117,7 +117,7 @@ /obj/item/chems/borghypo/service name = "cyborg drink synthesizer" - desc = "A portable drink dispencer." + desc = "A portable drink dispenser." icon = 'icons/obj/drinks.dmi' icon_state = "shaker" charge_cost = 5 diff --git a/code/modules/reagents/reagent_containers/condiments/condiment_appearance.dm b/code/modules/reagents/reagent_containers/condiments/condiment_appearance.dm index 4236c1867544..6192a77f4d6a 100644 --- a/code/modules/reagents/reagent_containers/condiments/condiment_appearance.dm +++ b/code/modules/reagents/reagent_containers/condiments/condiment_appearance.dm @@ -124,3 +124,9 @@ condiment_desc = "A small bottle of the essential oil of some kind of mint plant." condiment_icon = 'icons/obj/food/condiments/coldsauce.dmi' condiment_key = "small" + +/decl/condiment_appearance/cinnamon + condiment_type = /decl/material/solid/cinnamon + condiment_name = "cinnamon" + condiment_desc = "A small bottle of ground cinnamon." + condiment_icon = 'icons/obj/food/condiments/generic.dmi' diff --git a/code/modules/reagents/reagent_containers/condiments/condiments.dm b/code/modules/reagents/reagent_containers/condiments/condiments.dm index 3204fee220dc..c58d74df45ca 100644 --- a/code/modules/reagents/reagent_containers/condiments/condiments.dm +++ b/code/modules/reagents/reagent_containers/condiments/condiments.dm @@ -18,5 +18,6 @@ MAPPED_CONDIMENT_TYPE(frostoil, /decl/condiment_appearance/coldsauce) MAPPED_CONDIMENT_TYPE(capsaicin, /decl/condiment_appearance/capsaicin) MAPPED_CONDIMENT_TYPE(yeast, /decl/condiment_appearance/yeast) MAPPED_CONDIMENT_TYPE(flour, /decl/condiment_appearance/flour) +MAPPED_CONDIMENT_TYPE(cinnamon, /decl/condiment_appearance/cinnamon) #undef MAPPED_CONDIMENT_TYPE \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/drinks/bottle.dm b/code/modules/reagents/reagent_containers/drinks/bottle.dm index 56e5f6b47206..7797e94b0e32 100644 --- a/code/modules/reagents/reagent_containers/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/drinks/bottle.dm @@ -13,7 +13,7 @@ abstract_type = /obj/item/chems/drinks/bottle var/smash_duration = 5 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) - var/obj/item/chems/glass/rag/rag = null + var/obj/item/chems/rag/rag = null var/rag_underlay = "rag" var/stop_spin_bottle = FALSE //Gotta stop the rotation. @@ -95,7 +95,7 @@ /obj/item/chems/drinks/bottle/attackby(obj/item/W, mob/user) if(!rag) - if(istype(W, /obj/item/chems/glass/rag)) + if(istype(W, /obj/item/chems/rag)) insert_rag(W, user) return TRUE else if(W.isflamesource()) @@ -105,7 +105,7 @@ /obj/item/chems/drinks/bottle/attack_self(mob/user) return rag ? remove_rag(user) : ..() -/obj/item/chems/drinks/bottle/proc/insert_rag(obj/item/chems/glass/rag/R, mob/user) +/obj/item/chems/drinks/bottle/proc/insert_rag(obj/item/chems/rag/R, mob/user) if(material?.type != /decl/material/solid/glass) to_chat(user, SPAN_WARNING("\The [src] isn't made of glass, you can't make a good Molotov with it.")) return TRUE @@ -290,7 +290,7 @@ /obj/item/chems/drinks/bottle/patron name = "Wrapp Artiste Patron" - desc = "Silver laced tequila, served in space night clubs across the galaxy." + desc = "Silver laced tequila, served in space nightclubs across the galaxy." icon_state = "patronbottle" center_of_mass = @'{"x":16,"y":6}' @@ -346,7 +346,7 @@ /obj/item/chems/drinks/bottle/cognac name = "Chateau De Baton Premium Cognac" - desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." + desc = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" center_of_mass = @'{"x":16,"y":6}' @@ -409,7 +409,7 @@ /obj/item/chems/drinks/bottle/cola name = "\improper Space Cola" - desc = "Cola. in space." + desc = "Cola... in space." icon_state = "colabottle" center_of_mass = @'{"x":16,"y":6}' diff --git a/code/modules/reagents/reagent_containers/drinks/cans.dm b/code/modules/reagents/reagent_containers/drinks/cans.dm index 7c2dbb14dd63..3b0974dd6e3a 100644 --- a/code/modules/reagents/reagent_containers/drinks/cans.dm +++ b/code/modules/reagents/reagent_containers/drinks/cans.dm @@ -12,7 +12,7 @@ /obj/item/chems/drinks/cans/cola name = "\improper Space Cola" - desc = "Cola. in space." + desc = "Cola... in space." icon_state = "cola" center_of_mass = @'{"x":16,"y":10}' diff --git a/code/modules/reagents/reagent_containers/drinks/cocktailshaker.dm b/code/modules/reagents/reagent_containers/drinks/cocktailshaker.dm index c2517e3b519d..f8416cf3a1f0 100644 --- a/code/modules/reagents/reagent_containers/drinks/cocktailshaker.dm +++ b/code/modules/reagents/reagent_containers/drinks/cocktailshaker.dm @@ -1,6 +1,6 @@ /obj/item/chems/drinks/shaker name = "shaker" - desc = "A three piece Cobbler-style shaker. Used to mix, cool, and strain drinks." + desc = "A three-piece Cobbler-style shaker. Used to mix, cool, and strain drinks." icon_state = "shaker" amount_per_transfer_from_this = 10 possible_transfer_amounts = @"[5,10,15,25,30,60]" //Professional bartender should be able to transfer as much as needed diff --git a/code/modules/reagents/reagent_containers/food/canned/_canned.dm b/code/modules/reagents/reagent_containers/food/canned/_canned.dm index 5e4c35d81297..63fa762a18d6 100644 --- a/code/modules/reagents/reagent_containers/food/canned/_canned.dm +++ b/code/modules/reagents/reagent_containers/food/canned/_canned.dm @@ -82,7 +82,7 @@ /obj/item/food/can/beans name = "baked beans" icon_state = "beans" - desc = "Carefully synthethized from soy." + desc = "Carefully synthesized from soy." trash = /obj/item/trash/beans filling_color = "#ff6633" nutriment_desc = list("beans" = 1) diff --git a/code/modules/reagents/reagent_containers/food/dairy/cheeses.dm b/code/modules/reagents/reagent_containers/food/dairy/cheeses.dm index 9b31f8e3c7c6..b6f7287382da 100644 --- a/code/modules/reagents/reagent_containers/food/dairy/cheeses.dm +++ b/code/modules/reagents/reagent_containers/food/dairy/cheeses.dm @@ -22,7 +22,7 @@ /obj/item/food/dairy/cheese/wheel name = "wheel" - desc = "A big wheel of delcious cheese." + desc = "A big wheel of delicious cheese." icon = 'icons/obj/food/dairy/cheese_wheel.dmi' slice_path = /obj/item/food/dairy/cheese/wedge/slice slice_num = 5 diff --git a/code/modules/reagents/reagent_containers/food/eggs.dm b/code/modules/reagents/reagent_containers/food/eggs.dm index ea7851b65edc..955ea9d8d10b 100644 --- a/code/modules/reagents/reagent_containers/food/eggs.dm +++ b/code/modules/reagents/reagent_containers/food/eggs.dm @@ -96,7 +96,7 @@ /obj/item/food/boiledegg name = "boiled egg" - desc = "A hard boiled egg." + desc = "A hard-boiled egg." icon = 'icons/obj/food/eggs/egg.dmi' icon_state = ICON_STATE_WORLD filling_color = "#ffffff" diff --git a/code/modules/reagents/reagent_containers/food/junkfood.dm b/code/modules/reagents/reagent_containers/food/junkfood.dm index 7792578bcda1..70a2f267872b 100644 --- a/code/modules/reagents/reagent_containers/food/junkfood.dm +++ b/code/modules/reagents/reagent_containers/food/junkfood.dm @@ -91,7 +91,7 @@ /obj/item/food/junk/squid name = "\improper Calamari Crisps" icon_state = "squid" - desc = "Space cepholapod tentacles, carefully removed from the squid then dried into strips of delicious rubbery goodness!" + desc = "Space cephalopod tentacles, carefully removed from the squid then dried into strips of delicious rubbery goodness!" trash = /obj/item/trash/squid filling_color = "#c0a9d7" center_of_mass = @'{"x":15,"y":9}' @@ -355,7 +355,7 @@ /obj/item/food/junk/oort name = "\improper Cloud Rocks" icon_state = "oort" - desc = "Pop rocks. The new formula guarantees fewer shrapnel induced oral injuries." + desc = "Pop rocks. The new formula guarantees fewer shrapnel-induced oral injuries." trash = /obj/item/trash/oort filling_color = "#3f7dd2" center_of_mass = @'{"x":15,"y":9}' diff --git a/code/modules/reagents/reagent_containers/food/meat/cubes.dm b/code/modules/reagents/reagent_containers/food/meat/cubes.dm index 76236a4910cf..ccad0f203228 100644 --- a/code/modules/reagents/reagent_containers/food/meat/cubes.dm +++ b/code/modules/reagents/reagent_containers/food/meat/cubes.dm @@ -36,7 +36,7 @@ add_to_reagents(/decl/material/solid/organic/meat, 10) /obj/item/food/animal_cube/get_single_monetary_worth() - . = (spawn_type ? round(atom_info_repository.get_combined_worth_for(spawn_type) * 1.25) : 5) + . = (spawn_type ? round(atom_info_repository.get_combined_worth_for((islist(spawn_type) ? spawn_type[1] : spawn_type)) * 1.25) : 5) if(wrapper_type) . += atom_info_repository.get_combined_worth_for(wrapper_type) @@ -51,6 +51,8 @@ return growing = TRUE visible_message(SPAN_NOTICE("\The [src] expands!")) + if(islist(spawn_type)) + spawn_type = pickweight(spawn_type) var/mob/critter = new spawn_type critter.dropInto(force_loc || loc) qdel(src) @@ -96,3 +98,19 @@ /obj/item/food/animal_cube/wrapped/monkey name = "monkey cube" spawn_type = /mob/living/human/monkey + +/obj/item/food/animal_cube/carp + name = "carp cube" + spawn_type = list( + /mob/living/simple_animal/hostile/carp = 10, + /mob/living/simple_animal/hostile/carp/pike = 3, + /mob/living/simple_animal/hostile/carp/shark = 1 + ) + +/obj/item/food/animal_cube/wrapped/carp + name = "carp cube" + spawn_type = list( + /mob/living/simple_animal/hostile/carp = 10, + /mob/living/simple_animal/hostile/carp/pike = 3, + /mob/living/simple_animal/hostile/carp/shark = 1 + ) diff --git a/code/modules/reagents/reagent_containers/food/pasta.dm b/code/modules/reagents/reagent_containers/food/pasta.dm index b62330fb2e96..94c12fc4feb7 100644 --- a/code/modules/reagents/reagent_containers/food/pasta.dm +++ b/code/modules/reagents/reagent_containers/food/pasta.dm @@ -54,7 +54,7 @@ /obj/item/food/meatballspagetti name = "spaghetti & meatballs" - desc = "Now thats a nice meatball!" + desc = "Now that's a nice meatball!" icon = 'icons/obj/food/pasta/meatball_spaghetti.dmi' plate = /obj/item/plate filling_color = "#de4545" diff --git a/code/modules/reagents/reagent_containers/food/rotten.dm b/code/modules/reagents/reagent_containers/food/rotten.dm index 22e15e4dea1c..4115b5d05dee 100644 --- a/code/modules/reagents/reagent_containers/food/rotten.dm +++ b/code/modules/reagents/reagent_containers/food/rotten.dm @@ -1,8 +1,7 @@ //inedible old vendor food - +//filled with inedible and possibly dangerous chemicals /obj/item/food/old name = "master old-food" - desc = "they're all inedible and potentially dangerous items" center_of_mass = @'{"x":15,"y":12}' nutriment_desc = list("rot" = 5, "mold" = 5) nutriment_amt = 10 diff --git a/code/modules/reagents/reagent_containers/food/sliceable/cakes.dm b/code/modules/reagents/reagent_containers/food/sliceable/cakes.dm index e5088980d8ef..2d7f45c72ee7 100644 --- a/code/modules/reagents/reagent_containers/food/sliceable/cakes.dm +++ b/code/modules/reagents/reagent_containers/food/sliceable/cakes.dm @@ -17,7 +17,7 @@ /obj/item/food/slice/carrotcake name = "carrot cake slice" - desc = "Carrotty slice of carrot cake, carrots are good for your eyes! It's true! Probably!" + desc = "Carrot-y slice of carrot cake, carrots are good for your eyes! It's true! Probably!" icon = 'icons/obj/food/baked/cakes/slices/carrot.dmi' plate = /obj/item/plate filling_color = "#ffd675" @@ -77,7 +77,7 @@ /obj/item/food/slice/cheesecake name = "cheese cake slice" - desc = "Slice of pure cheestisfaction." + desc = "Slice of pure cheesatisfaction." icon = 'icons/obj/food/baked/cakes/slices/cheese.dmi' plate = /obj/item/plate filling_color = "#faf7af" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index be5659ebba4e..70dc6661c2a2 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -22,7 +22,7 @@ ) // autoinjectors takes less time than a normal syringe (overriden for hypospray). - // This delay is only applied when injecting concious mobs, and is not applied for self-injection + // This delay is only applied when injecting conscious mobs, and is not applied for self-injection // The 1.9 factor scales it so it takes the following number of seconds: // NONE 1.47 // BASIC 1.00 @@ -57,7 +57,7 @@ user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(target) - if(user != target && !target.incapacitated() && time) // you're injecting someone else who is concious, so apply the device's intrisic delay + if(user != target && !target.incapacitated() && time) // you're injecting someone else who is conscious, so apply the device's intrisic delay to_chat(user, SPAN_WARNING("\The [user] is trying to inject \the [target] with \the [name].")) if(!user.do_skilled(time, SKILL_MEDICAL, target)) return TRUE @@ -83,7 +83,7 @@ //////////////////////////////////////////////////////////////////////////////// /obj/item/chems/hypospray/vial name = "hypospray" - desc = "A sterile, air-needle autoinjector for rapid administration of drugs to patients. Uses a replacable 30u vial." + desc = "A sterile, air-needle autoinjector for rapid administration of drugs to patients. Uses a replaceable 30u vial." possible_transfer_amounts = @"[1,2,5,10,15,20,30]" amount_per_transfer_from_this = 5 volume = 0 diff --git a/code/modules/reagents/reagent_containers/retort.dm b/code/modules/reagents/reagent_containers/retort.dm index d19e473ee337..0b78d727e24e 100644 --- a/code/modules/reagents/reagent_containers/retort.dm +++ b/code/modules/reagents/reagent_containers/retort.dm @@ -1,7 +1,7 @@ /obj/item/chems/glass/retort name = "retort" base_name = "retort" - desc = "A strangely-shaped vessel for seperating chemicals when heated." + desc = "A strangely-shaped vessel for separating chemicals when heated." icon = 'icons/obj/items/retort.dmi' icon_state = ICON_STATE_WORLD volume = 120 diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index febab7b3c6b1..da96a75e031b 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -301,7 +301,7 @@ var/global/list/all_conveyor_switches = list() /obj/item/conveyor_switch_construct/oneway name = "one-way conveyor switch assembly" - desc = "An one-way conveyor control switch assembly." + desc = "A one-way conveyor control switch assembly." /obj/item/conveyor_switch_construct/oneway/afterattack(atom/A, mob/user, proximity) if(!proximity || !istype(A, /turf/floor) || user.incapacitated()) diff --git a/code/modules/recycling/disposalpipe.dm b/code/modules/recycling/disposalpipe.dm index 88e11fbbdc60..6727ee5fbfa8 100644 --- a/code/modules/recycling/disposalpipe.dm +++ b/code/modules/recycling/disposalpipe.dm @@ -236,6 +236,7 @@ // a straight or bent segment /obj/structure/disposalpipe/segment + desc = "A linear segment of disposal piping that simply moves things from one end to the other." icon_state = "pipe-s" // Sadly this var stores state. "pipe-c" is corner. Should be changed, but requires huge map diff. turn = DISPOSAL_FLIP_FLIP @@ -364,6 +365,7 @@ //a three-way junction with dir being the dominant direction /obj/structure/disposalpipe/junction + desc = "A three-way segment of disposal piping that merges two incoming directions into a third outgoing one." icon_state = "pipe-j1" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP flipped_state = /obj/structure/disposalpipe/junction/mirrored @@ -413,6 +415,7 @@ /obj/structure/disposalpipe/tagger name = "package tagger" + desc = "A pipe that tags things passing through it with a sorting tag." icon_state = "pipe-tagger" var/sort_tag = "" var/partial = 0 @@ -459,6 +462,7 @@ /obj/structure/disposalpipe/tagger/partial //needs two passes to tag name = "partial package tagger" + desc = "A pipe that tags things passing through it with a sorting tag... but only the second time around." icon_state = "pipe-tagger-partial" partial = 1 turn = DISPOSAL_FLIP_FLIP @@ -480,7 +484,7 @@ /obj/structure/disposalpipe/diversion_junction/proc/updatedesc() desc = initial(desc) if(sort_type) - desc += "\nIt's currently [active ? "" : "un"]active!" + desc += "\nIt's currently [active ? "" : "in"]active!" /obj/structure/disposalpipe/diversion_junction/proc/updatedir() inactive_dir = dir @@ -687,6 +691,7 @@ //a trunk joining to a disposal bin or outlet on the same turf /obj/structure/disposalpipe/trunk + desc = "A section of pneumatic piping made to connect to a bin or outlet." icon_state = "pipe-t" var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 76e6c440ec3a..274c5aec2599 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,6 +1,6 @@ /obj/machinery/disposal/deliveryChute name = "delivery chute" - desc = "A chute for big and small packages alike!" + desc = "A chute to put things into a disposal network. Takes big and small packages alike!" density = TRUE icon = 'icons/obj/pipes/disposal_chute.dmi' icon_state = "chute" diff --git a/code/modules/research/research_fields.dm b/code/modules/research/research_fields.dm index 31448ed7631b..d37be7dde722 100644 --- a/code/modules/research/research_fields.dm +++ b/code/modules/research/research_fields.dm @@ -49,7 +49,7 @@ /decl/research_field/programming name = "Data Science" - desc = "The study of computer science, data manipuation and artificial intelligence." + desc = "The study of computer science, data manipulation and artificial intelligence." id = TECH_DATA /decl/research_field/esoteria diff --git a/code/game/objects/items/devices/scanners/_scanner.dm b/code/modules/scanners/_scanner.dm similarity index 100% rename from code/game/objects/items/devices/scanners/_scanner.dm rename to code/modules/scanners/_scanner.dm diff --git a/code/game/objects/items/devices/scanners/breath.dm b/code/modules/scanners/breath.dm similarity index 100% rename from code/game/objects/items/devices/scanners/breath.dm rename to code/modules/scanners/breath.dm diff --git a/code/game/objects/items/devices/scanners/gas.dm b/code/modules/scanners/gas.dm similarity index 100% rename from code/game/objects/items/devices/scanners/gas.dm rename to code/modules/scanners/gas.dm diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/modules/scanners/health.dm similarity index 100% rename from code/game/objects/items/devices/scanners/health.dm rename to code/modules/scanners/health.dm diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/modules/scanners/mass_spectrometer.dm similarity index 100% rename from code/game/objects/items/devices/scanners/mass_spectrometer.dm rename to code/modules/scanners/mass_spectrometer.dm diff --git a/code/game/objects/items/devices/scanners/mining.dm b/code/modules/scanners/mining.dm similarity index 100% rename from code/game/objects/items/devices/scanners/mining.dm rename to code/modules/scanners/mining.dm diff --git a/code/game/objects/items/devices/scanners/network.dm b/code/modules/scanners/network.dm similarity index 100% rename from code/game/objects/items/devices/scanners/network.dm rename to code/modules/scanners/network.dm diff --git a/code/game/objects/items/devices/scanners/plant.dm b/code/modules/scanners/plant.dm similarity index 100% rename from code/game/objects/items/devices/scanners/plant.dm rename to code/modules/scanners/plant.dm diff --git a/code/game/objects/items/devices/scanners/price.dm b/code/modules/scanners/price.dm similarity index 100% rename from code/game/objects/items/devices/scanners/price.dm rename to code/modules/scanners/price.dm diff --git a/code/game/objects/items/devices/scanners/reagents.dm b/code/modules/scanners/reagents.dm similarity index 100% rename from code/game/objects/items/devices/scanners/reagents.dm rename to code/modules/scanners/reagents.dm diff --git a/code/game/objects/items/devices/scanners/xenobio.dm b/code/modules/scanners/xenobio.dm similarity index 100% rename from code/game/objects/items/devices/scanners/xenobio.dm rename to code/modules/scanners/xenobio.dm diff --git a/code/datums/extensions/scent/_scent.dm b/code/modules/scent/_scent.dm similarity index 94% rename from code/datums/extensions/scent/_scent.dm rename to code/modules/scent/_scent.dm index cdf60ec83e0f..2298b57494d2 100644 --- a/code/datums/extensions/scent/_scent.dm +++ b/code/modules/scent/_scent.dm @@ -1,6 +1,6 @@ -#define SCENT_DESC_ODOR "odour" -#define SCENT_DESC_SMELL "smell" -#define SCENT_DESC_FRAGRANCE "fragrance" +var/global/const/SCENT_DESC_ODOR = "odour" +var/global/const/SCENT_DESC_SMELL = "smell" +var/global/const/SCENT_DESC_FRAGRANCE = "fragrance" /***** Scent intensity @@ -43,7 +43,7 @@ Scent intensity var/scent = "something" var/decl/scent_intensity/intensity = /decl/scent_intensity - var/descriptor = SCENT_DESC_SMELL //unambiguous descriptor of smell; food is generally good, sewage is generally bad. how 'nice' the scent is + var/descriptor = "smell" //unambiguous descriptor of smell; food is generally good, sewage is generally bad. how 'nice' the scent is var/range = 1 //range in tiles /datum/extension/scent/New() diff --git a/code/datums/extensions/scent/scent_candle.dm b/code/modules/scent/scent_candle.dm similarity index 95% rename from code/datums/extensions/scent/scent_candle.dm rename to code/modules/scent/scent_candle.dm index b8821fbe4ef8..37830e311c08 100644 --- a/code/datums/extensions/scent/scent_candle.dm +++ b/code/modules/scent/scent_candle.dm @@ -1,6 +1,6 @@ /datum/extension/scent/candle intensity = /decl/scent_intensity/normal - descriptor = SCENT_DESC_FRAGRANCE + descriptor = "fragrance" range = 4 /datum/extension/scent/candle/rose diff --git a/code/datums/scents/scent_decls.dm b/code/modules/scent/scent_decls.dm similarity index 100% rename from code/datums/scents/scent_decls.dm rename to code/modules/scent/scent_decls.dm diff --git a/code/datums/extensions/scent/scent_misc.dm b/code/modules/scent/scent_misc.dm similarity index 76% rename from code/datums/extensions/scent/scent_misc.dm rename to code/modules/scent/scent_misc.dm index 5e79b5552e89..ecad58d68fc8 100644 --- a/code/datums/extensions/scent/scent_misc.dm +++ b/code/modules/scent/scent_misc.dm @@ -1,5 +1,5 @@ /datum/extension/scent/ashtray scent = "an ashtray" intensity = /decl/scent_intensity - descriptor = SCENT_DESC_ODOR + descriptor = "odour" range = 2 \ No newline at end of file diff --git a/code/modules/sealant_gun/sealant_gun.dm b/code/modules/sealant_gun/sealant_gun.dm index 70d644b721c9..6f0d91966447 100644 --- a/code/modules/sealant_gun/sealant_gun.dm +++ b/code/modules/sealant_gun/sealant_gun.dm @@ -1,6 +1,6 @@ /obj/item/gun/launcher/sealant name = "sealant gun" - desc = "A heavy, unwieldly device used to spray metal foam sealant onto hull breaches or damaged flooring." + desc = "A heavy, unwieldy device used to spray metal foam sealant onto hull breaches or damaged flooring." icon = 'icons/obj/guns/sealant_gun.dmi' icon_state = ICON_STATE_WORLD autofire_enabled = TRUE diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index d7cb76c4ead0..41df847379cf 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -194,7 +194,7 @@ if(nuke) visible_message(SPAN_WARNING("\The [src] blinks and displays a message: The nuclear authorization code is [nuke.r_code]"), range=2) else - visible_message(SPAN_WARNING("\The [src] blinks and displays a message: No self destruct terminal found."), range=2) + visible_message(SPAN_WARNING("\The [src] blinks and displays a message: No self-destruct terminal found."), range=2) SSstatistics.add_field("alert_keycard_auth_nukecode",1) /obj/machinery/keycard_auth/proc/is_ert_blocked() diff --git a/code/modules/shield_generators/shield.dm b/code/modules/shield_generators/shield.dm index b39816fdce51..4a48e64409d5 100644 --- a/code/modules/shield_generators/shield.dm +++ b/code/modules/shield_generators/shield.dm @@ -13,12 +13,12 @@ var/disabled_for = 0 var/diffused_for = 0 -/obj/effect/shield/on_update_icon(update_neighbors = FALSE) +/obj/effect/shield/on_update_icon() if(gen && gen.check_flag(MODEFLAG_PHOTONIC) && !disabled_for && !diffused_for) - set_opacity(1) + set_opacity(TRUE) else - set_opacity(0) + set_opacity(FALSE) if(gen && gen.check_flag(MODEFLAG_OVERCHARGE)) color = COLOR_VIOLET @@ -29,24 +29,32 @@ cut_overlays() for(var/direction in global.cardinal) - var/turf/T = get_step(src, direction) - if(!T) + var/turf/resolved_turf = get_step_resolving_mimic(src, direction) + if(!resolved_turf) continue - var/found = locate(/obj/effect/shield) in T + var/found = locate(/obj/effect/shield) in resolved_turf if(found) - if(update_neighbors) - for(var/obj/effect/shield/shield in T) - shield.update_icon(FALSE) add_overlay(image(icon = icon, icon_state = "[icon_state]edge", dir = direction)) +/obj/effect/shield/update_nearby_tiles(need_rebuild) + . = ..() + for(var/direction in global.cardinal) + var/turf/resolved_turf = get_step_resolving_mimic(src, direction) + if(!resolved_turf) + continue + for(var/obj/effect/shield/shield in resolved_turf) + if(!(shield.atom_flags & ATOM_FLAG_INITIALIZED)) // they'll update themselves later + continue + shield.update_icon() + // Prevents shuttles, singularities and pretty much everything else from moving the field segments away. // The only thing that is allowed to move us is the Destroy() proc. /obj/effect/shield/forceMove() . = QDELING(src) && ..() -/obj/effect/shield/Initialize() +/obj/effect/shield/Initialize(mapload) . = ..() - update_icon(TRUE) + update_icon() update_nearby_tiles() /obj/effect/shield/Destroy() @@ -96,7 +104,7 @@ set_density(1) set_invisibility(INVISIBILITY_NONE) update_nearby_tiles() - update_icon(TRUE) + update_icon() update_explosion_resistance() gen.damaged_segments -= src @@ -112,7 +120,7 @@ set_density(0) set_invisibility(INVISIBILITY_MAXIMUM) update_nearby_tiles() - update_icon(TRUE) + update_icon() update_explosion_resistance() // Fails shield segments in specific range. Range of 1 affects the shielded turf only. @@ -255,7 +263,7 @@ // Update airflow update_nearby_tiles() - update_icon(TRUE) + update_icon() update_explosion_resistance() /obj/effect/shield/proc/update_explosion_resistance() diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index bd13d30c417b..8d1ee2489bec 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -142,7 +142,7 @@ var/global/list/escape_pods_by_name = list() /datum/computer/file/embedded_program/docking/simple/escape_pod_berth/receive_user_command(command) if (!armed) - return TRUE // Eat all commands. + return TOPIC_HANDLED // Eat all commands. return ..(command) /datum/computer/file/embedded_program/docking/simple/escape_pod_berth/process() diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 85ee565817b5..d11e0cb97a83 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -15,7 +15,7 @@ abstract_type = /datum/shuttle var/multiz = 0 //how many multiz levels, starts at 0 - var/ceiling_type = /turf/unsimulated/floor/shuttle_ceiling + var/ceiling_type = /turf/floor/shuttle_ceiling var/force_ceiling_on_init = TRUE // Whether or not to force ceilings turfs to be created above on initialization. var/sound_takeoff = 'sound/effects/shuttle_takeoff.ogg' @@ -116,7 +116,7 @@ if (moving_status == SHUTTLE_IDLE) return //someone cancelled the launch - if(!fuel_check()) //fuel error (probably out of fuel) occured, so cancel the launch + if(!fuel_check()) //fuel error (probably out of fuel) occurred, so cancel the launch var/datum/shuttle/autodock/S = src if(istype(S)) S.cancel_launch(null) @@ -138,7 +138,7 @@ if(moving_status == SHUTTLE_IDLE) return //someone cancelled the launch - if(!fuel_check()) //fuel error (probably out of fuel) occured, so cancel the launch + if(!fuel_check()) //fuel error (probably out of fuel) occurred, so cancel the launch var/datum/shuttle/autodock/S = src if(istype(S)) S.cancel_launch(null) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 422e33e3f0e1..774c5d4bdf09 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -37,7 +37,7 @@ shuttle_status = "Standing-by at [shuttle.get_location_name()]." if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has recieved command and will depart shortly." + shuttle_status = "Shuttle has received command and will depart shortly." if(WAIT_ARRIVE) shuttle_status = "Proceeding to \the [shuttle.get_destination_name()]." if(WAIT_FINISH) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index f6efaa4a8645..f78010c50559 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -201,7 +201,7 @@ else shuttle_status = "Standing-by at [global.using_map.dock_name]." if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has recieved command and will depart shortly." + shuttle_status = "Shuttle has received command and will depart shortly." if(WAIT_ARRIVE) shuttle_status = "Proceeding to destination." if(WAIT_FINISH) diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm index ebe0a7cf54f6..020d8c670c9c 100644 --- a/code/modules/shuttles/shuttle_ferry.dm +++ b/code/modules/shuttles/shuttle_ferry.dm @@ -63,4 +63,4 @@ if(initial(waypoint_offsite)) return "The offsite waypoint landmark (tag: [initial(waypoint_offsite)]) was not found." else - return "A offsite waypoint was not properly set." \ No newline at end of file + return "An offsite waypoint was not properly set." \ No newline at end of file diff --git a/code/modules/shuttles/shuttle_log.dm b/code/modules/shuttles/shuttle_log.dm index 03d6fe0f3070..b4cf0a2d7b57 100644 --- a/code/modules/shuttles/shuttle_log.dm +++ b/code/modules/shuttles/shuttle_log.dm @@ -6,7 +6,7 @@ var/list/datum/shuttle_mission/queued_missions = list() //Missions which are queued up, in order ([1] is the next one scheduled). var/datum/shuttle_mission/current_mission //The current mission, planned or ongoing. Will also be in either missions or queued_missions, depending on stage. var/home_base //The landmark tag from which missions originate. - var/list/datum/nano_module/registered = list() //Nanomodules using logs should register to recieve updates. + var/list/datum/nano_module/registered = list() //Nanomodules using logs should register to receive updates. var/last_spam = 0 //Helps with spam control from deck software. /datum/shuttle_log/New(datum/shuttle/given_shuttle) @@ -17,7 +17,7 @@ SSshuttle.shuttle_logs[given_shuttle] = src /datum/shuttle_log/Destroy() - update_registred() + update_registered() registered = null current_mission = null QDEL_NULL_LIST(missions) @@ -30,7 +30,7 @@ /datum/shuttle_log/proc/unregister(datum/nano_module/module) registered -= module -/datum/shuttle_log/proc/update_registred() +/datum/shuttle_log/proc/update_registered() for(var/datum/nano_module/module in registered) SSnano.update_uis(module) @@ -49,7 +49,7 @@ qdel(old_report) new_report.mission.set_value(mission.name) mission.other_reports += report - update_registred() + update_registered() return 1 /datum/shuttle_log/proc/process_queue() @@ -64,7 +64,7 @@ if(!current_mission && length(queued_missions)) current_mission = queued_missions[1] current_mission.stage = SHUTTLE_MISSION_PLANNED - update_registred() + update_registered() /datum/shuttle_log/proc/create_mission(name) var/datum/shuttle_mission/mission = new() @@ -85,7 +85,7 @@ mission.name = name for(var/datum/computer_file/report/recipient/shuttle/report in mission.other_reports) report.mission.set_value(name) - update_registred() + update_registered() //Only missions that haven't started can be deleted; returns 0 on failure. /datum/shuttle_log/proc/delete_mission(datum/shuttle_mission/mission) diff --git a/code/modules/species/outsider/random.dm b/code/modules/species/outsider/random.dm deleted file mode 100644 index af9094b53cae..000000000000 --- a/code/modules/species/outsider/random.dm +++ /dev/null @@ -1,142 +0,0 @@ -/decl/bodytype/alium - name = "humanoid" - bodytype_category = BODYTYPE_HUMANOID - icon_base = 'icons/mob/human_races/species/humanoid/body.dmi' - bandages_icon = 'icons/mob/bandage.dmi' - limb_blend = ICON_MULTIPLY - appearance_flags = HAS_SKIN_COLOR - body_flags = BODY_FLAG_NO_DNA | BODY_FLAG_NO_DEFIB | BODY_FLAG_NO_STASIS - uid = "bodytype_alium" - -/decl/bodytype/alium/Initialize() - if(prob(10)) - movement_slowdown += pick(-1,1) - if(prob(5)) - body_flags |= BODY_FLAG_NO_PAIN - base_color = RANDOM_RGB - MULT_BY_RANDOM_COEF(eye_flash_mod, 0.5, 1.5) - eye_darksight_range = rand(1,8) - var/temp_comfort_shift = rand(-50,50) - cold_level_1 += temp_comfort_shift - cold_level_2 += temp_comfort_shift - cold_level_3 += temp_comfort_shift - heat_level_1 += temp_comfort_shift - heat_level_2 += temp_comfort_shift - heat_level_3 += temp_comfort_shift - heat_discomfort_level += temp_comfort_shift - cold_discomfort_level += temp_comfort_shift - . = ..() - -/decl/species/alium - name = SPECIES_ALIEN - name_plural = "Humanoids" - description = "Some alien humanoid species, unknown to humanity. How exciting." - rarity_value = 5 - hidden_from_codex = TRUE - - spawn_flags = SPECIES_IS_RESTRICTED - - available_bodytypes = list(/decl/bodytype/alium) - - force_background_info = list( - /decl/background_category/heritage = /decl/background_detail/heritage/hidden/alium - ) - - exertion_effect_chance = 10 - exertion_hydration_scale = 1 - exertion_reagent_scale = 1 - exertion_reagent_path = /decl/material/liquid/lactate - exertion_emotes_biological = list( - /decl/emote/exertion/biological, - /decl/emote/exertion/biological/breath, - /decl/emote/exertion/biological/pant - ) - var/blood_color - -/decl/species/alium/Initialize() - - //Coloring - blood_color = RANDOM_RGB - flesh_color = RANDOM_RGB - - //Combat stats - MULT_BY_RANDOM_COEF(total_health, 0.8, 1.2) - MULT_BY_RANDOM_COEF(brute_mod, 0.5, 1.5) - MULT_BY_RANDOM_COEF(burn_mod, 0.8, 1.2) - MULT_BY_RANDOM_COEF(oxy_mod, 0.5, 1.5) - MULT_BY_RANDOM_COEF(toxins_mod, 0, 2) - MULT_BY_RANDOM_COEF(radiation_mod, 0, 2) - - if(brute_mod < 1 && prob(40)) - species_flags |= SPECIES_FLAG_NO_MINOR_CUT - if(brute_mod < 0.9 && prob(40)) - species_flags |= SPECIES_FLAG_NO_EMBED - if(toxins_mod < 0.1) - species_flags |= SPECIES_FLAG_NO_POISON - - //Gastronomic traits - taste_sensitivity = pick(TASTE_HYPERSENSITIVE, TASTE_SENSITIVE, TASTE_DULL, TASTE_NUMB) - gluttonous = pick(0, GLUT_TINY, GLUT_SMALLER, GLUT_ANYTHING) - stomach_capacity = 5 * stomach_capacity - if(prob(20)) - gluttonous |= pick(GLUT_ITEM_TINY, GLUT_ITEM_NORMAL, GLUT_ITEM_ANYTHING, GLUT_PROJECTILE_VOMIT) - if(gluttonous & GLUT_ITEM_ANYTHING) - stomach_capacity += ITEM_SIZE_HUGE - - //Environment - var/temp_comfort_shift = rand(-50,50) - body_temperature += temp_comfort_shift - - var/pressure_comfort_shift = rand(-50,50) - hazard_high_pressure += pressure_comfort_shift - warning_high_pressure += pressure_comfort_shift - warning_low_pressure += pressure_comfort_shift - hazard_low_pressure += pressure_comfort_shift - - //Misc traits - if(prob(40)) - available_pronouns = list(/decl/pronouns) - if(prob(10)) - species_flags |= SPECIES_FLAG_NO_SLIP - if(prob(10)) - species_flags |= SPECIES_FLAG_NO_TANGLE - - . = ..() - -/decl/species/alium/get_species_blood_color(mob/living/human/H) - if(istype(H) && H.isSynthetic()) - return ..() - return blood_color - -/obj/structure/aliumizer - name = "alien monolith" - desc = "Your true form is calling. Use this to become an alien humanoid." - icon = 'icons/obj/xenoarchaeology.dmi' - icon_state = "ano51" - anchored = TRUE - -/obj/structure/aliumizer/attack_hand(mob/user) - SHOULD_CALL_PARENT(FALSE) - if(!ishuman(user)) - to_chat(user, SPAN_WARNING("You've got no business touching this.")) - return TRUE - var/decl/species/species = user.get_species() - if(!species) - return TRUE - if(species.name == SPECIES_ALIEN) - to_chat(user, SPAN_WARNING("You're already a [SPECIES_ALIEN].")) - return TRUE - if(alert("Are you sure you want to be an alien?", "Mom Look I'm An Alien!", "Yes", "No") == "No") - to_chat(user, SPAN_NOTICE("You are now a [SPECIES_ALIEN]!")) - return TRUE - if(species.name == SPECIES_ALIEN) //no spamming it to get free implants - return TRUE - to_chat(user, "You're now an alien humanoid of some undiscovered species. Make up what lore you want, no one knows a thing about your species! You can check info about your traits with Check Species Info verb in IC tab.") - to_chat(user, "You can't speak any other languages by default. You can use translator implant that spawns on top of this monolith - it will give you knowledge of any language if you hear it enough times.") - var/mob/living/human/H = user - new /obj/item/implanter/translator(get_turf(src)) - H.change_species(SPECIES_ALIEN) - var/decl/background_detail/background = H.get_background_datum_by_flag(BACKGROUND_FLAG_NAMING) - H.fully_replace_character_name(background.get_random_name(H, H.gender)) - H.rename_self("Humanoid Alien", 1) - return TRUE diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index 6ef37bd2681e..82e201d287f5 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -176,7 +176,7 @@ var/global/const/DEFAULT_SPECIES_HEALTH = 200 var/list/base_auras - var/job_skill_buffs = list() // A list containing jobs (/datum/job), with values the extra points that job recieves. + var/job_skill_buffs = list() // A list containing jobs (/datum/job), with values the extra points that job receives. var/standing_jump_range = 2 var/list/maneuvers = list(/decl/maneuver/leap) @@ -608,7 +608,7 @@ var/global/const/DEFAULT_SPECIES_HEALTH = 200 return var/randn = rand(1, 100) - skill_mod + state_mod - if(!(check_no_slip(target)) && randn <= 25) + if(!target.can_slip() && randn <= 25) var/armor_check = 100 * target.get_blocked_ratio(affecting, BRUTE, damage = 20) target.apply_effect(push_mod, WEAKEN, armor_check) playsound(target.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) @@ -668,8 +668,8 @@ var/global/const/DEFAULT_SPECIES_HEALTH = 200 if(31 to 45) . = 4 else . = 8 -/decl/species/proc/check_no_slip(var/mob/living/human/H) - if(can_overcome_gravity(H)) +/decl/species/proc/check_no_slip(mob/living/user, magboots_only) + if(can_overcome_gravity(user)) return TRUE return (species_flags & SPECIES_FLAG_NO_SLIP) diff --git a/code/modules/species/species_hud.dm b/code/modules/species/species_hud.dm index 7add078db3ac..6c67caea5d24 100644 --- a/code/modules/species/species_hud.dm +++ b/code/modules/species/species_hud.dm @@ -1,25 +1,4 @@ /datum/hud_data - - /// Set to draw move intent box. - var/has_m_intent = 1 - /// Set to draw environment warnings. - var/has_warnings = 1 - /// Draw the pressure indicator. - var/has_pressure = 1 - /// Draw the nutrition indicator. - var/has_nutrition = 1 - /// Draw the bodytemp indicator. - var/has_bodytemp = 1 - /// Set to draw drop button. - var/has_drop = 1 - /// Set to draw throw button. - var/has_throw = 1 - /// Set to draw resist button. - var/has_resist = 1 - /// Set to draw the internals toggle button. - var/has_internals = 1 - /// Set to draw the "look-up" hint icon - var/has_up_hint = 1 /// Checked by mob_can_equip(). var/list/equip_slots = list() /// Built in New(), used for unhidable inv updates diff --git a/code/modules/surgery/crystal.dm b/code/modules/surgery/crystal.dm index b607c915c263..39ec4770a456 100644 --- a/code/modules/surgery/crystal.dm +++ b/code/modules/surgery/crystal.dm @@ -1,6 +1,6 @@ /decl/surgery_step/generic/cut_open/crystal name = "Drill keyhole incision" - description = "This procedure drills a keyhold incision into crystalline limbs to allow for delicate internal work." + description = "This procedure drills a keyhole incision into crystalline limbs to allow for delicate internal work." allowed_tools = list(TOOL_SURGICAL_DRILL = 100) fail_string = "cracking" access_string = "a neat hole" diff --git a/code/modules/synthesized_instruments/real_instruments.dm b/code/modules/synthesized_instruments/real_instruments.dm index 9324dc19c50f..b3cd8c900e2b 100644 --- a/code/modules/synthesized_instruments/real_instruments.dm +++ b/code/modules/synthesized_instruments/real_instruments.dm @@ -18,11 +18,11 @@ maximum_line_length = global.musical_config.max_line_length instruments = istype(what) ? list(what) : what -/datum/real_instrument/proc/Topic_call(href, href_list, usr) +/datum/real_instrument/proc/OnTopic(mob/user, href_list) var/target = href_list["target"] var/value = text2num(href_list["value"]) if (href_list["value"] && !isnum(value)) - to_chat(usr, "Non-numeric value was given.") + to_chat(user, "Non-numeric value was given.") return 0 @@ -31,20 +31,20 @@ if ("play") src.player.song.playing = value if (src.player.song.playing) - src.player.song.play_song(usr) + src.player.song.play_song(user) if ("newsong") src.player.song.lines.Cut() src.player.song.tempo = src.player.song.sanitize_tempo(5) // default 120 BPM if ("import") var/t = "" do - t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", owner.name), t) as message) - if(!CanInteractWith(usr, owner, global.physical_topic_state)) + t = html_encode(input(user, "Please paste the entire song, formatted:", text("[]", owner.name), t) as message) + if(!CanInteractWith(user, owner, global.physical_topic_state)) return if(length(t) >= 2*src.maximum_lines*src.maximum_line_length) - var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no") - if(!CanInteractWith(usr, owner, global.physical_topic_state)) + var/cont = input(user, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no") + if(!CanInteractWith(user, owner, global.physical_topic_state)) return if(cont == "no") break @@ -60,24 +60,24 @@ else src.player.song.tempo = src.player.song.sanitize_tempo(5) // default 120 BPM if(src.player.song.lines.len > maximum_lines) - to_chat(usr,"Too many lines!") + to_chat(user,"Too many lines!") src.player.song.lines.Cut(maximum_lines+1) var/linenum = 1 for(var/l in src.player.song.lines) if(length(l) > maximum_line_length) - to_chat(usr, "Line [linenum] too long!") + to_chat(user, "Line [linenum] too long!") src.player.song.lines.Remove(l) else linenum++ if ("show_song_editor") if (!src.song_editor) src.song_editor = new (host = src.owner, song = src.player.song) - src.song_editor.ui_interact(usr) + src.song_editor.ui_interact(user) if ("show_usage") if (!src.usage_info) src.usage_info = new (owner, src.player) - src.usage_info.ui_interact(usr) + src.usage_info.ui_interact(user) if ("volume") src.player.volume = min(max(min(player.volume+text2num(value), 100), 0), player.max_volume) if ("transposition") @@ -91,8 +91,8 @@ if ("sustain_timer") src.player.song.sustain_timer = max(min(player.song.sustain_timer+value, global.musical_config.longest_sustain_timer), 1) if ("soft_coeff") - var/new_coeff = input(usr, "from [global.musical_config.gentlest_drop] to [global.musical_config.steepest_drop]") as num - if(!CanInteractWith(usr, owner, global.physical_topic_state)) + var/new_coeff = input(user, "from [global.musical_config.gentlest_drop] to [global.musical_config.steepest_drop]") as num + if(!CanInteractWith(user, owner, global.physical_topic_state)) return new_coeff = round(min(max(new_coeff, global.musical_config.gentlest_drop), global.musical_config.steepest_drop), 0.001) src.player.song.soft_coeff = new_coeff @@ -102,8 +102,8 @@ var/datum/instrument/instrument = instruments[key] categories |= instrument.category - var/category = input(usr, "Choose a category") as null|anything in categories - if(!CanInteractWith(usr, owner, global.physical_topic_state)) + var/category = input(user, "Choose a category") as null|anything in categories + if(!CanInteractWith(user, owner, global.physical_topic_state)) return var/list/instruments_available = list() for (var/key in instruments) @@ -111,8 +111,8 @@ if (instrument.category == category) instruments_available += key - var/new_instrument = input(usr, "Choose an instrument") as null|anything in instruments_available - if(!CanInteractWith(usr, owner, global.physical_topic_state)) + var/new_instrument = input(user, "Choose an instrument") as null|anything in instruments_available + if(!CanInteractWith(user, owner, global.physical_topic_state)) return if (new_instrument) src.player.song.instrument_data = instruments[new_instrument] @@ -123,14 +123,14 @@ if (global.musical_config.env_settings_available) if (!src.env_editor) src.env_editor = new (src.player) - src.env_editor.ui_interact(usr) + src.env_editor.ui_interact(user) else - to_chat(usr, "Virtual environment is disabled.") + to_chat(user, "Virtual environment is disabled.") if ("show_echo_editor") if (!src.echo_editor) src.echo_editor = new (src.player) - src.echo_editor.ui_interact(usr) + src.echo_editor.ui_interact(user) if ("select_env") if (value in -1 to 26) @@ -239,11 +239,8 @@ return 0 -/obj/structure/synthesized_instrument/Topic(href, href_list) - if (..()) - return 1 - - return real_instrument.Topic_call(href, href_list, usr) +/obj/structure/synthesized_instrument/OnTopic(mob/user, href_list) + return ..() || real_instrument.OnTopic(user, href_list) //////////////////////// @@ -291,10 +288,7 @@ /obj/item/synthesized_instrument/proc/shouldStopPlaying(mob/user) - return !(src && in_range(src, user)) - -/obj/item/synthesized_instrument/Topic(href, href_list) - if (..()) - return 1 + return src && CanPhysicallyInteract(user) - return real_instrument.Topic_call(href, href_list, usr) \ No newline at end of file +/obj/item/synthesized_instrument/OnTopic(mob/user, href_list) + return ..() || real_instrument.OnTopic(user, href_list) \ No newline at end of file diff --git a/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm b/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm index ef2caaa8bb4d..6f275ac25217 100644 --- a/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm +++ b/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm @@ -1,6 +1,6 @@ /obj/item/synthesized_instrument/trumpet name = "Omnitrumpet" - desc = "The Omnitrumptet series 400 with more than 30 sound samples and fully customizable high fidelity output provides the ultimate means to toot your own horn" + desc = "The Omnitrumpet series 400 with more than 30 sound samples and fully customizable high fidelity output provides the ultimate means to toot your own horn" icon_state = "trumpet" sound_player = /datum/sound_player/synthesizer path = /datum/instrument/brass diff --git a/code/modules/tools/subtypes/hammers.dm b/code/modules/tools/subtypes/hammers.dm index ff5d1ef19892..acd258ef5c08 100644 --- a/code/modules/tools/subtypes/hammers.dm +++ b/code/modules/tools/subtypes/hammers.dm @@ -84,6 +84,10 @@ icon = 'icons/obj/items/tool/hammers/forge.dmi' w_class = ITEM_SIZE_NORMAL +/obj/item/tool/hammer/forge/iron + material = /decl/material/solid/metal/iron + handle_material = /decl/material/solid/organic/wood/mahogany + // Forging hammers are not great at general hammer tasks (too heavy I guess), // and also don't work as crowbars due to missing the nail ripper/flange, // but will be more effective at forging when blacksmithy is merged. diff --git a/code/modules/tools/subtypes/power_tools.dm b/code/modules/tools/subtypes/power_tools.dm index a0b0867a3b74..84099987a3e4 100644 --- a/code/modules/tools/subtypes/power_tools.dm +++ b/code/modules/tools/subtypes/power_tools.dm @@ -1,6 +1,6 @@ /obj/item/tool/hydraulic_cutter name = "hydraulic cutter" - desc = "A universal, miniturized hydraulic tool with interchangable heads for either prying or cutting. But not both at the same time." + desc = "A universal, miniaturized hydraulic tool with interchangeable heads for either prying or cutting. But not both at the same time." icon = 'icons/obj/items/tool/cutter.dmi' icon_state = ICON_STATE_WORLD slot_flags = SLOT_LOWER_BODY diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 62606d2626bc..4a61ea40daac 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -1,6 +1,6 @@ /obj/vehicle/train/cargo/engine name = "cargo train tug" - desc = "A ridable electric car designed for pulling cargo trolleys." + desc = "A rideable electric car designed for pulling cargo trolleys." icon = 'icons/obj/vehicles.dmi' icon_state = "cargo_engine" on = 0 diff --git a/code/modules/xenoarcheaology/finds/strange_rock.dm b/code/modules/xenoarcheaology/finds/strange_rock.dm index 7f0713988ff5..5e2c8770e9c6 100644 --- a/code/modules/xenoarcheaology/finds/strange_rock.dm +++ b/code/modules/xenoarcheaology/finds/strange_rock.dm @@ -1,7 +1,7 @@ /obj/item/strangerock name = "strange rock" - desc = "Seems to have some unusal strata evident throughout it." + desc = "Seems to have some unusual strata evident throughout it." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "strange" origin_tech = @'{"materials":5}' diff --git a/code/unit_tests/mob_tests.dm b/code/unit_tests/mob_tests.dm index 2f03eb9da320..a131d1ee7bdc 100644 --- a/code/unit_tests/mob_tests.dm +++ b/code/unit_tests/mob_tests.dm @@ -65,7 +65,7 @@ test_result["msg"] = "Unable to find a location to create test mob" return test_result - var/mob/living/human/H = new mobtype(mobloc) + var/mob/living/human/H = new mobtype(mobloc, SPECIES_HUMAN) // force human for testing H.mind_initialize("TestKey[rand(0,10000)]") diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm index 7866c78bd62a..a3a236167d57 100644 --- a/code/unit_tests/zas_tests.dm +++ b/code/unit_tests/zas_tests.dm @@ -99,7 +99,7 @@ /// Here we move a shuttle then test it's area once the shuttle has arrived. /datum/unit_test/zas_supply_shuttle_moved name = "ZAS: Supply Shuttle (When Moved)" - async = TRUE // We're moving the shuttle using built in procs. + async = TRUE // We're moving the shuttle using built-in procs. ///The shuttle datum of the supply shuttle var/datum/shuttle/autodock/ferry/supply/shuttle = null diff --git a/html/changelog.html b/html/changelog.html index 23cae88f2087..2c838c27eee2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -52,6 +52,12 @@ -->![](\"pill[i].png\")
+29 January 2025
+MistakeNot4892 updated:
+-
+
- Various map changes to Bearcat, crashed pod, and several others. Please report issues! +
22 January 2025
MistakeNot4892 updated:
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 20e1bd55f284..280424e35bb8 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14971,3 +14971,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
MistakeNot4892:
- tweak: Swords on Shaded Hills can be sharpened using whetstones or grindstones.
- tweak: Guns can now be fired from rigs regardless of dexterity.
+2025-01-29:
+ MistakeNot4892:
+ - tweak: Various map changes to Bearcat, crashed pod, and several others. Please
+ report issues!
diff --git a/html/changelogs/AutoChangeLog-pr-4796.yml b/html/changelogs/AutoChangeLog-pr-4796.yml
new file mode 100644
index 000000000000..debd7429ad88
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4796.yml
@@ -0,0 +1,4 @@
+author: Penelope Haze
+changes:
+ - {tweak: Modified liquid and coating presentation to be more fancy.}
+delete-after: true
diff --git a/icons/atmos/tank.dmi b/icons/atmos/tank.dmi
index c36c231a14e6..4a10b295ee33 100644
Binary files a/icons/atmos/tank.dmi and b/icons/atmos/tank.dmi differ
diff --git a/icons/clothing/head/cakehat.dmi b/icons/clothing/head/cakehat.dmi
index ac3563351c5b..7b598c138c4e 100644
Binary files a/icons/clothing/head/cakehat.dmi and b/icons/clothing/head/cakehat.dmi differ
diff --git a/icons/clothing/spacesuit/void/pilot/helmet.dmi b/icons/clothing/spacesuit/void/expedition/helmet.dmi
similarity index 100%
rename from icons/clothing/spacesuit/void/pilot/helmet.dmi
rename to icons/clothing/spacesuit/void/expedition/helmet.dmi
diff --git a/icons/clothing/spacesuit/void/pilot/suit.dmi b/icons/clothing/spacesuit/void/expedition/suit.dmi
similarity index 100%
rename from icons/clothing/spacesuit/void/pilot/suit.dmi
rename to icons/clothing/spacesuit/void/expedition/suit.dmi
diff --git a/icons/mob/screen/styles/charge.dmi b/icons/mob/screen/styles/charge.dmi
index 265c213516d8..71c34fea3d0e 100644
Binary files a/icons/mob/screen/styles/charge.dmi and b/icons/mob/screen/styles/charge.dmi differ
diff --git a/icons/mob/screen/styles/midnight/interaction.dmi b/icons/mob/screen/styles/midnight/interaction.dmi
deleted file mode 100644
index f43b95ad2eef..000000000000
Binary files a/icons/mob/screen/styles/midnight/interaction.dmi and /dev/null differ
diff --git a/icons/mob/screen/styles/midnight/interaction_drop.dmi b/icons/mob/screen/styles/midnight/interaction_drop.dmi
new file mode 100644
index 000000000000..2c059e4a764c
Binary files /dev/null and b/icons/mob/screen/styles/midnight/interaction_drop.dmi differ
diff --git a/icons/mob/screen/styles/midnight/interaction_maneuver.dmi b/icons/mob/screen/styles/midnight/interaction_maneuver.dmi
new file mode 100644
index 000000000000..9b86b5d4a9f2
Binary files /dev/null and b/icons/mob/screen/styles/midnight/interaction_maneuver.dmi differ
diff --git a/icons/mob/screen/styles/midnight/interaction_resist.dmi b/icons/mob/screen/styles/midnight/interaction_resist.dmi
new file mode 100644
index 000000000000..2cf744ec8c16
Binary files /dev/null and b/icons/mob/screen/styles/midnight/interaction_resist.dmi differ
diff --git a/icons/mob/screen/styles/midnight/interaction_throw.dmi b/icons/mob/screen/styles/midnight/interaction_throw.dmi
new file mode 100644
index 000000000000..63c4a5a1086d
Binary files /dev/null and b/icons/mob/screen/styles/midnight/interaction_throw.dmi differ
diff --git a/icons/mob/screen/styles/minimalist/interaction.dmi b/icons/mob/screen/styles/minimalist/interaction.dmi
deleted file mode 100644
index b8c4a0b80fe8..000000000000
Binary files a/icons/mob/screen/styles/minimalist/interaction.dmi and /dev/null differ
diff --git a/icons/mob/screen/styles/minimalist/interaction_drop.dmi b/icons/mob/screen/styles/minimalist/interaction_drop.dmi
new file mode 100644
index 000000000000..7090d7c1ce8b
Binary files /dev/null and b/icons/mob/screen/styles/minimalist/interaction_drop.dmi differ
diff --git a/icons/mob/screen/styles/minimalist/interaction_maneuver.dmi b/icons/mob/screen/styles/minimalist/interaction_maneuver.dmi
new file mode 100644
index 000000000000..6c42b11d1987
Binary files /dev/null and b/icons/mob/screen/styles/minimalist/interaction_maneuver.dmi differ
diff --git a/icons/mob/screen/styles/minimalist/interaction_resist.dmi b/icons/mob/screen/styles/minimalist/interaction_resist.dmi
new file mode 100644
index 000000000000..5e7fce2ada8f
Binary files /dev/null and b/icons/mob/screen/styles/minimalist/interaction_resist.dmi differ
diff --git a/icons/mob/screen/styles/minimalist/interaction_throw.dmi b/icons/mob/screen/styles/minimalist/interaction_throw.dmi
new file mode 100644
index 000000000000..9365cb5fc65f
Binary files /dev/null and b/icons/mob/screen/styles/minimalist/interaction_throw.dmi differ
diff --git a/icons/mob/screen/styles/old/interaction.dmi b/icons/mob/screen/styles/old/interaction.dmi
deleted file mode 100644
index dcd99248921f..000000000000
Binary files a/icons/mob/screen/styles/old/interaction.dmi and /dev/null differ
diff --git a/icons/mob/screen/styles/old/interaction_drop.dmi b/icons/mob/screen/styles/old/interaction_drop.dmi
new file mode 100644
index 000000000000..06f0d2d6ddaa
Binary files /dev/null and b/icons/mob/screen/styles/old/interaction_drop.dmi differ
diff --git a/icons/mob/screen/styles/old/interaction_maneuver.dmi b/icons/mob/screen/styles/old/interaction_maneuver.dmi
new file mode 100644
index 000000000000..19176dd8e987
Binary files /dev/null and b/icons/mob/screen/styles/old/interaction_maneuver.dmi differ
diff --git a/icons/mob/screen/styles/old/interaction_resist.dmi b/icons/mob/screen/styles/old/interaction_resist.dmi
new file mode 100644
index 000000000000..cff4fb592bd9
Binary files /dev/null and b/icons/mob/screen/styles/old/interaction_resist.dmi differ
diff --git a/icons/mob/screen/styles/old/interaction_throw.dmi b/icons/mob/screen/styles/old/interaction_throw.dmi
new file mode 100644
index 000000000000..425e7f6b86c5
Binary files /dev/null and b/icons/mob/screen/styles/old/interaction_throw.dmi differ
diff --git a/icons/mob/screen/styles/orange/interaction.dmi b/icons/mob/screen/styles/orange/interaction.dmi
deleted file mode 100644
index e750e6fb45db..000000000000
Binary files a/icons/mob/screen/styles/orange/interaction.dmi and /dev/null differ
diff --git a/icons/mob/screen/styles/orange/interaction_drop.dmi b/icons/mob/screen/styles/orange/interaction_drop.dmi
new file mode 100644
index 000000000000..75f415b0f27a
Binary files /dev/null and b/icons/mob/screen/styles/orange/interaction_drop.dmi differ
diff --git a/icons/mob/screen/styles/orange/interaction_maneuver.dmi b/icons/mob/screen/styles/orange/interaction_maneuver.dmi
new file mode 100644
index 000000000000..d4798c022701
Binary files /dev/null and b/icons/mob/screen/styles/orange/interaction_maneuver.dmi differ
diff --git a/icons/mob/screen/styles/orange/interaction_resist.dmi b/icons/mob/screen/styles/orange/interaction_resist.dmi
new file mode 100644
index 000000000000..34d6ed3d9d6d
Binary files /dev/null and b/icons/mob/screen/styles/orange/interaction_resist.dmi differ
diff --git a/icons/mob/screen/styles/orange/interaction_throw.dmi b/icons/mob/screen/styles/orange/interaction_throw.dmi
new file mode 100644
index 000000000000..e036affab2e7
Binary files /dev/null and b/icons/mob/screen/styles/orange/interaction_throw.dmi differ
diff --git a/icons/mob/screen/styles/robot/module.dmi b/icons/mob/screen/styles/robot/module.dmi
index 042f304f4366..4ce31caf38c2 100644
Binary files a/icons/mob/screen/styles/robot/module.dmi and b/icons/mob/screen/styles/robot/module.dmi differ
diff --git a/icons/mob/screen/styles/robot/status_oxy.dmi b/icons/mob/screen/styles/robot/status_oxy.dmi
new file mode 100644
index 000000000000..914f5646fb4b
Binary files /dev/null and b/icons/mob/screen/styles/robot/status_oxy.dmi differ
diff --git a/icons/mob/screen/styles/status.dmi b/icons/mob/screen/styles/status.dmi
deleted file mode 100644
index ccb0b383679f..000000000000
Binary files a/icons/mob/screen/styles/status.dmi and /dev/null differ
diff --git a/icons/mob/screen/styles/status_bodytemp.dmi b/icons/mob/screen/styles/status_bodytemp.dmi
new file mode 100644
index 000000000000..c422aead1841
Binary files /dev/null and b/icons/mob/screen/styles/status_bodytemp.dmi differ
diff --git a/icons/mob/screen/styles/status_oxy.dmi b/icons/mob/screen/styles/status_oxy.dmi
new file mode 100644
index 000000000000..cb49f5f466da
Binary files /dev/null and b/icons/mob/screen/styles/status_oxy.dmi differ
diff --git a/icons/mob/screen/styles/status_pressure.dmi b/icons/mob/screen/styles/status_pressure.dmi
new file mode 100644
index 000000000000..707b6910860a
Binary files /dev/null and b/icons/mob/screen/styles/status_pressure.dmi differ
diff --git a/icons/mob/screen/styles/status_tox.dmi b/icons/mob/screen/styles/status_tox.dmi
new file mode 100644
index 000000000000..019f3f1f6801
Binary files /dev/null and b/icons/mob/screen/styles/status_tox.dmi differ
diff --git a/icons/mob/screen/styles/underworld/interaction.dmi b/icons/mob/screen/styles/underworld/interaction.dmi
deleted file mode 100644
index ce806127f530..000000000000
Binary files a/icons/mob/screen/styles/underworld/interaction.dmi and /dev/null differ
diff --git a/icons/mob/screen/styles/underworld/interaction_drop.dmi b/icons/mob/screen/styles/underworld/interaction_drop.dmi
new file mode 100644
index 000000000000..fda4a6b146c3
Binary files /dev/null and b/icons/mob/screen/styles/underworld/interaction_drop.dmi differ
diff --git a/icons/mob/screen/styles/underworld/interaction_maneuver.dmi b/icons/mob/screen/styles/underworld/interaction_maneuver.dmi
new file mode 100644
index 000000000000..c678600935ca
Binary files /dev/null and b/icons/mob/screen/styles/underworld/interaction_maneuver.dmi differ
diff --git a/icons/mob/screen/styles/underworld/interaction_resist.dmi b/icons/mob/screen/styles/underworld/interaction_resist.dmi
new file mode 100644
index 000000000000..19bab4626001
Binary files /dev/null and b/icons/mob/screen/styles/underworld/interaction_resist.dmi differ
diff --git a/icons/mob/screen/styles/underworld/interaction_throw.dmi b/icons/mob/screen/styles/underworld/interaction_throw.dmi
new file mode 100644
index 000000000000..dac73e3f87ca
Binary files /dev/null and b/icons/mob/screen/styles/underworld/interaction_throw.dmi differ
diff --git a/icons/mob/screen/styles/white/interaction.dmi b/icons/mob/screen/styles/white/interaction.dmi
deleted file mode 100644
index 8511d73937a2..000000000000
Binary files a/icons/mob/screen/styles/white/interaction.dmi and /dev/null differ
diff --git a/icons/mob/screen/styles/white/interaction_drop.dmi b/icons/mob/screen/styles/white/interaction_drop.dmi
new file mode 100644
index 000000000000..aa03166c504c
Binary files /dev/null and b/icons/mob/screen/styles/white/interaction_drop.dmi differ
diff --git a/icons/mob/screen/styles/white/interaction_maneuver.dmi b/icons/mob/screen/styles/white/interaction_maneuver.dmi
new file mode 100644
index 000000000000..b885672572c6
Binary files /dev/null and b/icons/mob/screen/styles/white/interaction_maneuver.dmi differ
diff --git a/icons/mob/screen/styles/white/interaction_resist.dmi b/icons/mob/screen/styles/white/interaction_resist.dmi
new file mode 100644
index 000000000000..462763ac6568
Binary files /dev/null and b/icons/mob/screen/styles/white/interaction_resist.dmi differ
diff --git a/icons/mob/screen/styles/white/interaction_throw.dmi b/icons/mob/screen/styles/white/interaction_throw.dmi
new file mode 100644
index 000000000000..f95dbe55095c
Binary files /dev/null and b/icons/mob/screen/styles/white/interaction_throw.dmi differ
diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi
index ac409de94859..2636de482993 100644
Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ
diff --git a/icons/obj/guns/foam/machine_gun.dmi b/icons/obj/guns/foam/machine_gun.dmi
new file mode 100644
index 000000000000..fc2ab213fcea
Binary files /dev/null and b/icons/obj/guns/foam/machine_gun.dmi differ
diff --git a/icons/obj/guns/shotgun/quadbarrel.dmi b/icons/obj/guns/shotgun/quadbarrel.dmi
new file mode 100644
index 000000000000..7fbaae5632c6
Binary files /dev/null and b/icons/obj/guns/shotgun/quadbarrel.dmi differ
diff --git a/icons/obj/items/doormat.dmi b/icons/obj/items/doormat.dmi
new file mode 100644
index 000000000000..8be97b78f2c6
Binary files /dev/null and b/icons/obj/items/doormat.dmi differ
diff --git a/icons/obj/items/storage/backpack/backpack.dmi b/icons/obj/items/storage/backpack/backpack.dmi
index 959b3bd40746..9b38d461f2c6 100644
Binary files a/icons/obj/items/storage/backpack/backpack.dmi and b/icons/obj/items/storage/backpack/backpack.dmi differ
diff --git a/icons/obj/items/towel.dmi b/icons/obj/items/towel.dmi
index c4ec8addb772..c879bdae767b 100644
Binary files a/icons/obj/items/towel.dmi and b/icons/obj/items/towel.dmi differ
diff --git a/icons/obj/items/towel_flat.dmi b/icons/obj/items/towel_flat.dmi
deleted file mode 100644
index f43fd36a72e4..000000000000
Binary files a/icons/obj/items/towel_flat.dmi and /dev/null differ
diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index 01878c15e8df..7414e05bb148 100644
Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ
diff --git a/maps/__map_modpack_compatibility.dm b/maps/__map_modpack_compatibility.dm
new file mode 100644
index 000000000000..288644f46e27
--- /dev/null
+++ b/maps/__map_modpack_compatibility.dm
@@ -0,0 +1,25 @@
+// This must be included before maps and any modpacks that use it.
+// That includes before _map_include.dm.
+
+/// A spawner that can have its path overridden by a modpack, so that maps can have optional modpack compatibility.
+/obj/abstract/modpack_compat
+ abstract_type = /obj/abstract/modpack_compat
+ name = "optional modpack object"
+ desc = "This item type is used to spawn a movable at roundstart, whether a modpack is included or not."
+ icon = 'icons/misc/mark.dmi'
+ icon_state = "rup"
+ var/atom/movable/spawn_object
+
+/obj/abstract/modpack_compat/Initialize()
+ ..()
+ if(ispath(spawn_object))
+ new spawn_object
+ return INITIALIZE_HINT_QDEL
+
+#define OPTIONAL_SPAWNER(TYPE, VALUE) \
+/obj/abstract/modpack_compat/##TYPE { \
+ spawn_object = VALUE; \
+}
+
+/// This spawner is used to optionally spawn the aliumizer if the random aliens modpack is included.
+OPTIONAL_SPAWNER(aliumizer, null)
\ No newline at end of file
diff --git a/maps/away/bearcat/bearcat-1.dmm b/maps/away/bearcat/bearcat-1.dmm
index f5de21280396..a70555082767 100644
--- a/maps/away/bearcat/bearcat-1.dmm
+++ b/maps/away/bearcat/bearcat-1.dmm
@@ -894,6 +894,7 @@
"bX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/frame/light/small,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/floor/usedup,
/area/ship/scrap/broken2)
"bY" = (
@@ -908,6 +909,7 @@
/obj/machinery/power/apc/derelict{
dir = 1
},
+/obj/structure/closet/crate/uranium,
/turf/floor/usedup,
/area/ship/scrap/broken2)
"bZ" = (
@@ -1624,6 +1626,8 @@
/obj/item/clothing/glasses/welding,
/obj/item/stack/cable_coil,
/obj/item/stack/cable_coil,
+/obj/item/stack/material/sheet/mapped/steel/fifty,
+/obj/item/stack/material/sheet/mapped/steel/fifty,
/turf/floor/tiled/usedup,
/area/ship/scrap/broken1)
"dy" = (
@@ -1977,9 +1981,7 @@
/turf/floor/usedup,
/area/ship/scrap/maintenance/storage)
"ej" = (
-/obj/structure/rack,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/clothing/mask/breath,
+/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/floor/usedup,
/area/ship/scrap/maintenance/eva)
"ek" = (
@@ -1991,6 +1993,8 @@
/obj/structure/rack,
/obj/item/tank/jetpack/oxygen,
/obj/item/clothing/mask/breath,
+/obj/item/tank/jetpack/oxygen,
+/obj/item/clothing/mask/breath,
/turf/floor/usedup,
/area/ship/scrap/maintenance/eva)
"el" = (
@@ -2393,6 +2397,9 @@
/obj/item/stack/material/pane/mapped/glass/fifty,
/obj/item/stack/material/pane/mapped/rglass/fifty,
/obj/item/stack/material/sheet/reinforced/mapped/fiberglass/fifty,
+/obj/item/stack/material/sheet/mapped/steel/fifty,
+/obj/item/stack/material/sheet/mapped/steel/fifty,
+/obj/item/stack/material/sheet/reinforced/mapped/plasteel/fifty,
/turf/floor/tiled/usedup,
/area/ship/scrap/maintenance/storage)
"eT" = (
@@ -2417,6 +2424,7 @@
"eW" = (
/obj/machinery/suit_cycler,
/obj/machinery/light/small,
+/obj/item/clothing/shoes/magboots,
/turf/floor/tiled/usedup,
/area/ship/scrap/maintenance/eva)
"eX" = (
@@ -2426,6 +2434,7 @@
pixel_x = 24;
req_access = newlist()
},
+/obj/item/clothing/shoes/magboots,
/turf/floor/tiled/usedup,
/area/ship/scrap/maintenance/eva)
"eY" = (
diff --git a/maps/away/bearcat/bearcat-2.dmm b/maps/away/bearcat/bearcat-2.dmm
index b6ad7af5d298..2d9318f06d47 100644
--- a/maps/away/bearcat/bearcat-2.dmm
+++ b/maps/away/bearcat/bearcat-2.dmm
@@ -116,7 +116,8 @@
/area/ship/scrap/comms)
"as" = (
/obj/machinery/door/blast/regular{
- id_tag = "sensor"
+ id_tag = "sensor";
+ dir = 4
},
/turf/floor/usedup,
/area/ship/scrap/comms)
@@ -149,6 +150,7 @@
pixel_x = 32;
initial_network_id = "freightnet_0451";
dir = 4;
+
},
/obj/structure/bed/chair{
dir = 1
@@ -490,6 +492,7 @@
/obj/item/chems/drinks/glass2/coffeecup/one,
/obj/item/tank/oxygen,
/obj/item/clothing/mask/breath/emergency,
+/obj/item/flashlight,
/turf/floor/laminate,
/area/ship/scrap/command/captain)
"bd" = (
@@ -1175,6 +1178,7 @@
},
/obj/item/plate/tray,
/obj/item/circular_saw,
+/obj/item/flashlight/lamp,
/turf/floor/tiled/usedup,
/area/ship/scrap/crew/saloon)
"cz" = (
@@ -1202,16 +1206,9 @@
/turf/floor/tiled/usedup,
/area/ship/scrap/crew/cryo)
"cE" = (
-/obj/structure/window/reinforced/tinted{
- dir = 4;
- icon_state = "twindow"
- },
/obj/structure/hygiene/shower{
dir = 4
},
-/obj/structure/window/reinforced/tinted{
- dir = 1
- },
/obj/item/soap,
/obj/structure/curtain/open/shower,
/obj/effect/floor_decal/corner/white/diagonal,
@@ -1223,17 +1220,6 @@
icon_state = "bulb1"
},
/obj/structure/hygiene/toilet,
-/obj/structure/window/reinforced/tinted{
- dir = 1
- },
-/obj/structure/window/reinforced/tinted{
- dir = 4;
- icon_state = "twindow"
- },
-/obj/structure/window/reinforced/tinted{
- dir = 8;
- icon_state = "twindow"
- },
/obj/effect/decal/cleanable/dirt/visible,
/obj/effect/floor_decal/corner/white/diagonal,
/turf/floor/tiled/usedup,
@@ -1532,11 +1518,6 @@
/obj/structure/hygiene/shower{
dir = 4
},
-/obj/structure/window/reinforced/tinted{
- dir = 4;
- icon_state = "twindow"
- },
-/obj/structure/window/reinforced/tinted,
/obj/structure/curtain/open/shower,
/obj/effect/floor_decal/corner/white/diagonal,
/turf/floor/tiled/usedup,
@@ -1545,15 +1526,6 @@
/obj/structure/hygiene/toilet{
dir = 1
},
-/obj/structure/window/reinforced/tinted,
-/obj/structure/window/reinforced/tinted{
- dir = 4;
- icon_state = "twindow"
- },
-/obj/structure/window/reinforced/tinted{
- dir = 8;
- icon_state = "twindow"
- },
/obj/effect/decal/cleanable/dirt/visible,
/obj/effect/floor_decal/corner/white/diagonal,
/turf/floor/tiled/usedup,
@@ -1562,15 +1534,6 @@
/obj/structure/hygiene/toilet{
dir = 1
},
-/obj/structure/window/reinforced/tinted{
- dir = 8;
- icon_state = "twindow"
- },
-/obj/structure/window/reinforced/tinted{
- dir = 4;
- icon_state = "twindow"
- },
-/obj/structure/window/reinforced/tinted,
/obj/effect/decal/cleanable/dirt/visible,
/obj/structure/cable,
/obj/machinery/power/apc/derelict{
@@ -1898,7 +1861,7 @@
pixel_x = 3
},
/obj/item/chems/condiment/enzyme,
-/obj/item/chems/glass/rag,
+/obj/item/chems/rag,
/turf/floor/tiled/usedup,
/area/ship/scrap/crew/kitchen)
"dU" = (
@@ -2459,13 +2422,14 @@
/obj/item/stack/tape_roll/duct_tape,
/obj/item/retractor,
/obj/item/scalpel,
+/obj/item/tank/oxygen,
/turf/floor/tiled/white,
/area/ship/scrap/crew/medbay)
"eP" = (
/obj/machinery/light,
/obj/machinery/optable,
/obj/item/chems/drinks/glass2/coffeecup/britcup,
-/obj/item/chems/glass/rag,
+/obj/item/chems/rag,
/turf/floor/tiled/white,
/area/ship/scrap/crew/medbay)
"eQ" = (
@@ -3037,7 +3001,7 @@
/obj/random/clothing,
/obj/random/clothing,
/obj/random/clothing,
-/obj/item/chems/glass/rag,
+/obj/item/chems/rag,
/obj/effect/floor_decal/corner/white/diagonal,
/turf/floor/tiled/usedup,
/area/ship/scrap/crew/wash)
@@ -4701,6 +4665,7 @@
/obj/structure/window/reinforced{
current_health = 1e+007
},
+/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/floor/reinforced/airless,
/area/ship/scrap/maintenance/atmos)
"je" = (
@@ -5034,21 +4999,6 @@
/obj/structure/hygiene/sink{
pixel_y = 18
},
-/obj/structure/window/reinforced/tinted{
- dir = 8;
- icon_state = "twindow"
- },
-/obj/structure/window/reinforced/tinted{
- dir = 4;
- icon_state = "twindow"
- },
-/obj/structure/window/reinforced/tinted{
- dir = 1
- },
-/obj/structure/window/reinforced/tinted{
- dir = 8;
- icon_state = "twindow"
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
level = 2
},
@@ -5121,6 +5071,7 @@
"uM" = (
/obj/item/stack/material/sheet/mapped/steel,
/obj/structure/lattice,
+/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/space,
/area/ship/scrap/maintenance/atmos)
"vs" = (
@@ -5145,6 +5096,10 @@
/obj/effect/paint/brown,
/turf/wall/r_wall,
/area/space)
+"zq" = (
+/obj/item/stack/material/rods,
+/turf/space,
+/area/ship/scrap/maintenance/atmos)
"zT" = (
/obj/effect/floor_decal/corner/blue/diagonal{
dir = 4
@@ -5197,19 +5152,16 @@
/turf/wall/r_wall,
/area/ship/scrap/crew/kitchen)
"Hd" = (
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/turf/space,
-/area/space)
+/obj/item/stack/material/sheet/mapped/steel,
+/obj/machinery/atmospherics/unary/tank/nitrogen{
+ dir = 1
+ },
+/turf/floor/plating/airless,
+/area/ship/scrap/maintenance/atmos)
"HQ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/floor/reinforced/airless,
/area/ship/scrap/maintenance/atmos)
-"Ix" = (
-/obj/machinery/network/router{
- initial_network_id = "freightnet_0451"
- },
-/turf/floor/bluegrid/airless,
-/area/ship/scrap/comms)
"IG" = (
/obj/item/shard,
/obj/machinery/atmospherics/unary/outlet_injector{
@@ -5251,6 +5203,12 @@
},
/turf/floor/tiled/usedup,
/area/ship/scrap/maintenance/engineering)
+"KW" = (
+/obj/item/shard,
+/obj/structure/lattice,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/space,
+/area/ship/scrap/maintenance/atmos)
"Lp" = (
/turf/floor/reinforced/airless,
/area/space)
@@ -5290,6 +5248,12 @@
},
/turf/floor/usedup,
/area/ship/scrap/hidden)
+"Nc" = (
+/obj/machinery/network/router{
+ initial_network_id = "bearnet"
+ },
+/turf/floor/bluegrid/airless,
+/area/ship/scrap/comms)
"Od" = (
/obj/effect/floor_decal/corner/blue,
/obj/effect/floor_decal/corner/yellow{
@@ -11296,14 +11260,14 @@ wp
gY
hx
hx
-ie
+Hd
iQ
-hw
+zq
iP
Eq
-id
+KW
Yl
-Hd
+aa
aa
aa
aa
@@ -11547,7 +11511,7 @@ IG
Mm
hN
hx
-hM
+hw
aa
aa
aa
@@ -11994,7 +11958,7 @@ xU
Yv
Yv
ar
-Ix
+Nc
aO
aX
Yv
diff --git a/maps/away/bearcat/bearcat_access.dm b/maps/away/bearcat/bearcat_access.dm
index f5b3511bf945..167dd671f20b 100644
--- a/maps/away/bearcat/bearcat_access.dm
+++ b/maps/away/bearcat/bearcat_access.dm
@@ -39,3 +39,4 @@ var/global/const/access_bearcat_captain = "ACCESS_BEARCAT_CAPTAIN" //999
/obj/machinery/vending/tool/bearcat
req_access = list(access_bearcat)
+
diff --git a/maps/away/bearcat/bearcat_areas.dm b/maps/away/bearcat/bearcat_areas.dm
index 4d7c5c2eb3bb..85920d542ad4 100644
--- a/maps/away/bearcat/bearcat_areas.dm
+++ b/maps/away/bearcat/bearcat_areas.dm
@@ -1,134 +1,134 @@
/area/ship/scrap
- name = "Generic Ship"
+ name = "\improper Generic Ship"
ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg')
/area/ship/scrap/crew
- name = "Crew Compartements"
+ name = "\improper Crew Compartements"
icon_state = "crew_quarters"
/area/ship/scrap/crew/hallway/port
- name = "Crew Hallway - Port"
+ name = "\improper Crew Hallway - Port"
/area/ship/scrap/crew/hallway/starboard
- name = "Crew Hallway - Starboard"
+ name = "\improper Crew Hallway - Starboard"
/area/ship/scrap/crew/kitchen
- name = "Galley"
+ name = "\improper Galley"
icon_state = "kitchen"
/area/ship/scrap/crew/cryo
- name = "Cryo Storage"
+ name = "\improper Cryo Storage"
icon_state = "cryo"
/area/ship/scrap/crew/dorms1
- name = "Crew Cabin #1"
+ name = "\improper Crew Cabin #1"
icon_state = "green"
/area/ship/scrap/crew/dorms2
- name = "Crew Cabin #2"
+ name = "\improper Crew Cabin #2"
icon_state = "purple"
/area/ship/scrap/crew/dorms3
- name = "Crew Cabin #3"
+ name = "\improper Crew Cabin #3"
icon_state = "yellow"
/area/ship/scrap/crew/saloon
- name = "Saloon"
+ name = "\improper Saloon"
icon_state = "conference"
/area/ship/scrap/crew/toilets
- name = "Bathrooms"
+ name = "\improper Bathrooms"
icon_state = "toilet"
turf_initializer = /decl/turf_initializer/maintenance
/area/ship/scrap/crew/wash
- name = "Washroom"
+ name = "\improper Washroom"
icon_state = "locker"
/area/ship/scrap/crew/medbay
- name = "Medical Bay"
+ name = "\improper Medical Bay"
icon_state = "medbay"
/area/ship/scrap/cargo
- name = "Cargo Hold"
+ name = "\improper Cargo Hold"
icon_state = "quartstorage"
/area/ship/scrap/cargo/lower
- name = "Lower Cargo Hold"
+ name = "\improper Lower Cargo Hold"
/area/ship/scrap/dock
- name = "Docking Bay"
+ name = "\improper Docking Bay"
icon_state = "entry_1"
/area/ship/scrap/fire
- name = "Firefighting Equipment Comparment"
+ name = "\improper Firefighting Equipment Comparment"
icon_state = "green"
/area/ship/scrap/unused
- name = "Compartment 2-B"
+ name = "\improper Compartment 2-B"
icon_state = "yellow"
turf_initializer = /decl/turf_initializer/maintenance
ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg')
/area/ship/scrap/hidden
- name = "Unknown" //shielded compartment
+ name = "\improper Unknown" //shielded compartment
icon_state = "auxstorage"
/area/ship/scrap/escape_port
- name = "Port Escape Pods"
+ name = "\improper Port Escape Pods"
icon_state = "green"
/area/ship/scrap/escape_star
- name = "Starboard Escape Pods"
+ name = "\improper Starboard Escape Pods"
icon_state = "yellow"
/area/ship/scrap/broken1
- name = "Robotic Maintenance"
+ name = "\improper Robotic Maintenance"
icon_state = "green"
/area/ship/scrap/broken2
- name = "Compartment 1-B"
+ name = "\improper Compartment 1-B"
icon_state = "yellow"
/area/ship/scrap/gambling
- name = "Compartment 1-C"
+ name = "\improper Compartment 1-C"
icon_state = "cave"
/area/ship/scrap/maintenance
- name = "Maintenance Compartments"
+ name = "\improper Maintenance Compartments"
icon_state = "amaint"
req_access = list(access_bearcat)
/area/ship/scrap/maintenance/hallway
- name = "Maintenance Corridors"
+ name = "\improper Maintenance Corridors"
/area/ship/scrap/maintenance/lower
- name = "Lower Deck Maintenance Compartments"
+ name = "\improper Lower Deck Maintenance Compartments"
icon_state = "sub_maint_aft"
/area/ship/scrap/maintenance/storage
- name = "Tools Storage"
+ name = "\improper Tools Storage"
icon_state = "engineering_storage"
/area/ship/scrap/maintenance/techstorage
- name = "Parts Storage"
+ name = "\improper Parts Storage"
icon_state = "engineering_supply"
/area/ship/scrap/maintenance/eva
- name = "EVA Storage"
+ name = "\improper EVA Storage"
icon_state = "eva"
/area/ship/scrap/maintenance/engineering
- name = "Engineering Bay"
+ name = "\improper Engineering Bay"
icon_state = "engineering_supply"
/area/ship/scrap/maintenance/atmos
- name = "Atmospherics Comparment"
+ name = "\improper Atmospherics Comparment"
icon_state = "atmos"
ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambiatm1.ogg')
/area/ship/scrap/maintenance/power
- name = "Power Compartment"
+ name = "\improper Power Compartment"
icon_state = "engine_smes"
ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambieng1.ogg')
@@ -137,35 +137,35 @@
ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambieng1.ogg')
/area/ship/scrap/maintenance/engine/aft
- name = "Main Engine Bay"
+ name = "\improper Main Engine Bay"
/area/ship/scrap/maintenance/engine/port
- name = "Port Thruster"
+ name = "\improper Port Thruster"
/area/ship/scrap/maintenance/engine/starboard
- name = "Starboard Thruster"
+ name = "\improper Starboard Thruster"
/area/ship/scrap/command/hallway
- name = "Command Deck"
+ name = "\improper Command Deck"
icon_state = "centcom"
req_access = list(access_bearcat)
/area/ship/scrap/command/bridge
- name = "Hauler Bridge"
+ name = "\improper Bearcat Bridge"
icon_state = "bridge"
req_access = list(access_bearcat)
/area/ship/scrap/command/captain
- name = "Captain's Quarters"
+ name = "\improper Captain's Quarters"
icon_state = "captain"
req_access = list(access_bearcat_captain)
/area/ship/scrap/comms
- name = "Communications Relay"
+ name = "\improper Communications Relay"
icon_state = "tcomsatcham"
ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/signal.ogg','sound/ambience/sonar.ogg')
/area/ship/scrap/shuttle/lift
- name = "Cargo Lift"
+ name = "\improper Cargo Lift"
icon_state = "shuttle3"
base_turf = /turf/open
\ No newline at end of file
diff --git a/maps/away/bearcat/bearcat_jobs.dm b/maps/away/bearcat/bearcat_jobs.dm
index dce4ece7f44d..aa3578e6a53e 100644
--- a/maps/away/bearcat/bearcat_jobs.dm
+++ b/maps/away/bearcat/bearcat_jobs.dm
@@ -6,6 +6,10 @@
info = "Your ship has suffered a catastrophic amount of damage, leaving it dark and crippled in the depths of \
unexplored space. The Captain is dead, leaving you, previously the First Mate in charge. Organize what's left of \
your crew, and maybe you'll be able to survive long enough to be rescued."
+ access = list(
+ access_engine,
+ access_atmospherics,
+ )
/datum/job/submap/bearcat_crewman
title = "Independant Crewman"
@@ -15,6 +19,10 @@
info = "Your ship has suffered a catastrophic amount of damage, leaving it dark and crippled in the depths of \
unexplored space. Work together with the Acting Captain and what's left of the crew, and maybe you'll be able \
to survive long enough to be rescued."
+ access = list(
+ access_engine,
+ access_atmospherics
+ )
/decl/outfit/job/bearcat
abstract_type = /decl/outfit/job/bearcat
diff --git a/maps/away/casino/casino.dmm b/maps/away/casino/casino.dmm
index f9fa8619ce6e..77f3aee176a2 100644
--- a/maps/away/casino/casino.dmm
+++ b/maps/away/casino/casino.dmm
@@ -3543,7 +3543,7 @@
"kf" = (
/obj/structure/table/marble,
/obj/item/chems/drinks/bottle/rum,
-/obj/item/chems/glass/rag,
+/obj/item/chems/rag,
/obj/random/drinkbottle,
/obj/random/drinkbottle,
/obj/random/drinkbottle,
diff --git a/maps/away/errant_pisces/errant_pisces.dm b/maps/away/errant_pisces/errant_pisces.dm
index 98b02fae56ab..1060e8f8a9cb 100644
--- a/maps/away/errant_pisces/errant_pisces.dm
+++ b/maps/away/errant_pisces/errant_pisces.dm
@@ -17,65 +17,6 @@
cost = 1
area_usage_test_exempted_root_areas = list(/area/errant_pisces)
-/mob/living/simple_animal/hostile/carp/shark // generally stronger version of a carp that doesn't die from a mean look. Fance new sprites included, credits to F-Tang Steve
- name = "cosmoshark"
- desc = "Enormous creature that resembles a shark with magenta glowing lines along its body and set of long deep-purple teeth."
- icon = 'maps/away/errant_pisces/icons/cosmoshark.dmi'
- butchery_data = /decl/butchery_data/animal/fish/space_carp/shark
- max_health = 100
- natural_weapon = /obj/item/natural_weapon/bite/strong
- faction = "shark"
- ai = /datum/mob_controller/aggressive/carp/shark
-
-/datum/mob_controller/aggressive/carp/shark
- break_stuff_probability = 35
- turns_per_wander = 10
-
-/mob/living/simple_animal/hostile/carp/shark/carp_randomify()
- return
-
-/mob/living/simple_animal/hostile/carp/shark/death(gibbed)
- . = ..()
- if(. && !gibbed)
- var/datum/gas_mixture/environment = loc.return_air()
- if (environment)
- var/datum/gas_mixture/sharkmaw_chlorine = new
- sharkmaw_chlorine.adjust_gas(/decl/material/gas/chlorine, 10)
- environment.merge(sharkmaw_chlorine)
- visible_message(SPAN_WARNING("\The [src]'s body releases some gas from the gills with a quiet fizz!"))
-
-/mob/living/simple_animal/hostile/carp/shark/apply_attack_effects(mob/living/target)
- . =..()
- var/mob/living/L = target
- if(istype(L))
- if(prob(25))//if one is unlucky enough, they get tackled few tiles away
- L.visible_message("\The [src] tackles [L]!")
- var/tackle_length = rand(3,5)
- for (var/i = 1 to tackle_length)
- var/turf/T = get_step(L.loc, dir)//on a first step of tackling standing mob would block movement so let's check if there's something behind it. Works for consequent moves too
- if (T.density || LinkBlocked(L.loc, T) || TurfBlockedNonWindow(T) || DirBlocked(T, global.flip_dir[dir]))
- break
- sleep(2)
- forceMove(T)//maybe there's better manner then just forceMove() them
- L.forceMove(T)
- visible_message("\The [src] releases [L].")
-
-/decl/butchery_data/animal/fish/space_carp/shark
- meat_type = /obj/item/food/butchery/meat/fish/shark
- must_use_hook = TRUE
-
-/obj/item/food/butchery/meat/fish/shark
- desc = "A fillet of cosmoshark meat."
- butchery_data = /decl/butchery_data/animal/fish/space_carp/shark
- color = "#cecece"
- center_of_mass = @'{"x":17,"y":13}'
- bitesize = 8
-
-/obj/item/food/butchery/meat/fish/shark/populate_reagents()
- . = ..()
- add_to_reagents(/decl/material/liquid/psychoactives, 1)
- add_to_reagents(/decl/material/gas/chlorine, 1)
-
//if you want to have fun, make them to be draggable as a whole unless at least one piece is attached to a non-space turf or anchored object
/obj/structure/net
name = "industrial net"
diff --git a/maps/away/liberia/liberia.dm b/maps/away/liberia/liberia.dm
index 0e5321874c84..e9a8a470d28a 100644
--- a/maps/away/liberia/liberia.dm
+++ b/maps/away/liberia/liberia.dm
@@ -8,8 +8,7 @@
name = "Liberia"
description = "A Merchant ship."
suffixes = list("liberia/liberia.dmm")
- cost = 0.5
- spawn_weight = 50
+ cost = 1
area_usage_test_exempted_root_areas = list(/area/liberia)
shuttles_to_initialise = list(
/datum/shuttle/autodock/overmap/mule
diff --git a/maps/away/liberia/liberia.dmm b/maps/away/liberia/liberia.dmm
index fee5cdfb47d0..5d5473d9c567 100644
--- a/maps/away/liberia/liberia.dmm
+++ b/maps/away/liberia/liberia.dmm
@@ -134,6 +134,7 @@
icon_state = "4-8"
},
/obj/structure/disposalpipe/junction/mirrored,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"as" = (
@@ -246,11 +247,7 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
-/obj/structure/table,
-/obj/item/toolbox/electrical{
- pixel_x = 7;
- pixel_y = 4
- },
+/obj/machinery/computer/ship/engines,
/turf/floor/tiled/techfloor/grid,
/area/liberia/engineeringengines)
"aF" = (
@@ -307,14 +304,11 @@
/turf/floor/plating,
/area/liberia/merchantstorage)
"aK" = (
-/obj/structure/cable/blue{
- icon_state = "0-2"
- },
-/obj/machinery/ion_thruster{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
},
-/turf/floor/plating/airless,
-/area/liberia/engineeringengines)
+/turf/wall/r_wall/prepainted,
+/area/liberia/captain)
"aM" = (
/obj/effect/floor_decal/techfloor{
dir = 9
@@ -329,11 +323,6 @@
/obj/effect/floor_decal/techfloor{
dir = 5
},
-/obj/structure/table,
-/obj/item/rcd,
-/obj/item/rcd_ammo/large,
-/obj/item/rcd_ammo/large,
-/obj/item/rcd_ammo/large,
/turf/floor/tiled/techfloor/grid,
/area/liberia/engineeringengines)
"aO" = (
@@ -405,6 +394,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/tiled/techfloor,
/area/liberia/engineeringreactor)
"aW" = (
@@ -462,6 +452,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/techfloor,
/area/liberia/engineeringreactor)
"bb" = (
@@ -497,6 +490,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/techfloor,
/area/liberia/engineeringreactor)
"be" = (
@@ -703,14 +699,9 @@
/obj/item/clothing/glasses/tacgoggles,
/obj/item/clothing/shoes/legguards,
/obj/item/clothing/shirt/syndicate,
-/obj/item/clothing/pants/casual/camo,
/turf/floor/tiled/dark/monotile,
/area/liberia/mule)
"bt" = (
-/obj/structure/closet/secure_closet{
- name = "merchant's locker";
- req_access = list("ACCESS_MERCHANT")
- },
/obj/effect/floor_decal/corner/brown/half,
/obj/machinery/power/apc/liberia{
dir = 1;
@@ -720,6 +711,7 @@
/obj/structure/cable/blue{
icon_state = "0-2"
},
+/obj/machinery/atmospherics/unary/tank/carbon_dioxide,
/turf/floor/tiled/dark/monotile,
/area/liberia/mule)
"bu" = (
@@ -787,14 +779,12 @@
/turf/floor/tiled/steel_grid,
/area/liberia/mule)
"by" = (
-/obj/effect/floor_decal/corner/green{
- dir = 5
- },
-/obj/structure/table,
-/obj/structure/cable/blue{
- icon_state = "1-2"
+/obj/effect/paint/silver,
+/obj/effect/paint_stripe/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6
},
-/turf/floor/tiled/steel_grid,
+/turf/wall/r_titanium,
/area/liberia/mule)
"bz" = (
/obj/machinery/portable_atmospherics/canister/air,
@@ -986,9 +976,7 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
-/obj/structure/cable/blue{
- icon_state = "2-4"
- },
+/obj/machinery/atmospherics/valve/open,
/turf/floor/tiled/dark,
/area/liberia/mule)
"bR" = (
@@ -997,9 +985,6 @@
req_access = newlist()
},
/obj/machinery/door/firedoor,
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
/turf/floor/tiled/dark/monotile,
/area/liberia/mule)
"bS" = (
@@ -1007,9 +992,6 @@
dir = 8
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
/turf/floor/tiled,
/area/liberia/mule)
"bT" = (
@@ -1019,9 +1001,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 6
},
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
/turf/floor/tiled,
/area/liberia/mule)
"bU" = (
@@ -1043,9 +1022,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/tiled,
/area/liberia/mule)
"bW" = (
@@ -1196,6 +1173,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/effect/catwalk_plated,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"cj" = (
@@ -1257,6 +1235,9 @@
dir = 4
},
/obj/item/taperecorder,
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 5
+ },
/turf/floor/tiled/dark,
/area/liberia/mule)
"cp" = (
@@ -1278,6 +1259,9 @@
dir = 4
},
/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/plating,
/area/liberia/mule)
"cq" = (
@@ -1291,6 +1275,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled,
/area/liberia/mule)
"cr" = (
@@ -1301,11 +1288,8 @@
dir = 9
},
/obj/effect/catwalk_plated,
-/obj/abstract/local_dock/automatic{
- shuttle_tag = "Mule";
- port_tag = "center";
- dir = 8;
- name = "center"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
},
/turf/floor/plating,
/area/liberia/mule)
@@ -1324,6 +1308,9 @@
dir = 10
},
/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/steel_grid,
/area/liberia/mule)
"ct" = (
@@ -1338,6 +1325,9 @@
},
/obj/item/clothing/mask/gas,
/obj/structure/table,
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/steel_grid,
/area/liberia/mule)
"cu" = (
@@ -1351,9 +1341,6 @@
dir = 5
},
/obj/structure/table,
-/obj/structure/cable/blue{
- icon_state = "1-2"
- },
/turf/floor/tiled/steel_grid,
/area/liberia/mule)
"cv" = (
@@ -1469,6 +1456,7 @@
/obj/structure/cable/blue{
icon_state = "0-2"
},
+/obj/machinery/atmospherics/unary/tank/carbon_dioxide,
/turf/floor/tiled/techfloor/grid,
/area/liberia/engineeringengines)
"cG" = (
@@ -1653,6 +1641,7 @@
/obj/structure/cable/blue{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/valve/open,
/turf/floor/tiled/techfloor,
/area/liberia/engineeringengines)
"cZ" = (
@@ -1734,9 +1723,7 @@
/turf/floor/plating,
/area/liberia/mule)
"dh" = (
-/obj/machinery/computer/ship/engines{
- dir = 4
- },
+/obj/machinery/computer/ship/engines,
/obj/structure/window/reinforced{
dir = 8
},
@@ -1826,6 +1813,7 @@
/obj/machinery/light{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"do" = (
@@ -1976,6 +1964,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/steel_grid,
/area/liberia/engineeringlobby)
"dA" = (
@@ -1992,6 +1983,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/plating,
/area/liberia/hallway)
"dB" = (
@@ -2000,6 +1994,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/effect/catwalk_plated,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"dC" = (
@@ -2154,6 +2149,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/plating,
/area/liberia/hallway)
"dP" = (
@@ -2207,6 +2205,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 5
+ },
/turf/floor/plating,
/area/liberia/hallway)
"dT" = (
@@ -2260,6 +2261,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/monotile,
/area/liberia/hallway)
"dW" = (
@@ -2277,6 +2281,9 @@
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment/bent,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
+ },
/turf/floor/plating,
/area/liberia/hallway)
"dX" = (
@@ -2303,9 +2310,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel,
/turf/floor/tiled/techfloor,
/area/liberia/engineeringengines)
"ea" = (
@@ -2318,8 +2323,8 @@
/obj/structure/cable/blue{
icon_state = "1-4"
},
-/obj/structure/cable/blue{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
},
/turf/floor/tiled/techfloor,
/area/liberia/engineeringengines)
@@ -2412,6 +2417,7 @@
},
/obj/item/binoculars,
/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/tiled/steel_grid,
/area/liberia/mule)
"eh" = (
@@ -2420,9 +2426,6 @@
},
/obj/item/guitar,
/obj/structure/table,
-/obj/structure/cable/blue{
- icon_state = "1-2"
- },
/turf/floor/tiled/steel_grid,
/area/liberia/mule)
"ej" = (
@@ -2448,6 +2451,8 @@
anchored = 1;
name = "anchored emergency closet"
},
+/obj/item/clothing/head/helmet/space/void,
+/obj/item/clothing/suit/space/void,
/turf/floor/tiled/monotile,
/area/liberia/hallway)
"em" = (
@@ -2462,6 +2467,7 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"en" = (
@@ -2879,6 +2885,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/steel_grid,
/area/liberia/engineeringlobby)
"fa" = (
@@ -3202,6 +3211,7 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"fF" = (
@@ -3220,6 +3230,8 @@
"fI" = (
/obj/structure/closet/emcloset,
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/clothing/head/helmet/space/void,
+/obj/item/clothing/suit/space/void,
/turf/floor/tiled/monotile,
/area/liberia/hallway)
"fJ" = (
@@ -3394,6 +3406,7 @@
/obj/structure/cable/blue{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"fZ" = (
@@ -3528,6 +3541,8 @@
},
/obj/effect/floor_decal/corner/green,
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/clothing/head/helmet/space/void,
+/obj/item/clothing/suit/space/void,
/turf/floor/tiled,
/area/liberia/hallway)
"gn" = (
@@ -3610,6 +3625,9 @@
/obj/structure/cable/blue{
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6
+ },
/turf/floor/laminate/ebony,
/area/liberia/bar)
"gv" = (
@@ -3621,6 +3639,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/ebony,
/area/liberia/bar)
"gw" = (
@@ -3637,6 +3658,9 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/ebony,
/area/liberia/bar)
"gx" = (
@@ -3650,6 +3674,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/ebony,
/area/liberia/bar)
"gy" = (
@@ -3662,11 +3689,14 @@
dir = 4
},
/obj/item/clothing/mask/smokable/cigarette/cigar/havana,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/ebony,
/area/liberia/bar)
"gz" = (
/obj/structure/table/laminate,
-/obj/item/chems/glass/rag,
+/obj/item/chems/rag,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -3676,6 +3706,9 @@
/obj/structure/disposalpipe/segment/bent{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/ebony,
/area/liberia/bar)
"gA" = (
@@ -3689,6 +3722,9 @@
dir = 4
},
/obj/effect/wallframe_spawn/no_grille,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/plating,
/area/liberia/bar)
"gC" = (
@@ -3705,6 +3741,9 @@
/obj/structure/cable/blue{
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/plating,
/area/liberia/hallway)
"gD" = (
@@ -3716,6 +3755,8 @@
dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/clothing/head/helmet/space/void,
+/obj/item/clothing/suit/space/void,
/turf/floor/tiled,
/area/liberia/hallway)
"gE" = (
@@ -3825,9 +3866,11 @@
"gM" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/shoes/craftable,
-/obj/item/clothing/pants/slacks/red,
+/obj/item/clothing/shirt/button,
+/obj/item/clothing/neck/tie/navy,
+/obj/item/clothing/suit/jacket/blazer,
/obj/item/clothing/costume/lawyer,
-/obj/item/clothing/pants/slacks/black/outfit/navy,
+/obj/item/clothing/suit/jacket/navy,
/obj/random/handgun,
/obj/item/chems/drinks/bottle/premiumwine,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -3856,9 +3899,6 @@
/obj/structure/cable/blue{
icon_state = "0-4"
},
-/obj/structure/cable/blue{
- icon_state = "0-2"
- },
/turf/floor/laminate/ebony,
/area/liberia/captain)
"gP" = (
@@ -3874,6 +3914,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6
+ },
/turf/floor/laminate/ebony,
/area/liberia/captain)
"gQ" = (
@@ -3896,6 +3939,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/ebony,
/area/liberia/captain)
"gR" = (
@@ -3922,6 +3968,9 @@
/obj/structure/cable/blue{
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/walnut,
/area/liberia/bar)
"gT" = (
@@ -3934,6 +3983,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/walnut,
/area/liberia/bar)
"gU" = (
@@ -3947,6 +3999,9 @@
/obj/structure/cable/blue{
icon_state = "1-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 9
+ },
/turf/floor/laminate/walnut,
/area/liberia/bar)
"gW" = (
@@ -4036,15 +4091,15 @@
req_access = list("ACCESS_MERCHANT")
},
/obj/item/folder,
-/obj/structure/cable/blue{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
},
/turf/floor/laminate/ebony,
/area/liberia/captain)
"hh" = (
/obj/effect/floor_decal/spline/plain/brown,
-/obj/structure/cable/blue{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
},
/turf/floor/laminate/ebony,
/area/liberia/captain)
@@ -4054,6 +4109,9 @@
dir = 4
},
/obj/effect/floor_decal/spline/plain/brown,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 9
+ },
/turf/floor/laminate/ebony,
/area/liberia/captain)
"hj" = (
@@ -4408,12 +4466,7 @@
/obj/effect/floor_decal/techfloor{
dir = 8
},
-/obj/structure/table,
-/obj/item/flashlight,
-/obj/random/tool,
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel,
/turf/floor/tiled/techfloor,
/area/liberia/engineeringengines)
"ic" = (
@@ -4495,6 +4548,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/techfloor,
/area/liberia/engineeringengines)
"ii" = (
@@ -4516,6 +4572,9 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/techfloor,
/area/liberia/engineeringengines)
"ij" = (
@@ -4548,6 +4607,14 @@
pixel_x = 7;
pixel_y = 4
},
+/obj/item/toolbox/electrical{
+ pixel_x = 7;
+ pixel_y = 4
+ },
+/obj/item/rcd,
+/obj/item/rcd_ammo/large,
+/obj/item/rcd_ammo/large,
+/obj/item/rcd_ammo/large,
/turf/floor/tiled/techfloor/grid,
/area/liberia/engineeringreactor)
"ip" = (
@@ -5254,14 +5321,11 @@
/turf/floor/carpet,
/area/liberia/library)
"kf" = (
-/obj/machinery/ion_thruster{
- dir = 8
- },
-/obj/structure/cable/blue{
- icon_state = "0-2"
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 4
},
-/turf/floor/plating,
-/area/liberia/mule)
+/turf/wall/r_wall/prepainted,
+/area/liberia/engineeringengines)
"kg" = (
/obj/machinery/door/airlock/civilian{
id_tag = "merchdorm1";
@@ -5536,6 +5600,9 @@
/obj/structure/cable/blue{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/techfloor,
/area/liberia/engineeringreactor)
"kG" = (
@@ -5601,6 +5668,7 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"kQ" = (
@@ -5642,6 +5710,7 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"kU" = (
@@ -5673,6 +5742,7 @@
/obj/structure/cable/blue{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"kX" = (
@@ -6115,6 +6185,7 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/tiled/steel_grid,
/area/liberia/engineeringlobby)
"mr" = (
@@ -6188,6 +6259,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/laminate/walnut,
/area/liberia/bar)
"ns" = (
@@ -6331,33 +6405,17 @@
/turf/wall/prepainted,
/area/liberia/toiletroom1)
"pE" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/floor_decal/corner/green{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/cable/blue{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 9
},
-/turf/floor/tiled,
-/area/liberia/mule)
+/turf/wall/r_wall/prepainted,
+/area/liberia/captain)
"pF" = (
-/obj/structure/cable/blue,
-/obj/structure/cable/blue{
- icon_state = "0-2"
- },
-/obj/machinery/ion_thruster{
- dir = 4
- },
-/obj/structure/cable/blue{
- icon_state = "0-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
},
-/turf/floor/plating/airless,
-/area/liberia/captain)
+/turf/wall/r_wall/prepainted,
+/area/liberia/engineeringengines)
"pJ" = (
/obj/structure/fireaxecabinet{
pixel_x = -32
@@ -6377,6 +6435,9 @@
/obj/effect/floor_decal/corner/yellow{
dir = 6
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 5
+ },
/turf/floor/tiled/steel_grid,
/area/liberia/engineeringlobby)
"pS" = (
@@ -6406,6 +6467,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/techfloor,
/area/liberia/engineeringreactor)
"pX" = (
@@ -6429,9 +6493,6 @@
/turf/floor/carpet/red,
/area/liberia/traidingroom)
"qc" = (
-/obj/machinery/atm{
- pixel_y = -30
- },
/obj/structure/window/reinforced{
dir = 8
},
@@ -6439,6 +6500,9 @@
req_access = newlist()
},
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atm{
+ pixel_y = -30
+ },
/turf/floor/tiled/steel_grid,
/area/liberia/mule)
"qg" = (
@@ -6466,6 +6530,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"qo" = (
@@ -6556,6 +6621,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/plating,
/area/liberia/hallway)
"rx" = (
@@ -6591,6 +6659,8 @@
dir = 8
},
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/clothing/head/helmet/space/void,
+/obj/item/clothing/suit/space/void,
/turf/floor/tiled/monotile,
/area/liberia/hallway)
"rZ" = (
@@ -6625,6 +6695,9 @@
/obj/structure/disposalpipe/segment/bent{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 9
+ },
/turf/floor/plating,
/area/liberia/hallway)
"ss" = (
@@ -6637,14 +6710,6 @@
},
/turf/floor/tiled/techfloor,
/area/liberia/merchantstorage)
-"sA" = (
-/obj/effect/paint/silver,
-/obj/effect/paint_stripe/yellow,
-/obj/structure/cable/blue{
- icon_state = "1-2"
- },
-/turf/wall/r_titanium,
-/area/liberia/mule)
"sF" = (
/obj/machinery/door/airlock/civilian{
id_tag = "merchdorm2";
@@ -6785,12 +6850,13 @@
/turf/floor/tiled,
/area/liberia/hallway)
"tG" = (
-/obj/structure/cable/blue,
-/obj/machinery/ion_thruster{
- dir = 4
+/obj/effect/paint/silver,
+/obj/effect/paint_stripe/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 5
},
-/turf/floor/plating/airless,
-/area/liberia/engineeringengines)
+/turf/wall/r_titanium,
+/area/liberia/mule)
"tI" = (
/obj/effect/wallframe_spawn/reinforced,
/turf/floor/plating,
@@ -6850,21 +6916,22 @@
icon_state = "1-2"
},
/obj/effect/floor_decal/corner/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/tiled/steel_grid,
/area/liberia/engineeringlobby)
"ur" = (
/turf/wall/r_wall/prepainted,
/area/liberia/guestroom1)
"uS" = (
-/obj/structure/cable/blue,
-/obj/structure/cable/blue{
- icon_state = "0-2"
+/obj/effect/floor_decal/corner/brown{
+ dir = 10
},
-/obj/machinery/ion_thruster{
- dir = 4
+/obj/structure/cable/blue{
+ icon_state = "4-8"
},
-/turf/floor/plating/airless,
-/area/liberia/engineeringengines)
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/floor/tiled,
+/area/liberia/mule)
"vd" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -6970,11 +7037,7 @@
/turf/floor/tiled/techfloor,
/area/liberia/dockinghall)
"xx" = (
-/obj/structure/cable/blue,
-/obj/structure/cable/blue{
- icon_state = "0-2"
- },
-/obj/machinery/ion_thruster{
+/obj/machinery/atmospherics/unary/engine{
dir = 4
},
/turf/floor/plating/airless,
@@ -7184,6 +7247,9 @@
/obj/structure/disposalpipe/segment/bent{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/steel_grid,
/area/liberia/engineeringlobby)
"Br" = (
@@ -7191,14 +7257,7 @@
/turf/floor/tiled/steel_grid,
/area/liberia/atmos)
"Bx" = (
-/obj/structure/cable/blue,
-/obj/structure/cable/blue{
- icon_state = "0-2"
- },
-/obj/structure/cable/blue{
- icon_state = "0-4"
- },
-/obj/machinery/ion_thruster{
+/obj/machinery/atmospherics/unary/engine{
dir = 4
},
/turf/floor/plating/airless,
@@ -7244,9 +7303,7 @@
/turf/floor/tiled/techfloor/grid,
/area/liberia/merchantstorage)
"BX" = (
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel,
/turf/wall/r_wall/prepainted,
/area/liberia/engineeringengines)
"Dl" = (
@@ -7301,6 +7358,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"Ei" = (
@@ -7355,8 +7413,7 @@
/obj/effect/floor_decal/techfloor{
dir = 8
},
-/obj/structure/table,
-/obj/random/coin,
+/obj/machinery/atmospherics/valve/open,
/turf/floor/tiled/techfloor,
/area/liberia/engineeringengines)
"EG" = (
@@ -7469,12 +7526,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/structure/cable/blue{
- icon_state = "1-8"
- },
-/obj/structure/cable/blue{
- icon_state = "2-8"
- },
/turf/floor/tiled,
/area/liberia/mule)
"GE" = (
@@ -7490,6 +7541,7 @@
/obj/structure/cable/blue{
icon_state = "0-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"GG" = (
@@ -7642,16 +7694,12 @@
/turf/floor/reinforced/airless,
/area/liberia/merchantstorage)
"Iq" = (
-/obj/effect/floor_decal/corner/brown{
- dir = 10
- },
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
-/obj/structure/cable/blue{
- icon_state = "1-2"
+/obj/effect/floor_decal/corner/green{
+ dir = 5
},
-/turf/floor/tiled,
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/floor/tiled/steel_grid,
/area/liberia/mule)
"Iw" = (
/turf/wall/prepainted,
@@ -7676,10 +7724,9 @@
/turf/floor/tiled/techfloor,
/area/liberia/engineeringengines)
"IM" = (
-/obj/machinery/ion_thruster{
+/obj/machinery/atmospherics/unary/engine{
dir = 8
},
-/obj/structure/cable/blue,
/turf/floor/plating,
/area/liberia/mule)
"IQ" = (
@@ -7785,16 +7832,13 @@
/turf/floor/tiled/steel_ridged,
/area/liberia/engineeringlobby)
"KF" = (
-/obj/structure/cable/blue,
-/obj/machinery/ion_thruster{
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 4
},
-/turf/floor/plating/airless,
+/turf/wall/r_wall/prepainted,
/area/liberia/captain)
"KH" = (
-/obj/structure/cable/blue{
- icon_state = "4-8"
- },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel,
/turf/wall/r_wall/prepainted,
/area/liberia/captain)
"Lh" = (
@@ -7933,6 +7977,7 @@
/obj/structure/cable/blue{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/tiled/techfloor,
/area/liberia/engineeringreactor)
"NK" = (
@@ -8006,6 +8051,9 @@
/obj/structure/cable/blue{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
+ },
/turf/floor/tiled/techfloor,
/area/liberia/engineeringreactor)
"PI" = (
@@ -8156,12 +8204,11 @@
/turf/wall/prepainted,
/area/liberia/cryo)
"Sb" = (
-/obj/effect/floor_decal/spline/plain/brown,
-/obj/structure/cable/blue{
- icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 9
},
-/turf/floor/laminate/ebony,
-/area/liberia/captain)
+/turf/wall/r_wall/prepainted,
+/area/liberia/engineeringengines)
"Se" = (
/turf/wall/r_wall/prepainted,
/area/liberia/toiletroom1)
@@ -8279,6 +8326,9 @@
/obj/structure/cable/blue{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/plating,
/area/liberia/hallway)
"TT" = (
@@ -8291,6 +8341,9 @@
/obj/structure/cable/blue{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
/turf/floor/tiled/techfloor,
/area/liberia/engineeringreactor)
"Uc" = (
@@ -8459,17 +8512,17 @@
pixel_x = 24
},
/obj/structure/disposalpipe/segment/bent,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
+ },
/turf/floor/plating,
/area/liberia/hallway)
"WS" = (
-/obj/structure/cable/blue{
- icon_state = "0-2"
- },
-/obj/machinery/ion_thruster{
- dir = 4
- },
-/turf/floor/plating/airless,
-/area/liberia/captain)
+/obj/effect/paint/silver,
+/obj/effect/paint_stripe/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/wall/r_titanium,
+/area/liberia/mule)
"WW" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 5
@@ -8521,6 +8574,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/floor/plating,
/area/liberia/hallway)
"Yt" = (
@@ -24481,7 +24535,7 @@ aa
aa
ex
bw
-pE
+bU
cs
cU
bw
@@ -24680,15 +24734,15 @@ VX
aa
aa
aa
-ex
-ex
-bx
+by
+WS
+Iq
bV
ct
-cV
+uS
eg
-ex
-ex
+WS
+tG
aa
oM
ZO
@@ -24882,14 +24936,14 @@ VX
aa
aa
aa
-kf
-sA
-by
+IM
+ex
+bx
Gz
cu
-Iq
+cV
eh
-sA
+ex
IM
aa
oM
@@ -25070,10 +25124,10 @@ aa
aa
aa
iy
-aK
-uS
Bx
-tG
+Bx
+Bx
+Bx
iy
xG
oM
@@ -25101,10 +25155,10 @@ pS
VX
Fc
Aa
-WS
-pF
xx
-KF
+xx
+xx
+xx
Aa
aa
aa
@@ -25272,10 +25326,10 @@ aa
aa
aa
iy
-iy
-iy
+pF
+kf
BX
-iy
+Sb
iy
aa
oM
@@ -25303,10 +25357,10 @@ pS
VX
Fc
Aa
-Aa
+aK
KH
-Aa
-Aa
+KF
+pE
Aa
aa
aa
@@ -25910,7 +25964,7 @@ VX
Fc
Aa
gO
-Sb
+hh
no
hE
xc
diff --git a/maps/away/liberia/liberia_areas.dm b/maps/away/liberia/liberia_areas.dm
index f9c07b776912..de18310846c2 100644
--- a/maps/away/liberia/liberia_areas.dm
+++ b/maps/away/liberia/liberia_areas.dm
@@ -42,11 +42,11 @@
icon_state = "engine"
/area/liberia/personellroom1
- name = "\improper Liberia - Personell Room 1"
+ name = "\improper Liberia - Personal Room 1"
icon_state = "dk_yellow"
/area/liberia/personellroom2
- name = "\improper Liberia - Personell Room 2"
+ name = "\improper Liberia - Personal Room 2"
icon_state = "purple"
/area/liberia/traidingroom
diff --git a/maps/away/magshield/magshield.dm b/maps/away/magshield/magshield.dm
index 323d4beb7599..7344b67ec55c 100644
--- a/maps/away/magshield/magshield.dm
+++ b/maps/away/magshield/magshield.dm
@@ -2,7 +2,7 @@
/obj/effect/overmap/visitable/sector/magshield
name = "orbital station"
- desc = "Sensors detect an orbital station above the exoplanet. Sporadic magentic impulses are registred inside it. Planet landing is impossible due to lower orbits being cluttered with chaotically moving metal chunks."
+ desc = "Sensors detect an orbital station above the exoplanet. Sporadic magentic impulses are registered inside it. Planet landing is impossible due to lower orbits being cluttered with chaotically moving metal chunks."
icon_state = "object"
initial_generic_waypoints = list(
"nav_magshield_1",
@@ -172,4 +172,4 @@
/obj/item/paper/magshield/log
name = "printed page"
- info = "\[07:31\] Attention: solar flare detected! Automatic countermeasures activated.
\[07:33\] Warning: ERROR: NULL input at FARADAY_CAGE#12.TFI - line 2067: No command found. System will be rebooted.
\[07:39\] Warning: radiaton countermeasures inactive. Please initiate emergency protocol.
\[07:40\] Warning: radiaton countermeasures inactive. Please initiate emergency protocol.
\[07:41\] Warning: radiaton countermeasures inactive. Please initiate emergency protocol.
\[07:45\] Attention! Multiple systems failure. Please initiate emergency protocol
\[07:52\] Warning: LIDAR-ASTRA system detected multiple meteors approaching. Estimate impact time: 12.478 seconds.
\[07:52\] Warning! Miltiple hull breaches det~!!@#" + info = "\[07:31\] Attention: solar flare detected! Automatic countermeasures activated.
\[07:33\] Warning: ERROR: NULL input at FARADAY_CAGE#12.TFI - line 2067: No command found. System will be rebooted.
\[07:39\] Warning: radiation countermeasures inactive. Please initiate emergency protocol.
\[07:40\] Warning: radiation countermeasures inactive. Please initiate emergency protocol.
\[07:41\] Warning: radiation countermeasures inactive. Please initiate emergency protocol.
\[07:45\] Attention! Multiple systems failure. Please initiate emergency protocol
\[07:52\] Warning: LIDAR-ASTRA system detected multiple meteors approaching. Estimate impact time: 12.478 seconds.
\[07:52\] Warning! Miltiple hull breaches det~!!@#" diff --git a/maps/away/unishi/unishi-3.dmm b/maps/away/unishi/unishi-3.dmm index df8752f14c53..f1b508bf2884 100644 --- a/maps/away/unishi/unishi-3.dmm +++ b/maps/away/unishi/unishi-3.dmm @@ -248,8 +248,7 @@ /obj/item/clothing/suit/armor/pcarrier/tan, /obj/item/clothing/suit/armor/pcarrier/tan, /obj/machinery/recharger/wallcharger{ - pixel_y = -30; - dir = 1 + pixel_y = -30 }, /turf/floor, /area/unishi/bridge) @@ -1744,6 +1743,9 @@ dir = 10 }, /obj/structure/closet/crate/bin, +/obj/item/clothing/suit/space/void, +/obj/item/clothing/head/helmet/space/void, +/obj/item/tank/oxygen, /turf/floor/tiled, /area/unishi/living) "eM" = ( @@ -2002,6 +2004,20 @@ }, /turf/floor/tiled, /area/unishi/living) +"Dj" = ( +/obj/structure/closet/emcloset, +/obj/item/clothing/suit/space/void, +/obj/item/clothing/head/helmet/space/void, +/obj/item/tank/oxygen, +/turf/floor/tiled, +/area/unishi/living) +"Ew" = ( +/obj/structure/closet/emcloset, +/obj/item/clothing/head/helmet/space/void, +/obj/item/clothing/suit/space/void, +/obj/item/tank/oxygen, +/turf/floor/tiled, +/area/unishi/living) "Um" = ( /obj/machinery/light/small{ dir = 4 @@ -6863,7 +6879,7 @@ bf bf bf eq -dF +Ew bf bf eD @@ -7160,7 +7176,7 @@ bf dm du bf -dF +Dj dM bf dV diff --git a/maps/away/unishi/unishi.dm b/maps/away/unishi/unishi.dm index de64aad2f44c..6808619093cc 100644 --- a/maps/away/unishi/unishi.dm +++ b/maps/away/unishi/unishi.dm @@ -30,7 +30,7 @@ name = "University Ship" description = "CTI research ship." suffixes = list("unishi/unishi-1.dmm", "unishi/unishi-2.dmm", "unishi/unishi-3.dmm") - cost = 2 + cost = 1 area_usage_test_exempted_root_areas = list(/area/unishi) @@ -92,7 +92,7 @@ /obj/item/paper/prof2 name = "error log" - info = "COMPUTER ID: 15131 Email to iodc@net
Attempting recovery of document directory.
Three files recovered
Printing file (1/2)
To whom it may concern,
I recieved your email today in regards to the research I am conducting. You have no legal right to question our research or attempt to block it. Per article 323, scientific research is protected information, that you have absolutely zero claim to. The compound is secret in composition, but I can fully promise you that it contains absolutely no proprietary molecules, and thus you have no claim whatsoever to it or the technologies to it. Your threats are laughable at best, and have been forwarded to CTI legal. Do not contact me aga!#!41asjw.
Printing file (2/2) Email from fuckyou@12cmal
We have ways of making you comply. " + info = "COMPUTER ID: 15131 Email to iodc@net
Attempting recovery of document directory.
Three files recovered
Printing file (1/2)
To whom it may concern,
I received your email today in regards to the research I am conducting. You have no legal right to question our research or attempt to block it. Per article 323, scientific research is protected information, that you have absolutely zero claim to. The compound is secret in composition, but I can fully promise you that it contains absolutely no proprietary molecules, and thus you have no claim whatsoever to it or the technologies to it. Your threats are laughable at best, and have been forwarded to CTI legal. Do not contact me aga!#!41asjw.
Printing file (2/2) Email from fuckyou@12cmal
We have ways of making you comply. " /obj/machinery/computer/log_printer name = "Computer" diff --git a/maps/away/unishi/unishi_jobs.dm b/maps/away/unishi/unishi_jobs.dm index ce315df3faf2..4935f5c928c4 100644 --- a/maps/away/unishi/unishi_jobs.dm +++ b/maps/away/unishi/unishi_jobs.dm @@ -4,7 +4,7 @@ outfit_type = /decl/outfit/job/unishi/crew supervisors = "your survival" info = "You remember waking up to alarms blaring in your face. Before you could react, a gush of hot air blew \ - you away, knocking you cold unconcious. Before this happened you were a crew member \ + you away, knocking you cold unconscious. Before this happened you were a crew member \ on this research vessel, SRV Verne, as it carried the members of the presitigous Ceti Technical institute in \ their pursuit of research. " required_language = /decl/language/human/common @@ -15,7 +15,7 @@ total_positions = 2 outfit_type = /decl/outfit/job/unishi/researcher info = "You remember waking up to alarms blaring in your face. Before you could react, a gush of hot air blew \ - you away, knocking you cold unconcious. Before this happened, you were a researcher, aboard SRV Verne." + you away, knocking you cold unconscious. Before this happened, you were a researcher, aboard SRV Verne." required_language = /decl/language/human/common /decl/outfit/job/unishi diff --git a/maps/away/yacht/yacht.dm b/maps/away/yacht/yacht.dm index fa96ac0d32c9..d829a42770a4 100644 --- a/maps/away/yacht/yacht.dm +++ b/maps/away/yacht/yacht.dm @@ -22,7 +22,7 @@ name = "Yacht" description = "Tiny movable ship with spiders." suffixes = list("yacht/yacht.dmm") - cost = 0.5 + cost = 1 area_usage_test_exempted_root_areas = list(/area/yacht) /obj/effect/shuttle_landmark/nav_yacht/nav1 diff --git a/maps/away/yacht/yacht.dmm b/maps/away/yacht/yacht.dmm index 87f0973c8886..4cec95db85f5 100644 --- a/maps/away/yacht/yacht.dmm +++ b/maps/away/yacht/yacht.dmm @@ -249,7 +249,7 @@ "aM" = ( /obj/structure/table/marble, /obj/item/pizzabox/vegetable, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/laminate/yew, /area/yacht/living) diff --git a/maps/exodus/exodus-2.dmm b/maps/exodus/exodus-2.dmm index 059f7cec3441..d97c31997955 100644 --- a/maps/exodus/exodus-2.dmm +++ b/maps/exodus/exodus-2.dmm @@ -16348,7 +16348,7 @@ /area/exodus/hallway/secondary/entry/starboard) "aIe" = ( /obj/structure/table/reinforced, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/structure/noticeboard{ default_pixel_x = -30 }, @@ -26783,7 +26783,7 @@ }, /obj/structure/table/marble, /obj/item/stack/package_wrap, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/item/chems/spray/cleaner, /turf/floor/tiled/white, /area/exodus/crew_quarters/kitchen) @@ -32641,7 +32641,7 @@ tag_door = "cargo_bay_door" }, /obj/machinery/camera/network/civilian_west{ - c_tag = "Cargo Recieving Dock"; + c_tag = "Cargo Receiving Dock"; dir = 4 }, /turf/floor/tiled/steel_grid, diff --git a/maps/exodus/exodus-admin.dmm b/maps/exodus/exodus-admin.dmm index f8b0550efc0d..97ee913e4191 100644 --- a/maps/exodus/exodus-admin.dmm +++ b/maps/exodus/exodus-admin.dmm @@ -1487,7 +1487,7 @@ dir = 5 }, /obj/item/book/manual/barman_recipes, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /turf/unsimulated/floor/lino, /area/centcom/holding) "aNl" = ( diff --git a/maps/exodus/exodus.dm b/maps/exodus/exodus.dm index 67ca1974ecce..081ad6f823b1 100644 --- a/maps/exodus/exodus.dm +++ b/maps/exodus/exodus.dm @@ -29,11 +29,16 @@ #include "../../mods/mobs/dionaea/_dionaea.dme" #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/bayliens/_bayliens.dme" + #include "../../mods/species/tajaran/_tajaran.dme" + #include "../../mods/species/unathi/_unathi.dme" + #include "../../mods/species/skrell/_skrell.dme" + #include "../../mods/species/adherent/_adherent.dme" + #include "../../mods/species/tritonian/_tritonian.dme" #include "../../mods/species/serpentid/_serpentid.dme" #include "../../mods/species/utility_frames/_utility_frames.dme" #include "../random_ruins/exoplanet_ruins/playablecolony/playablecolony.dm" + #include "../random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dm" #include "../../mods/content/government/away_sites/icarus/icarus.dm" #include "../../mods/content/corporate/away_sites/lar_maria/lar_maria.dm" diff --git a/maps/exodus/exodus_areas.dm b/maps/exodus/exodus_areas.dm index 6f66621d75ee..265523d92cb5 100644 --- a/maps/exodus/exodus_areas.dm +++ b/maps/exodus/exodus_areas.dm @@ -749,9 +749,6 @@ /area/shuttle/arrival/station icon_state = "shuttle" -/area/shuttle/escape_shuttle - name = "\improper Emergency Shuttle" - // SUBSTATIONS. (Subtype of maint, that should let them serve as shielded area during radstorm) /area/exodus/maintenance/substation diff --git a/maps/ministation/ministation-1.dmm b/maps/ministation/ministation-1.dmm index 6646873ff830..d8e968288635 100644 --- a/maps/ministation/ministation-1.dmm +++ b/maps/ministation/ministation-1.dmm @@ -2259,7 +2259,7 @@ /area/ministation/hall/e2) "kR" = ( /obj/structure/table, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/item/trash/stick, /obj/item/utensil/spoon, /turf/floor/tiled/white, diff --git a/maps/ministation/ministation.dm b/maps/ministation/ministation.dm index fca80d6d6478..4a4d02771021 100644 --- a/maps/ministation/ministation.dm +++ b/maps/ministation/ministation.dm @@ -45,7 +45,11 @@ Twice... #include "../../mods/content/tabloids/_tabloids.dme" #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/bayliens/_bayliens.dme" + #include "../../mods/species/tajaran/_tajaran.dme" + #include "../../mods/species/unathi/_unathi.dme" + #include "../../mods/species/skrell/_skrell.dme" + #include "../../mods/species/adherent/_adherent.dme" + #include "../../mods/species/tritonian/_tritonian.dme" #include "../../mods/species/neoavians/_neoavians.dme" #include "../../mods/species/serpentid/_serpentid.dme" diff --git a/maps/ministation/ministation_antagonists.dm b/maps/ministation/ministation_antagonists.dm index bdbfab66cc8a..c924733529f6 100644 --- a/maps/ministation/ministation_antagonists.dm +++ b/maps/ministation/ministation_antagonists.dm @@ -45,7 +45,7 @@ "the tradehouse account documents" = /obj/item/documents/tradehouse/account, "the tradehouse personnel data" = /obj/item/documents/tradehouse/personnel, "the table-top spaceship model" = /obj/item/toy/shipmodel, - "the AI inteliCard" = /obj/item/aicard, + "the AI intelliCard" = /obj/item/aicard, "the nuclear authentication disk" = /obj/item/disk/nuclear, "the officer's sword" = /obj/item/sword/replica/officersword ) \ No newline at end of file diff --git a/maps/modpack_testing/modpack_testing.dm b/maps/modpack_testing/modpack_testing.dm index 6a867b8917fa..533ca68cf0bc 100644 --- a/maps/modpack_testing/modpack_testing.dm +++ b/maps/modpack_testing/modpack_testing.dm @@ -40,12 +40,17 @@ #include "../../mods/mobs/dionaea/_dionaea.dme" #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/bayliens/_bayliens.dme" + #include "../../mods/species/tajaran/_tajaran.dme" + #include "../../mods/species/unathi/_unathi.dme" + #include "../../mods/species/skrell/_skrell.dme" + #include "../../mods/species/adherent/_adherent.dme" + #include "../../mods/species/tritonian/_tritonian.dme" #include "../../mods/species/drakes/_drakes.dme" #include "../../mods/species/neoavians/_neoavians.dme" #include "../../mods/species/serpentid/_serpentid.dme" #include "../../mods/species/utility_frames/_utility_frames.dme" #include "../../mods/species/vox/_vox.dme" + #include "../../mods/species/random_species/_random_species.dme" #define USING_MAP_DATUM /datum/map/modpack_testing diff --git a/maps/planets/test_planet/neutralia-3.dmm b/maps/planets/test_planet/neutralia-3.dmm index f7d1ff768ee3..fb4f5b6268e2 100644 --- a/maps/planets/test_planet/neutralia-3.dmm +++ b/maps/planets/test_planet/neutralia-3.dmm @@ -13,7 +13,7 @@ /turf/unsimulated/floor/rescue_base, /area/exoplanet/neutralia) "e" = ( -/turf/unsimulated/floor/shuttle_ceiling, +/turf/floor/shuttle_ceiling, /area/exoplanet/neutralia) "j" = ( /obj/abstract/landmark/exoplanet_spawn/large_plant, diff --git a/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dm b/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dm index 7eb021cf0cbf..b893cabaae96 100644 --- a/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dm +++ b/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dm @@ -59,5 +59,5 @@ . = ..() /obj/structure/sign/plaque/ai_dev/pod - desc = "A plaque with information regarding this particular lifepod. It reads: 'Armalev Industries Skyfin-E, Exoplanetary Suvival Pod' there's a registry number, and an assigned mothership, but they've both been scratched to illegiblity." + desc = "A plaque with information regarding this particular lifepod. It reads: 'Yoyodyne Propulsion Systems Exoplanetary Suvival Pod MK 7' there's a registry number, and an assigned mothership, but they've both been scratched to illegiblity." name = "\improper Lifepod Plaque" \ No newline at end of file diff --git a/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm b/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm index c7ef24bae56b..ac68a3de9626 100644 --- a/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm +++ b/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm @@ -1,6 +1,21 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/grille, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ + id_tag = "crashed_pod_pump_out_external" + }, +/obj/machinery/button/access/exterior{ + id_tag = "crashed_pod"; + pixel_x = 10; + pixel_y = -20; + dir = 1; + name = "exterior access button" + }, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_x = -1; + id_tag = "crashed_pod_ext_sensor"; + pixel_y = -19 + }, /turf/floor/plating, /area/map_template/crashed_pod) "ab" = ( @@ -30,11 +45,16 @@ /turf/floor/plating, /area/map_template/crashed_pod) "af" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/structure/wall_frame, +/obj/structure/grille, +/obj/structure/window/borosilicate_reinforced/full, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/abstract/landmark/allowed_leak, -/turf/wall/r_wall, +/turf/floor/plating, /area/map_template/crashed_pod) "ag" = ( /obj/structure/shuttle/engine/heater{ @@ -43,957 +63,1219 @@ /obj/structure/wall_frame, /obj/structure/grille, /obj/structure/window/borosilicate_reinforced/full, -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, +/obj/abstract/landmark/allowed_leak, /turf/floor/plating, /area/map_template/crashed_pod) "ah" = ( -/obj/machinery/alarm{ - dir = 4; - locked = 0; - pixel_x = -25 +/obj/structure/rack, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/effect/floor_decal/industrial/hatch/orange, +/obj/item/tool/pickaxe, +/obj/item/tool/pickaxe, +/obj/item/scanner/gas, +/obj/item/scanner/gas, +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor/grid, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "ai" = ( -/obj/effect/decal/cleanable/dirt/visible, -/obj/item/trash/raisins, -/obj/item/chems/drinks/glass2/fitnessflask, -/turf/floor/tiled/techfloor/grid, +/obj/machinery/atmospherics/binary/pump{ + dir = 1 + }, +/turf/wall/r_wall, /area/map_template/crashed_pod) "aj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/obj/structure/rack, +/obj/item/stock_parts/circuitboard/pacman/super, +/obj/item/stock_parts/circuitboard/space_heater, +/obj/item/stack/material/sheet/mapped/steel/fifty, +/obj/item/stack/material/sheet/mapped/steel/fifty, +/obj/item/stack/material/sheet/mapped/steel/fifty, +/obj/item/stack/material/pane/mapped/glass/fifty, +/obj/item/stack/material/pane/mapped/glass/fifty, +/obj/item/stack/material/sheet/reinforced/mapped/fiberglass/fifty, +/obj/item/stack/material/sheet/reinforced/mapped/fiberglass/fifty, +/obj/item/stack/material/ingot/mapped/copper/fifty, +/obj/item/stack/material/panel/mapped/plastic/fifty, +/obj/item/stack/material/sheet/reinforced/mapped/plasteel/fifty, +/obj/item/stock_parts/circuitboard/unary_atmos/heater, +/obj/item/stock_parts/circuitboard/unary_atmos/cooler, +/obj/item/stock_parts/circuitboard/oxyregenerator, +/obj/item/stock_parts/circuitboard/biogenerator, +/obj/item/stack/material/pane/mapped/glass/fifty, /obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor/grid, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "ak" = ( -/obj/machinery/power/terminal, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 }, /obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor/grid, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "al" = ( -/obj/structure/sign/plaque/ai_dev/pod{ - pixel_y = 30 - }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 }, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor/grid, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "am" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, -/obj/abstract/landmark/allowed_leak, -/turf/floor/tiled/techfloor/grid, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "an" = ( -/obj/machinery/atmospherics/omni/filter, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/table/steel_reinforced{ + dir = 8 + }, +/obj/item/belt/utility/full, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/random/toolbox, +/obj/random/toolbox, +/obj/random/toolbox, +/obj/item/clothing/gloves/insulated, +/obj/item/t_scanner, +/obj/item/chems/drinks/glass2/coffeecup/metal, +/obj/item/multitool, +/obj/item/wrench, +/obj/item/toolbox/repairs, /obj/effect/decal/cleanable/dirt/visible, /obj/abstract/landmark/allowed_leak, -/turf/floor/tiled/techfloor/grid, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "ao" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 +/obj/machinery/atmospherics/omni/filter, +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/structure/closet/crate/solar, /obj/effect/decal/cleanable/dirt/visible, -/obj/item/trash/tastybread, -/obj/item/chems/drinks/cans/speer, /obj/abstract/landmark/allowed_leak, -/turf/floor/tiled/techfloor/grid, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "ap" = ( -/obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/vomit/mapped, -/obj/effect/decal/cleanable/filth, -/obj/structure/curtain/open/shower/engineering, -/obj/structure/hygiene/toilet{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/structure/mirror{ - pixel_x = 27 +/obj/machinery/power/smes/buildable{ + charge = 50000; + inputting = 1; + outputting = 1 }, -/obj/item/stock_parts/circuitboard/solar_control, -/turf/floor/tiled/techfloor/grid, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt/visible, +/obj/abstract/landmark/allowed_leak, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/decal/cleanable/dirt/visible, -/obj/structure/closet/hydrant{ - pixel_x = -27; +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/hatch/orange, +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/floor/tiled/techfloor/grid, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "ar" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/portable_atmospherics/canister/air/airlock{ + start_pressure = 0 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 }, -/obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "as" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/power/apc{ - locked = 0; - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/filth, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/floor/tiled/techfloor, +/turf/wall, /area/map_template/crashed_pod) "at" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/fabricator/pipe, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light/small{ + icon_state = "bulb1" }, /obj/effect/decal/cleanable/dirt/visible, -/obj/machinery/power/smes/buildable{ - charge = 50000; - inputting = 1; - outputting = 1 - }, -/turf/floor/tiled/techfloor, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "au" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt/visible, -/obj/abstract/landmark/allowed_leak, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "av" = ( -/obj/machinery/atmospherics/omni/filter, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = -18; + dir = 1; + locked = 0 + }, +/obj/item/trash/candy/proteinbar, +/obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt/visible, -/obj/abstract/landmark/allowed_leak, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aw" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 9 }, +/obj/item/chems/drinks/cans/speer, +/obj/item/chems/drinks/cans/speer, /obj/effect/decal/cleanable/dirt/visible, /obj/abstract/landmark/allowed_leak, -/turf/floor/tiled/techfloor/grid, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "ax" = ( /obj/effect/wallframe_spawn/reinforced/hull, -/obj/machinery/door/firedoor, -/turf/floor/plating, +/turf/space, /area/map_template/crashed_pod) "ay" = ( /turf/wall, /area/map_template/crashed_pod) "az" = ( -/obj/machinery/atmospherics/binary/pump, -/turf/wall, -/area/map_template/crashed_pod) -"aA" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor/grid, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"aA" = ( +/obj/effect/wallframe_spawn/reinforced/hull, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "aB" = ( -/obj/machinery/sleeper/standard{ - dir = 4 +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/floor/tiled/techfloor/grid, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aC" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering, -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ + dir = 4; + id_tag = "crashed_pod_pump" + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -18; + id_tag = "crashed_pod_sensor" }, +/obj/effect/floor_decal/industrial/hatch/orange, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor/grid, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/abstract/landmark/allowed_leak, -/turf/wall, +/turf/wall/r_wall, /area/map_template/crashed_pod) "aE" = ( -/obj/machinery/sleeper/standard{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/effect/decal/cleanable/cobweb, -/turf/floor/tiled/techfloor/grid, -/area/map_template/crashed_pod) -"aF" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" }, +/obj/structure/emergency_dispenser/east, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor/grid, -/area/map_template/crashed_pod) -"aG" = ( -/obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/hatch/orange, -/obj/item/scanner/gas, -/obj/item/stock_parts/circuitboard/unary_atmos/cooler, -/obj/item/stock_parts/circuitboard/unary_atmos/heater, -/obj/item/stock_parts/circuitboard/oxyregenerator, -/obj/item/tank/emergency/oxygen/double/red, -/obj/structure/cable, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/stack/material/puck/mapped/uranium/ten, -/obj/item/clothing/costume/savage_hunter, -/obj/item/clothing/costume/savage_hunter/female, -/obj/item/clothing/jumpsuit/wetsuit, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/turf/floor/tiled/white, +/area/map_template/crashed_pod) +"aF" = ( +/obj/machinery/button/access/interior{ + id_tag = "crashed_pod"; + pixel_x = -10; + pixel_y = 20; + name = "interior access button" + }, /obj/effect/decal/cleanable/dirt/visible, -/obj/item/trash/candy/proteinbar, -/obj/item/trash/liquidfood, -/obj/item/stock_parts/matter_bin/super, -/obj/item/stock_parts/circuitboard/biogenerator, -/obj/item/bedsheet/orange, -/obj/item/bedsheet/orange, -/obj/item/stock_parts/matter_bin/adv, -/obj/item/stock_parts/micro_laser/ultra, -/obj/item/food/junk/liquidfood, -/obj/item/stack/material/brick/mapped/sandstone/fifty, -/turf/floor/tiled/techfloor, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) -"aH" = ( +"aG" = ( +/obj/machinery/fabricator, +/obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 + dir = 4; + level = 2 }, -/obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) -"aI" = ( -/obj/machinery/atmospherics/unary/tank/air, +"aH" = ( +/obj/machinery/material_processing/smeltery, /obj/effect/floor_decal/industrial/outline/blue, -/obj/effect/decal/cleanable/generic, -/turf/floor/tiled/techfloor, -/area/map_template/crashed_pod) -"aJ" = ( -/obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/filth, -/obj/structure/curtain/open/shower/engineering, -/obj/structure/hygiene/shower{ - dir = 8; - pixel_x = -6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/floor/tiled/techfloor/grid, -/area/map_template/crashed_pod) -"aK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, -/obj/item/mop, /obj/effect/decal/cleanable/dirt/visible, /obj/item/trash/candy/proteinbar, -/obj/item/trash/liquidfood, -/obj/item/box/detergent, -/obj/item/plunger, -/turf/floor/tiled/techfloor, +/obj/item/trash/candy/proteinbar, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) -"aL" = ( -/obj/effect/floor_decal/industrial/warning{ +"aI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/visible/red{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"aJ" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/solar_control{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"aK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/ore_box, +/obj/effect/decal/cleanable/dirt/visible, +/obj/structure/sign/plaque/ai_dev/pod, +/turf/floor/tiled/dark, +/area/map_template/crashed_pod) +"aL" = ( +/obj/structure/hygiene/toilet{ + dir = 1 + }, +/obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/obj/structure/curtain/open/shower/engineering, /turf/floor/tiled/techfloor/grid, /area/map_template/crashed_pod) "aM" = ( -/obj/machinery/fabricator/pipe, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/effect/decal/cleanable/generic, +/obj/structure/curtain/open/shower/engineering, +/obj/structure/hygiene/shower{ + dir = 8; + pixel_x = -6 + }, +/obj/machinery/alarm{ + pixel_y = -24; + dir = 1; + locked = 0 + }, +/obj/item/chems/drinks/cans/speer, +/obj/item/chems/drinks/cans/speer, +/obj/item/chems/drinks/cans/speer, +/obj/item/chems/drinks/cans/speer, /obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, /turf/floor/tiled/techfloor/grid, /area/map_template/crashed_pod) "aN" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4; + level = 2 }, /obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/emergency_dispenser/south, /obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/filth, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/structure/table/steel_reinforced, +/obj/item/backpack/dufflebag/eng, +/obj/item/backpack/dufflebag/eng, +/obj/item/box/animal_cubes/monkeys, +/obj/item/multitool, +/obj/item/screwdriver, +/obj/item/wrench, +/obj/item/cell/device/high, +/obj/item/cell/device/high, +/obj/item/cell/crap, +/obj/item/toolbox/mechanical, +/obj/item/chems/drinks/cans/speer, +/obj/item/chems/drinks/cans/speer, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "aR" = ( -/obj/machinery/fabricator, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/floor/tiled/techfloor/grid, +/obj/machinery/atmospherics/binary/pump, +/turf/wall/r_wall, /area/map_template/crashed_pod) "aS" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/civilian, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "_North APC"; + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/filth, +/obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 +/obj/item/stool/padded, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4; + level = 2 }, +/obj/item/trash/candy/proteinbar, /obj/effect/decal/cleanable/dirt/visible, -/obj/item/trash/tastybread, -/turf/floor/tiled/techfloor, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/turf/floor/tiled/white, /area/map_template/crashed_pod) "aU" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock{ + dir = 8 }, /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aV" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 9 }, -/obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/wall/r_wall, /area/map_template/crashed_pod) "aW" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/atmospherics/unary/tank/air{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister/empty, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "aX" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + external_pressure_bound = 140; + external_pressure_bound_default = 140; + icon_state = "map_vent_out"; + use_power = 1 + }, +/turf/floor/plating, /area/map_template/crashed_pod) "aY" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/civilian, -/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/crate/hydroponics, +/obj/item/chems/glass/bucket, +/obj/item/seeds/random, +/obj/item/seeds/random, +/obj/item/seeds/random, +/obj/item/seeds/random, +/obj/item/seeds/random, +/obj/item/seeds/clam, +/obj/item/seeds/cornseed, +/obj/item/seeds/potatoseed, +/obj/item/tool/hoe/mini, +/obj/item/tool/axe/hatchet, +/obj/item/plantspray/pests, +/obj/item/plantspray/weeds, +/obj/item/plants, +/obj/item/chems/glass/bottle/eznutrient, +/obj/item/seeds/wheatseed, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "aZ" = ( -/obj/abstract/submap_landmark/spawnpoint/crashed_pod_survivor, -/obj/structure/bed/chair/shuttle/black, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/closet/crate{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/item/ore, +/obj/item/ore, +/obj/item/mop, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/plunger, +/obj/item/box/glowsticks, +/obj/item/box/glowsticks, +/obj/item/crowbar, +/obj/item/bag/trash, +/obj/item/bag/trash, +/obj/item/beartrap, +/obj/random/plushie, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/dark/monotile, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "ba" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/effect/decal/cleanable/dirt/visible, +/obj/structure/table, +/obj/item/pill_bottle/assorted, +/obj/item/pill_bottle/assorted, +/obj/item/pill_bottle/assorted, +/obj/item/pill_bottle/assorted, +/obj/item/pill_bottle/antidepressants, +/obj/item/firstaid/stab, +/obj/item/scanner/health, +/obj/item/firstaid/surgery, +/obj/item/chems/drinks/bottle/vodka, +/obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor, +/turf/floor/tiled/white, /area/map_template/crashed_pod) "bb" = ( -/obj/machinery/door/firedoor, /obj/effect/wallframe_spawn/reinforced/hull, -/turf/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/space, /area/map_template/crashed_pod) "bc" = ( -/obj/abstract/submap_landmark/spawnpoint/crashed_pod_survivor, -/obj/structure/bed/chair/shuttle/black, -/obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/dark/monotile, -/area/map_template/crashed_pod) -"bd" = ( /obj/structure/table/steel_reinforced, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/random/plushie, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24; + locked = 0 + }, +/obj/machinery/reagentgrinder, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/dark/monotile, +/turf/floor/tiled/dark, +/area/map_template/crashed_pod) +"bd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/wall/r_wall, /area/map_template/crashed_pod) "be" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24; + locked = 0 }, -/obj/structure/bed/chair, -/obj/structure/closet/hydrant{ - pixel_x = -27; - dir = 4 +/obj/structure/bed/chair{ + dir = 1 }, /obj/effect/decal/cleanable/dirt/visible, +/obj/item/trash/liquidfood, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bf" = ( -/obj/abstract/submap_landmark/spawnpoint/crashed_pod_survivor, -/obj/structure/bed/chair/shuttle/black, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/dark/monotile, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "bg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt/visible, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bh" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/trash/tastybread, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/dark, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bi" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/closet/crate/plastic/rations, +/obj/item/food/junk/liquidfood, +/obj/item/food/junk/liquidfood, +/obj/item/food/junk/liquidfood, +/obj/item/food/junk/liquidfood, +/obj/item/food/junk/liquidfood, +/obj/item/food/junk/liquidfood, +/obj/item/food/junk/liquidfood, +/obj/item/food/junk/liquidfood, +/obj/item/box/fancy/egg_box, +/obj/item/box/fancy/egg_box, +/obj/item/box/donkpockets, +/obj/item/box/donkpockets, +/obj/item/chems/drinks/milk, +/obj/item/chems/drinks/milk, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bj" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/recharger, -/obj/effect/decal/cleanable/dirt/visible, -/obj/item/chems/drinks/glass2/coffeecup/metal, -/turf/floor/tiled/dark/monotile, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 1 + }, +/turf/wall/r_wall, /area/map_template/crashed_pod) "bk" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/closet/crate, +/obj/item/gun/energy/gun/small, +/obj/item/gun/energy/gun/small, +/obj/item/gun/energy/gun/small, +/obj/item/knife/combat, +/obj/item/knife/combat, +/obj/item/bladed/polearm/spear, +/obj/item/bladed/polearm/spear, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/industrial/warning, +/obj/structure/table/steel_reinforced, +/obj/machinery/recharger, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/screwdriver, +/obj/item/wrench, +/obj/item/pill_bottle/happy, +/obj/item/box/fancy/cigar, +/obj/item/box/fancy/cigarettes, +/obj/item/chems/drinks/bottle/vodka, +/obj/item/chems/drinks/cans/speer, +/obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt/visible, +/obj/item/box/lights/mixed, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bm" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/hatch/orange, +/obj/machinery/door/airlock/external/glass{ + autoset_access = 0; + name = "Internal Airlock Hatch"; + locked = 1; + id_tag = "crashed_pod_airlock_interior" + }, /obj/effect/decal/cleanable/dirt/visible, -/obj/item/trash/candy/proteinbar, -/obj/item/trash/liquidfood, -/turf/floor/tiled/dark, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bn" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning, +/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/decal/cleanable/dirt/visible, +/obj/structure/closet/hydrant{ + pixel_x = -27 + }, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/cleanable/flour, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/filth, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/trash/tastybread, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bq" = ( -/obj/structure/closet/emcloset, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/item/crowbar, -/obj/item/crowbar, +/obj/structure/table/steel_reinforced, +/obj/item/chems/condiment/small/saltshaker, +/obj/item/chems/condiment/small/peppermill, +/obj/machinery/reagentgrinder/juicer, +/obj/item/chems/drinks/glass2/coffeecup/metal, +/obj/item/chems/condiment/enzyme, +/obj/item/knife/kitchen/cleaver, +/obj/item/chems/drinks/bottle/vodka, +/obj/item/trash/candy/proteinbar, +/obj/effect/decal/cleanable/flour, +/obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "br" = ( /obj/structure/table/steel_reinforced, /obj/machinery/microwave, +/obj/effect/decal/cleanable/flour, +/obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light, /obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bu" = ( -/obj/structure/table/steel_reinforced, -/obj/item/chems/condiment/small/saltshaker, -/obj/item/chems/condiment/small/peppermill, -/obj/effect/decal/cleanable/flour, -/obj/item/trash/candy/proteinbar, -/obj/machinery/reagentgrinder, -/obj/item/chems/condiment/small/sugar, -/turf/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/orange, +/obj/machinery/door/airlock/external/glass{ + autoset_access = 0; + name = "External Airlock Hatch"; + locked = 1; + id_tag = "crashed_pod_airlock_exterior" + }, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bx" = ( -/obj/machinery/alarm{ - dir = 4; - locked = 0; - pixel_x = -25 - }, -/obj/structure/bed/chair{ - dir = 1 - }, +/obj/structure/table/gamblingtable, +/obj/item/deck/cards, +/obj/item/dice, +/obj/item/flashlight/lamp/green, +/obj/item/chems/drinks/cans/speer, +/obj/item/chems/drinks/cans/speer, +/obj/item/chems/drinks/cans/speer, +/obj/item/trash/candy/proteinbar, /obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/filth, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "by" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ + dir = 8; + id_tag = "crashed_pod_pump_out_internal" + }, +/obj/effect/floor_decal/industrial/hatch/orange, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "crashed_pod"; + pixel_y = null; + tag_airpump = "crashed_pod_pump"; + tag_chamber_sensor = "crashed_pod_sensor"; + tag_exterior_door = "crashed_pod_airlock_exterior"; + tag_interior_door = "crashed_pod_airlock_interior"; + dir = 4; + pixel_x = -20; + tag_pump_out_external = "crashed_pod_pump_out_external"; + tag_pump_out_internal = "crashed_pod_pump_out_internal"; + cycle_to_external_air = 1; + tag_exterior_sensor = "crashed_pod_ext_sensor"; + tag_interior_sensor = "crashed_pod_int_sensor" }, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/light/small{ + icon_state = "bulb1" }, -/turf/floor/tiled/techfloor, +/obj/effect/decal/cleanable/dirt/visible, +/obj/item/trash/liquidfood, +/obj/item/trash/liquidfood, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "bA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bB" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/engineering, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/bed/chair{ + dir = 8 }, /obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "bD" = ( /obj/effect/floor_decal/industrial/hatch/orange, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 }, -/turf/floor/tiled/techfloor, +/turf/wall/r_wall, /area/map_template/crashed_pod) "bG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt/visible, -/obj/effect/decal/cleanable/filth, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bH" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/floor/tiled/techfloor/grid, +/obj/structure/bed/chair/shuttle/black, +/obj/abstract/submap_landmark/spawnpoint/crashed_pod_survivor, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "bI" = ( -/obj/structure/closet/crate, -/obj/item/briefcase/inflatable, -/obj/item/briefcase/inflatable, -/obj/item/briefcase/inflatable, -/obj/item/briefcase/inflatable, -/obj/item/briefcase/inflatable, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/bed/chair/shuttle/black, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/floor/tiled/techfloor, +/obj/abstract/submap_landmark/spawnpoint/crashed_pod_survivor, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "bJ" = ( -/obj/machinery/door/airlock/external{ - name = "escape pod airlock" - }, -/turf/floor/tiled/techfloor, +/obj/machinery/optable, +/obj/item/chems/drinks/bottle/agedwhiskey, +/obj/item/chems/drinks/cans/speer, +/obj/item/chems/drinks/cans/speer, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/white, /area/map_template/crashed_pod) "bK" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/light/small, -/obj/effect/decal/cleanable/ash, -/obj/item/trash/cigbutt/cigarbutt, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bL" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/floor_decal/industrial/outline, +/obj/random/crate{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/techfloor, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "bM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/closet, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/gloves, -/obj/random/gloves, -/obj/random/hat, -/obj/random/hat, -/obj/random/hat, -/obj/random/hat, -/obj/random/hat, -/obj/item/clothing/jumpsuit/orange, -/obj/item/clothing/jumpsuit/orange, -/obj/item/clothing/jumpsuit/blackjumpshorts, -/obj/item/clothing/jumpsuit/black, -/obj/effect/decal/cleanable/dirt/visible, +/obj/structure/closet/emcloset, +/obj/item/crowbar, +/obj/effect/floor_decal/industrial/outline/red, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bN" = ( -/obj/machinery/seed_extractor, -/turf/floor/tiled/techfloor/grid, +/obj/effect/floor_decal/industrial/warning{ + dir = 1; + icon_state = "warning" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/visible, +/obj/item/flashlight/flare/glowstick/random, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bO" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/table/steel_reinforced, -/obj/item/binoculars, -/obj/effect/decal/cleanable/dirt/visible, -/obj/item/trash/candy/proteinbar, -/obj/item/chems/drinks/cans/speer, +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/dark, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bP" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/turf/floor/tiled/techfloor/grid, +/obj/item/crowbar, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/red, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/closet, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/gloves, -/obj/random/gloves, -/obj/random/hat, -/obj/random/hat, -/obj/random/hat, -/obj/random/hat, -/obj/random/hat, -/obj/item/clothing/jumpsuit/orange, -/obj/item/clothing/jumpsuit/orange, -/obj/item/clothing/jumpsuit/blackjumpshorts, -/obj/item/clothing/jumpsuit/black, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt/visible, +/obj/item/stack/material/puck/mapped/uranium/fifty, +/obj/item/box/parts, +/obj/item/box/parts, +/obj/item/box/parts, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bR" = ( -/obj/structure/table/steel_reinforced, -/obj/effect/decal/cleanable/dirt/visible, -/obj/item/trash/tastybread, -/obj/item/geiger, -/obj/item/geiger, -/obj/effect/decal/cleanable/dirt/visible, -/turf/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/wall/r_wall, /area/map_template/crashed_pod) "bS" = ( -/obj/effect/floor_decal/industrial/hatch/orange, -/obj/structure/rack, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/turf/floor/tiled/techfloor/grid, +/obj/machinery/sleeper/standard, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/white, /area/map_template/crashed_pod) "bT" = ( -/obj/structure/closet/emcloset, -/obj/machinery/light/small, -/obj/item/crowbar, -/obj/item/crowbar, +/obj/item/bedsheet/brown, +/obj/structure/curtain/open/privacy, +/obj/structure/bed/padded, +/obj/effect/decal/cleanable/dirt/visible, +/obj/item/trash/candy/proteinbar, +/obj/item/trash/candy/proteinbar, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/closet, +/obj/item/crowbar, /obj/random/clothing, /obj/random/clothing, /obj/random/clothing, /obj/random/clothing, /obj/random/clothing, /obj/random/clothing, -/obj/random/clothing, -/obj/random/clothing, -/obj/random/gloves, +/obj/random/hat, /obj/random/hat, /obj/random/hat, /obj/random/hat, /obj/item/clothing/jumpsuit/orange, -/obj/item/clothing/jumpsuit/orange, +/obj/random/gloves, +/obj/random/gloves, /obj/item/clothing/jumpsuit/blackjumpshorts, /obj/item/clothing/jumpsuit/black, -/obj/effect/decal/cleanable/dirt/visible, +/obj/item/clothing/jumpsuit/black, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/jumpsuit/hazard, +/obj/item/clothing/jumpsuit/hazard, +/obj/effect/decal/cleanable/dirt/visible, +/obj/item/clothing/suit/jacket/winter, +/obj/item/clothing/suit/jacket/winter, +/obj/item/clothing/head/winterhood, +/obj/item/clothing/head/winterhood, /turf/floor/tiled/dark, /area/map_template/crashed_pod) "bV" = ( -/obj/effect/floor_decal/industrial/hatch/orange, -/obj/structure/rack, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/machinery/light/small{ - dir = 8 +/obj/structure/closet/crate/medical{ + dir = 4 }, -/turf/floor/tiled/techfloor/grid, -/area/map_template/crashed_pod) -"bW" = ( -/obj/structure/closet/crate/medical, /obj/random/firstaid, /obj/random/firstaid, /obj/random/firstaid, /obj/random/firstaid, -/obj/random/firstaid, -/obj/item/firstaid/surgery, -/obj/item/firstaid/stab, -/obj/item/pill_bottle/antibiotics, -/obj/item/pill_bottle/antibiotics, -/obj/item/med_pouch/radiation, -/obj/item/med_pouch/radiation, /obj/item/med_pouch/radiation, /obj/item/med_pouch/radiation, -/obj/item/pill_bottle/assorted, -/turf/floor/tiled/techfloor/grid, +/obj/item/med_pouch/toxin, +/obj/item/med_pouch/toxin, +/obj/item/med_pouch/burn, +/obj/item/med_pouch/burn, +/obj/item/med_pouch/trauma, +/obj/item/med_pouch/trauma, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/white, +/area/map_template/crashed_pod) +"bW" = ( +/obj/structure/bed/chair/shuttle/black, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/abstract/submap_landmark/spawnpoint/crashed_pod_survivor, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) "bX" = ( -/obj/structure/closet/crate/large, -/obj/random/handgun, -/obj/random/handgun, -/obj/random/handgun, -/obj/item/tool/pickaxe, -/obj/item/tool/pickaxe, -/obj/item/tool/pickaxe, -/obj/item/stack/material/pane/mapped/glass/fifty, -/obj/item/stack/material/pane/mapped/glass/fifty, -/obj/item/stack/material/sheet/reinforced/mapped/fiberglass/fifty, -/obj/item/stack/material/sheet/reinforced/mapped/plasteel/fifty, -/obj/item/stack/material/ingot/mapped/copper/fifty, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/box/glowsticks, -/obj/item/box/glowsticks, -/obj/item/box/glowsticks, -/obj/item/stack/material/sheet/mapped/steel/fifty, -/obj/item/stack/material/sheet/mapped/steel/fifty, -/obj/item/stack/material/sheet/mapped/steel/fifty, -/obj/random/toolbox, -/obj/random/toolbox, -/obj/random/toolbox, -/obj/random/toolbox, -/turf/floor/tiled/techfloor/grid, +/obj/structure/bed/padded, +/obj/item/bedsheet/medical, +/obj/structure/curtain/open/privacy, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/white, /area/map_template/crashed_pod) "bY" = ( -/obj/structure/closet/crate/plastic/rations, -/obj/item/bag/trash, -/obj/item/bag/trash, -/obj/item/box/donkpockets, -/obj/item/box/donkpockets, -/obj/item/box/fancy/egg_box, -/obj/item/box/fancy/egg_box, -/obj/item/box/fancy/egg_box, -/obj/item/chems/condiment/enzyme, -/obj/item/chems/drinks/milk, -/obj/item/chems/drinks/milk, -/obj/item/food/dairy/butter/stick, -/obj/item/trash/liquidfood, -/obj/item/trash/liquidfood, -/obj/item/beartrap, -/obj/item/knife/kitchen/cleaver, -/turf/floor/tiled/techfloor/grid, +/obj/effect/floor_decal/industrial/warning{ + dir = 1; + icon_state = "warning" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/trash/tastybread, +/obj/item/trash/candy/proteinbar, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/obj/item/flashlight/flare/glowstick/random, +/turf/floor/tiled/techfloor, /area/map_template/crashed_pod) "bZ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/alarm{ + pixel_y = -24; + dir = 1; + locked = 0 + }, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"ca" = ( +/obj/structure/bed/chair, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/dark, +/area/map_template/crashed_pod) +"cb" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1; + icon_state = "warning" + }, +/obj/effect/decal/cleanable/vomit/mapped, +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"cc" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1; + icon_state = "warning" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/filth, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"cd" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/chems/drinks/cans/speer, +/obj/item/trash/liquidfood, +/obj/effect/decal/cleanable/dirt/visible, +/obj/item/flashlight/flare/glowstick/random, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"kw" = ( +/obj/structure/closet/hydrant{ + pixel_x = -27 }, -/obj/machinery/port_gen/pacman/super, -/obj/machinery/light/small, +/obj/effect/decal/cleanable/dirt/visible, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) -"ca" = ( -/obj/structure/table/steel_reinforced, -/obj/item/backpack/dufflebag/eng, -/obj/item/ashtray, -/obj/item/paper_bin, -/obj/item/chems/drinks/cans/speer, +"nM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 22; + locked = 0 + }, +/obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt/visible, -/obj/item/pen, -/turf/floor/tiled/dark, +/obj/effect/decal/cleanable/dirt{ + dir = 9 + }, +/turf/floor/tiled/white, /area/map_template/crashed_pod) -"cb" = ( -/obj/item/oxycandle, -/obj/item/oxycandle, -/obj/item/oxycandle, -/obj/item/oxycandle, -/obj/item/oxycandle, -/obj/item/oxycandle, -/obj/item/oxycandle, -/obj/item/oxycandle, -/obj/item/oxycandle, -/obj/item/oxycandle, +"nQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"qc" = ( +/obj/effect/floor_decal/industrial/outline, +/obj/structure/closet/crate, /obj/item/oxycandle, /obj/item/oxycandle, /obj/item/oxycandle, @@ -1002,91 +1284,114 @@ /obj/item/oxycandle, /obj/item/oxycandle, /obj/item/oxycandle, -/obj/structure/closet/crate, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/item/briefcase/inflatable, +/obj/item/briefcase/inflatable, +/obj/item/briefcase/inflatable, +/obj/item/briefcase/inflatable, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/dark, +/area/map_template/crashed_pod) +"yo" = ( +/obj/item/bedsheet/brown, +/obj/structure/curtain/open/privacy, +/obj/structure/bed/padded, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/dark, +/area/map_template/crashed_pod) +"Ar" = ( +/obj/item/trash/liquidfood, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/white, +/area/map_template/crashed_pod) +"DM" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt/visible, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -17; + id_tag = "crashed_pod_int_sensor" }, -/obj/machinery/light/small, /turf/floor/tiled/techfloor, /area/map_template/crashed_pod) -"cc" = ( +"GT" = ( +/obj/item/trash/candy/proteinbar, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"Ta" = ( +/obj/effect/decal/cleanable/dirt/visible, +/obj/effect/decal/cleanable/dirt/visible, +/obj/structure/hygiene/sink{ + dir = 8; + pixel_x = -13 + }, +/obj/effect/decal/cleanable/vomit/mapped, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"Ut" = ( +/obj/effect/decal/cleanable/dirt/visible, +/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/floor/tiled/techfloor, +/area/map_template/crashed_pod) +"Ys" = ( /obj/structure/table/steel_reinforced, -/obj/item/multitool, -/obj/item/screwdriver, -/obj/item/cell/device/high, -/obj/item/cell/device/high, -/obj/item/cell/crap, -/obj/item/box/lights, -/obj/item/scanner/gas, -/obj/item/chems/drinks/cans/speer, +/obj/item/paper_bin, +/obj/structure/emergency_dispenser/west, +/obj/item/ashtray, +/obj/item/pen, +/obj/item/pen/multi, +/obj/item/chems/drinks/glass2/coffeecup/metal, +/obj/item/flame/fuelled/lighter/random, +/obj/random/plushie, +/obj/item/chems/drinks/bottle/agedwhiskey, /obj/item/chems/drinks/cans/speer, /obj/item/chems/drinks/cans/speer, -/obj/item/box/animal_cubes/monkeys, -/obj/item/chems/drinks/bottle/vodka, -/obj/item/chems/drinks/bottle/agedwhiskey, -/obj/item/tracker_electronics, -/obj/item/pen/blue, -/obj/item/pen/green, -/obj/item/pen/red, -/turf/floor/tiled/techfloor/grid, +/obj/effect/decal/cleanable/dirt/visible, +/turf/floor/tiled/dark, /area/map_template/crashed_pod) -"cd" = ( -/obj/structure/closet/crate/large/hydroponics, -/obj/item/seeds/potatoseed, -/obj/item/seeds/potatoseed, -/obj/item/seeds/wheatseed, -/obj/item/seeds/wheatseed, -/obj/item/seeds/orangeseed, -/obj/item/seeds/orangeseed, -/obj/item/seeds/cornseed, -/obj/item/seeds/cornseed, -/obj/item/tool/axe/hatchet, -/obj/item/chems/glass/bucket, -/obj/item/tool/hoe/mini, -/obj/item/plantspray/pests, -/obj/item/plantspray/pests, -/obj/item/plantspray/weeds, -/obj/item/seeds/poppyseed, -/obj/item/seeds/towercap, -/obj/item/seeds/glowbell, -/obj/item/seeds/whitebeetseed, -/obj/item/plants, -/obj/item/seeds/bananaseed, -/turf/floor/tiled/techfloor/grid, +"Zp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, +/obj/machinery/meter, +/turf/wall/r_wall, /area/map_template/crashed_pod) (1,1,1) = {" aa -aa -aa -aa -ab +bR +bb +ax ab ab ab ab -bb ab +ax ab ab ab +ax ab ab "} (2,1,1) = {" -ab -ab -ab -ab -ab -aE -aB -ay +bD +bu +by +aC +bm +DM +kw +Ys be ca bx -bK -ax +ay +ba bV bS ab @@ -1099,138 +1404,138 @@ aq aA aF aN -aS -bg +GT +aB bg bC -bL -bJ -bD -bD +aA bJ +aT +Ar +ax "} (4,1,1) = {" -ab -ab -ai +ac +ae +ay as ay aK aO -ay +bQ aZ bh bE bO -ab -ab -ab +nM +aE +bX ab "} (5,1,1) = {" -ac -ae +bF +aR aj ar ay aH -aV +aB +bL ay -bc bi bt -bR ay -bY -bX +ay +ay +ay ab "} (6,1,1) = {" -ab -ab +bj +aW ak at -ax -aI -ba -ax -bd +ay +aS +aB +bL +ay bk bG bv bB -bF +bv bZ -ax +ab "} (7,1,1) = {" -ab -ab +bj +aW al aG -ax +aA aI +qc aQ -ax -bj +ay bl -bw +nQ bM ay bW cc -ab +ax "} (8,1,1) = {" -ac -ae +Zp +ai am au az aP -aT ay -bc -bm -by -bQ ay ay ay -ab +aU +ay +ay +bH +bY +ax "} (9,1,1) = {" -ab +ac af an av -aD -aU -aW ay +ay +ay +bK bf bn -by +bw bU ay bH bN -ab +ax "} (10,1,1) = {" ac ag ao aw -aC +Ta aL -aX +ay aY bp bo bA bz -bB +ay bI cb ax @@ -1240,13 +1545,13 @@ ab ab ap aJ -ay +Ut aM -aR ay +bc bq -bu br +yo bT ay bP @@ -1254,10 +1559,10 @@ cd ab "} (12,1,1) = {" -aa -ab -ab -ab +aX +bd +aV +aD ab ab ab @@ -1267,7 +1572,7 @@ ax ab ab ab -ab +ax ab ab "} diff --git a/maps/random_ruins/exoplanet_ruins/fountain/fountain_ruin.dm b/maps/random_ruins/exoplanet_ruins/fountain/fountain_ruin.dm index 0a2ae6fd9c5c..e99c60570e0c 100644 --- a/maps/random_ruins/exoplanet_ruins/fountain/fountain_ruin.dm +++ b/maps/random_ruins/exoplanet_ruins/fountain/fountain_ruin.dm @@ -2,7 +2,7 @@ name = "Fountain of Youth" description = "The fountain of youth itself." suffixes = list("fountain/fountain_ruin.dmm") - cost = 2 + cost = 0.5 template_flags = TEMPLATE_FLAG_NO_RUINS | TEMPLATE_FLAG_CLEAR_CONTENTS template_tags = TEMPLATE_TAG_ALIEN diff --git a/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm b/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm index 42ec0eadd5ae..7677b177ff42 100644 --- a/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm +++ b/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm @@ -988,8 +988,7 @@ /obj/machinery/power/solar, /obj/effect/floor_decal/solarpanel, /obj/structure/cable{ - dir = 4; - icon_state = "0-2" + icon_state = "0-4" }, /turf/floor/fixed/alium/airless, /area/map_template/hydrobase/solars) @@ -1773,8 +1772,7 @@ icon_state = "1-2" }, /obj/structure/cable{ - dir = 4; - icon_state = "0-2" + icon_state = "1-4" }, /turf/floor/fixed/alium/airless, /area/map_template/hydrobase/solars) @@ -1797,7 +1795,7 @@ "eL" = ( /obj/machinery/power/tracker, /obj/structure/cable{ - dir = 4 + icon_state = "0-8" }, /turf/floor/concrete, /area/template_noop) @@ -2171,8 +2169,7 @@ /obj/machinery/power/solar, /obj/effect/floor_decal/solarpanel, /obj/structure/cable{ - dir = 4; - icon_state = "0-2" + icon_state = "0-4" }, /obj/structure/cable{ icon_state = "4-8" @@ -2609,6 +2606,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/floor/fixed/alium/airless, /area/map_template/hydrobase/solars) "gE" = ( diff --git a/maps/random_ruins/exoplanet_ruins/monoliths/monoliths.dm b/maps/random_ruins/exoplanet_ruins/monoliths/monoliths.dm index 77f027c0babd..1f8f82994c3f 100644 --- a/maps/random_ruins/exoplanet_ruins/monoliths/monoliths.dm +++ b/maps/random_ruins/exoplanet_ruins/monoliths/monoliths.dm @@ -8,7 +8,7 @@ /obj/structure/monolith name = "monolith" - desc = "An obviously artifical structure of unknown origin. The symbols 'DWNbTX' are engraved on the base." + desc = "An obviously artificial structure of unknown origin. The symbols 'DWNbTX' are engraved on the base." icon = 'icons/obj/structures/monolith.dmi' icon_state = "jaggy1" layer = ABOVE_HUMAN_LAYER diff --git a/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm b/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm index c210e95884c6..cd6082a3b661 100644 --- a/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm +++ b/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm @@ -5442,7 +5442,11 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/structure/closet/secure_closet/hydroponics, +/obj/structure/closet/secure_closet/hydroponics{ + anchored = 1; + locked = 0; + req_access = null + }, /obj/item/chems/glass/bucket, /turf/floor/tiled/techfloor/grid, /area/map_template/colony/hydroponics) @@ -6037,7 +6041,9 @@ tag_exterior_door = "playablecolonymain_exterior_door"; tag_exterior_sensor = "playablecolonymain_sensor_external"; tag_interior_door = "playablecolonymain_interior_door"; - tag_interior_sensor = "playablecolonymain_sensor_interior" + tag_interior_sensor = "playablecolonymain_sensor_interior"; + tag_pump_out_internal = "playablecolonymain_pump_out_internal"; + tag_pump_out_external = "playablecolonymain_pump_out_external" }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ id_tag = "playablecolonymain_pump"; @@ -6223,7 +6229,7 @@ /area/map_template/colony) "lZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 + dir = 4 }, /obj/structure/catwalk, /obj/structure/cable{ @@ -6247,7 +6253,9 @@ pixel_x = 19; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, /obj/structure/catwalk, /obj/structure/cable{ desc = "A flexible superconducting cable for heavy-duty power transfer. It's been labeled 'chaos reigns'."; @@ -6258,9 +6266,6 @@ }, /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/structure/closet/emcloset, /obj/item/clothing/head/helmet/space/emergency, /obj/item/clothing/suit/space/emergency, @@ -6270,7 +6275,7 @@ "mb" = ( /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, -/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/floor/tiled/techfloor, /area/map_template/colony/airlock) "mc" = ( @@ -6315,7 +6320,7 @@ /turf/floor/tiled/dark/monotile, /area/map_template/colony/jail) "mg" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -6978,9 +6983,7 @@ /turf/floor/fake_grass, /area/map_template/colony/hydroponics) "nt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/wall/r_wall, /area/map_template/colony/airlock) "nu" = ( @@ -7211,15 +7214,14 @@ /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ - dir = 8; - id_tag = "playablecolonymain_pump_out_internal"; - power_rating = 25000 - }, /obj/item/radio/intercom{ dir = 4; pixel_x = -22 }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ + id_tag = "playablecolonymain_pump"; + power_rating = 25000 + }, /turf/floor/tiled/techfloor, /area/map_template/colony/airlock) "nP" = ( @@ -7265,8 +7267,7 @@ /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, /obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ - dir = 1; - id_tag = "playablecolonymain_pump"; + id_tag = "playablecolonymain_pump_out_internal"; power_rating = 25000 }, /turf/floor/tiled/techfloor, @@ -7285,8 +7286,7 @@ }, /obj/effect/decal/cleanable/dirt/visible, /obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ - dir = 1; - id_tag = "playablecolonymain_pump"; + id_tag = "playablecolonymain_pump_out_internal"; power_rating = 25000 }, /turf/floor/tiled/techfloor, @@ -7461,16 +7461,6 @@ desc = "A large, unwieldy bolt-action rifle in shoddy condition. Chambered in small caliber, looks far scarier than it is. Vamoos ya varmint!"; name = "anti-varmint rifle" }, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, -/obj/item/ammo_magazine/pistol/small, /obj/machinery/door/window/northright, /obj/structure/window/reinforced{ dir = 4 @@ -7478,6 +7468,107 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/projectile/bullet/rifle, +/obj/item/stock_parts/ammo_box, /turf/floor/concrete, /area/map_template/colony/mineralprocessing) "ok" = ( @@ -7605,9 +7696,7 @@ /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/floor/tiled/techfloor, /area/map_template/colony/airlock) "ov" = ( @@ -7635,7 +7724,7 @@ /obj/effect/wallframe_spawn/reinforced_borosilicate, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 + dir = 10 }, /turf/floor/tiled/techfloor, /area/map_template/colony/airlock) @@ -7650,7 +7739,6 @@ /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, /obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{ - dir = 8; id_tag = "playablecolonymain_pump_out_internal"; power_rating = 25000 }, @@ -7678,7 +7766,9 @@ "oA" = ( /obj/effect/decal/cleanable/dirt/visible, /obj/effect/decal/cleanable/dirt/visible, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, /obj/structure/catwalk, /turf/floor/concrete, /area/map_template/colony/mineralprocessing) @@ -7904,6 +7994,12 @@ }, /turf/floor/fake_grass, /area/map_template/colony/hydroponics) +"Hu" = ( +/obj/machinery/door/firedoor, +/obj/effect/wallframe_spawn/reinforced_borosilicate, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/floor/plating, +/area/map_template/colony/airlock) "Hy" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/power/apc{ @@ -8016,6 +8112,12 @@ "Ot" = ( /turf/floor/tiled/white, /area/map_template/colony/bathroom) +"Rf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/wall/r_wall, +/area/map_template/colony/airlock) "RR" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -8033,6 +8135,14 @@ /obj/item/stack/cable_coil, /turf/floor/tiled/techfloor, /area/map_template/colony/hydroponics) +"VV" = ( +/obj/machinery/door/firedoor, +/obj/effect/wallframe_spawn/reinforced_borosilicate, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/floor/plating, +/area/map_template/colony/airlock) "Xh" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -8862,10 +8972,10 @@ kI kq ky nV -nt +bh lh ow -bh +Rf bh or "} @@ -8906,7 +9016,7 @@ mw nO ou ox -mw +Hu mZ os "} @@ -8947,7 +9057,7 @@ bd lJ mb nS -bh +nt nm os "} @@ -8988,7 +9098,7 @@ aJ lM mg nU -mw +VV nq os "} diff --git a/maps/random_ruins/space_ruins/multi_zas_test.dmm b/maps/random_ruins/space_ruins/multi_zas_test.dmm index a8f32fc94f6e..e90fb1fbc7ab 100644 --- a/maps/random_ruins/space_ruins/multi_zas_test.dmm +++ b/maps/random_ruins/space_ruins/multi_zas_test.dmm @@ -13,13 +13,13 @@ /turf/open, /area/template_noop) "e" = ( -/turf/unsimulated/floor/shuttle_ceiling, +/turf/floor/shuttle_ceiling, /area/template_noop) "f" = ( /obj/abstract/map_data{ height = 3 }, -/turf/unsimulated/floor/shuttle_ceiling, +/turf/floor/shuttle_ceiling, /area/template_noop) (1,1,1) = {" diff --git a/maps/shaded_hills/shaded_hills-dungeon.dmm b/maps/shaded_hills/shaded_hills-dungeon.dmm index 6d1ab918e6f6..52330b32d366 100644 --- a/maps/shaded_hills/shaded_hills-dungeon.dmm +++ b/maps/shaded_hills/shaded_hills-dungeon.dmm @@ -26,7 +26,7 @@ /area/shaded_hills/caves/dungeon/poi) "cp" = ( /obj/structure/table/wood/ebony, -/obj/item/bladed/knife, +/obj/item/bladed/knife/iron, /turf/floor/path/running_bond/basalt, /area/shaded_hills/caves/dungeon/poi) "cM" = ( @@ -213,7 +213,7 @@ /area/shaded_hills/caves/dungeon/poi) "ob" = ( /obj/structure/table/wood/ebony, -/obj/item/bladed/knife, +/obj/item/bladed/knife/iron, /turf/floor/path/herringbone/basalt, /area/shaded_hills/caves/dungeon/poi) "ok" = ( @@ -406,7 +406,7 @@ "BG" = ( /obj/structure/table/wood/ebony, /obj/item/stack/material/thread/mapped/cotton/thirty, -/obj/item/bladed/knife, +/obj/item/bladed/knife/iron, /turf/floor/path/running_bond/basalt, /area/shaded_hills/caves/dungeon/poi) "Cu" = ( diff --git a/maps/tradeship/hud.dmi b/maps/tradeship/hud.dmi index 9c7a81cf7816..c0f438fff7a8 100644 Binary files a/maps/tradeship/hud.dmi and b/maps/tradeship/hud.dmi differ diff --git a/maps/tradeship/jobs/civilian.dm b/maps/tradeship/jobs/civilian.dm index edb03def44ac..fe0f2d50ca66 100644 --- a/maps/tradeship/jobs/civilian.dm +++ b/maps/tradeship/jobs/civilian.dm @@ -8,3 +8,23 @@ "Passenger" ) event_categories = list(ASSIGNMENT_GARDENER, ASSIGNMENT_JANITOR) + +/datum/job/tradeship_helmsman + title = "Helmsman" + hud_icon = 'maps/tradeship/hud.dmi' + total_positions = 1 + spawn_positions = 1 + supervisors = "the Captain, so don't mess up!" + outfit_type = /decl/outfit/job/tradeship/hand + min_skill = list( + SKILL_LITERACY = SKILL_ADEPT, + SKILL_PILOT = SKILL_ADEPT + ) + max_skill = list( + SKILL_PILOT = SKILL_MAX + ) + skill_points = 10 + department_types = list(/decl/department/civilian) + economic_power = 1 + access = list(access_bridge) + minimal_access = list(access_bridge) diff --git a/maps/tradeship/tradeship-0.dmm b/maps/tradeship/tradeship-0.dmm index 625326ea6258..1e1c08af1588 100644 --- a/maps/tradeship/tradeship-0.dmm +++ b/maps/tradeship/tradeship-0.dmm @@ -1325,7 +1325,7 @@ }, /obj/effect/decal/cleanable/dirt/visible, /obj/item/backpack/dufflebag, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/item/chems/glass/bucket, /obj/machinery/firealarm{ pixel_y = 21 @@ -1518,7 +1518,7 @@ /obj/item/assembly/mousetrap, /obj/item/radio, /obj/item/bag/trash, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/item/caution, /obj/item/caution, /obj/item/caution, diff --git a/maps/tradeship/tradeship-2.dmm b/maps/tradeship/tradeship-2.dmm index 0084e4d8d712..d00b923a361d 100644 --- a/maps/tradeship/tradeship-2.dmm +++ b/maps/tradeship/tradeship-2.dmm @@ -2009,7 +2009,7 @@ pixel_x = 3 }, /obj/item/chems/condiment/enzyme, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/item/chems/cooking_vessel/pot, /turf/floor/tiled, /area/ship/trade/crew/kitchen) @@ -4759,7 +4759,7 @@ /obj/machinery/light, /obj/machinery/optable, /obj/item/chems/drinks/glass2/coffeecup/britcup, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /turf/floor/tiled/white, /area/ship/trade/crew/medbay) "op" = ( @@ -5672,7 +5672,7 @@ /obj/random/clothing, /obj/random/clothing, /obj/random/clothing, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/item/firstaid/regular, /turf/floor/tiled/freezer, /area/ship/trade/crew/wash) diff --git a/maps/tradeship/tradeship.dm b/maps/tradeship/tradeship.dm index 739a2948bae7..e829a3299185 100644 --- a/maps/tradeship/tradeship.dm +++ b/maps/tradeship/tradeship.dm @@ -39,7 +39,11 @@ #include "../../mods/mobs/dionaea/_dionaea.dme" #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/bayliens/_bayliens.dme" + #include "../../mods/species/tajaran/_tajaran.dme" + #include "../../mods/species/unathi/_unathi.dme" + #include "../../mods/species/skrell/_skrell.dme" + #include "../../mods/species/adherent/_adherent.dme" + #include "../../mods/species/tritonian/_tritonian.dme" #include "../../mods/species/drakes/_drakes.dme" #include "../../mods/species/neoavians/_neoavians.dme" #include "../../mods/species/serpentid/_serpentid.dme" diff --git a/maps/tradeship/tradeship_shuttles.dm b/maps/tradeship/tradeship_shuttles.dm index 7df1f80cab5d..c309ad625a2d 100644 --- a/maps/tradeship/tradeship_shuttles.dm +++ b/maps/tradeship/tradeship_shuttles.dm @@ -15,7 +15,7 @@ /datum/shuttle/autodock/overmap/rescue name = "Rescue Shuttle" shuttle_area = /area/ship/trade/shuttle/rescue - dock_target = "rescue_shuttle" + dock_target = "tradeship_rescue_shuttle" current_location = "nav_tradeship_starboard_dock_rescue" //In case multiple shuttles can dock at a location, diff --git a/maps/~mapsystem/maps.dm b/maps/~mapsystem/maps.dm index 4347eed54197..84a5e81f276c 100644 --- a/maps/~mapsystem/maps.dm +++ b/maps/~mapsystem/maps.dm @@ -2,8 +2,8 @@ var/global/datum/map/using_map = new USING_MAP_DATUM var/global/list/all_maps = list() var/global/list/votable_maps = list() -var/global/const/MAP_HAS_BRANCH = 1 //Branch system for occupations, togglable -var/global/const/MAP_HAS_RANK = 2 //Rank system, also togglable +var/global/const/MAP_HAS_BRANCH = 1 //Branch system for occupations, toggleable +var/global/const/MAP_HAS_RANK = 2 //Rank system, also toggleable /proc/initialise_map_list() for(var/map_type in subtypesof(/datum/map)) diff --git a/mods/content/corporate/clothing/suit/ponchos.dm b/mods/content/corporate/clothing/suit/ponchos.dm index f8f204560444..17f39ecf2d04 100644 --- a/mods/content/corporate/clothing/suit/ponchos.dm +++ b/mods/content/corporate/clothing/suit/ponchos.dm @@ -1,10 +1,10 @@ -/obj/item/clothing/suit/poncho/roles/science +/obj/item/clothing/suit/poncho/science name = "science poncho" desc = "A simple, comfortable cloak without sleeves. This one is white with a few bottle green stripes, corporate colors." bodytype_equip_flags = null icon = 'mods/content/corporate/icons/clothing/suit/sci_poncho.dmi' -/obj/item/clothing/suit/poncho/roles/science/nanotrasen +/obj/item/clothing/suit/poncho/science/nanotrasen name = "\improper NanoTrasen poncho" desc = "A simple, comfortable cloak without sleeves. This one is white with a few red stripes, colors of NanoTrasen. Go NanoTrasen!" icon = 'mods/content/corporate/icons/clothing/suit/nt_poncho.dmi' diff --git a/mods/content/corporate/datum/loadout.dm b/mods/content/corporate/datum/loadout.dm index 855177a3446a..eee71e7c71b8 100644 --- a/mods/content/corporate/datum/loadout.dm +++ b/mods/content/corporate/datum/loadout.dm @@ -103,7 +103,7 @@ /decl/loadout_option/suit/nanotrasen_poncho name = "poncho, NanoTrasen" - path = /obj/item/clothing/suit/poncho/roles/science/nanotrasen + path = /obj/item/clothing/suit/poncho/science/nanotrasen uid = "gear_suit_corpponcho" /decl/loadout_option/suit/corp_jacket @@ -121,7 +121,7 @@ /decl/loadout_option/suit/science_poncho name = "poncho, science" - path = /obj/item/clothing/suit/poncho/roles/science + path = /obj/item/clothing/suit/poncho/science uid = "gear_suit_corpponcho_science" /decl/loadout_option/suit/hoodie_nt diff --git a/mods/content/corporate/items/medals.dm b/mods/content/corporate/items/medals.dm index 646bbcdea407..136cc53f5cd0 100644 --- a/mods/content/corporate/items/medals.dm +++ b/mods/content/corporate/items/medals.dm @@ -15,5 +15,5 @@ /obj/item/clothing/medal/nanotrasen/bronze name = "corporate sciences medal" - desc = "A bronze medal awarded to employees for signifigant contributions to the fields of science or engineering." + desc = "A bronze medal awarded to employees for significant contributions to the fields of science or engineering." icon = 'mods/content/corporate/icons/clothing/accessories/medal_bronze.dmi' diff --git a/mods/content/dungeon_loot/subtypes/exosuit.dm b/mods/content/dungeon_loot/subtypes/exosuit.dm index 44a04ae3a75c..29ab815a1196 100644 --- a/mods/content/dungeon_loot/subtypes/exosuit.dm +++ b/mods/content/dungeon_loot/subtypes/exosuit.dm @@ -92,7 +92,7 @@ /obj/structure/loot_pile/exosuit/explorer name = "exploration exosuit wreckage" - desc = "The ruins of some unfortunate exploration exosuit. Perhaps something is salvagable." + desc = "The ruins of some unfortunate exploration exosuit. Perhaps something is salvageable." /obj/structure/loot_pile/exosuit/explorer/get_common_loot() var/static/list/common_loot = list( @@ -118,7 +118,7 @@ /obj/structure/loot_pile/exosuit/heavy name = "heavy exosuit wreckage" - desc = "The ruins of some unfortunate heavy exosuit. Perhaps something is salvagable." + desc = "The ruins of some unfortunate heavy exosuit. Perhaps something is salvageable." /obj/structure/loot_pile/exosuit/heavy/get_common_loot() var/static/list/common_loot = list( @@ -144,7 +144,7 @@ /obj/structure/loot_pile/exosuit/light name = "light exosuit wreckage" - desc = "The ruins of some unfortunate light exosuit. Perhaps something is salvagable." + desc = "The ruins of some unfortunate light exosuit. Perhaps something is salvageable." /obj/structure/loot_pile/exosuit/light/get_common_loot() var/static/list/common_loot = list( diff --git a/mods/content/dungeon_loot/subtypes/maint.dm b/mods/content/dungeon_loot/subtypes/maint.dm index cea9732ac81c..dd04faa5a42f 100644 --- a/mods/content/dungeon_loot/subtypes/maint.dm +++ b/mods/content/dungeon_loot/subtypes/maint.dm @@ -30,7 +30,7 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/breath, - /obj/item/chems/glass/rag, + /obj/item/chems/rag, /obj/item/food/junk/liquidfood, /obj/item/secure_storage/briefcase, /obj/item/briefcase, diff --git a/mods/content/fantasy/datum/cultures.dm b/mods/content/fantasy/datum/cultures.dm index ae74081e827a..f7d0ad5b0bc3 100644 --- a/mods/content/fantasy/datum/cultures.dm +++ b/mods/content/fantasy/datum/cultures.dm @@ -3,7 +3,7 @@ description = "The Splinter Kingdoms are a disparate mish-mash of regional powers, feudal warlords, and more organized \ settlements within the space once claimed by the Imperial Aegis. When the Aegis collapsed, several hundred years ago, the \ resulting wars and squabbling took decades to settle, and in many places the tensions and conflicts still run hot. Most of \ - the Splinter Kingdoms emulate the peasant-noble social heirarchies of the Aegis, but a variety of other forms of governance \ + the Splinter Kingdoms emulate the peasant-noble social hierarchies of the Aegis, but a variety of other forms of governance \ and society can be found." uid = "heritage_fantasy_splinter" diff --git a/mods/content/government/away_sites/icarus/icarus.dm b/mods/content/government/away_sites/icarus/icarus.dm index bd1b5e575841..7715e42d5eca 100644 --- a/mods/content/government/away_sites/icarus/icarus.dm +++ b/mods/content/government/away_sites/icarus/icarus.dm @@ -38,7 +38,7 @@ /datum/map_template/ruin/away_site/icarus name = "Fallen Icarus" - description = "The crashlanding site of the SEV Icarus." + description = "The crash-landing site of the SEV Icarus." prefix = "mods/content/government/away_sites/" suffixes = list("icarus/icarus-1.dmm", "icarus/icarus-2.dmm") cost = 2 @@ -78,7 +78,7 @@ /obj/item/disk/icarus name = "black box backup disk" - desc = "Digital storage. Inscription says: \"Deliver to Sol Goverment Expeditionary Corps Command!\". Content is encrypted with quantum crypthography methods." + desc = "Digital storage. Inscription says: \"Deliver to Sol Government Expeditionary Corps Command!\". Content is encrypted with quantum cryptography methods." color = COLOR_GRAY40 label = "label_warning" /obj/item/paper/icarus/log diff --git a/mods/content/modern_earth/datum/religions.dm b/mods/content/modern_earth/datum/religions.dm index a52d2d252f38..d241f9a86bb7 100644 --- a/mods/content/modern_earth/datum/religions.dm +++ b/mods/content/modern_earth/datum/religions.dm @@ -20,7 +20,7 @@ /decl/background_detail/religion/sikh name = "Sikhsm" - description = "An Indian monotheistic religion based on the spiritual teachings of Guru Nanak and the nine Sikh gurus that succeeded him. Someone who practicies Sikhism is called a Sikh." + description = "An Indian monotheistic religion based on the spiritual teachings of Guru Nanak and the nine Sikh gurus that succeeded him. Someone who practices Sikhism is called a Sikh." uid = "religion_sikhsm" /decl/background_detail/religion/muslim diff --git a/mods/content/pheromones/pheromone_implant.dm b/mods/content/pheromones/pheromone_implant.dm index 961c4755d5d5..a9e16ef2faf0 100644 --- a/mods/content/pheromones/pheromone_implant.dm +++ b/mods/content/pheromones/pheromone_implant.dm @@ -1,6 +1,6 @@ /obj/item/implant/pheromone name = "pheromone implant" - desc = "A civilian grade implant for communicating with Indrel via pheromones." + desc = "A civilian grade implant for communicating via pheromones." origin_tech = "{'materials':1,'biotech':1}" /obj/item/implanter/pheromone diff --git a/mods/content/pheromones/pheromone_mob.dm b/mods/content/pheromones/pheromone_mob.dm index 776e978ce34c..fef81e3e234b 100644 --- a/mods/content/pheromones/pheromone_mob.dm +++ b/mods/content/pheromones/pheromone_mob.dm @@ -21,7 +21,7 @@ /obj/item/organ/internal/pheromone_gland name = "pheromone gland" - desc = "A miscellenaous lump of flesh full of chemicals." + desc = "A miscellaneous lump of flesh full of chemicals." icon_state = "stomach" organ_tag = BP_PHEROMONE_GLAND parent_organ = BP_CHEST diff --git a/mods/content/psionics/datum/antagonists/foundation.dm b/mods/content/psionics/datum/antagonists/foundation.dm index 7877dfd50617..fd6b15b0bde7 100644 --- a/mods/content/psionics/datum/antagonists/foundation.dm +++ b/mods/content/psionics/datum/antagonists/foundation.dm @@ -48,6 +48,6 @@ /obj/item/radio/headset/foundation name = "\improper Foundation radio headset" - desc = "The headeset of the occult cavalry." + desc = "The headset of the occult cavalry." icon = 'icons/obj/items/device/radio/headsets/headset_command.dmi' encryption_keys = list(/obj/item/encryptionkey/ert) diff --git a/mods/content/psionics/machines/psimeter.dm b/mods/content/psionics/machines/psimeter.dm index b3abc2cb9c58..8266066e7e13 100644 --- a/mods/content/psionics/machines/psimeter.dm +++ b/mods/content/psionics/machines/psimeter.dm @@ -42,30 +42,22 @@ popup.set_content(jointext(dat,null)) popup.open() -/obj/machinery/psi_meter/Topic(href, href_list) +/obj/machinery/psi_meter/OnTopic(mob/user, href_list) . = ..() - if(!.) - - if(!issilicon(usr) && !Adjacent(usr)) - return FALSE - - var/refresh - if(href_list["print"]) - if(last_assay) - var/obj/item/paper/P = new(loc) - P.name = "paper - Psi-Assay ([last_assayed.name])" - P.info = jointext(last_assay - last_assay[last_assay.len],null) // Last line is 'print | clear' link line. - return TRUE - - if(href_list["clear"]) - last_assay = null - refresh = TRUE - else if(href_list["assay"]) - last_assayed = locate(href_list["assay"]) - if(istype(last_assayed)) - last_assayed.show_psi_assay(usr, src) - refresh = TRUE - - if(refresh) - interact(usr) - return TRUE + if(.) + return + if(href_list["print"]) + if(last_assay) + var/obj/item/paper/P = new(loc) + P.name = "paper - Psi-Assay ([last_assayed.name])" + P.info = jointext(last_assay - last_assay[last_assay.len],null) // Last line is 'print | clear' link line. + return TOPIC_HANDLED + if(href_list["clear"]) + last_assay = null + return TOPIC_REFRESH + else if(href_list["assay"]) + last_assayed = locate(href_list["assay"]) + if(istype(last_assayed)) + last_assayed.show_psi_assay(usr, src) + return TOPIC_REFRESH + return TOPIC_NOACTION \ No newline at end of file diff --git a/mods/content/psionics/machines/psimonitor.dm b/mods/content/psionics/machines/psimonitor.dm index de83ed6b114f..600966267172 100644 --- a/mods/content/psionics/machines/psimonitor.dm +++ b/mods/content/psionics/machines/psimonitor.dm @@ -29,45 +29,44 @@ return TRUE return FALSE -/obj/machinery/psi_monitor/Topic(href, href_list) - +/obj/machinery/psi_monitor/OnTopic(mob/user, href_list) . = ..() - if(!.) - - if(href_list["login"]) - - var/obj/item/card/id/ID = usr.GetIdCard() - if(!ID || !allowed(usr)) - to_chat(usr, "Access denied.") - else - authorized = "[ID.registered_name] ([ID.assignment])" - . = 1 - - else if(href_list["logout"]) - authorized = FALSE - . = 1 - - else if(href_list["show_violations"]) - show_violations = (href_list["show_violations"] == "1") - . = 1 - - else if(href_list["remove_violation"]) - var/remove_ind = text2num(href_list["remove_violation"]) - if(remove_ind > 0 && remove_ind <= psi_violations.len) - psi_violations.Cut(remove_ind, remove_ind++) - . = 1 - - else if(href_list["change_mode"]) - var/obj/item/implant/psi_control/implant = locate(href_list["change_mode"]) - if(implant.imp_in && !implant.malfunction) - var/choice = input("Select a new implant mode.", "Psi Dampener") as null|anything in list(PSI_IMPLANT_AUTOMATIC, PSI_IMPLANT_SHOCK, PSI_IMPLANT_WARN, PSI_IMPLANT_LOG, PSI_IMPLANT_DISABLED) - if(choice && implant && implant.imp_in && !implant.malfunction) - implant.psi_mode = choice - implant.update_functionality() - . = 1 - - if(. && usr) - interact(usr) + if(.) + return + + if(href_list["login"]) + var/obj/item/card/id/ID = user.GetIdCard() + if(!ID || !allowed(user)) + to_chat(user, "Access denied.") + return TOPIC_HANDLED + else + authorized = "[ID.registered_name] ([ID.assignment])" + return TOPIC_REFRESH + + else if(href_list["logout"]) + authorized = FALSE + return TOPIC_REFRESH + + else if(href_list["show_violations"]) + show_violations = (href_list["show_violations"] == "1") + return TOPIC_REFRESH + + else if(href_list["remove_violation"]) + var/remove_ind = text2num(href_list["remove_violation"]) + if(remove_ind > 0 && remove_ind <= psi_violations.len) + psi_violations.Cut(remove_ind, remove_ind++) + return TOPIC_REFRESH + + else if(href_list["change_mode"]) + var/obj/item/implant/psi_control/implant = locate(href_list["change_mode"]) + if(implant.imp_in && !implant.malfunction) + var/choice = input("Select a new implant mode.", "Psi Dampener") as null|anything in list(PSI_IMPLANT_AUTOMATIC, PSI_IMPLANT_SHOCK, PSI_IMPLANT_WARN, PSI_IMPLANT_LOG, PSI_IMPLANT_DISABLED) + if(choice && implant && implant.imp_in && !implant.malfunction) + implant.psi_mode = choice + implant.update_functionality() + return TOPIC_REFRESH + return TOPIC_HANDLED + return TOPIC_NOACTION /obj/machinery/psi_monitor/interface_interact(var/mob/user) interact(user) diff --git a/mods/content/scaling_descriptors.dm b/mods/content/scaling_descriptors.dm index 5c4178e35190..b6857e1b6752 100644 --- a/mods/content/scaling_descriptors.dm +++ b/mods/content/scaling_descriptors.dm @@ -1,3 +1,7 @@ +#ifndef MODPACK_SCALING_MODIFIERS +#define MODPACK_SCALING_MODIFIERS +#endif + // These values were reverse-engineered from Polaris, where they apparently // took quite a lot of fiddling to get looking nice. Cheers to whoever did that. /decl/bodytype diff --git a/mods/content/supermatter/datums/sm_codex.dm b/mods/content/supermatter/datums/sm_codex.dm index c0d5c160faeb..72810edb7a41 100644 --- a/mods/content/supermatter/datums/sm_codex.dm +++ b/mods/content/supermatter/datums/sm_codex.dm @@ -15,7 +15,7 @@
\ Touching the supermatter will result in *instant death*, with no corpse left behind! You can drag the supermatter, but anything else will kill you. \ It is advised to obtain a genetic backup before trying to drag it." - antag_text = "Exposing the supermatter to oxygen or vaccum will cause it to start rapidly heating up. Sabotaging the supermatter and making it explode will \ + antag_text = "Exposing the supermatter to oxygen or vacuum will cause it to start rapidly heating up. Sabotaging the supermatter and making it explode will \ cause a period of lag as the explosion is processed by the server, as well as irradiating the entire station and causing hallucinations to happen. \ Wearing radiation equipment will protect you from most of the delamination effects sans explosion." available_to_map_tech_level = MAP_TECH_LEVEL_SPACE \ No newline at end of file diff --git a/mods/content/supermatter/items/sm_grenade.dm b/mods/content/supermatter/items/sm_grenade.dm index b7f3186e666f..6ee79e079bfb 100644 --- a/mods/content/supermatter/items/sm_grenade.dm +++ b/mods/content/supermatter/items/sm_grenade.dm @@ -51,7 +51,7 @@ /datum/uplink_item/item/grenades/supermatters name = "5x Supermatter Grenades" - desc = "These grenades contains a small supermatter shard which will delaminate upon activation and pull in nearby objects, irradiate lifeforms, and eventually explode." + desc = "These grenades contain a small supermatter shard which will delaminate upon activation and pull in nearby objects, irradiate lifeforms, and eventually explode." item_cost = 60 antag_roles = list(/decl/special_role/mercenary) path = /obj/item/box/supermatters diff --git a/mods/content/supermatter/overrides/sm_meteor.dm b/mods/content/supermatter/overrides/sm_meteor.dm index 449ad80fbb91..f5bba645c189 100644 --- a/mods/content/supermatter/overrides/sm_meteor.dm +++ b/mods/content/supermatter/overrides/sm_meteor.dm @@ -1,5 +1,5 @@ /obj/effect/meteor/destroyer/supermatter name = "supermatter shard" - desc = "Oh god, what will be next..?" + desc = "Oh God, what will be next...?" icon = 'icons/obj/supermatter_32.dmi' icon_state = "supermatter" diff --git a/mods/content/xenobiology/_xenobiology.dm b/mods/content/xenobiology/_xenobiology.dm index aa3c42d34802..ab4b0f9da7ae 100644 --- a/mods/content/xenobiology/_xenobiology.dm +++ b/mods/content/xenobiology/_xenobiology.dm @@ -1,4 +1,9 @@ #define isslime(X) istype(X, /mob/living/slime) +#define SPECIES_GOLEM "Golem" /decl/modpack/xenobiology name = "Xenobiology" + +/decl/modpack/xenobiology/initialize() + . = ..() + SSmodpacks.default_submap_blacklisted_species += SPECIES_GOLEM diff --git a/mods/content/xenobiology/_xenobiology.dme b/mods/content/xenobiology/_xenobiology.dme index 1591ea3f458a..4057d6b485bd 100644 --- a/mods/content/xenobiology/_xenobiology.dme +++ b/mods/content/xenobiology/_xenobiology.dme @@ -53,5 +53,7 @@ #include "slime\slime_reagents.dm" #include "slime\slime_surgery.dm" #include "slime\slime_update_icon.dm" +#include "species\golem.dm" +#include "species\golem_organs.dm" // END_INCLUDE #endif \ No newline at end of file diff --git a/mods/content/xenobiology/slime/_slime.dm b/mods/content/xenobiology/slime/_slime.dm index 60c12cb89e3d..71fda53a3319 100644 --- a/mods/content/xenobiology/slime/_slime.dm +++ b/mods/content/xenobiology/slime/_slime.dm @@ -18,7 +18,7 @@ status_flags = CANPARALYSE|CANPUSH butchery_data = null ai = /datum/mob_controller/slime - hud_used = /datum/hud/animal + hud_used = /datum/hud nutrition = 800 var/is_adult = FALSE @@ -296,9 +296,6 @@ /mob/living/slime/check_has_mouth() return FALSE -/mob/living/slime/set_nutrition(amt) - ..() - /mob/living/slime/get_hydration() return get_nutrition() diff --git a/mods/content/xenobiology/slime/items.dm b/mods/content/xenobiology/slime/items.dm index 0af184e22c39..da4a21eff12c 100644 --- a/mods/content/xenobiology/slime/items.dm +++ b/mods/content/xenobiology/slime/items.dm @@ -61,7 +61,7 @@ /obj/effect/golemrune anchored = TRUE - desc = "a strange rune used to create golems. It glows when it can be activated." + desc = "A strange rune used to create golems. It glows when it can be activated." name = "rune" icon = 'icons/obj/rune.dmi' icon_state = "golem" diff --git a/code/modules/species/station/golem.dm b/mods/content/xenobiology/species/golem.dm similarity index 100% rename from code/modules/species/station/golem.dm rename to mods/content/xenobiology/species/golem.dm diff --git a/code/modules/organs/internal/species/golem.dm b/mods/content/xenobiology/species/golem_organs.dm similarity index 100% rename from code/modules/organs/internal/species/golem.dm rename to mods/content/xenobiology/species/golem_organs.dm diff --git a/mods/gamemodes/cult/mobs/constructs/constructs.dm b/mods/gamemodes/cult/mobs/constructs/constructs.dm index 1eb37f6980bd..ce9913eb9f33 100644 --- a/mods/gamemodes/cult/mobs/constructs/constructs.dm +++ b/mods/gamemodes/cult/mobs/constructs/constructs.dm @@ -26,7 +26,7 @@ bleed_colour = "#331111" gene_damage = -1 butchery_data = /decl/butchery_data/occult - hud_used = /datum/hud/construct + hud_used = /datum/hud/animal/construct z_flags = ZMM_MANGLE_PLANES glowing_eyes = TRUE ai = /datum/mob_controller/aggressive/construct @@ -109,7 +109,7 @@ construct_spells = list( /decl/ability/cult/construct/forcewall/lesser ) - hud_used = /datum/hud/construct/juggernaut + hud_used = /datum/hud/animal/construct/juggernaut base_movement_delay = 2 ai = /datum/mob_controller/aggressive/construct_armoured @@ -167,7 +167,7 @@ construct_spells = list( /decl/ability/cult/construct/shift ) - hud_used = /datum/hud/construct/wraith + hud_used = /datum/hud/animal/construct/wraith /obj/item/natural_weapon/wraith name = "wicked blade" @@ -203,7 +203,7 @@ /decl/ability/cult/construct/soulstone, /decl/ability/cult/construct/pylon ) - hud_used = /datum/hud/construct/artificer + hud_used = /datum/hud/animal/construct/artificer base_movement_delay = 0 /obj/item/natural_weapon/cult_builder @@ -234,7 +234,7 @@ construct_spells = list( /decl/ability/cult/construct/lesser ) - hud_used = /datum/hud/construct/juggernaut + hud_used = /datum/hud/animal/construct/juggernaut base_movement_delay = 2 ai = /datum/mob_controller/aggressive/construct_armoured @@ -252,7 +252,7 @@ natural_weapon = /obj/item/natural_weapon/harvester environment_smash = 1 see_in_dark = 7 - hud_used = /datum/hud/construct/harvester + hud_used = /datum/hud/animal/construct/harvester construct_spells = list( /decl/ability/cult/construct/harvest ) @@ -274,16 +274,4 @@ /mob/living/simple_animal/construct/handle_regular_hud_updates() . = ..() if(.) - if(fire) - fire.icon_state = "fire[!!GET_HUD_ALERT(src, /decl/hud_element/condition/fire)]" disable_abilities(purge) - if(healths) - switch(current_health) - if(250 to INFINITY) healths.icon_state = "health0" - if(208 to 249) healths.icon_state = "health1" - if(167 to 207) healths.icon_state = "health2" - if(125 to 166) healths.icon_state = "health3" - if(84 to 124) healths.icon_state = "health4" - if(42 to 83) healths.icon_state = "health5" - if(1 to 41) healths.icon_state = "health6" - else healths.icon_state = "health7" diff --git a/mods/gamemodes/cult/narsie.dm b/mods/gamemodes/cult/narsie.dm index 11ea55d13026..ef8281558ddc 100644 --- a/mods/gamemodes/cult/narsie.dm +++ b/mods/gamemodes/cult/narsie.dm @@ -49,8 +49,8 @@ var/global/list/narsie_list = list() STOP_PROCESSING(SSobj, src) . = ..() -/obj/effect/narsie/Process_Spacemove(allow_movement) - return TRUE +/obj/effect/narsie/is_space_movement_permitted(allow_movement) + return SPACE_MOVE_PERMITTED // See comment at the top of the file for why this sections of this are commented out. /obj/effect/narsie/on_update_icon() diff --git a/mods/gamemodes/cult/runes.dm b/mods/gamemodes/cult/runes.dm index c54cb016914f..c8e47d2bed60 100644 --- a/mods/gamemodes/cult/runes.dm +++ b/mods/gamemodes/cult/runes.dm @@ -129,7 +129,7 @@ if(!cult.can_become_antag(target.mind, 1)) to_chat(target, SPAN_DANGER("Are you going insane?")) else - to_chat(target, SPAN_OCCULT("Do you want to join the cult of Nar'Sie? You can choose to ignore offer... Join the cult.")) + to_chat(target, SPAN_OCCULT("Do you want to join the cult of Nar'Sie? You can choose to ignore the offer... Join the cult.")) spamcheck = 1 spawn(40) @@ -150,10 +150,10 @@ to_chat(target, SPAN_OCCULT("Your mind turns to ash as the burning flames engulf your very soul and images of an unspeakable horror begin to bombard the last remnants of mental resistance.")) target.take_overall_damage(0, 10) -/obj/effect/rune/convert/Topic(href, href_list) - if(href_list["join"] && usr.loc == loc && !iscultist(usr)) +/obj/effect/rune/convert/OnTopic(mob/user, href_list) + if(href_list["join"] && user.loc == loc && !iscultist(user)) var/decl/special_role/cult = GET_DECL(/decl/special_role/cultist) - cult.add_antagonist(usr.mind, ignore_role = 1, do_not_equip = 1) + cult.add_antagonist(user.mind, ignore_role = 1, do_not_equip = 1) /obj/effect/rune/teleport cultname = "teleport" @@ -214,16 +214,16 @@ return destination = sanitize(input) -/obj/effect/rune/teleport/Topic(href, href_list) - if(usr.loc != src) +/obj/effect/rune/teleport/OnTopic(mob/user, href_list) + if(user.loc != src) return if(href_list["target"]) var/obj/effect/rune/teleport/targ = locate(href_list["target"]) if(istype(targ)) // Checks for null, too - usr.forceMove(targ) - targ.showOptions(usr) + user.forceMove(targ) + targ.showOptions(user) else if(href_list["leave"]) - leaveRune(usr) + leaveRune(user) /obj/effect/rune/teleport/proc/showOptions(var/mob/living/user) var/list/t = list() diff --git a/mods/gamemodes/cult/structures.dm b/mods/gamemodes/cult/structures.dm index 9f39d61522d6..38bfdda57c09 100644 --- a/mods/gamemodes/cult/structures.dm +++ b/mods/gamemodes/cult/structures.dm @@ -112,7 +112,7 @@ /obj/structure/grille/cult name = "cult grille" - desc = "A matrice built out of an unknown material, with some sort of force field blocking air around it." + desc = "A matrix built out of an unknown material, with some sort of force field blocking air around it." material = /decl/material/solid/stone/cult /obj/structure/grille/cult/CanPass(atom/movable/mover, turf/target, height = 1.5, air_group = 0) diff --git a/mods/gamemodes/heist/heist_base.dmm b/mods/gamemodes/heist/heist_base.dmm index 71eeb7977d42..5a445c37f40b 100644 --- a/mods/gamemodes/heist/heist_base.dmm +++ b/mods/gamemodes/heist/heist_base.dmm @@ -112,7 +112,7 @@ /turf/unsimulated/floor/plating, /area/map_template/syndicate_mothership/raider_base) "aA" = ( -/obj/structure/aliumizer, +/obj/abstract/modpack_compat/aliumizer, /turf/unsimulated/floor/asteroid, /area/map_template/syndicate_mothership/raider_base) "aB" = ( @@ -604,7 +604,7 @@ /area/map_template/syndicate_mothership/raider_base) "cc" = ( /obj/structure/table/laminate, -/obj/item/chems/glass/rag, +/obj/item/chems/rag, /obj/random/loot, /turf/unsimulated/floor/laminate, /area/map_template/syndicate_mothership/raider_base) @@ -737,7 +737,7 @@ /obj/machinery/door/blast/regular/open{ id_tag = "SkipjackShuttersNorth"; name = "Blast Doors"; - + }, /obj/effect/wallframe_spawn/reinforced/titanium, /obj/effect/paint/brown, @@ -903,7 +903,7 @@ /area/map_template/skipjack_station/start) "cT" = ( /obj/structure/rack, -/obj/random/hardsuit, +/obj/random/hardsuit/heist, /obj/item/clothing/glasses/thermal/plain/monocle, /turf/floor/shuttle/red, /area/map_template/skipjack_station/start) @@ -920,7 +920,7 @@ /area/map_template/skipjack_station/start) "cX" = ( /obj/structure/rack, -/obj/random/hardsuit, +/obj/random/hardsuit/heist, /obj/item/clothing/head/pirate, /obj/item/gun/launcher/money, /turf/floor/shuttle/red, @@ -1104,7 +1104,7 @@ dir = 4; id_tag = "SkipjackShuttersWest"; name = "Skipjack Shutters"; - + }, /obj/effect/wallframe_spawn/reinforced/titanium, /obj/effect/paint/brown, @@ -1131,7 +1131,7 @@ dir = 8; id_tag = "SkipjackShuttersEast"; name = "Skipjack Shutters"; - + }, /obj/effect/wallframe_spawn/reinforced/titanium, /obj/effect/paint/brown, @@ -1203,7 +1203,7 @@ dir = 4; id_tag = "SkipjackShuttersWest"; name = "Skipjack Shutters"; - + }, /obj/effect/wallframe_spawn/reinforced/titanium, /turf/floor/plating, diff --git a/mods/gamemodes/ninja/maps/ninja_base.dmm b/mods/gamemodes/ninja/maps/ninja_base.dmm index 828d006063ec..9b4d2bb2ad4f 100644 --- a/mods/gamemodes/ninja/maps/ninja_base.dmm +++ b/mods/gamemodes/ninja/maps/ninja_base.dmm @@ -2,17 +2,10 @@ "ac" = ( /turf/unsimulated/floor/snow, /area/map_template/ninja_dojo/dojo) -"ad" = ( -/turf/unsimulated/floor/snow, -/area/map_template/ninja_dojo/dojo) "ae" = ( /obj/effect/floor_decal/asteroid, /turf/unsimulated/floor/snow, /area/map_template/ninja_dojo/dojo) -"af" = ( -/obj/effect/floor_decal/asteroid, -/turf/unsimulated/floor/snow, -/area/map_template/ninja_dojo/dojo) "ag" = ( /obj/structure/flora/tree/dead, /turf/unsimulated/floor/snow, @@ -21,10 +14,6 @@ /obj/structure/flora/tree/pine, /turf/unsimulated/floor/snow, /area/map_template/ninja_dojo/dojo) -"ai" = ( -/obj/structure/flora/tree/dead, -/turf/unsimulated/floor/snow, -/area/map_template/ninja_dojo/dojo) "aj" = ( /turf/wall/wood, /area/map_template/ninja_dojo/dojo) @@ -156,10 +145,6 @@ "aG" = ( /turf/unsimulated/floor/wood, /area/map_template/ninja_dojo/dojo) -"aH" = ( -/obj/structure/flora/tree/pine, -/turf/unsimulated/floor/snow, -/area/map_template/ninja_dojo/dojo) "aI" = ( /obj/structure/iv_drip, /obj/structure/window/reinforced/crescent, @@ -500,7 +485,7 @@ /area/map_template/ninja_dojo/dojo) "bM" = ( /obj/effect/floor_decal/snow, -/obj/structure/aliumizer, +/obj/abstract/modpack_compat/aliumizer, /turf/unsimulated/floor/ice, /area/map_template/ninja_dojo/dojo) "bN" = ( @@ -905,7 +890,7 @@ /obj/machinery/door/blast/regular/open{ id_tag = "ninjadoor"; name = "Blast Door"; - + }, /turf/unsimulated/floor/dark, /area/map_template/ninja_dojo/start) @@ -1103,11 +1088,11 @@ ss ss ac ac -ad -ad ac ac -af +ac +ac +ae ac ac ac @@ -1117,14 +1102,14 @@ ac ac ac ac -ad +ac ag bn bo -ad +ac ag ac -ad +ac bn bn bn @@ -1144,30 +1129,30 @@ ss "} (3,1,1) = {" ss -ad -af -ad -ad -ad -ai -ad ac -ad -ad +ae +ac +ac +ac +ag +ac +ac +ac +ac +ac +ac +ac ac -ad -ad -ad ac ae -ad -ad +ac +ac bo bn -ad -ad -ad -ad +ac +ac +ac +ac bn bo bo @@ -1187,29 +1172,29 @@ ss "} (4,1,1) = {" ss -ad -ad -ad ac ac -ad -ad ac ac -aH ac -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ah +ac +ac +ac +ac +ac +ac +ac +ac bn bn ac -ad -ad +ac +ac ac bn bn @@ -1230,30 +1215,30 @@ ss "} (5,1,1) = {" ss -ad -ad -ad ac -ad -ad ac -ad -ad ac ac -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac bn bo -ad -ad +ac +ac ae -ad +ac bo bn bn @@ -1277,26 +1262,26 @@ ac ac ac ae -ad -ad -ad ac ac ac -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac ae ac ac ag bo bn -ad +ac ag -ad -ad +ac +ac bo bn ck @@ -1320,7 +1305,7 @@ ac ac ac ac -ad +ac aj aj aj @@ -1329,17 +1314,17 @@ aj aj aj aj -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac bn bn -ad -ad -ad -ad +ac +ac +ac +ac bo bn bn @@ -1363,7 +1348,7 @@ ac ac ac ac -ad +ac aj ak ar @@ -1382,7 +1367,7 @@ bh aA aj aj -ad +ac bn bn bn @@ -1405,8 +1390,8 @@ ss ac ag ac -ad -ad +ac +ac aj al ao @@ -1425,7 +1410,7 @@ aG aG bT aj -ad +ac bn bn bn @@ -1447,9 +1432,9 @@ ss ss ac ac -ad -ad -ad +ac +ac +ac aj am ao @@ -1468,7 +1453,7 @@ bG bP bU aA -ad +ac bn bn ck @@ -1490,9 +1475,9 @@ ss ss ac ac -ad -ad -ad +ac +ac +ac aj an at @@ -1533,9 +1518,9 @@ ss ss ac ac -ad -ad -ad +ac +ac +ac aj ao ao @@ -1575,10 +1560,10 @@ ss (13,1,1) = {" ss ac -ad -ad -ad -ad +ac +ac +ac +ac aj ao ao @@ -1597,7 +1582,7 @@ bI bR aU aA -ad +ac bn bn bo @@ -1618,10 +1603,10 @@ ss (14,1,1) = {" ss ac -ad +ac ac ae -ad +ac aj aq aw @@ -1640,7 +1625,7 @@ aG aG bV aj -ad +ac bn bn bn @@ -1661,10 +1646,10 @@ ss (15,1,1) = {" ss ac -ad ac ac -ad +ac +ac aj aj aj @@ -1683,7 +1668,7 @@ bh aA aj aj -ad +ac bo bn bn @@ -1703,12 +1688,12 @@ ss "} (16,1,1) = {" ss -ad -ad ac ac -ad -ad +ac +ac +ac +ac aj ax aE @@ -1716,42 +1701,42 @@ aA aV aG aj -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac bn bn -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac bn bn -ad -ad -ad ac -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac ss "} (17,1,1) = {" ss -ad ac -ad ac -ad -ad +ac +ac +ac +ac aj ay aE @@ -1770,26 +1755,26 @@ bo bn bn bn -ad -ad +ac +ac ae -ad +ac bn bn -ad ac ac -ad -ad -ad -ad +ac +ac +ac +ac +ac ac ah ss "} (18,1,1) = {" ss -ad +ac ac ah ac @@ -1802,42 +1787,42 @@ aA aG aG aA -ad +ac bn ag bn -ad -ad -ad -ad +ac +ac +ac +ac bn ah bn ac -ad -ad -ad +ac +ac +ac bn bn -ad -ad -ad -ad +ac +ac +ac +ac ag -ad -ad -ad -ad +ac +ac +ac +ac ss "} (19,1,1) = {" ss -ad -ad -ad ac ac -ad +ac +ac +ac +ac aj aj aj @@ -1845,88 +1830,88 @@ aj aG bb aj -ad +ac bo bn bn -ad -ad -ad -ad +ac +ac +ac +ac bn bn bn ac -ad -ad +ac +ac ac bn bo -ad +ac ae -ad -ad ac ac -ad -ad +ac +ac +ac +ac ae ss "} (20,1,1) = {" ss -ad -ad ac ac -ad -ad -ad ac -ad +ac +ac +ac +ac +ac +ac aA aG aG aj -ad +ac bn -ad -ad +ac +ac bD bE bE bE -ad -ad +ac +ac bn -ad -ad -ad +ac +ac +ac ac bn bn -ad -ad ac -ad -ad -ad -ad ac -ad +ac +ac +ac +ac +ac +ac +ac ss "} (21,1,1) = {" ss -ad -ad ac -ad ac -ad -ad -af -ad +ac +ac +ac +ac +ac +ae +ac aA aG aG @@ -1934,13 +1919,13 @@ bh bn bn ae -ad +ac bE bJ bM bD -ad -ad +ac +ac bo bn bo @@ -1948,28 +1933,28 @@ bn bn bn bn -ad -ad ac -ad ac -ad -ad -ad +ac +ac +ac +ac +ac +ac ac ss "} (22,1,1) = {" ss ac -ad ac -ad -ai -ad -ad ac -ad +ac +ag +ac +ac +ac +ac aA aG aG @@ -1982,8 +1967,8 @@ bD bJ bJ bE -ad -ad +ac +ac bo bn bn @@ -1991,15 +1976,15 @@ bo bn bn bn -ad -ad -ad -ad ac -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac ss "} (23,1,1) = {" @@ -2007,146 +1992,146 @@ ss ac ac ac -ad -ad -ad -ad ac -ad +ac +ac +ac +ac +ac aA aG aG aj -ad +ac bn ac -ad +ac bE bE bD bE ac -ad +ac bn ac -ad -ad -ad +ac +ac +ac bn bn -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac ag -ad +ac ss "} (24,1,1) = {" ss -ad -ad -ad -ad -ad -ad ac -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac aj aG aG aj -ad +ac bn bn bn -ad ac -ad -ad +ac +ac +ac bn bn bn ac ae -ad -ad +ac +ac bn bn -ad -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac ss "} (25,1,1) = {" ss ac -ad -ad -ad -ad -ad ac -ad -ad +ac +ac +ac +ac +ac +ac +ac aj aG aG aA -ad +ac bo bt bn -ad -ad -ad +ac +ac +ac ac bn ag bn ac -ad +ac aj aj cu cu aj aj -ad -ad +ac +ac ae -ad -ad -ad -ad +ac +ac +ac +ac ss "} (26,1,1) = {" ss -ad -ad -ad -ad ac ac ac -ad -ad +ac +ac +ac +ac +ac +ac aj aG aG aA -ad +ac bn bn bn @@ -2157,73 +2142,73 @@ bn bn bo bn -ad -ad +ac +ac aj cm cp cp cy aj -ad -ad -ad ac ac ac -ad +ac +ac +ac +ac ss "} (27,1,1) = {" ss -ad ac ac -ad -ad ac ac -ad -ad +ac +ac +ac +ac +ac aj aV aG aj -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac bn bn -ad -ad +ac +ac ae -ad -ad -ad +ac +ac +ac aj cn cp cp cz aj -ad -ad -ad ac -ad ac -ad +ac +ac +ac +ac +ac ss "} (28,1,1) = {" ss -ad -ad ac ac -ad +ac +ac +ac ae ac aj @@ -2251,22 +2236,22 @@ cp cp cA aj -ad -ad -ad -ad -ad ac -ad +ac +ac +ac +ac +ac +ac ss "} (29,1,1) = {" ss -ad +ac ae ac -ad -ad +ac +ac ae ac aj @@ -2294,13 +2279,13 @@ cp cp cB aj -ad -ad -ad -ad -ad -af -ad +ac +ac +ac +ac +ac +ae +ac ss "} (30,1,1) = {" @@ -2309,9 +2294,9 @@ ac ac ac ac -ad ac -ad +ac +ac aA aG aG @@ -2337,13 +2322,13 @@ cp cp cC aj -ad -ad -ad -ad -ad ac -ad +ac +ac +ac +ac +ac +ac ss "} (31,1,1) = {" @@ -2354,7 +2339,7 @@ ac ac ac ac -ad +ac aA aG aO @@ -2380,24 +2365,24 @@ cp cp cD aj -ad -ad ac -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac ss "} (32,1,1) = {" ss -ad -ad ac -ad ac ac -ad +ac +ac +ac +ac aA aG aP @@ -2423,24 +2408,24 @@ cp cp cE aj -ad -ad -ad -ad -aH ac -ad +ac +ac +ac +ah +ac +ac ss "} (33,1,1) = {" ss -ad -ad +ac +ac ac ag -ad ac -ad +ac +ac aA aG aP @@ -2466,24 +2451,24 @@ cp cp cF aj -ad -ad -ad -ad ac -ad -ad +ac +ac +ac +ac +ac +ac ss "} (34,1,1) = {" ss -ad -ad ac -ad -ad ac -ad +ac +ac +ac +ac +ac aA aG aQ @@ -2509,24 +2494,24 @@ cv cw aj aj -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac ss "} (35,1,1) = {" ss -ad -ad -ad ac -ad ac -ad +ac +ac +ac +ac +ac aj aG aG @@ -2551,25 +2536,25 @@ aj aj aj aj -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac ss "} (36,1,1) = {" ss -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac aj aj aA @@ -2590,119 +2575,111 @@ cc ci ci aj -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ss "} (37,1,1) = {" ss ae -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac aj cd ci ci aj -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad ac -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ss "} (38,1,1) = {" ss -ad -ad -ad -ad -ac -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ae -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac aj aj aj aj aj -ad +ac ae ac ac -ad -ad -ad -ad -ad -ad ac -ad +ac +ac +ac +ac +ac +ac +ac ss "} (39,1,1) = {" ss -ad +ac ag -ad -ad ac -ad -ad -ad -ad -ad -ad ac ac ac @@ -2711,198 +2688,206 @@ ac ac ac ac -ad -ad -ad -ad -ad -ad -ad -ad -ad ac ac -ad -ad -ad ac -ad -ad -ad ac -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ss "} (40,1,1) = {" ss -ad -ad -ad -ad ac -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac ag -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad ac ac ac ac -ad -ad -ad ac ac -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ss "} (41,1,1) = {" ss -ad -ad -ad -ad -ad -ac -ad -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ag -ad -ad -ad -ad -ad -ad -ad -ac -aH -ac -ad -ad -ad -ad -ad -ad -ad -ad -ac -ad +ac +ac +ac +ac +ac +ac +ac +ac +ah +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ag -ad -ad +ac +ac ss "} (42,1,1) = {" ss -ad -ad -ad -ad -ad -ad -ac -ac -ac -ad -ad -ac -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ac -ac -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ss "} (43,1,1) = {" ss -ad -ad -ad -ad -ad -ad -ad -ad -ad ac ac ac -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ae -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac ae -ad -ac -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ss "} (44,1,1) = {" diff --git a/mods/gamemodes/ninja/objects/rigsuit.dm b/mods/gamemodes/ninja/objects/rigsuit.dm index 36b47a9aa1ab..7a49651656a8 100644 --- a/mods/gamemodes/ninja/objects/rigsuit.dm +++ b/mods/gamemodes/ninja/objects/rigsuit.dm @@ -1,6 +1,6 @@ /obj/item/rig/light/ninja name = "ominous suit control module" - desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for assassins." + desc = "A unique, vacuum-proof suit of nano-enhanced armor designed specifically for assassins." suit_type = "ominous" icon = 'icons/clothing/rigs/rig_ninja.dmi' armor = list( diff --git a/mods/gamemodes/traitor/syndicatebeacon.dm b/mods/gamemodes/traitor/syndicatebeacon.dm index 63ad135fb2c0..1386e2c44f49 100644 --- a/mods/gamemodes/traitor/syndicatebeacon.dm +++ b/mods/gamemodes/traitor/syndicatebeacon.dm @@ -37,22 +37,20 @@ show_browser(user, dat, "window=syndbeacon") onclose(user, "syndbeacon") -/obj/machinery/syndicate_beacon/Topic(href, href_list) - if(..()) +/obj/machinery/syndicate_beacon/OnTopic(mob/user, href_list) + if((. = ..())) return if(href_list["betraitor"]) + . = TOPIC_REFRESH if(charges < 1) - src.updateUsrDialog() return var/mob/M = locate(href_list["traitormob"]) if(M.mind.assigned_special_role || jobban_isbanned(M, /decl/special_role/traitor)) temptext = "We have no need for you at this time. Have a pleasant day.
" - src.updateUsrDialog() return charges -= 1 if(prob(50)) temptext = "Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind." - src.updateUsrDialog() addtimer(CALLBACK(src, PROC_REF(selfdestruct)), rand(5, 20) SECONDS) return if(ishuman(M)) @@ -61,10 +59,7 @@ var/decl/special_role/traitors = GET_DECL(/decl/special_role/traitor) traitors.add_antagonist(N.mind) log_and_message_admins("has accepted a traitor objective from a syndicate beacon.", M) - - - src.updateUsrDialog() - return + return /obj/machinery/syndicate_beacon/proc/selfdestruct() diff --git a/mods/mobs/borers/mob/borer/borer.dm b/mods/mobs/borers/mob/borer/borer.dm index f9dbbe2f6e17..f83d77f9fb03 100644 --- a/mods/mobs/borers/mob/borer/borer.dm +++ b/mods/mobs/borers/mob/borer/borer.dm @@ -71,9 +71,9 @@ roundstart = TRUE /mob/living/simple_animal/borer/symbiote - name = "symbiote" + name = "symbiote" real_name = "symbiote" - neutered = TRUE + neutered = TRUE /mob/living/simple_animal/borer/Login() . = ..() @@ -83,6 +83,8 @@ /mob/living/simple_animal/borer/Initialize(var/mapload, var/gen=1) + hud_used = neutered ? /datum/hud/animal/borer/neutered : /datum/hud/animal/borer + . = ..() add_language(/decl/language/corticalborer) @@ -225,7 +227,7 @@ #define COLOR_BORER_RED "#ff5555" /mob/living/simple_animal/borer/proc/set_ability_cooldown(var/amt) set_special_ability_cooldown(amt) - var/datum/hud/borer/borer_hud = hud_used + var/datum/hud/animal/borer/borer_hud = hud_used if(istype(borer_hud)) for(var/obj/thing in borer_hud.borer_hud_elements) thing.color = COLOR_BORER_RED @@ -234,7 +236,7 @@ /mob/living/simple_animal/borer/proc/leave_host() - var/datum/hud/borer/borer_hud = hud_used + var/datum/hud/animal/borer/borer_hud = hud_used if(istype(borer_hud)) for(var/obj/thing in borer_hud.borer_hud_elements) thing.alpha = 0 diff --git a/mods/mobs/borers/mob/borer/borer_attacks.dm b/mods/mobs/borers/mob/borer/borer_attacks.dm index 6c5919ed2b5c..89805ffdceb1 100644 --- a/mods/mobs/borers/mob/borer/borer_attacks.dm +++ b/mods/mobs/borers/mob/borer/borer_attacks.dm @@ -42,7 +42,7 @@ host.status_flags |= PASSEMOTES forceMove(host) - var/datum/hud/borer/borer_hud = hud_used + var/datum/hud/animal/borer/borer_hud = hud_used if(istype(borer_hud)) for(var/obj/thing in borer_hud.borer_hud_elements) thing.alpha = 255 diff --git a/mods/mobs/borers/mob/borer/borer_hud.dm b/mods/mobs/borers/mob/borer/borer_hud.dm index 79235e827d59..9d9435c08eda 100644 --- a/mods/mobs/borers/mob/borer/borer_hud.dm +++ b/mods/mobs/borers/mob/borer/borer_hud.dm @@ -1,55 +1,56 @@ -/datum/hud/borer - var/list/borer_hud_elements = list() - var/obj/screen/intent/hud_intent_selector - var/obj/screen/borer/toggle_host_control/hud_toggle_control - var/obj/screen/borer/inject_chemicals/hud_inject_chemicals - var/obj/screen/borer/leave_host/hud_leave_host - -/datum/hud/borer/Destroy() - QDEL_NULL_LIST(borer_hud_elements) - hud_toggle_control = null - hud_inject_chemicals = null - hud_leave_host = null - QDEL_NULL(hud_intent_selector) - . = ..() +/decl/hud_element/borer + abstract_type = /decl/hud_element/borer + +/decl/hud_element/borer/inject_chemicals + elem_type = /obj/screen/borer/inject_chemicals + +/decl/hud_element/borer/leave_host + elem_type = /obj/screen/borer/leave_host -/datum/hud/borer/FinalizeInstantiation() - hud_intent_selector = new(null, mymob) - adding += hud_intent_selector - hud_inject_chemicals = new(null, mymob) - hud_leave_host = new(null, mymob) - borer_hud_elements = list( - hud_inject_chemicals, - hud_leave_host +/decl/hud_element/borer/toggle_control + elem_type = /obj/screen/borer/toggle_host_control + +/datum/hud/animal/borer + omit_hud_elements = list( + /decl/hud_element/movement, + /decl/hud_element/stamina + ) + additional_hud_elements = list( + /decl/hud_element/borer/inject_chemicals, + /decl/hud_element/borer/leave_host, + /decl/hud_element/borer/toggle_control ) - if(isborer(mymob)) - var/mob/living/simple_animal/borer/borer = mymob - if(!borer.neutered) - hud_toggle_control = new(null, mymob) - borer_hud_elements += hud_toggle_control - adding += borer_hud_elements - if(mymob) - var/mob/living/simple_animal/borer/borer = mymob - if(istype(borer) && borer.host) - for(var/obj/thing in borer_hud_elements) - thing.alpha = 255 - thing.set_invisibility(INVISIBILITY_NONE) - ..() + var/list/borer_hud_elements + +/datum/hud/animal/borer/neutered + additional_hud_elements = list( + /decl/hud_element/borer/inject_chemicals, + /decl/hud_element/borer/leave_host + ) + +/datum/hud/animal/borer/Destroy() + borer_hud_elements = null + return ..() + +/datum/hud/animal/borer/create_and_register_element(decl/hud_element/ui_elem, decl/ui_style/ui_style, ui_color, ui_alpha) + var/obj/screen/elem = ..() + if(istype(elem) && istype(elem, /obj/screen/borer)) + LAZYADD(borer_hud_elements, elem) + return elem /mob/living/simple_animal/borer - hud_used = /datum/hud/borer + hud_used = /datum/hud/animal/borer /mob/living/simple_animal/borer/proc/reset_ui_callback() if(!is_on_special_ability_cooldown()) - var/datum/hud/borer/borer_hud = hud_used + var/datum/hud/animal/borer/borer_hud = hud_used if(istype(borer_hud)) for(var/obj/thing in borer_hud.borer_hud_elements) thing.color = null /obj/screen/borer icon = 'mods/mobs/borers/icons/borer_ui.dmi' - alpha = 0 - invisibility = INVISIBILITY_MAXIMUM + use_supplied_ui_icon = FALSE requires_ui_style = FALSE /obj/screen/borer/handle_click(mob/user, params) diff --git a/mods/mobs/dionaea/icons/ui_interactions.dmi b/mods/mobs/dionaea/icons/ui_interactions.dmi deleted file mode 100644 index 29d6ce04dce8..000000000000 Binary files a/mods/mobs/dionaea/icons/ui_interactions.dmi and /dev/null differ diff --git a/mods/mobs/dionaea/icons/ui_interactions_drop.dmi b/mods/mobs/dionaea/icons/ui_interactions_drop.dmi new file mode 100644 index 000000000000..cbb91b5ebecd Binary files /dev/null and b/mods/mobs/dionaea/icons/ui_interactions_drop.dmi differ diff --git a/mods/mobs/dionaea/icons/ui_interactions_maneuver.dmi b/mods/mobs/dionaea/icons/ui_interactions_maneuver.dmi new file mode 100644 index 000000000000..967631175ae0 Binary files /dev/null and b/mods/mobs/dionaea/icons/ui_interactions_maneuver.dmi differ diff --git a/mods/mobs/dionaea/icons/ui_interactions_resist.dmi b/mods/mobs/dionaea/icons/ui_interactions_resist.dmi new file mode 100644 index 000000000000..559690c3ccf1 Binary files /dev/null and b/mods/mobs/dionaea/icons/ui_interactions_resist.dmi differ diff --git a/mods/mobs/dionaea/icons/ui_interactions_throw.dmi b/mods/mobs/dionaea/icons/ui_interactions_throw.dmi new file mode 100644 index 000000000000..f6189daec8ad Binary files /dev/null and b/mods/mobs/dionaea/icons/ui_interactions_throw.dmi differ diff --git a/mods/mobs/dionaea/mob/_nymph.dm b/mods/mobs/dionaea/mob/_nymph.dm index a1c8efe44862..296d0a20e8bc 100644 --- a/mods/mobs/dionaea/mob/_nymph.dm +++ b/mods/mobs/dionaea/mob/_nymph.dm @@ -1,7 +1,7 @@ #define DIONA_SCREEN_LOC_HELD "RIGHT-8:16,BOTTOM:5" #define DIONA_SCREEN_LOC_HAT "RIGHT-7:16,BOTTOM:5" #define DIONA_SCREEN_LOC_INTENT "RIGHT-2,BOTTOM:5" -#define DIONA_SCREEN_LOC_HEALTH ui_alien_health +#define DIONA_SCREEN_LOC_HEALTH "RIGHT-1:28,CENTER-1:13" /mob/living/simple_animal/alien/diona name = "diona nymph" @@ -76,18 +76,6 @@ heal_damage(OXY, rads, do_update_health = FALSE) heal_damage(TOX, rads) -/* -/mob/living/simple_animal/alien/diona/get_default_intent() - return GET_DECL(/decl/intent/help/binary/diona) - -/mob/living/simple_animal/alien/diona/get_available_intents() - var/static/list/available_intents = list( - GET_DECL(/decl/intent/harm/binary/diona), - GET_DECL(/decl/intent/help/binary/diona) - ) - return available_intents -*/ - /decl/bodytype/diona name = "nymph" bodytype_flag = 0 diff --git a/mods/mobs/dionaea/mob/nymph_ui.dm b/mods/mobs/dionaea/mob/nymph_ui.dm index fc44f7639a3b..f4226bf88712 100644 --- a/mods/mobs/dionaea/mob/nymph_ui.dm +++ b/mods/mobs/dionaea/mob/nymph_ui.dm @@ -1,30 +1,24 @@ -/* Commented out due to issues with interactions and combined intent flags. -/obj/screen/intent/binary/diona - icon = 'mods/mobs/dionaea/icons/ui_intents.dmi' - screen_loc = DIONA_SCREEN_LOC_INTENT - -/decl/intent/harm/binary/diona - icon = 'mods/mobs/dionaea/icons/ui_intent_overlay.dmi' - uid = "intent_harm_binary_diona" - -/decl/intent/help/binary/diona - icon = 'mods/mobs/dionaea/icons/ui_intent_overlay.dmi' - uid = "intent_help_binary_diona" -*/ - /decl/ui_style/diona name = "Diona" restricted = TRUE uid = "ui_style_diona" override_icons = list( - UI_ICON_HEALTH = 'mods/mobs/dionaea/icons/ui_health.dmi', - UI_ICON_HANDS = 'mods/mobs/dionaea/icons/ui_hands.dmi', - UI_ICON_INTERACTION = 'mods/mobs/dionaea/icons/ui_interactions.dmi', - UI_ICON_INVENTORY = 'mods/mobs/dionaea/icons/ui_inventory.dmi' + (HUD_HEALTH) = 'mods/mobs/dionaea/icons/ui_health.dmi', + (HUD_HANDS) = 'mods/mobs/dionaea/icons/ui_hands.dmi', + (HUD_RESIST) = 'mods/mobs/dionaea/icons/ui_interactions_resist.dmi', + (HUD_THROW) = 'mods/mobs/dionaea/icons/ui_interactions_throw.dmi', + (HUD_DROP) = 'mods/mobs/dionaea/icons/ui_interactions_drop.dmi', + (HUD_MANEUVER) = 'mods/mobs/dionaea/icons/ui_interactions_maneuver.dmi', + (HUD_INVENTORY) = 'mods/mobs/dionaea/icons/ui_inventory.dmi' ) +/decl/hud_element/health/diona + elem_type = /obj/screen/health/diona + elem_reference_type = /decl/hud_element/health + /datum/hud/diona_nymph -// action_intent_type = /obj/screen/intent/diona_nymph + omit_hud_elements = list(/decl/hud_element/health) + additional_hud_elements = list(/decl/hud_element/health/diona) /datum/hud/diona_nymph/get_ui_style_data() return GET_DECL(/decl/ui_style/diona) @@ -35,17 +29,7 @@ /datum/hud/diona_nymph/get_ui_alpha() return 255 -/datum/hud/diona_nymph/FinalizeInstantiation() - var/decl/ui_style/ui_style = get_ui_style_data() - var/ui_color = get_ui_color() - var/ui_alpha = get_ui_alpha() - - mymob.healths = new /obj/screen/diona_health(null, mymob, ui_style, ui_color, ui_alpha, UI_ICON_HEALTH) - other = list() - adding = list(mymob.healths) - ..() - -/obj/screen/diona_health +/obj/screen/health/diona icon_state = "health0" name = "health" screen_loc = DIONA_SCREEN_LOC_HEALTH diff --git a/mods/species/bayliens/adherent/_adherent.dm b/mods/species/adherent/_adherent.dm similarity index 53% rename from mods/species/bayliens/adherent/_adherent.dm rename to mods/species/adherent/_adherent.dm index d70f337115d7..e71681dc4311 100644 --- a/mods/species/bayliens/adherent/_adherent.dm +++ b/mods/species/adherent/_adherent.dm @@ -3,6 +3,16 @@ #define BP_JETS "maneuvering jets" #define BP_COOLING_FINS "cooling fins" +#define SPECIES_ADHERENT "Adherent" +#define BODYTYPE_ADHERENT "adherent body" + +/decl/modpack/adherent + name = "Adherent Species" + +/decl/modpack/adherent/pre_initialize() + ..() + SSmodpacks.default_submap_whitelisted_species |= SPECIES_ADHERENT + /mob/living/human/adherent/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) species_name = SPECIES_ADHERENT - . = ..() \ No newline at end of file + . = ..() diff --git a/mods/species/adherent/_adherent.dme b/mods/species/adherent/_adherent.dme new file mode 100644 index 000000000000..2e916cfc7929 --- /dev/null +++ b/mods/species/adherent/_adherent.dme @@ -0,0 +1,15 @@ +#ifndef MODPACK_SPECIES_ADHERENT +#define MODPACK_SPECIES_ADHERENT +// BEGIN_INCLUDE +#include "_adherent.dm" +#include "datum\culture.dm" +#include "datum\emotes.dm" +#include "datum\faction.dm" +#include "datum\language.dm" +#include "datum\location.dm" +#include "datum\species.dm" +#include "datum\species_bodytypes.dm" +#include "organs\organs_external.dm" +#include "organs\organs_internal.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/adherent/datum/culture.dm b/mods/species/adherent/datum/culture.dm similarity index 100% rename from mods/species/bayliens/adherent/datum/culture.dm rename to mods/species/adherent/datum/culture.dm diff --git a/mods/species/bayliens/adherent/datum/emotes.dm b/mods/species/adherent/datum/emotes.dm similarity index 70% rename from mods/species/bayliens/adherent/datum/emotes.dm rename to mods/species/adherent/datum/emotes.dm index dd347dedd156..72cdd85fbcd2 100644 --- a/mods/species/bayliens/adherent/datum/emotes.dm +++ b/mods/species/adherent/datum/emotes.dm @@ -7,9 +7,9 @@ /decl/emote/audible/adherent_ding key = "ding" emote_message_3p = "$USER$ dings." - emote_sound = 'mods/species/bayliens/adherent/sound/ding.ogg' + emote_sound = 'mods/species/adherent/sound/ding.ogg' /decl/emote/audible/adherent_chime key = "chime" emote_message_3p = "$USER$ chimes." - emote_sound = 'mods/species/bayliens/adherent/sound/chime.ogg' + emote_sound = 'mods/species/adherent/sound/chime.ogg' diff --git a/mods/species/bayliens/adherent/datum/faction.dm b/mods/species/adherent/datum/faction.dm similarity index 100% rename from mods/species/bayliens/adherent/datum/faction.dm rename to mods/species/adherent/datum/faction.dm diff --git a/mods/species/bayliens/adherent/datum/language.dm b/mods/species/adherent/datum/language.dm similarity index 100% rename from mods/species/bayliens/adherent/datum/language.dm rename to mods/species/adherent/datum/language.dm diff --git a/mods/species/bayliens/adherent/datum/location.dm b/mods/species/adherent/datum/location.dm similarity index 100% rename from mods/species/bayliens/adherent/datum/location.dm rename to mods/species/adherent/datum/location.dm diff --git a/mods/species/bayliens/adherent/datum/species.dm b/mods/species/adherent/datum/species.dm similarity index 97% rename from mods/species/bayliens/adherent/datum/species.dm rename to mods/species/adherent/datum/species.dm index f9b4904ab4d9..f209e12168b7 100644 --- a/mods/species/bayliens/adherent/datum/species.dm +++ b/mods/species/adherent/datum/species.dm @@ -44,7 +44,7 @@ hazard_low_pressure = -1 strength = STR_HIGH - speech_sounds = list('mods/species/bayliens/adherent/sound/chime.ogg') + speech_sounds = list('mods/species/adherent/sound/chime.ogg') speech_chance = 25 species_flags = SPECIES_FLAG_NO_POISON | SPECIES_FLAG_NO_MINOR_CUT @@ -107,7 +107,6 @@ if(can_overcome_gravity(H)) return "\nThey are floating on a cloud of shimmering distortion." /datum/hud_data/adherent - has_internals = FALSE inventory_slots = list( /datum/inventory_slot/handcuffs, /datum/inventory_slot/ear/adherent, diff --git a/mods/species/bayliens/adherent/datum/species_bodytypes.dm b/mods/species/adherent/datum/species_bodytypes.dm similarity index 82% rename from mods/species/bayliens/adherent/datum/species_bodytypes.dm rename to mods/species/adherent/datum/species_bodytypes.dm index bbf275eb8558..ae9b69dda28c 100644 --- a/mods/species/bayliens/adherent/datum/species_bodytypes.dm +++ b/mods/species/adherent/datum/species_bodytypes.dm @@ -2,10 +2,10 @@ name = "turquoise" desc = "A gleaming crystalline mass." bodytype_category = BODYTYPE_ADHERENT - icon_template = 'mods/species/bayliens/adherent/icons/template.dmi' - icon_base = 'mods/species/bayliens/adherent/icons/body_turquoise.dmi' - damage_overlays = 'mods/species/bayliens/adherent/icons/damage_overlay.dmi' - blood_overlays = 'mods/species/bayliens/adherent/icons/blood_overlays.dmi' + icon_template = 'mods/species/adherent/icons/template.dmi' + icon_base = 'mods/species/adherent/icons/body_turquoise.dmi' + damage_overlays = 'mods/species/adherent/icons/damage_overlay.dmi' + blood_overlays = 'mods/species/adherent/icons/blood_overlays.dmi' antaghud_offset_y = 14 movement_slowdown = -1 appearance_flags = HAS_EYE_COLOR @@ -49,7 +49,7 @@ ) eye_contaminant_guard = TRUE eye_innate_flash_protection = FLASH_PROTECTION_MAJOR - eye_icon = 'mods/species/bayliens/adherent/icons/eyes.dmi' + eye_icon = 'mods/species/adherent/icons/eyes.dmi' uid = "bodytype_crystalline_adherent_turquoise" /decl/bodytype/crystalline/adherent/Initialize() @@ -105,35 +105,35 @@ /decl/bodytype/crystalline/adherent/emerald name = "emerald" - icon_base = 'mods/species/bayliens/adherent/icons/body_emerald.dmi' + icon_base = 'mods/species/adherent/icons/body_emerald.dmi' uid = "bodytype_crystalline_adherent_emerald" /decl/bodytype/crystalline/adherent/amethyst name = "amethyst" - icon_base = 'mods/species/bayliens/adherent/icons/body_amethyst.dmi' + icon_base = 'mods/species/adherent/icons/body_amethyst.dmi' uid = "bodytype_crystalline_adherent_amethyst" /decl/bodytype/crystalline/adherent/sapphire name = "sapphire" - icon_base = 'mods/species/bayliens/adherent/icons/body_sapphire.dmi' + icon_base = 'mods/species/adherent/icons/body_sapphire.dmi' uid = "bodytype_crystalline_adherent_sapphire" /decl/bodytype/crystalline/adherent/ruby name = "ruby" - icon_base = 'mods/species/bayliens/adherent/icons/body_ruby.dmi' + icon_base = 'mods/species/adherent/icons/body_ruby.dmi' uid = "bodytype_crystalline_adherent_ruby" /decl/bodytype/crystalline/adherent/topaz name = "topaz" - icon_base = 'mods/species/bayliens/adherent/icons/body_topaz.dmi' + icon_base = 'mods/species/adherent/icons/body_topaz.dmi' uid = "bodytype_crystalline_adherent_topaz" /decl/bodytype/crystalline/adherent/quartz name = "quartz" - icon_base = 'mods/species/bayliens/adherent/icons/body_quartz.dmi' + icon_base = 'mods/species/adherent/icons/body_quartz.dmi' uid = "bodytype_crystalline_adherent_quartz" /decl/bodytype/crystalline/adherent/jet name = "jet" - icon_base = 'mods/species/bayliens/adherent/icons/body_jet.dmi' + icon_base = 'mods/species/adherent/icons/body_jet.dmi' uid = "bodytype_crystalline_adherent_jet" diff --git a/mods/species/bayliens/adherent/icons/actions.dmi b/mods/species/adherent/icons/actions.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/actions.dmi rename to mods/species/adherent/icons/actions.dmi diff --git a/mods/species/bayliens/adherent/icons/blood_overlays.dmi b/mods/species/adherent/icons/blood_overlays.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/blood_overlays.dmi rename to mods/species/adherent/icons/blood_overlays.dmi diff --git a/mods/species/bayliens/adherent/icons/body_amethyst.dmi b/mods/species/adherent/icons/body_amethyst.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_amethyst.dmi rename to mods/species/adherent/icons/body_amethyst.dmi diff --git a/mods/species/bayliens/adherent/icons/body_emerald.dmi b/mods/species/adherent/icons/body_emerald.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_emerald.dmi rename to mods/species/adherent/icons/body_emerald.dmi diff --git a/mods/species/bayliens/adherent/icons/body_jet.dmi b/mods/species/adherent/icons/body_jet.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_jet.dmi rename to mods/species/adherent/icons/body_jet.dmi diff --git a/mods/species/bayliens/adherent/icons/body_quartz.dmi b/mods/species/adherent/icons/body_quartz.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_quartz.dmi rename to mods/species/adherent/icons/body_quartz.dmi diff --git a/mods/species/bayliens/adherent/icons/body_ruby.dmi b/mods/species/adherent/icons/body_ruby.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_ruby.dmi rename to mods/species/adherent/icons/body_ruby.dmi diff --git a/mods/species/bayliens/adherent/icons/body_sapphire.dmi b/mods/species/adherent/icons/body_sapphire.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_sapphire.dmi rename to mods/species/adherent/icons/body_sapphire.dmi diff --git a/mods/species/bayliens/adherent/icons/body_topaz.dmi b/mods/species/adherent/icons/body_topaz.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_topaz.dmi rename to mods/species/adherent/icons/body_topaz.dmi diff --git a/mods/species/bayliens/adherent/icons/body_turquoise.dmi b/mods/species/adherent/icons/body_turquoise.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_turquoise.dmi rename to mods/species/adherent/icons/body_turquoise.dmi diff --git a/mods/species/bayliens/adherent/icons/damage_overlay.dmi b/mods/species/adherent/icons/damage_overlay.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/damage_overlay.dmi rename to mods/species/adherent/icons/damage_overlay.dmi diff --git a/mods/species/bayliens/adherent/icons/eyes.dmi b/mods/species/adherent/icons/eyes.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/eyes.dmi rename to mods/species/adherent/icons/eyes.dmi diff --git a/mods/species/bayliens/adherent/icons/organs.dmi b/mods/species/adherent/icons/organs.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/organs.dmi rename to mods/species/adherent/icons/organs.dmi diff --git a/mods/species/bayliens/adherent/icons/template.dmi b/mods/species/adherent/icons/template.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/template.dmi rename to mods/species/adherent/icons/template.dmi diff --git a/mods/species/bayliens/adherent/organs/organs_external.dm b/mods/species/adherent/organs/organs_external.dm similarity index 100% rename from mods/species/bayliens/adherent/organs/organs_external.dm rename to mods/species/adherent/organs/organs_external.dm diff --git a/mods/species/bayliens/adherent/organs/organs_internal.dm b/mods/species/adherent/organs/organs_internal.dm similarity index 84% rename from mods/species/bayliens/adherent/organs/organs_internal.dm rename to mods/species/adherent/organs/organs_internal.dm index 3a7cb3475b45..fc4c73332911 100644 --- a/mods/species/bayliens/adherent/organs/organs_internal.dm +++ b/mods/species/adherent/organs/organs_internal.dm @@ -1,11 +1,11 @@ #define PROTOCOL_ARTICLE "Protocol article [rand(100,999)]-[uppertext(pick(global.alphabet))] subsection #[rand(10,99)]" /datum/action/item_action/organ/adherent - button_icon = 'mods/species/bayliens/adherent/icons/actions.dmi' + button_icon = 'mods/species/adherent/icons/actions.dmi' /obj/item/organ/internal/brain/adherent name = "mentality matrix" desc = "The self-contained, self-supporting internal 'brain' of an Adherent unit." - icon = 'mods/species/bayliens/adherent/icons/organs.dmi' + icon = 'mods/species/adherent/icons/organs.dmi' icon_state = "brain" action_button_name = "Reset Ident" action_button_desc = "Updates your public name to reflect your current job" @@ -16,7 +16,7 @@ /obj/item/organ/internal/brain/adherent/refresh_action_button() . = ..() - if(.) + if(. && istype(action)) action.button_icon_state = "adherent-brain" action.button?.update_icon() @@ -48,7 +48,7 @@ to_chat(user, "You are now designated [owner.real_name].") /obj/item/organ/internal/powered - icon = 'mods/species/bayliens/adherent/icons/organs.dmi' + icon = 'mods/species/adherent/icons/organs.dmi' organ_properties = ORGAN_PROP_CRYSTAL var/maintenance_cost = 1 var/base_action_state @@ -66,14 +66,14 @@ /obj/item/organ/internal/powered/refresh_action_button() . = ..() - if(.) + if(. && istype(action)) action.button_icon_state = "[base_action_state]-[active ? "on" : "off"]" action.button?.update_icon() /obj/item/organ/internal/powered/attack_self(var/mob/user) . = ..() if(.) - sound_to(user, sound('mods/species/bayliens/adherent/sound/ding.ogg')) + sound_to(user, sound('mods/species/adherent/sound/ding.ogg')) if(is_broken()) to_chat(owner, "\The [src] [gender == PLURAL ? "are" : "is"] too damaged to function.") active = FALSE @@ -120,7 +120,7 @@ /obj/item/organ/internal/eyes/adherent name = "receptor prism" - icon = 'mods/species/bayliens/adherent/icons/organs.dmi' + icon = 'mods/species/adherent/icons/organs.dmi' icon_state = "eyes" organ_properties = ORGAN_PROP_CRYSTAL @@ -130,13 +130,13 @@ /obj/item/organ/internal/cell/adherent name = "piezoelectric core" - icon = 'mods/species/bayliens/adherent/icons/organs.dmi' + icon = 'mods/species/adherent/icons/organs.dmi' icon_state = "cell" /obj/item/organ/internal/powered/cooling_fins name = "cooling fins" gender = PLURAL - desc = "A lacy filligree of heat-radiating fins." + desc = "A lacy filigree of heat-radiating fins." action_button_name = "Toggle Cooling" action_button_desc = "Enables or disables your battery-powered internal cooling system" default_action_type = /datum/action/item_action/organ/adherent @@ -162,4 +162,15 @@ else . = ..() +/mob/living/is_space_movement_permitted(allow_movement = FALSE) + // This is horrible but short of spawning a jetpack inside the organ than locating + // it, I don't really see another viable approach short of a total jetpack refactor. + for(var/obj/item/organ/internal/powered/jets/jet in get_internal_organs()) + if(!jet.is_broken() && jet.active) + // Unlike Bay, we don't check or unset inertia_dir here + // because the spacedrift subsystem checks the return value of this proc + // and unsets inertia_dir if it returns nonzero. + return SPACE_MOVE_PERMITTED + return ..() + #undef PROTOCOL_ARTICLE diff --git a/mods/species/bayliens/adherent/sound/chime.ogg b/mods/species/adherent/sound/chime.ogg similarity index 100% rename from mods/species/bayliens/adherent/sound/chime.ogg rename to mods/species/adherent/sound/chime.ogg diff --git a/mods/species/bayliens/adherent/sound/ding.ogg b/mods/species/adherent/sound/ding.ogg similarity index 100% rename from mods/species/bayliens/adherent/sound/ding.ogg rename to mods/species/adherent/sound/ding.ogg diff --git a/mods/species/ascent/datum/languages.dm b/mods/species/ascent/datum/languages.dm index ca38c2909b66..d4af47ccc14e 100644 --- a/mods/species/ascent/datum/languages.dm +++ b/mods/species/ascent/datum/languages.dm @@ -47,7 +47,7 @@ /decl/language/mantid/nonvocal key = "]" name = "Ascent-Glow" - desc = "A complex visual language of bright bio-luminescent flashes, 'spoken' natively by the Kharmaani of the Ascent." + desc = "A complex visual language of bright bioluminescent flashes, 'spoken' natively by the Kharmaani of the Ascent." colour = "alien" speech_verb = "flashes" ask_verb = "gleams" diff --git a/mods/species/ascent/icons/ui_interactions.dmi b/mods/species/ascent/icons/ui_interactions.dmi deleted file mode 100644 index 10c5474aa658..000000000000 Binary files a/mods/species/ascent/icons/ui_interactions.dmi and /dev/null differ diff --git a/mods/species/ascent/icons/ui_interactions_drop.dmi b/mods/species/ascent/icons/ui_interactions_drop.dmi new file mode 100644 index 000000000000..b24e4d6e5aef Binary files /dev/null and b/mods/species/ascent/icons/ui_interactions_drop.dmi differ diff --git a/mods/species/ascent/icons/ui_interactions_maneuver.dmi b/mods/species/ascent/icons/ui_interactions_maneuver.dmi new file mode 100644 index 000000000000..da098d4e743e Binary files /dev/null and b/mods/species/ascent/icons/ui_interactions_maneuver.dmi differ diff --git a/mods/species/ascent/icons/ui_interactions_resist.dmi b/mods/species/ascent/icons/ui_interactions_resist.dmi new file mode 100644 index 000000000000..1363c5b33f07 Binary files /dev/null and b/mods/species/ascent/icons/ui_interactions_resist.dmi differ diff --git a/mods/species/ascent/icons/ui_interactions_throw.dmi b/mods/species/ascent/icons/ui_interactions_throw.dmi new file mode 100644 index 000000000000..bcab914a8a30 Binary files /dev/null and b/mods/species/ascent/icons/ui_interactions_throw.dmi differ diff --git a/mods/species/ascent/items/tools.dm b/mods/species/ascent/items/tools.dm index e007d98d30bf..663a47ca6ea5 100644 --- a/mods/species/ascent/items/tools.dm +++ b/mods/species/ascent/items/tools.dm @@ -32,7 +32,7 @@ MANTIDIFY(/obj/item/tank/jetpack/carbondioxide, "maneuvering pack", "pr /obj/item/knife/kitchen/cleaver/ascent name = "xenobiological flenser" - desc = "A mindboggingly alien tool for flensing flesh." + desc = "A mind-boggingly alien tool for flensing flesh." icon = 'mods/species/ascent/icons/ascent_doodads.dmi' icon_state = "xenobutch" @@ -44,7 +44,7 @@ MANTIDIFY(/obj/item/tank/jetpack/carbondioxide, "maneuvering pack", "pr /obj/item/food/hydration name = "hydration ration" - desc = "Approximately ten units of liquid hydration in a edible membrane. Unflavored." + desc = "Approximately ten units of liquid hydration in an edible membrane. Unflavored." icon = 'mods/species/ascent/icons/ascent_doodads.dmi' icon_state = "h2o_ration" bitesize = 10 diff --git a/mods/species/ascent/mobs/bodyparts.dm b/mods/species/ascent/mobs/bodyparts.dm index dba73c0e1210..ec27acd8e0ff 100644 --- a/mods/species/ascent/mobs/bodyparts.dm +++ b/mods/species/ascent/mobs/bodyparts.dm @@ -19,7 +19,7 @@ /obj/item/organ/external/groin/insectoid/mantid/refresh_action_button() . = ..() - if(.) + if(. && istype(action)) action.button_icon_state = "weave-web-[organ_cooldown ? "off" : "on"]" action.button?.update_icon() @@ -64,7 +64,7 @@ /obj/item/organ/external/head/insectoid/mantid/refresh_action_button() . = ..() - if(.) + if(. && istype(action)) action.button_icon_state = "shot-web-[organ_cooldown ? "off" : "on"]" action.button?.update_icon() diff --git a/mods/species/ascent/mobs/bodyparts_insectoid.dm b/mods/species/ascent/mobs/bodyparts_insectoid.dm index 5198e90b337f..f083fe98fec8 100644 --- a/mods/species/ascent/mobs/bodyparts_insectoid.dm +++ b/mods/species/ascent/mobs/bodyparts_insectoid.dm @@ -10,7 +10,7 @@ /obj/item/organ/internal/egg_sac/insectoid/refresh_action_button() . = ..() - if(.) + if(. && istype(action)) action.button_icon_state = "egg-on" action.button?.update_icon() diff --git a/mods/species/ascent/mobs/nymph/_nymph.dm b/mods/species/ascent/mobs/nymph/_nymph.dm index 16447b0c51dc..f9ed8bb3b4a2 100644 --- a/mods/species/ascent/mobs/nymph/_nymph.dm +++ b/mods/species/ascent/mobs/nymph/_nymph.dm @@ -2,7 +2,7 @@ #define ANYMPH_SCREEN_LOC_HAT "RIGHT-7:16,BOTTOM:5" #define ANYMPH_SCREEN_LOC_MOLT "RIGHT-6:16,BOTTOM:5" #define ANYMPH_SCREEN_LOC_INTENT "RIGHT-2,BOTTOM:5" -#define ANYMPH_SCREEN_LOC_HEALTH ui_alien_health +#define ANYMPH_SCREEN_LOC_HEALTH "RIGHT-1:28,CENTER-1:13" #define ANYMPH_MAX_CRYSTALS 20000 #define ANYMPH_CRYSTAL_MOLT 2000 // How much it takes to molt. @@ -51,15 +51,3 @@ /mob/living/simple_animal/alien/kharmaan/get_dexterity(var/silent) return (DEXTERITY_EQUIP_ITEM) - -/* -/mob/living/simple_animal/alien/kharmaan/get_default_intent() - return GET_DECL(/decl/intent/help/binary/ascent) - -/mob/living/simple_animal/alien/kharmaan/get_available_intents() - var/static/list/available_intents = list( - GET_DECL(/decl/intent/harm/binary/ascent), - GET_DECL(/decl/intent/help/binary/ascent) - ) - return available_intents -*/ \ No newline at end of file diff --git a/mods/species/ascent/mobs/nymph/nymph_life.dm b/mods/species/ascent/mobs/nymph/nymph_life.dm index f8e5c45fd4a4..0724b604a493 100644 --- a/mods/species/ascent/mobs/nymph/nymph_life.dm +++ b/mods/species/ascent/mobs/nymph/nymph_life.dm @@ -1,26 +1,3 @@ - -/mob/living/simple_animal/alien/kharmaan/handle_regular_hud_updates() - . = ..() - if(!.) - return - var/datum/hud/ascent_nymph/nymph_hud = hud_used - if(!istype(nymph_hud)) - return - if(nymph_hud.food) - switch(nutrition) - if(450 to INFINITY) nymph_hud.food.icon_state = "nutrition0" - if(350 to 450) nymph_hud.food.icon_state = "nutrition1" - if(250 to 350) nymph_hud.food.icon_state = "nutrition2" - if(150 to 250) nymph_hud.food.icon_state = "nutrition3" - else nymph_hud.food.icon_state = "nutrition4" - if(nymph_hud.drink) - switch(hydration) - if(450 to INFINITY) nymph_hud.drink.icon_state = "hydration0" - if(350 to 450) nymph_hud.drink.icon_state = "hydration1" - if(250 to 350) nymph_hud.drink.icon_state = "hydration2" - if(150 to 250) nymph_hud.drink.icon_state = "hydration3" - else nymph_hud.drink.icon_state = "hydration4" - /mob/living/simple_animal/alien/kharmaan/handle_nutrition_and_hydration() . = ..() // Generate some crystals over time. diff --git a/mods/species/ascent/mobs/nymph/nymph_ui.dm b/mods/species/ascent/mobs/nymph/nymph_ui.dm index e3b6d1ec70c8..0539953d693e 100644 --- a/mods/species/ascent/mobs/nymph/nymph_ui.dm +++ b/mods/species/ascent/mobs/nymph/nymph_ui.dm @@ -1,45 +1,31 @@ -/* Commented out due to issues with interactions and combined intent flags. -/obj/screen/intent/binary/ascent - icon = 'mods/species/ascent/icons/ui_intents.dmi' - screen_loc = ANYMPH_SCREEN_LOC_INTENT - -/decl/intent/harm/binary/ascent - icon = 'mods/species/ascent/icons/ui_intent_overlay.dmi' - uid = "intent_harm_binary_ascent" - -/decl/intent/help/binary/ascent - icon = 'mods/species/ascent/icons/ui_intent_overlay.dmi' - uid = "intent_help_binary_ascent" -*/ -/obj/screen/ascent_nymph_molt - name = "molt" - icon = 'mods/species/ascent/icons/ui_molt.dmi' - screen_loc = ANYMPH_SCREEN_LOC_MOLT - icon_state = "molt-on" - requires_ui_style = FALSE - -/obj/screen/ascent_nymph_molt/handle_click(mob/user, params) - var/mob/living/simple_animal/alien/kharmaan/nymph = user - if(istype(nymph)) nymph.molt() - -/datum/hud/ascent_nymph - var/obj/screen/ascent_nymph_molt/molt - var/obj/screen/food/food - var/obj/screen/drink/drink /decl/ui_style/ascent name = "Ascent" restricted = TRUE uid = "ui_style_ascent" override_icons = list( - UI_ICON_HEALTH = 'mods/species/ascent/icons/ui_health.dmi', - UI_ICON_HANDS = 'mods/species/ascent/icons/ui_hands.dmi', - UI_ICON_INTERACTION = 'mods/species/ascent/icons/ui_interactions.dmi', - UI_ICON_INVENTORY = 'mods/species/ascent/icons/ui_inventory.dmi' + (HUD_HEALTH) = 'mods/species/ascent/icons/ui_health.dmi', + (HUD_HANDS) = 'mods/species/ascent/icons/ui_hands.dmi', + (HUD_RESIST) = 'mods/species/ascent/icons/ui_interactions_resist.dmi', + (HUD_THROW) = 'mods/species/ascent/icons/ui_interactions_throw.dmi', + (HUD_DROP) = 'mods/species/ascent/icons/ui_interactions_drop.dmi', + (HUD_MANEUVER) = 'mods/species/ascent/icons/ui_interactions_maneuver.dmi', + (HUD_INVENTORY) = 'mods/species/ascent/icons/ui_inventory.dmi' ) +/decl/hud_element/health/ascent_nymph + elem_reference_type = /decl/hud_element/health + elem_type = /obj/screen/health/ascent_nymph + +/decl/hud_element/molt + elem_type = /obj/screen/ascent_nymph_molt + /datum/hud/ascent_nymph -// action_intent_type = /obj/screen/intent/ascent_nymph + omit_hud_elements = list(/decl/hud_element/health) + additional_hud_elements = list( + /decl/hud_element/health/ascent_nymph, + /decl/hud_element/molt + ) /datum/hud/ascent_nymph/get_ui_style_data() return GET_DECL(/decl/ui_style/ascent) @@ -50,18 +36,18 @@ /datum/hud/ascent_nymph/get_ui_alpha() return 255 -/datum/hud/ascent_nymph/FinalizeInstantiation() - var/decl/ui_style/ui_style = get_ui_style_data() - var/ui_color = get_ui_color() - var/ui_alpha = get_ui_alpha() - molt = new( null, mymob, ui_style, ui_color, ui_alpha) - food = new /obj/screen/food( null, mymob, ui_style, ui_color, ui_alpha, UI_ICON_NUTRITION) - drink = new /obj/screen/drink( null, mymob, ui_style, ui_color, ui_alpha, UI_ICON_HYDRATION) - mymob.healths = new /obj/screen/ascent_nymph_health(null, mymob, ui_style, ui_color, ui_alpha, UI_ICON_HEALTH) - other = list() - adding = list(mymob.healths, molt, food, drink) - ..() - -/obj/screen/ascent_nymph_health +/obj/screen/health/ascent_nymph name = "health" screen_loc = ANYMPH_SCREEN_LOC_HEALTH + +/obj/screen/ascent_nymph_molt + name = "molt" + icon = 'mods/species/ascent/icons/ui_molt.dmi' + screen_loc = ANYMPH_SCREEN_LOC_MOLT + icon_state = "molt-on" + requires_ui_style = FALSE + +/obj/screen/ascent_nymph_molt/handle_click(mob/user, params) + var/mob/living/simple_animal/alien/kharmaan/nymph = user + if(istype(nymph)) + nymph.molt() diff --git a/mods/species/bayliens/_bayliens.dm b/mods/species/bayliens/_bayliens.dm deleted file mode 100644 index 80febefc65ea..000000000000 --- a/mods/species/bayliens/_bayliens.dm +++ /dev/null @@ -1,40 +0,0 @@ -#define SPECIES_SKRELL "Skrell" -#define SPECIES_TAJARA "Tajara" -#define SPECIES_LIZARD "Unathi" -#define SPECIES_ADHERENT "Adherent" - -#define BODYTYPE_FELINE "feline body" -#define BODYTYPE_ADHERENT "adherent body" - -#define BODY_EQUIP_FLAG_FELINE BITFLAG(7) - -/decl/modpack/bayliens - name = "Baystation 12 Aliens" - tabloid_headlines = list( - "SHOCKING FIGURES REVEAL MORE TEENS DIE TO UNATHI HONOUR DUELS THAN GUN VIOLENCE", - "LOCAL UNATHI SYMPATHIZER: 'I really think you should stop with these spacebaiting articles.'", - "DO UNATHI SYMPATHIZERS HATE THE HUMAN RACE?", - "TENTACLES OF TERROR: SKRELL BLACK OPS SEIGE NYX NAVAL DEPOT. SHOCKING PHOTOGRAPHS INSIDE!", - "LOCAL MAN HAS SEIZURE AFTER SAYING SKRELLIAN NAME; FORCED ASSIMILATION SOON?", - "TAJARANS: CUTE AND CUDDLY, OR INFILTRATING THE GOVERNMENT? FIND OUT MORE INSIDE" - ) - -/decl/modpack/bayliens/pre_initialize() - ..() - SSmodpacks.default_submap_whitelisted_species |= SPECIES_TAJARA - SSmodpacks.default_submap_whitelisted_species |= SPECIES_LIZARD - SSmodpacks.default_submap_whitelisted_species |= SPECIES_SKRELL - SSmodpacks.default_submap_whitelisted_species |= SPECIES_ADHERENT - -/mob/living/human/Process_Spacemove(allow_movement) - . = ..() - if(.) - return - // This is horrible but short of spawning a jetpack inside the organ than locating - // it, I don't really see another viable approach short of a total jetpack refactor. - for(var/obj/item/organ/internal/powered/jets/jet in get_internal_organs()) - if(!jet.is_broken() && jet.active) - // Unlike Bay, we don't check or unset inertia_dir here - // because the spacedrift subsystem checks the return value of this proc - // and unsets inertia_dir if it returns nonzero. - return 1 diff --git a/mods/species/bayliens/_bayliens.dme b/mods/species/bayliens/_bayliens.dme deleted file mode 100644 index 014aba6cf5d8..000000000000 --- a/mods/species/bayliens/_bayliens.dme +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef MODPACK_BAYLIENS -#define MODPACK_BAYLIENS -// BEGIN_INCLUDE -#include "_bayliens.dm" -#include "_overrides.dm" -#include "adherent\_adherent.dm" -#include "adherent\datum\culture.dm" -#include "adherent\datum\emotes.dm" -#include "adherent\datum\faction.dm" -#include "adherent\datum\language.dm" -#include "adherent\datum\location.dm" -#include "adherent\datum\species.dm" -#include "adherent\datum\species_bodytypes.dm" -#include "adherent\organs\organs_external.dm" -#include "adherent\organs\organs_internal.dm" -#include "skrell\_skrell.dm" -#include "skrell\datum\accessory.dm" -#include "skrell\datum\blood.dm" -#include "skrell\datum\culture.dm" -#include "skrell\datum\descriptor.dm" -#include "skrell\datum\emotes.dm" -#include "skrell\datum\faction.dm" -#include "skrell\datum\language.dm" -#include "skrell\datum\location.dm" -#include "skrell\datum\pronouns_skrell.dm" -#include "skrell\datum\religion.dm" -#include "skrell\datum\skrell_meat.dm" -#include "skrell\datum\species.dm" -#include "skrell\datum\species_bodytype.dm" -#include "skrell\gear\ammo.dm" -#include "skrell\gear\clustertool.dm" -#include "skrell\gear\fabrication_designs.dm" -#include "skrell\gear\gear.dm" -#include "skrell\gear\gear_ears.dm" -#include "skrell\gear\gear_head.dm" -#include "skrell\gear\gear_mask.dm" -#include "skrell\gear\gear_rig.dm" -#include "skrell\gear\gear_suit.dm" -#include "skrell\gear\gear_under.dm" -#include "skrell\turfs\flooring.dm" -#include "tajaran\_tajaran.dm" -#include "tajaran\datum\accessory.dm" -#include "tajaran\datum\blood.dm" -#include "tajaran\datum\culture.dm" -#include "tajaran\datum\emotes.dm" -#include "tajaran\datum\language.dm" -#include "tajaran\datum\species.dm" -#include "tajaran\datum\species_bodytypes.dm" -#include "tajaran\machinery\suit_cycler.dm" -#include "tritonian\_tritonian.dm" -#include "tritonian\datum\species.dm" -#include "tritonian\datum\species_bodytypes.dm" -#include "unathi\_lizard.dm" -#include "unathi\datum\autohiss.dm" -#include "unathi\datum\blood.dm" -#include "unathi\datum\culture.dm" -#include "unathi\datum\language.dm" -#include "unathi\datum\species.dm" -#include "unathi\datum\species_bodytypes.dm" -#include "unathi\datum\sprite_accessory.dm" -#include "unathi\organs\organs_internal.dm" -// END_INCLUDE -#endif diff --git a/mods/species/bayliens/_overrides.dm b/mods/species/bayliens/_overrides.dm deleted file mode 100644 index 5eb6f5a85583..000000000000 --- a/mods/species/bayliens/_overrides.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/item - var/_feline_onmob_icon - -/obj/item/setup_sprite_sheets() - . = ..() - if(_feline_onmob_icon) - LAZYSET(sprite_sheets, BODYTYPE_FELINE, _feline_onmob_icon) diff --git a/mods/species/bayliens/skrell/_skrell.dm b/mods/species/bayliens/skrell/_skrell.dm deleted file mode 100644 index 74094628d1e2..000000000000 --- a/mods/species/bayliens/skrell/_skrell.dm +++ /dev/null @@ -1,4 +0,0 @@ - -/mob/living/human/skrell/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) - species_name = SPECIES_SKRELL - . = ..() \ No newline at end of file diff --git a/mods/species/bayliens/tajaran/_tajaran.dm b/mods/species/bayliens/tajaran/_tajaran.dm deleted file mode 100644 index 151b2b1c8a7a..000000000000 --- a/mods/species/bayliens/tajaran/_tajaran.dm +++ /dev/null @@ -1,9 +0,0 @@ -#define LANGUAGE_TAJARA "Siik'maas" - -/obj/item/clothing/setup_equip_flags() - . = ..() - if(bodytype_equip_flags & BODY_EQUIP_FLAG_EXCLUDE) - bodytype_equip_flags |= BODY_EQUIP_FLAG_FELINE - -/mob/living/human/tajaran/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) - . = ..(species_name = SPECIES_TAJARA) diff --git a/mods/species/bayliens/tajaran/datum/blood.dm b/mods/species/bayliens/tajaran/datum/blood.dm deleted file mode 100644 index 29282ccbd58d..000000000000 --- a/mods/species/bayliens/tajaran/datum/blood.dm +++ /dev/null @@ -1,58 +0,0 @@ -/decl/blood_type/feline - antigen_category = "feline" - splatter_colour = "#862a51" - abstract_type = /decl/blood_type/feline - -/decl/blood_type/feline/mplus - name = "M+" - antigens = list("M", "Fe") - random_weighting = 28 - -/decl/blood_type/feline/mminus - name = "M-" - antigens = list("M") - random_weighting = 3 - -/decl/blood_type/feline/rplus - name = "R+" - antigens = list("R", "Fe") - random_weighting = 20 - -/decl/blood_type/feline/rminus - name = "R-" - antigens = list("R",) - -/decl/blood_type/feline/mrplus - name = "MR+" - antigens = list("M", "R", "Fe") - random_weighting = 5 - -/decl/blood_type/feline/mrminus - name = "MR-" - antigens = list("M", "R") - -/decl/blood_type/feline/oplus - name = "Of+" - antigens = list("Fe") - random_weighting = 36 - -/decl/blood_type/feline/ominus - name = "Of-" - random_weighting = 4 - -/obj/item/chems/ivbag/blood/feline_mplus - label_text = "M+" -/obj/item/chems/ivbag/blood/feline_mminus - label_text = "M-" -/obj/item/chems/ivbag/blood/feline_rplus - label_text = "R+" -/obj/item/chems/ivbag/blood/feline_mminus - label_text = "M-" -/obj/item/chems/ivbag/blood/feline_mrplus - label_text = "MR+" -/obj/item/chems/ivbag/blood/feline_mrminus - label_text = "MR-" -/obj/item/chems/ivbag/blood/feline_oplus - label_text = "Of+" -/obj/item/chems/ivbag/blood/feline_oplus - label_text = "Of-" diff --git a/mods/species/bayliens/tajaran/machinery/suit_cycler.dm b/mods/species/bayliens/tajaran/machinery/suit_cycler.dm deleted file mode 100644 index e3be8485345b..000000000000 --- a/mods/species/bayliens/tajaran/machinery/suit_cycler.dm +++ /dev/null @@ -1,52 +0,0 @@ -/obj/machinery/suit_cycler/Initialize() - LAZYDISTINCTADD(available_bodytypes, BODYTYPE_FELINE) - . = ..() - -/obj/item/clothing/suit/space/void/merc - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/merc/suit.dmi' - -/obj/item/clothing/suit/space/void/swat - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/deathsquad/suit.dmi' - -/obj/item/clothing/suit/space/void/engineering - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/engineering/suit.dmi' - -/obj/item/clothing/suit/space/void/mining - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/mining/suit.dmi' - -/obj/item/clothing/suit/space/void/medical - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/medical/suit.dmi' - -/obj/item/clothing/suit/space/void/security - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/sec/suit.dmi' - -/obj/item/clothing/suit/space/void/atmos - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/atmos/suit.dmi' - -/obj/item/clothing/suit/space/void/engineering/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/engineering_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/mining/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/mining_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/medical/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/medical_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/security/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/sec_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/atmos/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/atmos_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/engineering/salvage - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/salvage/suit.dmi' - -/obj/item/clothing/suit/space/void/expedition - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/pilot/suit.dmi' - -/obj/item/clothing/suit/space/void - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/nasa/suit.dmi' - - -/obj/item/clothing/suit/space/void/excavation - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/excavation/suit.dmi' diff --git a/mods/species/bayliens/tritonian/_tritonian.dm b/mods/species/bayliens/tritonian/_tritonian.dm deleted file mode 100644 index 52ec72110ffe..000000000000 --- a/mods/species/bayliens/tritonian/_tritonian.dm +++ /dev/null @@ -1 +0,0 @@ -#define SPECIES_TRITONIAN "Tritonian" diff --git a/mods/species/bayliens/unathi/_lizard.dm b/mods/species/bayliens/unathi/_lizard.dm deleted file mode 100644 index 5db7c43c7a07..000000000000 --- a/mods/species/bayliens/unathi/_lizard.dm +++ /dev/null @@ -1,5 +0,0 @@ -#define LANGUAGE_LIZARD "Sinta'unathi" - -/mob/living/human/lizard/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) - species_name = SPECIES_LIZARD - . = ..() diff --git a/mods/species/drakes/drake_emotes.dm b/mods/species/drakes/drake_emotes.dm index 14af84c05cf6..a641bc6cf236 100644 --- a/mods/species/drakes/drake_emotes.dm +++ b/mods/species/drakes/drake_emotes.dm @@ -99,12 +99,7 @@ return var/mob/living/victim = target - var/decl/species/species = victim.get_species() - if(species?.check_no_slip(victim)) - return - - var/obj/item/clothing/shoes = victim.get_equipped_item(slot_shoes_str) - if(istype(shoes) && (shoes.item_flags & ITEM_FLAG_NOSLIP)) + if(!victim.can_slip()) return var/mob/user_mob = user diff --git a/mods/species/neoavians/clothing.dm b/mods/species/neoavians/clothing.dm index db6790ea35e7..3c78ace7940f 100644 --- a/mods/species/neoavians/clothing.dm +++ b/mods/species/neoavians/clothing.dm @@ -43,7 +43,6 @@ name = "smock" desc = "A loose-fitting smock favoured by neo-avians." icon = 'mods/species/neoavians/icons/clothing/under/smock.dmi' - icon_state = ICON_STATE_WORLD bodytype_equip_flags = BODY_EQUIP_FLAG_AVIAN _avian_onmob_icon = null @@ -83,7 +82,6 @@ /obj/item/clothing/shoes/avian name = "small shoes" - icon = 'mods/species/neoavians/icons/clothing/feet/shoes.dmi' color = COLOR_GRAY bodytype_equip_flags = BODY_EQUIP_FLAG_AVIAN _avian_onmob_icon = null @@ -95,4 +93,4 @@ icon = 'mods/species/neoavians/icons/clothing/feet/footwraps.dmi' _base_attack_force = 1 item_flags = ITEM_FLAG_SILENT - w_class = ITEM_SIZE_SMALL \ No newline at end of file + w_class = ITEM_SIZE_SMALL diff --git a/mods/species/neoavians/icons/clothing/feet/shoes.dmi b/mods/species/neoavians/icons/clothing/feet/shoes.dmi index 1cbe0ed4adf6..842c03257065 100644 Binary files a/mods/species/neoavians/icons/clothing/feet/shoes.dmi and b/mods/species/neoavians/icons/clothing/feet/shoes.dmi differ diff --git a/mods/species/neoavians/icons/clothing/spacesuit/void/pilot/helmet.dmi b/mods/species/neoavians/icons/clothing/spacesuit/void/expedition/helmet.dmi similarity index 100% rename from mods/species/neoavians/icons/clothing/spacesuit/void/pilot/helmet.dmi rename to mods/species/neoavians/icons/clothing/spacesuit/void/expedition/helmet.dmi diff --git a/mods/species/neoavians/icons/clothing/spacesuit/void/pilot/suit.dmi b/mods/species/neoavians/icons/clothing/spacesuit/void/expedition/suit.dmi similarity index 100% rename from mods/species/neoavians/icons/clothing/spacesuit/void/pilot/suit.dmi rename to mods/species/neoavians/icons/clothing/spacesuit/void/expedition/suit.dmi diff --git a/mods/species/neoavians/icons/clothing/under/jumpsuit.dmi b/mods/species/neoavians/icons/clothing/under/jumpsuit.dmi new file mode 100644 index 000000000000..6db5380e5890 Binary files /dev/null and b/mods/species/neoavians/icons/clothing/under/jumpsuit.dmi differ diff --git a/mods/species/neoavians/machinery/suit_cycler.dm b/mods/species/neoavians/machinery/suit_cycler.dm index 4397f39c94db..5a59ed475b36 100644 --- a/mods/species/neoavians/machinery/suit_cycler.dm +++ b/mods/species/neoavians/machinery/suit_cycler.dm @@ -59,10 +59,10 @@ //pilot /obj/item/clothing/head/helmet/space/void/expedition - _avian_onmob_icon = 'mods/species/neoavians/icons/clothing/spacesuit/void/pilot/helmet.dmi' + _avian_onmob_icon = 'mods/species/neoavians/icons/clothing/spacesuit/void/expedition/helmet.dmi' /obj/item/clothing/suit/space/void/expedition - _avian_onmob_icon = 'mods/species/neoavians/icons/clothing/spacesuit/void/pilot/suit.dmi' + _avian_onmob_icon = 'mods/species/neoavians/icons/clothing/spacesuit/void/expedition/suit.dmi' //merc /obj/item/clothing/head/helmet/space/void/merc diff --git a/mods/species/random_species/_random_species.dm b/mods/species/random_species/_random_species.dm new file mode 100644 index 000000000000..7f20e9a608f5 --- /dev/null +++ b/mods/species/random_species/_random_species.dm @@ -0,0 +1,8 @@ +#define SPECIES_ALIEN "Humanoid" + +/decl/modpack/random_species + name = "Random Alien Species" + +/decl/modpack/random_species/initialize() + . = ..() + SSmodpacks.default_submap_blacklisted_species += SPECIES_ALIEN diff --git a/mods/species/random_species/_random_species.dme b/mods/species/random_species/_random_species.dme new file mode 100644 index 000000000000..fda80f4abf42 --- /dev/null +++ b/mods/species/random_species/_random_species.dme @@ -0,0 +1,9 @@ +#ifndef SPECIES_PACK_RANDOM +#define SPECIES_PACK_RANDOM +// BEGIN_INCLUDE +#include "_random_species.dm" +#include "aliumizer.dm" +#include "random_species_bodytype.dm" +#include "random_species_species.dm" +// END_INCLUDE +#endif diff --git a/mods/species/random_species/aliumizer.dm b/mods/species/random_species/aliumizer.dm new file mode 100644 index 000000000000..6d7ab1e57964 --- /dev/null +++ b/mods/species/random_species/aliumizer.dm @@ -0,0 +1,34 @@ +/obj/structure/aliumizer + name = "alien monolith" + desc = "Your true form is calling. Use this to become an alien humanoid." + icon = 'icons/obj/xenoarchaeology.dmi' // todo: duplicate icon in modpack to avoid skew from upstream changes? + icon_state = "ano51" + anchored = TRUE + +/obj/structure/aliumizer/attack_hand(mob/user) + SHOULD_CALL_PARENT(FALSE) + if(!ishuman(user)) + to_chat(user, SPAN_WARNING("You've got no business touching this.")) + return TRUE + var/decl/species/species = user.get_species() + if(!species) + return TRUE + if(species.name == SPECIES_ALIEN) + to_chat(user, SPAN_WARNING("You're already a [SPECIES_ALIEN].")) + return TRUE + if(alert("Are you sure you want to be an alien?", "Mom Look I'm An Alien!", "Yes", "No") == "No") + to_chat(user, SPAN_NOTICE("You are now a [SPECIES_ALIEN]!")) + return TRUE + if(species.name == SPECIES_ALIEN) //no spamming it to get free implants + return TRUE + to_chat(user, "You're now an alien humanoid of some undiscovered species. Make up what lore you want, no one knows a thing about your species! You can check info about your traits with Check Species Info verb in IC tab.") + to_chat(user, "You can't speak any other languages by default. You can use translator implant that spawns on top of this monolith - it will give you knowledge of any language if you hear it enough times.") + var/mob/living/human/H = user + new /obj/item/implanter/translator(get_turf(src)) + H.change_species(SPECIES_ALIEN) + var/decl/background_detail/background = H.get_background_datum_by_flag(BACKGROUND_FLAG_NAMING) + H.fully_replace_character_name(background.get_random_name(H, H.gender)) + H.rename_self("Humanoid Alien", 1) + return TRUE + +OPTIONAL_SPAWNER(aliumizer, /obj/structure/aliumizer) \ No newline at end of file diff --git a/mods/species/random_species/random_species_bodytype.dm b/mods/species/random_species/random_species_bodytype.dm new file mode 100644 index 000000000000..b4a015834ff8 --- /dev/null +++ b/mods/species/random_species/random_species_bodytype.dm @@ -0,0 +1,28 @@ +/decl/bodytype/alium + name = "humanoid" + bodytype_category = BODYTYPE_HUMANOID + icon_base = 'icons/mob/human_races/species/humanoid/body.dmi' + bandages_icon = 'icons/mob/bandage.dmi' + limb_blend = ICON_MULTIPLY + appearance_flags = HAS_SKIN_COLOR + body_flags = BODY_FLAG_NO_DNA | BODY_FLAG_NO_DEFIB | BODY_FLAG_NO_STASIS + uid = "bodytype_alium" + +/decl/bodytype/alium/Initialize() + if(prob(10)) + movement_slowdown += pick(-1,1) + if(prob(5)) + body_flags |= BODY_FLAG_NO_PAIN + base_color = RANDOM_RGB + MULT_BY_RANDOM_COEF(eye_flash_mod, 0.5, 1.5) + eye_darksight_range = rand(1,8) + var/temp_comfort_shift = rand(-50,50) + cold_level_1 += temp_comfort_shift + cold_level_2 += temp_comfort_shift + cold_level_3 += temp_comfort_shift + heat_level_1 += temp_comfort_shift + heat_level_2 += temp_comfort_shift + heat_level_3 += temp_comfort_shift + heat_discomfort_level += temp_comfort_shift + cold_discomfort_level += temp_comfort_shift + . = ..() \ No newline at end of file diff --git a/mods/species/random_species/random_species_species.dm b/mods/species/random_species/random_species_species.dm new file mode 100644 index 000000000000..06f431624ac4 --- /dev/null +++ b/mods/species/random_species/random_species_species.dm @@ -0,0 +1,80 @@ +/decl/species/alium + name = SPECIES_ALIEN + name_plural = "Humanoids" + description = "Some alien humanoid species, unknown to humanity. How exciting." + rarity_value = 5 + hidden_from_codex = TRUE + + spawn_flags = SPECIES_IS_RESTRICTED + + available_bodytypes = list(/decl/bodytype/alium) + + force_background_info = list( + /decl/background_category/heritage = /decl/background_detail/heritage/hidden/alium + ) + + exertion_effect_chance = 10 + exertion_hydration_scale = 1 + exertion_reagent_scale = 1 + exertion_reagent_path = /decl/material/liquid/lactate + exertion_emotes_biological = list( + /decl/emote/exertion/biological, + /decl/emote/exertion/biological/breath, + /decl/emote/exertion/biological/pant + ) + var/blood_color + +/decl/species/alium/Initialize() + + //Coloring + blood_color = RANDOM_RGB + flesh_color = RANDOM_RGB + + //Combat stats + MULT_BY_RANDOM_COEF(total_health, 0.8, 1.2) + MULT_BY_RANDOM_COEF(brute_mod, 0.5, 1.5) + MULT_BY_RANDOM_COEF(burn_mod, 0.8, 1.2) + MULT_BY_RANDOM_COEF(oxy_mod, 0.5, 1.5) + MULT_BY_RANDOM_COEF(toxins_mod, 0, 2) + MULT_BY_RANDOM_COEF(radiation_mod, 0, 2) + + if(brute_mod < 1 && prob(40)) + species_flags |= SPECIES_FLAG_NO_MINOR_CUT + if(brute_mod < 0.9 && prob(40)) + species_flags |= SPECIES_FLAG_NO_EMBED + if(toxins_mod < 0.1) + species_flags |= SPECIES_FLAG_NO_POISON + + //Gastronomic traits + taste_sensitivity = pick(TASTE_HYPERSENSITIVE, TASTE_SENSITIVE, TASTE_DULL, TASTE_NUMB) + gluttonous = pick(0, GLUT_TINY, GLUT_SMALLER, GLUT_ANYTHING) + stomach_capacity = 5 * stomach_capacity + if(prob(20)) + gluttonous |= pick(GLUT_ITEM_TINY, GLUT_ITEM_NORMAL, GLUT_ITEM_ANYTHING, GLUT_PROJECTILE_VOMIT) + if(gluttonous & GLUT_ITEM_ANYTHING) + stomach_capacity += ITEM_SIZE_HUGE + + //Environment + var/temp_comfort_shift = rand(-50,50) + body_temperature += temp_comfort_shift + + var/pressure_comfort_shift = rand(-50,50) + hazard_high_pressure += pressure_comfort_shift + warning_high_pressure += pressure_comfort_shift + warning_low_pressure += pressure_comfort_shift + hazard_low_pressure += pressure_comfort_shift + + //Misc traits + if(prob(40)) + available_pronouns = list(/decl/pronouns) + if(prob(10)) + species_flags |= SPECIES_FLAG_NO_SLIP + if(prob(10)) + species_flags |= SPECIES_FLAG_NO_TANGLE + + . = ..() + +/decl/species/alium/get_species_blood_color(mob/living/human/H) + if(istype(H) && H.isSynthetic()) + return ..() + return blood_color \ No newline at end of file diff --git a/mods/species/serpentid/mobs/bodyparts_serpentid.dm b/mods/species/serpentid/mobs/bodyparts_serpentid.dm index 31f79e3f7c93..55aa7fd4eff7 100644 --- a/mods/species/serpentid/mobs/bodyparts_serpentid.dm +++ b/mods/species/serpentid/mobs/bodyparts_serpentid.dm @@ -20,7 +20,7 @@ /obj/item/organ/internal/eyes/insectoid/serpentid/refresh_action_button() . = ..() - if(.) + if(. && istype(action)) action.button_icon_state = "shield-[eyes_shielded ? 1 : 0]" action.button?.update_icon() @@ -77,13 +77,13 @@ H.heal_damage(OXY, HUMAN_MAX_OXYLOSS * oxygenated) if(breath_fail_ratio < 0.25 && oxygenated) - SET_HUD_ALERT(H, /decl/hud_element/condition/oxygen, 0) + SET_HUD_ALERT(H, HUD_OXY, 0) if(breath_fail_ratio >= 0.25 && (damage || world.time > last_successful_breath + 2 MINUTES)) H.take_damage(HUMAN_MAX_OXYLOSS * breath_fail_ratio, OXY) if(oxygenated) - SET_HUD_ALERT(H, /decl/hud_element/condition/oxygen, 1) + SET_HUD_ALERT(H, HUD_OXY, 1) else - SET_HUD_ALERT(H, /decl/hud_element/condition/oxygen, 2) + SET_HUD_ALERT(H, HUD_OXY, 2) /obj/item/organ/internal/brain/insectoid/serpentid var/lowblood_tally = 0 @@ -129,7 +129,7 @@ /obj/item/organ/external/chest/insectoid/serpentid/refresh_action_button() . = ..() - if(.) + if(. && istype(action)) action.button_icon_state = "threat" action.button?.update_icon() @@ -184,7 +184,7 @@ /obj/item/organ/external/groin/insectoid/serpentid/refresh_action_button() . = ..() - if(.) + if(. && istype(action)) action.button_icon_state = "cloak-[owner && owner.is_cloaked_by(species) ? 1 : 0]" action.button?.update_icon() diff --git a/mods/species/skrell/_skrell.dm b/mods/species/skrell/_skrell.dm new file mode 100644 index 000000000000..c038ee1d7d22 --- /dev/null +++ b/mods/species/skrell/_skrell.dm @@ -0,0 +1,16 @@ +#define SPECIES_SKRELL "Skrell" + +/decl/modpack/skrell + name = "Skrell Species" + tabloid_headlines = list( + "TENTACLES OF TERROR: SKRELL BLACK OPS SEIGE NYX NAVAL DEPOT. SHOCKING PHOTOGRAPHS INSIDE!", + "LOCAL MAN HAS SEIZURE AFTER SAYING SKRELLIAN NAME; FORCED ASSIMILATION SOON?" + ) + +/decl/modpack/skrell/pre_initialize() + ..() + SSmodpacks.default_submap_whitelisted_species |= SPECIES_SKRELL + +/mob/living/human/skrell/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) + species_name = SPECIES_SKRELL + . = ..() diff --git a/mods/species/skrell/_skrell.dme b/mods/species/skrell/_skrell.dme new file mode 100644 index 000000000000..e10b661dadb6 --- /dev/null +++ b/mods/species/skrell/_skrell.dme @@ -0,0 +1,30 @@ +#ifndef MODPACK_SPECIES_SKRELL +#define MODPACK_SPECIES_SKRELL +// BEGIN_INCLUDE +#include "_skrell.dm" +#include "datum\accessory.dm" +#include "datum\blood.dm" +#include "datum\culture.dm" +#include "datum\descriptor.dm" +#include "datum\emotes.dm" +#include "datum\faction.dm" +#include "datum\language.dm" +#include "datum\location.dm" +#include "datum\pronouns_skrell.dm" +#include "datum\religion.dm" +#include "datum\skrell_meat.dm" +#include "datum\species.dm" +#include "datum\species_bodytype.dm" +#include "gear\ammo.dm" +#include "gear\clustertool.dm" +#include "gear\fabrication_designs.dm" +#include "gear\gear.dm" +#include "gear\gear_ears.dm" +#include "gear\gear_head.dm" +#include "gear\gear_mask.dm" +#include "gear\gear_rig.dm" +#include "gear\gear_suit.dm" +#include "gear\gear_under.dm" +#include "turfs\flooring.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/skrell/datum/accessory.dm b/mods/species/skrell/datum/accessory.dm similarity index 97% rename from mods/species/bayliens/skrell/datum/accessory.dm rename to mods/species/skrell/datum/accessory.dm index 99213a4e0c16..86dc5b9755ab 100644 --- a/mods/species/bayliens/skrell/datum/accessory.dm +++ b/mods/species/skrell/datum/accessory.dm @@ -1,6 +1,6 @@ /decl/sprite_accessory/hair/skrell name = "Kanin - Very Short Headtails" - icon = 'mods/species/bayliens/skrell/icons/body/hair.dmi' + icon = 'mods/species/skrell/icons/body/hair.dmi' icon_state = "very_short" species_allowed = list(SPECIES_SKRELL) uid = "acc_hair_skrell_veryshort" diff --git a/mods/species/bayliens/skrell/datum/blood.dm b/mods/species/skrell/datum/blood.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/blood.dm rename to mods/species/skrell/datum/blood.dm diff --git a/mods/species/bayliens/skrell/datum/culture.dm b/mods/species/skrell/datum/culture.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/culture.dm rename to mods/species/skrell/datum/culture.dm diff --git a/mods/species/bayliens/skrell/datum/descriptor.dm b/mods/species/skrell/datum/descriptor.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/descriptor.dm rename to mods/species/skrell/datum/descriptor.dm diff --git a/mods/species/bayliens/skrell/datum/emotes.dm b/mods/species/skrell/datum/emotes.dm similarity index 91% rename from mods/species/bayliens/skrell/datum/emotes.dm rename to mods/species/skrell/datum/emotes.dm index 3bb122ec9122..098bc81c3b3f 100644 --- a/mods/species/bayliens/skrell/datum/emotes.dm +++ b/mods/species/skrell/datum/emotes.dm @@ -10,7 +10,7 @@ /decl/emote/audible/warble key = "warble" emote_message_3p = "$USER$ warbles." - emote_sound = 'mods/species/bayliens/skrell/sound/warble.ogg' + emote_sound = 'mods/species/skrell/sound/warble.ogg' /decl/emote/audible/croak key = "croak" diff --git a/mods/species/bayliens/skrell/datum/faction.dm b/mods/species/skrell/datum/faction.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/faction.dm rename to mods/species/skrell/datum/faction.dm diff --git a/mods/species/bayliens/skrell/datum/language.dm b/mods/species/skrell/datum/language.dm similarity index 84% rename from mods/species/bayliens/skrell/datum/language.dm rename to mods/species/skrell/datum/language.dm index d103e2351f18..6068a692a1dd 100644 --- a/mods/species/bayliens/skrell/datum/language.dm +++ b/mods/species/skrell/datum/language.dm @@ -1,5 +1,5 @@ -var/global/list/first_name_skrell = file2list("mods/species/bayliens/skrell/names/first_name_skrell.txt") -var/global/list/last_name_skrell = file2list("mods/species/bayliens/skrell/names/last_name_skrell.txt") +var/global/list/first_name_skrell = file2list("mods/species/skrell/names/first_name_skrell.txt") +var/global/list/last_name_skrell = file2list("mods/species/skrell/names/last_name_skrell.txt") /decl/language/skrell name = "Common Skrellian" diff --git a/mods/species/bayliens/skrell/datum/location.dm b/mods/species/skrell/datum/location.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/location.dm rename to mods/species/skrell/datum/location.dm diff --git a/mods/species/bayliens/skrell/datum/pronouns_skrell.dm b/mods/species/skrell/datum/pronouns_skrell.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/pronouns_skrell.dm rename to mods/species/skrell/datum/pronouns_skrell.dm diff --git a/mods/species/bayliens/skrell/datum/religion.dm b/mods/species/skrell/datum/religion.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/religion.dm rename to mods/species/skrell/datum/religion.dm diff --git a/mods/species/bayliens/skrell/datum/skrell_meat.dm b/mods/species/skrell/datum/skrell_meat.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/skrell_meat.dm rename to mods/species/skrell/datum/skrell_meat.dm diff --git a/mods/species/bayliens/skrell/datum/species.dm b/mods/species/skrell/datum/species.dm similarity index 97% rename from mods/species/bayliens/skrell/datum/species.dm rename to mods/species/skrell/datum/species.dm index c52a6dc67358..ac49a3c8a8b9 100644 --- a/mods/species/bayliens/skrell/datum/species.dm +++ b/mods/species/skrell/datum/species.dm @@ -45,7 +45,7 @@ spawn_flags = SPECIES_CAN_JOIN flesh_color = "#8cd7a3" - organs_icon = 'mods/species/bayliens/skrell/icons/body/organs.dmi' + organs_icon = 'mods/species/skrell/icons/body/organs.dmi' blood_types = list( /decl/blood_type/skrell/yplus, @@ -144,4 +144,4 @@ /obj/item/organ/internal/eyes/skrell name = "amphibian eyes" desc = "Large black orbs, belonging to some sort of giant frog by looks of it." - icon = 'mods/species/bayliens/skrell/icons/body/organs.dmi' + icon = 'mods/species/skrell/icons/body/organs.dmi' diff --git a/mods/species/bayliens/skrell/datum/species_bodytype.dm b/mods/species/skrell/datum/species_bodytype.dm similarity index 90% rename from mods/species/bayliens/skrell/datum/species_bodytype.dm rename to mods/species/skrell/datum/species_bodytype.dm index 2bd89cc0562e..b4f0d5d9ce1d 100644 --- a/mods/species/bayliens/skrell/datum/species_bodytype.dm +++ b/mods/species/skrell/datum/species_bodytype.dm @@ -1,12 +1,12 @@ /decl/bodytype/skrell name = "skrellian body" - icon_base = 'mods/species/bayliens/skrell/icons/body/body.dmi' + icon_base = 'mods/species/skrell/icons/body/body.dmi' bandages_icon = 'icons/mob/bandage.dmi' health_hud_intensity = 1.75 associated_gender = PLURAL eye_darksight_range = 4 eye_flash_mod = 1.2 - eye_icon = 'mods/species/bayliens/skrell/icons/body/eyes.dmi' + eye_icon = 'mods/species/skrell/icons/body/eyes.dmi' apply_eye_colour = FALSE uid = "bodytype_skrell" appearance_flags = HAS_UNDERWEAR | HAS_SKIN_COLOR diff --git a/mods/species/bayliens/skrell/gear/ammo.dm b/mods/species/skrell/gear/ammo.dm similarity index 82% rename from mods/species/bayliens/skrell/gear/ammo.dm rename to mods/species/skrell/gear/ammo.dm index e9c331157d84..a7a979853e94 100644 --- a/mods/species/bayliens/skrell/gear/ammo.dm +++ b/mods/species/skrell/gear/ammo.dm @@ -1,7 +1,7 @@ /obj/item/magnetic_ammo/skrell name = "ZT-8 cylinder" desc = "A magazine containing flechettes, the design harkening back to cylinders on revolvers." - icon = 'mods/species/bayliens/skrell/icons/gear/skrell_rifle.dmi' + icon = 'mods/species/skrell/icons/gear/skrell_rifle.dmi' icon_state = "skrell_magazine" projectile_type = /obj/item/projectile/bullet/magnetic/slug projectile_name = "slug" diff --git a/mods/species/bayliens/skrell/gear/clustertool.dm b/mods/species/skrell/gear/clustertool.dm similarity index 92% rename from mods/species/bayliens/skrell/gear/clustertool.dm rename to mods/species/skrell/gear/clustertool.dm index 31d153a593d8..7a00e5c94a06 100644 --- a/mods/species/bayliens/skrell/gear/clustertool.dm +++ b/mods/species/skrell/gear/clustertool.dm @@ -1,7 +1,7 @@ /obj/item/clustertool name = "alien clustertool" desc = "A bewilderingly complex knot of tool heads." - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "clustertool" w_class = ITEM_SIZE_SMALL diff --git a/mods/species/bayliens/skrell/gear/fabrication_designs.dm b/mods/species/skrell/gear/fabrication_designs.dm similarity index 100% rename from mods/species/bayliens/skrell/gear/fabrication_designs.dm rename to mods/species/skrell/gear/fabrication_designs.dm diff --git a/mods/species/bayliens/skrell/gear/gear.dm b/mods/species/skrell/gear/gear.dm similarity index 93% rename from mods/species/bayliens/skrell/gear/gear.dm rename to mods/species/skrell/gear/gear.dm index 40788b67b9b6..52b33e247137 100644 --- a/mods/species/bayliens/skrell/gear/gear.dm +++ b/mods/species/skrell/gear/gear.dm @@ -21,7 +21,7 @@ /obj/item/cell/skrell name = "skrellian microfusion cell" desc = "An impossibly tiny fusion power engine of Skrell design." - icon = 'mods/species/bayliens/skrell/icons/gear/gear.dmi' + icon = 'mods/species/skrell/icons/gear/gear.dmi' icon_state = "skrellcell" maxcharge = 1500 w_class = ITEM_SIZE_NORMAL @@ -43,7 +43,7 @@ /obj/item/shield/energy/skrell name = "skrellian combat shield" desc = "An alien shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." - icon = 'mods/species/bayliens/skrell/icons/gear/e_shield.dmi' + icon = 'mods/species/skrell/icons/gear/e_shield.dmi' icon_state = "skrellshield" shield_light_color = "#bf7efc" @@ -55,7 +55,7 @@ w_class = ITEM_SIZE_NORMAL icon_state = ICON_STATE_WORLD slot_flags = SLOT_LOWER_BODY|SLOT_HOLSTER - icon = 'mods/species/bayliens/skrell/icons/gear/skrell_pistol.dmi' + icon = 'mods/species/skrell/icons/gear/skrell_pistol.dmi' max_shots = 10 fire_delay = 6 one_hand_penalty = 1 @@ -71,7 +71,7 @@ /obj/item/gun/magnetic/railgun/skrell name = "ZT-8 Railgun" desc = "The Zquiv*Tzuuli-8, or ZT-8, is a railgun rarely seen by anyone other than those within Skrellian SDTF ranks. The rotary magazine houses a cylinder with individual chambers, that press against the barrel when loaded." - icon = 'mods/species/bayliens/skrell/icons/gear/skrell_rifle.dmi' + icon = 'mods/species/skrell/icons/gear/skrell_rifle.dmi' icon_state = ICON_STATE_WORLD item_state = "skrell_rifle" one_hand_penalty = 3 @@ -89,7 +89,7 @@ /obj/item/gun/energy/pulse_rifle/skrell name = "VT-3 Carbine" - icon = 'mods/species/bayliens/skrell/icons/gear/skrell_carbine.dmi' + icon = 'mods/species/skrell/icons/gear/skrell_carbine.dmi' icon_state = ICON_STATE_WORLD item_state = "skrell_carbine" slot_flags = SLOT_BACK|SLOT_LOWER_BODY diff --git a/mods/species/bayliens/skrell/gear/gear_ears.dm b/mods/species/skrell/gear/gear_ears.dm similarity index 67% rename from mods/species/bayliens/skrell/gear/gear_ears.dm rename to mods/species/skrell/gear/gear_ears.dm index b2d1a45501a9..338e30307fe3 100644 --- a/mods/species/bayliens/skrell/gear/gear_ears.dm +++ b/mods/species/skrell/gear/gear_ears.dm @@ -10,35 +10,35 @@ /obj/item/clothing/ears/skrell/band name = "headtail bands" desc = "Metallic bands worn by skrell to adorn their head tails." - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/band.dmi' - drop_sound = 'mods/species/bayliens/skrell/sound/drop/accessory.ogg' - pickup_sound = 'mods/species/bayliens/skrell/sound/pickup/accessory.ogg' + icon = 'mods/species/skrell/icons/clothing/ears/band.dmi' + drop_sound = 'mods/species/skrell/sound/drop/accessory.ogg' + pickup_sound = 'mods/species/skrell/sound/pickup/accessory.ogg' /obj/item/clothing/ears/skrell/band/chains name = "very short headtail chains" desc = "A delicate chain worn by skrell to decorate their headtails." - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/chains_very_short.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/chains_very_short.dmi' /obj/item/clothing/ears/skrell/band/chains/short name = "short headtail chains" - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/chains_short.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/chains_short.dmi' /obj/item/clothing/ears/skrell/band/chains/long name = "long headtail chains" - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/chains_long.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/chains_long.dmi' /obj/item/clothing/ears/skrell/band/chains/very_long name = "very long headtail chains" - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/chains_very_long.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/chains_very_long.dmi' /obj/item/clothing/ears/skrell/cloth name = "short headtail cloth" desc = "A cloth shawl worn by skrell draped around their head tails." - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/cloth_short.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/cloth_short.dmi' /obj/item/clothing/ears/skrell/cloth/long name = "long headtail cloth" - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/cloth_long.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/cloth_long.dmi' /decl/loadout_option/ears/skrell name = "skrell headtail accessory selection" diff --git a/mods/species/bayliens/skrell/gear/gear_head.dm b/mods/species/skrell/gear/gear_head.dm similarity index 81% rename from mods/species/bayliens/skrell/gear/gear_head.dm rename to mods/species/skrell/gear/gear_head.dm index 6621dd11301d..655c5b99824f 100644 --- a/mods/species/bayliens/skrell/gear/gear_head.dm +++ b/mods/species/skrell/gear/gear_head.dm @@ -1,6 +1,6 @@ /obj/item/clothing/head/helmet/space/void/skrell name = "alien helmet" - icon = 'mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_white.dmi' + icon = 'mods/species/skrell/icons/clothing/head/skrell_helmet_white.dmi' desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl." armor = list( ARMOR_MELEE = ARMOR_MELEE_KNIVES, @@ -18,12 +18,12 @@ return FALSE /obj/item/clothing/head/helmet/space/void/skrell/black - icon = 'mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_black.dmi' + icon = 'mods/species/skrell/icons/clothing/head/skrell_helmet_black.dmi' /obj/item/clothing/head/helmet/skrell name = "skrellian helmet" desc = "A helmet built for use by a Skrell. This one appears to be fairly standard and reliable." - icon = 'mods/species/bayliens/skrell/icons/clothing/head/helmet_skrell.dmi' + icon = 'mods/species/skrell/icons/clothing/head/helmet_skrell.dmi' /obj/item/clothing/head/helmet/skrell/mob_can_equip(mob/user, slot, disable_warning = FALSE, force = FALSE, ignore_equipped = FALSE) . = ..() diff --git a/mods/species/bayliens/skrell/gear/gear_mask.dm b/mods/species/skrell/gear/gear_mask.dm similarity index 90% rename from mods/species/bayliens/skrell/gear/gear_mask.dm rename to mods/species/skrell/gear/gear_mask.dm index 1d14f847fd5c..c28f99aa4871 100644 --- a/mods/species/bayliens/skrell/gear/gear_mask.dm +++ b/mods/species/skrell/gear/gear_mask.dm @@ -7,7 +7,7 @@ /obj/item/clothing/mask/gas/skrell name = "skrellian gill cover" desc = "A comfy technological piece used typically by those suffering from gill-related disorders. It goes around the neck and shoulders with a small water tank on the back, featuring a hookup for oxytanks to keep the water oxygenated." - icon = 'mods/species/bayliens/skrell/icons/clothing/mask/gill_cover.dmi' + icon = 'mods/species/skrell/icons/clothing/mask/gill_cover.dmi' flags_inv = 0 body_parts_covered = 0 diff --git a/mods/species/bayliens/skrell/gear/gear_rig.dm b/mods/species/skrell/gear/gear_rig.dm similarity index 80% rename from mods/species/bayliens/skrell/gear/gear_rig.dm rename to mods/species/skrell/gear/gear_rig.dm index 0272c6797448..ed16f4d45e79 100644 --- a/mods/species/bayliens/skrell/gear/gear_rig.dm +++ b/mods/species/skrell/gear/gear_rig.dm @@ -2,7 +2,7 @@ /obj/item/rig/skrell name = "skrellian recon hardsuit control module" desc = "A powerful recon hardsuit with integrated power supply and atmosphere. Its impressive design perfectly tailors to the user's body." - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/rig.dmi' suit_type = "recon hardsuit" armor = list( ARMOR_MELEE = ARMOR_MELEE_RESISTANT, @@ -41,20 +41,20 @@ // req_access = list("ACCESS_SKRELLSCOUT") /obj/item/clothing/head/helmet/space/rig/skrell - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/boots.dmi' /obj/item/clothing/gloves/rig/skrell - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/gloves.dmi' siemens_coefficient = 0 //Skrell Engineering Suit /obj/item/rig/skrell/eng name = "skrellian engineering hardsuit" desc = "A highly sophisticated, cutting-edge engineering hardsuit with an integrated power supply and atmosphere. Its impressive design is resistant yet extremely lightweight, perfectly tailoring itself to the user's body" - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/rig.dmi' suit_type = "engineering hardsuit" chest = /obj/item/clothing/suit/space/rig/skrell/eng helmet = /obj/item/clothing/head/helmet/space/rig/skrell/eng @@ -73,20 +73,20 @@ ) /obj/item/clothing/head/helmet/space/rig/skrell/eng - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell/eng - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell/eng - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/boots.dmi' /obj/item/clothing/gloves/rig/skrell/eng - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/gloves.dmi' //Skrell Medical Suit /obj/item/rig/skrell/med name = "skrellian medical hardsuit" desc = "A highly sophisticated, cutting-edge medical hardsuit with an integrated power supply and atmosphere. Its impressive design is resistant yet extremely lightweight, perfectly tailoring itself to the user's body" - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/rig.dmi' initial_modules = list( /obj/item/rig_module/vision, /obj/item/rig_module/chem_dispenser/injector, @@ -103,19 +103,19 @@ gloves = /obj/item/clothing/gloves/rig/skrell/med /obj/item/clothing/head/helmet/space/rig/skrell/med - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell/med - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell/med - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/boots.dmi' /obj/item/clothing/gloves/rig/skrell/med - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/gloves.dmi' //Skrell Combat Suit /obj/item/rig/skrell/sec name = "skrellian combat hardsuit" desc = "A highly sophisticated, cutting-edge combat hardsuit with an integrated power supply and atmosphere. Its impressive design is resistant yet extremely lightweight, perfectly tailoring itself to the user's body" - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/rig.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_MAJOR, ARMOR_BULLET = ARMOR_BALLISTIC_AP, @@ -139,19 +139,19 @@ gloves = /obj/item/clothing/gloves/rig/skrell/sec /obj/item/clothing/head/helmet/space/rig/skrell/sec - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell/sec - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell/sec - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/boots.dmi' /obj/item/clothing/gloves/rig/skrell/sec - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/gloves.dmi' //Skrell Command Suit /obj/item/rig/skrell/cmd name = "skrellian command hardsuit" desc = "A highly sophisticated, cutting-edge hardsuit with an integrated power supply and atmosphere. Its impressive design is resistant yet extremely lightweight, perfectly tailoring itself to the user's body. Property of the Qrii'Vuxix" - icon = 'mods/species/bayliens/skrell/icons/rigs/command/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/command/rig.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_MAJOR, ARMOR_BULLET = ARMOR_BALLISTIC_AP, @@ -175,20 +175,20 @@ gloves = /obj/item/clothing/gloves/rig/skrell/cmd /obj/item/clothing/head/helmet/space/rig/skrell/cmd - icon = 'mods/species/bayliens/skrell/icons/rigs/command/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/command/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell/cmd - icon = 'mods/species/bayliens/skrell/icons/rigs/command/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/command/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell/cmd - icon = 'mods/species/bayliens/skrell/icons/rigs/command/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/command/boots.dmi' /obj/item/clothing/gloves/rig/skrell/cmd - icon = 'mods/species/bayliens/skrell/icons/rigs/command/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/command/gloves.dmi' /obj/item/rig_module/device/clustertool/skrell name = "skrellian clustertool" desc = "A complex assembly of self-guiding, modular heads capable of performing most manual tasks." interface_name = "modular clustertool" interface_desc = "A complex assembly of self-guiding, modular heads capable of performing most manual tasks." - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "clustertool" engage_string = "Select Mode" device = /obj/item/clustertool @@ -208,7 +208,7 @@ interface_name = "multitool" interface_desc = "A limited-sentience integrated multitool capable of interfacing with any number of systems." device = /obj/item/multitool/ - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "multitool" usable = FALSE selectable = TRUE @@ -225,7 +225,7 @@ interface_name = "cable fabricator" interface_desc = "A cable nanofabricator of Skrellian design." device = /obj/item/stack/cable_coil/fabricator - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "cablecoil" usable = FALSE selectable = TRUE @@ -235,7 +235,7 @@ desc = "An electrical cutting torch of Skrellian design." interface_name = "welding arm" interface_desc = "An electrical cutting torch of Skrellian design." - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "welder1" engage_string = "Toggle Welder" device = /obj/item/weldingtool/electric diff --git a/mods/species/bayliens/skrell/gear/gear_suit.dm b/mods/species/skrell/gear/gear_suit.dm similarity index 83% rename from mods/species/bayliens/skrell/gear/gear_suit.dm rename to mods/species/skrell/gear/gear_suit.dm index 891da81aa2db..f9b5947f421d 100644 --- a/mods/species/bayliens/skrell/gear/gear_suit.dm +++ b/mods/species/skrell/gear/gear_suit.dm @@ -1,6 +1,6 @@ /obj/item/clothing/suit/space/void/skrell name = "Skrellian voidsuit" - icon = 'mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_white.dmi' + icon = 'mods/species/skrell/icons/clothing/suit/skrell_suit_white.dmi' desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic." allowed = list( /obj/item/rcd, @@ -23,4 +23,4 @@ flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/space/void/skrell/black - icon = 'mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_black.dmi' \ No newline at end of file + icon = 'mods/species/skrell/icons/clothing/suit/skrell_suit_black.dmi' \ No newline at end of file diff --git a/mods/species/bayliens/skrell/gear/gear_under.dm b/mods/species/skrell/gear/gear_under.dm similarity index 73% rename from mods/species/bayliens/skrell/gear/gear_under.dm rename to mods/species/skrell/gear/gear_under.dm index e2ee16307dc2..5a194a14ac40 100644 --- a/mods/species/bayliens/skrell/gear/gear_under.dm +++ b/mods/species/skrell/gear/gear_under.dm @@ -1,4 +1,4 @@ /obj/item/clothing/jumpsuit/skrell name = "black bodysuit" desc = "A sleek, skin-tight bodysuit designed to not wick moisture away from the body. The inner stitching appears to contain something written in Skrellian." - icon = 'mods/species/bayliens/skrell/icons/clothing/under/skrell_uniform.dmi' + icon = 'mods/species/skrell/icons/clothing/under/skrell_uniform.dmi' diff --git a/mods/species/bayliens/skrell/icons/body/body.dmi b/mods/species/skrell/icons/body/body.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/body.dmi rename to mods/species/skrell/icons/body/body.dmi diff --git a/mods/species/bayliens/skrell/icons/body/eyes.dmi b/mods/species/skrell/icons/body/eyes.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/eyes.dmi rename to mods/species/skrell/icons/body/eyes.dmi diff --git a/mods/species/bayliens/skrell/icons/body/hair.dmi b/mods/species/skrell/icons/body/hair.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/hair.dmi rename to mods/species/skrell/icons/body/hair.dmi diff --git a/mods/species/bayliens/skrell/icons/body/organs.dmi b/mods/species/skrell/icons/body/organs.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/organs.dmi rename to mods/species/skrell/icons/body/organs.dmi diff --git a/mods/species/bayliens/skrell/icons/body/preview.dmi b/mods/species/skrell/icons/body/preview.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/preview.dmi rename to mods/species/skrell/icons/body/preview.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_badge.dmi b/mods/species/skrell/icons/clothing/accessories/obj_skrell_badge.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_badge.dmi rename to mods/species/skrell/icons/clothing/accessories/obj_skrell_badge.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_blank.dmi b/mods/species/skrell/icons/clothing/accessories/obj_skrell_blank.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_blank.dmi rename to mods/species/skrell/icons/clothing/accessories/obj_skrell_blank.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi b/mods/species/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi rename to mods/species/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi b/mods/species/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi rename to mods/species/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/band.dmi b/mods/species/skrell/icons/clothing/ears/band.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/band.dmi rename to mods/species/skrell/icons/clothing/ears/band.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/chains_long.dmi b/mods/species/skrell/icons/clothing/ears/chains_long.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/chains_long.dmi rename to mods/species/skrell/icons/clothing/ears/chains_long.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/chains_short.dmi b/mods/species/skrell/icons/clothing/ears/chains_short.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/chains_short.dmi rename to mods/species/skrell/icons/clothing/ears/chains_short.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/chains_very_long.dmi b/mods/species/skrell/icons/clothing/ears/chains_very_long.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/chains_very_long.dmi rename to mods/species/skrell/icons/clothing/ears/chains_very_long.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/chains_very_short.dmi b/mods/species/skrell/icons/clothing/ears/chains_very_short.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/chains_very_short.dmi rename to mods/species/skrell/icons/clothing/ears/chains_very_short.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/cloth_long.dmi b/mods/species/skrell/icons/clothing/ears/cloth_long.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/cloth_long.dmi rename to mods/species/skrell/icons/clothing/ears/cloth_long.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/cloth_short.dmi b/mods/species/skrell/icons/clothing/ears/cloth_short.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/cloth_short.dmi rename to mods/species/skrell/icons/clothing/ears/cloth_short.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/head/helmet_skrell.dmi b/mods/species/skrell/icons/clothing/head/helmet_skrell.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/head/helmet_skrell.dmi rename to mods/species/skrell/icons/clothing/head/helmet_skrell.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_black.dmi b/mods/species/skrell/icons/clothing/head/skrell_helmet_black.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_black.dmi rename to mods/species/skrell/icons/clothing/head/skrell_helmet_black.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_white.dmi b/mods/species/skrell/icons/clothing/head/skrell_helmet_white.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_white.dmi rename to mods/species/skrell/icons/clothing/head/skrell_helmet_white.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/mask/gill_cover.dmi b/mods/species/skrell/icons/clothing/mask/gill_cover.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/mask/gill_cover.dmi rename to mods/species/skrell/icons/clothing/mask/gill_cover.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_black.dmi b/mods/species/skrell/icons/clothing/suit/skrell_suit_black.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_black.dmi rename to mods/species/skrell/icons/clothing/suit/skrell_suit_black.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_white.dmi b/mods/species/skrell/icons/clothing/suit/skrell_suit_white.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_white.dmi rename to mods/species/skrell/icons/clothing/suit/skrell_suit_white.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/under/skrell_uniform.dmi b/mods/species/skrell/icons/clothing/under/skrell_uniform.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/under/skrell_uniform.dmi rename to mods/species/skrell/icons/clothing/under/skrell_uniform.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/ammo_unused.dmi b/mods/species/skrell/icons/gear/ammo_unused.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/ammo_unused.dmi rename to mods/species/skrell/icons/gear/ammo_unused.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/e_shield.dmi b/mods/species/skrell/icons/gear/e_shield.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/e_shield.dmi rename to mods/species/skrell/icons/gear/e_shield.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/gear.dmi b/mods/species/skrell/icons/gear/gear.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/gear.dmi rename to mods/species/skrell/icons/gear/gear.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/gear_rig.dmi b/mods/species/skrell/icons/gear/gear_rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/gear_rig.dmi rename to mods/species/skrell/icons/gear/gear_rig.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/skrell_carbine.dmi b/mods/species/skrell/icons/gear/skrell_carbine.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/skrell_carbine.dmi rename to mods/species/skrell/icons/gear/skrell_carbine.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/skrell_pistol.dmi b/mods/species/skrell/icons/gear/skrell_pistol.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/skrell_pistol.dmi rename to mods/species/skrell/icons/gear/skrell_pistol.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/skrell_rifle.dmi b/mods/species/skrell/icons/gear/skrell_rifle.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/skrell_rifle.dmi rename to mods/species/skrell/icons/gear/skrell_rifle.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/boots.dmi b/mods/species/skrell/icons/rigs/combat/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/boots.dmi rename to mods/species/skrell/icons/rigs/combat/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/chest.dmi b/mods/species/skrell/icons/rigs/combat/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/chest.dmi rename to mods/species/skrell/icons/rigs/combat/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/gloves.dmi b/mods/species/skrell/icons/rigs/combat/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/gloves.dmi rename to mods/species/skrell/icons/rigs/combat/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/helmet.dmi b/mods/species/skrell/icons/rigs/combat/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/helmet.dmi rename to mods/species/skrell/icons/rigs/combat/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/rig.dmi b/mods/species/skrell/icons/rigs/combat/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/rig.dmi rename to mods/species/skrell/icons/rigs/combat/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/boots.dmi b/mods/species/skrell/icons/rigs/command/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/boots.dmi rename to mods/species/skrell/icons/rigs/command/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/chest.dmi b/mods/species/skrell/icons/rigs/command/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/chest.dmi rename to mods/species/skrell/icons/rigs/command/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/gloves.dmi b/mods/species/skrell/icons/rigs/command/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/gloves.dmi rename to mods/species/skrell/icons/rigs/command/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/helmet.dmi b/mods/species/skrell/icons/rigs/command/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/helmet.dmi rename to mods/species/skrell/icons/rigs/command/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/rig.dmi b/mods/species/skrell/icons/rigs/command/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/rig.dmi rename to mods/species/skrell/icons/rigs/command/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/boots.dmi b/mods/species/skrell/icons/rigs/engineering/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/boots.dmi rename to mods/species/skrell/icons/rigs/engineering/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/chest.dmi b/mods/species/skrell/icons/rigs/engineering/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/chest.dmi rename to mods/species/skrell/icons/rigs/engineering/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/gloves.dmi b/mods/species/skrell/icons/rigs/engineering/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/gloves.dmi rename to mods/species/skrell/icons/rigs/engineering/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/helmet.dmi b/mods/species/skrell/icons/rigs/engineering/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/helmet.dmi rename to mods/species/skrell/icons/rigs/engineering/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/rig.dmi b/mods/species/skrell/icons/rigs/engineering/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/rig.dmi rename to mods/species/skrell/icons/rigs/engineering/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/boots.dmi b/mods/species/skrell/icons/rigs/medical/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/boots.dmi rename to mods/species/skrell/icons/rigs/medical/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/chest.dmi b/mods/species/skrell/icons/rigs/medical/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/chest.dmi rename to mods/species/skrell/icons/rigs/medical/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/gloves.dmi b/mods/species/skrell/icons/rigs/medical/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/gloves.dmi rename to mods/species/skrell/icons/rigs/medical/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/helmet.dmi b/mods/species/skrell/icons/rigs/medical/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/helmet.dmi rename to mods/species/skrell/icons/rigs/medical/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/rig.dmi b/mods/species/skrell/icons/rigs/medical/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/rig.dmi rename to mods/species/skrell/icons/rigs/medical/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/boots.dmi b/mods/species/skrell/icons/rigs/standard/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/boots.dmi rename to mods/species/skrell/icons/rigs/standard/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/chest.dmi b/mods/species/skrell/icons/rigs/standard/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/chest.dmi rename to mods/species/skrell/icons/rigs/standard/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/gloves.dmi b/mods/species/skrell/icons/rigs/standard/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/gloves.dmi rename to mods/species/skrell/icons/rigs/standard/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/helmet.dmi b/mods/species/skrell/icons/rigs/standard/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/helmet.dmi rename to mods/species/skrell/icons/rigs/standard/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/rig.dmi b/mods/species/skrell/icons/rigs/standard/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/rig.dmi rename to mods/species/skrell/icons/rigs/standard/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/turf/skrellturf.dmi b/mods/species/skrell/icons/turf/skrellturf.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/turf/skrellturf.dmi rename to mods/species/skrell/icons/turf/skrellturf.dmi diff --git a/mods/species/bayliens/skrell/names/first_name_skrell.txt b/mods/species/skrell/names/first_name_skrell.txt similarity index 100% rename from mods/species/bayliens/skrell/names/first_name_skrell.txt rename to mods/species/skrell/names/first_name_skrell.txt diff --git a/mods/species/bayliens/skrell/names/last_name_skrell.txt b/mods/species/skrell/names/last_name_skrell.txt similarity index 100% rename from mods/species/bayliens/skrell/names/last_name_skrell.txt rename to mods/species/skrell/names/last_name_skrell.txt diff --git a/mods/species/bayliens/skrell/sound/accessory.ogg b/mods/species/skrell/sound/accessory.ogg similarity index 100% rename from mods/species/bayliens/skrell/sound/accessory.ogg rename to mods/species/skrell/sound/accessory.ogg diff --git a/mods/species/bayliens/skrell/sound/drop/accessory.ogg b/mods/species/skrell/sound/drop/accessory.ogg similarity index 100% rename from mods/species/bayliens/skrell/sound/drop/accessory.ogg rename to mods/species/skrell/sound/drop/accessory.ogg diff --git a/mods/species/bayliens/skrell/sound/pickup/accessory.ogg b/mods/species/skrell/sound/pickup/accessory.ogg similarity index 100% rename from mods/species/bayliens/skrell/sound/pickup/accessory.ogg rename to mods/species/skrell/sound/pickup/accessory.ogg diff --git a/mods/species/bayliens/skrell/sound/warble.ogg b/mods/species/skrell/sound/warble.ogg similarity index 100% rename from mods/species/bayliens/skrell/sound/warble.ogg rename to mods/species/skrell/sound/warble.ogg diff --git a/mods/species/bayliens/skrell/turfs/flooring.dm b/mods/species/skrell/turfs/flooring.dm similarity index 90% rename from mods/species/bayliens/skrell/turfs/flooring.dm rename to mods/species/skrell/turfs/flooring.dm index 8a35d60d164b..255c64ebb71b 100644 --- a/mods/species/bayliens/skrell/turfs/flooring.dm +++ b/mods/species/skrell/turfs/flooring.dm @@ -1,5 +1,5 @@ /turf/floor/tiled/skrell - icon = 'mods/species/bayliens/skrell/icons/turf/skrellturf.dmi' + icon = 'mods/species/skrell/icons/turf/skrellturf.dmi' icon_state = "skrellblack" _flooring = /decl/flooring/reinforced/shuttle/skrell @@ -26,7 +26,7 @@ ///////////////////////////////////////////////////////////////////////// /decl/flooring/reinforced/shuttle/skrell - icon = 'mods/species/bayliens/skrell/icons/turf/skrellturf.dmi' + icon = 'mods/species/skrell/icons/turf/skrellturf.dmi' icon_base = "skrellblack" /decl/flooring/reinforced/shuttle/skrell/white diff --git a/mods/species/tajaran/_tajaran.dm b/mods/species/tajaran/_tajaran.dm new file mode 100644 index 000000000000..cb92dbfae89c --- /dev/null +++ b/mods/species/tajaran/_tajaran.dm @@ -0,0 +1,24 @@ +#define LANGUAGE_TAJARAN "Siik'maas" +#define SPECIES_TAJARAN "Tajara" +#define BODYTYPE_TAJARAN "felinoid body" + +/decl/modpack/tajaran + name = "Tajaran Species" + tabloid_headlines = list( + "TAJARANS: CUTE AND CUDDLY, OR INFILTRATING THE GOVERNMENT? FIND OUT MORE INSIDE" + ) + +/decl/modpack/tajaran/pre_initialize() + ..() + SSmodpacks.default_submap_whitelisted_species |= SPECIES_TAJARAN + +/mob/living/human/tajaran/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) + . = ..(species_name = SPECIES_TAJARAN) + +/obj/item + var/_tajaran_onmob_icon + +/obj/item/setup_sprite_sheets() + . = ..() + if(_tajaran_onmob_icon) + LAZYSET(sprite_sheets, BODYTYPE_TAJARAN, _tajaran_onmob_icon) diff --git a/mods/species/tajaran/_tajaran.dme b/mods/species/tajaran/_tajaran.dme new file mode 100644 index 000000000000..a1ebf288ceca --- /dev/null +++ b/mods/species/tajaran/_tajaran.dme @@ -0,0 +1,14 @@ +#ifndef MODPACK_SPECIES_TAJARAN +#define MODPACK_SPECIES_TAJARAN +// BEGIN_INCLUDE +#include "_tajaran.dm" +#include "datum\accessory.dm" +#include "datum\blood.dm" +#include "datum\culture.dm" +#include "datum\emotes.dm" +#include "datum\language.dm" +#include "datum\species.dm" +#include "datum\species_bodytypes.dm" +#include "machinery\suit_cycler.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/tajaran/datum/accessory.dm b/mods/species/tajaran/datum/accessory.dm similarity index 96% rename from mods/species/bayliens/tajaran/datum/accessory.dm rename to mods/species/tajaran/datum/accessory.dm index 0aa3121da545..33d858efac46 100644 --- a/mods/species/bayliens/tajaran/datum/accessory.dm +++ b/mods/species/tajaran/datum/accessory.dm @@ -2,8 +2,8 @@ /decl/sprite_accessory/hair/taj name = "Tajaran Rattail" icon_state = "hair_rattail" - species_allowed = list(SPECIES_TAJARA) - icon = 'mods/species/bayliens/tajaran/icons/hair.dmi' + species_allowed = list(SPECIES_TAJARAN) + icon = 'mods/species/tajaran/icons/hair.dmi' color_blend = ICON_MULTIPLY uid = "acc_hair_taj_rattail" @@ -135,8 +135,8 @@ /decl/sprite_accessory/facial_hair/taj name = "Tajaran Sideburns" icon_state = "facial_sideburns" - species_allowed = list(SPECIES_TAJARA) - icon = 'mods/species/bayliens/tajaran/icons/facial.dmi' + species_allowed = list(SPECIES_TAJARAN) + icon = 'mods/species/tajaran/icons/facial.dmi' color_blend = ICON_MULTIPLY uid = "acc_fhair_taj_sideburns" @@ -168,8 +168,8 @@ /decl/sprite_accessory/marking/tajaran name = "Tajaran Nose" icon_state = "nose" - icon = 'mods/species/bayliens/tajaran/icons/markings.dmi' - species_allowed = list(SPECIES_TAJARA) + icon = 'mods/species/tajaran/icons/markings.dmi' + species_allowed = list(SPECIES_TAJARAN) body_parts = list(BP_HEAD) color_blend = ICON_MULTIPLY uid = "acc_marking_taj_nose" diff --git a/mods/species/tajaran/datum/blood.dm b/mods/species/tajaran/datum/blood.dm new file mode 100644 index 000000000000..e993197f5327 --- /dev/null +++ b/mods/species/tajaran/datum/blood.dm @@ -0,0 +1,58 @@ +/decl/blood_type/tajaran + antigen_category = "Tajaran" + splatter_colour = "#862a51" + abstract_type = /decl/blood_type/tajaran + +/decl/blood_type/tajaran/mplus + name = "M+" + antigens = list("M", "Fe") + random_weighting = 28 + +/decl/blood_type/tajaran/mminus + name = "M-" + antigens = list("M") + random_weighting = 3 + +/decl/blood_type/tajaran/rplus + name = "R+" + antigens = list("R", "Fe") + random_weighting = 20 + +/decl/blood_type/tajaran/rminus + name = "R-" + antigens = list("R",) + +/decl/blood_type/tajaran/mrplus + name = "MR+" + antigens = list("M", "R", "Fe") + random_weighting = 5 + +/decl/blood_type/tajaran/mrminus + name = "MR-" + antigens = list("M", "R") + +/decl/blood_type/tajaran/oplus + name = "Of+" + antigens = list("Fe") + random_weighting = 36 + +/decl/blood_type/tajaran/ominus + name = "Of-" + random_weighting = 4 + +/obj/item/chems/ivbag/blood/tajaran_mplus + label_text = "M+" +/obj/item/chems/ivbag/blood/tajaran_mminus + label_text = "M-" +/obj/item/chems/ivbag/blood/tajaran_rplus + label_text = "R+" +/obj/item/chems/ivbag/blood/tajaran_mminus + label_text = "M-" +/obj/item/chems/ivbag/blood/tajaran_mrplus + label_text = "MR+" +/obj/item/chems/ivbag/blood/tajaran_mrminus + label_text = "MR-" +/obj/item/chems/ivbag/blood/tajaran_oplus + label_text = "Of+" +/obj/item/chems/ivbag/blood/tajaran_oplus + label_text = "Of-" diff --git a/mods/species/bayliens/tajaran/datum/culture.dm b/mods/species/tajaran/datum/culture.dm similarity index 100% rename from mods/species/bayliens/tajaran/datum/culture.dm rename to mods/species/tajaran/datum/culture.dm diff --git a/mods/species/bayliens/tajaran/datum/emotes.dm b/mods/species/tajaran/datum/emotes.dm similarity index 53% rename from mods/species/bayliens/tajaran/datum/emotes.dm rename to mods/species/tajaran/datum/emotes.dm index adeed0c5c8d6..9dff98489016 100644 --- a/mods/species/bayliens/tajaran/datum/emotes.dm +++ b/mods/species/tajaran/datum/emotes.dm @@ -1,9 +1,9 @@ /decl/emote/audible/purr key = "purr" emote_message_3p = "$USER$ purrs." - emote_sound = 'mods/species/bayliens/tajaran/sound/cat_purr.ogg' + emote_sound = 'mods/species/tajaran/sound/cat_purr.ogg' /decl/emote/audible/purrlong key = "purrl" emote_message_3p = "$USER$ purrs." - emote_sound = 'mods/species/bayliens/tajaran/sound/cat_purr_long.ogg' + emote_sound = 'mods/species/tajaran/sound/cat_purr_long.ogg' diff --git a/mods/species/bayliens/tajaran/datum/language.dm b/mods/species/tajaran/datum/language.dm similarity index 98% rename from mods/species/bayliens/tajaran/datum/language.dm rename to mods/species/tajaran/datum/language.dm index 08427f4f6344..ae3b42f9293b 100644 --- a/mods/species/bayliens/tajaran/datum/language.dm +++ b/mods/species/tajaran/datum/language.dm @@ -1,5 +1,5 @@ /decl/language/tajaran - name = LANGUAGE_TAJARA + name = LANGUAGE_TAJARAN desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran." speech_verb = "purrs" ask_verb = "purrs" diff --git a/mods/species/bayliens/tajaran/datum/species.dm b/mods/species/tajaran/datum/species.dm similarity index 79% rename from mods/species/bayliens/tajaran/datum/species.dm rename to mods/species/tajaran/datum/species.dm index 19de51ffc360..4feacd90c5b7 100644 --- a/mods/species/bayliens/tajaran/datum/species.dm +++ b/mods/species/tajaran/datum/species.dm @@ -12,13 +12,13 @@ ) /decl/species/tajaran - name = SPECIES_TAJARA + name = SPECIES_TAJARAN name_plural = "Tajaran" base_external_prosthetics_model = null description = "A small mammalian carnivore. If you are reading this, you are probably a Tajaran." hidden_from_codex = FALSE - available_bodytypes = list(/decl/bodytype/feline) + available_bodytypes = list(/decl/bodytype/tajaran) traits = list(/decl/trait/malus/intolerance/caffeine = TRAIT_LEVEL_MAJOR) @@ -27,19 +27,19 @@ spawn_flags = SPECIES_CAN_JOIN blood_types = list( - /decl/blood_type/feline/mplus, - /decl/blood_type/feline/mminus, - /decl/blood_type/feline/rplus, - /decl/blood_type/feline/rminus, - /decl/blood_type/feline/mrplus, - /decl/blood_type/feline/mrminus, - /decl/blood_type/feline/oplus, - /decl/blood_type/feline/ominus + /decl/blood_type/tajaran/mplus, + /decl/blood_type/tajaran/mminus, + /decl/blood_type/tajaran/rplus, + /decl/blood_type/tajaran/rminus, + /decl/blood_type/tajaran/mrplus, + /decl/blood_type/tajaran/mrminus, + /decl/blood_type/tajaran/oplus, + /decl/blood_type/tajaran/ominus ) flesh_color = "#ae7d32" - organs_icon = 'mods/species/bayliens/tajaran/icons/organs.dmi' + organs_icon = 'mods/species/tajaran/icons/organs.dmi' hunger_factor = DEFAULT_HUNGER_FACTOR * 1.2 thirst_factor = DEFAULT_THIRST_FACTOR * 1.2 @@ -72,7 +72,7 @@ "р" = list("рр", "ррр", "рррр")//thats not "pi" ) - autohiss_exempt = list(LANGUAGE_TAJARA) + autohiss_exempt = list(LANGUAGE_TAJARAN) /decl/species/tajaran/handle_additional_hair_loss(var/mob/living/human/H, var/defer_body_update = TRUE) . = H?.set_skin_colour(rgb(189, 171, 143)) diff --git a/mods/species/bayliens/tajaran/datum/species_bodytypes.dm b/mods/species/tajaran/datum/species_bodytypes.dm similarity index 72% rename from mods/species/bayliens/tajaran/datum/species_bodytypes.dm rename to mods/species/tajaran/datum/species_bodytypes.dm index 0088067d9b28..f2ae05c42dcf 100644 --- a/mods/species/bayliens/tajaran/datum/species_bodytypes.dm +++ b/mods/species/tajaran/datum/species_bodytypes.dm @@ -1,21 +1,21 @@ -/decl/bodytype/feline - name = "humanoid" - bodytype_category = BODYTYPE_FELINE +/decl/bodytype/tajaran + name = "felinoid" + bodytype_category = BODYTYPE_TAJARAN limb_blend = ICON_MULTIPLY - icon_template = 'mods/species/bayliens/tajaran/icons/template.dmi' - icon_base = 'mods/species/bayliens/tajaran/icons/body.dmi' - icon_deformed = 'mods/species/bayliens/tajaran/icons/deformed_body.dmi' + icon_template = 'mods/species/tajaran/icons/template.dmi' + icon_base = 'mods/species/tajaran/icons/body.dmi' + icon_deformed = 'mods/species/tajaran/icons/deformed_body.dmi' bandages_icon = 'icons/mob/bandage.dmi' - skeletal_icon = 'mods/species/bayliens/tajaran/icons/skeleton.dmi' - cosmetics_icon = 'mods/species/bayliens/tajaran/icons/cosmetics.dmi' + skeletal_icon = 'mods/species/tajaran/icons/skeleton.dmi' + cosmetics_icon = 'mods/species/tajaran/icons/cosmetics.dmi' health_hud_intensity = 1.75 - bodytype_flag = BODY_EQUIP_FLAG_FELINE + bodytype_flag = BODY_EQUIP_FLAG_HUMANOID movement_slowdown = -0.5 appearance_flags = HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR base_color = "#ae7d32" base_eye_color = "#00aa00" nail_noun = "claws" - uid = "bodytype_feline" + uid = "bodytype_tajaran" footprints_icon = 'icons/mob/footprints/footprints_paw.dmi' age_descriptor = /datum/appearance_descriptor/age/tajaran @@ -23,7 +23,7 @@ eye_darksight_range = 7 eye_flash_mod = 2 eye_blend = ICON_MULTIPLY - eye_icon = 'mods/species/bayliens/tajaran/icons/eyes.dmi' + eye_icon = 'mods/species/tajaran/icons/eyes.dmi' eye_low_light_vision_effectiveness = 0.15 eye_low_light_vision_adjustment_speed = 0.3 @@ -55,7 +55,7 @@ "Your overheated skin itches." ) -/decl/bodytype/feline/Initialize() +/decl/bodytype/tajaran/Initialize() _equip_adjust = list( (slot_glasses_str) = list( "[NORTH]" = list(0, 2), @@ -78,7 +78,7 @@ ) . = ..() -/decl/bodytype/feline/get_default_grooming_results(obj/item/organ/external/limb, obj/item/grooming/tool) +/decl/bodytype/tajaran/get_default_grooming_results(obj/item/organ/external/limb, obj/item/grooming/tool) if(tool?.grooming_flags & GROOMABLE_BRUSH) return list( "success" = GROOMING_RESULT_SUCCESS, @@ -87,6 +87,6 @@ return ..() /obj/item/organ/external/tail/cat - tail_icon = 'mods/species/bayliens/tajaran/icons/tail.dmi' + tail_icon = 'mods/species/tajaran/icons/tail.dmi' tail_blend = ICON_MULTIPLY tail_animation_states = 1 diff --git a/mods/species/bayliens/tajaran/icons/body.dmi b/mods/species/tajaran/icons/body.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/body.dmi rename to mods/species/tajaran/icons/body.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/atmos/suit.dmi b/mods/species/tajaran/icons/clothing/atmos/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/atmos/suit.dmi rename to mods/species/tajaran/icons/clothing/atmos/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/atmos_alt/suit.dmi b/mods/species/tajaran/icons/clothing/atmos_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/atmos_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/atmos_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/deathsquad/suit.dmi b/mods/species/tajaran/icons/clothing/deathsquad/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/deathsquad/suit.dmi rename to mods/species/tajaran/icons/clothing/deathsquad/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/engineering/suit.dmi b/mods/species/tajaran/icons/clothing/engineering/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/engineering/suit.dmi rename to mods/species/tajaran/icons/clothing/engineering/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/engineering_alt/suit.dmi b/mods/species/tajaran/icons/clothing/engineering_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/engineering_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/engineering_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/excavation/suit.dmi b/mods/species/tajaran/icons/clothing/excavation/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/excavation/suit.dmi rename to mods/species/tajaran/icons/clothing/excavation/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/medical/suit.dmi b/mods/species/tajaran/icons/clothing/medical/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/medical/suit.dmi rename to mods/species/tajaran/icons/clothing/medical/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/medical_alt/suit.dmi b/mods/species/tajaran/icons/clothing/medical_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/medical_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/medical_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/merc/suit.dmi b/mods/species/tajaran/icons/clothing/merc/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/merc/suit.dmi rename to mods/species/tajaran/icons/clothing/merc/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/mining/suit.dmi b/mods/species/tajaran/icons/clothing/mining/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/mining/suit.dmi rename to mods/species/tajaran/icons/clothing/mining/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/mining_alt/suit.dmi b/mods/species/tajaran/icons/clothing/mining_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/mining_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/mining_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/nasa/suit.dmi b/mods/species/tajaran/icons/clothing/nasa/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/nasa/suit.dmi rename to mods/species/tajaran/icons/clothing/nasa/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/pilot/suit.dmi b/mods/species/tajaran/icons/clothing/pilot/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/pilot/suit.dmi rename to mods/species/tajaran/icons/clothing/pilot/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/salvage/suit.dmi b/mods/species/tajaran/icons/clothing/salvage/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/salvage/suit.dmi rename to mods/species/tajaran/icons/clothing/salvage/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/sec/suit.dmi b/mods/species/tajaran/icons/clothing/sec/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/sec/suit.dmi rename to mods/species/tajaran/icons/clothing/sec/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/sec_alt/suit.dmi b/mods/species/tajaran/icons/clothing/sec_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/sec_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/sec_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/wizard/suit.dmi b/mods/species/tajaran/icons/clothing/wizard/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/wizard/suit.dmi rename to mods/species/tajaran/icons/clothing/wizard/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/cosmetics.dmi b/mods/species/tajaran/icons/cosmetics.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/cosmetics.dmi rename to mods/species/tajaran/icons/cosmetics.dmi diff --git a/mods/species/bayliens/tajaran/icons/deformed_body.dmi b/mods/species/tajaran/icons/deformed_body.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/deformed_body.dmi rename to mods/species/tajaran/icons/deformed_body.dmi diff --git a/mods/species/bayliens/tajaran/icons/eyes.dmi b/mods/species/tajaran/icons/eyes.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/eyes.dmi rename to mods/species/tajaran/icons/eyes.dmi diff --git a/mods/species/bayliens/tajaran/icons/facial.dmi b/mods/species/tajaran/icons/facial.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/facial.dmi rename to mods/species/tajaran/icons/facial.dmi diff --git a/mods/species/bayliens/tajaran/icons/hair.dmi b/mods/species/tajaran/icons/hair.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/hair.dmi rename to mods/species/tajaran/icons/hair.dmi diff --git a/mods/species/bayliens/tajaran/icons/markings.dmi b/mods/species/tajaran/icons/markings.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/markings.dmi rename to mods/species/tajaran/icons/markings.dmi diff --git a/mods/species/bayliens/tajaran/icons/markings_old.dmi b/mods/species/tajaran/icons/markings_old.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/markings_old.dmi rename to mods/species/tajaran/icons/markings_old.dmi diff --git a/mods/species/bayliens/tajaran/icons/organs.dmi b/mods/species/tajaran/icons/organs.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/organs.dmi rename to mods/species/tajaran/icons/organs.dmi diff --git a/mods/species/bayliens/tajaran/icons/skeleton.dmi b/mods/species/tajaran/icons/skeleton.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/skeleton.dmi rename to mods/species/tajaran/icons/skeleton.dmi diff --git a/mods/species/bayliens/tajaran/icons/tail.dmi b/mods/species/tajaran/icons/tail.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/tail.dmi rename to mods/species/tajaran/icons/tail.dmi diff --git a/mods/species/bayliens/tajaran/icons/template.dmi b/mods/species/tajaran/icons/template.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/template.dmi rename to mods/species/tajaran/icons/template.dmi diff --git a/mods/species/tajaran/machinery/suit_cycler.dm b/mods/species/tajaran/machinery/suit_cycler.dm new file mode 100644 index 000000000000..44be03d5588e --- /dev/null +++ b/mods/species/tajaran/machinery/suit_cycler.dm @@ -0,0 +1,52 @@ +/obj/machinery/suit_cycler/Initialize() + LAZYDISTINCTADD(available_bodytypes, BODYTYPE_TAJARAN) + . = ..() + +/obj/item/clothing/suit/space/void/merc + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/merc/suit.dmi' + +/obj/item/clothing/suit/space/void/swat + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/deathsquad/suit.dmi' + +/obj/item/clothing/suit/space/void/engineering + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/engineering/suit.dmi' + +/obj/item/clothing/suit/space/void/mining + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/mining/suit.dmi' + +/obj/item/clothing/suit/space/void/medical + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/medical/suit.dmi' + +/obj/item/clothing/suit/space/void/security + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/sec/suit.dmi' + +/obj/item/clothing/suit/space/void/atmos + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/atmos/suit.dmi' + +/obj/item/clothing/suit/space/void/engineering/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/engineering_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/mining/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/mining_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/medical/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/medical_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/security/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/sec_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/atmos/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/atmos_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/engineering/salvage + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/salvage/suit.dmi' + +/obj/item/clothing/suit/space/void/expedition + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/pilot/suit.dmi' + +/obj/item/clothing/suit/space/void + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/nasa/suit.dmi' + + +/obj/item/clothing/suit/space/void/excavation + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/excavation/suit.dmi' diff --git a/mods/species/bayliens/tajaran/sound/cat_purr.ogg b/mods/species/tajaran/sound/cat_purr.ogg similarity index 100% rename from mods/species/bayliens/tajaran/sound/cat_purr.ogg rename to mods/species/tajaran/sound/cat_purr.ogg diff --git a/mods/species/bayliens/tajaran/sound/cat_purr_long.ogg b/mods/species/tajaran/sound/cat_purr_long.ogg similarity index 100% rename from mods/species/bayliens/tajaran/sound/cat_purr_long.ogg rename to mods/species/tajaran/sound/cat_purr_long.ogg diff --git a/mods/species/tritonian/_tritonian.dm b/mods/species/tritonian/_tritonian.dm new file mode 100644 index 000000000000..5b8b6ad2a6c7 --- /dev/null +++ b/mods/species/tritonian/_tritonian.dm @@ -0,0 +1,4 @@ +#define SPECIES_TRITONIAN "Tritonian" + +/decl/modpack/tritonians + name = "Tritonian Species" \ No newline at end of file diff --git a/mods/species/tritonian/_tritonian.dme b/mods/species/tritonian/_tritonian.dme new file mode 100644 index 000000000000..b1f286a9dd84 --- /dev/null +++ b/mods/species/tritonian/_tritonian.dme @@ -0,0 +1,8 @@ +#ifndef MODPACK_TRITONIAN_SPECIES +#define MODPACK_TRITONIAN_SPECIES +// BEGIN_INCLUDE +#include "_tritonian.dm" +#include "datum\species.dm" +#include "datum\species_bodytypes.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/tritonian/datum/species.dm b/mods/species/tritonian/datum/species.dm similarity index 100% rename from mods/species/bayliens/tritonian/datum/species.dm rename to mods/species/tritonian/datum/species.dm diff --git a/mods/species/bayliens/tritonian/datum/species_bodytypes.dm b/mods/species/tritonian/datum/species_bodytypes.dm similarity index 84% rename from mods/species/bayliens/tritonian/datum/species_bodytypes.dm rename to mods/species/tritonian/datum/species_bodytypes.dm index dadaac398a3d..9ee6c55a8039 100644 --- a/mods/species/bayliens/tritonian/datum/species_bodytypes.dm +++ b/mods/species/tritonian/datum/species_bodytypes.dm @@ -1,5 +1,5 @@ /decl/bodytype/human/tritonian - icon_base = 'mods/species/bayliens/tritonian/icons/body_female.dmi' + icon_base = 'mods/species/tritonian/icons/body_female.dmi' movement_slowdown = 0.5 appearance_flags = HAS_SKIN_TONE_TRITON | HAS_UNDERWEAR | HAS_EYE_COLOR uid = "bodytype_tritonian_fem" @@ -12,7 +12,7 @@ /decl/bodytype/human/tritonian/masculine name = "masculine" - icon_base = 'mods/species/bayliens/tritonian/icons/body_male.dmi' + icon_base = 'mods/species/tritonian/icons/body_male.dmi' icon_deformed = 'icons/mob/human_races/species/human/deformed_body_male.dmi' associated_gender = MALE onmob_state_modifiers = null diff --git a/mods/species/bayliens/tritonian/icons/body_female.dmi b/mods/species/tritonian/icons/body_female.dmi similarity index 100% rename from mods/species/bayliens/tritonian/icons/body_female.dmi rename to mods/species/tritonian/icons/body_female.dmi diff --git a/mods/species/bayliens/tritonian/icons/body_male.dmi b/mods/species/tritonian/icons/body_male.dmi similarity index 100% rename from mods/species/bayliens/tritonian/icons/body_male.dmi rename to mods/species/tritonian/icons/body_male.dmi diff --git a/mods/species/bayliens/tritonian/icons/tritonian_preview.dmi b/mods/species/tritonian/icons/tritonian_preview.dmi similarity index 100% rename from mods/species/bayliens/tritonian/icons/tritonian_preview.dmi rename to mods/species/tritonian/icons/tritonian_preview.dmi diff --git a/mods/species/unathi/_unathi.dm b/mods/species/unathi/_unathi.dm new file mode 100644 index 000000000000..9815aeceb09c --- /dev/null +++ b/mods/species/unathi/_unathi.dm @@ -0,0 +1,18 @@ +#define SPECIES_UNATHI "Unathi" +#define LANGUAGE_LIZARD "Sinta'unathi" + +/decl/modpack/unathi + name = "Unathi Species" + tabloid_headlines = list( + "SHOCKING FIGURES REVEAL MORE TEENS DIE TO UNATHI HONOUR DUELS THAN GUN VIOLENCE", + "LOCAL UNATHI SYMPATHIZER: 'I really think you should stop with these spacebaiting articles.'", + "DO UNATHI SYMPATHIZERS HATE THE HUMAN RACE?" + ) + +/decl/modpack/unathi/pre_initialize() + ..() + SSmodpacks.default_submap_whitelisted_species |= SPECIES_UNATHI + +/mob/living/human/unathi/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) + species_name = SPECIES_UNATHI + . = ..() diff --git a/mods/species/unathi/_unathi.dme b/mods/species/unathi/_unathi.dme new file mode 100644 index 000000000000..175b179346b6 --- /dev/null +++ b/mods/species/unathi/_unathi.dme @@ -0,0 +1,14 @@ +#ifndef MODPACK_SPECIES_UNATHI +#define MODPACK_SPECIES_UNATHI +// BEGIN_INCLUDE +#include "_unathi.dm" +#include "datum\autohiss.dm" +#include "datum\blood.dm" +#include "datum\culture.dm" +#include "datum\language.dm" +#include "datum\species.dm" +#include "datum\species_bodytypes.dm" +#include "datum\sprite_accessory.dm" +#include "organs\organs_internal.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/unathi/datum/autohiss.dm b/mods/species/unathi/datum/autohiss.dm similarity index 100% rename from mods/species/bayliens/unathi/datum/autohiss.dm rename to mods/species/unathi/datum/autohiss.dm diff --git a/mods/species/bayliens/unathi/datum/blood.dm b/mods/species/unathi/datum/blood.dm similarity index 100% rename from mods/species/bayliens/unathi/datum/blood.dm rename to mods/species/unathi/datum/blood.dm diff --git a/mods/species/bayliens/unathi/datum/culture.dm b/mods/species/unathi/datum/culture.dm similarity index 83% rename from mods/species/bayliens/unathi/datum/culture.dm rename to mods/species/unathi/datum/culture.dm index 0c1101d09e0b..4087e19f3c08 100644 --- a/mods/species/bayliens/unathi/datum/culture.dm +++ b/mods/species/unathi/datum/culture.dm @@ -1,8 +1,8 @@ -/decl/background_detail/heritage/lizard +/decl/background_detail/heritage/unathi name = "Lizard Culture" description = "The humanoid race of reptiles was able to successfully adapt to life in space. \ Despite the fact that these creatures are sensitive to cold, they have a number of fighting qualities that have evolved over their long evolved life." - language = /decl/language/lizard + language = /decl/language/unathi secondary_langs = list( /decl/language/human/common, /decl/language/sign diff --git a/mods/species/bayliens/unathi/datum/language.dm b/mods/species/unathi/datum/language.dm similarity index 97% rename from mods/species/bayliens/unathi/datum/language.dm rename to mods/species/unathi/datum/language.dm index f14b8b486ce8..e302d2208217 100644 --- a/mods/species/bayliens/unathi/datum/language.dm +++ b/mods/species/unathi/datum/language.dm @@ -1,4 +1,4 @@ -/decl/language/lizard +/decl/language/unathi name = LANGUAGE_LIZARD desc = "The common language of Lizards, composed of sibilant hisses and rattles. Hiss!" speech_verb = "hisses" diff --git a/mods/species/bayliens/unathi/datum/species.dm b/mods/species/unathi/datum/species.dm similarity index 87% rename from mods/species/bayliens/unathi/datum/species.dm rename to mods/species/unathi/datum/species.dm index ad4a508329bd..aa7e32e0efb3 100644 --- a/mods/species/bayliens/unathi/datum/species.dm +++ b/mods/species/unathi/datum/species.dm @@ -1,4 +1,4 @@ -/datum/appearance_descriptor/age/lizard +/datum/appearance_descriptor/age/unathi standalone_value_descriptors = list( "an infant" = 1, "a toddler" = 3, @@ -16,13 +16,13 @@ skin_material = /decl/material/solid/organic/skin/lizard /decl/species/unathi - name = SPECIES_LIZARD - name_plural = SPECIES_LIZARD + name = SPECIES_UNATHI + name_plural = SPECIES_UNATHI butchery_data = /decl/butchery_data/humanoid/unathi available_bodytypes = list( - /decl/bodytype/lizard, - /decl/bodytype/lizard/masculine + /decl/bodytype/unathi, + /decl/bodytype/unathi/masculine ) available_accessory_categories = list( @@ -51,7 +51,7 @@ spawn_flags = SPECIES_CAN_JOIN | SPECIES_NO_ROBOTIC_INTERNAL_ORGANS flesh_color = "#34af10" - organs_icon = 'mods/species/bayliens/unathi/icons/organs.dmi' + organs_icon = 'mods/species/unathi/icons/organs.dmi' preview_outfit = /decl/outfit/job/generic/doctor @@ -67,7 +67,7 @@ ) move_trail = /obj/effect/decal/cleanable/blood/tracks/claw - breathing_sound = 'mods/species/bayliens/unathi/sound/lizard_breathing.ogg' + breathing_sound = 'mods/species/unathi/sound/lizard_breathing.ogg' default_emotes = list( /decl/emote/visible/tail/swish, @@ -98,8 +98,8 @@ /decl/species/unathi/Initialize() . = ..() LAZYINITLIST(available_background_info) - LAZYDISTINCTADD(available_background_info[/decl/background_category/heritage], /decl/background_detail/heritage/lizard) - LAZYSET(default_background_info, /decl/background_category/heritage, /decl/background_detail/heritage/lizard) + LAZYDISTINCTADD(available_background_info[/decl/background_category/heritage], /decl/background_detail/heritage/unathi) + LAZYSET(default_background_info, /decl/background_category/heritage, /decl/background_detail/heritage/unathi) /decl/species/unathi/equip_survival_gear(var/mob/living/human/H) ..() diff --git a/mods/species/bayliens/unathi/datum/species_bodytypes.dm b/mods/species/unathi/datum/species_bodytypes.dm similarity index 66% rename from mods/species/bayliens/unathi/datum/species_bodytypes.dm rename to mods/species/unathi/datum/species_bodytypes.dm index 226241bc9a1a..1cf2fe31d668 100644 --- a/mods/species/bayliens/unathi/datum/species_bodytypes.dm +++ b/mods/species/unathi/datum/species_bodytypes.dm @@ -1,10 +1,10 @@ -/decl/bodytype/lizard +/decl/bodytype/unathi name = "feminine" bodytype_category = BODYTYPE_HUMANOID - husk_icon = 'mods/species/bayliens/unathi/icons/husk.dmi' - icon_base = 'mods/species/bayliens/unathi/icons/body_female.dmi' - icon_deformed = 'mods/species/bayliens/unathi/icons/deformed_body_female.dmi' - cosmetics_icon = 'mods/species/bayliens/unathi/icons/cosmetics.dmi' + husk_icon = 'mods/species/unathi/icons/husk.dmi' + icon_base = 'mods/species/unathi/icons/body_female.dmi' + icon_deformed = 'mods/species/unathi/icons/deformed_body_female.dmi' + cosmetics_icon = 'mods/species/unathi/icons/cosmetics.dmi' blood_overlays = 'icons/mob/human_races/species/human/blood_overlays.dmi' bandages_icon = 'icons/mob/bandage.dmi' limb_icon_intensity = 0.7 @@ -18,13 +18,13 @@ eye_flash_mod = 1.2 nail_noun = "claws" uid = "bodytype_unathi_fem" - footprints_icon = 'mods/species/bayliens/unathi/icons/footprints.dmi' + footprints_icon = 'mods/species/unathi/icons/footprints.dmi' - age_descriptor = /datum/appearance_descriptor/age/lizard + age_descriptor = /datum/appearance_descriptor/age/unathi default_sprite_accessories = list( SAC_FRILLS = list( - /decl/sprite_accessory/frills/lizard/frills_long = list(SAM_COLOR = "#192e19") + /decl/sprite_accessory/frills/unathi/frills_long = list(SAM_COLOR = "#192e19") ) ) @@ -34,12 +34,12 @@ ) override_organ_types = list( - BP_EYES = /obj/item/organ/internal/eyes/lizard, - BP_BRAIN = /obj/item/organ/internal/brain/lizard + BP_EYES = /obj/item/organ/internal/eyes/unathi, + BP_BRAIN = /obj/item/organ/internal/brain/unathi ) override_limb_types = list( - BP_TAIL = /obj/item/organ/external/tail/lizard, + BP_TAIL = /obj/item/organ/external/tail/unathi, BP_HEAD = /obj/item/organ/external/head/strong_bite, BP_L_HAND = /obj/item/organ/external/hand/clawed, BP_R_HAND = /obj/item/organ/external/hand/right/clawed @@ -67,7 +67,7 @@ "Your scales bristle against the cold." ) -/decl/bodytype/lizard/get_default_grooming_results(obj/item/organ/external/limb, obj/item/grooming/tool) +/decl/bodytype/unathi/get_default_grooming_results(obj/item/organ/external/limb, obj/item/grooming/tool) if(tool?.grooming_flags & GROOMABLE_FILE) return list( "success" = GROOMING_RESULT_SUCCESS, @@ -75,18 +75,18 @@ ) return ..() -/decl/bodytype/lizard/masculine +/decl/bodytype/unathi/masculine name = "masculine" - icon_base = 'mods/species/bayliens/unathi/icons/body_male.dmi' - icon_deformed = 'mods/species/bayliens/unathi/icons/deformed_body_male.dmi' + icon_base = 'mods/species/unathi/icons/body_male.dmi' + icon_deformed = 'mods/species/unathi/icons/deformed_body_male.dmi' associated_gender = MALE onmob_state_modifiers = null uid = "bodytype_unathi_masc" -/obj/item/organ/external/tail/lizard - tail_icon = 'mods/species/bayliens/unathi/icons/tail.dmi' +/obj/item/organ/external/tail/unathi + tail_icon = 'mods/species/unathi/icons/tail.dmi' tail_animation_states = 9 -/obj/item/organ/external/tail/lizard/get_natural_attacks() +/obj/item/organ/external/tail/unathi/get_natural_attacks() var/static/unarmed_attack = GET_DECL(/decl/natural_attack/tail) return unarmed_attack diff --git a/mods/species/bayliens/unathi/datum/sprite_accessory.dm b/mods/species/unathi/datum/sprite_accessory.dm similarity index 63% rename from mods/species/bayliens/unathi/datum/sprite_accessory.dm rename to mods/species/unathi/datum/sprite_accessory.dm index 910761195dd9..bc102edebe41 100644 --- a/mods/species/bayliens/unathi/datum/sprite_accessory.dm +++ b/mods/species/unathi/datum/sprite_accessory.dm @@ -1,112 +1,112 @@ -/decl/sprite_accessory/horns/lizard +/decl/sprite_accessory/horns/unathi name = "Lizard Horns" - icon = 'mods/species/bayliens/unathi/icons/horns.dmi' + icon = 'mods/species/unathi/icons/horns.dmi' icon_state = "horns" - species_allowed = list(SPECIES_LIZARD) + species_allowed = list(SPECIES_UNATHI) color_blend = ICON_MULTIPLY accessory_flags = HAIR_VERY_SHORT uid = "acc_hair_una_horns" -/decl/sprite_accessory/horns/lizard/spines_long +/decl/sprite_accessory/horns/unathi/spines_long name = "Lizard Spines Long" icon_state = "spines_long" uid = "acc_hair_una_longspines" -/decl/sprite_accessory/horns/lizard/spines_short +/decl/sprite_accessory/horns/unathi/spines_short name = "Lizard Spines Short" icon_state = "spines_short" uid = "acc_hair_una_shortspines" -/decl/sprite_accessory/horns/lizard/bighorns +/decl/sprite_accessory/horns/unathi/bighorns name = "Lizard Horns Big" icon_state = "horns_big" uid = "acc_hair_una_bighorns" -/decl/sprite_accessory/horns/lizard/smallhorns +/decl/sprite_accessory/horns/unathi/smallhorns name = "Lizard Horns Small" icon_state = "horns_small" uid = "acc_hair_una_smallhorns" -/decl/sprite_accessory/horns/lizard/shorthorns +/decl/sprite_accessory/horns/unathi/shorthorns name = "Lizard Horns Short" icon_state = "horns_short" uid = "acc_hair_una_shorthorns" -/decl/sprite_accessory/horns/lizard/curledhorns +/decl/sprite_accessory/horns/unathi/curledhorns name = "Lizard Horns Curled" icon_state = "horns_curled" uid = "acc_hair_una_curledhorns" -/decl/sprite_accessory/horns/lizard/ramhorns +/decl/sprite_accessory/horns/unathi/ramhorns name = "Lizard Horns Ram" icon_state = "horns_ram" uid = "acc_hair_una_ramhorns" -/decl/sprite_accessory/horns/lizard/ramhornsthick +/decl/sprite_accessory/horns/unathi/ramhornsthick name = "Lizard Horns Ram Thick" icon_state = "horns_ram_thick" uid = "acc_hair_una_ramhornsthick" -/decl/sprite_accessory/horns/lizard/doublehorns +/decl/sprite_accessory/horns/unathi/doublehorns name = "Lizard Horns Double" icon_state = "horns_double" uid = "acc_hair_una_doublehorns" -/decl/sprite_accessory/horns/lizard/chin +/decl/sprite_accessory/horns/unathi/chin name = "Lizard Horn Chin" icon_state = "facial_chinhorns" uid = "acc_fhair_una_chinhorns" -/decl/sprite_accessory/horns/lizard/hornadorns +/decl/sprite_accessory/horns/unathi/hornadorns name = "Lizard Horn Adorns" icon_state = "facial_hornadorns" uid = "acc_fhair_una_adorns" -/decl/sprite_accessory/horns/lizard/spinespikes +/decl/sprite_accessory/horns/unathi/spinespikes name = "Lizard Spine Spikes" icon_state = "facial_spikes" uid = "acc_fhair_una_spinespikes" -/decl/sprite_accessory/frills/lizard +/decl/sprite_accessory/frills/unathi name = "Lizard Frills Aqua" - icon = 'mods/species/bayliens/unathi/icons/frills.dmi' + icon = 'mods/species/unathi/icons/frills.dmi' icon_state = "frills_aqua" - species_allowed = list(SPECIES_LIZARD) + species_allowed = list(SPECIES_UNATHI) color_blend = ICON_MULTIPLY accessory_flags = HAIR_VERY_SHORT uid = "acc_hair_una_aqua" -/decl/sprite_accessory/frills/lizard/hood +/decl/sprite_accessory/frills/unathi/hood name = "Lizard Cobra Hood" icon_state = "cobrahood" uid = "acc_hair_una_cobra" -/decl/sprite_accessory/frills/lizard/frills_long +/decl/sprite_accessory/frills/unathi/frills_long name = "Lizard Frills Long" icon_state = "frills_long" uid = "acc_hair_una_longfrills" -/decl/sprite_accessory/frills/lizard/frills_short +/decl/sprite_accessory/frills/unathi/frills_short name = "Lizard Frills Short" icon_state = "frills_short" uid = "acc_hair_una_shortfrills" -/decl/sprite_accessory/frills/lizard/sidefrills +/decl/sprite_accessory/frills/unathi/sidefrills name = "Lizard Frills Side" icon_state = "frills_side" uid = "acc_hair_una_sidefrills" -/decl/sprite_accessory/frills/lizard/spinedfrillslong +/decl/sprite_accessory/frills/unathi/spinedfrillslong name = "Lizard Spined Long Frills" icon_state = "spined_long_frills" uid = "acc_hair_una_longspinedfrills" -/decl/sprite_accessory/frills/lizard/spinedfrillsshort +/decl/sprite_accessory/frills/unathi/spinedfrillsshort name = "Lizard Spined Short Frills" icon_state = "spined_short_frills" uid = "acc_hair_una_shortspinedfrills" -/decl/sprite_accessory/frills/lizard/dorsalfrill +/decl/sprite_accessory/frills/unathi/dorsalfrill name = "Lizard Frill Dorsal" icon_state = "facial_dorsalfrill" uid = "acc_fhair_una_dorsalfrill" diff --git a/mods/species/bayliens/unathi/icons/body_female.dmi b/mods/species/unathi/icons/body_female.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/body_female.dmi rename to mods/species/unathi/icons/body_female.dmi diff --git a/mods/species/bayliens/unathi/icons/body_male.dmi b/mods/species/unathi/icons/body_male.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/body_male.dmi rename to mods/species/unathi/icons/body_male.dmi diff --git a/mods/species/bayliens/unathi/icons/cosmetics.dmi b/mods/species/unathi/icons/cosmetics.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/cosmetics.dmi rename to mods/species/unathi/icons/cosmetics.dmi diff --git a/mods/species/bayliens/unathi/icons/deformed_body_female.dmi b/mods/species/unathi/icons/deformed_body_female.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/deformed_body_female.dmi rename to mods/species/unathi/icons/deformed_body_female.dmi diff --git a/mods/species/bayliens/unathi/icons/deformed_body_male.dmi b/mods/species/unathi/icons/deformed_body_male.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/deformed_body_male.dmi rename to mods/species/unathi/icons/deformed_body_male.dmi diff --git a/mods/species/bayliens/unathi/icons/eyes.dmi b/mods/species/unathi/icons/eyes.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/eyes.dmi rename to mods/species/unathi/icons/eyes.dmi diff --git a/mods/species/bayliens/unathi/icons/footprints.dmi b/mods/species/unathi/icons/footprints.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/footprints.dmi rename to mods/species/unathi/icons/footprints.dmi diff --git a/mods/species/bayliens/unathi/icons/frills.dmi b/mods/species/unathi/icons/frills.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/frills.dmi rename to mods/species/unathi/icons/frills.dmi diff --git a/mods/species/bayliens/unathi/icons/horns.dmi b/mods/species/unathi/icons/horns.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/horns.dmi rename to mods/species/unathi/icons/horns.dmi diff --git a/mods/species/bayliens/unathi/icons/husk.dmi b/mods/species/unathi/icons/husk.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/husk.dmi rename to mods/species/unathi/icons/husk.dmi diff --git a/mods/species/bayliens/unathi/icons/organs.dmi b/mods/species/unathi/icons/organs.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/organs.dmi rename to mods/species/unathi/icons/organs.dmi diff --git a/mods/species/bayliens/unathi/icons/tail.dmi b/mods/species/unathi/icons/tail.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/tail.dmi rename to mods/species/unathi/icons/tail.dmi diff --git a/mods/species/bayliens/unathi/organs/organs_internal.dm b/mods/species/unathi/organs/organs_internal.dm similarity index 56% rename from mods/species/bayliens/unathi/organs/organs_internal.dm rename to mods/species/unathi/organs/organs_internal.dm index 1edd08ffc19f..307a2cbdbc33 100644 --- a/mods/species/bayliens/unathi/organs/organs_internal.dm +++ b/mods/species/unathi/organs/organs_internal.dm @@ -1,7 +1,7 @@ -/obj/item/organ/internal/eyes/lizard +/obj/item/organ/internal/eyes/unathi name = "reptilian eyes" desc = "Eyes belonging to a big lizard. They seem to be staring right at you no matter where you look from." - icon = 'mods/species/bayliens/unathi/icons/organs.dmi' + icon = 'mods/species/unathi/icons/organs.dmi' -/obj/item/organ/internal/brain/lizard +/obj/item/organ/internal/brain/unathi can_use_brain_interface = FALSE diff --git a/mods/species/bayliens/unathi/sound/lizard_breathing.ogg b/mods/species/unathi/sound/lizard_breathing.ogg similarity index 100% rename from mods/species/bayliens/unathi/sound/lizard_breathing.ogg rename to mods/species/unathi/sound/lizard_breathing.ogg diff --git a/mods/species/vox/datum/factions_vox.dm b/mods/species/vox/datum/factions_vox.dm index a82a82ca0258..1fbf82597989 100644 --- a/mods/species/vox/datum/factions_vox.dm +++ b/mods/species/vox/datum/factions_vox.dm @@ -2,7 +2,7 @@ name = "Shoal Crew" description = "Most vox are content to live and work on the arkships, serving their alloted span under the watchful \ eye of their betters, who in turn serve the apex. Although there is always some degree of social turmoil amongst the \ - ark families, with contests and challenges resulting in shifting heirarchies, it usually does not go any further than \ + ark families, with contests and challenges resulting in shifting hierarchies, it usually does not go any further than \ the general day-to-day energy exhibited by all vox. The average ark labourer is not ambitious, and knows things could \ be a lot worse." hidden_from_codex = TRUE diff --git a/nano/templates/aicard.tmpl b/nano/templates/aicard.tmpl index be860a52ac99..6f25cb01f230 100644 --- a/nano/templates/aicard.tmpl +++ b/nano/templates/aicard.tmpl @@ -1,51 +1,51 @@ - + - + {{if data.has_ai}}- - {{if data.has_laws}} + + {{if data.has_laws}}@@ -61,11 +61,11 @@ Used In File(s): \code\game\objects\items\devices\aicard.dm {{:data.backup_capacitor}}%Index Law Laws:@@ -76,8 +76,8 @@ Used In File(s): \code\game\objects\items\devices\aicard.dm {{else}} No laws found. {{/if}} - - {{if data.operational}} + + {{if data.operational}}Radio Subspace Transceiver diff --git a/nano/templates/camera_settings.tmpl b/nano/templates/camera_settings.tmpl index f6a37d773c29..7620bc0da8a1 100644 --- a/nano/templates/camera_settings.tmpl +++ b/nano/templates/camera_settings.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -An error has occured:
+An error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance.@@ -58,4 +58,4 @@{{/if}} EXONET Firmware v110.04.4h Copyright EXONETWORKS INC -{{/if}} \ No newline at end of file +{{/if}} \ No newline at end of file diff --git a/nano/templates/computer_fabricator.tmpl b/nano/templates/computer_fabricator.tmpl index d8bfb558b7c9..3fd551c3078b 100644 --- a/nano/templates/computer_fabricator.tmpl +++ b/nano/templates/computer_fabricator.tmpl @@ -62,7 +62,7 @@ Tesla Relay is an advanced wireless power relay that allows your device to connect to nearby area power controller to provide alternative power source.
Nano Printer is device that allows printing of various documents. This device was certified EcoFriendlyPlus and is capable of recycling existing paper for printing purposes.
Card Reader adds a slot that allows you to manipulate RFID cards. Please note that this is not necessary to allow the device to read your identification, it is just necessary to manipulate other cards.
- Intellicard Slot is a specialised high powered hardware that can hold an intellicard with active AI personality. It is required for some specialised programs to run properly.
+ Intellicard Slot is a specialised high powered hardware that can hold an intelliCard with active AI personality. It is required for some specialised programs to run properly.
{{else data.state == 2}}Step 3: Payment
diff --git a/nano/templates/file_browser.tmpl b/nano/templates/file_browser.tmpl index cf3c3d3c1b5b..5453c8b6876b 100644 --- a/nano/templates/file_browser.tmpl +++ b/nano/templates/file_browser.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -A disk error has occured:
+A disk error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance. {{:helper.link('Back to file select', null, { "BRS_back" : 1 })}} diff --git a/nano/templates/file_manager.tmpl b/nano/templates/file_manager.tmpl index 3b61a10dddbc..248043b31e63 100644 --- a/nano/templates/file_manager.tmpl +++ b/nano/templates/file_manager.tmpl @@ -12,16 +12,16 @@ {{/if}} {{if data.error}} -An error has occured:
+An error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance. {{:helper.link('Back to menu', null, { "PRG_clear_error" : 1 })}} {{else data.file_error}} -An error with the selected file has occured:
+An error with the selected file has occurred:
Additional information: {{:data.file_error}}
{{:helper.link('Back to menu', null, { "PRG_clear_error" : 1 })}} {{else data.disk_error}} -An error with the selected disk has occured:
+An error with the selected disk has occurred:
Additional information: {{:data.disk_error}}
{{:helper.link('Back to menu', null, { "PRG_clear_error" : 1 })}} {{else}} diff --git a/nano/templates/network_acl.tmpl b/nano/templates/network_acl.tmpl index 19e60e2ddd92..11812a6b02b7 100644 --- a/nano/templates/network_acl.tmpl +++ b/nano/templates/network_acl.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -An error has occured:
+An error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance.diff --git a/nano/templates/network_lock.tmpl b/nano/templates/network_lock.tmpl index 319618960fcc..89ba30748e59 100644 --- a/nano/templates/network_lock.tmpl +++ b/nano/templates/network_lock.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -An error has occured:
+An error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance. {{:helper.link('Refresh', null, { "refresh" : 1 })}} diff --git a/nano/templates/network_machine_settings.tmpl b/nano/templates/network_machine_settings.tmpl index 73c9b1078223..8c75b76e1b7a 100644 --- a/nano/templates/network_machine_settings.tmpl +++ b/nano/templates/network_machine_settings.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -An error has occured:
+An error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance.@@ -34,4 +34,4 @@
EXONET Firmware v110.04.4h Copyright EXONETWORKS INC -{{/if}} \ No newline at end of file +{{/if}} \ No newline at end of file diff --git a/nano/templates/network_mainframe.tmpl b/nano/templates/network_mainframe.tmpl index f271e98b4f16..3cb6d44378b9 100644 --- a/nano/templates/network_mainframe.tmpl +++ b/nano/templates/network_mainframe.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -An error has occured:
+An error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance.@@ -33,7 +33,7 @@MISSING- {{/if}} + {{/if}}
EXONET Firmware v110.04.4h Copyright EXONETWORKS INC -{{/if}} \ No newline at end of file +{{/if}} \ No newline at end of file diff --git a/nano/templates/network_modem.tmpl b/nano/templates/network_modem.tmpl index f48696ebe4cc..ad1abaa9901d 100644 --- a/nano/templates/network_modem.tmpl +++ b/nano/templates/network_modem.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -An error has occured:
+An error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance.@@ -28,4 +28,4 @@ {{/for}}
EXONET Firmware v110.04.4h Copyright EXONETWORKS INC -{{/if}} \ No newline at end of file +{{/if}} \ No newline at end of file diff --git a/nano/templates/network_router.tmpl b/nano/templates/network_router.tmpl index 3829283b7126..0c1630f0af5c 100644 --- a/nano/templates/network_router.tmpl +++ b/nano/templates/network_router.tmpl @@ -1,5 +1,5 @@ {{if data.error}} -An error has occured:
+An error has occurred:
Additional information: {{:data.error}}
Please try again. If the problem persists contact your system administrator for assistance.diff --git a/nano/templates/request_console.tmpl b/nano/templates/request_console.tmpl index 82b27de25d54..698f7b162c92 100644 --- a/nano/templates/request_console.tmpl +++ b/nano/templates/request_console.tmpl @@ -66,14 +66,14 @@ Used In File(s): \code\game\machinery\requests_console.dmMessage sent successfully.{{:helper.link('Continue', 'arrowthick-1-e', { 'setScreen' : 0 })}}{{else data.screen == 5}} -An Error occured. Message not sent.+An Error occurred. Message not sent.{{:helper.link('Continue', 'arrowthick-1-e', { 'setScreen' : 0 })}}{{else data.screen == 6}}{{for data.message_log}}{{:value}}{{empty}} -No messages have been recieved.+No messages have been received.{{/for}}{{:helper.link('Back', 'arrowreturnthick-1-w', { 'setScreen' : 0 })}}diff --git a/nano/templates/song_editor.tmpl b/nano/templates/song_editor.tmpl index 56618b947e82..3ac2b19b17ef 100644 --- a/nano/templates/song_editor.tmpl +++ b/nano/templates/song_editor.tmpl @@ -7,7 +7,7 @@ By default, every note is natural and in octave 3. Defining otherwise is remembered for each note.
Example: C,D,E,F,G,A,B will play a C major scale.
After a note has an accidental placed, it will be remembered: C,C4,C,C3 is C3,C4,C4,C3
- Chords can be played simply by seperating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B
+ Chords can be played simply by separating each note with a hyphon: A-C#,Cn-E,E-G#,Gn-B
A pause may be denoted by an empty chord: C,E,,C,G
To make a chord be a different time, end it with /x, where the chord length will be length
defined by tempo / x: C,G/2,E/4
diff --git a/nano/templates/space_heater.tmpl b/nano/templates/space_heater.tmpl new file mode 100644 index 000000000000..0b6c683380c0 --- /dev/null +++ b/nano/templates/space_heater.tmpl @@ -0,0 +1,21 @@ + +++Power++ {{if data.has_cell == 0}} + None + {{else}} + Battery ({{:data.cell_percent}}%) + {{/if}} +++\ No newline at end of file diff --git a/nebula.dme b/nebula.dme index 8af51001eb56..f02a17d70440 100644 --- a/nebula.dme +++ b/nebula.dme @@ -179,19 +179,26 @@ #include "code\_onclick\rig.dm" #include "code\_onclick\hud\_defines.dm" #include "code\_onclick\hud\action.dm" -#include "code\_onclick\hud\ai.dm" -#include "code\_onclick\hud\ai_hud.dm" -#include "code\_onclick\hud\animal.dm" #include "code\_onclick\hud\fullscreen.dm" #include "code\_onclick\hud\global_hud.dm" -#include "code\_onclick\hud\hud.dm" -#include "code\_onclick\hud\human.dm" -#include "code\_onclick\hud\other_mobs.dm" -#include "code\_onclick\hud\pai.dm" #include "code\_onclick\hud\radial.dm" #include "code\_onclick\hud\radial_persistent.dm" -#include "code\_onclick\hud\robot.dm" #include "code\_onclick\hud\skybox.dm" +#include "code\_onclick\hud\hud_elements\_hud_element.dm" +#include "code\_onclick\hud\hud_elements\hud_auxilliary.dm" +#include "code\_onclick\hud\hud_elements\hud_health.dm" +#include "code\_onclick\hud\hud_elements\hud_permanent.dm" +#include "code\_onclick\hud\hud_elements\hud_robot.dm" +#include "code\_onclick\hud\hud_elements\hud_stubs.dm" +#include "code\_onclick\hud\hud_elements\hud_warnings.dm" +#include "code\_onclick\hud\hud_types\_hud.dm" +#include "code\_onclick\hud\hud_types\ai.dm" +#include "code\_onclick\hud\hud_types\ai_hud.dm" +#include "code\_onclick\hud\hud_types\animal.dm" +#include "code\_onclick\hud\hud_types\human.dm" +#include "code\_onclick\hud\hud_types\other_mobs.dm" +#include "code\_onclick\hud\hud_types\pai.dm" +#include "code\_onclick\hud\hud_types\robot.dm" #include "code\_onclick\hud\screen\_screen.dm" #include "code\_onclick\hud\screen\screen_action_button.dm" #include "code\_onclick\hud\screen\screen_ai_button.dm" @@ -207,6 +214,7 @@ #include "code\_onclick\hud\screen\screen_fullscreen.dm" #include "code\_onclick\hud\screen\screen_global_hud.dm" #include "code\_onclick\hud\screen\screen_gun.dm" +#include "code\_onclick\hud\screen\screen_health.dm" #include "code\_onclick\hud\screen\screen_holomap.dm" #include "code\_onclick\hud\screen\screen_intent.dm" #include "code\_onclick\hud\screen\screen_internal.dm" @@ -214,19 +222,11 @@ #include "code\_onclick\hud\screen\screen_inventory_hands.dm" #include "code\_onclick\hud\screen\screen_lighting.dm" #include "code\_onclick\hud\screen\screen_maneuver.dm" -#include "code\_onclick\hud\screen\screen_module.dm" #include "code\_onclick\hud\screen\screen_movement.dm" #include "code\_onclick\hud\screen\screen_needs.dm" #include "code\_onclick\hud\screen\screen_pai.dm" #include "code\_onclick\hud\screen\screen_radial.dm" #include "code\_onclick\hud\screen\screen_resist.dm" -#include "code\_onclick\hud\screen\screen_robot_drop_grab.dm" -#include "code\_onclick\hud\screen\screen_robot_inventory.dm" -#include "code\_onclick\hud\screen\screen_robot_modules.dm" -#include "code\_onclick\hud\screen\screen_robot_panel.dm" -#include "code\_onclick\hud\screen\screen_robot_radio.dm" -#include "code\_onclick\hud\screen\screen_robot_store.dm" -#include "code\_onclick\hud\screen\screen_robot_warnings.dm" #include "code\_onclick\hud\screen\screen_setup.dm" #include "code\_onclick\hud\screen\screen_stamina.dm" #include "code\_onclick\hud\screen\screen_storage.dm" @@ -234,8 +234,22 @@ #include "code\_onclick\hud\screen\screen_throw.dm" #include "code\_onclick\hud\screen\screen_toggle.dm" #include "code\_onclick\hud\screen\screen_up_hint.dm" -#include "code\_onclick\hud\screen\screen_warnings.dm" +#include "code\_onclick\hud\screen\screen_warning.dm" +#include "code\_onclick\hud\screen\screen_warning_bodytemp.dm" +#include "code\_onclick\hud\screen\screen_warning_fire.dm" +#include "code\_onclick\hud\screen\screen_warning_oxygen.dm" +#include "code\_onclick\hud\screen\screen_warning_pressure.dm" +#include "code\_onclick\hud\screen\screen_warning_toxins.dm" #include "code\_onclick\hud\screen\screen_zone_selector.dm" +#include "code\_onclick\hud\screen\robot\screen_robot.dm" +#include "code\_onclick\hud\screen\robot\screen_robot_drop_grab.dm" +#include "code\_onclick\hud\screen\robot\screen_robot_inventory.dm" +#include "code\_onclick\hud\screen\robot\screen_robot_module.dm" +#include "code\_onclick\hud\screen\robot\screen_robot_modules.dm" +#include "code\_onclick\hud\screen\robot\screen_robot_panel.dm" +#include "code\_onclick\hud\screen\robot\screen_robot_radio.dm" +#include "code\_onclick\hud\screen\robot\screen_robot_store.dm" +#include "code\_onclick\hud\screen\robot\screen_robot_warnings.dm" #include "code\controllers\admin.dm" #include "code\controllers\autotransfer.dm" #include "code\controllers\communications.dm" @@ -472,32 +486,7 @@ #include "code\datums\extensions\multitool\items\stock_parts_radio.dm" #include "code\datums\extensions\on_click\turf_hand.dm" #include "code\datums\extensions\resistable\resistable.dm" -#include "code\datums\extensions\scent\_scent.dm" -#include "code\datums\extensions\scent\scent_candle.dm" -#include "code\datums\extensions\scent\scent_misc.dm" #include "code\datums\extensions\shearable\shearable.dm" -#include "code\datums\extensions\storage\_storage.dm" -#include "code\datums\extensions\storage\_storage_ui.dm" -#include "code\datums\extensions\storage\subtypes_backpack.dm" -#include "code\datums\extensions\storage\subtypes_bag.dm" -#include "code\datums\extensions\storage\subtypes_basket.dm" -#include "code\datums\extensions\storage\subtypes_belt.dm" -#include "code\datums\extensions\storage\subtypes_box.dm" -#include "code\datums\extensions\storage\subtypes_excavation.dm" -#include "code\datums\extensions\storage\subtypes_firstaid.dm" -#include "code\datums\extensions\storage\subtypes_holster.dm" -#include "code\datums\extensions\storage\subtypes_misc.dm" -#include "code\datums\extensions\storage\subtypes_mre.dm" -#include "code\datums\extensions\storage\subtypes_part_replacer.dm" -#include "code\datums\extensions\storage\subtypes_pills.dm" -#include "code\datums\extensions\storage\subtypes_pockets.dm" -#include "code\datums\extensions\storage\subtypes_secure.dm" -#include "code\datums\extensions\storage\subtypes_sheets.dm" -#include "code\datums\extensions\storage\subtypes_slides.dm" -#include "code\datums\extensions\storage\subtypes_specialized.dm" -#include "code\datums\extensions\storage\subtypes_structure.dm" -#include "code\datums\extensions\storage\subtypes_tray.dm" -#include "code\datums\extensions\storage\subtypes_wallet.dm" #include "code\datums\genetics\genetic_conditions.dm" #include "code\datums\graph\graph.dm" #include "code\datums\graph\node.dm" @@ -646,10 +635,31 @@ #include "code\datums\repositories\crew\tracking.dm" #include "code\datums\repositories\crew\vital.dm" #include "code\datums\repositories\crew\~defines.dm" -#include "code\datums\scents\scent_decls.dm" #include "code\datums\state_machine\paper_fortune_fsm.dm" #include "code\datums\state_machine\state.dm" #include "code\datums\state_machine\transition.dm" +#include "code\datums\storage\_storage.dm" +#include "code\datums\storage\_storage_ui.dm" +#include "code\datums\storage\subtypes_backpack.dm" +#include "code\datums\storage\subtypes_bag.dm" +#include "code\datums\storage\subtypes_basket.dm" +#include "code\datums\storage\subtypes_belt.dm" +#include "code\datums\storage\subtypes_box.dm" +#include "code\datums\storage\subtypes_excavation.dm" +#include "code\datums\storage\subtypes_firstaid.dm" +#include "code\datums\storage\subtypes_holster.dm" +#include "code\datums\storage\subtypes_misc.dm" +#include "code\datums\storage\subtypes_mre.dm" +#include "code\datums\storage\subtypes_part_replacer.dm" +#include "code\datums\storage\subtypes_pills.dm" +#include "code\datums\storage\subtypes_pockets.dm" +#include "code\datums\storage\subtypes_secure.dm" +#include "code\datums\storage\subtypes_sheets.dm" +#include "code\datums\storage\subtypes_slides.dm" +#include "code\datums\storage\subtypes_specialized.dm" +#include "code\datums\storage\subtypes_structure.dm" +#include "code\datums\storage\subtypes_tray.dm" +#include "code\datums\storage\subtypes_wallet.dm" #include "code\datums\supplypacks\atmospherics.dm" #include "code\datums\supplypacks\custodial.dm" #include "code\datums\supplypacks\dispcarts.dm" @@ -1056,13 +1066,6 @@ #include "code\game\objects\effects\decals\Cleanable\misc.dm" #include "code\game\objects\effects\decals\Cleanable\robots.dm" #include "code\game\objects\effects\decals\Cleanable\tracks.dm" -#include "code\game\objects\effects\decals\posters\_poster.dm" -#include "code\game\objects\effects\decals\posters\_poster_design.dm" -#include "code\game\objects\effects\decals\posters\bs12.dm" -#include "code\game\objects\effects\projectile\projectile_effects.dm" -#include "code\game\objects\effects\projectile\projectile_impact.dm" -#include "code\game\objects\effects\projectile\projectile_muzzle.dm" -#include "code\game\objects\effects\projectile\projectile_tracer.dm" #include "code\game\objects\effects\spawners\bombspawner.dm" #include "code\game\objects\effects\spawners\gibspawner.dm" #include "code\game\objects\items\__item.dm" @@ -1094,7 +1097,6 @@ #include "code\game\objects\items\hourglass.dm" #include "code\game\objects\items\instruments.dm" #include "code\game\objects\items\latexballoon.dm" -#include "code\game\objects\items\lockpicks.dm" #include "code\game\objects\items\paintkit.dm" #include "code\game\objects\items\paper_fortune_teller.dm" #include "code\game\objects\items\part_replacer.dm" @@ -1107,6 +1109,7 @@ #include "code\game\objects\items\saddle.dm" #include "code\game\objects\items\silencer.dm" #include "code\game\objects\items\spirit_board.dm" +#include "code\game\objects\items\stools.dm" #include "code\game\objects\items\toys.dm" #include "code\game\objects\items\training_dummy.dm" #include "code\game\objects\items\trash.dm" @@ -1114,6 +1117,7 @@ #include "code\game\objects\items\waterskin.dm" #include "code\game\objects\items\artifice\chain.dm" #include "code\game\objects\items\artifice\hook.dm" +#include "code\game\objects\items\artifice\lockpicks.dm" #include "code\game\objects\items\blades\_blade.dm" #include "code\game\objects\items\blades\axe.dm" #include "code\game\objects\items\blades\axe_fire.dm" @@ -1141,6 +1145,41 @@ #include "code\game\objects\items\books\skill\research.dm" #include "code\game\objects\items\books\skill\security.dm" #include "code\game\objects\items\books\skill\service.dm" +#include "code\game\objects\items\circuitboards\broken.dm" +#include "code\game\objects\items\circuitboards\circuitboard.dm" +#include "code\game\objects\items\circuitboards\other.dm" +#include "code\game\objects\items\circuitboards\wall.dm" +#include "code\game\objects\items\circuitboards\computer\air_management.dm" +#include "code\game\objects\items\circuitboards\computer\computer.dm" +#include "code\game\objects\items\circuitboards\computer\holodeckcontrol.dm" +#include "code\game\objects\items\circuitboards\computer\modular.dm" +#include "code\game\objects\items\circuitboards\computer\shuttle.dm" +#include "code\game\objects\items\circuitboards\computer\station_alert.dm" +#include "code\game\objects\items\circuitboards\machinery\biogenerator.dm" +#include "code\game\objects\items\circuitboards\machinery\chemistry.dm" +#include "code\game\objects\items\circuitboards\machinery\cloning.dm" +#include "code\game\objects\items\circuitboards\machinery\commsantenna.dm" +#include "code\game\objects\items\circuitboards\machinery\docking_beacon.dm" +#include "code\game\objects\items\circuitboards\machinery\engineering_circuits.dm" +#include "code\game\objects\items\circuitboards\machinery\forensic.dm" +#include "code\game\objects\items\circuitboards\machinery\holomap.dm" +#include "code\game\objects\items\circuitboards\machinery\household.dm" +#include "code\game\objects\items\circuitboards\machinery\mech_recharger.dm" +#include "code\game\objects\items\circuitboards\machinery\medical.dm" +#include "code\game\objects\items\circuitboards\machinery\mining.dm" +#include "code\game\objects\items\circuitboards\machinery\mining_drill.dm" +#include "code\game\objects\items\circuitboards\machinery\network.dm" +#include "code\game\objects\items\circuitboards\machinery\oxyregenerator.dm" +#include "code\game\objects\items\circuitboards\machinery\pacman.dm" +#include "code\game\objects\items\circuitboards\machinery\portable_atmospherics.dm" +#include "code\game\objects\items\circuitboards\machinery\power.dm" +#include "code\game\objects\items\circuitboards\machinery\recharge_station.dm" +#include "code\game\objects\items\circuitboards\machinery\research.dm" +#include "code\game\objects\items\circuitboards\machinery\self_destruct_storage.dm" +#include "code\game\objects\items\circuitboards\machinery\shieldgen.dm" +#include "code\game\objects\items\circuitboards\machinery\shipsensors.dm" +#include "code\game\objects\items\circuitboards\machinery\telecomms.dm" +#include "code\game\objects\items\circuitboards\machinery\unary_atmos.dm" #include "code\game\objects\items\devices\aicard.dm" #include "code\game\objects\items\devices\auto_cpr.dm" #include "code\game\objects\items\devices\binoculars.dm" @@ -1152,6 +1191,7 @@ #include "code\game\objects\items\devices\geiger.dm" #include "code\game\objects\items\devices\gps.dm" #include "code\game\objects\items\devices\hacktool.dm" +#include "code\game\objects\items\devices\hailer.dm" #include "code\game\objects\items\devices\holowarrant.dm" #include "code\game\objects\items\devices\inducer.dm" #include "code\game\objects\items\devices\lightreplacer.dm" @@ -1174,7 +1214,6 @@ #include "code\game\objects\items\devices\tvcamera.dm" #include "code\game\objects\items\devices\uplink.dm" #include "code\game\objects\items\devices\uplink_random_lists.dm" -#include "code\game\objects\items\devices\whistle.dm" #include "code\game\objects\items\devices\radio\beacon.dm" #include "code\game\objects\items\devices\radio\encryptionkey.dm" #include "code\game\objects\items\devices\radio\headset.dm" @@ -1186,17 +1225,6 @@ #include "code\game\objects\items\devices\radio\radio_borg.dm" #include "code\game\objects\items\devices\radio\radio_exosuit.dm" #include "code\game\objects\items\devices\radio\radio_misc.dm" -#include "code\game\objects\items\devices\scanners\_scanner.dm" -#include "code\game\objects\items\devices\scanners\breath.dm" -#include "code\game\objects\items\devices\scanners\gas.dm" -#include "code\game\objects\items\devices\scanners\health.dm" -#include "code\game\objects\items\devices\scanners\mass_spectrometer.dm" -#include "code\game\objects\items\devices\scanners\mining.dm" -#include "code\game\objects\items\devices\scanners\network.dm" -#include "code\game\objects\items\devices\scanners\plant.dm" -#include "code\game\objects\items\devices\scanners\price.dm" -#include "code\game\objects\items\devices\scanners\reagents.dm" -#include "code\game\objects\items\devices\scanners\xenobio.dm" #include "code\game\objects\items\flame\_flame.dm" #include "code\game\objects\items\flame\flame_candle.dm" #include "code\game\objects\items\flame\flame_fuelled.dm" @@ -1231,6 +1259,11 @@ #include "code\game\objects\items\stacks\medical\medical_splint.dm" #include "code\game\objects\items\stacks\tiles\tile_types.dm" #include "code\game\objects\items\stacks\tiles\tile_types_wooden.dm" +#include "code\game\objects\items\tools\crowbar.dm" +#include "code\game\objects\items\tools\screwdriver.dm" +#include "code\game\objects\items\tools\shears.dm" +#include "code\game\objects\items\tools\wirecutter.dm" +#include "code\game\objects\items\tools\wrench.dm" #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\autopsy.dm" #include "code\game\objects\items\weapons\balls.dm" @@ -1244,7 +1277,6 @@ #include "code\game\objects\items\weapons\defib.dm" #include "code\game\objects\items\weapons\dice.dm" #include "code\game\objects\items\weapons\ecigs.dm" -#include "code\game\objects\items\weapons\electric_welder.dm" #include "code\game\objects\items\weapons\explosives.dm" #include "code\game\objects\items\weapons\extinguisher.dm" #include "code\game\objects\items\weapons\flamethrower.dm" @@ -1252,10 +1284,10 @@ #include "code\game\objects\items\weapons\handcuffs.dm" #include "code\game\objects\items\weapons\ironing_iron.dm" #include "code\game\objects\items\weapons\janitor_sign.dm" +#include "code\game\objects\items\weapons\locator.dm" #include "code\game\objects\items\weapons\mop.dm" #include "code\game\objects\items\weapons\nuclear_cylinder.dm" #include "code\game\objects\items\weapons\paint.dm" -#include "code\game\objects\items\weapons\policetape.dm" #include "code\game\objects\items\weapons\RCD.dm" #include "code\game\objects\items\weapons\RPD.dm" #include "code\game\objects\items\weapons\RSF.dm" @@ -1268,46 +1300,9 @@ #include "code\game\objects\items\weapons\swords_axes_etc.dm" #include "code\game\objects\items\weapons\tape.dm" #include "code\game\objects\items\weapons\tech_disks.dm" -#include "code\game\objects\items\weapons\teleportation.dm" #include "code\game\objects\items\weapons\towels.dm" #include "code\game\objects\items\weapons\traps.dm" #include "code\game\objects\items\weapons\weaponry.dm" -#include "code\game\objects\items\weapons\weldbackpack.dm" -#include "code\game\objects\items\weapons\circuitboards\broken.dm" -#include "code\game\objects\items\weapons\circuitboards\circuitboard.dm" -#include "code\game\objects\items\weapons\circuitboards\other.dm" -#include "code\game\objects\items\weapons\circuitboards\wall.dm" -#include "code\game\objects\items\weapons\circuitboards\computer\air_management.dm" -#include "code\game\objects\items\weapons\circuitboards\computer\computer.dm" -#include "code\game\objects\items\weapons\circuitboards\computer\holodeckcontrol.dm" -#include "code\game\objects\items\weapons\circuitboards\computer\modular.dm" -#include "code\game\objects\items\weapons\circuitboards\computer\shuttle.dm" -#include "code\game\objects\items\weapons\circuitboards\computer\station_alert.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\biogenerator.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\chemistry.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\cloning.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\commsantenna.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\docking_beacon.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\engineering_circuits.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\forensic.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\holomap.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\household.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\mech_recharger.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\medical.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\mining.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\mining_drill.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\network.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\oxyregenerator.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\pacman.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\portable_atmospherics.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\power.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\recharge_station.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\research.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\self_destruct_storage.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\shieldgen.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\shipsensors.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\telecomms.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\unary_atmos.dm" #include "code\game\objects\items\weapons\grenades\anti_photon_grenade.dm" #include "code\game\objects\items\weapons\grenades\chem_grenade.dm" #include "code\game\objects\items\weapons\grenades\decompiler.dm" @@ -1319,22 +1314,6 @@ #include "code\game\objects\items\weapons\grenades\prank_grenades.dm" #include "code\game\objects\items\weapons\grenades\smokebomb.dm" #include "code\game\objects\items\weapons\grenades\spawnergrenade.dm" -#include "code\game\objects\items\weapons\implants\implant.dm" -#include "code\game\objects\items\weapons\implants\implantcase.dm" -#include "code\game\objects\items\weapons\implants\implantchair.dm" -#include "code\game\objects\items\weapons\implants\implanter.dm" -#include "code\game\objects\items\weapons\implants\implantpad.dm" -#include "code\game\objects\items\weapons\implants\implants\adrenaline.dm" -#include "code\game\objects\items\weapons\implants\implants\chem.dm" -#include "code\game\objects\items\weapons\implants\implants\compressed.dm" -#include "code\game\objects\items\weapons\implants\implants\death_alarm.dm" -#include "code\game\objects\items\weapons\implants\implants\explosive.dm" -#include "code\game\objects\items\weapons\implants\implants\freedom.dm" -#include "code\game\objects\items\weapons\implants\implants\imprinting.dm" -#include "code\game\objects\items\weapons\implants\implants\loyalty.dm" -#include "code\game\objects\items\weapons\implants\implants\tracking.dm" -#include "code\game\objects\items\weapons\implants\implants\translator.dm" -#include "code\game\objects\items\weapons\implants\implants\uplink.dm" #include "code\game\objects\items\weapons\material\ashtray.dm" #include "code\game\objects\items\weapons\material\bell.dm" #include "code\game\objects\items\weapons\material\coins.dm" @@ -1398,12 +1377,10 @@ #include "code\game\objects\items\weapons\tanks\jetpack.dm" #include "code\game\objects\items\weapons\tanks\tank_types.dm" #include "code\game\objects\items\weapons\tanks\tanks.dm" -#include "code\game\objects\items\weapons\tools\crowbar.dm" -#include "code\game\objects\items\weapons\tools\screwdriver.dm" -#include "code\game\objects\items\weapons\tools\shears.dm" -#include "code\game\objects\items\weapons\tools\weldingtool.dm" -#include "code\game\objects\items\weapons\tools\wirecutter.dm" -#include "code\game\objects\items\weapons\tools\wrench.dm" +#include "code\game\objects\items\welding\electric_welder.dm" +#include "code\game\objects\items\welding\weldbackpack.dm" +#include "code\game\objects\items\welding\weldingtool.dm" +#include "code\game\objects\items\welding\weldingtool_tank.dm" #include "code\game\objects\random\_random.dm" #include "code\game\objects\random\date_based.dm" #include "code\game\objects\random\random.dm" @@ -1454,7 +1431,6 @@ #include "code\game\objects\structures\emergency_dispenser.dm" #include "code\game\objects\structures\extinguisher.dm" #include "code\game\objects\structures\fences.dm" -#include "code\game\objects\structures\filter_stand.dm" #include "code\game\objects\structures\fireaxe_cabinet.dm" #include "code\game\objects\structures\fires.dm" #include "code\game\objects\structures\fishtanks.dm" @@ -1493,6 +1469,7 @@ #include "code\game\objects\structures\signs.dm" #include "code\game\objects\structures\skele_stand.dm" #include "code\game\objects\structures\snowman.dm" +#include "code\game\objects\structures\sofa.dm" #include "code\game\objects\structures\stasis_cage.dm" #include "code\game\objects\structures\tables.dm" #include "code\game\objects\structures\tank_dispenser.dm" @@ -1511,7 +1488,20 @@ #include "code\game\objects\structures\barrels\barrel.dm" #include "code\game\objects\structures\barrels\cask.dm" #include "code\game\objects\structures\barrels\cask_rack.dm" -#include "code\game\objects\structures\chemistry\_chemistry.dm" +#include "code\game\objects\structures\beds\bed.dm" +#include "code\game\objects\structures\beds\bedroll.dm" +#include "code\game\objects\structures\beds\mattress.dm" +#include "code\game\objects\structures\beds\rollerbed.dm" +#include "code\game\objects\structures\beds\simple_bed.dm" +#include "code\game\objects\structures\beds\travois.dm" +#include "code\game\objects\structures\benches\bench.dm" +#include "code\game\objects\structures\benches\lounge.dm" +#include "code\game\objects\structures\benches\pew.dm" +#include "code\game\objects\structures\chairs\chairs.dm" +#include "code\game\objects\structures\chairs\rustic_chairs.dm" +#include "code\game\objects\structures\chairs\wheelchair.dm" +#include "code\game\objects\structures\chemistry\filter_stand.dm" +#include "code\game\objects\structures\chemistry\heater.dm" #include "code\game\objects\structures\crates_lockers\crates.dm" #include "code\game\objects\structures\crates_lockers\largecrate.dm" #include "code\game\objects\structures\crates_lockers\med_crate.dm" @@ -1560,15 +1550,6 @@ #include "code\game\objects\structures\signs\paintings.dm" #include "code\game\objects\structures\signs\plaques.dm" #include "code\game\objects\structures\signs\warning_signs.dm" -#include "code\game\objects\structures\stool_bed_chair_nest_sofa\bed.dm" -#include "code\game\objects\structures\stool_bed_chair_nest_sofa\bedroll.dm" -#include "code\game\objects\structures\stool_bed_chair_nest_sofa\chairs.dm" -#include "code\game\objects\structures\stool_bed_chair_nest_sofa\pew.dm" -#include "code\game\objects\structures\stool_bed_chair_nest_sofa\rustic_chairs.dm" -#include "code\game\objects\structures\stool_bed_chair_nest_sofa\simple_bed.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\turf.dm" #include "code\game\turfs\turf_ao.dm" #include "code\game\turfs\turf_buildmode.dm" @@ -1583,7 +1564,6 @@ #include "code\game\turfs\turf_material.dm" #include "code\game\turfs\turf_navigation.dm" #include "code\game\turfs\turf_ramps.dm" -#include "code\game\turfs\unsimulated.dm" #include "code\game\turfs\flooring\_flooring.dm" #include "code\game\turfs\flooring\_flooring_decals.dm" #include "code\game\turfs\flooring\flooring_carpet.dm" @@ -1630,6 +1610,7 @@ #include "code\game\turfs\open\open_sky.dm" #include "code\game\turfs\space\space.dm" #include "code\game\turfs\space\transit.dm" +#include "code\game\turfs\unsimulated\_unsimulated.dm" #include "code\game\turfs\unsimulated\floor.dm" #include "code\game\turfs\unsimulated\mask.dm" #include "code\game\turfs\unsimulated\walls.dm" @@ -1848,6 +1829,10 @@ #include "code\modules\banners\banner_frame_definitions.dm" #include "code\modules\banners\sign.dm" #include "code\modules\banners\sign_post.dm" +#include "code\modules\barricade_tape\barricade_tape.dm" +#include "code\modules\barricade_tape\barricade_tape_roll.dm" +#include "code\modules\barricade_tape\barricade_tape_subtypes.dm" +#include "code\modules\barricade_tape\barricade_tape_template.dm" #include "code\modules\blob\blob.dm" #include "code\modules\blood\blood.dm" #include "code\modules\blood\blood_types.dm" @@ -2169,6 +2154,7 @@ #include "code\modules\clothing\suits\jackets\track.dm" #include "code\modules\clothing\suits\jackets\waistcoat.dm" #include "code\modules\clothing\suits\jackets\wintercoat.dm" +#include "code\modules\clothing\tail\_tail.dm" #include "code\modules\clothing\underwear\base.dm" #include "code\modules\clothing\webbing\_webbing.dm" #include "code\modules\clothing\webbing\drop_pouches.dm" @@ -2589,7 +2575,6 @@ #include "code\modules\holomap\holomap.dm" #include "code\modules\hotloading\_admin.dm" #include "code\modules\hotloading\note.dm" -#include "code\modules\hud\_hud_condition.dm" #include "code\modules\hydroponics\grown.dm" #include "code\modules\hydroponics\grown_inedible.dm" #include "code\modules\hydroponics\grown_predefined.dm" @@ -2614,6 +2599,22 @@ #include "code\modules\hydroponics\trays\tray_soil.dm" #include "code\modules\hydroponics\trays\tray_tools.dm" #include "code\modules\hydroponics\trays\tray_update_icons.dm" +#include "code\modules\implants\implant.dm" +#include "code\modules\implants\implantcase.dm" +#include "code\modules\implants\implantchair.dm" +#include "code\modules\implants\implanter.dm" +#include "code\modules\implants\implantpad.dm" +#include "code\modules\implants\implant_types\adrenaline.dm" +#include "code\modules\implants\implant_types\chem.dm" +#include "code\modules\implants\implant_types\compressed.dm" +#include "code\modules\implants\implant_types\death_alarm.dm" +#include "code\modules\implants\implant_types\explosive.dm" +#include "code\modules\implants\implant_types\freedom.dm" +#include "code\modules\implants\implant_types\imprinting.dm" +#include "code\modules\implants\implant_types\loyalty.dm" +#include "code\modules\implants\implant_types\tracking.dm" +#include "code\modules\implants\implant_types\translator.dm" +#include "code\modules\implants\implant_types\uplink.dm" #include "code\modules\integrated_electronics\_defines.dm" #include "code\modules\integrated_electronics\core\_electronics.dm" #include "code\modules\integrated_electronics\core\analyzer.dm" @@ -3066,6 +3067,7 @@ #include "code\modules\mob\living\simple_animal\hostile\mimic.dm" #include "code\modules\mob\living\simple_animal\hostile\pike.dm" #include "code\modules\mob\living\simple_animal\hostile\revenant.dm" +#include "code\modules\mob\living\simple_animal\hostile\shark.dm" #include "code\modules\mob\living\simple_animal\hostile\slug.dm" #include "code\modules\mob\living\simple_animal\hostile\space_dragon.dm" #include "code\modules\mob\living\simple_animal\hostile\tree.dm" @@ -3347,7 +3349,6 @@ #include "code\modules\organs\internal\lungs.dm" #include "code\modules\organs\internal\stomach.dm" #include "code\modules\organs\internal\voice.dm" -#include "code\modules\organs\internal\species\golem.dm" #include "code\modules\overmap\_defines.dm" #include "code\modules\overmap\_overmap.dm" #include "code\modules\overmap\overmap_object.dm" @@ -3432,6 +3433,9 @@ #include "code\modules\persistence\persistence_datum_paper.dm" #include "code\modules\persistence\persistence_datum_paper_sticky.dm" #include "code\modules\pointdefense\pointdefense.dm" +#include "code\modules\posters\_poster.dm" +#include "code\modules\posters\_poster_design.dm" +#include "code\modules\posters\bs12.dm" #include "code\modules\posture\_posture.dm" #include "code\modules\posture\posture_bodytype.dm" #include "code\modules\posture\posture_mob.dm" @@ -3558,7 +3562,10 @@ #include "code\modules\projectiles\projectile\pellets.dm" #include "code\modules\projectiles\projectile\special.dm" #include "code\modules\projectiles\projectile\trace.dm" -#include "code\modules\projectiles\targeting\targeting_client.dm" +#include "code\modules\projectiles\projectile\effects\projectile_effects.dm" +#include "code\modules\projectiles\projectile\effects\projectile_impact.dm" +#include "code\modules\projectiles\projectile\effects\projectile_muzzle.dm" +#include "code\modules\projectiles\projectile\effects\projectile_tracer.dm" #include "code\modules\projectiles\targeting\targeting_gun.dm" #include "code\modules\projectiles\targeting\targeting_mob.dm" #include "code\modules\projectiles\targeting\targeting_overlay.dm" @@ -3751,6 +3758,21 @@ #include "code\modules\research\design_database.dm" #include "code\modules\research\design_database_analyzer.dm" #include "code\modules\research\research_fields.dm" +#include "code\modules\scanners\_scanner.dm" +#include "code\modules\scanners\breath.dm" +#include "code\modules\scanners\gas.dm" +#include "code\modules\scanners\health.dm" +#include "code\modules\scanners\mass_spectrometer.dm" +#include "code\modules\scanners\mining.dm" +#include "code\modules\scanners\network.dm" +#include "code\modules\scanners\plant.dm" +#include "code\modules\scanners\price.dm" +#include "code\modules\scanners\reagents.dm" +#include "code\modules\scanners\xenobio.dm" +#include "code\modules\scent\_scent.dm" +#include "code\modules\scent\scent_candle.dm" +#include "code\modules\scent\scent_decls.dm" +#include "code\modules\scent\scent_misc.dm" #include "code\modules\sealant_gun\sealant.dm" #include "code\modules\sealant_gun\sealant_gun.dm" #include "code\modules\sealant_gun\sealant_injector.dm" @@ -3792,8 +3814,6 @@ #include "code\modules\species\species_getters.dm" #include "code\modules\species\species_helpers.dm" #include "code\modules\species\species_hud.dm" -#include "code\modules\species\outsider\random.dm" -#include "code\modules\species\station\golem.dm" #include "code\modules\species\station\human.dm" #include "code\modules\species\station\human_bodytypes.dm" #include "code\modules\species\station\monkey.dm" @@ -4066,6 +4086,7 @@ #include "code\unit_tests\~helpers.dm" #include "interface\interface.dm" #include "interface\skin.dmf" +#include "maps\__map_modpack_compatibility.dm" #include "maps\__map_names.dm" #include "maps\_map_include.dm" #include "maps\antag_spawn\ert\ert.dm" diff --git a/test/annotate_od.sh b/test/annotate_od.sh new file mode 100644 index 000000000000..c0197915ca1f --- /dev/null +++ b/test/annotate_od.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +set -euo pipefail +python tools/od_annotator/__main__.py "$@" diff --git a/tools/map_migrations/4829_rags.txt b/tools/map_migrations/4829_rags.txt new file mode 100644 index 000000000000..8009144e5852 --- /dev/null +++ b/tools/map_migrations/4829_rags.txt @@ -0,0 +1 @@ +/obj/item/chems/glass/rag/@SUBTYPES : /obj/item/chems/rag/@SUBTYPES{@OLD} \ No newline at end of fileTemperature++ {{:helper.link('--', '', {'adj_temp' : -5})}} + {{:helper.link('-', '', {'adj_temp' : -1})}} ++{{:data.set_temperature}}K ({{:data.set_temperature - 273.15}}°C)+ {{:helper.link('+', '', {'adj_temp' : 1})}} + {{:helper.link('++', '', {'adj_temp' : 5})}} +