From 688009dadac51444eb60f8705f54d1ca7169f8b4 Mon Sep 17 00:00:00 2001 From: evilew Date: Tue, 15 Oct 2024 15:17:49 +0200 Subject: [PATCH] readded 2 GS events - readded fattening vent clog - readded cargo snack attack --- GainStation13/code/game/lore_papers.dm | 6 +++ .../modules/events/vent_clog.dm/vent_clog.dm | 27 ++++++++++++++ code/modules/events/shuttle_loan.dm | 37 ++++++++++++++----- tgstation.dme | 1 + 4 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 GainStation13/code/modules/events/vent_clog.dm/vent_clog.dm diff --git a/GainStation13/code/game/lore_papers.dm b/GainStation13/code/game/lore_papers.dm index a879935823..82754112a1 100644 --- a/GainStation13/code/game/lore_papers.dm +++ b/GainStation13/code/game/lore_papers.dm @@ -549,3 +549,9 @@ "} + +//gs13 snack attack shuttle loan + +/obj/item/paper/fluff/chocoslime_research + name = "Stained Research Papers" + info = "AUDIO LOG OF CHOCOLATE SLIME REPORT NO.3. Despite possessing no obvious combat capabilities, the chocolate slime can feed itself to its victim, possibly rupturing its st-- mmhfph- grhm... ...(AUDIO LOG END)." diff --git a/GainStation13/code/modules/events/vent_clog.dm/vent_clog.dm b/GainStation13/code/modules/events/vent_clog.dm/vent_clog.dm new file mode 100644 index 0000000000..3a7c4bd880 --- /dev/null +++ b/GainStation13/code/modules/events/vent_clog.dm/vent_clog.dm @@ -0,0 +1,27 @@ + + +/datum/round_event_control/vent_clog/fattening + name = "Clogged Vents: Fattening" + typepath = /datum/round_event/vent_clog/fattening + max_occurrences = 2 + min_players = 5 + description = "Spits out lipoifier foam through the scrubber system." + +/datum/round_event/vent_clog/fattening + reagentsAmount = 50 + +/datum/round_event/vent_clog/fattening/announce() + priority_announce("The scrubbers network is experiencing an unexpected surge of lipo-related chemicals. Some ejection of contents may occur.", "Atmospherics alert") + +/datum/round_event/vent_clog/fattening/start() + for(var/obj/machinery/atmospherics/components/unary/vent in vents) + if(vent && vent.loc && !vent.welded) + var/datum/reagents/R = new/datum/reagents(1000) + R.my_atom = vent + R.add_reagent(/datum/reagent/consumable/lipoifier, reagentsAmount) + + var/datum/effect_system/foam_spread/foam = new + foam.set_up(200, get_turf(vent), R) + foam.start() + CHECK_TICK + diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 7de9629530..cd53390577 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -1,12 +1,13 @@ -#define HIJACK_SYNDIE 1 -#define RUSKY_PARTY 2 -#define SPIDER_GIFT 3 -#define DEPARTMENT_RESUPPLY 4 -#define ANTIDOTE_NEEDED 5 -#define PIZZA_DELIVERY 6 -#define ITS_HIP_TO 7 -#define MY_GOD_JC 8 -#define DELTA_CRATES 9 +#define SNACK_ATTACK 1 //GS13 +#define HIJACK_SYNDIE 2 +#define RUSKY_PARTY 3 +#define SPIDER_GIFT 4 +#define DEPARTMENT_RESUPPLY 5 +#define ANTIDOTE_NEEDED 6 +#define PIZZA_DELIVERY 7 +#define ITS_HIP_TO 8 +#define MY_GOD_JC 9 +#define DELTA_CRATES 10 /datum/round_event_control/shuttle_loan name = "Shuttle Loan" @@ -32,6 +33,9 @@ var/message = "Cargo: I just wanna tell you techs good luck, we are all counting on you." var/title = "CentCom Free Real Estate" switch(dispatch_type) + if(SNACK_ATTACK) //GS13 + message = "Cargo: Our science division took couple too many samples from one the local candy biohabitats. Would you care to dispose of the unneeded specimen?" + title = "CentCom Science Division" if(HIJACK_SYNDIE) message = "Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache." title = "CentCom Counter Intelligence" @@ -81,6 +85,8 @@ SSshuttle.supply.setTimer(3000) switch(dispatch_type) + if(SNACK_ATTACK) //GS13 + SSshuttle.centcom_message += "Snack attack en route." if(HIJACK_SYNDIE) SSshuttle.centcom_message += "Syndicate hijack team incoming." if(RUSKY_PARTY) @@ -125,6 +131,19 @@ var/list/shuttle_spawns = list() switch(dispatch_type) + if(SNACK_ATTACK) //GS13 + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast) + if(prob(50)) + shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast) + + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange) + shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange) + shuttle_spawns.Add(/obj/item/paper/fluff/chocoslime_research) if(HIJACK_SYNDIE) var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/emergency/specialops] pack.generate(pick_n_take(empty_shuttle_turfs)) diff --git a/tgstation.dme b/tgstation.dme index 6472c5205a..2732e10178 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3976,6 +3976,7 @@ #include "GainStation13\code\modules\client\preferences\preferences.dm" #include "GainStation13\code\modules\clothing\under\jobs\clothing.dm" #include "GainStation13\code\modules\clothing\under\jobs\modcivilian.dm" +#include "GainStation13\code\modules\events\vent_clog.dm\vent_clog.dm" #include "GainStation13\code\modules\food_and_drinks\drinks.dm" #include "GainStation13\code\modules\food_and_drinks\food.dm" #include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm"