Merge pull request #5502 from CHOMPStation2/upstream-merge-14294

[MIRROR] Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event

code/_helpers/global_lists_vr.dm

@@ -852,6 +852,100 @@ var/global/list/xenobio_rainbow_extracts = list(
 										/obj/item/slime_extract/rainbow = 1)
 
 
+//// Wildlife lists
+//Listed by-type. Under each type are lists of lists that contain 'groupings' of wildlife. Sorted from 1 to 5 by threat level.
+
+var/global/list/event_wildlife_aquatic = list(
+										list(
+												list(/mob/living/simple_mob/animal/passive/fish/koi = 1,
+													 /mob/living/simple_mob/animal/passive/fish/pike = 2,
+													 /mob/living/simple_mob/animal/passive/fish/perch = 2,
+													 /mob/living/simple_mob/animal/passive/fish/salmon = 2,
+													 /mob/living/simple_mob/animal/passive/fish/trout = 2,
+													 /mob/living/simple_mob/animal/passive/fish/bass = 3),
+												list(/mob/living/simple_mob/animal/passive/fish/salmon = 1),
+												list(/mob/living/simple_mob/animal/passive/fish/perch = 1),
+												list(/mob/living/simple_mob/animal/passive/fish/trout = 1),
+												list(/mob/living/simple_mob/animal/passive/fish/bass = 1),
+												list(/mob/living/simple_mob/animal/passive/fish/pike = 1),
+												list(/mob/living/simple_mob/animal/passive/crab = 1)
+											),
+										list(
+												list(/mob/living/simple_mob/animal/sif/duck = 1),
+												list(/mob/living/simple_mob/animal/passive/fish/measelshark = 1),
+												list(/mob/living/simple_mob/vore/pakkun = 5,
+													 /mob/living/simple_mob/vore/pakkun/snapdragon = 1)
+											),
+										list(
+												list(/mob/living/simple_mob/animal/space/goose = 10,
+													 /mob/living/simple_mob/animal/space/goose/white = 1),
+												list(/mob/living/simple_mob/vore/alienanimals/space_jellyfish = 1)
+											),
+										list(
+												list(/mob/living/simple_mob/animal/sif/hooligan_crab = 1)
+											)
+										)
+
+var/global/list/event_wildlife_roaming = list(
+										list(
+												list(/mob/living/simple_mob/animal/passive/mouse/jerboa = 1,
+													 /mob/living/simple_mob/animal/passive/mouse/black = 2,
+													 /mob/living/simple_mob/animal/passive/mouse/brown = 2,
+													 /mob/living/simple_mob/animal/passive/mouse/gray = 2,
+													 /mob/living/simple_mob/animal/passive/mouse/white = 2,
+													 /mob/living/simple_mob/animal/passive/mouse/rat = 3),
+												list(/mob/living/simple_mob/animal/passive/bird/black_bird = 1,
+													 /mob/living/simple_mob/animal/passive/bird/azure_tit = 1,
+													 /mob/living/simple_mob/animal/passive/bird/european_robin = 1,
+													 /mob/living/simple_mob/animal/passive/bird/goldcrest = 1,
+													 /mob/living/simple_mob/animal/passive/bird/ringneck_dove = 1),
+												list(/mob/living/simple_mob/animal/passive/dog/corgi = 4,
+													 /mob/living/simple_mob/animal/passive/dog/corgi/puppy = 1),
+												list(/mob/living/simple_mob/vore/rabbit = 1),
+												list(/mob/living/simple_mob/vore/redpanda = 14,
+													 /mob/living/simple_mob/vore/redpanda/fae = 7,
+													 /mob/living/simple_mob/vore/redpanda/blue = 1),
+												list(/mob/living/simple_mob/animal/passive/cow = 1),
+												list(/mob/living/simple_mob/animal/passive/chicken = 4,
+													 /mob/living/simple_mob/animal/passive/chick = 1),
+												list(/mob/living/simple_mob/animal/passive/snake = 2,
+													 /mob/living/simple_mob/animal/passive/snake/red = 1,
+													 /mob/living/simple_mob/animal/passive/snake/python = 1)
+											),
+										list(
+												list(/mob/living/simple_mob/vore/horse/big = 7,
+													 /mob/living/simple_mob/vore/horse = 2),
+												list(/mob/living/simple_mob/vore/fennix = 1,
+													 /mob/living/simple_mob/vore/fennec = 4),
+												list(/mob/living/simple_mob/vore/bee = 1),
+												list(/mob/living/simple_mob/animal/passive/fox = 1),
+												list(/mob/living/simple_mob/vore/sheep = 3,
+													 /mob/living/simple_mob/animal/goat = 1),
+												list(/mob/living/simple_mob/vore/hippo = 1),
+												list(/mob/living/simple_mob/vore/alienanimals/dustjumper = 1),
+												list(/mob/living/simple_mob/vore/alienanimals/teppi = 1)
+											),
+										list(
+												list(/mob/living/simple_mob/vore/aggressive/frog = 1),
+												list(/mob/living/simple_mob/tomato = 1),
+												list(/mob/living/simple_mob/animal/wolf = 1),
+												list(/mob/living/simple_mob/vore/aggressive/dino = 1),
+												list(/mob/living/simple_mob/animal/space/bats = 1)
+											),
+										list(
+												list(/mob/living/simple_mob/animal/space/bear = 1),
+												list(/mob/living/simple_mob/vore/aggressive/deathclaw = 1),
+												list(/mob/living/simple_mob/otie = 1),
+												list(/mob/living/simple_mob/vore/aggressive/panther = 1),
+												list(/mob/living/simple_mob/vore/aggressive/rat = 1),
+												list(/mob/living/simple_mob/vore/aggressive/giant_snake = 1),
+												list(/mob/living/simple_mob/vore/aggressive/corrupthound = 1)
+											)
+										)
+
+
+
+
 // AREA GENERATION AND BLUEPRINT STUFF BELOW HERE
 // typecacheof(list) and list() are two completely separate things, don't break!
 

code/game/objects/effects/landmarks_vr.dm

@@ -8,6 +8,10 @@
 /obj/effect/landmark/vermin
 	name = "verminstart"
 
+/obj/effect/landmark/wildlife
+	name = "wildlife"
+	var/wildlife_type = 2		//1 for water, 2 for land; thats all for now
+
 /obj/effect/landmark/late_antag
 	name = "Antag Latespawn"
 	var/antag_id

code/game/turfs/flooring/seasonal.dm

@@ -212,6 +212,10 @@ var/world_time_season
 	tree_chance = 0
 	animal_chance = 0
 	snow_chance = 0
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow
+	tree_chance = 0
+	animal_chance = 0
+	snow_chance = 1
 /turf/simulated/floor/outdoors/grass/seasonal/lowsnow
 	snow_chance = 1
 
@@ -231,5 +235,9 @@ var/world_time_season
 	tree_chance = 0
 	animal_chance = 0
 	snow_chance = 0
+/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow
+	tree_chance = 0
+	animal_chance = 0
+	snow_chance = 1
 /turf/simulated/floor/outdoors/grass/seasonal/dark/lowsnow
 	snow_chance = 1

code/modules/events/roaming_wildlife.dm

@@ -0,0 +1,68 @@
+/datum/event/roaming_wildlife
+	announceWhen = 10
+
+/datum/event/roaming_wildlife/start()
+	var/list/possible_spawns = list()
+	for(var/obj/effect/landmark/C in landmarks_list)
+		if(istype(C, /obj/effect/landmark/wildlife))
+			possible_spawns.Add(C)
+
+	if(!(possible_spawns.len))
+		return
+
+	var/threat_level
+	var/spawn_count
+	var/location_amount
+
+	var/points_to_spend
+
+	switch(severity)
+		if(EVENT_LEVEL_MUNDANE)
+			points_to_spend = 6
+		if(EVENT_LEVEL_MODERATE)
+			points_to_spend = 10
+		if(EVENT_LEVEL_MAJOR)
+			points_to_spend = 14
+
+	if(!points_to_spend)
+		return
+
+	threat_level = rand(1,4)
+	points_to_spend -= threat_level
+	spawn_count = rand(1, min(points_to_spend-1, 9))
+	points_to_spend -= spawn_count
+	location_amount = points_to_spend
+
+	for(var/i = 1, i <= location_amount, i++)
+		if(!(possible_spawns.len))
+			break
+		var/obj/effect/landmark/wildlife/WL = pick(possible_spawns)
+		possible_spawns -= WL
+		var/list/spawn_list
+		switch(WL.wildlife_type)
+			if(1)
+				spawn_list = event_wildlife_aquatic
+			if(2)
+				spawn_list = event_wildlife_roaming
+		if(!spawn_list)
+			continue
+
+		spawn_list = pick(spawn_list[threat_level])
+		var/spawn_type
+		var/spawn_pos = get_turf(WL)
+
+		for(var/j = 1, j <= spawn_count, j++)
+			spawn_type = pickweight(spawn_list)
+			var/mob/living/L = new spawn_type(spawn_pos)
+			step_away(L, WL)
+
+/datum/event/roaming_wildlife/announce()
+	var/message
+	switch(severity)
+		if(EVENT_LEVEL_MUNDANE)
+			message = "Minor movements of local wildlife have been detected within proximity of the facility."
+		if(EVENT_LEVEL_MODERATE)
+			message = "Notable amount of local wildlife has been detected entering area surrounding the facility. Take caution."
+		if(EVENT_LEVEL_MAJOR)
+			message = "A particularly large shift within wildlife movement has been detected. Take caution."
+	command_announcement.Announce(message, "Wildlife Monitoring")

code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm

@@ -325,4 +325,4 @@
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish
 
 /decl/mob_organ_names/fish
-	hit_zones = list("head", "body", "dorsal fin", "left pectoral fin", "right pectoral fin", "tail fin")
+	hit_zones = list("head", "body", "dorsal fin", "left pectoral fin", "right pectoral fin", "tail fin")

code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm

@@ -17,7 +17,7 @@
 	name = "crystal-feather duck"
 	desc = "A glittering flightless bird."
 	tt_desc = "S Anatidae vitriae"
-	catalogue_data = list(/datum/category_item/catalogue/fauna/crystalduck)
+	catalogue_data = list(/datum/category_item/catalogue/fauna/crystalduck)	
 
 	faction = "duck"
 

code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm

@@ -47,6 +47,15 @@
 	icon_dead = "wah_fae_dead"
 	icon_rest = "wah_fae_rest"
 
+	vore_ignores_undigestable = 0	// wah don't care you're edible or not, you still go in
+	vore_digest_chance = 0			// instead of digesting if you struggle...
+	vore_absorb_chance = 20			// you get to become adorable purple wahpudge.
+	vore_bump_chance = 75
+	maxHealth = 100
+	health = 100
+	melee_damage_lower = 10
+	melee_damage_upper = 20
+
 /mob/living/simple_mob/vore/redpanda/blue
 	name = "blue wah"
 	desc = "Blue, but still cute!"

maps/groundbase/groundbase_events.dm

@@ -29,68 +29,58 @@
 	available_events = list(
 		// Severity level, event name, even type, base weight, role weights, one shot, min weight, max weight. Last two only used if set and non-zero
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Nothing",			/datum/event/nothing,			400),
-		// Bluescreens APCs, but they still work
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "APC Damage",		/datum/event/apc_damage,		20, 	list(ASSIGNMENT_ENGINEER = 20), min_jobs = list(ASSIGNMENT_ENGINEER = 1)),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Brand Intelligence",/datum/event/brand_intelligence, 0, 	list(ASSIGNMENT_ENGINEER = 10),	1, min_jobs = list(ASSIGNMENT_ENGINEER = 1)),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Camera Damage",		/datum/event/camera_damage,		20, 	list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_SECURITY = 5), min_jobs = list(ASSIGNMENT_ENGINEER = 1)),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Canister Leak",		/datum/event/canister_leak,		10, 	list(ASSIGNMENT_ENGINEER = 20), min_jobs = list(ASSIGNMENT_ENGINEER = 1)),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Economic News",		/datum/event/economic_event,	300),
-		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lost Carp",			/datum/event/carp_migration, 	0, 		list(ASSIGNMENT_SECURITY = 10), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Money Hacker",		/datum/event/money_hacker, 		0, 		list(ASSIGNMENT_ANY = 4), 1, 10, 25),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Money Lotto",		/datum/event/money_lotto, 		0, 		list(ASSIGNMENT_ANY = 1), 1, 5, 15),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Shipping Error",	/datum/event/shipping_error	, 	30, 	list(ASSIGNMENT_ANY = 2), 0),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Trivial News",		/datum/event/trivial_news, 		400),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lore News",			/datum/event/lore_news, 		400),
-		// Spawns mice, lizards, or dud spiderlings
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 		50,		list(ASSIGNMENT_JANITOR = 25), 1),
-		// Rot only weakens walls, not destroy them
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot",			/datum/event/wallrot, 			0,		list(ASSIGNMENT_ENGINEER = 30), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 1)),
+		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Passing Wildlife",  /datum/event/roaming_wildlife,  30,		list(ASSIGNMENT_SECURITY = 15), min_jobs = list(ASSIGNMENT_SECURITY = 1))
 	)
 	add_disabled_events(list(
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Ian Storm",			/datum/event/ianstorm,	 		1,		list(), 1),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Supply Demand",		/datum/event/supply_demand,		0,		list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Aurora Caelus",		/datum/event/aurora_caelus,		2,		list(), 1),
 		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Space Dust",		/datum/event/dust,	 			0, 		list(ASSIGNMENT_ENGINEER = 20), 0, 0, 50, min_jobs = list(ASSIGNMENT_ENGINEER = 2)),
+		new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lost Carp",			/datum/event/carp_migration, 	0, 		list(ASSIGNMENT_SECURITY = 10), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
 	))
 
 /datum/event_container/moderate/New()
 	available_events = list(
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Nothing",					/datum/event/nothing,					1600),
-		// Leaks gas into an unoccupied room.
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Atmos Leak",				/datum/event/atmos_leak, 				30,		list(ASSIGNMENT_ENGINEER = 25), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 1)),
-		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Carp School",				/datum/event/carp_migration,			0, 		list(ASSIGNMENT_SECURITY = 30), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
-		// Just disables comms for a short while.
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Communication Blackout",	/datum/event/communications_blackout,	500,	list(), 1),
-		// Just blows out a few lights
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Electrical Storm",			/datum/event/electrical_storm, 			70,		list(ASSIGNMENT_ENGINEER = 25, ASSIGNMENT_JANITOR = 100), 1),
-		// Temporary power failure, but mitigatead by subgrids
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grid Check",				/datum/event/grid_check, 				0,		list(ASSIGNMENT_ENGINEER = 25), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 1)),
-		// Pure RP fun, no mechanical effects.
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm",				/datum/event/ionstorm, 					0,		list(ASSIGNMENT_AI = 80, ASSIGNMENT_CYBORG = 50, ASSIGNMENT_SCIENTIST = 20), min_jobs = list(ASSIGNMENT_AI = 1)),
-		// Opens doors in brig.  So just RP fun
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Prison Break",				/datum/event/prison_break,				10,		list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_ENGINEER = 15), 1),
-		// Radiation, but only in space.
-		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rogue Drones",				/datum/event/rogue_drone, 				0,		list(ASSIGNMENT_SECURITY = 20), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Virology Breach",			/datum/event/prison_break/virology,		0,		list(ASSIGNMENT_MEDICAL = 15, ASSIGNMENT_ENGINEER = 15), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Xenobiology Breach",		/datum/event/prison_break/xenobiology,	0,		list(ASSIGNMENT_SCIENTIST = 15, ASSIGNMENT_ENGINEER = 15), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation",		/datum/event/spider_infestation, 		0,		list(ASSIGNMENT_SECURITY = 30), 1, min_jobs = list(ASSIGNMENT_SECURITY = 2)),
-		//Evil grubs that drain station power slightly
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grub Infestation",			/datum/event/grub_infestation,			0,		list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_ENGINEER = 30), 1, min_jobs = list(ASSIGNMENT_SECURITY = 1, ASSIGNMENT_ENGINEER = 1)),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Drone Pod Drop",			/datum/event/drone_pod_drop,			40,		list(ASSIGNMENT_SCIENTIST = 40), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn",				/datum/event/morph_spawn,				75,		list(ASSIGNMENT_ANY = 5), 0),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator",		/datum/event/maintenance_predator,		100,	list(ASSIGNMENT_ANY = 5), 0),
-		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Jellyfish School",			/datum/event/jellyfish_migration,		0,		list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 3), 1, min_jobs = list(ASSIGNMENT_SECURITY = 2)),
+		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Roaming Wildlife",			/datum/event/roaming_wildlife,  		0,		list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 5), min_jobs = list(ASSIGNMENT_SECURITY = 2))
 	)
 	add_disabled_events(list(
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", 			/datum/event/spontaneous_appendicitis, 	0,		list(ASSIGNMENT_MEDICAL = 30), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meteor Shower",			/datum/event/meteor_wave,				30,		list(ASSIGNMENT_ENGINEER = 20)),
-		// Not bad (dorms are shielded) but inconvenient
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Radiation Storm",			/datum/event/radiation_storm, 			50,		list(ASSIGNMENT_MEDICAL = 50), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Random Antagonist",		/datum/event/random_antag,		 		0,	list(ASSIGNMENT_SECURITY = 1), 1, 0, 5),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Supply Demand",			/datum/event/supply_demand,				0,		list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Solar Storm",				/datum/event/solar_storm, 				30,		list(ASSIGNMENT_ENGINEER = 40, ASSIGNMENT_SECURITY = 30), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Gravity Failure",			/datum/event/gravity,	 				75,		list(ASSIGNMENT_ENGINEER = 60), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust",				/datum/event/dust,	 					0,		list(ASSIGNMENT_ENGINEER = 20), 1, 0, 50, min_jobs = list(ASSIGNMENT_ENGINEER = 3)),
+		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Carp School",				/datum/event/carp_migration,			0, 		list(ASSIGNMENT_SECURITY = 30), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
+		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rogue Drones",				/datum/event/rogue_drone, 				0,		list(ASSIGNMENT_SECURITY = 20), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
+		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Jellyfish School",			/datum/event/jellyfish_migration,		0,		list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 3), 1, min_jobs = list(ASSIGNMENT_SECURITY = 2)),
 	))
 
 /datum/event_container/major/New()
@@ -98,15 +88,16 @@
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Nothing",				/datum/event/nothing,				3600),
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Atmos Leak",			/datum/event/atmos_leak, 			20,		list(ASSIGNMENT_ENGINEER = 25), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 1)),
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Space Vines",			/datum/event/spacevine, 			10,		list(ASSIGNMENT_ENGINEER = 3, ASSIGNMENT_GARDENER = 3, ASSIGNMENT_SCIENTIST = 3), 1),
-		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration",		/datum/event/carp_migration,		10,		list(ASSIGNMENT_SECURITY = 5), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach",	/datum/event/prison_break/station,	0,	list(ASSIGNMENT_ENGINEER = 5, ASSIGNMENT_MEDICAL = 5, ASSIGNMENT_SECURITY = 5, ASSIGNMENT_SCIENTIST = 5), 1),
-		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Jellyfish Migration",	/datum/event/jellyfish_migration,	5,	list(ASSIGNMENT_SECURITY = 5, ASSIGNMENT_MEDICAL = 3), 1, min_jobs = list(ASSIGNMENT_SECURITY = 2)),
+		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Amassing Wildlife",	/datum/event/roaming_wildlife,  	0,		list(ASSIGNMENT_SECURITY = 10, ASSIGNMENT_MEDICAL = 3), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3))
 	)
 	add_disabled_events(list(
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Strike",		/datum/event/meteor_strike,			10,		list(ASSIGNMENT_ENGINEER = 15), 1),
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob",				/datum/event/blob, 					10,		list(ASSIGNMENT_ENGINEER = 60), 1),
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Wave",			/datum/event/meteor_wave,			30,		list(ASSIGNMENT_ENGINEER = 15),	1),
 		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Supply Demand",		/datum/event/supply_demand,			0,		list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
+		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Jellyfish Migration",	/datum/event/jellyfish_migration,	5,	list(ASSIGNMENT_SECURITY = 5, ASSIGNMENT_MEDICAL = 3), 1, min_jobs = list(ASSIGNMENT_SECURITY = 2)),
+		new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration",		/datum/event/carp_migration,		10,		list(ASSIGNMENT_SECURITY = 5), 1, min_jobs = list(ASSIGNMENT_SECURITY = 3)),
 	))
 
 #undef ASSIGNMENT_ANY
@@ -117,4 +108,4 @@
 #undef ASSIGNMENT_JANITOR
 #undef ASSIGNMENT_MEDICAL
 #undef ASSIGNMENT_SCIENTIST
-#undef ASSIGNMENT_SECURITY
+#undef ASSIGNMENT_SECURITY

maps/groundbase/southwilds/southwilds1.dmm

@@ -3,6 +3,18 @@
 <<<<<<< HEAD
 /turf/unsimulated/wall/planetary/virgo3c,
 /area/groundbase/wilderness/south)
+=======
+/turf/unsimulated/wall/planetary/normal{
+	desc = "It's quite impassable";
+	icon_state = "rock-dark";
+	name = "impassable rock"
+	},
+/area/submap/groundbase/wilderness/south)
+"b" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/south/unexplored)
+>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife
 "c" = (
 /turf/simulated/floor/water/virgo3c,
 /area/groundbase/wilderness/south)
@@ -23,6 +35,21 @@
 	},
 <<<<<<< HEAD
 /area/groundbase/wilderness/south)
+=======
+/area/submap/groundbase/wilderness/south)
+"e" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/south/unexplored)
+"f" = (
+/obj/effect/landmark/wildlife/water,
+/turf/simulated/floor/water/deep,
+/area/submap/groundbase/wilderness/south)
+"g" = (
+/obj/effect/landmark/wildlife/water,
+/turf/simulated/floor/water,
+/area/submap/groundbase/wilderness/south)
+>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife
 "p" = (
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/wilderness/south)
@@ -66,8 +93,13 @@
 /turf/simulated/floor/water/deep/virgo3c,
 /area/groundbase/wilderness/south)
 "H" = (
+<<<<<<< HEAD
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/wilderness/south/unexplored)
+=======
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/south/unexplored)
+>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife
 "K" = (
 /obj/effect/map_effect/portal/line/side_b,
 /turf/simulated/floor/outdoors/grass/forest/virgo3c,
@@ -1173,7 +1205,7 @@ H
 d
 c
 c
-F
+f
 F
 c
 d
@@ -2126,7 +2158,7 @@ H
 H
 Y
 Y
-Y
+b
 Y
 Y
 Y
@@ -3585,7 +3617,7 @@ Y
 Y
 Y
 Y
-Y
+b
 Y
 Y
 Y
@@ -4554,7 +4586,7 @@ Y
 Y
 Y
 Y
-Y
+b
 H
 d
 c
@@ -4703,7 +4735,7 @@ c
 c
 c
 F
-F
+f
 c
 c
 c
@@ -4914,7 +4946,7 @@ Y
 Y
 Y
 Y
-Y
+b
 Y
 Y
 H
@@ -5155,7 +5187,7 @@ F
 F
 F
 F
-F
+f
 F
 c
 c
@@ -5599,7 +5631,7 @@ Y
 Y
 Y
 Y
-Y
+b
 Y
 Y
 Y
@@ -7300,7 +7332,7 @@ F
 F
 F
 F
-F
+f
 F
 F
 F
@@ -8235,7 +8267,7 @@ H
 Y
 Y
 Y
-Y
+b
 Y
 Y
 Y
@@ -8448,7 +8480,7 @@ H
 Y
 Y
 Y
-Y
+b
 Y
 H
 H
@@ -9752,7 +9784,7 @@ H
 H
 H
 H
-H
+e
 H
 H
 H
@@ -9771,7 +9803,7 @@ H
 Y
 Y
 Y
-Y
+b
 Y
 Y
 Y
@@ -9833,7 +9865,7 @@ H
 Y
 Y
 Y
-Y
+b
 Y
 Y
 Y
@@ -11274,7 +11306,7 @@ H
 H
 Y
 Y
-Y
+b
 Y
 Y
 Y
@@ -12009,7 +12041,7 @@ d
 H
 Y
 Y
-Y
+b
 Y
 H
 H
@@ -12372,7 +12404,7 @@ Y
 Y
 H
 H
-H
+e
 H
 H
 H
@@ -12633,7 +12665,7 @@ H
 H
 H
 H
-H
+e
 H
 H
 H
@@ -13142,7 +13174,7 @@ c
 c
 c
 c
-c
+g
 c
 c
 c
@@ -14381,7 +14413,7 @@ F
 F
 F
 F
-F
+f
 F
 c
 c
@@ -16148,7 +16180,7 @@ Y
 Y
 Y
 Y
-Y
+b
 Y
 Y
 H
@@ -17318,7 +17350,7 @@ H
 H
 H
 Y
-Y
+b
 Y
 Y
 Y
@@ -17474,7 +17506,7 @@ d
 d
 d
 c
-F
+f
 F
 c
 c
@@ -18191,7 +18223,7 @@ d
 d
 H
 Y
-Y
+b
 Y
 Y
 Y
@@ -18428,7 +18460,7 @@ c
 c
 F
 F
-F
+f
 F
 F
 c

maps/groundbase/southwilds/southwilds2.dmm

@@ -6,6 +6,25 @@
 "c" = (
 /turf/simulated/mineral/cave/virgo3c,
 /area/groundbase/wilderness/south/cave)
+=======
+/turf/unsimulated/wall/planetary/normal{
+	desc = "It's quite impassable";
+	icon_state = "rock-dark";
+	name = "impassable rock"
+	},
+/area/submap/groundbase/wilderness/south)
+"b" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/south/unexplored)
+"c" = (
+/turf/simulated/mineral/cave,
+/area/submap/groundbase/wilderness/south/cave)
+"d" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/south/unexplored)
+>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife
 "l" = (
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/wilderness/south)
@@ -3032,7 +3051,7 @@ H
 Y
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -3156,7 +3175,7 @@ c
 H
 H
 Y
-Y
+d
 Y
 H
 c
@@ -4256,7 +4275,7 @@ H
 H
 H
 Y
-Y
+d
 Y
 H
 c
@@ -4344,7 +4363,7 @@ c
 H
 Y
 Y
-Y
+d
 Y
 H
 c
@@ -6739,7 +6758,7 @@ Y
 Y
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -6938,7 +6957,7 @@ c
 c
 c
 H
-H
+b
 H
 H
 c
@@ -7007,7 +7026,7 @@ Y
 Y
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -7102,7 +7121,7 @@ c
 H
 H
 H
-Y
+d
 Y
 Y
 Y
@@ -7543,7 +7562,7 @@ Y
 Y
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -7983,7 +8002,7 @@ H
 H
 H
 Y
-Y
+d
 Y
 Y
 Y
@@ -9848,7 +9867,7 @@ Y
 Y
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -9979,7 +9998,7 @@ Y
 Y
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -10175,7 +10194,7 @@ H
 Y
 Y
 Y
-Y
+d
 H
 H
 H
@@ -10524,7 +10543,7 @@ H
 Y
 Y
 Y
-Y
+d
 Y
 Y
 H
@@ -11829,7 +11848,7 @@ Y
 Y
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -12340,7 +12359,7 @@ H
 H
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -12418,7 +12437,7 @@ Y
 Y
 Y
 Y
-Y
+d
 Y
 H
 H
@@ -13655,7 +13674,7 @@ Y
 Y
 Y
 Y
-Y
+d
 H
 H
 H
@@ -14953,7 +14972,7 @@ H
 H
 H
 Y
-Y
+d
 H
 H
 H
@@ -15898,7 +15917,7 @@ Y
 Y
 Y
 Y
-Y
+d
 Y
 Y
 Y
@@ -16544,7 +16563,7 @@ Y
 Y
 Y
 Y
-Y
+d
 H
 H
 H

maps/groundbase/southwilds/southwilds3.dmm

@@ -24,6 +24,14 @@
 "f" = (
 /turf/simulated/floor/outdoors/grass/seasonal/dark,
 /area/submap/groundbase/poi/wildvillage/plot/square)
+"g" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/south/unexplored)
+"h" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/south/unexplored)
 "j" = (
 /turf/simulated/floor/outdoors/grass/seasonal/dark,
 /area/submap/groundbase/poi/wildvillage/plot/wide)
@@ -3286,7 +3294,7 @@ H
 H
 Y
 Y
-Y
+h
 H
 H
 c
@@ -3443,7 +3451,7 @@ c
 H
 H
 H
-H
+g
 H
 H
 H
@@ -4190,7 +4198,7 @@ H
 H
 H
 Y
-Y
+h
 Y
 H
 H
@@ -4244,7 +4252,7 @@ H
 H
 H
 Y
-Y
+h
 Y
 H
 c
@@ -5705,7 +5713,7 @@ c
 H
 H
 Y
-Y
+h
 H
 H
 H
@@ -6665,7 +6673,7 @@ c
 c
 H
 Y
-Y
+h
 H
 H
 c
@@ -6736,7 +6744,7 @@ Y
 Y
 Y
 Y
-Y
+h
 Y
 Y
 H
@@ -6784,7 +6792,7 @@ c
 c
 c
 H
-H
+g
 H
 c
 c
@@ -9012,7 +9020,7 @@ H
 H
 H
 H
-Y
+h
 Y
 Y
 Y
@@ -10305,7 +10313,7 @@ Y
 Y
 H
 Y
-Y
+h
 H
 H
 H
@@ -12186,7 +12194,7 @@ c
 H
 Y
 Y
-Y
+h
 Y
 Y
 H
@@ -15177,7 +15185,7 @@ Y
 Y
 Y
 H
-H
+g
 H
 H
 c
@@ -15368,7 +15376,7 @@ c
 H
 H
 H
-H
+g
 H
 H
 H
@@ -15965,7 +15973,7 @@ H
 H
 H
 H
-H
+g
 H
 H
 c

maps/groundbase/westwilds/westwilds1.dmm

@@ -1,4 +1,8 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/west/unexplored)
 "ab" = (
 /turf/simulated/wall,
 /area/groundbase/science/outpost/anomaly_testing)
@@ -6237,7 +6241,7 @@ kc
 kc
 kc
 kc
-kc
+aa
 kc
 ia
 ia
@@ -7816,7 +7820,7 @@ kc
 kc
 kc
 kc
-kc
+aa
 kc
 kc
 kc
@@ -8123,7 +8127,7 @@ kc
 kc
 kc
 kc
-kc
+aa
 kc
 kc
 kc
@@ -9983,7 +9987,7 @@ ia
 ia
 kc
 kc
-kc
+aa
 ia
 ia
 ia
@@ -10472,7 +10476,7 @@ kc
 kc
 kc
 kc
-kc
+aa
 kc
 kc
 kc
@@ -11935,7 +11939,7 @@ ia
 ia
 kc
 kc
-kc
+aa
 kc
 kc
 kc
@@ -12908,7 +12912,7 @@ kc
 kc
 kc
 kc
-kc
+aa
 kc
 ia
 ia
@@ -13226,7 +13230,7 @@ kc
 kc
 kc
 kc
-kc
+aa
 kc
 kc
 kc
@@ -13714,7 +13718,7 @@ Xk
 ia
 kc
 kc
-kc
+aa
 kc
 ia
 ia
@@ -14950,7 +14954,7 @@ ia
 ia
 kc
 kc
-kc
+aa
 kc
 kc
 kc
@@ -17343,7 +17347,7 @@ ia
 ia
 ia
 kc
-kc
+aa
 kc
 kc
 kc
@@ -18970,7 +18974,7 @@ ia
 ia
 kc
 kc
-kc
+aa
 kc
 kc
 kc
@@ -20975,7 +20979,7 @@ ia
 ia
 ia
 kc
-kc
+aa
 kc
 kc
 kc

maps/groundbase/westwilds/westwilds2.dmm

@@ -30,6 +30,18 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/science/outpost/anomaly_lab)
+"ae" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/west/unexplored)
+"af" = (
+/obj/effect/landmark/wildlife/water,
+/turf/simulated/floor/water,
+/area/submap/groundbase/wilderness/west/unexplored)
+"ag" = (
+/obj/effect/landmark/wildlife/forest,
+/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow,
+/area/submap/groundbase/wilderness/west/unexplored)
 "am" = (
 /obj/machinery/atmospherics/pipe/simple/visible/blue{
 	dir = 9
@@ -5743,7 +5755,7 @@ YK
 YK
 nr
 nr
-nr
+ae
 nr
 nr
 nr
@@ -7571,7 +7583,7 @@ nr
 YK
 YK
 YK
-YK
+ag
 YK
 YK
 YK
@@ -8042,7 +8054,7 @@ YK
 YK
 YK
 YK
-YK
+ag
 YK
 YK
 nr
@@ -10676,7 +10688,7 @@ nr
 nr
 nr
 nr
-nr
+ae
 YK
 YK
 YK
@@ -11182,7 +11194,7 @@ YK
 YK
 YK
 YK
-YK
+ag
 YK
 YK
 YK
@@ -12259,7 +12271,7 @@ YK
 YK
 YK
 YK
-YK
+ag
 nr
 nr
 nr
@@ -12584,7 +12596,7 @@ YK
 YK
 YK
 YK
-YK
+ag
 YK
 YK
 YK
@@ -14312,7 +14324,7 @@ YK
 YK
 YK
 YK
-nr
+ae
 nr
 nr
 Zm
@@ -14696,7 +14708,7 @@ nr
 YK
 YK
 YK
-YK
+ag
 YK
 YK
 YK
@@ -14794,7 +14806,7 @@ DA
 DA
 DA
 DA
-DA
+af
 DA
 DA
 DA
@@ -18061,7 +18073,7 @@ nr
 nr
 YK
 YK
-YK
+ag
 YK
 YK
 YK
@@ -20707,7 +20719,7 @@ Wl
 nr
 YK
 YK
-YK
+ag
 nr
 nr
 nr

maps/yw/submaps/rogue_mines/groundbase_things.dm

@@ -101,4 +101,14 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks)
 // Shelter Capsule extra restrictions
 /datum/map_template/shelter/New()
 	..()
-	banned_areas += list(/area/groundbase/level3/escapepad)
+	banned_areas += list(/area/groundbase/level3/escapepad)
+
+// Landmarks for wildlife events
+
+/obj/effect/landmark/wildlife/water
+	name = "aquatic wildlife"
+	wildlife_type = 1
+
+/obj/effect/landmark/wildlife/forest
+	name = "roaming wildlife"
+	wildlife_type = 2

vorestation.dme

@@ -2379,6 +2379,7 @@
 #include "code\modules\events\prison_break.dm"
 #include "code\modules\events\radiation_storm.dm"
 #include "code\modules\events\random_antagonist.dm"
+#include "code\modules\events\roaming_wildlife.dm"
 #include "code\modules\events\rogue_drones.dm"
 #include "code\modules\events\shipping_error.dm"
 #include "code\modules\events\solar_storm.dm"