Merge pull request #1540 from Incoming5643/spooky

2SPOOKY

code/modules/events/holiday/halloween.dm

@@ -0,0 +1,17 @@
+/datum/round_event_control/spooky
+	name = "2 SPOOKY!"
+	holidayID = "Halloween"
+	typepath = /datum/round_event/spooky
+	weight = -1							//forces it to be called, regardless of weight
+	max_occurrences = 1
+	earliest_start = 0
+
+/datum/round_event/spooky/start()
+	for(var/mob/living/carbon/human/H in mob_list)
+		if(H.dna)
+			hardset_dna(H, null, null, null, "skeleton")
+	for(var/mob/living/simple_animal/corgi/Ian/Ian in mob_list)
+		Ian.place_on_head(new /obj/item/weapon/bedsheet(Ian))
+
+/datum/round_event/spooky/announce()
+	command_alert(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE")

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -163,7 +163,7 @@
 		return
 
 	if(inventory_head)
-		usr << "\red You can't put more than one hat on [src]!"
+		if(usr)	usr << "\red You can't put more than one hat on [src]!"
 		return
 	if(!item_to_add)
 		usr.visible_message("\blue [usr] pets [src]","\blue You rest your hand on [src]'s head for a moment.")
@@ -278,10 +278,11 @@
 			valid = 1
 
 	if(valid)
-		usr.visible_message("[usr] puts [item_to_add] on [real_name]'s head.  [src] looks at [usr] and barks once.",
-			"You put [item_to_add] on [real_name]'s head.  [src] gives you a peculiar look, then wags \his tail once and barks.",
-			"You hear a friendly-sounding bark.")
-		usr.drop_item()
+		if(usr)
+			usr.visible_message("[usr] puts [item_to_add] on [real_name]'s head.  [src] looks at [usr] and barks once.",
+				"You put [item_to_add] on [real_name]'s head.  [src] gives you a peculiar look, then wags \his tail once and barks.",
+				"You hear a friendly-sounding bark.")
+			usr.drop_item()
 		item_to_add.loc = src
 		src.inventory_head = item_to_add
 		regenerate_icons()

tgstation.dme

@@ -784,6 +784,7 @@
 #include "code\modules\events\spontaneous_appendicitis.dm"
 #include "code\modules\events\vent_clog.dm"
 #include "code\modules\events\wormholes.dm"
+#include "code\modules\events\holiday\halloween.dm"
 #include "code\modules\events\holiday\xmas.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\Hallucination.dm"