Merge remote-tracking branch 'TGStation/master' into tg-feb-2

.dockerignore

@@ -3,7 +3,6 @@
 GPLv3.txt
 LICENSE
 README.md
-TGS3.json
 .github
 .gitignore
 .gitattributes

.github/guides/STANDARDS.md

@@ -74,8 +74,6 @@ var/path_type = "/obj/item/baseball_bat"
 
 * Changes to the `/config` tree must be made in a way that allows for updating server deployments while preserving previous behaviour. This is due to the fact that the config tree is to be considered owned by the user and not necessarily updated alongside the remainder of the code. The code to preserve previous behaviour may be removed at some point in the future given the OK by maintainers.
 
-* The dlls section of tgs3.json is not designed for dlls that are purely `call()()`ed since those handles are closed between world reboots. Only put in dlls that may have to exist between world reboots.
-
 ## Structural
 ### No duplicated code (Don't repeat yourself)
 Copying code from one place to another may be suitable for small, short-time projects, but /tg/station is a long-term project and highly discourages this.

_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm

@@ -246,7 +246,6 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/syndielab)
 "oA" = (
-/obj/structure/syndicate_uplink_beacon,
 /turf/open/floor/iron/dark/textured,
 /area/ruin/syndielab)
 "oY" = (
@@ -267,10 +266,6 @@
 	pixel_x = -5;
 	pixel_y = 8
 	},
-/obj/item/traitor_bug{
-	pixel_y = 6;
-	pixel_x = 6
-	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/syndielab)
 "qy" = (

_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm

@@ -102,7 +102,6 @@
 "kp" = (
 /obj/structure/safe,
 /obj/item/stamp/syndicate,
-/obj/item/traitor_bug,
 /obj/item/eyesnatcher,
 /obj/item/stack/spacecash/c1000,
 /turf/open/floor/plating,