Add: New waste ruin (#1304)

CeladonSS13 · Dec 28, 2024 · e08052c · e08052c
1 parent f672ace
commit e08052c
Show file tree

Hide file tree

Showing 8 changed files with 7,096 additions and 7 deletions.
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_claw_ruin.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_claw_ruin.dmm
diff --git a/_maps/_mod_celadon/map_catalogue.txt b/_maps/_mod_celadon/map_catalogue.txt
@@ -233,3 +233,7 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		File name = "_maps\RandomRuins\wasteruins\wasteplanet_abandoned_mechbay.dmm"
 		Size = (x = 45)(y = 47)(z = 1)
 		Tags = "Boss Combat Challenge", "Medium Loot", "Shelter", "Hazardous"
+
+		File name = "_maps\_mod_celadon\RandomRuins\WasteRuins\wasteplanet_claw_ruin.dmm"
+		Size = (x = 69)(y = 50)(z = 1)
+		Tags = "Boss Combat Challenge", "Rare Loot", "Shelter", "Hazardous"
diff --git a/mod_celadon/areas/code/ruin.dm b/mod_celadon/areas/code/ruin.dm
@@ -73,3 +73,23 @@
 /area/ruin/space/has_grav/ancientstation/hivebot
 	name = "Hivebot Mothership"
 	icon_state = "xenocell1"
+
+/area/ruin/wasteplanet/secure_claw
+	name = "Laboratory"
+	icon_state = "toxlab"
+
+/area/ruin/wasteplanet/secure_claw/contain
+	name = "Contain area"
+	icon_state = "syndie-control"
+
+/area/ruin/wasteplanet/secure_claw/engineering
+	name = "Engineering area"
+	icon_state = "yellow"
+
+/area/ruin/wasteplanet/secure_claw/control
+	name = "Secure Control area"
+	icon_state = "security"
+
+/area/ruin/wasteplanet/secure_claw/dorm
+	name = "Recreation area"
+	icon_state = "yellow"
diff --git a/mod_celadon/balance/code/hostile_mobs.dm b/mod_celadon/balance/code/hostile_mobs.dm
@@ -834,13 +834,12 @@ GLOBAL_LIST_INIT(onecardinalwest, WEST)
 
 /mob/living/simple_animal/hostile/megafauna/claw
 	armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 60, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
-	crusher_loot = list(/obj/item/card/id/ert/deathsquad,
-						/obj/item/documents/nanotrasen)
+	crusher_loot = list(/obj/item/light_eater)
 
 /mob/living/simple_animal/hostile/megafauna/claw/phase2 //75% of the health this thing has is here
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
-	crusher_loot = list(/obj/effect/spawner/clawloot)
-	loot = list(/obj/effect/spawner/clawloot/crusher)
+	crusher_loot = list(/obj/structure/closet/crate/necropolis/claw_phase_2)
+	loot = list(/obj/structure/closet/crate/necropolis/claw_phase_2)
 
 /mob/living/simple_animal/hostile/megafauna/colossus
 	armor = list("melee" = 0, "bullet" = 30, "laser" = 30, "energy" = 100, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 100, "acid" = 20)

diff --git a/mod_celadon/crusher_trophy/code/megafuna.dm b/mod_celadon/crusher_trophy/code/megafuna.dm
@@ -1,6 +1,4 @@
-/obj/effect/spawner/clawloot/crusher/spawn_loot()
-	new /obj/item/nullrod/tribal_knife(get_turf(src)) //idk what to put here, memed is the loot person // Заменено с армблейда на ритуальный нож
-	return ..()
+
 
 /mob/living/simple_animal/hostile/megafauna/cult_templar // Офы выпилили курсед клэймор
 	crusher_loot = list(/obj/item/melee/sword/claymore, /obj/item/clothing/suit/space/hardsuit/cult/enchanted, /obj/item/upgradescroll)

diff --git a/mod_celadon/maps/code/ruins/ruin.dm b/mod_celadon/maps/code/ruins/ruin.dm
@@ -626,6 +626,12 @@
 	id = "crash_abductor_ship"
 	suffix = "wasteplanet_ruined_abductor_ship.dmm"
 
+/datum/map_template/ruin/wasteplanet/abondoned_containment
+	name = "Abandoned containment area"
+	description = "A containment zone that contains an unknown creature called 'Claws'. For some unknown reason, there is a crashed ship called 'Dareсt' near the containment zone."
+	id = "claw_waste"
+	suffix = "wasteplanet_claw_ruin.dmm"
+
 //							///
 //		Whitesand ruin		///
 //							///

diff --git a/mod_celadon/mobs/_mobs.dme b/mod_celadon/mobs/_mobs.dme
@@ -40,5 +40,6 @@
 #include "code/simple_animal/tele.dm"
 #include "code/simple_animal/plasma_legion.dm"
 #include "code/simple_animal/dragon.dm"
+#include "code/simple_animal/clawloot.dm"
 
 #endif
diff --git a/mod_celadon/mobs/code/simple_animal/clawloot.dm b/mod_celadon/mobs/code/simple_animal/clawloot.dm
@@ -0,0 +1,5 @@
+/obj/structure/closet/crate/necropolis/claw_phase_2
+	name = "Claw Chest"
+
+/obj/structure/closet/crate/necropolis/claw_phase_2/PopulateContents()
+	new /obj/item/minigunpack(src)