Merge remote-tracking branch 'upstream/master' into kk-misc3

.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 }}

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)

config/jobwhitelist.txt

@@ -9,4 +9,5 @@ chargae - mime
 verkister - clown
 H0lySquirr3l - clown
 sgtryder - mime
-tygertac - clown
+tygertac - clown
+radishfriend - clown

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.

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

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" = (