Merge branch 'icepost' of https://github.com/goober3/hi-github-portside…

… into icepost
shiptest-ss13 · Dec 3, 2023 · 933fe0b · 933fe0b
2 parents 998bcf2 + 88d843d
commit 933fe0b
Show file tree

Hide file tree

Showing 52 changed files with 101 additions and 614 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
@@ -282,11 +282,6 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "UM" = (
 /obj/structure/table/wood,
-/obj/item/clothing/shoes/cowboy/lizard,
-/obj/item/tailclub{
-	pixel_x = 3;
-	pixel_y = 9
-	},
 /turf/open/floor/plating/asteroid/basalt,
 /area/overmap_encounter/planetoid/cave/explored)
 "Vk" = (

diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -1163,7 +1163,6 @@
 /area/ruin/space/has_grav/powered/macspace)
 "cz" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/snacks/kebab/tail,
 /obj/structure/table/wood/fancy/blue,
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/powered/macspace)

diff --git a/_maps/RandomRuins/SpaceRuins/spacegym.dmm b/_maps/RandomRuins/SpaceRuins/spacegym.dmm
diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
@@ -426,10 +426,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 60)(y = 60)(z = 1)
 		Tags = "Medium Combat Challenge", "Medium Loot", "Inhospitable"
 
-		File Name = "_maps\RandomRuins\SpaceRuins\spacegym.dmm"
-		Size = (x = 12)(y = 12)(z = 1)
-		Tags = "Minor Combat Challenge", "Minor Loot", "Inhospitable"
-
 		File Name = "_maps\RandomRuins\SpaceRuins\transport18.dmm"
 		Size = (x = 51)(y = 23)(z = 1)
 		Tags = "No Combat", "Medium Loot", "Inhospitable"

diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -12926,7 +12926,6 @@
 /obj/structure/closet/crate/trashcart/laundry,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance/two,
-/obj/effect/spawner/lootdrop/lizardboots,
 /obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
 /obj/structure/grille/broken,
 /obj/effect/turf_decal/box/white,

diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -3631,8 +3631,6 @@
 /obj/structure/closet/crate/trashcart,
 /obj/machinery/airalarm/directional/east,
 /obj/machinery/firealarm/directional/south,
-/obj/effect/spawner/lootdrop/spacegym,
-/obj/effect/spawner/lootdrop/spacegym,
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/effect/turf_decal/corner_techfloor_gray{
 	dir = 4

diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
@@ -4935,10 +4935,6 @@
 /obj/machinery/advanced_airlock_controller{
 	pixel_x = 24
 	},
-/obj/item/clothing/shoes/cowboy/lizard{
-	pixel_x = 2;
-	pixel_y = -8
-	},
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /obj/structure/closet/emcloset/anchored,
 /turf/open/floor/plasteel/tech/grid,

diff --git a/_maps/templates/holodeck_thunderdome1218.dmm b/_maps/templates/holodeck_thunderdome1218.dmm
@@ -101,7 +101,6 @@
 /area/template_noop)
 "T" = (
 /obj/structure/table/wood,
-/obj/item/tailclub,
 /obj/item/spear,
 /turf/open/floor/holofloor/asteroid,
 /area/template_noop)

diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.6.2"
+#define TGS_DMAPI_VERSION "6.7.0"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.