diff --git a/_maps/templates/lazy_templates/wizard_den.dmm b/_maps/templates/lazy_templates/wizard_den.dmm index 3fe8ac99751..c400cfa6641 100644 --- a/_maps/templates/lazy_templates/wizard_den.dmm +++ b/_maps/templates/lazy_templates/wizard_den.dmm @@ -186,13 +186,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/engine/cult, /area/centcom/wizard_station) -"tv" = ( -/obj/effect/decal/cleanable/blood/splatter, -/mob/living/simple_animal/hostile/netherworld{ - name = "Experiment 35b" - }, -/turf/open/floor/grass, -/area/centcom/wizard_station) "tz" = ( /obj/structure/table/wood/fancy, /obj/item/camera/spooky, @@ -310,6 +303,14 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/centcom/wizard_station) +"Iz" = ( +/obj/structure/table/wood, +/obj/item/clothing/head/wizard/tape, +/obj/item/clothing/suit/wizrobe/tape, +/obj/item/staff/tape, +/obj/item/stack/sticky_tape/super, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "IZ" = ( /obj/structure/chair/wood/wings{ dir = 1 @@ -388,6 +389,13 @@ /obj/structure/chair/wood/wings, /turf/open/floor/carpet, /area/centcom/wizard_station) +"QL" = ( +/obj/effect/decal/cleanable/blood/splatter, +/mob/living/simple_animal/hostile/netherworld{ + name = "Experiment 35b" + }, +/turf/open/floor/grass, +/area/centcom/wizard_station) "RT" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck/wizoff{ @@ -1346,7 +1354,7 @@ qo iQ gC dp -jp +Iz hT hT OV @@ -1518,7 +1526,7 @@ lL cs nN kZ -tv +QL JN kZ cs diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index ffab6095caf..c1581ef9ae9 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -167,6 +167,14 @@ /obj/item/clothing/suit/wizrobe/marisa/fake, ) +/obj/effect/spawner/costume/tape_wizard + name = "tape wizard costume spawner" + items = list( + /obj/item/clothing/head/wizard/tape/fake, + /obj/item/clothing/suit/wizrobe/tape/fake, + /obj/item/staff/tape, + ) + /obj/effect/spawner/costume/cutewitch name = "cute witch costume spawner" items = list( diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm index 67f1fcc9a67..2df843c5a63 100644 --- a/code/game/objects/items/storage/boxes/clothes_boxes.dm +++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm @@ -27,6 +27,16 @@ for(var/i in 1 to 7) new /obj/item/clothing/glasses/regular(src) +/obj/item/storage/box/tape_wizard + name = "Tape Wizard - Episode 23" + desc = "A box containing the costume used by legendary entertainment icon 'Super Tape Wizard'. It got a little stuck on its way out." + +/obj/item/storage/box/tape_wizard/PopulateContents() + new /obj/item/clothing/head/wizard/tape/fake(src) + new /obj/item/clothing/suit/wizrobe/tape/fake(src) + new /obj/item/staff/tape(src) + new /obj/item/stack/sticky_tape(src) + /obj/item/storage/box/fakesyndiesuit name = "boxed space suit and helmet" desc = "A sleek, sturdy box used to hold replica spacesuits." diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index a6ca7dd52b9..34397c00b55 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -537,6 +537,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 inhand_icon_state = "broom" resistance_flags = FLAMMABLE +/obj/item/staff/tape + name = "tape staff" + desc = "A roll of tape snugly attached to a stick." + icon_state = "tapestaff" + inhand_icon_state = "tapestaff" + resistance_flags = FLAMMABLE + /obj/item/staff/stick name = "stick" desc = "A great tool to drag someone else's drinks across the bar." diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 69d19ed784a..a802c3ad4bf 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -59,6 +59,15 @@ flags_1 = IS_PLAYER_COLORABLE_1 dog_fashion = null +/obj/item/clothing/head/wizard/tape + name = "tape hat" + desc = "A magically attuned hat made exclusively from duct tape. You can barely see." + icon_state = "tapehat" + inhand_icon_state = "tapehat" + dog_fashion = null + worn_y_offset = 6 + body_parts_covered = HEAD|HAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR /obj/item/clothing/head/wizard/magus name = "\improper Magus helm" @@ -130,6 +139,12 @@ icon_state = "marisa" inhand_icon_state = null +/obj/item/clothing/suit/wizrobe/tape + name = "tape robe" + desc = "A fine robe made from magically attuned duct tape." + icon_state = "taperobe" + inhand_icon_state = "taperobe" + /obj/item/clothing/suit/wizrobe/magusblue name = "\improper Magus robe" desc = "A set of armored robes that seem to radiate a dark power." @@ -161,6 +176,12 @@ armor_type = /datum/armor/none resistance_flags = FLAMMABLE +/obj/item/clothing/head/wizard/tape/fake + name = "tape hat" + desc = "A hat designed exclusively from duct tape. You can barely see." + armor_type = /datum/armor/none + resistance_flags = FLAMMABLE + /obj/item/clothing/suit/wizrobe/marisa/fake name = "witch robe" desc = "Magic is all about the spell power, ZE!" @@ -169,6 +190,12 @@ armor_type = /datum/armor/none resistance_flags = FLAMMABLE +/obj/item/clothing/suit/wizrobe/tape/fake + name = "tape robe" + desc = "An outfit designed exclusively from duct tape. It was hard to put on." + armor_type = /datum/armor/none + resistance_flags = FLAMMABLE + /obj/item/clothing/suit/wizrobe/paper name = "papier-mache robe" // no non-latin characters! desc = "A robe held together by various bits of clear-tape and paste." diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 2c96f318f24..60f09d88034 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -204,6 +204,7 @@ /obj/item/clothing/head/costume/lobsterhat = 1, /obj/item/clothing/under/costume/lobster = 1, /obj/item/gun/magic/wand/nothing = 2, + /obj/item/storage/box/tape_wizard = 1, ) premium = list( /obj/item/clothing/suit/costume/pirate/captain = 2, diff --git a/icons/mob/clothing/head/wizard.dmi b/icons/mob/clothing/head/wizard.dmi index a6961ca7626..785ed63ca5b 100644 Binary files a/icons/mob/clothing/head/wizard.dmi and b/icons/mob/clothing/head/wizard.dmi differ diff --git a/icons/mob/clothing/suits/wizard.dmi b/icons/mob/clothing/suits/wizard.dmi index e8ac43bb6ca..454bc1f3cf1 100644 Binary files a/icons/mob/clothing/suits/wizard.dmi and b/icons/mob/clothing/suits/wizard.dmi differ diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi index 540c586d905..e0f246140ae 100644 Binary files a/icons/mob/inhands/clothing/hats_lefthand.dmi and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi index 343ecedcd07..a7d3c60f5f3 100644 Binary files a/icons/mob/inhands/clothing/hats_righthand.dmi and b/icons/mob/inhands/clothing/hats_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi index 181eb771ca6..b59ee57a4b3 100644 Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi index 7c8a01a3ab7..42265a7db98 100644 Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/staves_lefthand.dmi b/icons/mob/inhands/weapons/staves_lefthand.dmi index 8aec740579f..82c552b5038 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 6cba11eef9c..769709f53da 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/obj/clothing/head/wizard.dmi b/icons/obj/clothing/head/wizard.dmi index 8fcdbd6fcd7..29595f02fc2 100644 Binary files a/icons/obj/clothing/head/wizard.dmi and b/icons/obj/clothing/head/wizard.dmi differ diff --git a/icons/obj/clothing/suits/wizard.dmi b/icons/obj/clothing/suits/wizard.dmi index 9c2b4eee179..fcfa748d3b3 100644 Binary files a/icons/obj/clothing/suits/wizard.dmi and b/icons/obj/clothing/suits/wizard.dmi differ diff --git a/icons/obj/weapons/guns/magic.dmi b/icons/obj/weapons/guns/magic.dmi index ef25b89f77a..3a97682ef66 100644 Binary files a/icons/obj/weapons/guns/magic.dmi and b/icons/obj/weapons/guns/magic.dmi differ