From ef1b43eaa7ea9b74d8586c3b77d0b7d1bb97bed1 Mon Sep 17 00:00:00 2001 From: Lohikar Date: Fri, 3 Feb 2017 20:53:02 -0600 Subject: [PATCH 1/7] Fix playerlist verb (#1709) Associated with #1568 --- code/modules/admin/admin_verbs.dm | 38 +++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 172a408a22c..7101fafca5b 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -98,7 +98,8 @@ var/list/admin_verbs_admin = list( /client/proc/view_duty_log, /client/proc/cmd_dev_bst, /client/proc/clear_toxins, - /client/proc/wipe_ai // allow admins to force-wipe AIs + /client/proc/wipe_ai, // allow admins to force-wipe AIs + /client/proc/fix_player_list ) var/list/admin_verbs_ban = list( /client/proc/unban_panel, @@ -200,7 +201,8 @@ var/list/admin_verbs_debug = list( /client/proc/jumptocoord, /client/proc/dsay, /client/proc/toggle_recursive_explosions, - /client/proc/restart_sql + /client/proc/restart_sql, + /client/proc/fix_player_list ) var/list/admin_verbs_paranoid_debug = list( @@ -1050,3 +1052,35 @@ var/list/admin_verbs_cciaa = list( log_and_message_admins("is attempting to reconnect the server to MySQL.") dbcon.Reconnect() + +/client/proc/fix_player_list() + set category = "Special Verbs" + set name = "Regenerate Player List" + set desc = "Use this to regenerate the player list if it becomes broken somehow." + + if (!check_rights(R_DEBUG|R_ADMIN)) + return + + if (alert("Regenerate player lists?", "Player List Repair", "No", "No", "Yes") != "Yes") + return + + log_and_message_admins("is rebuilding the master player mob list.") + for (var/P in player_list) + if (!P) + var/msg = "WARNING: Found null entry in player_list!" + log_debug(msg) + message_admins(span("danger", msg)) + try + var/mob/M = player_list[P] + msg = " -- Associated mob is [M.name]." + log_debug(msg) + message_admins(span("danger", msg)) + catch() + player_list -= P + continue + player_list -= P + else if (!player_list[P]) + var/msg = "WARNING: Found ckey with no associated mob in player_list! Ckey: [P]" + log_debug(msg) + message_admins(span("danger", msg)) + player_list -= P From 1f0ef3497e9aa9f6f3504b19128760351ac60064 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 4 Feb 2017 17:43:55 +0200 Subject: [PATCH 2/7] Implement ban pass phrase (#1714) --- code/controllers/configuration.dm | 5 +++++ code/modules/admin/IsBanned.dm | 2 ++ config/example/config.txt | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 7518f65f1b7..5d298b3b12e 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -103,6 +103,7 @@ var/list/gamemode_cache = list() var/banappeals var/wikiurl var/forumurl + var/forum_passphrase var/githuburl //Alert level description @@ -458,6 +459,10 @@ var/list/gamemode_cache = list() if ("forumurl") config.forumurl = value + if ("forum_passphrase") + testing("Passphrase [value]") + config.forum_passphrase = value + if ("githuburl") config.githuburl = value diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index ded727606aa..ab4a7e45539 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -85,6 +85,8 @@ world/IsBanned(key,address,computer_id) expires = " The ban is for [duration] minutes and expires on [expiration] (server time)." var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime], [expires]" + if (config.forum_passphrase) + desc += "\nTo register on the forums, please use the following passphrase: [config.forum_passphrase]" return list("reason"="[bantype]", "desc"="[desc]", "id" = ban_id) diff --git a/config/example/config.txt b/config/example/config.txt index dab0413e199..7f730bef569 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -207,6 +207,9 @@ GUEST_BAN ## forum address # FORUMURL http://example.com +## The passphrase for the forums +# FORUM_PASSPHRASE + ## Wiki address # WIKIURL http://example.com @@ -414,7 +417,7 @@ STARLIGHT 0 ## Uncomment to enable simple Skype/Discord style markup over OOC, LOOC, and say. #ALLOW_CHAT_MARKUP -## Default language prefix keys, separated with spaces. Only single character keys are supported. If unset, defaults to , # and - +## Default language prefix keys, separated with spaces. Only single character keys are supported. If unset, defaults to , # and - # DEFAULT_LANGUAGE_PREFIXES , # - ## A ; separated list of lobby screens to randomly pick from. The listed screens must exist as icon states in '/icons/misc/title.dmi'. From 5b8e92fbffdae399e8812a43b5fdc9b82fd533a8 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 4 Feb 2017 17:46:50 +0200 Subject: [PATCH 3/7] In which Skull forgets to pay attention --- code/controllers/configuration.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 5d298b3b12e..2e22c1d9b12 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -460,7 +460,6 @@ var/list/gamemode_cache = list() config.forumurl = value if ("forum_passphrase") - testing("Passphrase [value]") config.forum_passphrase = value if ("githuburl") From 31162fe328c2f4346a8229e1dc87b92718a00d46 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 4 Feb 2017 20:06:38 +0200 Subject: [PATCH 4/7] Fix player_list fixer --- code/modules/admin/admin_verbs.dm | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7101fafca5b..f31cece28e8 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1034,10 +1034,10 @@ var/list/admin_verbs_cciaa = list( if (alert("Are you sure you want to wipe [target.name]? They will be ghosted and their job slot freed.", "Confirm AI Termination", "No", "No", "Yes") != "Yes") return - + log_and_message_admins("admin-wiped [key_name_admin(target)]'s core.") target.do_wipe_core() - + /client/proc/restart_sql() set category = "Debug" set name = "Reconnect SQL" @@ -1066,21 +1066,15 @@ var/list/admin_verbs_cciaa = list( log_and_message_admins("is rebuilding the master player mob list.") for (var/P in player_list) - if (!P) - var/msg = "WARNING: Found null entry in player_list!" + if (isnull(P) || !ismob(P)) + var/msg = "P_LIST DEBUG: Found null entry in player_list!" log_debug(msg) message_admins(span("danger", msg)) - try - var/mob/M = player_list[P] - msg = " -- Associated mob is [M.name]." + player_list -= P + else + var/mob/M = P + if (!M.client) + var/msg = "P_LIST DEBUG: Found a mob without a client in player_list! [M.name]" log_debug(msg) message_admins(span("danger", msg)) - catch() - player_list -= P - continue - player_list -= P - else if (!player_list[P]) - var/msg = "WARNING: Found ckey with no associated mob in player_list! Ckey: [P]" - log_debug(msg) - message_admins(span("danger", msg)) - player_list -= P + player_list -= M From 61e0ea04617874e7c156bc402a75b63fed23685a Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 4 Feb 2017 22:23:40 +0200 Subject: [PATCH 5/7] Fix persistent mob runtimes (#1715) Runtimes were in: Movement code Life() More movement code --- .../objects/effects/decals/Cleanable/humans.dm | 3 +++ .../mob/living/carbon/human/human_movement.dm | 2 +- code/modules/mob/living/carbon/viruses.dm | 15 ++++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 73de783335b..86d6b061b04 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -71,6 +71,9 @@ var/global/list/image/splatter_cache=list() if(amount < 1) return + if (!blood_DNA || !islist(blood_DNA)) + blood_DNA = list() + var/obj/item/organ/external/l_foot = perp.get_organ("l_foot") var/obj/item/organ/external/r_foot = perp.get_organ("r_foot") var/hasfeet = 1 diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index a3f1fa409d2..ddd2c6a21f6 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -32,7 +32,7 @@ var/obj/item/organ/external/E = get_organ(organ_name) if(!E || E.is_stump()) tally += 4 - if(E.status & ORGAN_SPLINTED) + else if(E.status & ORGAN_SPLINTED) tally += 0.5 else if(E.status & ORGAN_BROKEN) tally += 1.5 diff --git a/code/modules/mob/living/carbon/viruses.dm b/code/modules/mob/living/carbon/viruses.dm index 1d454f3b0e5..0aea7ac3f9a 100644 --- a/code/modules/mob/living/carbon/viruses.dm +++ b/code/modules/mob/living/carbon/viruses.dm @@ -13,17 +13,22 @@ for(var/obj/effect/decal/cleanable/O in view(1,src)) if(istype(O,/obj/effect/decal/cleanable/blood)) var/obj/effect/decal/cleanable/blood/B = O - if(B.virus2 && B.virus2.len) - for (var/ID in B.virus2) - var/datum/disease2/disease/V = B.virus2[ID] - infect_virus2(src,V) + if (B.virus2 && islist(B.virus2)) + if(B.virus2.len) + for (var/ID in B.virus2) + var/datum/disease2/disease/V = B.virus2[ID] + infect_virus2(src,V) + else + B.virus2 = list() else if(istype(O,/obj/effect/decal/cleanable/mucus)) var/obj/effect/decal/cleanable/mucus/M = O - if(M.virus2 && M.virus2.len) + if(M.virus2 && islist(M.virus2) && M.virus2.len) for (var/ID in M.virus2) var/datum/disease2/disease/V = M.virus2[ID] infect_virus2(src,V) + else + M.virus2 = list() if(virus2 && virus2.len) for (var/ID in virus2) From 2854aa67f343f567eea390729e248d7031c28aca Mon Sep 17 00:00:00 2001 From: Lohikar Date: Sun, 5 Feb 2017 14:28:28 -0600 Subject: [PATCH 6/7] Minor map fixes (#1710) changes: Added plastic flaps to medical OR storage to prevent air leakage. Re-added missing cyborg storage units in Drone Fabrication. The engineering outpost's SMES spawns enabled now. Fixed an invalid item path on the library's deck of cards. Fixes #1691 --- html/changelogs/lohikar-mapfix.yml | 7 +++++++ maps/exodus-1.dmm | 11 ++++++----- maps/exodus-5.dmm | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/lohikar-mapfix.yml diff --git a/html/changelogs/lohikar-mapfix.yml b/html/changelogs/lohikar-mapfix.yml new file mode 100644 index 00000000000..bf9dddcfa8d --- /dev/null +++ b/html/changelogs/lohikar-mapfix.yml @@ -0,0 +1,7 @@ +author: Lohikar +delete-after: True +changes: + - rscadd: "Added plastic flaps to medical OR storage to prevent air leakage." + - bugfix: "Re-added missing cyborg storage units in Drone Fabrication." + - bugfix: "The engineering outpost's SMES should spawn enabled now." + - bugfix: "The library's deck of cards should spawn properly now." diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 403138e5ac1..b622d0d4583 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -2005,7 +2005,7 @@ "aMC" = (/obj/effect/floor_decal/corner/red{tag = "icon-corner_white (SOUTHWEST)"; icon_state = "corner_white"; dir = 10},/obj/machinery/modular_computer/console/preset/security,/turf/simulated/floor/tiled,/area/bridge) "aMD" = (/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/floor/wood,/area/library) "aME" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 0},/turf/simulated/floor/wood,/area/library) -"aMF" = (/obj/structure/table/woodentable,/obj/structure/disposalpipe/segment,/obj/item/weapon/deck,/turf/simulated/floor/wood,/area/library) +"aMF" = (/obj/structure/table/woodentable,/obj/structure/disposalpipe/segment,/obj/item/weapon/deck/cards,/turf/simulated/floor/wood,/area/library) "aMG" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/wood,/area/library) "aMH" = (/obj/item/device/radio/intercom{pixel_x = 28},/obj/machinery/modular_computer/console/preset/civilian,/turf/simulated/floor/wood,/area/library) "aMI" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled,/area/hallway/primary/port) @@ -6262,7 +6262,7 @@ "cqv" = (/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/device/flash,/obj/item/device/flash,/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/obj/structure/table/steel,/obj/item/device/flashlight/heavy,/turf/simulated/floor/plating,/area/storage/tech) "cqw" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) "cqx" = (/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) -"cqy" = (/obj/machinery/door/airlock/medical{name = "Operating Theatre 1 Storage"; req_access = list(45)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/white,/area/medical/surgeryprep) +"cqy" = (/obj/machinery/door/airlock/medical{name = "Operating Theatre 1 Storage"; req_access = list(45)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor,/obj/structure/plasticflaps/airtight,/turf/simulated/floor/tiled/white,/area/medical/surgeryprep) "cqz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/solar/starboard) "cqA" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan{dir = 8},/obj/machinery/meter,/turf/simulated/floor/tiled,/area/engineering/atmos) "cqB" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos) @@ -6301,7 +6301,7 @@ "cri" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/medical/virology) "crj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/medical/virology) "crk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio3"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/rnd/xenobiology) -"crl" = (/obj/machinery/door/airlock/medical{name = "Operating Theatre 2 Storage"; req_access = list(45)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/white,/area/medical/surgeryprep) +"crl" = (/obj/machinery/door/airlock/medical{name = "Operating Theatre 2 Storage"; req_access = list(45)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor,/obj/structure/plasticflaps/airtight,/turf/simulated/floor/tiled/white,/area/medical/surgeryprep) "crm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/corner/paleblue/full{tag = "icon-corner_white_full (EAST)"; icon_state = "corner_white_full"; dir = 4},/turf/simulated/floor/tiled,/area/medical/surgeryprep) "crn" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/effect/floor_decal/corner/paleblue{tag = "icon-corner_white (SOUTHWEST)"; icon_state = "corner_white"; dir = 10},/turf/simulated/floor/tiled,/area/medical/surgeryprep) "cro" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/freezer{name = "cold storage tiles"; temperature = 278},/area/medical/surgery2) @@ -7155,6 +7155,7 @@ "cHE" = (/obj/machinery/computer/station_alert,/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/shuttle/constructionsite/station) "cHF" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/plating,/area/engineering/engine_room) "cHG" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA"; pixel_y = 0},/turf/simulated/wall,/area/maintenance/engineering) +"cHH" = (/obj/machinery/cryopod/robot,/turf/simulated/floor/plating,/area/engineering/drone_fabrication) "cHI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/engineering) "cHJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/medical/virology) "cHK" = (/obj/structure/grille,/obj/structure/grille,/turf/simulated/wall/r_wall,/area/engineering/atmos) @@ -7554,11 +7555,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaJaaaaaacAxcppcqFcppczwcrEcrDcrEczxcrEcrDcrEczxcrEczycrEczzczCczAcwSczDcyHczFczHczGczJczIczRcwQczScAMcwQcwQcwQcwQcwQcANcniczTcnicotcotcotcotcotcotcotcotcAPczLczLcAQcARcASbPUcATcwncAUcAVczXczUczYcAZcBacwncAaczZcsnaaaaaaaaaaaaaaaaaacrgcuxczuczgcumcBecBfcBgcumcAccAbcAdcBkcAecAbcAfcrgaafaafaaaaaaaaaaaacAhaaaceHcAicAmcAjcAocAncAmcApcAqcAncAmcArceHaaaaaacaBaaaaafaaaaafaaaaafaaacsDaaaaafaaaaafaafaafaafcswaaacyFcyFcyFcyFaaaaaacyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaacyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaIfaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaBaaaaaaaaaaaJaaaaaacBwcppcqFcppcAscxVcqFcppcAtcxVcqFcppcAucxVcppcppcAvcppcAycxVcAzcABcAAcADcACcAFcAEcAGcwQcAIcAHcBMcAJcAKctTcAOcALctTcAWctTcAXctWcAYcBccBbcBbcBdcBXcBYcBYcBYcBZcCacASbPUcCbcwncwncCccCdcCecCdcCccCfcwncsncCgcsnaaaaaaaaaaaaaaaaaacrgcumcAgcutcumcBicBhcBjcumcClcCmcrjcCncCocCmcCpcsoaaaaaaaaaaaaaaaaaacBmaafceHcBncBocCtcoScCucBpcCwcoScCxcBqcCzceHaaaaaacswaaactFctFctFctFctFaafcsDaafctFctFctFctFctFaafcswaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswaafaafaafaaJaafaafcBwcppcBscBucBtcBxcBvcBzcBycBBcBAcBDcBCcBEcppcuTcBFcBHcBGcBJcBIcogcogcogcogcogcogcogcogcCRcCScANcBKcBLcovcBNcovcovcxicovcovcBOcovcBLcBPcBRcBQcDacBScBUcBTcBVcDfcASbPTcATcwnaaacCccDjcDkcDlcCccChcBWcCjcCicCkaaaaaaaaaaaaaaaaaacrgcBlcsAcuxcBrcCqcuxcCscCrcDwaafaaacCAcCCcCBcCDaaaaaaaaaaacaaaaaaaaaaaaaaaceHcCEcoLcoLcoScCFcoLcoLcoScCFcoLcoLceHaafaafcswaafcuNcuOcuOcuOcuOcuPcsDcuRcuQcuQcuQcuQcuSaafcswaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswcCGaaaaaaaaJaaaaaacDEcDFcDGcDHcDIcDJcDKcDLcDIcDJcDKcDLcDIcDJcDMcDMcDNcDLcDIcDJcDOcogaaacDPcFncCIcCHcCKcCJcDVcDWcDXcDXcCLcDZcEacEbcEccCMcEbcEccEacEecCNcEgcEecANcANcAScEhcEicEjcEkcASbOscATcwncwncCccCdcEocCdcCccCPcCOcCQaafaaaaaaaaaaaaaaaaaaaaacrgcBlcCvcCTcCycCycCTczecCUcrgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaceHcCXcoLcoLcoScCYcoLcoLcoScCYcoLcoLceHaaaaaacswaafcvScvScvScvScvSaaacsDaaacvScvScvScvScvSaaacswaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswcCGaaaaaaaaJaaaaaacDEcDFcDGcDHcDIcDJcDKcDLcDIcDJcDKcDLcDIcDJcDMcDMcDNcDLcDIcDJcDOcogaaacDPcHHcCIcCHcCKcCJcDVcDWcDXcDXcCLcDZcEacEbcEccCMcEbcEccEacEecCNcEgcEecANcANcAScEhcEicEjcEkcASbOscATcwncwncCccCdcEocCdcCccCPcCOcCQaafaaaaaaaaaaaaaaaaaaaaacrgcBlcCvcCTcCycCycCTczecCUcrgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaceHcCXcoLcoLcoScCYcoLcoLcoScCYcoLcoLceHaaaaaacswaafcvScvScvScvScvSaaacsDaaacvScvScvScvScvSaaacswaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswcDbcEzcEzcEAcEzcEzcEzcEzcEBcEzcECcEzcEBcEzcECcEzcEBcEzcECcEzcEzcEzcECcEzcECcEzcEDaafaaacEEcEFcDccEHcEIcDdcDVcEKcDXcDecDmcDgcEOcDncDpcDocDrcDqcEOcDscDucDtcEeaaaaafcAScDxcDvcEZaafaaabOscDzcDycDAcCccDCcDBcDDcCcaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacrgcCVcuBcCZcCWcCWcCZcuxcDQcrgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaceHcoLcoLcoLcoScDUcoLcoLcoScDUcoLcoLceHaacaaacswaaaaaaaafaafaafaaaaaacDYaafaaaaaaaafaafaaaaaacswaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswaafaafaaaaaqaaaaaaaafchCcmVcmTcmWchCcmVcmTcmWchCcmVcmTcFjchCaaachCcmWcmTcFjchCaaaaafaaacEEcMIcEdcFmcFncEfcFpcFqcDXcEpcErcEqcEOcEscEucEtcEwcEvcEOcExcEGcEycEeaaaaaacAScELcEJcFEaaaaaabOscENcEMcEPcCccEQcEQcEQcCcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacrgcDScDRcuxcuxcuxcuxcuxcDTcrgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacljceHceHceHceHceHceHceHceHcEUcEUcEUcljaaaaaacswcswcswcswcswaaaaaaaaacqzaaaaaaaaacswcswcswcaBcswaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswaaaaafaafaaJaaaaaaaafchCcEVcEXcEWchCcEYcFbcFachCcFccFecFdchCaafchCcFfcFhcFgchCaaaaafaaacEEcFWcDccFncFncFicFYcFZcGacFlcFrcFocFtcFscFvcFucFxcFwcGkcGlcGmcGncEeaafaaacGocGpcGqcAScGraaabOscFycMAcFzcCcaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacsocrgcrgcGwcERcCZcCZcCZcEScGwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacFCcFCcFCaaaaaaaaaaaaaaaaaaaaaaaaaaacswaafcFDaafcswaaaaaaaaaaaaaaaaaaaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaJaaaaafaafchCcFFcFGcFFchCcFHcFIcFHchCcFJcFKcFJchCaaachCcFJcFJcFLchCaaaaafaaacEEcFncFMcFmcFncDdcGJcEKcDXcFNcFPcFOcEOcFQcFScFRcFScFTcEOcFUcGScFVcEeaapcGbcFXcGWcGXcFXcFXcGcbOscGecGdcGfcCcaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacHccCWcCWcCWcCWcCWcHcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswaaaaafaaacswaaaaaaaaaaaaaaaaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaJaaaaafaafchCcFFcFGcFFchCcFHcFIcFHchCcFJcFKcFJchCaaachCcFJcFJcFLchCaaaaafaaacEEcHHcFMcFmcFncDdcGJcEKcDXcFNcFPcFOcEOcFQcFScFRcFScFTcEOcFUcGScFVcEeaapcGbcFXcGWcGXcFXcFXcGcbOscGecGdcGfcCcaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacHccCWcCWcCWcCWcCWcHcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswaaaaafaaacswaaaaaaaaaaaaaaaaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaJaafaafaaachCcFFcGgcFFchCcFHcGhcFHchCcFJcGicFJchCaafchCcFJcGjcFJchCaafaafaafcHhcHicGycGxcGAcGzcHncEKcDXcETcGDcGCcEOcGEcGGcGFcGIcGHcEOcGKcHxcGLcEeaaacHzcHAcHBcGMcHDcHEcGNcHGcMGcHIbOsbOsaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacrgcHJcricricricCpcrgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswcswcswcswcswaaaaaaaaaaaaaaaaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaBaaaaaachCchCchCchCchCchCchCchCchCchCchCchCchCaaacHKchCchCchCchCaaaaaaaaaaaacCScCScCScCScCScHLcHMcHMcHMcHMcHNcHMcHOcHPcHQcHPcHRcHMcHMcHScHMcHMcHMcHzcHAcHTcGOcHVcHWcHXaafaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFcuFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacswaaaaaaaafaafaaaaafaafaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaafaaacHYcHZcHZcHZcIacGPcGQcIdcIecGRcGTcIhcGUcIjcGYcGVcHdcIrcIocIpcIqcIrcIscHecIucIvcHecHMcHzcHAcIwcHfcIycIzcGNaafaaacHYcIBcHYcIBcHYcIBaafcICaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFcyFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/exodus-5.dmm b/maps/exodus-5.dmm index 648093b115e..e3877f1d241 100644 --- a/maps/exodus-5.dmm +++ b/maps/exodus-5.dmm @@ -953,7 +953,7 @@ "sq" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/effect/floor_decal/carpet,/turf/simulated/floor/carpet,/area/outpost/engineering/meeting) "sr" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "ss" = (/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{tag = "icon-carpet_edges (EAST)"; icon_state = "carpet_edges"; dir = 4},/obj/effect/floor_decal/carpet{tag = "icon-carpet_edges (SOUTHEAST)"; icon_state = "carpet_edges"; dir = 6},/turf/simulated/floor/carpet,/area/outpost/engineering/meeting) -"st" = (/obj/machinery/power/smes/buildable/outpost_substation{charge = 500000; input_attempt = 1; input_level = 150000; output_level = 150000; RCon_tag = "Outpost - Engineering"},/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/outpost/engineering/power) +"st" = (/obj/machinery/power/smes/buildable/outpost_substation{charge = 500000; input_attempt = 1; input_level = 150000; output_attempt = 1; output_level = 150000; RCon_tag = "Outpost - Engineering"},/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/outpost/engineering/power) "su" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 4; name = "Firelock"},/turf/simulated/floor/plating,/area/outpost/engineering/power) "sv" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "sw" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) From 3e0b64ad190e5242a1aad5e9de4dbca8e61d2928 Mon Sep 17 00:00:00 2001 From: skull132 Date: Tue, 7 Feb 2017 12:52:23 -0500 Subject: [PATCH 7/7] Changelogs, 07FEB2017 --- html/changelog.html | 9 +++++++++ html/changelogs/.all_changelog.yml | 6 ++++++ html/changelogs/lohikar-mapfix.yml | 7 ------- 3 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 html/changelogs/lohikar-mapfix.yml diff --git a/html/changelog.html b/html/changelog.html index ffb5358b9da..ffdefd98168 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,15 @@ -->
+

07 February 2017

+

Lohikar updated:

+
    +
  • Added plastic flaps to medical OR storage to prevent air leakage.
    • +
  • Re-added missing cyborg storage units in Drone Fabrication.
    • +
  • The engineering outpost's SMES should spawn enabled now.
    • +
  • The library's deck of cards should spawn properly now.
    • +
+

03 February 2017

Alberyk updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 6b59cbbab78..22ea69ac7c1 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3773,3 +3773,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Alberyk: - bugfix: Fixed the fake central command announcement, in the traitor uplinks, not working. +2017-02-07: + Lohikar: + - rscadd: Added plastic flaps to medical OR storage to prevent air leakage. + - bugfix: Re-added missing cyborg storage units in Drone Fabrication. + - bugfix: The engineering outpost's SMES should spawn enabled now. + - bugfix: The library's deck of cards should spawn properly now. diff --git a/html/changelogs/lohikar-mapfix.yml b/html/changelogs/lohikar-mapfix.yml deleted file mode 100644 index bf9dddcfa8d..00000000000 --- a/html/changelogs/lohikar-mapfix.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Lohikar -delete-after: True -changes: - - rscadd: "Added plastic flaps to medical OR storage to prevent air leakage." - - bugfix: "Re-added missing cyborg storage units in Drone Fabrication." - - bugfix: "The engineering outpost's SMES should spawn enabled now." - - bugfix: "The library's deck of cards should spawn properly now."