Merge branch 'master' of https://github.com/sawu-tg/tgstation

.travis.yml

@@ -16,6 +16,7 @@ env:
     - DM_MAPFILE="dreamstation"
     - DM_MAPFILE="birdstation"
     - DM_MAPFILE="efficiencystation"
+    - DM_MAPFILE="templates"
 
 
 cache:
@@ -43,4 +44,4 @@ before_script:
 script:
   - tools/travis/check_filedirs.sh tgstation.dme
   - tools/travis/build_tools.sh
-  - tools/travis/build_byond.sh
+  - tools/travis/build_byond.sh

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+[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)
+
+
+:cl: optional name here
+add: Added new things
+add: Added more things
+del: Removed old things
+tweak: tweaked a few things
+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
+/:cl:

_maps/.gitignore

@@ -1 +1,2 @@
-backup/
+backup/
+templates.dm

_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm

@@ -516,7 +516,7 @@
 	},
 /area/ruin/powered)
 "bt" = (
-/obj/structure/flora/kirbyplants,
+/obj/item/weapon/twohanded/required/kirbyplants,
 /turf/open/floor/plasteel{
 	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm

@@ -32,7 +32,7 @@
 "g" = (
 /obj/structure/reagent_dispensers/water_cooler{
 	name = "punch cooler";
-	reagent = "bacchus_blessing"
+	reagent_id = "bacchus_blessing"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{

_maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm

@@ -27,7 +27,7 @@
 "h" = (
 /turf/closed/indestructible{
 	desc = "The patterns engraved on the wall seem to shift as you try to focus on them. You feel sick.";
-	icon = 'icons/turf/closed/walls/cult_wall.dmi';
+	icon = 'icons/turf/walls/cult_wall.dmi';
 	icon_state = "cult"
 	},
 /area/ruin/powered)
@@ -111,7 +111,7 @@
 /turf/template_noop,
 /turf/closed/indestructible{
 	desc = "The patterns engraved on the wall seem to shift as you try to focus on them. You feel sick.";
-	icon = 'icons/turf/closed/walls/cult_wall.dmi';
+	icon = 'icons/turf/walls/cult_wall.dmi';
 	icon_state = "cult"
 	},
 /area/ruin/powered)