Merge branch 'master' of https://github.com/tgstation/-tg-station int…

…o goon_port

.travis.yml

@@ -4,7 +4,7 @@ sudo: false
 env:
     global:
     - BYOND_MAJOR="510"
-    - BYOND_MINOR="1322"
+    - BYOND_MINOR="1332"
     - NODE_VERSION="4"
     matrix:
     - DM_MAPFILE="tgstation2"

CONTRIBUTING.md

@@ -272,4 +272,4 @@ There is no strict process when it comes to merging pull requests, pull requests
 
 * 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.
 
-* If your pull request is accepted, the code you add is no longer exclusively yours but everyones, everyone is free to work on it but you are also free to object to any changes being made, which will be noted by a Project Lead or Project Manager. It is a shame this has to be explicitly told but there have been cases where this would've saved some trouble.
+* If your pull request is accepted, the code you add no longer belongs exclusively to you but to everyone; everyone is free to work on it, but you are also free to object to any changes being made, which will be noted by a Project Lead or Project Manager. It is a shame this has to be explicitly said, but there have been cases where this would've saved some trouble.

ISSUE_TEMPLATE.md

@@ -1,13 +1,3 @@
-[Everyone]: # (Please fill in your information on the line AFTER the header.)
-
-### What is the problem?
-
-### Why is it a problem, or what should have happened?
-
-### How can the problem be reproduced?
-
-### What revision did the problem happen on? (Helpful, but not required)
-[If you're including this]: # (Type find-server-revision ingame to find it. "Current" isn't helpful.)
-
+[Note]: # (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))
 
 [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.)

README.md

@@ -73,6 +73,10 @@ specified in the config.txt, and set the Security box to 'Safe'.  Then press GO
 and the server should start up and be ready to join. It is also recommended that
 you set up the SQL backend (see below).
 
+###HOSTING ON LINUX
+If you're not using BYOND version 510, BYGEX will be used for some text replacement related code. Unfortunately, we only have a windows dll included right now. You can find a version known to compile on linux, along with some basic install instructions here:
+https://github.com/optimumtact/byond-regex
+
 ##UPDATING
 
 To update an existing installation, first back up your /config and /data folders
@@ -118,10 +122,8 @@ The SQL backend requires a MySQL server. SQL is required for the library, stats
 
 ##IRC BOT SETUP
 
-Included in the repository is an IRC bot capable of relaying adminhelps to a specified
-IRC channel/server (thanks to Skibiliano).
-Instructions for bot setup are included in the /bot folder along with the script
-itself
+Included in the repository is a python3 compatible IRC bot capable of relaying adminhelps to a specified
+IRC channel/server, see the /bot folder for more
 
 ##CONTRIBUTING
 

_maps/RandomZLevels/caves.dmm

@@ -175,7 +175,7 @@
 "ds" = (/obj/structure/closet/secure_closet/personal,/obj/item/weapon/pickaxe{attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; throwforce = 1},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship{name = "\improper BMP Asteroid Level 2"})
 "dt" = (/turf/simulated/wall{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/northblock)
 "du" = (/turf/simulated/wall/rust{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/northblock)
-"dv" = (/obj/machinery/suit_storage_unit/mining{desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open."; isbroken = 0; ispowered = 0; name = "rusted suit storage unit"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship{name = "\improper BMP Asteroid Level 2"})
+"dv" = (/obj/machinery/suit_storage_unit/mining{desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open."; name = "rusted suit storage unit"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship{name = "\improper BMP Asteroid Level 2"})
 "dw" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship{name = "\improper BMP Asteroid Level 2"})
 "dx" = (/obj/structure/closet/secure_closet/personal,/obj/effect/decal/cleanable/cobweb,/obj/item/weapon/sord,/turf/simulated/floor/wood{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/northblock)
 "dy" = (/turf/simulated/floor/wood{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/northblock)
@@ -231,7 +231,7 @@
 "ew" = (/obj/structure/table,/obj/item/device/mining_scanner,/obj/item/device/mining_scanner,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
 "ex" = (/obj/structure/closet/secure_closet/miner,/obj/effect/decal/cleanable/cobweb,/obj/item/weapon/survivalcapsule,/obj/item/weapon/extinguisher/mini,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
 "ey" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
-"ez" = (/obj/machinery/light/small/built{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/machinery/suit_storage_unit/mining{desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open."; isbroken = 0; ispowered = 0; name = "rusted suit storage unit"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
+"ez" = (/obj/machinery/light/small/built{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/machinery/suit_storage_unit/mining{desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open."; name = "rusted suit storage unit"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
 "eA" = (/obj/structure/table,/obj/item/weapon/paper{info = "<center><b>Survival Info For Miners</b></center><br><br><center>The caves are an unforgiving place, the only thing you'll have to traverse is the supplies in your locker and your own wit. Travel in packs when mining and try to shut down the monster dens before they overwhelm you. The job is dangerous but the haul is good, so remember this infomation and hopefully we'll all go home alive.</center>"; name = "work notice"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
 "eB" = (/obj/structure/barricade/wooden,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
 "eC" = (/obj/structure/table,/obj/item/device/gps/mining,/obj/item/device/gps/mining,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
@@ -250,7 +250,7 @@
 "eP" = (/obj/structure/table,/obj/item/weapon/pickaxe{attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; throwforce = 1},/obj/item/weapon/pickaxe{attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; throwforce = 1},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/listeningpost)
 "eQ" = (/obj/machinery/mineral/mint,/turf/simulated/floor/plating/asteroid/basalt{nitrogen = 23; oxygen = 14},/area/awaymission/BMPship)
 "eR" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
-"eS" = (/obj/machinery/light/small/built,/obj/machinery/suit_storage_unit/mining{desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open."; isbroken = 0; ispowered = 0; name = "rusted suit storage unit"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
+"eS" = (/obj/machinery/light/small/built,/obj/machinery/suit_storage_unit/mining{desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open."; name = "rusted suit storage unit"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
 "eT" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/BMPship)
 "eU" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/listeningpost)
 "eV" = (/obj/structure/closet/crate/bin,/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/awaymission/listeningpost)