From 7ae252c595f0578544fef492dc124bb22225e2aa Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Mon, 9 Nov 2020 09:46:01 +0000 Subject: [PATCH] 8th November Fixes (#10359) * Fixes Wiki link * Maybe fixes ling * Small map fixes --- _maps/map_files/YogStation/YogStation.dmm | 71 ++++++++++++------- .../antagonists/changeling/powers/hivemind.dm | 11 +-- interface/interface.dm | 2 +- 3 files changed, 54 insertions(+), 30 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index eb0bb395ff02..2133f2a7ef7f 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -20148,11 +20148,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bdS" = ( -/obj/structure/closet/crate/internals, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/quartermaster/warehouse) "bdT" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/disposal"; @@ -20165,11 +20160,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"bdU" = ( -/obj/structure/closet/crate/medical, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/quartermaster/warehouse) "bdX" = ( /obj/item/storage/box/fancy/donut_box, /obj/structure/table, @@ -40912,12 +40902,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) -"gvw" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Mix Pump" - }, -/turf/open/floor/plasteel, -/area/maintenance/disposal/incinerator) "gws" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, @@ -45199,6 +45183,15 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"jQb" = ( +/obj/structure/closet/crate/medical, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera{ + c_tag = "Security Escape Pod"; + dir = 4 + }, +/turf/open/floor/plasteel, +/area/quartermaster/warehouse) "jQg" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/firedoor/border_only{ @@ -48157,6 +48150,13 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"msd" = ( +/obj/machinery/camera{ + c_tag = "Security Escape Pod"; + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/security/execution/transfer) "msz" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 @@ -49588,6 +49588,16 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"ntB" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix Pump" + }, +/obj/machinery/camera{ + c_tag = "Incinerator"; + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/disposal/incinerator) "ntD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 10 @@ -50417,6 +50427,13 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"nZa" = ( +/obj/structure/fireaxecabinet/spare{ + pixel_x = 2; + pixel_y = 32 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain) "oaa" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -56525,6 +56542,15 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"sQb" = ( +/obj/structure/closet/crate/internals, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera{ + c_tag = "Security Escape Pod"; + dir = 4 + }, +/turf/open/floor/plasteel, +/area/quartermaster/warehouse) "sQI" = ( /turf/closed/wall, /area/security/execution/transfer) @@ -60360,9 +60386,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) -"vVj" = ( -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain) "vVZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -85722,8 +85745,8 @@ baS aZI baS baS -bdS -bdU +sQb +jQb ckQ gjl bjq @@ -88759,7 +88782,7 @@ qQV qQV qQV qQV -afA +msd aaf aaa aaa @@ -96265,7 +96288,7 @@ bfl bim bjG aZV -vVj +nZa qWH kSk bqH @@ -101969,7 +101992,7 @@ bvA aaf gEo kHp -gvw +ntB mNF gLr xvC diff --git a/code/modules/antagonists/changeling/powers/hivemind.dm b/code/modules/antagonists/changeling/powers/hivemind.dm index ad0dde8c8fb5..611843d84036 100644 --- a/code/modules/antagonists/changeling/powers/hivemind.dm +++ b/code/modules/antagonists/changeling/powers/hivemind.dm @@ -33,6 +33,7 @@ ..() + // HIVE MIND UPLOAD/DOWNLOAD DNA GLOBAL_LIST_EMPTY(hivemind_bank) @@ -43,7 +44,7 @@ GLOBAL_LIST_EMPTY(hivemind_bank) chemical_cost = 10 dna_cost = -1 -/datum/action/changeling/hivemind_upload/sting_action(var/mob/living/user) +/datum/action/changeling/hivemind_upload/sting_action(mob/living/user) if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE)) to_chat(user, "The poison in the air hinders our ability to interact with the hivemind.") return @@ -55,10 +56,10 @@ GLOBAL_LIST_EMPTY(hivemind_bank) names += prof.name if(names.len <= 0) - to_chat(user, "The airwaves already have all of our DNA.") + to_chat(user, "The airwaves already have all of our DNA!") return - var/chosen_name = input("Select a DNA to channel: ", "Channel DNA", null) as null|anything in names + var/chosen_name = input("Select a DNA to channel: ", "Channel DNA", null) as null|anything in sortList(names) if(!chosen_name) return @@ -100,10 +101,10 @@ GLOBAL_LIST_EMPTY(hivemind_bank) names[prof.name] = prof if(names.len <= 0) - to_chat(user, "There's no new DNA to absorb from the air.") + to_chat(user, "There's no new DNA to absorb from the air!") return - var/S = input("Select a DNA absorb from the air: ", "Absorb DNA", null) as null|anything in names + var/S = input("Select a DNA absorb from the air: ", "Absorb DNA", null) as null|anything in sortList(names) if(!S) return var/datum/changelingprofile/chosen_prof = names[S] diff --git a/interface/interface.dm b/interface/interface.dm index 01f8c6ec4b4f..e30b59bc41cc 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -6,7 +6,7 @@ var/wikiurl = CONFIG_GET(string/wikiurl) if(wikiurl) if(query) - var/output = wikiurl + "/index.php?title=Special%3ASearch&profile=default&search=" + query + var/output = wikiurl + "/index.php?search=" + query src << link(output) else if (query != null) src << link(wikiurl)