merge conflict fix

ViktorVil · Oct 5, 2017 · ee3e8d2 · ee3e8d2
2 parents 2ae0380 + f700cb6
commit ee3e8d2
Show file tree

Hide file tree

Showing 882 changed files with 77,057 additions and 8,307 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -125,6 +125,9 @@ var/path_type = /obj/item/baseball_bat
 var/path_type = "/obj/item/baseball_bat"
 ```
 
+### Use var/name format when declaring variables
+While DM allows other ways of declaring variables, this one should be used for consistency.
+
 ### Tabs, not spaces
 You must use tabs to indent your code, NOT SPACES.
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,4 @@
-[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. An example changelog has been provided below for you to edit or remove. If you need help, read https://github.com/tgstation/tgstation/wiki/Changelogs)
-
+[Changelogs]: # (Your PR should contain a detailed changelog of notable changes, titled and categorized appropriately. This includes, new features, sprites, sounds, balance changes, admin tools, map edits, removals, big refactors, config changes, hosting changes and important fixes. An example changelog has been provided below for you to edit. If you need additional help, read https://github.com/tgstation/tgstation/wiki/Changelogs)
 
 :cl: optional name here
 add: Added new things
@@ -8,13 +7,16 @@ del: Removed old things
 tweak: tweaked a few things
 balance: rebalanced something
 fix: fixed a few things
-wip: added a few works in progress
 soundadd: added a new sound thingy
 sounddel: removed an old sound thingy
 imageadd: added some icons and images
 imagedel: deleted some icons and images
 spellcheck: fixed a few typos
-experiment: added an experimental thingy
+code: changed some code
+refactor: refactored some code
+config: changed some config setting
+admin: messed with admin stuff
+server: something server ops should know
 /:cl:
 
 [why]: # (Please add a short description [two lines down] of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding.)
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 language: generic
 sudo: false
-dist: precise
-
 env:
     global:
     - BYOND_MAJOR="511"
@@ -23,12 +21,15 @@ cache:
 
 addons:
   apt:
+    sources:
+      - sourceline: 'ppa:ondrej/php'
     packages:
       - libc6-i386
       - libgcc1:i386
       - libstdc++6:i386
       - python
       - python-pip
+      - php5.6
 
 install:
   - tools/travis/install_build_tools.sh

diff --git a/README.md b/README.md
@@ -137,8 +137,10 @@ See LICENSE-AGPLv3.txt and LICENSE-GPLv3.txt for more details.
 tgui clientside is licensed as a subproject under the MIT license.
 Font Awesome font files, used by tgui, are licensed under the SIL Open Font License v1.1
 tgui assets are licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License](http://creativecommons.org/licenses/by-sa/4.0/).
+The TGS3 API is licensed as a subproject under the MIT license.
 
 See tgui/LICENSE.md for the MIT license.
 See tgui/assets/fonts/SIL-OFL-1.1-LICENSE.md for the SIL Open Font License.
+See the footers of code/\_\_DEFINES/server\_tools.dm, code/modules/server\_tools/st\_commands.dm, and code/modules/server\_tools/st\_inteface.dm for the MIT license.
 
 All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](http://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.
diff --git a/TGS3.json b/TGS3.json
@@ -0,0 +1,22 @@
+{
+    "documentation": "/tg/station server 3 configuration file",
+    "changelog": {
+      "script": "tools/ss13_genchangelog.py",
+      "arguments": "html/changelog.html html/changelogs",
+      "pip_dependancies": [
+        "PyYaml",
+        "beautifulsoup4"
+      ]
+    },
+    "synchronize_paths": [
+      "html/changelog.html",
+      "html/changelogs/*"
+    ],
+    "static_directories": [
+      "config",
+      "data"
+    ],
+    "dlls": [
+      "libmysql.dll"
+    ]
+  }
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
@@ -24,15 +24,6 @@
 /area/ruin/unpowered)
 "g" = (
 /obj/effect/decal/cleanable/blood/old,
-/obj/effect/step_trigger/thrower{
-	name = "south";
-	tiles = 5
-	},
-/obj/effect/step_trigger/sound_effect{
-	name = "turn around";
-	sound = 'sound/hallucinations/turn_around1.ogg';
-	triggerer_only = 1
-	},
 /turf/open/floor/engine/cult{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
@@ -79,16 +70,6 @@
 /area/ruin/unpowered)
 "n" = (
 /obj/effect/decal/cleanable/blood/old,
-/obj/effect/step_trigger/thrower{
-	direction = 4;
-	name = "east";
-	tiles = 5
-	},
-/obj/effect/step_trigger/sound_effect{
-	name = "turn around";
-	sound = 'sound/hallucinations/turn_around1.ogg';
-	triggerer_only = 1
-	},
 /turf/open/floor/engine/cult{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
@@ -117,16 +98,6 @@
 /area/ruin/unpowered)
 "p" = (
 /obj/effect/decal/cleanable/blood/old,
-/obj/effect/step_trigger/thrower{
-	direction = 8;
-	name = "west";
-	tiles = 5
-	},
-/obj/effect/step_trigger/sound_effect{
-	name = "turn around";
-	sound = 'sound/hallucinations/turn_around1.ogg';
-	triggerer_only = 1
-	},
 /turf/open/floor/engine/cult{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
@@ -142,16 +113,6 @@
 /area/ruin/unpowered)
 "r" = (
 /obj/effect/decal/cleanable/blood/old,
-/obj/effect/step_trigger/thrower{
-	direction = 1;
-	name = "north";
-	tiles = 5
-	},
-/obj/effect/step_trigger/sound_effect{
-	name = "turn around";
-	sound = 'sound/hallucinations/turn_around1.ogg';
-	triggerer_only = 1
-	},
 /turf/open/floor/engine/cult{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
@@ -48,7 +48,7 @@
 /area/ruin/unpowered)
 "j" = (
 /obj/machinery/abductor/experiment{
-	team = 100
+	team_number = 100
 	},
 /turf/open/floor/plating/abductor{
 	initial_gas_mix = "o2=16;n2=23;TEMP=300"
@@ -61,7 +61,7 @@
 /area/ruin/unpowered)
 "l" = (
 /obj/machinery/abductor/pad{
-	team = 100
+	team_number = 100
 	},
 /turf/open/floor/plating/abductor{
 	initial_gas_mix = "o2=16;n2=23;TEMP=300"

diff --git a/_maps/basemap.dm b/_maps/basemap.dm
@@ -3,6 +3,7 @@
 #include "map_files\generic\Space.dmm"
 #include "map_files\generic\SpaceDock.dmm"
 #include "map_files\Mining\Lavaland.dmm"
+#include "map_files\generic\City_of_Cogs.dmm"
 
 #ifdef ALL_MAPS
 #include "map_files\debug\runtimestation.dmm"