Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners

2021-09-10 12:12:57 -04:00
parent 04af8ae302 eae147f6a3
commit 68e2eb1d7a
211 changed files with 9352 additions and 4834 deletions
@@ -70,6 +70,12 @@
 	cost = 1500
 	contains = list(/obj/item/toy/plush/beeplushie)

+/datum/supply_pack/goody/dyespray
+	name = "Hair Dye Spray"
+	desc = "A cool spray to dye your hair with awesome colors!"
+	cost = PAYCHECK_EASY * 2
+	contains = list(/obj/item/dyespray)
+
 /datum/supply_pack/goody/beach_ball
 	name = "Beach Ball"
 	desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen"