From 6270a7769692d2944d7e8208eed70b31ea09ef54 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Wed, 25 Nov 2020 17:56:09 +0000 Subject: [PATCH 1/5] ERT Ship Cleanup --- maps/submaps/admin_use_vr/ert.dmm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 193550f2c13..f017d21a305 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -635,9 +635,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) -"fw" = ( -/turf/simulated/floor/tiled/techmaint, -/area/space) "fx" = ( /obj/structure/table/steel_reinforced, /obj/item/rig_module/sprinter, @@ -6046,13 +6043,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/teleporter) -"PZ" = ( -/obj/structure/table/bench/steel, -/obj/effect/landmark{ - name = "Commando" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/space) "Qc" = ( /obj/machinery/power/apc/hyper{ alarms_hidden = 1; @@ -16646,7 +16636,7 @@ Ci yz yz yz -PZ +yz yz yz yz @@ -18472,7 +18462,7 @@ pn tH xv Ce -fw +FR FR Mt Pl From 9a9f0fa9e8f172867a93681dfecf167082c333e6 Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Wed, 25 Nov 2020 13:27:25 -0800 Subject: [PATCH 2/5] Prevent cyclic neighbor references in spreading plants These are kind of a nightmare to GC regardless, but this should at least help prevent hard del hell --- code/modules/hydroponics/spreading/spreading.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 9c8e8107538..8d28c85da62 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -72,6 +72,7 @@ var/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/plant /obj/effect/plant/Destroy() + neighbors.Cut() if(seed.get_trait(TRAIT_SPREAD)==2) unsense_proximity(callback = .HasProximity, center = get_turf(src)) SSplants.remove_plant(src) From 9d9c9aa206dee1f484d5f1443363a8a3f5362462 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Wed, 25 Nov 2020 20:52:12 -0500 Subject: [PATCH 3/5] Adds Radishfriend to whitelist for Clown Accepted Application at: https://forum.vore-station.net/viewtopic.php?f=46&t=1849&sid=8406f2f309c1da40fbbff643b98ff375 --- config/jobwhitelist.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/jobwhitelist.txt b/config/jobwhitelist.txt index 6cb52a63919..130be911dbe 100644 --- a/config/jobwhitelist.txt +++ b/config/jobwhitelist.txt @@ -9,4 +9,5 @@ chargae - mime verkister - clown H0lySquirr3l - clown sgtryder - mime -tygertac - clown \ No newline at end of file +tygertac - clown +radishfriend - clown From 1eda686221f9dba0c8dd33fd67fd5a01090475cc Mon Sep 17 00:00:00 2001 From: VerySoft Date: Thu, 26 Nov 2020 04:11:37 -0500 Subject: [PATCH 4/5] Adds an APC --- maps/tether/tether-02-surface2.dmm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index c237d954d2f..d5dc9a1d9fd 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1081,6 +1081,14 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence/upper) "abY" = ( From e559c1b20ca53e021d076000ca6784c1bb2f496c Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Thu, 26 Nov 2020 05:37:23 -0800 Subject: [PATCH 5/5] Theoretically make nanomaps work via PR --- .github/workflows/render_nanomaps.yml | 32 ++++++++++++++++++--------- maps/_map_system_readme.dm | 2 +- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/render_nanomaps.yml b/.github/workflows/render_nanomaps.yml index 6ed50e1f5a9..f3a50a5e942 100644 --- a/.github/workflows/render_nanomaps.yml +++ b/.github/workflows/render_nanomaps.yml @@ -16,25 +16,37 @@ jobs: name: 'Generate NanoMaps' runs-on: ubuntu-18.04 steps: - - name: 'Update Branch' + - name: Clone uses: actions/checkout@v2 - with: - fetch-depth: 1 + + - name: Branch + run: | + git fetch origin + git branch -f nanomaps_generation + git checkout nanomaps_generation + git reset --hard origin/master - name: Ensure +x on github-actions directory - run: | - chmod -R +x ./tools/github-actions + run: chmod -R +x ./tools/github-actions - - name: 'Generate Maps' + - name: Generate Maps run: './tools/github-actions/nanomap-renderer-invoker.sh' - - name: 'Commit Maps' + - name: Commit Maps run: | git config --local user.email "action@github.com" git config --local user.name "NanoMap Generation" - git pull origin master + git add . git commit -m "NanoMap Auto-Update (`date`)" -a || true - - name: 'Push Maps' - uses: ad-m/github-push-action@master + git push -f -u origin nanomaps_generation + + - name: Create Pull Request + uses: repo-sync/pull-request@v2 with: + source_branch: "nanomaps_generation" + destination_branch: "master" + pr_title: "Automatic NanoMap Update" + pr_body: "This pull request updates the nanomap images to the latest version of the map." + pr_label: "Infrastructure" + pr_allow_empty: false github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/maps/_map_system_readme.dm b/maps/_map_system_readme.dm index 95e996907ba..e97445241df 100644 --- a/maps/_map_system_readme.dm +++ b/maps/_map_system_readme.dm @@ -10,7 +10,7 @@ things, such as areas, elevators, or shuttles. Generally, the layout is that yo (optional) [map_name]_areas/structures/whatever.dm - Files for unique things to that map. [map_name]-1.dmm - Your actual map files. Z-levels should be ordered correctly if you seperate your z-levels across map files. --HOW TO LOAD A SPECIFIC MAP- +- HOW TO LOAD A SPECIFIC MAP - Say you want to load southern_cross, First, uncheck your current loaded map, presumably northern_star. Uncheck northern_star.dm inside northern_star folder. Then go open southern_cross folder, and check southern_cross.dm, don't check any other folders below, and compile.