diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 1373d4706fc..da667432189 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -705,3 +705,16 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 to_chat(user, "[M] is too close to use [src] on.") return M.attack_hand(user) + +/obj/item/gohei + name = "gohei" + desc = "A wooden stick with white streamers at the end. Originally used by shrine maidens to purify things. Now used by the station's valued weeaboos." + force = 5 + throwforce = 5 + hitsound = "swing_hit" + attack_verb = list("whacked", "thwacked", "walloped", "socked") + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "gohei" + item_state = "gohei" + lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 321adf07e3e..d4168642105 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -428,3 +428,14 @@ desc = "An extra-mustahabb way of showing your devotion to Allah." icon_state = "taqiyahred" pocket_storage_component_path = /datum/component/storage/concrete/pockets/small + +/obj/item/clothing/head/shrine_wig + name = "shrine maiden's wig" + desc = "Purify in style!" + flags_inv = HIDEHAIR //bald + mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi' + icon_state = "shrine_wig" + item_state = "shrine_wig" + worn_x_dimension = 64 + worn_y_dimension = 64 + dynamic_hair_suffix = "" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6789f20ecf9..68b97dd80c2 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -335,6 +335,14 @@ item_state = "officertanjacket" body_parts_covered = CHEST|ARMS +/obj/item/clothing/suit/shrine_maiden + name = "shrine maiden's outfit" + desc = "Makes you want to exterminate some troublesome youkai." + icon_state = "shrine_maiden" + item_state = "shrine_maiden" + body_parts_covered = CHEST|GROIN|LEGS|ARMS + flags_inv = HIDEJUMPSUIT + /* * Misc */ diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 9a7574ed22f..f6df2da8895 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -116,7 +116,10 @@ /obj/item/clothing/under/costume/sailor = 1, /obj/item/clothing/ears/headphones = 2, /obj/item/clothing/head/delinquent = 1, - /obj/item/clothing/head/wig/random = 3) + /obj/item/clothing/head/wig/random = 3, + /obj/item/clothing/head/shrine_wig = 1, + /obj/item/clothing/suit/shrine_maiden = 1, + /obj/item/gohei = 1) contraband = list(/obj/item/clothing/suit/judgerobe = 1, /obj/item/clothing/head/powdered_wig = 1, /obj/item/gun/magic/wand = 2, diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 701bfc2d664..252f10aeec0 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/inhands/weapons/staves_lefthand.dmi b/icons/mob/inhands/weapons/staves_lefthand.dmi index ecc92c7d203..9158e12833c 100644 Binary files a/icons/mob/inhands/weapons/staves_lefthand.dmi and b/icons/mob/inhands/weapons/staves_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/staves_righthand.dmi b/icons/mob/inhands/weapons/staves_righthand.dmi index 92e5b91323d..d3de4926c95 100644 Binary files a/icons/mob/inhands/weapons/staves_righthand.dmi and b/icons/mob/inhands/weapons/staves_righthand.dmi differ diff --git a/icons/mob/large-worn-icons/64x64/head.dmi b/icons/mob/large-worn-icons/64x64/head.dmi index 6ea91d2c6d3..feaf64a9284 100644 Binary files a/icons/mob/large-worn-icons/64x64/head.dmi and b/icons/mob/large-worn-icons/64x64/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 895692feab2..b6fa2f99f40 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index d7d500eafcd..27cee74ce4b 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 7f97bf62ab2..90a8d51cb28 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ