TG Merge 5 (thermoelectric boogaloo) (#122)

* Merge remote-tracking branch 'tg/master'

# Conflicts:
#	README.md
#	_maps/map_files/BoxStation/BoxStation.dmm
#	_maps/map_files/Deltastation/DeltaStation2.dmm
#	_maps/map_files/Donutstation/Donutstation.dmm
#	_maps/map_files/KiloStation/KiloStation.dmm
#	_maps/map_files/MetaStation/MetaStation.dmm
#	_maps/map_files/PubbyStation/PubbyStation.dmm
#	code/__DEFINES/dcs/signals.dm
#	code/__DEFINES/jobs.dm
#	code/__DEFINES/misc.dm
#	code/__DEFINES/movespeed_modification.dm
#	code/__DEFINES/preferences.dm
#	code/_onclick/hud/_defines.dm
#	code/_onclick/hud/hud.dm
#	code/datums/components/edible.dm
#	code/datums/http.dm
#	code/datums/status_effects/buffs.dm
#	code/game/machinery/computer/arcade.dm
#	code/game/machinery/computer/card.dm
#	code/game/objects/items/melee/misc.dm
#	code/game/objects/items/stunbaton.dm
#	code/modules/atmospherics/machinery/pipes/mapping.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/spacesuits/miscellaneous.dm
#	code/modules/jobs/access.dm
#	code/modules/jobs/job_types/chief_medical_officer.dm
#	code/modules/mob/living/carbon/human/species_types/ethereal.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
#	code/modules/power/lighting.dm
#	code/modules/power/multiz.dm
#	code/modules/projectiles/guns/energy/energy_gun.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/other_reagents.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/research/designs/misc_designs.dm
#	code/modules/research/techweb/all_nodes.dm
#	code/modules/surgery/organs/liver.dm
#	code/modules/uplink/uplink_items.dm
#	html/changelogs/.all_changelog.yml
#	tgui/README.md
#	tgui/packages/tgui/public/tgui.bundle.js
#	tgui/packages/tgui/routes.js

* dumb workflows

* Revert "Merge pull request #49563 from Fikou/clarke"

This reverts commit 9d4eb58.

* readme fix

* movement fixes

* moar fixes

* more fixes and things

* whoops

* hopefully final fix

* map updates

* box power fixes(?)

* more map fixes/changes

* minor fixes

* final changes

* actual real fixes

* i'm so tired

.github/AUTODOC_GUIDE.md

@@ -32,7 +32,7 @@ All class level defined variables *must* be documented
 Internal functions *should* be documented, but may not be
 
 A public function is any function that a developer might reasonably call while using
-or interating with your object. Internal functions are helper functions that your
+or interacting with your object. Internal functions are helper functions that your
 public functions rely on to implement logic
 
 

.github/workflows/round_id_linker.yml

@@ -0,0 +1,12 @@
+name: "Round ID Linker"
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  link_rounds:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: tgstation/round_linker@master
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
 	"eslint.workingDirectories": [
-        "./tgui-next"
+        "./tgui"
     ]
 }

Dockerfile

@@ -40,7 +40,7 @@ RUN apt-get install -y --no-install-recommends software-properties-common \
     g++-7 \
     libmariadb-client-lgpl-dev \
     && git init \
-    && git remote add origin https://github.com/tgstation/BSQL 
+    && git remote add origin https://github.com/tgstation/BSQL
 
 COPY dependencies.sh .
 

README.md

@@ -1,28 +1,33 @@
-<h1 align="center">WaspStation 13 Codebase</h1>
+# WaspStation 13 Codebase
 
 [![Build Status](https://api.travis-ci.com/WaspStation/WaspStation-1.0.svg?branch=master)](https://travis-ci.com/WaspStation/WaspStation-1.0) [![Krihelimeter](http://www.krihelinator.xyz/badge/WaspStation/WaspStation-1.0)](https://www.krihelinator.xyz)
-[![Percentage of issues still open](http://isitmaintained.com/badge/open/waspstation/waspstation-1.0.svg)](https://isitmaintained.com/project/tgstation/tgstation "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/waspstation/waspstation-1.0.svg)](https://isitmaintained.com/project/tgstation/tgstation "Average time to resolve an issue") ![Coverage](https://img.shields.io/badge/coverage---2%25-red.svg)
-[![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png)[![forthebadge](https://forthebadge.com/images/badges/60-percent-of-the-time-works-every-time.svg)](https://forthebadge.com) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
+[![Percentage of issues still open](http://isitmaintained.com/badge/open/waspstation/waspstation-1.0.svg)](https://isitmaintained.com/project/waspstation/waspstation-1.0 "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/waspstation/waspstation-1.0.svg)](https://isitmaintained.com/project/waspstation/waspstation-1.0 "Average time to resolve an issue") [![GitHub issues](https://img.shields.io/github/issues/waspstation/waspstation-1.0)](https://github.com/waspstation/waspstation-1.0/issues) ![GitHub top language](https://img.shields.io/github/languages/top/waspstation/waspstation-1.0)
+
+[![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
 * **Website:** TBA
-* **Code:** https://github.com/WaspStation/WaspStation-1.0
-* **Mantis Discord:** https://discord.gg/husVWe8
-* **Boomer Discord:** https://discord.gg/BUM8uRc
+* **Code:** <https://github.com/WaspStation/WaspStation-1.0>
+* **Mantis Discord:** <https://discord.gg/husVWe8>
+* **Boomer Discord:** <https://discord.gg/BUM8uRc>
+* **Coderbus Discord:** <https://discord.gg/Vh8TJp9>
 * **Wiki** TBA
 
 ## DOWNLOADING
 
-There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at https://www.tgstation13.org/wiki/Downloading_the_source_code
+There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at <https://www.tgstation13.org/wiki/Downloading_the_source_code>
 
 Option 1:
-Follow this: https://www.tgstation13.org/wiki/Setting_up_git
+Follow one of these:
+
+* <https://www.tgstation13.org/wiki/Setting_up_git>
+* <https://thooloo.tk/babbypr.html>
 
 Option 2: Download the source code as a zip by clicking the ZIP button in the
-code tab of https://github.com/tgstation/tgstation
+code tab of <https://github.com/tgstation/tgstation>
 (note: this will use a lot of bandwidth if you wish to update and is a lot of
 hassle if you want to make any changes at all, so it's not recommended.)
 
-Option 3: Download a pre-compiled nightly at https://tgstation13.download/nightlies/ (same caveats as option 2)
+Option 3: Download a pre-compiled nightly at <https://tgstation13.download/nightlies/> (same caveats as option 2)
 
 Option 4: Use our docker image that tracks the master branch (See commits for build status. Again, same caveats as option 2)
 
@@ -33,7 +38,7 @@ docker run -d -p <your port>:1337 -v /path/to/your/config:/tgstation/config -v /
 ## INSTALLATION
 
 First-time installation should be fairly straightforward. First, you'll need
-BYOND installed. You can get it from https://www.byond.com/download. Once you've done
+BYOND installed. You can get it from <https://www.byond.com/download.> Once you've done
 that, extract the game files to wherever you want to keep them. This is a
 sourcecode-only release, so the next step is to compile the server files.
 Open tgstation.dme by double-clicking it, open the Build menu, and click
@@ -47,7 +52,7 @@ tgstation.dmb - 0 errors, 0 warnings
 
 If you see any errors or warnings, something has gone wrong - possibly a corrupt
 download or the files extracted wrong. If problems persist, ask for assistance
-in https://discord.gg/Vh8TJp9
+in <https://discord.gg/Vh8TJp9>
 
 Once that's done, open up the config folder. You'll want to edit config.txt to
 set the probabilities for different gamemodes in Secret and to set your server
@@ -83,27 +88,27 @@ you set up the SQL backend (see below).
 
 ## UPDATING
 
-This is the codebase for the /tg/station flavoured fork of SpaceStation 13.
+This is the codebase for the WaspStation flavoured fork of SpaceStation 13.
 
 Space Station 13 is a paranoia-laden round-based roleplaying game set against the backdrop of a nonsensical, metal death trap masquerading as a space station, with charming spritework designed to represent the sci-fi setting and its dangerous undertones. Have fun, and survive!
 
 ## HOSTING
 
-If you'd like a more robust server hosting option for tgstation and its
-derivatives. Check out our server tools suite at
-https://github.com/tgstation/tgstation-server
+If you'd like a more robust server hosting option for tgcode and its
+derivatives. Check out the server tools suite at
+<https://github.com/tgstation/tgstation-server>.
+otherwise, use DreamDaemon, which is included with your BYOND installation.
 
 ## MAPS
 
-/tg/station currently comes equipped with five maps.
+Waspstation currently comes equipped with five maps, with more on the way!
 
 * [BoxStation (default)](https://tgstation13.org/wiki/Boxstation)
 * [MetaStation](https://tgstation13.org/wiki/MetaStation)
 * [DeltaStation](https://tgstation13.org/wiki/DeltaStation)
 * [PubbyStation](https://tgstation13.org/wiki/PubbyStation)
 * [DonutStation](https://tgstation13.org/wiki/Donutstation)
 
-
 All maps have their own code file that is in the base of the _maps directory. Maps are loaded dynamically when the game starts. Follow this guideline when adding your own map, to your fork, for easy compatibility.
 
 The map that will be loaded for the upcoming round is determined by reading data/next_map.json, which is a copy of the json files found in the _maps tree. If this file does not exist, the default map from config/maps.txt will be loaded. Failing that, BoxStation will be loaded. If you want to set a specific map to load next round you can use the Change Map verb in game before restarting the server or copy a json from _maps to data/next_map.json before starting the server. Also, for debugging purposes, ticking a corresponding map's code file in Dream Maker will force that map to load every round.
@@ -122,31 +127,32 @@ To enable an away mission open `config/awaymissionconfig.txt` and uncomment one
 
 ## SQL SETUP
 
-The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes.  More detailed setup instructions are located here: https://www.tgstation13.org/wiki/Downloading_the_source_code#Setting_up_the_database
+The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes.  More detailed setup instructions are located here: <https://www.tgstation13.org/wiki/Downloading_the_source_code#Setting_up_the_database>
 
-If you are hosting a testing server on windows you can use a standalone version of MariaDB pre load with a blank (but initialized) tgdb database. Find them here: https://tgstation13.download/database/ Just unzip and run for a working (but insecure) database server. Includes a zipped copy of the data folder for easy resetting back to square one.
+If you are hosting a testing server on windows you can use a standalone version of MariaDB pre load with a blank (but initialized) tgdb database. Find them here: <https://tgstation13.download/database/> Just unzip and run for a working (but insecure) database server. Includes a zipped copy of the data folder for easy resetting back to square one.
 
 ## WEB/CDN RESOURCE DELIVERY
 
 Web delivery of game resources makes it quicker for players to join and reduces some of the stress on the game server.
 
 1. Edit compile_options.dm to set the `PRELOAD_RSC` define to `0`
 1. Add a url to config/external_rsc_urls pointing to a .zip file containing the .rsc.
-    * If you keep up to date with /tg/ you could reuse /tg/'s rsc cdn at http://tgstation13.download/byond/tgstation.zip. Otherwise you can use cdn services like CDN77 or cloudflare (requires adding a page rule to enable caching of the zip), or roll your own cdn using route 53 and vps providers.
-	* Regardless even offloading the rsc to a website without a CDN will be a massive improvement over the in game system for transferring files.
+    * If you keep up to date with /tg/ you could reuse /tg/'s rsc cdn at <http://tgstation13.download/byond/tgstation.zip.> Otherwise you can use cdn services like CDN77 or cloudflare (requires adding a page rule to enable caching of the zip), or roll your own cdn using route 53 and vps providers.
+    * Regardless even offloading the rsc to a website without a CDN will be a massive improvement over the in game system for transferring files.
 
 ## CONTRIBUTING
 
 [Documenting your code](.github/AUTODOC_GUIDE.md)
 
 ## CODEBASE CREDITS
-- /tg/, for the codebase
-- BeeStation, for the many QoL changes
-- Oracle, for the inspiration and wonderful features and sprites
-- Interstation for bridging the gap between Oracle and Modern /tg/
-- YogStation for multiple different features
-- CEV Eris, for the PDA sprites
-- Citadel, for their beautiful lighting
+
+* /tg/, for the codebase
+* BeeStation, for the many QoL changes
+* Oracle, for the inspiration and wonderful features and sprites
+* Interstation for bridging the gap between Oracle and Modern /tg/
+* YogStation for multiple different features
+* CEV Eris, for the PDA sprites
+* Citadel, for their beautiful lighting
 
 And thank you to any other codebase not mentioned here that has been used in the code. Your wonderful contributions are known.
 

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -34,12 +34,12 @@
 /turf/open/floor/plating,
 /area/ruin/powered/beach)
 "at" = (
-/mob/living/simple_animal/crab{
-	name = "Eddie"
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/mob/living/simple_animal/crab{
+	name = "Eddie"
+	},
 /turf/open/floor/plating/beach/sand,
 /area/ruin/powered/beach)
 "au" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm

@@ -696,7 +696,7 @@
 /area/lavaland/surface/outdoors)
 "bP" = (
 /obj/structure/stone_tile/block,
-/obj/item/twohanded/spear,
+/obj/item/spear,
 /obj/effect/mapping_helpers/no_lava,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
@@ -868,7 +868,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "ck" = (
-/obj/item/twohanded/spear,
+/obj/item/spear,
 /obj/structure/stone_tile{
 	dir = 4
 	},
@@ -882,7 +882,7 @@
 /obj/structure/stone_tile/cracked{
 	dir = 8
 	},
-/obj/item/twohanded/spear,
+/obj/item/spear,
 /obj/effect/mapping_helpers/no_lava,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
@@ -986,7 +986,7 @@
 /obj/structure/stone_tile/cracked{
 	dir = 1
 	},
-/obj/item/twohanded/spear,
+/obj/item/spear,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "cA" = (
@@ -1029,7 +1029,7 @@
 	dir = 1
 	},
 /obj/structure/table/wood,
-/obj/item/twohanded/spear,
+/obj/item/spear,
 /obj/item/storage/belt,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
@@ -1072,7 +1072,7 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/twohanded/spear,
+/obj/item/spear,
 /obj/item/scythe,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
@@ -1085,7 +1085,7 @@
 	dir = 8
 	},
 /obj/structure/table/wood,
-/obj/item/twohanded/spear,
+/obj/item/spear,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "cN" = (
@@ -1100,7 +1100,7 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/twohanded/spear,
+/obj/item/spear,
 /obj/item/clothing/head/helmet/roman/legionnaire,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)

_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm

@@ -36,15 +36,16 @@
 /turf/open/floor/plating,
 /area/ruin/powered/snow_biodome)
 "ai" = (
-/obj/machinery/shower,
-/turf/open/floor/plating,
+/obj/machinery/shower{
+	pixel_y = 12
+	},
+/turf/open/floor/plasteel/white,
 /area/ruin/powered/snow_biodome)
 "aj" = (
-/obj/structure/sink,
-/obj/machinery/light/small{
-	dir = 1
+/obj/structure/sink{
+	pixel_y = 26
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/white,
 /area/ruin/powered/snow_biodome)
 "ak" = (
 /turf/open/floor/plating/asteroid/snow,
@@ -61,7 +62,7 @@
 /obj/structure/toilet{
 	dir = 8
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/white,
 /area/ruin/powered/snow_biodome)
 "ao" = (
 /turf/open/floor/plating/ice,
@@ -333,7 +334,7 @@
 /turf/open/floor/pod/dark,
 /area/ruin/powered/snow_biodome)
 "KS" = (
-/obj/item/twohanded/required/chainsaw,
+/obj/item/chainsaw,
 /obj/structure/closet,
 /obj/machinery/light/small{
 	dir = 4
@@ -387,6 +388,9 @@
 /obj/structure/filingcabinet,
 /turf/open/floor/pod/dark,
 /area/ruin/powered/snow_biodome)
+"UH" = (
+/turf/open/floor/plasteel/white,
+/area/ruin/powered/snow_biodome)
 "UM" = (
 /obj/machinery/computer/monitor/secret{
 	dir = 1
@@ -396,6 +400,10 @@
 "Wg" = (
 /turf/closed/wall/r_wall,
 /area/ruin/powered/snow_biodome)
+"Zq" = (
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/white,
+/area/ruin/powered/snow_biodome)
 
 (1,1,1) = {"
 aa
@@ -976,7 +984,7 @@ tb
 (19,1,1) = {"
 Wg
 ai
-af
+UH
 aq
 av
 bx
@@ -1008,7 +1016,7 @@ tb
 (20,1,1) = {"
 Wg
 aj
-af
+Zq
 aq
 aq
 aq

_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm

@@ -132,11 +132,11 @@
 /turf/open/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/arrivals)
 "aR" = (
-/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/atmospherics/pipe/layer_manifold/visible{
 	dir = 4
 	},
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
 "aW" = (
@@ -4107,10 +4107,6 @@
 	dir = 6;
 	name = "N2 to Mix"
 	},
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible/layer1{
-	dir = 4;
-	name = "N2"
-	},
 /turf/open/floor/plasteel,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
 "lb" = (
@@ -4752,7 +4748,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/syndicate_lava_base/bar)
 "mu" = (
-/obj/item/twohanded/required/kirbyplants{
+/obj/item/kirbyplants{
 	icon_state = "plant-22"
 	},
 /obj/effect/decal/cleanable/dirt,

_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm

@@ -350,6 +350,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
+/obj/structure/cable,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/abandonedzoo)
 "be" = (

_maps/RandomRuins/SpaceRuins/bigderelict1.dmm

@@ -428,6 +428,7 @@
 /obj/machinery/power/terminal{
 	dir = 1
 	},
+/obj/structure/cable,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/derelictoutpost/powerstorage)
 "bs" = (