Merge branch 'master' into make_tgstation_great_again

flangela · Jun 29, 2016 · 5fca5a3 · 5fca5a3
2 parents e8ce9b5 + b7dea04
commit 5fca5a3
Show file tree

Hide file tree

Showing 89 changed files with 2,645 additions and 579 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
@@ -73,7 +73,7 @@
 	pixel_y = 28;
 	shattered = 1
 	},
-/obj/item/weapon/knife/envy,
+/obj/item/weapon/kitchen/knife/envy,
 /turf/open/floor/plating{
 	baseturf = /turf/open/floor/plating/lava/smooth
 	},