diff --git a/aurorastation.dme b/aurorastation.dme index 1d5cc8b6cc7..22f86286ce7 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1585,6 +1585,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\rescue_pod.dm" #include "code\modules\events\rogue_drones.dm" #include "code\modules\events\space_ninja.dm" #include "code\modules\events\spacevine.dm" @@ -1592,6 +1593,7 @@ #include "code\modules\events\spontaneous_appendicitis.dm" #include "code\modules\events\supply_drop.dm" #include "code\modules\events\vent_clog.dm" +#include "code\modules\events\visitor.dm" #include "code\modules\events\wallrot.dm" #include "code\modules\examine\examine.dm" #include "code\modules\ext_scripts\python.dm" diff --git a/code/controllers/subsystems/event.dm b/code/controllers/subsystems/event.dm index b3696ec38d9..d045825c394 100644 --- a/code/controllers/subsystems/event.dm +++ b/code/controllers/subsystems/event.dm @@ -272,6 +272,7 @@ var/datum/controller/subsystem/events/SSevents var/datum/event/E = locate(href_list["stop"]) var/datum/event_meta/EM = E.event_meta log_and_message_admins("has stopped the [severity_to_string[EM.severity]] event '[EM.name]'.") + E.end() E.kill() else if(href_list["view_events"]) selected_event_container = locate(href_list["view_events"]) diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 2ebc0976443..20ba5bc8502 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -22,6 +22,7 @@ /datum/event/blob/tick() if(!Blob || !Blob.loc) Blob = null + end() kill() return if(IsMultiple(activeFor, 3)) diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm index 1b4677a4544..9aee7271d90 100644 --- a/code/modules/events/event.dm +++ b/code/modules/events/event.dm @@ -143,6 +143,8 @@ if(!dummy && isRunning) end() + var/datum/event_container/killed_ec = SSevents.event_containers[severity] + killed_ec.start_event() isRunning = 0 endedAt = world.time diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 02debcb61d3..ce2cff22721 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -7,6 +7,7 @@ #define ASSIGNMENT_MEDICAL "Medical" #define ASSIGNMENT_SCIENTIST "Scientist" #define ASSIGNMENT_SECURITY "Security" +#define ASSIGNMENT_SURGEON "Surgeon" var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT_LEVEL_MODERATE = "Moderate", EVENT_LEVEL_MAJOR = "Major") @@ -129,7 +130,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT // 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, 120), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "APC Damage", /datum/event/apc_damage, 20, list(ASSIGNMENT_ENGINEER = 15)), - new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Brand Intelligence", /datum/event/brand_intelligence, 15, list(ASSIGNMENT_JANITOR = 20), 1), + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Brand Intelligence", /datum/event/brand_intelligence, 0, list(ASSIGNMENT_ENGINEER = 5), 1), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Camera Damage", /datum/event/camera_damage, 20, list(ASSIGNMENT_ENGINEER = 10)), 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, 20, list(ASSIGNMENT_SECURITY = 10), 1), @@ -143,30 +144,31 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Supply Drop", /datum/event/supply_drop, 80), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Golem Rune", /datum/event/supply_drop/golem, 20), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "CCIA General Notice", /datum/event/ccia_general_notice, 300), - new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Mundane Vermin Infestation",/datum/event/infestation, 60, list(ASSIGNMENT_JANITOR = 15, ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 15)) - + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Mundane Vermin Infestation",/datum/event/infestation, 60, list(ASSIGNMENT_JANITOR = 15, ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 15)), + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Visitor", /datum/event/visitor, 50, is_one_shot = TRUE) ) /datum/event_container/moderate severity = EVENT_LEVEL_MODERATE available_events = list( new /datum/event_meta(EVENT_LEVEL_MODERATE, "Nothing", /datum/event/nothing, 200), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Carp School", /datum/event/carp_migration, 50, list(ASSIGNMENT_SECURITY = 25)), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Communication Blackout", /datum/event/communications_blackout, 60), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Electrical Storm", /datum/event/electrical_storm, 50, list(ASSIGNMENT_ENGINEER = 5, ASSIGNMENT_JANITOR = 20)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", /datum/event/spontaneous_appendicitis, 0, list(ASSIGNMENT_SURGEON = 25)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Carp School", /datum/event/carp_migration, 25, list(ASSIGNMENT_SECURITY = 15)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Communication Blackout", /datum/event/communications_blackout, 100), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Electrical Storm", /datum/event/electrical_storm, 50, list(ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_JANITOR = 20)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Gravity Failure", /datum/event/gravity, 100), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grid Check", /datum/event/grid_check, 80), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm", /datum/event/ionstorm, 0, list(ASSIGNMENT_AI = 45, ASSIGNMENT_CYBORG = 25, ASSIGNMENT_ENGINEER = 6, ASSIGNMENT_SCIENTIST = 6)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meteor Shower", /datum/event/meteor_wave/shower, 40, list(ASSIGNMENT_ENGINEER = 13)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Prison Break", /datum/event/prison_break, 0, list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_CYBORG = 20),1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Containment Error - Xenobiology", /datum/event/prison_break/xenobiology, 0, list(ASSIGNMENT_SCIENTIST = 15, ASSIGNMENT_CYBORG = 20),1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Containment Error - Bridge", /datum/event/prison_break/bridge, 0, list(ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_CYBORG = 20),1), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Radiation Storm", /datum/event/radiation_storm, 100), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Radiation Storm", /datum/event/radiation_storm, 100, list(ASSIGNMENT_MEDICAL = 20)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Random Antagonist", /datum/event/random_antag, 0, list(ASSIGNMENT_ANY = 1, ASSIGNMENT_SECURITY = 1),0,10,125, list("Extended")), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rogue Drones", /datum/event/rogue_drone, 50, list(ASSIGNMENT_SECURITY = 25)), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Moderate Spider Infestation", /datum/event/spider_infestation/moderate, 50, list(ASSIGNMENT_SECURITY = 25)), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Moderate Vermin Infestation", /datum/event/infestation/moderate, 30, list(ASSIGNMENT_JANITOR = 15, ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 15)), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", /datum/event/spontaneous_appendicitis, 0, list(ASSIGNMENT_MEDICAL = 5)) + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rogue Drones", /datum/event/rogue_drone, 15, list(ASSIGNMENT_SECURITY = 15)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Moderate Spider Infestation", /datum/event/spider_infestation/moderate, 50, list(ASSIGNMENT_SECURITY = 10)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Moderate Vermin Infestation", /datum/event/infestation/moderate, 30, list(ASSIGNMENT_JANITOR = 15, ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 10)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rescue Pod", /datum/event/rescue_pod, 50, list(ASSIGNMENT_MEDICAL = 10, ASSIGNMENT_SECURITY = 2), is_one_shot = TRUE), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Burglar Pod", /datum/event/rescue_pod/burglar, 50, list(ASSIGNMENT_SECURITY = 5), is_one_shot = TRUE, excluded_roundtypes = list("Extended")) ) /datum/event_container/major @@ -191,3 +193,4 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT #undef ASSIGNMENT_MEDICAL #undef ASSIGNMENT_SCIENTIST #undef ASSIGNMENT_SECURITY +#undef ASSIGNMENT_SURGEON diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index d010fd6cb16..43f6cde39c8 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -123,6 +123,7 @@ var/list/event_last_fired = list() var/list/active_with_role = list() active_with_role["Engineer"] = 0 active_with_role["Medical"] = 0 + active_with_role["Surgeon"] = 0 active_with_role["Security"] = 0 active_with_role["Scientist"] = 0 active_with_role["AI"] = 0 @@ -151,6 +152,8 @@ var/list/event_last_fired = list() if(M.mind.assigned_role in medical_positions) active_with_role["Medical"]++ + if(M.mind.assigned_role == "Surgeon") + active_with_role["Surgeon"]++ if(M.mind.assigned_role in security_positions) active_with_role["Security"]++ diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index 94e049e808b..213ee03bb16 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -31,6 +31,7 @@ var/fake_allowed = 0 while (!fake_allowed) if (E) + E.end() E.kill() qdel(E) E = null @@ -46,5 +47,6 @@ two_part = 1 E.start() + E.end() E.kill() E.announce() \ No newline at end of file diff --git a/code/modules/events/rescue_pod.dm b/code/modules/events/rescue_pod.dm new file mode 100644 index 00000000000..1afeec373c2 --- /dev/null +++ b/code/modules/events/rescue_pod.dm @@ -0,0 +1,31 @@ +/datum/event/rescue_pod + no_fake = 1 + var/spawner_name = "rescuepodsurv" + var/datum/ghostspawner/human/rescuepodsurv/spawner + +/datum/event/rescue_pod/announce() + if(prob(66)) + command_announcement.Announce("The NDV Icarus reports an escape pod inbound to the [station_name()]. Investigate and attend to the situation in accordance with NanoTrasen corporate regulations.", new_title="NDV Icarus", new_sound='sound/AI/escapepod.ogg') + +/datum/event/rescue_pod/setup() + for(var/datum/event/E in typesof(src)) + if(is_type_in_list(E, SSevents.finished_events)) + kill() + return + spawner = SSghostroles.get_spawner(spawner_name) + +/datum/event/rescue_pod/start() + if(istype(spawner)) + spawner.enable() + +/datum/event/rescue_pod/burglar + no_fake = 1 + spawner_name = "burglarpod" + +/datum/event/rescue_pod/burglar/announce() + if(prob(33)) // Make a silent drop more likely since they're spooky burglar + ..() + +/datum/event/rescue_pod/burglar/start() + if(istype(spawner)) + spawner.enable() \ No newline at end of file diff --git a/code/modules/events/visitor.dm b/code/modules/events/visitor.dm new file mode 100644 index 00000000000..cfaa6ec1278 --- /dev/null +++ b/code/modules/events/visitor.dm @@ -0,0 +1,10 @@ +/datum/event/visitor + no_fake = 1 + var/datum/ghostspawner/human/visitor/spawner + +/datum/event/visitor/setup() + spawner = SSghostroles.get_spawner("visitor") + +/datum/event/visitor/start() + if(istype(spawner)) + spawner.enable() diff --git a/code/modules/ghostroles/spawner/human/emergencypod.dm b/code/modules/ghostroles/spawner/human/emergencypod.dm index fe26605ef1a..4b308a12551 100644 --- a/code/modules/ghostroles/spawner/human/emergencypod.dm +++ b/code/modules/ghostroles/spawner/human/emergencypod.dm @@ -1,7 +1,7 @@ /datum/ghostspawner/human/rescuepodsurv short_name = "rescuepodsurv" name = "Rescue Pod Survivor" - desc = "You managed to get into a rescue pod and landed somewhere on a asteroid." + desc = "You managed to get into a rescue pod and landed somewhere on an asteroid." tags = list("External") enabled = FALSE @@ -19,8 +19,6 @@ mob_name = FALSE - enable_chance = 10 - /datum/ghostspawner/human/rescuepodsurv/New() . = ..() var/t = pick(list("star", "priest", "rep", "smuggler", "hunter", "occultist", "pmc")) @@ -233,3 +231,102 @@ /datum/outfit/admin/pod/pmc/get_id_rank() return "Security Officer" +/datum/ghostspawner/human/rescuepodsurv/burglar + short_name = "burglarpod" + name = "Burglar" + desc = "Your last attempt at petty theft went awry, and now you're heading toward an asteroid in a ratty escape pod." + +/datum/ghostspawner/human/rescuepodsurv/burglar/New() + welcome_message = "You're a petty criminal on the run from the law!
After a failed bit of theft and larceny, you've found yourself in an escape pod hurtling toward the [station_name()]. You'll probably end up incarcerated or dead, but...with a great risk comes great rewards. Maybe you can make a big score after all?" + outfit = /datum/outfit/admin/pod/burglar + +/datum/outfit/admin/pod/burglar + name = "RescuePod - Burglar" + + uniform = list( + /obj/item/clothing/under/suit_jacket/really_black, + /obj/item/clothing/under/suit_jacket/charcoal, + /obj/item/clothing/under/suit_jacket/navy, + /obj/item/clothing/under/suit_jacket/burgundy + ) + + belt = null + + shoes = list( + /obj/item/clothing/shoes/laceup/all_species, + /obj/item/clothing/shoes/laceup/brown/all_species + ) + + glasses = list( + /obj/item/clothing/glasses/sunglasses, + /obj/item/clothing/glasses/sunglasses/aviator + ) + + gloves = list( + /obj/item/clothing/gloves/watch, + /obj/item/clothing/gloves/watch/silver, + /obj/item/clothing/gloves/watch/gold, + /obj/item/clothing/gloves/watch/spy + ) + + l_pocket = /obj/item/syndie/teleporter + r_pocket = /obj/item/device/special_uplink/burglar + id = /obj/item/storage/wallet + + r_hand = /obj/item/storage/briefcase/black + + backpack_contents = list() + +/datum/outfit/admin/pod/burglar/post_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if (visualsOnly) + return + + var/static/list/burglar_guns = list( + /obj/item/gun/energy/rifle/icelance, + /obj/item/gun/energy/retro, + /obj/item/gun/projectile/silenced, + /obj/item/gun/projectile/colt, + /obj/item/gun/projectile/revolver/deckard, + /obj/item/gun/projectile/revolver/lemat + ) + + var/new_gun = pick(burglar_guns) + var/obj/item/primary = new new_gun(H.loc) + var/obj/item/clothing/accessory/holster/armpit/holster + + if(primary.slot_flags & SLOT_HOLSTER) + holster = new /obj/item/clothing/accessory/holster/armpit(H.loc) + holster.holstered = primary + primary.forceMove(holster) + else if(!H.belt && (primary.slot_flags & SLOT_BELT)) + H.equip_to_slot_or_del(primary, slot_belt) + else if(!H.back && (primary.slot_flags & SLOT_BACK)) + H.equip_to_slot_or_del(primary, slot_back) + else + H.put_in_any_hand_if_possible(primary) + + if(istype(primary, /obj/item/gun/projectile)) + var/obj/item/gun/projectile/bullet_thrower = primary + var/obj/item/storage/briefcase/B = locate() in H + if(bullet_thrower.magazine_type) + new bullet_thrower.magazine_type(B) + if(prob(20)) //don't want to give them too much + new bullet_thrower.magazine_type(B) + else if(bullet_thrower.ammo_type) + for(var/i in 1 to rand(3, 5) + rand(0, 2)) + new bullet_thrower.ammo_type(B) + H.put_in_hands(B) + + if(holster) + var/obj/item/clothing/under/uniform = H.w_uniform + if(istype(uniform) && uniform.can_attach_accessory(holster)) + uniform.attackby(holster, H) + else + H.put_in_any_hand_if_possible(holster) + + var/obj/item/storage/wallet/W = H.wear_id + var/obj/item/card/id/syndicate/raider/passport = new(H.loc) + passport.name = "[H.real_name]'s Passport" + if(W) + W.handle_item_insertion(passport) diff --git a/code/modules/ghostroles/spawner/human/visitor.dm b/code/modules/ghostroles/spawner/human/visitor.dm index 03a5a3e4a55..fbaf5182ff5 100644 --- a/code/modules/ghostroles/spawner/human/visitor.dm +++ b/code/modules/ghostroles/spawner/human/visitor.dm @@ -20,7 +20,5 @@ mob_name = null - enable_chance = 10 - /datum/ghostspawner/human/visitor/select_spawnlocation(var/use = TRUE) return pick(latejoin) diff --git a/html/changelogs/johnwildkins-events.yml b/html/changelogs/johnwildkins-events.yml new file mode 100644 index 00000000000..5a49566a431 --- /dev/null +++ b/html/changelogs/johnwildkins-events.yml @@ -0,0 +1,10 @@ +author: JohnWildkins + +delete-after: True + +changes: + - tweak: "Rescue Pod and Visitor ghost spawners are now mid-round events, rather than a 10% chance to activate on round start." + - rscadd: "Added a new subtype of Rescue Pod, which sends a single burglar to the Aurora on non-extended rounds." + - tweak: "Decreased chances of Moderate Infestations, Carp Schools, and Rogue Drone events. Increased chances of Radiation Storm, Electrical Storm, and Communication Blackout events." + - tweak: "Changed Appendicitis chance to scale off slotted Surgeons, rather than medical staff. Rampant Brand Intelligence now scales off of engineers rather than janitors." + - rscdel: "Removed powergrid check event from rotation, boosted Electrical Storm chance to compensate." diff --git a/sound/AI/escapepod.ogg b/sound/AI/escapepod.ogg new file mode 100644 index 00000000000..941660ed9f1 Binary files /dev/null and b/sound/AI/escapepod.ogg differ