Merge branch 'master' into my-best-friend-is-a-holocarp

Conflicts:
	code/_globalvars/lists/names.dm
	code/modules/mob/living/simple_animal/guardian/types/explosive.dm
	code/modules/mob/living/simple_animal/guardian/types/protector.dm
	code/modules/mob/living/simple_animal/guardian/types/ranged.dm
	code/modules/mob/living/simple_animal/guardian/types/standard.dm
	code/modules/mob/living/simple_animal/guardian/types/support.dm

.travis.yml

@@ -12,7 +12,6 @@ env:
     - DM_MAPFILE="ministation"
     - DM_MAPFILE="dreamstation"
     - DM_MAPFILE="birdstation"
-    - DM_MAPFILE="asteroidstation"
     - DM_MAPFILE="efficiencystation"
 
 
@@ -42,9 +41,9 @@ before_script:
   - cd tgui && npm install && cd ..
   - chmod +x ./install-byond.sh
   - ./install-byond.sh
+  - shopt -s globstar
 
 script:
-  - shopt -s globstar
   - (! grep 'step_[xy]' _maps/**/*.dmm)
   - md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml"
   - tools/check_filedirs.sh tgstation.dme

_maps/RandomRuins/SpaceRuins/asteroid1.dmm

@@ -1,6 +1,6 @@
-"a" = (/turf/space,/area/space)
-"b" = (/turf/simulated/floor/plating/asteroid/airless,/area/space)
-"c" = (/turf/simulated/mineral/random/high_chance,/area/space)
+"a" = (/turf/open/space,/area/space)
+"b" = (/turf/open/floor/plating/asteroid/airless,/area/space)
+"c" = (/turf/closed/mineral/random/high_chance,/area/space)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaa

_maps/RandomRuins/SpaceRuins/asteroid2.dmm

@@ -1,7 +1,7 @@
-"a" = (/turf/space,/area/space)
-"b" = (/turf/simulated/floor/plating/asteroid/airless,/area/space)
-"c" = (/turf/simulated/mineral,/area/space)
-"d" = (/turf/simulated/mineral/random/high_chance,/area/space)
+"a" = (/turf/open/space,/area/space)
+"b" = (/turf/open/floor/plating/asteroid/airless,/area/space)
+"c" = (/turf/closed/mineral,/area/space)
+"d" = (/turf/closed/mineral/random/high_chance,/area/space)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaa

_maps/RandomRuins/SpaceRuins/asteroid3.dmm

@@ -1,9 +1,9 @@
-"a" = (/turf/space,/area/space)
-"b" = (/turf/simulated/floor/plating/asteroid/airless,/area/space)
-"c" = (/turf/simulated/mineral,/area/space)
-"d" = (/turf/simulated/mineral/random/high_chance,/area/space)
-"e" = (/obj/effect/decal/remains/human,/turf/simulated/floor/plating/asteroid/airless,/area/space)
-"f" = (/obj/item/weapon/pickaxe/diamond,/turf/simulated/floor/plating/asteroid/airless,/area/space)
+"a" = (/turf/open/space,/area/space)
+"b" = (/turf/open/floor/plating/asteroid/airless,/area/space)
+"c" = (/turf/closed/mineral,/area/space)
+"d" = (/turf/closed/mineral/random/high_chance,/area/space)
+"e" = (/obj/effect/decal/remains/human,/turf/open/floor/plating/asteroid/airless,/area/space)
+"f" = (/obj/item/weapon/pickaxe/diamond,/turf/open/floor/plating/asteroid/airless,/area/space)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaa

_maps/RandomRuins/SpaceRuins/asteroid4.dmm

@@ -1,18 +1,18 @@
-"a" = (/turf/space,/area/space)
-"b" = (/turf/simulated/mineral,/area/space)
-"c" = (/turf/simulated/mineral/random/high_chance,/area/space)
-"d" = (/turf/simulated/floor/plating/asteroid/airless,/area/space)
-"e" = (/turf/simulated/mineral/clown,/area/space)
-"f" = (/turf/simulated/floor/plating/asteroid,/area/space)
-"g" = (/obj/item/weapon/shard,/obj/item/weapon/paper{info = "Extraction was successful! The disguise was perfect, the clowns never knew what hit 'em! Once I get back to base with the bananium samples I'll be rich, I tell you! RICH!"},/turf/simulated/floor/plating/asteroid,/area/space)
-"h" = (/obj/item/stack/sheet/mineral/bananium{amount = 15},/turf/simulated/floor/plating,/area/space)
-"i" = (/turf/simulated/floor/plating/asteroid,/turf/simulated/wall/shuttle{dir = 2; icon_state = "swall_f10"; layer = 2},/area/space)
-"j" = (/turf/simulated/wall/shuttle{icon_state = "swall3"; dir = 2},/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/simulated/floor/plasteel/shuttle,/area/space)
-"l" = (/obj/structure/chair{dir = 1},/obj/item/weapon/storage/pod{pixel_x = -26},/turf/simulated/floor/plasteel/shuttle,/area/space)
-"m" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/wall/shuttle{icon_state = "swall_f5"; dir = 2},/area/space)
-"n" = (/obj/machinery/door/airlock/shuttle{name = "Escape Pod Airlock"},/turf/simulated/floor/plasteel/shuttle,/area/space)
-"o" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/wall/shuttle{icon_state = "swall_f9"; dir = 2},/area/space)
+"a" = (/turf/open/space,/area/space)
+"b" = (/turf/closed/mineral,/area/space)
+"c" = (/turf/closed/mineral/random/high_chance,/area/space)
+"d" = (/turf/open/floor/plating/asteroid/airless,/area/space)
+"e" = (/turf/closed/mineral/clown,/area/space)
+"f" = (/turf/open/floor/plating/asteroid,/area/space)
+"g" = (/obj/item/weapon/shard,/obj/item/weapon/paper{info = "Extraction was successful! The disguise was perfect, the clowns never knew what hit 'em! Once I get back to base with the bananium samples I'll be rich, I tell you! RICH!"},/turf/open/floor/plating/asteroid,/area/space)
+"h" = (/obj/item/stack/sheet/mineral/bananium{amount = 15},/turf/open/floor/plating,/area/space)
+"i" = (/turf/open/floor/plating/asteroid,/turf/closed/wall/shuttle{dir = 2; icon_state = "swall_f10"; layer = 2},/area/space)
+"j" = (/turf/closed/wall/shuttle{icon_state = "swall3"; dir = 2},/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/open/floor/plasteel/shuttle,/area/space)
+"l" = (/obj/structure/chair{dir = 1},/obj/item/weapon/storage/pod{pixel_x = -26},/turf/open/floor/plasteel/shuttle,/area/space)
+"m" = (/turf/open/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/closed/wall/shuttle{icon_state = "swall_f5"; dir = 2},/area/space)
+"n" = (/obj/machinery/door/airlock/shuttle{name = "Escape Pod Airlock"},/turf/open/floor/plasteel/shuttle,/area/space)
+"o" = (/turf/open/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/closed/wall/shuttle{icon_state = "swall_f9"; dir = 2},/area/space)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaa

_maps/RandomRuins/SpaceRuins/asteroid5.dmm

@@ -1,7 +1,7 @@
-"a" = (/turf/space,/area/space)
-"b" = (/turf/simulated/mineral,/area/ruin/unpowered)
-"c" = (/turf/simulated/mineral/random/high_chance,/area/ruin/unpowered)
-"d" = (/turf/simulated/floor/plating/asteroid/airless,/area/ruin/unpowered)
+"a" = (/turf/open/space,/area/space)
+"b" = (/turf/closed/mineral,/area/ruin/unpowered)
+"c" = (/turf/closed/mineral/random/high_chance,/area/ruin/unpowered)
+"d" = (/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

_maps/RandomRuins/SpaceRuins/derelict1.dmm

@@ -1,21 +1,21 @@
-"a" = (/turf/space,/area/space)
-"b" = (/obj/structure/lattice,/turf/space,/area/space)
-"c" = (/turf/simulated/wall,/area/ruin/unpowered)
-"d" = (/obj/structure/alien/weeds,/obj/structure/alien/resin/membrane,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"e" = (/obj/structure/girder,/obj/structure/alien/weeds,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"f" = (/obj/structure/alien/weeds,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"g" = (/obj/structure/alien/weeds,/obj/structure/table_frame,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"h" = (/obj/structure/alien/weeds/node,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"i" = (/obj/structure/alien/weeds,/obj/structure/bed/nest,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"j" = (/obj/structure/alien/weeds,/obj/structure/bed/nest,/obj/effect/decal/remains/human,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"k" = (/obj/structure/alien/resin/wall,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"l" = (/obj/structure/alien/resin/membrane,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"m" = (/obj/structure/alien/weeds,/obj/structure/table,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"n" = (/obj/structure/alien/weeds,/obj/effect/decal/remains/robot,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"o" = (/obj/structure/alien/weeds/node,/obj/structure/table,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"p" = (/obj/structure/girder,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"q" = (/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
-"r" = (/obj/structure/alien/weeds,/obj/structure/bed/nest,/obj/effect/decal/remains/xeno,/turf/simulated/floor/plating/airless,/area/ruin/unpowered)
+"a" = (/turf/open/space,/area/space)
+"b" = (/obj/structure/lattice,/turf/open/space,/area/space)
+"c" = (/turf/closed/wall,/area/ruin/unpowered)
+"d" = (/obj/structure/alien/weeds,/obj/structure/alien/resin/membrane,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"e" = (/obj/structure/girder,/obj/structure/alien/weeds,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"f" = (/obj/structure/alien/weeds,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"g" = (/obj/structure/alien/weeds,/obj/structure/table_frame,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"h" = (/obj/structure/alien/weeds/node,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"i" = (/obj/structure/alien/weeds,/obj/structure/bed/nest,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"j" = (/obj/structure/alien/weeds,/obj/structure/bed/nest,/obj/effect/decal/remains/human,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"k" = (/obj/structure/alien/resin/wall,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"l" = (/obj/structure/alien/resin/membrane,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"m" = (/obj/structure/alien/weeds,/obj/structure/table,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"n" = (/obj/structure/alien/weeds,/obj/effect/decal/remains/robot,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"o" = (/obj/structure/alien/weeds/node,/obj/structure/table,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"p" = (/obj/structure/girder,/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"q" = (/turf/open/floor/plating/airless,/area/ruin/unpowered)
+"r" = (/obj/structure/alien/weeds,/obj/structure/bed/nest,/obj/effect/decal/remains/xeno,/turf/open/floor/plating/airless,/area/ruin/unpowered)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

_maps/RandomRuins/SpaceRuins/derelict2.dmm

@@ -1,21 +1,21 @@
-"a" = (/turf/space,/area/space)
-"b" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/turf/space,/area/space)
-"c" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/ruin/powered)
-"d" = (/obj/structure/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/space,/area/space)
-"e" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor/plating,/area/ruin/powered)
-"f" = (/turf/simulated/wall,/area/ruin/powered)
-"g" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/ruin/powered)
-"h" = (/obj/machinery/light/small{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plasteel,/area/ruin/powered)
-"i" = (/turf/simulated/floor/plasteel,/area/ruin/powered)
-"j" = (/obj/machinery/light/small{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plasteel,/area/ruin/powered)
-"k" = (/obj/structure/window/reinforced,/turf/space,/area/space)
-"l" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/simulated/floor/plating,/area/ruin/powered)
-"m" = (/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/obj/effect/decal/remains/human,/turf/simulated/floor/plasteel,/area/ruin/powered)
-"n" = (/obj/structure/table,/obj/item/candle{pixel_y = 5},/obj/item/trash/plate{pixel_x = 10},/obj/item/trash/plate{pixel_x = -10},/turf/simulated/floor/plasteel,/area/ruin/powered)
-"o" = (/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/obj/effect/decal/remains/human,/turf/simulated/floor/plasteel,/area/ruin/powered)
-"p" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/space,/area/space)
-"q" = (/obj/machinery/light/small{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor/plasteel,/area/ruin/powered)
-"r" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel,/area/ruin/powered)
+"a" = (/turf/open/space,/area/space)
+"b" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/turf/open/space,/area/space)
+"c" = (/obj/machinery/door/airlock/external,/turf/open/floor/plating,/area/ruin/powered)
+"d" = (/obj/structure/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/open/space,/area/space)
+"e" = (/obj/structure/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/open/floor/plating,/area/ruin/powered)
+"f" = (/turf/closed/wall,/area/ruin/powered)
+"g" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/ruin/powered)
+"h" = (/obj/machinery/light/small{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/open/floor/plasteel,/area/ruin/powered)
+"i" = (/turf/open/floor/plasteel,/area/ruin/powered)
+"j" = (/obj/machinery/light/small{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/open/floor/plasteel,/area/ruin/powered)
+"k" = (/obj/structure/window/reinforced,/turf/open/space,/area/space)
+"l" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/open/floor/plating,/area/ruin/powered)
+"m" = (/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/obj/effect/decal/remains/human,/turf/open/floor/plasteel,/area/ruin/powered)
+"n" = (/obj/structure/table,/obj/item/candle{pixel_y = 5},/obj/item/trash/plate{pixel_x = 10},/obj/item/trash/plate{pixel_x = -10},/turf/open/floor/plasteel,/area/ruin/powered)
+"o" = (/obj/structure/chair{tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8},/obj/effect/decal/remains/human,/turf/open/floor/plasteel,/area/ruin/powered)
+"p" = (/obj/structure/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/open/space,/area/space)
+"q" = (/obj/machinery/light/small{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/open/floor/plasteel,/area/ruin/powered)
+"r" = (/obj/machinery/light/small,/turf/open/floor/plasteel,/area/ruin/powered)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

_maps/RandomRuins/SpaceRuins/derelict3.dmm

@@ -1,8 +1,8 @@
-"a" = (/turf/space,/area/space)
-"b" = (/turf/simulated/floor/plating/airless,/area/space)
-"c" = (/turf/simulated/wall,/area/space)
-"d" = (/obj/structure/lattice,/turf/space,/area/space)
-"e" = (/obj/structure/lattice,/obj/structure/lattice,/turf/space,/area/space)
+"a" = (/turf/open/space,/area/space)
+"b" = (/turf/open/floor/plating/airless,/area/space)
+"c" = (/turf/closed/wall,/area/space)
+"d" = (/obj/structure/lattice,/turf/open/space,/area/space)
+"e" = (/obj/structure/lattice,/obj/structure/lattice,/turf/open/space,/area/space)
 
 (1,1,1) = {"
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa