Merge remote-tracking branch 'upstream/master' into overmap4

_maps/configs/masinyane.json

@@ -5,7 +5,6 @@
 	"namelists": ["MYTHOLOGICAL", "NATURAL"],
 	"map_path": "_maps/shuttles/shiptest/masinyane.dmm",
 	"map_id": "masinyane",
-	"roundstart": true,
 	"job_slots": {
 		"Private Ship Owner": {
 			"outfit": "/datum/outfit/job/captain/independent/owner",
@@ -20,6 +19,5 @@
 			"outfit": "/datum/outfit/job/assistant/independent/crewmatefancy",
 			"slots": 1
 		}
-	},
-	"cost": 7000
+	}
 }

html/changelog.html

@@ -50,6 +50,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">16 July 2022</h2>
+			<h3 class="author">Apogee-dev updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed Masinyane from roundstart spawning and purchase.</li>
+			</ul>
+			<h3 class="author">Zevotech updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Miasma, the stinky corpse gas</li>
+				<li class="rscdel">rot.dm, and corpses/gibs creating miasma</li>
+			</ul>
+
 			<h2 class="date">15 July 2022</h2>
 			<h3 class="author">MarkSuckerberg updated:</h3>
 			<ul class="changes bgimages16">
@@ -705,38 +716,6 @@ <h3 class="author">kestoloppu updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">fixed a missing wire on the libertatia-class hauler</li>
 			</ul>
-
-			<h2 class="date">15 May 2022</h2>
-			<h3 class="author">Apogee-dev updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added briefing room and extra cargo space to Carina</li>
-				<li class="rscadd">Added R&D console and seclathe to Carina</li>
-				<li class="tweak">Secure doors and lockers on Carina now require proper access</li>
-			</ul>
-			<h3 class="author">Bokkiewokkie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed plastic plating causing crashes.</li>
-				<li class="code_imp">Minor improvement to turf transparency element</li>
-				<li class="code_imp">Tweaked material datum opacity usage</li>
-			</ul>
-			<h3 class="author">Ebin-Halcyon updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Digitigrade Syndicate hardsuits have been updated</li>
-			</ul>
-			<h3 class="author">PositiveEntropy updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Resprites the normal and syndicate sleepers!</li>
-				<li class="imagedel">Erases Cryogenics2.dmi from existence.</li>
-			</ul>
-			<h3 class="author">ZephyrTFA updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">You can no longer infinitely cut items for cloth</li>
-			</ul>
-			<h3 class="author">retlaw34 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">powered ballistics</li>
-				<li class="bugfix">fixed a bug where the loading sound effect would play when ejecting a magazine</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -42563,3 +42563,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2022-07-15:
   MarkSuckerberg:
   - rscadd: Explosive decomp is back
+2022-07-16:
+  Apogee-dev:
+  - rscdel: Removed Masinyane from roundstart spawning and purchase.
+  Zevotech:
+  - rscdel: Miasma, the stinky corpse gas
+  - rscdel: rot.dm, and corpses/gibs creating miasma