From 63c49c4e90af3291032204c3a76b5bb9478de631 Mon Sep 17 00:00:00 2001 From: Casey Date: Tue, 3 Jan 2023 16:55:29 -0500 Subject: [PATCH 1/6] Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event --- code/_helpers/global_lists_vr.dm | 94 +++++++++++++++ code/game/objects/effects/landmarks_vr.dm | 4 + code/modules/events/roaming_wildlife.dm | 68 +++++++++++ .../subtypes/animal/passive/fish.dm | 2 +- .../simple_mob/subtypes/animal/sif/duck.dm | 2 +- .../subtypes/animal/sif/hooligan_crab.dm | 2 +- .../simple_mob/subtypes/vore/redpanda.dm | 9 ++ maps/groundbase/eastwilds/eastwilds1.dmm | 79 +++++++++---- maps/groundbase/eastwilds/eastwilds2.dmm | 87 ++++++++++---- maps/groundbase/groundbase_events.dm | 111 ++++++++++++++++++ maps/groundbase/northwilds/northwilds1.dmm | 61 ++++++---- maps/groundbase/northwilds/northwilds2.dmm | 65 ++++++---- maps/groundbase/southwilds/southwilds1.dmm | 84 +++++++++---- maps/groundbase/southwilds/southwilds2.dmm | 62 ++++++---- maps/groundbase/southwilds/southwilds3.dmm | 36 +++--- maps/groundbase/westwilds/westwilds1.dmm | 30 +++-- maps/groundbase/westwilds/westwilds2.dmm | 36 ++++-- .../submaps/rogue_mines/groundbase_things.dm | 12 +- vorestation.dme | 1 + 19 files changed, 664 insertions(+), 181 deletions(-) create mode 100644 code/modules/events/roaming_wildlife.dm create mode 100644 maps/groundbase/groundbase_events.dm diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 32e7668f33..50c500fd64 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/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! diff --git a/code/game/objects/effects/landmarks_vr.dm b/code/game/objects/effects/landmarks_vr.dm index a45cea7593..ea6424265a 100644 --- a/code/game/objects/effects/landmarks_vr.dm +++ b/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 diff --git a/code/modules/events/roaming_wildlife.dm b/code/modules/events/roaming_wildlife.dm new file mode 100644 index 0000000000..2bdfe3863e --- /dev/null +++ b/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") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm index 582b304935..4dd631d5d7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm @@ -11,7 +11,7 @@ icon = 'icons/mob/fish.dmi' item_state = "fish" - catalogue_data = list(/datum/category_item/catalogue/fauna/invasive_fish) + //catalogue_data = list(/datum/category_item/catalogue/fauna/invasive_fish) //TODO: write non-sif lore mob_size = MOB_SMALL // So fish are actually underwater. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm index 31b25ee36f..35548509f7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm +++ b/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) TODO: Write non-sif lore faction = "duck" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm index 9831ac3769..5317cd72f4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm @@ -27,7 +27,7 @@ name = "hooligan crab" desc = "A large, hard-shelled crustacean. This one is mostly grey. \ You probably shouldn't mess with it." - catalogue_data = list(/datum/category_item/catalogue/fauna/hooligan_crab) + //catalogue_data = list(/datum/category_item/catalogue/fauna/hooligan_crab) //TODO: write non-sif lore icon_state = "sif_crab" icon_living = "sif_crab" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm index dea6250b16..1ab50769ea 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm +++ b/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!" diff --git a/maps/groundbase/eastwilds/eastwilds1.dmm b/maps/groundbase/eastwilds/eastwilds1.dmm index 00bb091653..09462dee70 100644 --- a/maps/groundbase/eastwilds/eastwilds1.dmm +++ b/maps/groundbase/eastwilds/eastwilds1.dmm @@ -32,7 +32,22 @@ outdoors = 0 }, /area/submap/groundbase/wilderness/east) +<<<<<<< HEAD >>>>>>> 79258d98bc... Merge pull request #13749 from Heroman3003/pakkun +======= +"g" = ( +/obj/effect/landmark/wildlife/water, +/turf/simulated/floor/water, +/area/submap/groundbase/wilderness/east) +"h" = ( +/obj/effect/landmark/wildlife/forest, +/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow, +/area/submap/groundbase/wilderness/east/unexplored) +"i" = ( +/obj/effect/landmark/wildlife/water, +/turf/simulated/floor/water/deep, +/area/submap/groundbase/wilderness/east) +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife "l" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/wilderness/east/unexplored) @@ -49,8 +64,13 @@ /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/wilderness/east) "r" = ( +<<<<<<< HEAD /turf/simulated/mineral/cave/virgo3c, /area/groundbase/wilderness/east/cave) +======= +/turf/simulated/mineral/cave, +/area/submap/groundbase/wilderness/east/cave) +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife "w" = ( /obj/effect/map_effect/portal/master/side_a/gb_wilds/east_west{ dir = 8 @@ -64,6 +84,7 @@ ======= /turf/simulated/mineral/ignore_cavegen/virgo3c, /area/submap/groundbase/wilderness/east) +<<<<<<< HEAD "B" = ( /obj/effect/landmark{ name = "carpspawn" @@ -71,6 +92,8 @@ /turf/simulated/floor/water/virgo3c, /area/submap/groundbase/wilderness/east) >>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs +======= +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife "F" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/wilderness/east/unexplored) @@ -851,7 +874,7 @@ Z U U U -U +i U U U @@ -1456,7 +1479,7 @@ U U Z Z -Z +g Z Z Z @@ -3885,7 +3908,7 @@ U U Z Z -Z +g Z Z V @@ -4239,7 +4262,7 @@ Z Z Z Z -Z +g U U U @@ -4716,7 +4739,7 @@ U U Z Z -Z +g Z Z V @@ -4891,7 +4914,7 @@ F F l l -l +h l l l @@ -5830,7 +5853,7 @@ l l l l -l +h l l l @@ -6523,7 +6546,7 @@ U U U U -U +i Z Z Z @@ -7263,7 +7286,7 @@ V Z Z Z -Z +g Z Z V @@ -8001,7 +8024,7 @@ U Z Z Z -Z +g Z Z Z @@ -8602,7 +8625,7 @@ l l l l -l +h l l l @@ -9008,7 +9031,7 @@ l l l l -l +h l l l @@ -9821,7 +9844,7 @@ l l l l -l +h l l l @@ -10932,7 +10955,7 @@ U U U U -U +i U Z Z @@ -11517,7 +11540,7 @@ Z Z Z Z -Z +g Z Z Z @@ -12114,7 +12137,7 @@ U U U Z -Z +g Z Z Z @@ -12342,7 +12365,7 @@ Z Z Z Z -Z +g Z Z Z @@ -13412,7 +13435,7 @@ l l l l -l +h l F F @@ -13665,7 +13688,7 @@ Z U U U -U +i Z Z Z @@ -13790,6 +13813,10 @@ Z Z U U +<<<<<<< HEAD +U +======= +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife U U U @@ -13801,6 +13828,10 @@ Z Z Z Z +<<<<<<< HEAD +Z +======= +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife Z Z Z @@ -14468,7 +14499,7 @@ F l l l -l +h l l l @@ -15090,7 +15121,7 @@ l l l l -l +h l l F @@ -15472,7 +15503,7 @@ l l l l -l +h l l l @@ -15786,7 +15817,7 @@ Z Z Z Z -Z +g Z Z Z @@ -18358,7 +18389,7 @@ l l l l -l +h l F F diff --git a/maps/groundbase/eastwilds/eastwilds2.dmm b/maps/groundbase/eastwilds/eastwilds2.dmm index 287d56b34b..8bc2cc10e9 100644 --- a/maps/groundbase/eastwilds/eastwilds2.dmm +++ b/maps/groundbase/eastwilds/eastwilds2.dmm @@ -12,8 +12,29 @@ /obj/effect/map_effect/portal/line/side_b{ dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/water/virgo3c, /area/groundbase/wilderness/east) +======= +/turf/simulated/floor/water, +/area/submap/groundbase/wilderness/east) +"e" = ( +/obj/effect/landmark/wildlife/water, +/turf/simulated/floor/water/deep, +/area/submap/groundbase/wilderness/east) +"f" = ( +/obj/effect/landmark/wildlife/forest, +/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow, +/area/submap/groundbase/wilderness/east/unexplored) +"g" = ( +/obj/effect/landmark/wildlife/water, +/turf/simulated/floor/water, +/area/submap/groundbase/wilderness/east) +"h" = ( +/obj/effect/landmark/wildlife/forest, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, +/area/submap/groundbase/wilderness/east/unexplored) +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife "l" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/wilderness/east/cave) @@ -40,8 +61,13 @@ /obj/effect/map_effect/portal/line/side_b{ dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/water/deep/virgo3c, /area/groundbase/wilderness/east) +======= +/turf/simulated/floor/water/deep, +/area/submap/groundbase/wilderness/east) +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife "F" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/wilderness/east/unexplored) @@ -49,8 +75,13 @@ /obj/effect/map_effect/portal/master/side_a/gb_wilds/east_west{ dir = 8 }, +<<<<<<< HEAD /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/wilderness/east) +======= +/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow, +/area/submap/groundbase/wilderness/east) +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife "V" = ( /obj/effect/map_effect/portal/master/side_b/gb_wilds/east{ dir = 4 @@ -3373,7 +3404,7 @@ Z Z Z t -t +e t Z Z @@ -5419,7 +5450,7 @@ b b b b -b +f F F F @@ -5682,7 +5713,7 @@ F F F F -b +f b b b @@ -5938,7 +5969,7 @@ b b b b -b +f b b b @@ -7115,7 +7146,7 @@ b b b b -b +f b b b @@ -7230,7 +7261,11 @@ Z t t t +<<<<<<< HEAD t +======= +e +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife t t t @@ -7767,7 +7802,7 @@ Z t t t -t +e t t Z @@ -8980,7 +9015,7 @@ Z Z Z Z -Z +g Z t t @@ -9140,7 +9175,7 @@ t t t Z -Z +g Z Z Z @@ -9433,7 +9468,7 @@ n F F F -F +h F F l @@ -9798,7 +9833,7 @@ b b b b -b +f b b b @@ -10108,7 +10143,7 @@ b b b b -b +f b b b @@ -10337,7 +10372,7 @@ b b b b -b +f b b b @@ -11529,7 +11564,7 @@ Z Z Z Z -Z +g Z Z Z @@ -12892,7 +12927,7 @@ Z Z Z Z -Z +g Z Z Z @@ -13900,7 +13935,7 @@ b b b b -b +f b b b @@ -14204,7 +14239,7 @@ Z Z Z Z -Z +g t t t @@ -14233,7 +14268,7 @@ t t t t -t +e t t t @@ -15634,7 +15669,7 @@ F F F b -b +f b b F @@ -16032,9 +16067,13 @@ Z Z Z Z +<<<<<<< HEAD +Z +======= +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife Z Z -Z +g Z Z Z @@ -16357,6 +16396,10 @@ Z Z t t +<<<<<<< HEAD +t +======= +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife t t t @@ -16384,7 +16427,7 @@ t t t t -Z +g Z Z n @@ -17289,7 +17332,7 @@ F F F b -b +f b b F @@ -18459,7 +18502,7 @@ l l F F -F +h b b F diff --git a/maps/groundbase/groundbase_events.dm b/maps/groundbase/groundbase_events.dm new file mode 100644 index 0000000000..5cf4f0d561 --- /dev/null +++ b/maps/groundbase/groundbase_events.dm @@ -0,0 +1,111 @@ +#define ASSIGNMENT_ANY "Any" +#define ASSIGNMENT_AI "AI" +#define ASSIGNMENT_CYBORG "Cyborg" +#define ASSIGNMENT_ENGINEER "Engineer" +#define ASSIGNMENT_GARDENER "Botanist" +#define ASSIGNMENT_JANITOR "Janitor" +#define ASSIGNMENT_MEDICAL "Medical" +#define ASSIGNMENT_SCIENTIST "Scientist" +#define ASSIGNMENT_SECURITY "Security" + +// +// VOREStation overrides to the default event manager configuration. +// +// This file lets us configure which events we want in the rotation without conflicts with upstream. +// It works because the actual event containers don't define New(), allowing us to use New() to replace +// the lists of available events. If they ever do define New() this will need to be changed. +// +// Specifically the change is to move events we don't want down into the disabled_events list +// + +// Adds a list of pre-disabled events to the available events list. +// This keeps them in the rotation, but disabled, so they can be enabled with a click if desired that round. +/datum/event_container/proc/add_disabled_events(var/list/disabled_events) + for(var/datum/event_meta/EM in disabled_events) + EM.enabled = 0 + available_events += EM + +/datum/event_container/mundane/New() + 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), + 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, "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), + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 50, list(ASSIGNMENT_JANITOR = 25), 1), + 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), + 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, "Communication Blackout", /datum/event/communications_blackout, 500, list(), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Electrical Storm", /datum/event/electrical_storm, 70, list(ASSIGNMENT_ENGINEER = 25, ASSIGNMENT_JANITOR = 100), 1), + 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)), + 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)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Prison Break", /datum/event/prison_break, 10, list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_ENGINEER = 15), 1), + 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)), + 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, "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)), + 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() + available_events = list( + 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, "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, "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 +#undef ASSIGNMENT_AI +#undef ASSIGNMENT_CYBORG +#undef ASSIGNMENT_ENGINEER +#undef ASSIGNMENT_GARDENER +#undef ASSIGNMENT_JANITOR +#undef ASSIGNMENT_MEDICAL +#undef ASSIGNMENT_SCIENTIST +#undef ASSIGNMENT_SECURITY diff --git a/maps/groundbase/northwilds/northwilds1.dmm b/maps/groundbase/northwilds/northwilds1.dmm index e586ac7bea..38fc4401a5 100644 --- a/maps/groundbase/northwilds/northwilds1.dmm +++ b/maps/groundbase/northwilds/northwilds1.dmm @@ -1,7 +1,24 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( +<<<<<<< HEAD /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/wilderness/north) +======= +/turf/unsimulated/wall/planetary/normal{ + desc = "It's quite impassable"; + icon_state = "rock-dark"; + name = "impassable rock" + }, +/area/submap/groundbase/wilderness/north) +"b" = ( +/obj/effect/landmark/wildlife/forest, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, +/area/submap/groundbase/wilderness/north/unexplored) +"c" = ( +/obj/effect/landmark/wildlife/forest, +/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow, +/area/submap/groundbase/wilderness/north/unexplored) +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife "d" = ( /obj/effect/map_effect/portal/line/side_b{ dir = 1 @@ -2125,7 +2142,7 @@ X X X X -X +c X X X @@ -3672,7 +3689,7 @@ K K X X -X +c X X X @@ -4266,7 +4283,7 @@ M M K K -X +c X X K @@ -5850,7 +5867,7 @@ K X X X -X +c X K K @@ -6669,7 +6686,7 @@ X X X X -X +c X K K @@ -7253,7 +7270,7 @@ M M K X -X +c X K M @@ -7639,7 +7656,7 @@ X X X X -X +c X X X @@ -8615,7 +8632,7 @@ K K K X -X +c X X X @@ -9270,7 +9287,7 @@ K K K X -X +c X X X @@ -10574,7 +10591,7 @@ X X K K -K +b K K K @@ -10877,7 +10894,7 @@ K X X X -X +c X X X @@ -11538,7 +11555,7 @@ X X X X -X +c X X X @@ -11635,7 +11652,7 @@ M K K X -K +b K K M @@ -12083,7 +12100,7 @@ K K X X -X +c X X X @@ -13768,7 +13785,7 @@ M M K K -X +c X X X @@ -14026,7 +14043,7 @@ K K K X -X +c K K M @@ -15027,7 +15044,7 @@ K K K X -X +c X X X @@ -15480,7 +15497,7 @@ X X X X -X +c X X X @@ -15500,7 +15517,7 @@ K X X X -X +c X X X @@ -15992,7 +16009,7 @@ X X X X -X +c X X X @@ -16649,7 +16666,7 @@ X X X X -X +c X X X @@ -17167,7 +17184,7 @@ X X X X -X +c X X X diff --git a/maps/groundbase/northwilds/northwilds2.dmm b/maps/groundbase/northwilds/northwilds2.dmm index 18d11228fa..7f4f1afd89 100644 --- a/maps/groundbase/northwilds/northwilds2.dmm +++ b/maps/groundbase/northwilds/northwilds2.dmm @@ -1,7 +1,24 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( +<<<<<<< HEAD /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/wilderness/north) +======= +/turf/unsimulated/wall/planetary/normal{ + desc = "It's quite impassable"; + icon_state = "rock-dark"; + name = "impassable rock" + }, +/area/submap/groundbase/wilderness/north) +"b" = ( +/obj/effect/landmark/wildlife/forest, +/turf/simulated/floor/outdoors/grass/seasonal/dark/notrees_nomobs_lowsnow, +/area/submap/groundbase/wilderness/north/unexplored) +"c" = ( +/obj/effect/landmark/wildlife/forest, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, +/area/submap/groundbase/wilderness/north/unexplored) +>>>>>>> 9faf154bbb... Merge pull request #14294 from Heroman3003/roaming-wildlife "d" = ( /obj/effect/map_effect/portal/line/side_b{ dir = 1 @@ -1409,7 +1426,7 @@ K K K X -X +b X K K @@ -1776,7 +1793,7 @@ K K X X -X +b X X K @@ -2011,7 +2028,7 @@ K K K K -K +c K K K @@ -3266,7 +3283,7 @@ X X K K -X +b X X X @@ -3877,7 +3894,7 @@ X X X X -X +b X X X @@ -3944,7 +3961,7 @@ o K X X -X +b X K K @@ -6038,7 +6055,7 @@ o o K K -X +b K o o @@ -6425,7 +6442,7 @@ X X X X -X +b X K K @@ -6726,7 +6743,7 @@ o o K X -K +c o o m @@ -6970,7 +6987,7 @@ X X K K -X +b X X X @@ -7080,7 +7097,7 @@ o o K K -K +c K o o @@ -7190,7 +7207,7 @@ o o K X -X +b K K o @@ -10438,7 +10455,7 @@ K X X X -X +b X K K @@ -10669,7 +10686,7 @@ o K K X -X +b X K K @@ -10739,7 +10756,7 @@ o K K X -X +b K K o @@ -11116,7 +11133,7 @@ o o K X -X +b K o o @@ -11351,7 +11368,7 @@ X X X K -K +c K K K @@ -11618,7 +11635,7 @@ o o X X -X +b K K o @@ -12886,7 +12903,7 @@ X X X X -X +b X X X @@ -14744,7 +14761,7 @@ K K X X -X +b X K K @@ -15142,7 +15159,7 @@ K K X X -X +b X X X @@ -15552,7 +15569,7 @@ X X K K -K +c X X X @@ -17340,7 +17357,7 @@ K K X X -X +b X X K @@ -17730,7 +17747,7 @@ X X X X -X +b X X K diff --git a/maps/groundbase/southwilds/southwilds1.dmm b/maps/groundbase/southwilds/southwilds1.dmm index 9788032938..315d182869 100644 --- a/maps/groundbase/southwilds/southwilds1.dmm +++ b/maps/groundbase/southwilds/southwilds1.dmm @@ -1,7 +1,20 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( +<<<<<<< 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) @@ -9,7 +22,23 @@ /turf/simulated/floor/beach/sand/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< 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) @@ -32,8 +61,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, @@ -1106,7 +1140,7 @@ H d c c -F +f F c d @@ -2059,7 +2093,7 @@ H H Y Y -Y +b Y Y Y @@ -3518,7 +3552,7 @@ Y Y Y Y -Y +b Y Y Y @@ -4487,7 +4521,7 @@ Y Y Y Y -Y +b H d c @@ -4636,7 +4670,7 @@ c c c F -F +f c c c @@ -4847,7 +4881,7 @@ Y Y Y Y -Y +b Y Y H @@ -5088,7 +5122,7 @@ F F F F -F +f F c c @@ -5532,7 +5566,7 @@ Y Y Y Y -Y +b Y Y Y @@ -7233,7 +7267,7 @@ F F F F -F +f F F F @@ -8168,7 +8202,7 @@ H Y Y Y -Y +b Y Y Y @@ -8381,7 +8415,7 @@ H Y Y Y -Y +b Y H H @@ -9685,7 +9719,7 @@ H H H H -H +e H H H @@ -9704,7 +9738,7 @@ H Y Y Y -Y +b Y Y Y @@ -9766,7 +9800,7 @@ H Y Y Y -Y +b Y Y Y @@ -11207,7 +11241,7 @@ H H Y Y -Y +b Y Y Y @@ -11942,7 +11976,7 @@ d H Y Y -Y +b Y H H @@ -12305,7 +12339,7 @@ Y Y H H -H +e H H H @@ -12566,7 +12600,7 @@ H H H H -H +e H H H @@ -13075,7 +13109,7 @@ c c c c -c +g c c c @@ -14314,7 +14348,7 @@ F F F F -F +f F c c @@ -16081,7 +16115,7 @@ Y Y Y Y -Y +b Y Y H @@ -17251,7 +17285,7 @@ H H H Y -Y +b Y Y Y @@ -17407,7 +17441,7 @@ d d d c -F +f F c c @@ -18124,7 +18158,7 @@ d d H Y -Y +b Y Y Y @@ -18361,7 +18395,7 @@ c c F F -F +f F F c diff --git a/maps/groundbase/southwilds/southwilds2.dmm b/maps/groundbase/southwilds/southwilds2.dmm index b3aeb2e3b7..889661e099 100644 --- a/maps/groundbase/southwilds/southwilds2.dmm +++ b/maps/groundbase/southwilds/southwilds2.dmm @@ -1,10 +1,30 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( +<<<<<<< HEAD /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/wilderness/south) "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) @@ -2978,7 +2998,7 @@ H Y Y Y -Y +d Y Y Y @@ -3102,7 +3122,7 @@ c H H Y -Y +d Y H c @@ -4202,7 +4222,7 @@ H H H Y -Y +d Y H c @@ -4290,7 +4310,7 @@ c H Y Y -Y +d Y H c @@ -6685,7 +6705,7 @@ Y Y Y Y -Y +d Y Y Y @@ -6884,7 +6904,7 @@ c c c H -H +b H H c @@ -6953,7 +6973,7 @@ Y Y Y Y -Y +d Y Y Y @@ -7048,7 +7068,7 @@ c H H H -Y +d Y Y Y @@ -7489,7 +7509,7 @@ Y Y Y Y -Y +d Y Y Y @@ -7929,7 +7949,7 @@ H H H Y -Y +d Y Y Y @@ -9794,7 +9814,7 @@ Y Y Y Y -Y +d Y Y Y @@ -9925,7 +9945,7 @@ Y Y Y Y -Y +d Y Y Y @@ -10121,7 +10141,7 @@ H Y Y Y -Y +d H H H @@ -10470,7 +10490,7 @@ H Y Y Y -Y +d Y Y H @@ -11775,7 +11795,7 @@ Y Y Y Y -Y +d Y Y Y @@ -12286,7 +12306,7 @@ H H Y Y -Y +d Y Y Y @@ -12364,7 +12384,7 @@ Y Y Y Y -Y +d Y H H @@ -13601,7 +13621,7 @@ Y Y Y Y -Y +d H H H @@ -14899,7 +14919,7 @@ H H H Y -Y +d H H H @@ -15844,7 +15864,7 @@ Y Y Y Y -Y +d Y Y Y @@ -16490,7 +16510,7 @@ Y Y Y Y -Y +d H H H diff --git a/maps/groundbase/southwilds/southwilds3.dmm b/maps/groundbase/southwilds/southwilds3.dmm index cfa03d4587..460e16d50a 100644 --- a/maps/groundbase/southwilds/southwilds3.dmm +++ b/maps/groundbase/southwilds/southwilds3.dmm @@ -20,6 +20,14 @@ "f" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /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/forest/virgo3c, /area/submap/groundbase/poi/wildvillage/plot/wide) @@ -3282,7 +3290,7 @@ H H Y Y -Y +h H H c @@ -3439,7 +3447,7 @@ c H H H -H +g H H H @@ -4186,7 +4194,7 @@ H H H Y -Y +h Y H H @@ -4240,7 +4248,7 @@ H H H Y -Y +h Y H c @@ -5701,7 +5709,7 @@ c H H Y -Y +h H H H @@ -6661,7 +6669,7 @@ c c H Y -Y +h H H c @@ -6732,7 +6740,7 @@ Y Y Y Y -Y +h Y Y H @@ -6780,7 +6788,7 @@ c c c H -H +g H c c @@ -9008,7 +9016,7 @@ H H H H -Y +h Y Y Y @@ -10301,7 +10309,7 @@ Y Y H Y -Y +h H H H @@ -12182,7 +12190,7 @@ c H Y Y -Y +h Y Y H @@ -15173,7 +15181,7 @@ Y Y Y H -H +g H H c @@ -15364,7 +15372,7 @@ c H H H -H +g H H H @@ -15961,7 +15969,7 @@ H H H H -H +g H H c diff --git a/maps/groundbase/westwilds/westwilds1.dmm b/maps/groundbase/westwilds/westwilds1.dmm index c594711843..7927923888 100644 --- a/maps/groundbase/westwilds/westwilds1.dmm +++ b/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) @@ -5789,7 +5793,7 @@ kc kc kc kc -kc +aa kc ia ia @@ -7368,7 +7372,7 @@ kc kc kc kc -kc +aa kc kc kc @@ -7675,7 +7679,7 @@ kc kc kc kc -kc +aa kc kc kc @@ -9535,7 +9539,7 @@ ia ia kc kc -kc +aa ia ia ia @@ -10024,7 +10028,7 @@ kc kc kc kc -kc +aa kc kc kc @@ -11487,7 +11491,7 @@ ia ia kc kc -kc +aa kc kc kc @@ -12460,7 +12464,7 @@ kc kc kc kc -kc +aa kc ia ia @@ -12778,7 +12782,7 @@ kc kc kc kc -kc +aa kc kc kc @@ -13266,7 +13270,7 @@ Xk ia kc kc -kc +aa kc ia ia @@ -14502,7 +14506,7 @@ ia ia kc kc -kc +aa kc kc kc @@ -16895,7 +16899,7 @@ ia ia ia kc -kc +aa kc kc kc @@ -18522,7 +18526,7 @@ ia ia kc kc -kc +aa kc kc kc @@ -20527,7 +20531,7 @@ ia ia ia kc -kc +aa kc kc kc diff --git a/maps/groundbase/westwilds/westwilds2.dmm b/maps/groundbase/westwilds/westwilds2.dmm index 4a821d801a..6d052b74e8 100644 --- a/maps/groundbase/westwilds/westwilds2.dmm +++ b/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 @@ -5235,7 +5247,7 @@ YK YK nr nr -nr +ae nr nr nr @@ -7063,7 +7075,7 @@ nr YK YK YK -YK +ag YK YK YK @@ -7534,7 +7546,7 @@ YK YK YK YK -YK +ag YK YK nr @@ -10168,7 +10180,7 @@ nr nr nr nr -nr +ae YK YK YK @@ -10674,7 +10686,7 @@ YK YK YK YK -YK +ag YK YK YK @@ -11751,7 +11763,7 @@ YK YK YK YK -YK +ag nr nr nr @@ -12076,7 +12088,7 @@ YK YK YK YK -YK +ag YK YK YK @@ -13804,7 +13816,7 @@ YK YK YK YK -nr +ae nr nr Zm @@ -14188,7 +14200,7 @@ nr YK YK YK -YK +ag YK YK YK @@ -14286,7 +14298,7 @@ DA DA DA DA -DA +af DA DA DA @@ -17553,7 +17565,7 @@ nr nr YK YK -YK +ag YK YK YK @@ -20199,7 +20211,7 @@ Wl nr YK YK -YK +ag nr nr nr diff --git a/maps/yw/submaps/rogue_mines/groundbase_things.dm b/maps/yw/submaps/rogue_mines/groundbase_things.dm index 9bcd693cc6..0530007d71 100644 --- a/maps/yw/submaps/rogue_mines/groundbase_things.dm +++ b/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) \ No newline at end of file + 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 \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index eb4532d842..90ec720cd2 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2378,6 +2378,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" From f77af8a678d2401b2db96345ec31266b71eba9f3 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 4 Jan 2023 21:10:26 -0500 Subject: [PATCH 2/6] powder that makes you say yes --- .../mob/living/simple_mob/subtypes/animal/passive/fish.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm index 4dd631d5d7..f21bf8db1f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm @@ -11,7 +11,7 @@ icon = 'icons/mob/fish.dmi' item_state = "fish" - //catalogue_data = list(/datum/category_item/catalogue/fauna/invasive_fish) //TODO: write non-sif lore + catalogue_data = list(/datum/category_item/catalogue/fauna/invasive_fish) mob_size = MOB_SMALL // So fish are actually underwater. @@ -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") \ No newline at end of file + hit_zones = list("head", "body", "dorsal fin", "left pectoral fin", "right pectoral fin", "tail fin") From c2d29045f0ab4697d8a7b0ce276a303918ffbb01 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 4 Jan 2023 21:10:46 -0500 Subject: [PATCH 3/6] powder that makes you say yes --- code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm index 35548509f7..ba46bc56dc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm +++ b/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) TODO: Write non-sif lore + catalogue_data = list(/datum/category_item/catalogue/fauna/crystalduck) faction = "duck" From 129aec333e4dd5e7603d61c87038011a1811c245 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 4 Jan 2023 21:11:22 -0500 Subject: [PATCH 4/6] powder that makes you say yes --- .../mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm index 5317cd72f4..9831ac3769 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm @@ -27,7 +27,7 @@ name = "hooligan crab" desc = "A large, hard-shelled crustacean. This one is mostly grey. \ You probably shouldn't mess with it." - //catalogue_data = list(/datum/category_item/catalogue/fauna/hooligan_crab) //TODO: write non-sif lore + catalogue_data = list(/datum/category_item/catalogue/fauna/hooligan_crab) icon_state = "sif_crab" icon_living = "sif_crab" From ad7736593720f4a0cc543d449dca1b2b3186b8db Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 4 Jan 2023 21:48:16 -0500 Subject: [PATCH 5/6] powder that makes you say yes --- code/game/turfs/flooring/seasonal.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/turfs/flooring/seasonal.dm b/code/game/turfs/flooring/seasonal.dm index c6bb51a319..142ca72ca4 100644 --- a/code/game/turfs/flooring/seasonal.dm +++ b/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 From 8eeeeb43558dd1bd51987a069775bf84e4501c6d Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 4 Jan 2023 22:01:22 -0500 Subject: [PATCH 6/6] powder that makes you say yes --- code/game/turfs/flooring/seasonal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/flooring/seasonal.dm b/code/game/turfs/flooring/seasonal.dm index 142ca72ca4..4c7d8e5b79 100644 --- a/code/game/turfs/flooring/seasonal.dm +++ b/code/game/turfs/flooring/seasonal.dm @@ -212,7 +212,7 @@ var/world_time_season tree_chance = 0 animal_chance = 0 snow_chance = 0 -turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow tree_chance = 0 animal_chance = 0 snow_chance = 1