New CoL Maps/New Resurgence Clan Mob (#2452)

* First commit * Debug Plans * First Comments * NPC + Spawner + Sensor * More actions * New Maps/New NPCs * Name Fixes/Fixer Bossrooms * Fixer name fixes * Changing Maps to TGM * Name/Room Fixes * Tab Fix * Flavor Changes * New Backstreets Template * Drone logic * Killing the Sweeper * heals + overheal * RedBeam * charge update * Tape Changes * Speeches * Fixes * Removing Debug Text * Remove overlay * Last Debug code. * New Backstreetlayout, Priest Room fix * Fixing Job Bug * Nerf Apex * Miniboss Nerf * Light Fix * Fixing Lore * Lore Fix Part 2 * L-Remnant Rooms * Lore Fix Part 3 * Lore Fix 4 * elevator fix * Color Fix * NPC fix * Starting Small Tunnels * BIGGER TUNNELS!!! * Area Fix * Joey Lore * No more stealing NPCs * Small Area Fixes * New/Reworked Rooms * BirdBox Fix --------- Co-authored-by: Anton Zenkov <[email protected]>
vlggms · Nov 4, 2024 · 9977c79 · 9977c79
1 parent bf65271
commit 9977c79
Show file tree

Hide file tree

Showing 56 changed files with 70,413 additions and 122 deletions.
diff --git a/ModularTegustation/Teguicons/resurgence_32x48.dmi b/ModularTegustation/Teguicons/resurgence_32x48.dmi
diff --git a/ModularTegustation/Teguicons/resurgence_64x96.dmi b/ModularTegustation/Teguicons/resurgence_64x96.dmi
diff --git a/ModularTegustation/Teguicons/teaser_mobs.dmi b/ModularTegustation/Teguicons/teaser_mobs.dmi
diff --git a/ModularTegustation/Teguicons/teaser_mobs2.dmi b/ModularTegustation/Teguicons/teaser_mobs2.dmi
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm
@@ -12,7 +12,7 @@
 	centerspawner = FALSE
 	template_width = 20
 	template_height = 20
-	stock = 3
+	stock = 1
 	room_type = "backstreets_bossroom"
 
 /datum/map_template/random_room/backstreets/bossroom/gcorp
@@ -24,3 +24,18 @@
 	name = "Robot - Bossroom"
 	room_id = "robotboss"
 	mappath = "_maps/RandomRooms/backstreets/bossroom/robot.dmm"
+
+/datum/map_template/random_room/backstreets/bossroom/clan_stronghold
+	name = "Clan - Bossroom"
+	room_id = "clan_stronghold"
+	mappath = "_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm"
+
+/datum/map_template/random_room/backstreets/bossroom/flame_fixer
+	name = "Flame - Bossroom"
+	room_id = "flame_fixer"
+	mappath = "_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm"
+
+/datum/map_template/random_room/backstreets/bossroom/metal_fixer
+	name = "Metal - Bossroom"
+	room_id = "metal_fixer"
+	mappath = "_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm
@@ -31,6 +31,16 @@
 	mappath = "_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm"
 
 /datum/map_template/random_room/backstreets/connector/rat_cave
-    name = "Rat - Connector"
-    room_id = "rat_cave"
-    mappath = "_maps/RandomRooms/backstreets/connector/rat_cave.dmm"
+	name = "Rat - Connector"
+	room_id = "rat_cave"
+	mappath = "_maps/RandomRooms/backstreets/connector/rat_cave.dmm"
+
+/datum/map_template/random_room/backstreets/connector/fort_knox
+	name = "Fort - Connector"
+	room_id = "fort_knox"
+	mappath = "_maps/RandomRooms/backstreets/connector/fort_knox.dmm"
+
+/datum/map_template/random_room/backstreets/connector/choke_point
+	name = "Choke Point - Connector"
+	room_id = "choke_point"
+	mappath = "_maps/RandomRooms/backstreets/connector/choke_point.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm
@@ -19,3 +19,8 @@
 	name = "Scorp Vault - Point of Interest"
 	room_id = "scorp_poi"
 	mappath = "_maps/RandomRooms/backstreets/pointofinterest/scorp_vault.dmm"
+
+/datum/map_template/random_room/backstreets/pointofinterest/love_train
+	name = "Love Train - Point of Interest"
+	room_id = "love_train"
+	mappath = "_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm
@@ -45,11 +45,26 @@
 	stock = 3 //Scorp has a lot of these
 	weight = 4 //40% as common
 
+/datum/map_template/random_room/backstreets/large_north/kcorp_warehouse
+	name = "K-Corp warehouse"
+	room_id = "kcorp_warehouse"
+	mappath = "_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm"
+	stock = 1
+	weight = 4
+
 /datum/map_template/random_room/backstreets/large_north/lab_ln
 	name = "Laboratory - Large North"
 	room_id = "lab_ln"
 	mappath = "_maps/RandomRooms/backstreets/large_north/lab_ln.dmm"
 
+/datum/map_template/random_room/backstreets/large_north/electric_room
+	name = "Amber Knight - Large North"
+	room_id = "electric_room"
+	mappath = "_maps/RandomRooms/backstreets/large_north/electric_room.dmm"
+	stock = 1
 
-
-
+/datum/map_template/random_room/backstreets/large_north/town_lna
+	name = "Lovetown - Large North"
+	room_id = "town_lna"
+	mappath = "_maps/RandomRooms/backstreets/large_north/town_lna.dmm"
+	stock = 1
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm
@@ -31,5 +31,12 @@
 	room_id = "robot_castle"
 	mappath = "_maps/RandomRooms/backstreets/large_south/robot_castle.dmm"
 
-
-
+/datum/map_template/random_room/backstreets/large_south/supermarket
+	name = "Supermarket - Large South"
+	room_id = "supermarket"
+	mappath = "_maps/RandomRooms/backstreets/large_south/supermarket.dmm"
+
+/datum/map_template/random_room/backstreets/large_south/gcorp_armory
+	name = "G Corp Armory - Large South"
+	room_id = "gcorp_armory"
+	mappath = "_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm
@@ -30,12 +30,11 @@
 	room_id = "kcorp_storage_me"
 	mappath = "_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm"
 
-
 /datum/map_template/random_room/backstreets/medium_east/zwei_office_mea
 	name = "Zwei Office - Medium East"
 	room_id = "zwei_office_mea"
 	mappath = "_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm"
-  
+
 /datum/map_template/random_room/backstreets/medium_east/church
     name = "Church - Medium East"
     room_id = "church"
@@ -50,4 +49,18 @@
     name = "Robot - Medium East A"
     room_id = "robot_mea"
     mappath = "_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm"
-
+
+/datum/map_template/random_room/backstreets/medium_east/clan_mechs
+    name = "Clan - Medium East A"
+    room_id = "clan_mechs"
+    mappath = "_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm"
+
+/datum/map_template/random_room/backstreets/medium_east/worm_cave
+    name = "Worm Cave - Medium East A"
+    room_id = "worm_cave"
+    mappath = "_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm"
+
+/datum/map_template/random_room/backstreets/medium_east/shrimp_office
+    name = "Shrimp Office - Medium East A"
+    room_id = "shrimp_office"
+    mappath = "_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm
@@ -31,17 +31,40 @@
 	name = "Hana Office - Medium North"
 	room_id = "hana_office_mn"
 	mappath = "_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm"
-  
+
 /datum/map_template/random_room/backstreets/medium_north/rage_cage
-    name = "Rage Cage - Medium North"
-    room_id = "rage_cage"
-    mappath = "_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm"
+	name = "Rage Cage - Medium North"
+	room_id = "rage_cage"
+	mappath = "_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm"
 
 /datum/map_template/random_room/backstreets/medium_north/rat_mna
-    name = "Rat - Medium North A"
-    room_id = "rat_mna"
-    mappath = "_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm"
-
+	name = "Rat - Medium North A"
+	room_id = "rat_mna"
+	mappath = "_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm"
+
+/datum/map_template/random_room/backstreets/medium_north/clan_outskirts
+	name = "Clan - Medium North A"
+	room_id = "clan_outskirts"
+	mappath = "_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm"
+
+/datum/map_template/random_room/backstreets/medium_north/buffet
+	name = "Buffet - Medium North A"
+	room_id = "buffet"
+	mappath = "_maps/RandomRooms/backstreets/medium_north/buffet.dmm"
 
+/datum/map_template/random_room/backstreets/medium_north/fairies
+	name = "Fairies - Medium North A"
+	room_id = "fairies"
+	mappath = "_maps/RandomRooms/backstreets/medium_north/fairies.dmm"
 
+/datum/map_template/random_room/backstreets/medium_north/gmanager_house
+	name = "Manager House - Medium North A"
+	room_id = "gmanager_house"
+	mappath = "_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm"
 
+/datum/map_template/random_room/backstreets/medium_north/lab_ln
+	name = "Strange Lab - Medium North A"
+	room_id = "lab_ln"
+	mappath = "_maps/RandomRooms/backstreets/medium_north/lab_ln.dmm"
+	stock = 1
+	weight = 2 //1/5th as common
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm
@@ -20,7 +20,6 @@
 	room_id = "eyes_temple"
 	mappath = "_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm"
 
-
 /datum/map_template/random_room/backstreets/medium_south/seven_office_msa
 	name = "Seven Office - Medium South A"
 	room_id = "seven_office_msa"
@@ -32,12 +31,41 @@
 	mappath = "_maps/RandomRooms/backstreets/medium_south/bar_msa.dmm"
 
 /datum/map_template/random_room/backstreets/medium_south/rat_msa
-    name = "Rat - Medium South A"
-    room_id = "rat_msa"
-    mappath = "_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm"
+	name = "Rat - Medium South A"
+	room_id = "rat_msa"
+	mappath = "_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm"
 
 /datum/map_template/random_room/backstreets/medium_south/theatre
-    name = "Theatre - Medium South"
-    room_id = "theatre"
-    mappath = "_maps/RandomRooms/backstreets/medium_south/theatre.dmm"
+	name = "Theatre - Medium South"
+	room_id = "theatre"
+	mappath = "_maps/RandomRooms/backstreets/medium_south/theatre.dmm"
+
+/datum/map_template/random_room/backstreets/medium_south/clan_storage
+	name = "Clan - Medium South A"
+	room_id = "clan_storage"
+	mappath = "_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm"
+
+/datum/map_template/random_room/backstreets/medium_south/town_msa
+	name = "Lovetown - Medium South A"
+	room_id = "town_msa"
+	mappath = "_maps/RandomRooms/backstreets/medium_south/town_msa.dmm"
+
+/datum/map_template/random_room/backstreets/medium_south/town_msa
+	name = "Lovetown - Medium South A"
+	room_id = "town_msa"
+	mappath = "_maps/RandomRooms/backstreets/medium_south/town_msa.dmm"
+
+/datum/map_template/random_room/backstreets/medium_south/mech_bay
+	name = "Mech Bay - Medium South A"
+	room_id = "mech_bay"
+	mappath = "_maps/RandomRooms/backstreets/medium_south/mech_bay.dmm"
+
+/datum/map_template/random_room/backstreets/medium_south/lcorp_ruin
+	name = "L Corp Ruin - Medium South A"
+	room_id = "lcorp_ruin"
+	mappath = "_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm"
 
+/datum/map_template/random_room/backstreets/medium_south/apartmentmsa
+	name = "Extra Appartment - Medium South A"
+	room_id = "apartmentmsa"
+	mappath = "_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm
@@ -40,3 +40,34 @@
 	name = "LCorp Office - Medium West"
 	room_id = "lcorp_office_me"
 	mappath = "_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm"
+
+/datum/map_template/random_room/backstreets/medium_west/clan_cages
+	name = "Clan - Medium West A"
+	room_id = "clan_cages"
+	mappath = "_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm"
+
+/datum/map_template/random_room/backstreets/medium_west/priest_room
+	name = "Redeemed Star - Medium West"
+	room_id = "priest_room"
+	mappath = "_maps/RandomRooms/backstreets/medium_west/priest_room.dmm"
+	stock = 1
+
+/datum/map_template/random_room/backstreets/medium_west/town_mwa
+	name = "Lovetown A - Medium West"
+	room_id = "town_mwa"
+	mappath = "_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm"
+
+/datum/map_template/random_room/backstreets/medium_west/town_mwb
+	name = "Lovetown B - Medium West"
+	room_id = "town_mwb"
+	mappath = "_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm"
+
+/datum/map_template/random_room/backstreets/medium_west/mini_beach
+	name = "Mini Beach - Medium West"
+	room_id = "mini_beach"
+	mappath = "_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm"
+
+/datum/map_template/random_room/backstreets/medium_west/chicken_coop
+	name = "Chicken - Medium West"
+	room_id = "chicken_coop"
+	mappath = "_maps/RandomRooms/backstreets/medium_west/chicken_coop.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm
@@ -35,3 +35,12 @@
     room_id = "rat_sea"
     mappath = "_maps/RandomRooms/backstreets/small_east/rat_sea.dmm"
 
+/datum/map_template/random_room/backstreets/small_east/dragon_statue
+    name = "Dragon - Small East A"
+    room_id = "dragon_statue"
+    mappath = "_maps/RandomRooms/backstreets/small_east/dragon_statue.dmm"
+
+/datum/map_template/random_room/backstreets/small_east/paper_pushed
+    name = "Paper - Small East A"
+    room_id = "paper_pushed"
+    mappath = "_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm
@@ -52,6 +52,21 @@
     mappath = "_maps/RandomRooms/backstreets/small_north/snow_forest.dmm"
 
 /datum/map_template/random_room/backstreets/small_north/small_clan_hideout
-    name = "Clan Hideout - Small North"
+    name = "Clan Hideout - Small North A"
     room_id = "small_clan_hideout"
     mappath = "_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm"
+
+/datum/map_template/random_room/backstreets/small_north/grey_parrizan
+    name = "Grey Parrizan - Small North A"
+    room_id = "grey_parrizan"
+    mappath = "_maps/RandomRooms/backstreets/small_north/grey_parrizan.dmm"
+
+/datum/map_template/random_room/backstreets/small_north/apartment_sna
+    name = "Apartment - Small North A"
+    room_id = "apartment_sna"
+    mappath = "_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm"
+
+/datum/map_template/random_room/backstreets/small_north/bird_box
+    name = "Bird Box - Small North A"
+    room_id = "bird_box"
+    mappath = "_maps/RandomRooms/backstreets/small_north/bird_box.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm
@@ -54,3 +54,8 @@
 	name = "Robot - Small South A"
 	room_id = "robot_ssa"
 	mappath = "_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm"
+
+/datum/map_template/random_room/backstreets/small_south/candlelit_dinner
+	name = "Candlelit Dinner - Small South A"
+	room_id = "candlelit_dinner"
+	mappath = "_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm
@@ -44,3 +44,19 @@
 	name = "Robot - Small West B"
 	room_id = "robot_swb"
 	mappath = "_maps/RandomRooms/backstreets/small_west/robot_swb.dmm"
+
+/datum/map_template/random_room/backstreets/small_west/fake_pit
+	name = "Fake Pit - Small West"
+	room_id = "fake_pit"
+	mappath = "_maps/RandomRooms/backstreets/small_west/fake_pit.dmm"
+	stock = 1
+
+/datum/map_template/random_room/backstreets/small_west/risk_rain_reference_robot
+	name = "Risk of Rain Reference - Small West"
+	room_id = "risk_rain_reference_robot"
+	mappath = "_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm"
+
+/datum/map_template/random_room/backstreets/small_west/booby_trapped
+	name = "Booby Trapped - Small West"
+	room_id = "booby_trapped"
+	mappath = "_maps/RandomRooms/backstreets/small_west/booby_trapped.dmm"
diff --git a/ModularTegustation/tegu_items/backstreets/templates.dm b/ModularTegustation/tegu_items/backstreets/templates.dm
@@ -23,3 +23,13 @@
 	name = "Large Template"
 	room_id = "template_large"
 	mappath = "_maps/RandomRooms/backstreetlayout/dungeon_backstreets.dmm"
+
+/datum/map_template/random_room/backstreet_template/tunnels
+	name = "Tunnels Template"
+	room_id = "tunnels_backstreets"
+	mappath = "_maps/RandomRooms/backstreetlayout/tunnels_backstreets.dmm"
+
+/datum/map_template/random_room/backstreet_template/lcorp_ruin
+	name = "L-Corp Ruin Template"
+	room_id = "lcorp_ruin"
+	mappath = "_maps/RandomRooms/backstreetlayout/lcorp_backstreets.dmm"