From b66c036b76ba32162fd5ebac5f6b7e5edc377638 Mon Sep 17 00:00:00 2001 From: N3D6 <71906740+N3D6@users.noreply.github.com> Date: Sun, 17 Jul 2022 20:00:26 -0400 Subject: [PATCH 1/8] decreases required pop (#14866) --- code/game/gamemodes/eldritch_cult/eldritch_cult.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm index de83b8e89ee5..c198d7964ccc 100644 --- a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm +++ b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm @@ -6,7 +6,7 @@ false_report_weight = 5 protected_jobs = list("Chaplain","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician") //Yogs: Added Brig Physician restricted_jobs = list("AI", "Cyborg") - required_players = 35 + required_players = 25 required_enemies = 1 recommended_enemies = 4 reroll_friendly = 1 From bf6ab2433ce3955ee4e1e51db740fc34fa39f59c Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Sun, 17 Jul 2022 20:00:28 -0400 Subject: [PATCH 2/8] Automatic changelog generation #14866 [ci skip] --- html/changelogs/AutoChangelog-pr-14866.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-14866.yml diff --git a/html/changelogs/AutoChangelog-pr-14866.yml b/html/changelogs/AutoChangelog-pr-14866.yml new file mode 100644 index 000000000000..cb7c6e250f47 --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-14866.yml @@ -0,0 +1,4 @@ +author: "N3D6" +delete-after: true +changes: + - tweak: "heretic player count lowered to 25 from 35" From f0a5d075fec28f780209714c562447ab79e78032 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Sun, 17 Jul 2022 19:32:42 -0500 Subject: [PATCH 3/8] weaver (#14890) --- code/datums/mapgen/Cavegens/IcemoonCaves.dm | 4 +++- code/datums/mapgen/Cavegens/LavalandGenerator.dm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/datums/mapgen/Cavegens/IcemoonCaves.dm b/code/datums/mapgen/Cavegens/IcemoonCaves.dm index 45f835686759..00501cadabc6 100644 --- a/code/datums/mapgen/Cavegens/IcemoonCaves.dm +++ b/code/datums/mapgen/Cavegens/IcemoonCaves.dm @@ -5,7 +5,9 @@ mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/wolf = 50, /obj/structure/spawner/ice_moon = 3, \ /mob/living/simple_animal/hostile/asteroid/polarbear = 30, /obj/structure/spawner/ice_moon/polarbear = 3, \ - /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10) + /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, + /mob/living/simple_animal/hostile/asteroid/marrowweaver/ice = 30, + /mob/living/simple_animal/hostile/asteroid/goldgrub = 10) flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/rock/icy = 2, /obj/structure/flora/rock/pile/icy = 2, /obj/structure/flora/grass/both = 6) ///Note that this spawn list is also in the lavaland generator feature_spawn_list = list() diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm index 5e2cd83c6a6e..2f0bfd97aae4 100644 --- a/code/datums/mapgen/Cavegens/LavalandGenerator.dm +++ b/code/datums/mapgen/Cavegens/LavalandGenerator.dm @@ -6,6 +6,7 @@ mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, \ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \ + /mob/living/simple_animal/hostile/asteroid/marrowweaver = 30, SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10 ) flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2) From a70535ac3fc0a99c4703d038575ea888f0fc5a52 Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Sun, 17 Jul 2022 20:32:43 -0400 Subject: [PATCH 4/8] Automatic changelog generation #14890 [ci skip] --- html/changelogs/AutoChangelog-pr-14890.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-14890.yml diff --git a/html/changelogs/AutoChangelog-pr-14890.yml b/html/changelogs/AutoChangelog-pr-14890.yml new file mode 100644 index 000000000000..2da08a05aef2 --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-14890.yml @@ -0,0 +1,4 @@ +author: "ToasterBiome" +delete-after: true +changes: + - bugfix: "Marrow Weaver readded to lavaland" From 6082379881e1eb0d93698d27c094f5ee5f9afa9a Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 18 Jul 2022 06:12:29 +0000 Subject: [PATCH 5/8] Automatic changelog compile [ci skip] --- html/changelog.html | 27 ++++++++++++++-------- html/changelogs/.all_changelog.yml | 10 ++++++++ html/changelogs/AutoChangelog-pr-14866.yml | 4 ---- html/changelogs/AutoChangelog-pr-14889.yml | 7 ------ html/changelogs/AutoChangelog-pr-14890.yml | 4 ---- 5 files changed, 27 insertions(+), 25 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-14866.yml delete mode 100644 html/changelogs/AutoChangelog-pr-14889.yml delete mode 100644 html/changelogs/AutoChangelog-pr-14890.yml diff --git a/html/changelog.html b/html/changelog.html index 524e2edf9886..5a299c74291c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -58,6 +58,23 @@ -->
+

18 July 2022

+

N3D6 updated:

+
    +
  • heretic player count lowered to 25 from 35
    • +
+

ToasterBiome updated:

+
    +
  • Marrow Weaver readded to lavaland
    • +
+

nmajask updated:

+
    +
  • adds an organ fridge to the meta medbay
    • +
  • wires the meta medbay treatment center,
    • +
  • adds some firelocks to meta medbay
    • +
  • fixed the cooler in meta medbay
    • +
+

17 July 2022

JamieD1 updated:

    @@ -2551,16 +2568,6 @@
    • pipebomb dmi tweak
    - -

    18 April 2022

    -

    Chubbygummibear updated:

    -
      -
    • Podpeople feeding off light toned down. You feed a decent amount off light, but not so much you're fat. So pods can actually eat a bit now without incurring obesity.
      • -
    -

    adamsong updated:

    -
      -
    • fixed only non-admins being asked to reboot the server on ticket resolution
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index af3a29ec00e8..18bb566d6920 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -32810,3 +32810,13 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. redmoogle: - bugfix: Unobserve button doesnt duplicate now - bugfix: Fixing a robotic limb no longer displays tool name +2022-07-18: + N3D6: + - tweak: heretic player count lowered to 25 from 35 + ToasterBiome: + - bugfix: Marrow Weaver readded to lavaland + nmajask: + - tweak: adds an organ fridge to the meta medbay + - tweak: wires the meta medbay treatment center, + - tweak: adds some firelocks to meta medbay + - tweak: fixed the cooler in meta medbay diff --git a/html/changelogs/AutoChangelog-pr-14866.yml b/html/changelogs/AutoChangelog-pr-14866.yml deleted file mode 100644 index cb7c6e250f47..000000000000 --- a/html/changelogs/AutoChangelog-pr-14866.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "N3D6" -delete-after: true -changes: - - tweak: "heretic player count lowered to 25 from 35" diff --git a/html/changelogs/AutoChangelog-pr-14889.yml b/html/changelogs/AutoChangelog-pr-14889.yml deleted file mode 100644 index fcf00b7c25b3..000000000000 --- a/html/changelogs/AutoChangelog-pr-14889.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "nmajask" -delete-after: true -changes: - - tweak: "adds an organ fridge to the meta medbay" - - tweak: "wires the meta medbay treatment center," - - tweak: "adds some firelocks to meta medbay" - - tweak: "fixed the cooler in meta medbay" diff --git a/html/changelogs/AutoChangelog-pr-14890.yml b/html/changelogs/AutoChangelog-pr-14890.yml deleted file mode 100644 index 2da08a05aef2..000000000000 --- a/html/changelogs/AutoChangelog-pr-14890.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "ToasterBiome" -delete-after: true -changes: - - bugfix: "Marrow Weaver readded to lavaland" From bf302b15798bb4baada0f1cc429e61aaa2008720 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Mon, 18 Jul 2022 03:15:04 -0500 Subject: [PATCH 6/8] fixes access for the fishing biodome. (#14908) again. ack. --- .../LavaRuins/lavaland_biodome_fishing.dmm | 70 ++++++++++--------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm index c5002c12e3f1..4600f5cf3f1c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm @@ -160,18 +160,6 @@ }, /turf/open/floor/plasteel/stairs/goon/stairs_middle, /area/ruin/powered/fishing) -"fG" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/reagent_containers/glass/mixbowl{ - pixel_x = 1; - pixel_y = 4 - }, -/obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ruin/powered/fishing) "fI" = ( /obj/effect/turf_decal/pool, /turf/open/floor/wood{ @@ -308,19 +296,6 @@ "jO" = ( /turf/open/floor/plasteel/dark, /area/ruin/powered/fishing) -"kZ" = ( -/obj/machinery/button/door{ - id = "fishing lockdown"; - name = "Lockdown Control"; - pixel_x = -23; - pixel_y = 1; - req_access_txt = "19" - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ruin/powered/fishing) "lg" = ( /obj/machinery/vending/dinnerware, /obj/effect/decal/cleanable/dirt/dust, @@ -573,6 +548,13 @@ }, /turf/open/water/safe, /area/ruin/powered/fishing) +"xb" = ( +/obj/structure/closet/secure_closet/freezer/fridge{ + req_access = "Fisherman" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/fishing) "ys" = ( /obj/machinery/door/airlock/wood{ name = "bunk room"; @@ -610,6 +592,20 @@ }, /turf/open/floor/plasteel/dark, /area/ruin/powered/fishing) +"zd" = ( +/obj/structure/closet/secure_closet/freezer/kitchen{ + req_access = "Fisherman" + }, +/obj/item/reagent_containers/glass/mixbowl{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/condiment/enzyme{ + layer = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/fishing) "zk" = ( /obj/effect/turf_decal/pool{ dir = 8 @@ -647,6 +643,19 @@ /obj/machinery/vending/autodrobe, /turf/open/floor/plasteel, /area/ruin/powered/fishing) +"By" = ( +/obj/machinery/button/door{ + id = "fishing lockdown"; + name = "Lockdown Control"; + pixel_x = -23; + pixel_y = 1; + req_access_txt = "Fisherman" + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ruin/powered/fishing) "BV" = ( /obj/machinery/light{ dir = 8 @@ -757,11 +766,6 @@ }, /turf/open/floor/wood, /area/ruin/powered/fishing) -"Eo" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ruin/powered/fishing) "Fb" = ( /obj/structure/railing{ dir = 8 @@ -1759,7 +1763,7 @@ SQ Jt JL UO -fG +zd JL aa "} @@ -1791,7 +1795,7 @@ XA gt OQ UO -Eo +xb JL aa "} @@ -2014,7 +2018,7 @@ sI CI HX HX -kZ +By WS JL US From 0cfbd9caecd8f76a6344ea04072568582a9fbde3 Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Mon, 18 Jul 2022 04:15:06 -0400 Subject: [PATCH 7/8] Automatic changelog generation #14908 [ci skip] --- html/changelogs/AutoChangelog-pr-14908.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-14908.yml diff --git a/html/changelogs/AutoChangelog-pr-14908.yml b/html/changelogs/AutoChangelog-pr-14908.yml new file mode 100644 index 000000000000..8a3dbd8ae6dd --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-14908.yml @@ -0,0 +1,4 @@ +author: "VaelophisNyx" +delete-after: true +changes: + - bugfix: "Fixes fishing biodome lockdown and fridge access" From dd157f698fd314155c0f0aa9ab0aef10f7a0b126 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 18 Jul 2022 14:12:53 +0000 Subject: [PATCH 8/8] Automatic changelog compile [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangelog-pr-14908.yml | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-14908.yml diff --git a/html/changelog.html b/html/changelog.html index 5a299c74291c..1b78f82fcf21 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -67,6 +67,10 @@
  • Marrow Weaver readded to lavaland
+

VaelophisNyx updated:

+
    +
  • Fixes fishing biodome lockdown and fridge access
    • +

nmajask updated:

  • adds an organ fridge to the meta medbay
    • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 18bb566d6920..14b39e3f8e2e 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -32815,6 +32815,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: heretic player count lowered to 25 from 35 ToasterBiome: - bugfix: Marrow Weaver readded to lavaland + VaelophisNyx: + - bugfix: Fixes fishing biodome lockdown and fridge access nmajask: - tweak: adds an organ fridge to the meta medbay - tweak: wires the meta medbay treatment center, diff --git a/html/changelogs/AutoChangelog-pr-14908.yml b/html/changelogs/AutoChangelog-pr-14908.yml deleted file mode 100644 index 8a3dbd8ae6dd..000000000000 --- a/html/changelogs/AutoChangelog-pr-14908.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "VaelophisNyx" -delete-after: true -changes: - - bugfix: "Fixes fishing biodome lockdown and fridge access"