A few extra costumes for the halloween crate

code/datums/outfit/special_outfits/special.dm

@@ -871,7 +871,7 @@
 			slot_ears_str = /obj/item/device/radio/headset,
 			slot_w_uniform_str = /obj/item/clothing/under/rank/scientist,
 			slot_shoes_str = /obj/item/clothing/shoes/jackboots,
-			slot_wear_mask_str = /obj/item/clothing/mask/gas/death_commando,
+			slot_wear_mask_str = /obj/item/clothing/mask/gas/grim_reaper/death_commando,
 			slot_wear_suit_str = /obj/item/clothing/suit/space/time,
 			slot_s_store_str = /obj/item/weapon/tank/emergency_oxygen/double,
 			slot_belt_str = /obj/item/weapon/storage/belt/grenade/chrono,

code/datums/supplypacks.dm

@@ -490,11 +490,34 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
 	name = "Halloween costumes"
 	contains = list(/obj/item/clothing/suit/space/plasmaman/moltar,
 					/obj/item/clothing/head/helmet/space/plasmaman/moltar,
-					/obj/item/clothing/under/skelesuit,
 					/obj/item/clothing/head/snake,
-					/obj/item/clothing/mask/vamp_fangs,
 					/obj/item/clothing/head/franken_bolt,
-					/obj/item/clothing/head/alien_antenna)
+					/obj/item/clothing/head/alien_antenna,
+
+					//Slasher set
+					/obj/item/toy/chainsaw,
+					/obj/item/clothing/mask/gas/slasher,
+
+					//Skeleton "set"
+					/obj/item/clothing/under/skelesuit,
+					/obj/item/clothing/under/skelesuit,
+
+					//Reaper set
+					/obj/item/clothing/mask/gas/grim_reaper,
+					/obj/item/clothing/head/chaplain_hood,
+					/obj/item/clothing/suit/reaper_robes,
+					/obj/item/toy/scythe,
+
+					//Vampire set
+					/obj/item/clothing/suit/storage/draculacoat_fake,
+					/obj/item/clothing/mask/vamp_fangs,
+
+					//Devil set
+					/obj/item/clothing/head/devil_horns,
+					/obj/item/toy/pitchfork,
+					/obj/item/clothing/under/color/red,
+					/obj/item/weapon/bedsheet/red
+					)
 	cost = 31
 	containertype = /obj/structure/closet/crate/basic
 	containername = "halloween costumes crate"
@@ -2164,7 +2187,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "lab mouse crate"
 	group = "Medical"
-	
+
 /datum/supply_packs/sutures
 	name = "Wound mending supplies"
 	contains = list (

code/game/objects/items/toys.dm

@@ -495,6 +495,44 @@
 	w_class = W_CLASS_MEDIUM
 	attack_verb = list("attacks", "slashes", "stabs", "slices")
 
+/obj/item/toy/scythe
+	name = "plastic scythe"
+	desc = "A blunt and curved plastic blade on a long plastic handle, this tool makes it hard for kids to hurt themselves while trick-or-treating."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "scythe0"
+	w_class = W_CLASS_LARGE
+	slot_flags = SLOT_BACK
+	attack_verb = list("chops", "slices", "cuts", "reaps")
+
+/obj/item/toy/pitchfork
+	name = "plastic pitchfork"
+	desc = "Great for harassing sinners in the fiery depths of Heck."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "devil_pitchfork"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/swords_axes.dmi', "right_hand" = 'icons/mob/in-hand/right/swords_axes.dmi')
+	w_class = W_CLASS_LARGE
+	slot_flags = SLOT_BACK
+	attack_verb = list("stabs", "prongs", "pokes")
+
+/obj/item/toy/chainsaw
+	name = "plastic chainsaw"
+	desc = "Won't cut down anything, except maybe some horny teens' make-out session in your cabin in the woods."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "chainsaw"
+	w_class = W_CLASS_MEDIUM
+	attack_verb = list("attacks", "slashes", "saws", "cuts")
+	hitsound = 'sound/items/circularsaw.ogg' //Maybe find a better sfx?
+	var/last_revv_time = 0
+	var/revv_delay = 60
+
+/obj/item/toy/chainsaw/attack_self(mob/user as mob)
+	..()
+	if(world.time - last_revv_time >= revv_delay)
+		last_revv_time = world.time
+		playsound(src, hitsound, 50, 1)
+		to_chat(viewers(user), "<span class='danger'>[user] revvs up \the [src.name] </span>")
+		add_fingerprint(user)
+
 /*
  * Foam armblade
  */

code/modules/clothing/head/misc.dm

@@ -665,6 +665,14 @@
 	species_fit = list(INSECT_SHAPED)
 	flags = FPRINT
 
+/obj/item/clothing/head/devil_horns
+	name = "devil horns"
+	desc = "Might be slightly offensive to your local chaplain."
+	icon_state = "devil_horns"
+	item_state = "devil_horns"
+	species_fit = list(INSECT_SHAPED)
+	flags = FPRINT
+
 /obj/item/clothing/head/elfhat
 	name = "elf hat"
 	desc = "Wear this hat, and become one of Santa's little helpers!"

code/modules/clothing/masks/gasmask.dm

@@ -276,11 +276,25 @@
 	can_flip = 0
 	canstage = 0
 
-/obj/item/clothing/mask/gas/death_commando
-	name = "Death Commando Mask"
+/obj/item/clothing/mask/gas/grim_reaper
+	name = "grim reaper mask"
+	desc = "Spare a coin for the ferryman, or brave the Styx on your own?"
 	icon_state = "death"
 	item_state = "death"
+	species_fit = list(VOX_SHAPED, INSECT_SHAPED)
+	can_flip = 0
+	canstage = 0
+
+/obj/item/clothing/mask/gas/grim_reaper/death_commando
+	name = "Death Commando Mask"
+	desc = "A face-covering mask that can be connected to an air supply."
 	siemens_coefficient = 0.2
+
+/obj/item/clothing/mask/gas/slasher
+	name = "hockey mask"
+	desc = "Maybe don't wear this near a lake on unlucky days."
+	icon_state = "jason"
+	item_state = "jason"
 	species_fit = list(VOX_SHAPED, INSECT_SHAPED)
 	can_flip = 0
 	canstage = 0

code/modules/clothing/suits/miscellaneous.dm

@@ -734,6 +734,22 @@ var/list/tag_suits_list = list()
 	armor = list(melee = 30, bullet = 20, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
 	species_fit = list(GREY_SHAPED, INSECT_SHAPED)
 
+/obj/item/clothing/suit/storage/draculacoat
+	name = "Vampire Coat"
+	desc = "What is a man? A miserable little pile of secrets."
+	icon_state = "draculacoat"
+	blood_overlay_type = "coat"
+	cant_hold = list(/obj/item/weapon/nullrod, /obj/item/weapon/storage/bible)
+	armor = list(melee = 30, bullet = 20, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
+	species_fit = list(GREY_SHAPED, INSECT_SHAPED)
+
+/obj/item/clothing/suit/storage/draculacoat_fake
+	name = "Vampire Costume"
+	desc = "Smells faintly of pumpkins and bloody mary."
+	icon_state = "draculacoat"
+	blood_overlay_type = "coat"
+	species_fit = list(GREY_SHAPED, INSECT_SHAPED)
+
 /obj/item/clothing/suit/maidapron
 	name = "Apron"
 	desc = "Simple white apron."
@@ -1122,4 +1138,4 @@ var/list/tag_suits_list = list()
 	var/hits = 2
 
 /obj/item/clothing/suit/reticulatedvest/update_icon()
-	icon_state = "reticulated[hits]"
+	icon_state = "reticulated[hits]"

code/modules/clothing/under/miscellaneous.dm

@@ -911,6 +911,14 @@
 	clothing_flags = ONESIZEFITSALL
 	body_parts_covered = FULL_HEAD|BEARD|HIDEHAIR
 
+/obj/item/clothing/suit/reaper_robes
+	name = "grim robes"
+	desc = "Tends to snag on tombstones"
+	icon_state = "reaper_hoodie" //edited version of chaplain_hoodie. 1px longer, and more open at the front
+	item_state = "reaper_hoodie"
+	species_fit = list(VOX_SHAPED, INSECT_SHAPED)
+	body_parts_covered = FULL_TORSO|LEGS|ARMS|IGNORE_INV
+
 /obj/item/clothing/under/clownpsyche
 	name = "Psychedelic clown outfit"
 	desc = "Do you know the definition of insanity?"

code/modules/mob/living/simple_animal/hostile/human/cult.dm

@@ -89,7 +89,7 @@
 	name = "cultist"
 	corpseshoes = /obj/item/clothing/shoes/cult
 	corpsesuit = /obj/item/clothing/suit/legacy_cultrobes
-	corpsemask = /obj/item/clothing/mask/gas/death_commando
+	corpsemask = /obj/item/clothing/mask/gas/grim_reaper/death_commando
 	corpseback = /obj/item/weapon/storage/backpack/cultpack
 
 /obj/effect/landmark/corpse/cult/New()