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

Ion Storm Trigger (#7883)

Browse Source
This commit is contained in:
Guti
2024-03-14 07:49:11 +01:00
committed by GitHub
parent 3a11d212ba
commit ce1162e6c6
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/events/ion_storm.dm
View File

@@ -4,6 +4,7 @@
has_skybox_image = TRUE has_skybox_image = TRUE
announceWhen = -1 // Never (setup may override) announceWhen = -1 // Never (setup may override)
var/botEmagChance = 0 //VOREStation Edit var/botEmagChance = 0 //VOREStation Edit
var/ionBorgs = TRUE // CHOMPStation Edit
var/cloud_hueshift var/cloud_hueshift
var/list/players = list() var/list/players = list()
@@ -53,6 +54,20 @@
to_chat(target, law) to_chat(target, law)
target.add_ion_law(law) target.add_ion_law(law)
target.show_laws() target.show_laws()
ionBorgs = FALSE // CHOMPEdit
// CHOMPEdit Start
if(ionBorgs) // Making sure an AI hasn't been given an Ion law...
for (var/mob/living/silicon/target in silicon_mob_list)
if(!(target.z in affecting_z) || prob(33))
continue
var/law = target.generate_ion_law()
to_chat(target, "<span class='danger'>You have detected a change in your laws information:</span>")
to_chat(target, law)
target.add_ion_law(law)
target.show_laws()
// CHOMPEdit End
/* //VOREstation edit. Was fucking up all PDA messagess. /* //VOREstation edit. Was fucking up all PDA messagess.
if(message_servers) if(message_servers)
for (var/obj/machinery/message_server/MS in message_servers) for (var/obj/machinery/message_server/MS in message_servers)

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

@@ -85,7 +85,7 @@
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grub Infestation", /datum/event/grub_infestation, -20, list(ASSIGNMENT_SECURITY = 40, ASSIGNMENT_ENGINEER = 40), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grub Infestation", /datum/event/grub_infestation, -20, list(ASSIGNMENT_SECURITY = 40, ASSIGNMENT_ENGINEER = 40), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Infected Room", /datum/event/infectedroom, -30, list(ASSIGNMENT_MEDICAL = 30, ASSIGNMENT_JANITOR = 10, ASSIGNMENT_ANY = 1), 1, min_jobs = list(ASSIGNMENT_MEDICAL = 2)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Infected Room", /datum/event/infectedroom, -30, list(ASSIGNMENT_MEDICAL = 30, ASSIGNMENT_JANITOR = 10, ASSIGNMENT_ANY = 1), 1, min_jobs = list(ASSIGNMENT_MEDICAL = 2)),
// Pure RP fun, no mechanical effects. // 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_ENGINEER = 15, ASSIGNMENT_SCIENTIST = 5), min_jobs = list(ASSIGNMENT_AI = 1)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm", /datum/event/ionstorm, -125, list(ASSIGNMENT_AI = 80, ASSIGNMENT_CYBORG = 50, ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_SCIENTIST = 5), min_jobs = list(ASSIGNMENT_SCIENTIST = 1, ASSIGNMENT_CYBORG = 3)),
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, "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, "Maintenance Predator", /datum/event/maintenance_predator, 75, list(ASSIGNMENT_SECURITY = 25, ASSIGNMENT_SCIENTIST = 10), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator", /datum/event/maintenance_predator, 75, list(ASSIGNMENT_SECURITY = 25, ASSIGNMENT_SCIENTIST = 10), 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, "Meaty Ore Shower", /datum/event/meteor_wave/meatyores, -50, list(ASSIGNMENT_ENGINEER = 45), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 2)),