Merge remote-tracking branch 'upstream/master'

_maps/map_files/triumph/triumph-04-deck4.dmm

@@ -12120,6 +12120,10 @@
 	req_access = list(58)
 	},
 /obj/structure/bed/chair/comfy/black,
+/obj/machinery/light_switch{
+	pixel_x = -36;
+	pixel_y = -35
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "jmm" = (
@@ -14908,6 +14912,9 @@
 /obj/item/storage/box/firingpins,
 /obj/item/storage/belt/security,
 /obj/item/megaphone,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hos)
 "lAR" = (
@@ -32252,6 +32259,10 @@
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/floor/tiled/old_cargo/gray,
 /area/security/hanger)
+"xKt" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/hallway/primary/aft)
 "xKG" = (
 /obj/structure/bed/chair/sofa/right{
 	icon_state = "sofaend_right"
@@ -43576,7 +43587,7 @@ mIQ
 tXz
 gto
 xiF
-pFE
+xKt
 cyH
 ugw
 ugw

html/changelog.html

@@ -53,6 +53,14 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">11 May 2021</h2>
+			<h3 class="author">nik707 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Mirror tool for borgs</li>
+				<li class="bugfix">fixed a bug that would allow infinite mirror production tweak: tweaks spawn in text when resleeving</li>
+				<li class="rscadd">further sanity checks to the mirror tool for more easy usage</li>
+			</ul>
+
 			<h2 class="date">10 May 2021</h2>
 			<h3 class="author">nevimer updated:</h3>
 			<ul class="changes bgimages16">
@@ -304,18 +312,6 @@
 				<li class="bugfix">loadout meson eyepatch</li>
 				<li class="rscdel">deleted player_panel tweak: changed player_panel_new to player_panel</li>
 			</ul>
-
-			<h2 class="date">12 March 2021</h2>
-			<h3 class="author">nik707 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">SKUB</li>
-			</ul>
-
-			<h2 class="date">11 March 2021</h2>
-			<h3 class="author">nik707 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">the dreaded square</li>
-			</ul>
 		</div>
 
 <br><b>Baystation 12 Credit List</b>

html/changelogs/.all_changelog.yml

@@ -5325,3 +5325,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-05-10:
   nevimer:
   - rscadd: Burn chamber engine submap.
+2021-05-11:
+  nik707:
+  - rscadd: Mirror tool for borgs
+  - bugfix: 'fixed a bug that would allow infinite mirror production tweak: tweaks
+      spawn in text when resleeving'
+  - rscadd: further sanity checks to the mirror tool for more easy usage

html/changelogs/AutoChangeLog-pr-3068.yml

@@ -1,7 +0,0 @@
-author: "nik707"
-delete-after: True
-changes: 
-  - rscadd: "Mirror tool for borgs"
-  - bugfix: "fixed a bug that would allow infinite mirror production
-tweak: tweaks spawn in text when resleeving"
-  - rscadd: "further sanity checks to the mirror tool for more easy usage"

tools/mapmerge2/readme.md

@@ -1,63 +0,0 @@
-# Map Merger
-
-The **Map Merger** is a collection of scripts that keep this repository's maps
-in a format which is easier to track in Git and less likely to cause merge
-conflicts. When merge conflicts do occur, it can sometimes resolve them.
-
-For detailed troubleshooting instructions and other tips, visit the
-[Map Merger] wiki article.
-
-## Installation
-
-To install the [Git hooks], open the `tools/hooks/` folder and double-click
-`Install.bat`. Linux users run `tools/hooks/install.sh`.
-
-## Manual Use
-
-If using a Git GUI which is not compatible with the hooks:
-
-* Before committing, double-click `Run Before Committing.bat`
-* When a merge has map conflicts, double-click `Resolve Map Conflicts.bat`
-
-The console will show whether the operation succeeded.
-
-For more details, see the [Map Merger] wiki article.
-
-## What Map Merging Is
-
-The "map merge" operation describes the process of rewriting a map file written
-by the DreamMaker map editor to A) use a format more amenable to Git's conflict
-resolution and B) differ in the least amount textually from the previous
-version of the map while maintaining all the actual changes. It requires an old
-version of the map to use as a reference and a new version of the map which
-contains the desired changes.
-
-Map Merge 2 adds multi-Z support, automatic handling of key overflow, better
-merge conflict prevention, and a real merge conflict resolver.
-
-## Code Structure
-
-Frontend scripts are meant to be run directly. They obey the environment
-variables `TGM` to set whether files are saved in TGM (1) or DMM (0) format,
-and `MAPROOT` to determine where maps are kept. By default, TGM is used and
-the map root is autodetected. Each script may either prompt for the desired map
-or be run with command-line parameters indicating which maps to act on. The
-scripts include:
-
-* `convert.py` for converting maps to and from the TGM format. Used by
-  `tgm2dmm.bat` and `dmm2tgm.bat`.
-* `mapmerge.py` for running the map merge on map backups saved by
-  `Prepare Maps.bat`. Used by `mapmerge.bat`
-
-Implementation modules:
-
-* `dmm.py` includes the map reader and writer.
-* `mapmerge.py` includes the implementation of the map merge operation.
-* `frontend.py` includes the common code for the frontend scripts.
-
-`precommit.py` is run by the [Git hooks] if installed, and merges the new
-version of any map saved in the index (`git add`ed) with the old version stored
-in Git when run.
-
-[Map Merger]: https://tgstation13.org/wiki/Map_Merger
-[Git hooks]: ../hooks/README.md