July 5th TG sync (#1883)

July 5th TG sync

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,3 @@
-[Note]: # (State what the issue is from a "whats wrong" perspective. Issue reports should clearly allow maintainers to understand whats wrong and how to test/reproduce if that is not obvious. Avoid ambiguity. Please enter the commit hash from the "Show Server Revision" verb if you can. Remove these notes before submitting your report.)
+[Note]: # (Please enter the commit hash and active testmerge numbers from the "Show Server Revision" verb if you can. If you believe the issue to be caused by a testmerge, please report it in its relative PR thread. State what the issue is from a "whats wrong" prospective. Issue reports should clearly allow maintainers to understand whats wrong and how to test/reproduce if that is not obvious. Avoid ambiguity. Start your issue report below both of these lines (or remove them))
 
-[GameAdmins]: # (If you are reporting a bug that occurred AFTER you used varedit/admin buttons to alter an object out of normal operating conditions, please verify that you can re-create the bug without the varedit usage/admin buttons before reporting the issue.)
+[Admins]: # (If you are reporting a bug that occured AFTER you used varedit/admin buttons to alter an object out of normal operating conditions, please verify that you can re-create the bug without the varedit usage/admin buttons before reporting the issue.)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,6 @@
+[Feature Freeze!]: # We are currently not considering any balance or antagonist oriented pull requests. Full details, as well as ways to bypass this freeze, are available here https://github.com/tgstation/tgstation/pull/28223
+
+
 [Changelogs]: # (Please make a changelog if you're adding, removing or changing content that'll affect players. This includes, but is not limited to, new features, sprites, sounds; balance changes; map edits and important fixes)
 []: # (See here for how to easily make a changelog: https://github.com/tgstation/tgstation/wiki/Changelogs. An example changelog has been provided below. Please edit or remove)
 

.travis.yml

@@ -41,5 +41,3 @@ script:
   - tools/travis/build_tools.sh
   - tools/travis/build_byond.sh
 
-notifications:
-  email: false

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -91,9 +91,7 @@
 "ao" = (
 /obj/structure/sink{
 	dir = 4;
-	icon_state = "sink";
-	pixel_x = 11;
-	pixel_y = 0
+	pixel_x = 11
 	},
 /obj/effect/decal/sandeffect,
 /obj/structure/mirror{
@@ -168,8 +166,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/asteroid{
-	baseturf = /turf/open/floor/plating/beach/sand;
-	tag = "icon-asteroidwarning (NORTH)"
+	baseturf = /turf/open/floor/plating/beach/sand
 	},
 /area/ruin/powered/beach)
 "aC" = (
@@ -226,8 +223,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/asteroid{
-	baseturf = /turf/open/floor/plating/beach/sand;
-	tag = "icon-asteroidwarning (NORTH)"
+	baseturf = /turf/open/floor/plating/beach/sand
 	},
 /area/ruin/powered/beach)
 "aK" = (
@@ -297,8 +293,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/asteroid{
-	baseturf = /turf/open/floor/plating/beach/sand;
-	tag = "icon-asteroidwarning (NORTH)"
+	baseturf = /turf/open/floor/plating/beach/sand
 	},
 /area/ruin/powered/beach)
 "aX" = (
@@ -317,8 +312,7 @@
 /area/ruin/powered/beach)
 "ba" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/open/floor/pod/dark{
 	baseturf = /turf/open/floor/plating/asteroid/basalt;
@@ -348,7 +342,6 @@
 /area/ruin/powered/beach)
 "bf" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 8
 	},
 /turf/open/floor/pod/dark{
@@ -371,7 +364,6 @@
 /area/ruin/powered)
 "bj" = (
 /obj/structure/chair/wood/normal{
-	icon_state = "wooden_chair";
 	dir = 4
 	},
 /turf/open/floor/plasteel/asteroid{
@@ -387,7 +379,6 @@
 /area/ruin/powered/beach)
 "bl" = (
 /obj/structure/chair/wood/normal{
-	icon_state = "wooden_chair";
 	dir = 8
 	},
 /turf/open/floor/plasteel/asteroid{
@@ -495,8 +486,7 @@
 /area/ruin/powered/beach)
 "bB" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -539,8 +529,7 @@
 /area/ruin/powered/beach)
 "bH" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/effect/mob_spawn/human/beach/alive{
 	flavour_text = "You're a spunky lifeguard! It's up to you to make sure nobody drowns or gets eaten by sharks and stuff.";
@@ -694,8 +683,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/asteroid{
-	baseturf = /turf/open/floor/plating/beach/sand;
-	tag = "icon-asteroidwarning (NORTH)"
+	baseturf = /turf/open/floor/plating/beach/sand
 	},
 /area/ruin/powered/beach)
 "ck" = (
@@ -706,8 +694,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/asteroid{
-	baseturf = /turf/open/floor/plating/beach/sand;
-	tag = "icon-asteroidwarning (NORTH)"
+	baseturf = /turf/open/floor/plating/beach/sand
 	},
 /area/ruin/powered/beach)
 "cl" = (

_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm

@@ -607,7 +607,6 @@
 /area/ruin/powered/clownplanet)
 "bo" = (
 /obj/machinery/light{
-	icon_state = "tube1";
 	dir = 4
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,

_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm

@@ -77,7 +77,6 @@
 /area/ruin/powered/animal_hospital)
 "an" = (
 /obj/machinery/sleeper{
-	icon_state = "sleeper-open";
 	dir = 4
 	},
 /obj/machinery/light{
@@ -172,7 +171,6 @@
 /area/lavaland/surface/outdoors)
 "ay" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2