Merge remote-tracking branch 'upstream/master' into lithiumaurora

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
@@ -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"

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

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 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!")
@@ -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 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
         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
 	..()
+*/

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)

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

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"