Merge branch 'master' into tjeosnerfsmedbayagain

Author: JamieD1

.github/CONTRIBUTING.md

@@ -378,7 +378,7 @@ There is no strict process when it comes to merging pull requests. Pull requests
 
 * You are going to be expected to document all your changes in the pull request. Failing to do so will mean delaying it as we will have to question why you made the change. On the other hand, you can speed up the process by making the pull request readable and easy to understand, with diagrams or before/after data.
 
-* We ask that you use the changelog system to document your change, which prevents our players from being caught unaware by changes - you can find more information about this [on this wiki page](http://tgstation13.org/wiki/Guide_to_Changelogs).
+* We ask that you use the changelog system to document your player facing changes, which prevents our players from being caught unaware by said changes - you can find more information about this [on this wiki page](http://tgstation13.org/wiki/Guide_to_Changelogs).
 
 * If you are proposing multiple changes, which change many different aspects of the code, you are expected to section them off into different pull requests in order to make it easier to review them and to deny/accept the changes that are deemed acceptable.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 # If this is your first PR, or not, take the time to read our CONTRIBUTING.md file! You can see it here: https://github.com/yogstation13/Yogstation/blob/master/.github/CONTRIBUTING.md
 
 
-# Github documenting your Pull Request
+# Document the changes in your pull request
 
 Remove this text and explain what the purpose of your PR is.
 

_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm

@@ -145,6 +145,17 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/arrivals)
+"cg" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/item/stamp/syndiround,
+/turf/open/floor/plasteel,
+/area/ruin/unpowered/syndicate_lava_base/cargo)
 "cF" = (
 /obj/machinery/door/poddoor{
 	id = "lavalandsyndi_arrivals"
@@ -1411,16 +1422,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/cargo)
-"gb" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ruin/unpowered/syndicate_lava_base/cargo)
 "gc" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -6617,7 +6618,7 @@
 /obj/effect/spawner/structure/window/plastitanium,
 /turf/open/floor/plating,
 /area/ruin/unpowered/syndicate_lava_base/chemistry)
-"XT" = (
+"WQ" = (
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -6630,6 +6631,7 @@
 	dir = 8
 	},
 /obj/item/folder/red,
+/obj/item/stamp/syndiround,
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/syndicate_lava_base/telecomms)
 "XW" = (
@@ -7223,7 +7225,7 @@ Oh
 IO
 nl
 Zi
-XT
+WQ
 ov
 mn
 ab
@@ -8550,7 +8552,7 @@ ee
 eB
 fb
 fu
-gb
+cg
 gQ
 hl
 gQ

_maps/RandomRuins/LavaRuins/miningbase.dmm

@@ -3014,6 +3014,20 @@
 	},
 /turf/open/floor/plating,
 /area/mine/eva)
+"NN" = (
+/obj/structure/table,
+/obj/machinery/newscaster{
+	pixel_y = 32
+	},
+/obj/item/storage/lockbox/vialbox/blood{
+	pixel_x = 3;
+	pixel_y = 6
+	},
+/obj/item/book/random{
+	pixel_x = -4
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/infirmary)
 "NP" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -3554,14 +3568,6 @@
 "Vt" = (
 /turf/open/floor/plasteel,
 /area/mine/production)
-"Vu" = (
-/obj/structure/table,
-/obj/machinery/newscaster{
-	pixel_y = 32
-	},
-/obj/item/book/random,
-/turf/open/floor/plasteel/white,
-/area/mine/infirmary)
 "VJ" = (
 /obj/machinery/conveyor_switch/oneway{
 	id = "mining_internal";
@@ -4865,7 +4871,7 @@ YH
 wu
 bl
 kD
-Vu
+NN
 Er
 Vk
 kD

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -583,26 +583,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/airless/dark,
 /area/shuttle/caravan/freighter3)
-"ha" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/yellow,
-/obj/item/pen{
-	pixel_x = 6;
-	pixel_y = 6
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter3)
 "hm" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/caravan/freighter2)
@@ -1308,6 +1288,27 @@
 /obj/item/gun/ballistic/shotgun/sc_pump,
 /turf/template_noop,
 /area/template_noop)
+"Xi" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/yellow,
+/obj/item/pen{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/item/stamp/syndiround,
+/turf/open/floor/plasteel/dark{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter3)
 
 (1,1,1) = {"
 aa
@@ -5753,7 +5754,7 @@ aa
 aa
 gd
 gd
-ha
+Xi
 aI
 ih
 iH

_maps/RandomRuins/StationRuins/maint/10x10/10x10_assaultpod.dmm

@@ -12,6 +12,12 @@
 	icon_state = "platingdmg1"
 	},
 /area/template_noop)
+"c" = (
+/obj/item/stamp/syndiround,
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/template_noop)
 "d" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
@@ -234,7 +240,7 @@ y
 y
 r
 w
-p
+c
 O
 p
 p