cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

MinorFixes (#7528)

Browse Source
This commit is contained in:
FluffMedic
2024-01-10 17:01:24 -05:00
committed by GitHub
parent 5a697e0533
commit b891446b40
4 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modular_chomp/code/modules/event/event_container_ch.dm
View File

@@ -102,6 +102,7 @@
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Xenobiology Breach", /datum/event/prison_break/xenobiology, 0, list(ASSIGNMENT_SCIENCE = 100), 1, min_jobs = list(ASSIGNMENT_SCIENTIST = 1), min_jobs = list(ASSIGNMENT_SCIENTIST = 1, ASSIGNMENT_SECURITY =1)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Jellyfish School", /datum/event/jellyfish_migration, 5, list(ASSIGNMENT_ANY = 1, ASSIGNMENT_SECURITY = 5, ASSIGNMENT_MEDICAL = 3), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meaty Ore Shower", /datum/event/meteor_wave/meatyores, -50, list(ASSIGNMENT_ENGINEER = 45), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 2)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Exotic Infestation", /datum/event/dangerinfestation, -30, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_SCIENCE = 5, ASSIGNMENT_ANY = 2)),
)
add_disabled_events(list(
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meteor Shower", /datum/event/meteor_wave, 30, list(ASSIGNMENT_ENGINEER = 20), min_jobs = list(ASSIGNMENT_ENGINEER = 3)),
@@ -111,7 +112,6 @@
//Spacedust doesn't work, commenting this out.
//new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 0, list(ASSIGNMENT_ENGINEER = 20), 1, 0, 50),
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, "Exotic Infestation", /datum/event/dangerinfestation, -30, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_SCIENCE = 5, ASSIGNMENT_ANY = 2)),
//Check if wormhole code is good and then move to enabled.
// new /datum/event_meta(EVENT_LEVEL_MODERATE, "Wormholes", /datum/event/wormholes, 20, list(ASSIGNMENT_ANY = 5)),
// new /datum/event_meta(EVENT_LEVEL_MODERATE, "Lost Spiders", /datum/event/spider_migration, 0, list(ASSIGNMENT_SECURITY = 30), 1), //YW EDIT //CHOMPStation Edit: Moved to disabled. This is a YW feature that spawns spiders on carp spawns.

10
modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm
View File

@@ -325,7 +325,7 @@
vore_default_mode = DM_DIGEST
/mob/living/simple_mob/vore/solarray
/mob/living/simple_mob/vore/spacecritter/solarray
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/raymeat
meat_amount = 8
@@ -347,7 +347,7 @@
/obj/item/stack/material/wisp = 1
)
/mob/living/simple_mob/vore/livingice
/mob/living/simple_mob/vore/spacecritter/livingice
meat_type = /obj/item/stack/material/snow
meat_amount = 18
@@ -369,7 +369,7 @@
/obj/item/stack/material/frostscale = 1
)
/mob/living/simple_mob/vore/radcrab
/mob/living/simple_mob/vore/spacecritter/radcrab
meat_type = /obj/item/weapon/reagent_containers/food/snacks/crabmeat
meat_amount = 8
@@ -391,7 +391,7 @@
/obj/item/stack/material/crystalscale = 1
)
/mob/living/simple_mob/vore/dreameel
/mob/living/simple_mob/vore/spacecritter/dreameel
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/eelmeat
meat_amount = 2
@@ -413,7 +413,7 @@
/obj/item/stack/material/dreamscale = 1
)
/mob/living/simple_mob/vore/gravityshell
/mob/living/simple_mob/vore/spacecritter/gravityshell
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/gravityshell
meat_amount = 8