Merge pull request #6232 from Incoming5643/happykwanzaa

Don't they know it's christmas time at all?
This commit is contained in:
hornygranny
2014-12-13 22:57:19 -08:00
5 changed files with 845 additions and 834 deletions
+12 -1
View File
@@ -38,6 +38,11 @@
icon_state = "magus"
item_state = "magus"
/obj/item/clothing/head/wizard/santa
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat"
flags = BLOCKHAIR
/obj/item/clothing/suit/wizrobe
name = "wizard robe"
@@ -86,6 +91,12 @@
item_state = "magusred"
/obj/item/clothing/suit/wizrobe/santa
name = "Santa's suit"
desc = "Festive!"
icon_state = "santa"
item_state = "santa"
/obj/item/clothing/suit/wizrobe/fake
name = "wizard robe"
desc = "A rather dull blue robe meant to mimick real wizard robes."
@@ -113,4 +124,4 @@
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
unacidable = 0
unacidable = 0