From 21d42614002e470f5be387a42b01173b24378e09 Mon Sep 17 00:00:00 2001 From: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com> Date: Sun, 19 May 2024 06:09:25 -0400 Subject: [PATCH 1/7] Medbeams now heal IBs and burn wounds along with (#25474) fractures --- code/modules/projectiles/guns/medbeam.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index 815ad91cb347..945960fbb94a 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -113,6 +113,8 @@ for(var/obj/item/organ/external/E in H.bodyparts) if(prob(10)) E.mend_fracture() + E.fix_internal_bleeding() + E.fix_burn_wound() else target.adjustBruteLoss(-4) target.adjustFireLoss(-4) From ac84655df6552731a7b8e2d4db6d06fe856cc126 Mon Sep 17 00:00:00 2001 From: matttheficus <57759731+matttheficus@users.noreply.github.com> Date: Sun, 19 May 2024 06:13:04 -0400 Subject: [PATCH 2/7] Radio Hotmic Noise + Alt Click Toggle (#25239) * radio check - lime charlie * examine addition * oops Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> * oops 2 Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> * dgamerl review * i didnt save lul --------- Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> --- code/__DEFINES/misc_defines.dm | 1 + code/game/objects/items/devices/radio/intercom.dm | 7 ++++++- .../game/objects/items/devices/radio/radio_objects.dm | 11 +++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm index e3fee8035c73..a837dc7a72b4 100644 --- a/code/__DEFINES/misc_defines.dm +++ b/code/__DEFINES/misc_defines.dm @@ -400,6 +400,7 @@ #define INVESTIGATE_RENAME "renames" #define INVESTIGATE_BOMB "bombs" +#define INVESTIGATE_HOTMIC "hotmic" // The SQL version required by this version of the code #define SQL_VERSION 56 diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index d8ff1d46d740..f2eb9da50073 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -174,6 +174,11 @@ else return ..() +/obj/item/radio/intercom/AltClick(mob/user) + . = ..() + if(broadcasting) + investigate_log("had its hotmic toggled on via hotkey by [key_name(user)].", INVESTIGATE_HOTMIC) ///Allows us to track who spams all these on if they do. + /obj/item/radio/intercom/crowbar_act(mob/user, obj/item/I) if(buildstage != 1) return @@ -245,7 +250,7 @@ underlays += emissive_appearance(icon, "intercom_lightmask") /obj/item/radio/intercom/proc/update_operating_status(on = TRUE) - if(!loc) // We init a few radios in nullspace to prevent them from needing power. + if(!loc) // We init a few radios in nullspace to prevent them from needing power. return var/area/current_area = get_area(src) if(on) diff --git a/code/game/objects/items/devices/radio/radio_objects.dm b/code/game/objects/items/devices/radio/radio_objects.dm index a26c5a126faa..4b5ca92cf499 100644 --- a/code/game/objects/items/devices/radio/radio_objects.dm +++ b/code/game/objects/items/devices/radio/radio_objects.dm @@ -131,6 +131,14 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems) return ui_interact(user) +/obj/item/radio/AltClick(mob/user) + if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user) || !istype(user)) + return + + ToggleBroadcast() + to_chat(user, "You [broadcasting ? "enable" : "disable"] [src]'s hotmic!") + add_fingerprint(user) + /obj/item/radio/ui_state(mob/user) return GLOB.default_state @@ -252,6 +260,8 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems) /obj/item/radio/proc/ToggleBroadcast() broadcasting = !broadcasting && !(wires.is_cut(WIRE_RADIO_TRANSMIT) || wires.is_cut(WIRE_RADIO_SIGNAL)) + if(broadcasting) + playsound(src, 'sound/items/radio_common.ogg', rand(4, 16) * 5, SOUND_RANGE_SET(3)) /obj/item/radio/proc/ToggleReception() listening = !listening && !(wires.is_cut(WIRE_RADIO_RECEIVER) || wires.is_cut(WIRE_RADIO_SIGNAL)) @@ -534,6 +544,7 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems) /obj/item/radio/examine(mob/user) . = ..() + . += "Alt-Click to toggle [src]'s hotmic!" if(in_range(src, user) || loc == user) if(b_stat) . += "\the [src] can be attached and modified!" From 8e43007b83e42eb4ea8f4b8d1a9b59defd4a946b Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Sun, 19 May 2024 12:42:02 +0200 Subject: [PATCH 3/7] fix this (#25524) --- code/datums/mind.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 26d4ba5fa50c..c055734bbe52 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -515,7 +515,7 @@ alert("Not before round-start!", "Alert") return - var/list/out = list("[name][(current && (current.real_name != name))?" (as [current.real_name])" : ""]") + var/list/out = list("[name][name][(current && (current.real_name != name))?" (as [current.real_name])" : ""]") out.Add("Mind currently owned by key: [key] [active ? "(synced)" : "(not synced)"]") out.Add("Assigned role: [assigned_role]. Edit") out.Add("Factions and special roles:") @@ -592,6 +592,7 @@ out.Add(gen_objective_text(admin = TRUE)) out.Add("Add objective
") out.Add("Announce objectives
") + out.Add("") usr << browse(out.Join("
"), "window=edit_memory[src];size=500x500") /datum/mind/Topic(href, href_list) From b290fdd76a993d78a7cbfb6277963b905018d8a3 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sun, 19 May 2024 14:25:42 -0400 Subject: [PATCH 4/7] The lance now has a very clear confirmation message on it. (#25501) * The lance now has a very clear confirmation message on it. * Update code/modules/supply/supply_console.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> --- code/modules/supply/supply_console.dm | 6 ++++-- code/modules/supply/supply_pack.dm | 2 ++ code/modules/supply/supply_packs/pack_shuttle.dm | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/supply/supply_console.dm b/code/modules/supply/supply_console.dm index 83f08bcdbd8d..3ff104c88927 100644 --- a/code/modules/supply/supply_console.dm +++ b/code/modules/supply/supply_console.dm @@ -275,13 +275,15 @@ if(!P.can_order()) to_chat(user, "That cannot be ordered right now. Please try again later.") return - + if(P.are_you_sure_you_want_to_be_banned) + var/we_warned_you = tgui_alert(user, "[P.are_you_sure_you_want_to_be_banned]", "ARE YOU SURE?", list("Yes", "No")) + if(!we_warned_you || we_warned_you == "No") + return if(!P.singleton && params["multiple"]) var/num_input = tgui_input_number(user, "Amount", "How many crates?", max_value = MULTIPLE_CRATE_MAX, min_value = 1) if(isnull(num_input) || (!is_public && !is_authorized(user)) || ..()) // Make sure they dont walk away return amount = clamp(round(num_input), 1, MULTIPLE_CRATE_MAX) - var/reason = tgui_input_text(user, "Reason", "Why do you require this item?", encode = FALSE, timeout = 60 SECONDS) if(!reason || (!is_public && !is_authorized(user)) || ..()) return diff --git a/code/modules/supply/supply_pack.dm b/code/modules/supply/supply_pack.dm index 3a3ce13a8ed9..a9f2bcaca46e 100644 --- a/code/modules/supply/supply_pack.dm +++ b/code/modules/supply/supply_pack.dm @@ -43,6 +43,8 @@ var/list/announce_beacons = list() /// List of names for being done in TGUI var/list/ui_manifest = list() + /// If this variable is filled, this grants the user a special TGUI confirmation prompt about ordering this shuttle, before they can place the order. Similar to bag of holding. + var/are_you_sure_you_want_to_be_banned /datum/supply_packs/New() . = ..() diff --git a/code/modules/supply/supply_packs/pack_shuttle.dm b/code/modules/supply/supply_packs/pack_shuttle.dm index 2425a61026b9..f00ef4cccf1b 100644 --- a/code/modules/supply/supply_packs/pack_shuttle.dm +++ b/code/modules/supply/supply_packs/pack_shuttle.dm @@ -106,6 +106,7 @@ cost = 5000 //please don't order this for funny please sir template = /datum/map_template/shuttle/emergency/lance speed_factor = 1.5 //Don't need to slow down before docking + are_you_sure_you_want_to_be_banned = "If you are not an antagonist, and you are ordering this shuttle for no valid reason, you will be banned, or job banned. If you are an antagonist, ahelp for permision, unless you are a hijacker, or you will be antagonist banned. If you are unsure, ahelp now." /datum/supply_packs/abstract/shuttle/lance/on_order_confirm(datum/supply_order/order) . = ..() From e799cef6b9012b01895d4dbb0afb63ffa6e309bc Mon Sep 17 00:00:00 2001 From: Taurtura <141481662+Taurtura@users.noreply.github.com> Date: Mon, 20 May 2024 05:55:49 +0200 Subject: [PATCH 5/7] adds the abductor surgery toolset (#25419) * adds surgical abductor toolset * ..Yes. The crew needs to be able to get it somehow. Right * handle review from 1080p * Required tech should be the correct one, and not engi's * Henri's review * 1080p's review * adds surgical abductor toolset * ..Yes. The crew needs to be able to get it somehow. Right * handle review from 1080p * Required tech should be the correct one, and not engi's * Henri's review * 1080p's review --- code/modules/research/designs/medical_designs.dm | 11 +++++++++++ code/modules/surgery/organs/augments_arms.dm | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index b929547aa27e..5caceeec130e 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -436,6 +436,17 @@ build_path = /obj/item/organ/internal/cyberimp/arm/janitorial_abductor category = list("Medical") +/datum/design/cyberimp_surgical_abductor + name = "Abductor Surgical Toolset Implant" + desc = "An alien surgical toolset, designed to be installed on the subject's arm." + id = "ci-med-abductor" + req_tech = list("materials" = 6, "magnets" = 6, "biotech" = 6, "abductor" = 3) + build_type = PROTOLATHE | MECHFAB + materials = list(MAT_METAL = 20000, MAT_SILVER = 10000, MAT_PLASMA = 9000, MAT_TITANIUM = 8000, MAT_DIAMOND = 8000) + construction_time = 20 SECONDS + build_path = /obj/item/organ/internal/cyberimp/arm/surgical_abductor + category = list("Medical") + /datum/design/cyberimp_jani_hud name = "Janitor HUD Implant" desc = "These cybernetic eye implants will display a filth HUD over everything you see. Wiggle eyes to control." diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index f28c4636559f..ec626a19ba64 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -261,6 +261,17 @@ /obj/item/organ/internal/cyberimp/arm/janitorial_abductor/l parent_organ = "l_arm" +/obj/item/organ/internal/cyberimp/arm/surgical_abductor + name = "Alien Surgical Toolset implant" + desc = "An alien surgical toolset, designed to be installed on the subject's arm." + origin_tech = "materials=5;engineering=5;plasmatech=5;powerstorage=4;abductor=2" + contents = newlist(/obj/item/retractor/alien, /obj/item/hemostat/alien, /obj/item/cautery/alien, /obj/item/bonesetter/alien, /obj/item/scalpel/alien, /obj/item/circular_saw/alien, /obj/item/bonegel/alien, /obj/item/FixOVein/alien, /obj/item/surgicaldrill/alien) + action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/abductor.dmi') + action_icon_state = list(/datum/action/item_action/organ_action/toggle = "belt") + +/obj/item/organ/internal/cyberimp/arm/surgical_abductor/l + parent_organ = "l_arm" + /obj/item/organ/internal/cyberimp/arm/esword name = "arm-mounted energy blade" desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated enregy." From e20bbc6ca3f974f7769e99830c55042a34224077 Mon Sep 17 00:00:00 2001 From: Charlie Nolan Date: Mon, 20 May 2024 20:39:41 -0700 Subject: [PATCH 6/7] Requests Console standardization (#25213) * Requests Console standardization * Update Secondary Goals to match the new Chemistry Requests Console --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) --- _maps/map_files/stations/boxstation.dmm | 85 ++------------ _maps/map_files/stations/cerestation.dmm | 107 ++++++++++++------ _maps/map_files/stations/deltastation.dmm | 86 +++++++------- _maps/map_files/stations/metastation.dmm | 90 ++++++--------- .../secondary/medical/random_bulk_medicine.dm | 2 +- .../secondary/medical/variety_medicine.dm | 2 +- 6 files changed, 168 insertions(+), 204 deletions(-) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 01ace0aec760..eea05eb169fc 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -679,7 +679,6 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - name = "Security Requests Console"; pixel_y = 30 }, /obj/machinery/economy/vending/secdrobe, @@ -3149,7 +3148,6 @@ announcementConsole = 1; department = "Head of Security's Desk"; departmentType = 5; - name = "Head of Security Requests Console"; pixel_x = 30 }, /obj/machinery/computer/brigcells{ @@ -4214,7 +4212,6 @@ /obj/machinery/requests_console{ department = "Warden"; departmentType = 7; - name = "Warden's Requests Console"; pixel_y = -30 }, /obj/item/radio/intercom/department/security{ @@ -6839,7 +6836,6 @@ /obj/structure/bookcase/sop, /obj/machinery/requests_console{ department = "Internal Affairs Office"; - name = "Internal Affairs Requests Console"; pixel_x = -30 }, /obj/machinery/light{ @@ -9694,8 +9690,7 @@ pixel_y = -28 }, /obj/machinery/requests_console{ - department = "Internal Affairs Office"; - name = "Magistrate Requests Console"; + department = "Magistrate"; pixel_x = 30; departmentType = 5 }, @@ -10030,8 +10025,7 @@ "aGu" = ( /obj/item/kirbyplants, /obj/machinery/requests_console{ - department = "Internal Affairs Office"; - name = "Courtroom Requests Console"; + department = "Courtroom"; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -10394,8 +10388,7 @@ icon_state = "1-2" }, /obj/machinery/requests_console{ - department = "Internal Affairs Office"; - name = "Courtroom Gallery Requests Console"; + department = "Courtroom"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -15139,7 +15132,6 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - name = "Security Requests Console"; pixel_y = 30 }, /obj/machinery/computer/secure_data, @@ -15189,7 +15181,6 @@ }, /obj/machinery/requests_console{ department = "Tool Storage"; - name = "Tool Storage Requests Console"; pixel_y = 30 }, /obj/item/assembly/igniter{ @@ -15989,9 +15980,8 @@ c_tag = "Medbay Paramedic" }, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Paramedic"; departmentType = 1; - name = "Paramedic Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel, @@ -18024,7 +18014,6 @@ "bex" = ( /obj/machinery/requests_console{ department = "Arrival Shuttle"; - name = "Arrival Shuttle Requests Console"; pixel_y = -30 }, /turf/simulated/floor/mineral/titanium/blue, @@ -18291,7 +18280,6 @@ /obj/machinery/requests_console{ department = "Bar"; departmentType = 2; - name = "Bar Requests Console"; pixel_y = 30 }, /obj/structure/table/reinforced, @@ -22961,8 +22949,7 @@ /area/station/service/bar) "brI" = ( /obj/machinery/requests_console{ - department = "Primary Tool Storage"; - name = "Chapel Request Console"; + department = "Chapel"; pixel_x = -30; departmentType = 2 }, @@ -23976,7 +23963,6 @@ /obj/machinery/requests_console{ department = "Kitchen"; departmentType = 2; - name = "Kitchen Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -24787,7 +24773,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_x = 30 }, /obj/structure/table, @@ -25167,7 +25152,6 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - name = "Cargo Requests Console"; pixel_y = 30 }, /obj/item/stack/tape_roll, @@ -26929,7 +26913,6 @@ /obj/machinery/requests_console{ department = "Robotics"; departmentType = 2; - name = "Robotics Requests Console"; pixel_y = 30 }, /obj/structure/rack{ @@ -27579,7 +27562,6 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - name = "Cargo Requests Console"; pixel_y = 30 }, /obj/effect/turf_decal/delivery/hollow, @@ -27928,7 +27910,6 @@ /obj/machinery/requests_console{ department = "Medbay"; departmentType = 1; - name = "Medbay Requests Console"; pixel_x = -30 }, /obj/structure/table, @@ -29465,7 +29446,6 @@ announcementConsole = 1; department = "Quartermaster's Desk"; departmentType = 5; - name = "Quartermaster Requests Console"; pixel_x = -30 }, /turf/simulated/floor/carpet, @@ -30477,7 +30457,6 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - name = "Cargo Requests Console"; pixel_x = -30 }, /obj/machinery/camera{ @@ -30512,9 +30491,8 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Chemistry"; departmentType = 1; - name = "Chemistry Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -32850,7 +32828,6 @@ announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; - name = "Chief Medical Officer Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -33953,7 +33930,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -34960,7 +34936,6 @@ /obj/machinery/requests_console{ department = "Virology"; departmentType = 3; - name = "Virology Requests Console"; pixel_y = 30 }, /obj/machinery/newscaster{ @@ -36065,7 +36040,6 @@ announcementConsole = 1; department = "Blueshield"; departmentType = 5; - name = "Blueshield Requests Console"; pixel_y = -30 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -39539,7 +39513,6 @@ "cAK" = ( /obj/machinery/requests_console{ department = "Tech Storage"; - name = "Tech Storage Requests Console"; pixel_y = -32 }, /turf/simulated/floor/plating, @@ -40038,7 +40011,6 @@ announcementConsole = 1; department = "NT Representative"; departmentType = 5; - name = "NT Representative Requests Console"; pixel_y = 30 }, /obj/machinery/photocopier, @@ -41501,7 +41473,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -42397,7 +42368,6 @@ /obj/machinery/requests_console{ department = "Atmospherics"; departmentType = 3; - name = "Atmospherics Requests Console"; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -44056,7 +44026,6 @@ /obj/machinery/requests_console{ department = "Engineering"; departmentType = 3; - name = "Engineering Requests Console"; pixel_x = 30 }, /obj/item/stack/sheet/glass{ @@ -44509,9 +44478,8 @@ /area/station/engineering/atmos) "cSf" = ( /obj/machinery/requests_console{ - department = "Science"; + department = "Xenobiology"; departmentType = 2; - name = "Science Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -45193,7 +45161,6 @@ /obj/machinery/requests_console{ department = "Engineering"; departmentType = 3; - name = "Engineering Requests Console"; pixel_y = 30 }, /obj/structure/table, @@ -45741,7 +45708,6 @@ /obj/machinery/requests_console{ department = "Atmospherics"; departmentType = 3; - name = "Atmospherics Requests Console"; pixel_y = -30 }, /obj/item/stack/sheet/glass{ @@ -46480,9 +46446,8 @@ /area/station/engineering/atmos) "cZa" = ( /obj/machinery/requests_console{ - department = "Bar"; + department = "Expedition"; departmentType = 2; - name = "Expedition Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -46779,7 +46744,6 @@ /obj/item/book/manual/evaguide, /obj/machinery/requests_console{ department = "EVA"; - name = "EVA Requests Console"; pixel_x = -32 }, /obj/effect/turf_decal/delivery/white/hollow, @@ -47411,12 +47375,6 @@ /area/station/engineering/break_room) "dcF" = ( /obj/structure/closet/firecloset, -/obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 3; - name = "Atmospherics Requests Console"; - pixel_x = -30 - }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dcG" = ( @@ -48855,7 +48813,6 @@ "dig" = ( /obj/machinery/requests_console{ department = "Locker Room"; - name = "Locker Room Requests Console"; pixel_x = -32 }, /turf/simulated/floor/plasteel, @@ -50680,7 +50637,6 @@ /obj/machinery/requests_console{ department = "Hydroponics"; departmentType = 2; - name = "Hydroponics Requests Console"; pixel_y = 30 }, /obj/machinery/plantgenes, @@ -51645,7 +51601,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - name = "AI Requests Console"; pixel_x = 32; pixel_y = -32 }, @@ -55080,8 +55035,7 @@ }, /obj/item/storage/briefcase, /obj/machinery/requests_console{ - department = "Medbay"; - name = "Psych Requests Console"; + department = "Psychiatrist"; pixel_x = -30; departmentType = 2 }, @@ -59849,7 +59803,6 @@ announcementConsole = 1; department = "Bridge"; departmentType = 5; - name = "Bridge Requests Console"; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -62147,7 +62100,6 @@ /obj/machinery/requests_console{ department = "Library"; departmentType = 2; - name = "Library Requests Console"; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -67018,8 +66970,7 @@ /area/station/security/permabrig) "kFd" = ( /obj/machinery/requests_console{ - department = "Primary Tool Storage"; - name = "Chapel Office Request Console"; + department = "Chapel"; departmentType = 2; pixel_y = -30 }, @@ -68801,7 +68752,6 @@ /obj/item/camera_film, /obj/item/camera/detective, /obj/machinery/requests_console{ - name = "Detective Requests Console"; pixel_y = -30; department = "Detective"; departmentType = 5 @@ -70463,7 +70413,6 @@ announcementConsole = 1; department = "Chief Engineer's Desk"; departmentType = 7; - name = "Chief Engineer Requests Console"; pixel_y = 32 }, /obj/machinery/light{ @@ -70917,7 +70866,6 @@ /obj/machinery/requests_console{ department = "Morgue"; departmentType = 5; - name = "Morgue Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -71655,7 +71603,6 @@ /obj/item/storage/firstaid/regular, /obj/machinery/requests_console{ department = "Crew Quarters"; - name = "Crew Quarters Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -74294,7 +74241,6 @@ announcementConsole = 1; department = "Bridge"; departmentType = 5; - name = "Bridge Requests Console"; pixel_y = -30 }, /obj/structure/cable{ @@ -79830,7 +79776,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_x = 30 }, /obj/structure/disposalpipe/segment, @@ -85470,7 +85415,6 @@ announcementConsole = 1; department = "Head of Personnel's Desk"; departmentType = 5; - name = "Head of Personnel Requests Console"; pixel_y = -30 }, /obj/machinery/camera/autoname{ @@ -85494,7 +85438,6 @@ announcementConsole = 1; department = "Research Director's Desk"; departmentType = 7; - name = "Research Director Requests Console"; pixel_x = -2; pixel_y = 30 }, @@ -87782,9 +87725,8 @@ pixel_y = -30 }, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Genetics"; departmentType = 1; - name = "Genetics Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -91819,9 +91761,8 @@ /area/station/maintenance/apmaint) "wQa" = ( /obj/machinery/requests_console{ - department = "Cargo Bay"; + department = "Mining"; departmentType = 2; - name = "Cargo Requests Console"; pixel_x = -30 }, /obj/effect/landmark/start/shaft_miner, @@ -92191,7 +92132,6 @@ /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; - name = "Janitor Requests Console"; pixel_y = -29 }, /obj/effect/turf_decal/delivery/green/hollow, @@ -93031,7 +92971,6 @@ announcementConsole = 1; department = "Captain's Desk"; departmentType = 5; - name = "Captain Requests Console"; pixel_x = 30 }, /turf/simulated/floor/carpet/royalblue, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index b23ff7503b78..6d9352005e52 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -3893,7 +3893,6 @@ announcementConsole = 1; department = "Head of Security's Desk"; departmentType = 5; - name = "Head of Security Requests Console"; pixel_y = -30 }, /obj/machinery/computer/secure_data{ @@ -9904,7 +9903,6 @@ }, /obj/machinery/requests_console{ department = "EVA"; - name = "EVA Requests Console"; pixel_x = -32 }, /turf/simulated/floor/plasteel{ @@ -16098,7 +16096,6 @@ }, /obj/machinery/requests_console{ department = "Virology"; - name = "Virology Requests Console"; pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24251,7 +24248,6 @@ }, /obj/machinery/requests_console{ department = "Crew Quarters"; - name = "Crew Quarters Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -24493,9 +24489,8 @@ /area/space) "cEm" = ( /obj/machinery/requests_console{ - department = "Cargo Bay"; + department = "Quartermaster's Desk"; departmentType = 5; - name = "Quartermaster Requests Console"; pixel_x = 30; announcementConsole = 1 }, @@ -24581,7 +24576,6 @@ /obj/machinery/requests_console{ department = "Warden"; departmentType = 7; - name = "Warden's Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -27688,6 +27682,10 @@ /obj/item/paper_bin/nanotrasen, /obj/item/stamp/magistrate, /obj/item/pen/multi/gold, +/obj/machinery/requests_console{ + department = "Magistrate"; + pixel_x = 30 + }, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "cSQ" = ( @@ -28896,7 +28894,6 @@ }, /obj/machinery/requests_console{ department = "Tool Storage"; - name = "Tool Storage Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -29344,7 +29341,6 @@ /obj/machinery/requests_console{ department = "Bar"; departmentType = 2; - name = "Bar Requests Console"; pixel_x = -30 }, /turf/simulated/floor/wood, @@ -30509,7 +30505,6 @@ /area/station/science/hallway) "dkb" = ( /obj/machinery/requests_console{ - name = "Detective Requests Console"; pixel_y = -30; department = "Detective"; departmentType = 5 @@ -33924,7 +33919,6 @@ /obj/item/multitool, /obj/machinery/requests_console{ department = "Tech Storage"; - name = "Tech Storage Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plating, @@ -43068,7 +43062,6 @@ /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; - name = "Janitor Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel, @@ -44348,6 +44341,11 @@ /area/station/maintenance/storage) "hkr" = ( /obj/item/kirbyplants, +/obj/machinery/requests_console{ + department = "Chapel"; + departmentType = 2; + pixel_y = 30 + }, /turf/simulated/floor/carpet/black, /area/station/service/chapel) "hkt" = ( @@ -46618,6 +46616,16 @@ icon_state = "darkblue" }, /area/station/medical/storage/secondary) +"hUK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/requests_console{ + department = "Mining"; + departmentType = 5; + pixel_x = 30; + announcementConsole = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/supply/miningdock) "hUN" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -49554,7 +49562,6 @@ announcementConsole = 1; department = "Blueshield"; departmentType = 5; - name = "Blueshield Requests Console"; pixel_x = 30 }, /obj/structure/table/wood, @@ -52798,6 +52805,14 @@ icon_state = "asteroidplating" }, /area/station/maintenance/port) +"jMh" = ( +/obj/item/kirbyplants, +/obj/machinery/requests_console{ + department = "Psychiatrist"; + pixel_x = -30 + }, +/turf/simulated/floor/carpet, +/area/station/medical/psych) "jMr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -53924,6 +53939,13 @@ /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"kgy" = ( +/obj/machinery/requests_console{ + department = "Library"; + pixel_x = -30 + }, +/turf/simulated/floor/wood, +/area/station/service/library) "kgP" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -54974,7 +54996,6 @@ announcementConsole = 1; department = "NT Representative"; departmentType = 5; - name = "NT Representative Requests Console"; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -62366,7 +62387,6 @@ /obj/structure/closet/wardrobe/black, /obj/machinery/requests_console{ department = "Arrival Shuttle"; - name = "Arrival Shuttle Requests Console"; pixel_y = -30 }, /turf/simulated/floor/mineral/titanium/blue, @@ -63470,7 +63490,6 @@ /obj/machinery/requests_console{ department = "Medbay"; departmentType = 1; - name = "Medbay Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -65774,6 +65793,16 @@ "nTa" = ( /turf/simulated/mineral/ancient, /area/station/hallway/primary/central/east) +"nTo" = ( +/obj/machinery/requests_console{ + department = "Expedition"; + departmentType = 2; + pixel_x = 30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/service/expedition) "nTJ" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -67759,7 +67788,6 @@ /obj/machinery/requests_console{ department = "Kitchen"; departmentType = 2; - name = "Kitchen Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -67866,7 +67894,6 @@ /obj/machinery/requests_console{ department = "Engineering"; departmentType = 3; - name = "Engineering Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -70284,6 +70311,17 @@ icon_state = "white" }, /area/station/science/misc_lab) +"pqq" = ( +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Xenobiology"; + departmentType = 5; + pixel_x = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplefull" + }, +/area/station/science/xenobiology) "pqr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -77273,7 +77311,6 @@ /obj/machinery/requests_console{ department = "Morgue"; departmentType = 5; - name = "Morgue Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -80554,7 +80591,6 @@ /obj/machinery/requests_console{ department = "Hydroponics"; departmentType = 2; - name = "Hydroponics Requests Console"; pixel_y = 30 }, /obj/machinery/hydroponics/constructable, @@ -83266,7 +83302,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_x = -30 }, /obj/machinery/r_n_d/circuit_imprinter, @@ -87017,6 +87052,14 @@ /obj/structure/falsewall/rock_ancient, /turf/simulated/floor/plasteel, /area/station/public/locker) +"uJE" = ( +/obj/machinery/requests_console{ + department = "Courtroom"; + departmentType = 2; + pixel_x = 30 + }, +/turf/simulated/floor/carpet, +/area/station/legal/courtroom) "uJT" = ( /turf/simulated/wall, /area/station/maintenance/gambling_den) @@ -87998,9 +88041,8 @@ /obj/item/storage/box/monkeycubes/stokcubes, /obj/item/storage/box/monkeycubes/wolpincubes, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Genetics"; departmentType = 1; - name = "Genetics Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -88993,7 +89035,6 @@ /obj/item/pen/multi, /obj/machinery/requests_console{ department = "Internal Affairs Office"; - name = "Internal Affairs Requests Console"; pixel_x = -30 }, /obj/item/taperecorder, @@ -93175,7 +93216,6 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - name = "Security Requests Console"; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -93366,6 +93406,10 @@ }, /area/station/maintenance/gambling_den) "wyn" = ( +/obj/machinery/requests_console{ + department = "Paramedic"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -98146,7 +98190,6 @@ "xYV" = ( /obj/machinery/requests_console{ department = "Locker Room"; - name = "Locker Room Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel, @@ -112105,7 +112148,7 @@ xJa gbb xJa gLH -xhk +uJE bIR xhk xhk @@ -113724,7 +113767,7 @@ aEe aEe aEe bLH -bHZ +kgy qKM bRi bPj @@ -120723,7 +120766,7 @@ cGd qqa muT uBC -uBC +pqq uBC cAh pon @@ -138883,7 +138926,7 @@ jVI jVI jVI bzs -vId +nTo hou oVI xbO @@ -145816,7 +145859,7 @@ fMl fMl aZM cMM -bcO +jMh oFv oWH poU @@ -153997,7 +154040,7 @@ uHx aFb byd qbb -qbb +hUK aJH cbR aIA diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 0d416241c107..51d579a263d1 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -398,6 +398,10 @@ /area/station/hallway/secondary/entry/east) "aeF" = ( /obj/structure/filingcabinet/chestdrawer, +/obj/machinery/requests_console{ + department = "Psychiatrist"; + pixel_x = -30 + }, /turf/simulated/floor/wood, /area/station/medical/psych) "aeI" = ( @@ -6289,7 +6293,6 @@ /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; - name = "Janitor Requests Console"; pixel_y = 29 }, /obj/effect/turf_decal/delivery/hollow, @@ -9096,7 +9099,6 @@ /obj/machinery/requests_console{ department = "Bar"; departmentType = 2; - name = "Bar Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel/dark, @@ -14497,7 +14499,6 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - name = "Cargo Requests Console"; pixel_y = 30 }, /obj/item/storage/firstaid/regular, @@ -14655,7 +14656,6 @@ announcementConsole = 1; department = "Quartermaster's Desk"; departmentType = 5; - name = "Quartermaster Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -18087,7 +18087,6 @@ /obj/machinery/requests_console{ department = "Kitchen"; departmentType = 2; - name = "Kitchen Requests Console"; pixel_x = 30 }, /obj/effect/turf_decal/delivery, @@ -20495,7 +20494,6 @@ announcementConsole = 1; department = "Head of Security's Desk"; departmentType = 5; - name = "Head of Security Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -24996,7 +24994,6 @@ /obj/machinery/requests_console{ department = "Hydroponics"; departmentType = 2; - name = "Hydroponics Requests Console"; pixel_x = 30 }, /obj/effect/turf_decal/delivery/hollow, @@ -27048,7 +27045,6 @@ /obj/machinery/requests_console{ department = "Atmospherics"; departmentType = 3; - name = "Atmospherics Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -27162,7 +27158,7 @@ dir = 4 }, /obj/machinery/requests_console{ - department = "Primary Tool Storage"; + department = "Tool Storage"; name = "Primary Tool Storage Console"; pixel_y = 30 }, @@ -27740,7 +27736,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - name = "AI Requests Console"; pixel_x = 32; pixel_y = 32 }, @@ -30227,7 +30222,6 @@ /obj/item/stack/sheet/glass, /obj/machinery/requests_console{ department = "Tech Storage"; - name = "Tech Storage Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel/dark, @@ -31234,7 +31228,6 @@ dir = 8 }, /obj/machinery/requests_console{ - name = "Detective Requests Console"; pixel_x = 30; department = "Detective"; departmentType = 5 @@ -31576,7 +31569,6 @@ announcementConsole = 1; department = "Chief Engineer's Desk"; departmentType = 7; - name = "Chief Engineer Requests Console"; pixel_x = -32 }, /turf/simulated/floor/plasteel/dark, @@ -34130,7 +34122,6 @@ announcementConsole = 1; department = "Captain's Desk"; departmentType = 5; - name = "Captain Requests Console"; pixel_x = -30 }, /turf/simulated/floor/carpet/black, @@ -34994,7 +34985,6 @@ announcementConsole = 1; department = "Head of Personnel's Desk"; departmentType = 5; - name = "Head of Personnel Requests Console"; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -36821,7 +36811,6 @@ announcementConsole = 1; department = "NT Representative"; departmentType = 5; - name = "NT Representative Requests Console"; pixel_y = 30 }, /turf/simulated/floor/carpet/royalblack, @@ -36864,7 +36853,6 @@ announcementConsole = 1; department = "Blueshield"; departmentType = 5; - name = "Blueshield Requests Console"; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -39217,6 +39205,10 @@ /area/station/legal/magistrate) "cgk" = ( /obj/item/kirbyplants, +/obj/machinery/requests_console{ + department = "Magistrate"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -39665,7 +39657,7 @@ "chL" = ( /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ - department = "IAA Office" + department = "Internal Affairs Office" }, /turf/simulated/floor/wood, /area/station/legal/lawoffice) @@ -39693,7 +39685,6 @@ /obj/structure/filingcabinet/security, /obj/machinery/requests_console{ department = "Internal Affairs Office"; - name = "Internal Affairs Requests Console"; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -41501,7 +41492,6 @@ /obj/machinery/requests_console{ department = "Engineering"; departmentType = 3; - name = "Engineering Requests Console"; pixel_y = -30 }, /obj/effect/turf_decal/delivery, @@ -42238,6 +42228,10 @@ pixel_x = 4; pixel_y = 4 }, +/obj/machinery/requests_console{ + department = "Courtroom"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "coQ" = ( @@ -42622,6 +42616,10 @@ /obj/structure/table/wood, /obj/item/storage/bag/books, /obj/item/taperecorder, +/obj/machinery/requests_console{ + department = "Library"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "cpN" = ( @@ -46929,7 +46927,6 @@ }, /obj/machinery/requests_console{ department = "EVA"; - name = "EVA Requests Console"; pixel_x = 32 }, /turf/simulated/floor/plasteel/dark, @@ -51033,6 +51030,10 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/requests_console{ + department = "Paramedic"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -53755,7 +53756,6 @@ /obj/structure/closet/wardrobe/yellow, /obj/machinery/requests_console{ department = "Locker Room"; - name = "Locker Room Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -54087,7 +54087,6 @@ /obj/machinery/requests_console{ department = "Xenobiology"; departmentType = 2; - name = "Xenobiology Requests Console"; pixel_x = 30 }, /obj/effect/turf_decal/delivery, @@ -55183,7 +55182,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Research Request Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -57214,9 +57212,8 @@ name = "Chemistry Cleaner" }, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Chemistry"; departmentType = 1; - name = "Chemistry Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -57999,7 +57996,6 @@ announcementConsole = 1; department = "Research Director's Desk"; departmentType = 7; - name = "Research Director Requests Console"; pixel_x = -30; pixel_y = -2 }, @@ -58835,7 +58831,6 @@ /obj/machinery/requests_console{ department = "Robotics"; departmentType = 2; - name = "Robotics Requests Console"; pixel_y = 30 }, /obj/effect/turf_decal/delivery/hollow, @@ -65227,9 +65222,8 @@ "dYd" = ( /obj/machinery/dna_scannernew, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Genetics"; departmentType = 1; - name = "Genetics Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -65479,7 +65473,6 @@ /obj/machinery/requests_console{ department = "Chapel"; departmentType = 2; - name = "Chapel Requests Console"; pixel_y = -30 }, /turf/simulated/floor/carpet, @@ -68283,6 +68276,12 @@ icon_state = "redyellowfull" }, /area/station/medical/break_room) +"fyq" = ( +/obj/machinery/requests_console{ + department = "Expedition" + }, +/turf/simulated/floor/plasteel, +/area/station/service/expedition) "fzd" = ( /obj/machinery/access_button{ autolink_id = "virolab_btn_int"; @@ -69545,7 +69544,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -73899,7 +73897,6 @@ announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; - name = "Chief Medical Officer Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -78176,7 +78173,6 @@ /obj/machinery/requests_console{ department = "Medbay"; departmentType = 1; - name = "Medbay Requests Console"; pixel_x = 30 }, /obj/structure/table, @@ -81016,6 +81012,14 @@ icon_state = "bar" }, /area/station/service/kitchen) +"nnV" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/requests_console{ + department = "Mining"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel, +/area/station/supply/miningdock) "nnW" = ( /obj/machinery/door/airlock/security, /obj/effect/mapping_helpers/airlock/autoname, @@ -81829,7 +81833,6 @@ /obj/machinery/requests_console{ department = "Morgue"; departmentType = 5; - name = "Morgue Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -81960,7 +81963,6 @@ announcementConsole = 1; department = "Bridge"; departmentType = 5; - name = "Bridge Requests Console"; pixel_y = -30; dir = 1 }, @@ -82235,7 +82237,6 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - name = "Security Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -88978,6 +88979,10 @@ c_tag = "Rec Room Aft"; dir = 4 }, +/obj/machinery/requests_console{ + department = "Crew Quarters"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -92213,7 +92218,6 @@ /obj/machinery/requests_console{ department = "Warden"; departmentType = 7; - name = "Warden's Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -98690,7 +98694,6 @@ /obj/machinery/requests_console{ department = "Virology"; departmentType = 3; - name = "Virology Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -99146,7 +99149,6 @@ /obj/item/kirbyplants, /obj/machinery/requests_console{ department = "Arrival Shuttle"; - name = "Arrival Shuttle Requests Console"; pixel_x = 30 }, /turf/simulated/floor/mineral/titanium/blue, @@ -141263,7 +141265,7 @@ bIX csV cxe cvK -cCX +fyq cyr czW cBw @@ -144822,7 +144824,7 @@ hYQ bgT bih bjL -boD +nnV eNt boE eNt diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 7380ac464208..1a88285f3340 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -440,7 +440,6 @@ /area/station/legal/magistrate) "afw" = ( /obj/machinery/requests_console{ - name = "Detective Requests Console"; pixel_y = 30; department = "Detective"; departmentType = 5 @@ -1336,7 +1335,6 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - name = "Security Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -5795,6 +5793,10 @@ "aFd" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/magistrate, +/obj/machinery/requests_console{ + department = "Magistrate"; + pixel_y = 30 + }, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "aFe" = ( @@ -7343,7 +7345,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -8903,7 +8904,6 @@ announcementConsole = 1; department = "Quartermaster's Desk"; departmentType = 5; - name = "Quartermaster Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -12321,8 +12321,7 @@ /area/station/hallway/secondary/bridge) "bad" = ( /obj/machinery/requests_console{ - department = "Locker Room"; - name = "Dorms Requests Console"; + department = "Crew Quarters"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -13505,7 +13504,6 @@ }, /obj/machinery/requests_console{ department = "Tech Storage"; - name = "Tech Storage Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -14286,7 +14284,6 @@ announcementConsole = 1; department = "Chief Engineer's Desk"; departmentType = 7; - name = "Chief Engineer Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -15614,7 +15611,6 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - name = "Security Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -18009,7 +18005,6 @@ /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; - name = "Janitor Requests Console"; pixel_x = -30 }, /obj/machinery/camera{ @@ -18800,7 +18795,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - name = "AI Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -18933,7 +18927,7 @@ /area/shuttle/arrival/station) "brt" = ( /obj/machinery/requests_console{ - department = "Arrival shuttle"; + department = "Arrival Shuttle"; pixel_y = -30 }, /obj/machinery/light, @@ -20145,7 +20139,6 @@ announcementConsole = 1; department = "Bridge"; departmentType = 5; - name = "Bridge Requests Console"; pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21673,7 +21666,6 @@ announcementConsole = 1; department = "Head of Personnel's Desk"; departmentType = 5; - name = "Head of Personnel Requests Console"; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -21793,7 +21785,6 @@ announcementConsole = 1; department = "Captain's Desk"; departmentType = 5; - name = "Captain Requests Console"; pixel_x = 30 }, /turf/simulated/floor/wood, @@ -24280,6 +24271,10 @@ "bHu" = ( /obj/structure/chair/comfy/black, /obj/effect/landmark/start/assistant, +/obj/machinery/requests_console{ + department = "Library"; + pixel_y = 30 + }, /turf/simulated/floor/wood, /area/station/service/library) "bHv" = ( @@ -24802,13 +24797,6 @@ }, /area/station/telecomms/computer) "bJm" = ( -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Telecoms Admin"; - departmentType = 5; - name = "Telecoms Request Console"; - pixel_y = -30 - }, /obj/machinery/firealarm{ dir = 4; name = "east bump"; @@ -26778,7 +26766,6 @@ /obj/machinery/requests_console{ department = "Kitchen"; departmentType = 2; - name = "Kitchen Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -27303,6 +27290,10 @@ pixel_x = 7; pixel_y = 4 }, +/obj/machinery/requests_console{ + department = "Expedition"; + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -28543,7 +28534,6 @@ announcementConsole = 1; department = "Blueshield"; departmentType = 5; - name = "Blueshield Requests Console"; pixel_x = -30 }, /obj/item/paper_bin, @@ -28839,7 +28829,6 @@ announcementConsole = 1; department = "NT Representative"; departmentType = 5; - name = "NT Representative Requests Console"; pixel_x = -30 }, /turf/simulated/floor/carpet/royalblack, @@ -30211,7 +30200,6 @@ /obj/machinery/requests_console{ department = "Medbay"; departmentType = 1; - name = "Medbay Requests Console"; pixel_y = 30 }, /obj/machinery/light{ @@ -30441,7 +30429,6 @@ /obj/machinery/requests_console{ department = "Hydroponics"; departmentType = 2; - name = "Hydroponics Requests Console"; pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30475,7 +30462,6 @@ /obj/machinery/requests_console{ department = "Robotics"; departmentType = 2; - name = "Robotics Requests Console"; pixel_y = 30 }, /obj/item/stack/sheet/plasteel{ @@ -35503,7 +35489,6 @@ announcementConsole = 1; department = "Research Director's Desk"; departmentType = 7; - name = "Research Director Requests Console"; pixel_x = 30 }, /obj/machinery/computer/aifixer{ @@ -36224,7 +36209,6 @@ announcementConsole = 1; department = "Head of Security's Desk"; departmentType = 5; - name = "Head of Security Requests Console"; pixel_y = 30 }, /turf/simulated/floor/wood, @@ -39084,6 +39068,11 @@ dir = 4 }, /obj/effect/landmark/start/geneticist, +/obj/machinery/requests_console{ + department = "Genetics"; + departmentType = 1; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -43323,9 +43312,8 @@ dir = 5 }, /obj/machinery/requests_console{ - department = "Science"; + department = "Xenobiology"; departmentType = 2; - name = "Science Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -43387,7 +43375,6 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - name = "Security Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -43579,7 +43566,6 @@ /obj/machinery/requests_console{ department = "Chapel"; departmentType = 2; - name = "Chapel Requests Console"; pixel_y = 30 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -46396,7 +46382,6 @@ /obj/machinery/requests_console{ department = "Engineering"; departmentType = 3; - name = "Engineering Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -47234,7 +47219,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -55040,7 +55024,6 @@ "hHW" = ( /obj/machinery/requests_console{ department = "Internal Affairs Office"; - name = "Internal Affairs Requests Console"; pixel_x = 30 }, /turf/simulated/floor/plasteel{ @@ -55860,7 +55843,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -59880,7 +59862,6 @@ /obj/machinery/requests_console{ department = "Robotics"; departmentType = 2; - name = "Robotics Requests Console"; pixel_x = -30 }, /obj/structure/disposalpipe/segment{ @@ -61796,7 +61777,6 @@ announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; - name = "Chief Medical Officer Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -62465,6 +62445,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/requests_console{ + department = "Paramedic"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -62573,6 +62557,11 @@ /area/station/maintenance/aft2) "kQx" = ( /obj/item/kirbyplants/plant11, +/obj/machinery/requests_console{ + department = "Courtroom"; + departmentType = 1; + pixel_x = -30 + }, /turf/simulated/floor/wood, /area/station/legal/courtroom) "kQB" = ( @@ -63242,9 +63231,8 @@ "lfd" = ( /obj/structure/table/glass, /obj/machinery/requests_console{ - department = "Medbay"; + department = "Chemistry"; departmentType = 1; - name = "Chemistry Requests Console"; pixel_x = -30 }, /obj/machinery/reagentgrinder, @@ -63604,9 +63592,7 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/security/armory{ dir = 1 }, -/obj/machinery/door/window/classic/normal{ - name = "Request Window" - }, +/obj/machinery/door/window/classic/normal, /obj/item/pen, /obj/item/paper, /obj/machinery/door/firedoor, @@ -63700,7 +63686,6 @@ "llW" = ( /obj/machinery/requests_console{ department = "Locker Room"; - name = "Dorms Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -64495,7 +64480,6 @@ /obj/machinery/requests_console{ department = "Atmospherics"; departmentType = 3; - name = "Atmospherics Requests Console"; pixel_x = 30 }, /obj/structure/disposalpipe/segment, @@ -66295,6 +66279,10 @@ /obj/structure/chair/comfy/beige{ dir = 8 }, +/obj/machinery/requests_console{ + department = "Psychiatrist"; + pixel_x = 30 + }, /turf/simulated/floor/carpet, /area/station/medical/psych) "moV" = ( @@ -68825,7 +68813,6 @@ /obj/machinery/requests_console{ department = "Bar"; departmentType = 2; - name = "Bar Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -74466,7 +74453,6 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - name = "Cargo Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -75012,7 +74998,6 @@ /obj/machinery/requests_console{ department = "Morgue"; departmentType = 5; - name = "Morgue Requests Console"; pixel_x = -30 }, /obj/machinery/light/small, @@ -75564,7 +75549,6 @@ /obj/machinery/requests_console{ department = "Atmospherics"; departmentType = 3; - name = "Atmospherics Requests Console"; pixel_x = -30 }, /turf/simulated/floor/plasteel{ @@ -76988,7 +76972,6 @@ /obj/machinery/requests_console{ department = "Virology"; departmentType = 3; - name = "Virology Requests Console"; pixel_y = -30 }, /obj/item/stack/sheet/mineral/plasma, @@ -79186,7 +79169,6 @@ /obj/machinery/requests_console{ department = "Warden"; departmentType = 7; - name = "Warden's Requests Console"; pixel_y = 30 }, /obj/structure/cable{ @@ -81820,7 +81802,6 @@ /obj/machinery/requests_console{ department = "Science"; departmentType = 2; - name = "Science Requests Console"; pixel_x = 30 }, /obj/effect/turf_decal/stripes/line{ @@ -82962,7 +82943,6 @@ /obj/machinery/requests_console{ department = "Engineering"; departmentType = 3; - name = "Engineering Requests Console"; pixel_y = -30 }, /turf/simulated/floor/plasteel, diff --git a/code/modules/station_goals/secondary/medical/random_bulk_medicine.dm b/code/modules/station_goals/secondary/medical/random_bulk_medicine.dm index 67f4ecba4025..640e25d631ac 100644 --- a/code/modules/station_goals/secondary/medical/random_bulk_medicine.dm +++ b/code/modules/station_goals/secondary/medical/random_bulk_medicine.dm @@ -1,6 +1,6 @@ /datum/station_goal/secondary/random_bulk_reagent/medchem name = "Random Bulk Medicine" - department = "Medbay" + department = "Chemistry" abstract = FALSE /datum/station_goal/secondary/random_bulk_reagent/medchem/randomize_params() diff --git a/code/modules/station_goals/secondary/medical/variety_medicine.dm b/code/modules/station_goals/secondary/medical/variety_medicine.dm index 4344004fa352..6618374912e2 100644 --- a/code/modules/station_goals/secondary/medical/variety_medicine.dm +++ b/code/modules/station_goals/secondary/medical/variety_medicine.dm @@ -1,7 +1,7 @@ /datum/station_goal/secondary/variety_reagent/medchem name = "Variety of Medicine" progress_type = /datum/secondary_goal_progress/variety_reagent - department = "Medbay" + department = "Chemistry" generic_name_plural = "medicines" abstract = FALSE From da36e9fc46849c48b2d81784acd2d878fa7ff330 Mon Sep 17 00:00:00 2001 From: Charlie Nolan Date: Mon, 20 May 2024 20:45:00 -0700 Subject: [PATCH 7/7] Crashing into stuff while leaping will actually work now. (#25545) --- code/game/dna/mutations/mutation_powers.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/dna/mutations/mutation_powers.dm b/code/game/dna/mutations/mutation_powers.dm index d25a11adfd77..b67124206327 100644 --- a/code/game/dna/mutations/mutation_powers.dm +++ b/code/game/dna/mutations/mutation_powers.dm @@ -562,11 +562,13 @@ for(var/atom/movable/hit_thing in turf_to_check) if(isliving(hit_thing)) var/mob/living/hit_mob = hit_thing - return hit_mob.density + if(hit_mob.density) + return hit_mob if(isobj(hit_thing)) var/obj/hit_obj = hit_thing - return hit_obj.density + if(hit_obj.density) + return hit_obj return FALSE