less infight

Foundation-19 · Apr 2, 2024 · 11e8277 · 11e8277
1 parent 97bc621
commit 11e8277
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/_maps/map_files/Pahrump-AB/Dungeons.dmm b/_maps/map_files/Pahrump-AB/Dungeons.dmm
@@ -13015,7 +13015,9 @@
 /obj/structure/stone_tile/slab/cracked{
 	dir = 5
 	},
-/mob/living/simple_animal/hostile/trog/tunneler,
+/mob/living/simple_animal/hostile/trog/tunneler{
+	faction = list("tunneler", "jungle")
+	},
 /turf/open/floor/plasteel/cult,
 /area/f13/underground/cave)
 "gxh" = (
@@ -21973,7 +21975,9 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/vault)
 "ldo" = (
-/mob/living/simple_animal/hostile/trog/tunneler,
+/mob/living/simple_animal/hostile/trog/tunneler{
+	faction = list("tunneler", "jungle")
+	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "ldq" = (
@@ -29963,7 +29967,9 @@
 /turf/open/floor/wood_common,
 /area/f13/underground/cave)
 "oZa" = (
-/mob/living/simple_animal/hostile/trog/tunneler,
+/mob/living/simple_animal/hostile/trog/tunneler{
+	faction = list("tunneler", "jungle")
+	},
 /turf/open/floor/plasteel/cult,
 /area/f13/underground/cave)
 "oZg" = (
@@ -39940,7 +39946,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull,
 /area/f13/enclave)
 "tWF" = (
-/obj/structure/nest/radroach,
+/obj/structure/nest/radroach/jungle,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "tWK" = (
@@ -44010,6 +44016,12 @@
 "vYk" = (
 /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess,
 /area/f13/vault)
+"vYz" = (
+/mob/living/simple_animal/hostile/radroach{
+	faction = list("gecko","critter-friend", "jungle")
+	},
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/tunnel)
 "vYB" = (
 /obj/machinery/light/small{
 	dir = 4;
@@ -64919,7 +64931,7 @@ hrZ
 hrZ
 hrZ
 hrZ
-kxw
+vYz
 kxw
 pif
 hrZ

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/insects.dm b/code/modules/mob/living/simple_animal/hostile/f13/insects.dm
@@ -571,3 +571,6 @@
 	call_backup = /obj/effect/proc_holder/mob_common/summon_backup/small_critter
 	send_mobs = /obj/effect/proc_holder/mob_common/direct_mobs/small_critter
 	. = ..()
+
+/mob/living/simple_animal/hostile/radroach/jungle
+	faction = list("gecko", "critter-friend", "jungle")
diff --git a/fallout/obj/structures/mob_spawners.dm b/fallout/obj/structures/mob_spawners.dm
@@ -189,6 +189,9 @@ GLOBAL_LIST_EMPTY(player_made_nests)
 	swarm_size = 3
 	mob_types = list(/mob/living/simple_animal/hostile/radroach = 15)
 
+/obj/structure/nest/radroach/jungle
+	mob_types = list(/mob/living/simple_animal/hostile/radroach/jungle = 15)
+
 /obj/structure/nest/fireant
 	name = "fireant nest"
 	max_mobs = 2