From 7873f4b4f58709af3c965cbcbd6187e8b38f8f63 Mon Sep 17 00:00:00 2001 From: Archie Date: Fri, 29 Oct 2021 14:45:32 -0300 Subject: [PATCH 1/6] Jaq commits tax fraud --- code/modules/holiday/halloween/bartholomew.dm | 39 +++++++++++++++++-- code/modules/holiday/halloween/jacqueen.dm | 14 +------ code/modules/holiday/holidays.dm | 7 +--- tgstation.dme | 1 + 4 files changed, 41 insertions(+), 20 deletions(-) diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm index aa119dca8..68f658661 100644 --- a/code/modules/holiday/halloween/bartholomew.dm +++ b/code/modules/holiday/halloween/bartholomew.dm @@ -1,3 +1,21 @@ +/datum/round_event_control/bartholomew + name = "Bartholomew's visit" + holidayID = "Bartholomew" + typepath = /datum/round_event/bartholomew + weight = -1 //forces it to be called, regardless of weight + max_occurrences = 1 + earliest_start = 0 MINUTES + +/datum/round_event/bartholomew/start() + ..() + + for(var/mob/living/carbon/human/H in GLOB.carbon_list) + playsound(H, 'sound/spookoween/ahaha.ogg', 100, 0.25) + + for(var/obj/effect/landmark/barthpot/bp in GLOB.landmarks_list) + new /obj/item/barthpot(bp.loc) + //new /mob/living/simple_animal/jacq(bp.loc) + /obj/effect/landmark/barthpot name = "barthpot" @@ -35,7 +53,7 @@ if(!active) say("Meow!") return - say("Hello there, I'm Bartholomew, Jacqueline's Familiar.") + say("Hello there, I'm Bartholomew, the pumkin witch's Familiar.") sleep(20) say("I'm currently seeking items to put into my pot, if we get the right items, it should crystalise into a magic candy!") @@ -55,14 +73,16 @@ sleep(15) say("[message]") sleep(15) - //To help people find her + if(prob(5)) + say("Also, Jacqueen kinda got arrested for not paying taxes, if you're looking for her. But don't worry, we've plenty of candy to make.") + /*//To help people find her for(var/mob/living/simple_animal/jacq/J in GLOB.simple_animals[1]) var/turf/L1 = J.loc if(!L1) //Incase someone uh.. puts her in a locker return var/area/L2 = L1.loc if(L2) - say("Also, it seems that Jacqueline is currently at the [L2], if you're looking for her too.") + say("Also, it seems that Jacqueline is currently at the [L2], if you're looking for her too.")*/ /obj/item/barthpot/proc/generate_items() var/length = LAZYLEN(items_list) @@ -148,6 +168,18 @@ items_list += item return TRUE +//Candies +/obj/item/reagent_containers/food/snacks/special_candy + name = "Magic candy" + icon = 'icons/obj/halloween_items.dmi' + icon_state = "jacq_candy" + desc = "A candy with strange magic within. Be careful, as the magic isn't always helpful." + +/obj/item/reagent_containers/food/snacks/special_candy/Initialize() + .=..() + reagents.add_reagent(get_random_reagent_id(), 5) + +/* /obj/item/pinpointer/jacq name = "The Jacq-Tracq" desc = "A handheld tracking device that locks onto witchy signals." @@ -156,3 +188,4 @@ for(var/mob/living/simple_animal/jacq/J in GLOB.simple_animals[1]) target = J ..() +*/ diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index f25a090f4..ba6412570 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -8,6 +8,7 @@ #define JACQ_DATE (1<<6) /////// EVENT +/* /datum/round_event_control/jacqueen name = "Jacqueline's visit" holidayID = "jacqueen" @@ -25,7 +26,7 @@ for(var/obj/effect/landmark/barthpot/bp in GLOB.landmarks_list) new /obj/item/barthpot(bp.loc) new /mob/living/simple_animal/jacq(bp.loc) - +*/ /////// MOBS //Whacha doing in here like? Yae wan tae ruin ta magicks? @@ -468,14 +469,3 @@ s.set_up(src.reagents, 3, src.loc) s.start() qdel(src) - -//Candies -/obj/item/reagent_containers/food/snacks/special_candy - name = "Magic candy" - icon = 'icons/obj/halloween_items.dmi' - icon_state = "jacq_candy" - desc = "A candy with strange magic within. Be careful, as the magic isn't always helpful." - -/obj/item/reagent_containers/food/snacks/special_candy/Initialize() - .=..() - reagents.add_reagent(get_random_reagent_id(), 5) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 8abcd70b4..31dc4707c 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -333,16 +333,13 @@ /datum/holiday/halloween/getStationPrefix() return pick("Bone-Rattling","Mr. Bones' Own","2SPOOKY","Spooky","Scary","Skeletons") -/datum/holiday/jacqueen //Subset of halloween - name = "jacqueen" +/datum/holiday/bartholomew //Subset of halloween + name = "Bartholomew" begin_day = 27 begin_month = OCTOBER end_day = 2 end_month = NOVEMBER -/datum/holiday/jacqueen/greet() - return "Jacqueline the great Pumpqueen has come to visit!" - /datum/holiday/vegan name = "Vegan Day" begin_day = 1 diff --git a/tgstation.dme b/tgstation.dme index 88bf87a88..5d6d87286 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1855,6 +1855,7 @@ #include "code\modules\goonchat\browserOutput.dm" #include "code\modules\holiday\easter.dm" #include "code\modules\holiday\holidays.dm" +#include "code\modules\holiday\halloween\bartholomew.dm" #include "code\modules\holiday\halloween\halloween.dm" #include "code\modules\holodeck\area_copy.dm" #include "code\modules\holodeck\computer.dm" From 3b739fdae10c80f0cd42d2868a87b512cd462318 Mon Sep 17 00:00:00 2001 From: Archie Date: Fri, 29 Oct 2021 14:52:26 -0300 Subject: [PATCH 2/6] enthusiasm is everything --- code/modules/holiday/halloween/bartholomew.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm index 68f658661..81bf10e78 100644 --- a/code/modules/holiday/halloween/bartholomew.dm +++ b/code/modules/holiday/halloween/bartholomew.dm @@ -74,7 +74,7 @@ say("[message]") sleep(15) if(prob(5)) - say("Also, Jacqueen kinda got arrested for not paying taxes, if you're looking for her. But don't worry, we've plenty of candy to make.") + say("Also, Jacqueen kinda got arrested for committing tax fraud if you're looking for her. But don't worry, we've plenty of candy to make!") /*//To help people find her for(var/mob/living/simple_animal/jacq/J in GLOB.simple_animals[1]) var/turf/L1 = J.loc From 2b2587572cdf0b5c05d3af799072c3f908e6636a Mon Sep 17 00:00:00 2001 From: Archie Date: Fri, 29 Oct 2021 14:53:21 -0300 Subject: [PATCH 3/6] typo fiesta --- code/modules/holiday/halloween/bartholomew.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm index 81bf10e78..2daea6e46 100644 --- a/code/modules/holiday/halloween/bartholomew.dm +++ b/code/modules/holiday/halloween/bartholomew.dm @@ -53,7 +53,7 @@ if(!active) say("Meow!") return - say("Hello there, I'm Bartholomew, the pumkin witch's Familiar.") + say("Hello there, I'm Bartholomew, the pumpkin witch's Familiar.") sleep(20) say("I'm currently seeking items to put into my pot, if we get the right items, it should crystalise into a magic candy!") From c57059571e7392350565f62b9465f5bfef8e8a17 Mon Sep 17 00:00:00 2001 From: Archie Date: Fri, 29 Oct 2021 20:47:54 -0300 Subject: [PATCH 4/6] Mini display case fix --- code/game/objects/structures/displaycase.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index cfbfc3e4e..a71e893a6 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -90,6 +90,7 @@ /obj/structure/displaycase/obj_break(damage_flag) . = ..() + dump() if(!broken && !(flags_1 & NODECONSTRUCT_1)) density = FALSE broken = TRUE From c911091ad8bdb7ef75cc0539ff4f165276b1ed8f Mon Sep 17 00:00:00 2001 From: Dahlular <55758850+Dahlular@users.noreply.github.com> Date: Fri, 29 Oct 2021 21:41:32 -0600 Subject: [PATCH 5/6] Gates SD behind chaos 3 --- code/game/gamemodes/dynamic/dynamic_rulesets_events.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index 016804eb3..730c5c2cc 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -604,7 +604,7 @@ //property_weights = list("story_potential" = 1, "extended" = 1, "valid" = -2) high_population_requirement = 5 occurances_max = 1 - chaos_min = 2 + chaos_min = 3 /datum/dynamic_ruleset/event/revenant name = "Revenant" From 23722c26f45f0148c4777ba7e97a7c645d16480d Mon Sep 17 00:00:00 2001 From: Dahlular <55758850+Dahlular@users.noreply.github.com> Date: Fri, 29 Oct 2021 21:57:42 -0600 Subject: [PATCH 6/6] Updates SD spawn conditions --- code/game/gamemodes/dynamic/dynamic_rulesets_events.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index 730c5c2cc..44fc86fa8 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -594,8 +594,8 @@ name = "Sentient Disease" //config_tag = "sentient_disease" typepath = /datum/round_event/ghost_role/sentient_disease - enemy_roles = list("Virologist","Chief Medical Officer","Chemist") - required_enemies = list(2,2,2,1,1,1,1,0,0,0) + enemy_roles = list("Virologist","Chief Medical Officer") + required_enemies = list(2,2,2,1,1,1,1,1,1,1) required_candidates = 1 weight = 2 cost = 5