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

…o turfs

Conflicts:
	_maps/RandomRuins/SpaceRuins/asteroid4.dmm
	_maps/RandomRuins/SpaceRuins/spacebar.dmm
	_maps/RandomZLevels/Academy.dmm
	_maps/RandomZLevels/beach.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/spacebattle.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/RandomZLevels/wildwest.dmm
	_maps/map_files/AsteroidStation/AsteroidStation.dmm
	_maps/map_files/BirdStation/BirdStation.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/DreamStation/z5.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	_maps/templates/lavaland_surface_ufo_crash.dmm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/structures/lattice.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/mulebot.dm
	code/modules/mob/mob_movement.dm

ISSUE_TEMPLATE.md

@@ -1,7 +1,13 @@
+[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.)
+
+
+[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.)

_maps/RandomRuins/SpaceRuins/asteroid4.dmm

@@ -8,7 +8,7 @@
 "h" = (/obj/item/stack/sheet/mineral/bananium{amount = 15},/turf/floor/plating,/area/space)
 "i" = (/turf/floor/plating/asteroid,/turf/wall/shuttle{dir = 2; icon_state = "swall_f10"; layer = 2},/area/space)
 "j" = (/turf/wall/shuttle{icon_state = "swall3"; dir = 2},/area/space)
-"k" = (/obj/structure/chair{dir = 1},/obj/item/weapon/shard,/obj/effect/landmark/corpse/clown{corpsebrute = 120; corpseoxy = 75},/turf/floor/plasteel/shuttle,/area/space)
+"k" = (/obj/structure/chair{dir = 1},/obj/item/weapon/shard,/obj/effect/mob_spawn/human/clown{brute_damage = 120; oxy_damage = 75},/turf/floor/plasteel/shuttle,/area/space)
 "l" = (/obj/structure/chair{dir = 1},/obj/item/weapon/storage/pod{pixel_x = -26},/turf/floor/plasteel/shuttle,/area/space)
 "m" = (/turf/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/wall/shuttle{icon_state = "swall_f5"; dir = 2},/area/space)
 "n" = (/obj/machinery/door/airlock/shuttle{name = "Escape Pod Airlock"},/turf/floor/plasteel/shuttle,/area/space)

_maps/RandomRuins/SpaceRuins/spacebar.dmm

@@ -18,7 +18,7 @@
 "ar" = (/turf/floor/wood,/area/ruin/powered)
 "as" = (/obj/structure/table,/obj/item/toy/figure/bartender,/turf/floor/wood,/area/ruin/powered)
 "at" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/floor/wood,/area/ruin/powered)
-"au" = (/obj/effect/landmark/corpse/bartender/alive,/turf/floor/wood,/area/ruin/powered)
+"au" = (/obj/effect/mob_spawn/human/bartender/alive,/turf/floor/wood,/area/ruin/powered)
 "av" = (/obj/structure/reagent_dispensers/beerkeg,/turf/floor/wood,/area/ruin/powered)
 "aw" = (/turf/floor/plasteel/shuttle,/area/ruin/unpowered)
 "ax" = (/obj/machinery/door/airlock{name = "Bar Storage"; req_access_txt = "25"},/turf/floor/wood,/area/ruin/powered)

_maps/RandomZLevels/Academy.dmm

@@ -175,7 +175,7 @@
 "ds" = (/obj/structure/chair/wood/normal{dir = 1},/turf/floor/wood,/area/awaymission/academy/classrooms)
 "dt" = (/turf/floor/plasteel{icon_state = "green"; dir = 8},/area/awaymission/academy/classrooms)
 "du" = (/obj/structure/chair/stool,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
-"dv" = (/obj/item/seeds/eggyseed,/obj/machinery/hydroponics/constructable,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
+"dv" = (/obj/item/seeds/eggplant/eggy,/obj/machinery/hydroponics/constructable,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
 "dw" = (/obj/machinery/hydroponics/constructable,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
 "dx" = (/turf/floor/plasteel{icon_state = "green"; dir = 4},/area/awaymission/academy/classrooms)
 "dy" = (/mob/living/simple_animal/hostile/wizard,/turf/floor/plasteel,/area/awaymission/academy/headmaster)
@@ -192,7 +192,7 @@
 "dJ" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/replicapod,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
 "dK" = (/turf/floor/engine/cult,/area/awaymission/academy/academycellar)
 "dL" = (/obj/structure/chair{dir = 8},/turf/floor/plasteel,/area/awaymission/academy/classrooms)
-"dM" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/bluespacetomatoseed,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
+"dM" = (/obj/machinery/hydroponics/constructable,/obj/item/seeds/tomato/blue/bluespace,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
 "dN" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/floor/plasteel,/area/awaymission/academy/classrooms)
 "dO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/floor/plasteel{icon_state = "green"; dir = 4},/area/awaymission/academy/classrooms)
 "dP" = (/obj/machinery/door/airlock/freezer,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/floor/plasteel{icon_state = "white"},/area/awaymission/academy/classrooms)
@@ -620,7 +620,7 @@
 "lV" = (/obj/structure/reagent_dispensers/fueltank,/turf/floor/plating,/area/awaymission/academy/academyengine)
 "lW" = (/obj/structure/ladder/unbreakable/rune{height = 1; id = "academy_storage"},/turf/floor/plating,/area/awaymission/academy/classrooms)
 "lX" = (/obj/structure/ladder/unbreakable/rune{height = 1; id = "academy_coldroom"},/turf/floor/plasteel{icon_state = "white"},/area/awaymission/academy/classrooms)
-"lY" = (/obj/structure/table/wood,/obj/item/seeds/kudzuseed,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
+"lY" = (/obj/structure/table/wood,/obj/item/seeds/kudzu,/turf/floor/plasteel,/area/awaymission/academy/classrooms)
 "lZ" = (/obj/structure/bookcase/random,/turf/floor/wood,/area/awaymission/academy/classrooms)
 "ma" = (/obj/structure/ladder/unbreakable/rune{height = 1; id = "academy_cellar"},/turf/floor/wood,/area/awaymission/academy/classrooms)
 "mb" = (/obj/structure/ladder/unbreakable/rune{height = 1; id = "academy_engine"},/turf/floor/plasteel,/area/awaymission/academy/academyaft)