diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index 77b056e8235..c2a171d46af 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -317,3 +317,12 @@ ) category = CAT_CLOTHING + +/datum/crafting_recipe/paper_hat + name = "Paper Hat" + result = /obj/item/clothing/head/costume/paper_hat + time = 5 SECONDS + reqs = list( + /obj/item/paper = 1, + ) + category = CAT_CLOTHING diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index c0c1215015f..245553d83ad 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -2,6 +2,7 @@ name = "medical pack" singular_name = "medical pack" icon = 'icons/obj/medical/stack_medical.dmi' + worn_icon_state = "nothing" amount = 6 max_amount = 6 w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index 131baec3e9d..70fd75c04b1 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -409,6 +409,7 @@ icon_state = "pill_canister" icon = 'icons/obj/medical/chemical.dmi' inhand_icon_state = "contsolid" + worn_icon_state = "nothing" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index a0d0d12924a..2d32440b145 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -282,3 +282,10 @@ name = "red nightcap" desc = "A red nightcap for all the sleepyheads and dozers out there." icon_state = "sleep_red" + +/obj/item/clothing/head/costume/paper_hat + name = "paper hat" + desc = "A flimsy hat made of paper." + icon_state = "paper" + worn_icon_state = "paper" + dog_fashion = /datum/dog_fashion/head diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 4916dc37c8c..16c4220b714 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -16,7 +16,6 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper" inhand_icon_state = "paper" - worn_icon = 'icons/mob/clothing/head/costume.dmi' worn_icon_state = "paper" custom_fire_overlay = "paper_onfire_overlay" throwforce = 0 @@ -24,11 +23,8 @@ throw_range = 1 throw_speed = 1 pressure_resistance = 0 - slot_flags = ITEM_SLOT_HEAD - body_parts_covered = HEAD resistance_flags = FLAMMABLE max_integrity = 50 - dog_fashion = /datum/dog_fashion/head drop_sound = 'sound/items/handling/paper_drop.ogg' pickup_sound = 'sound/items/handling/paper_pickup.ogg' grind_results = list(/datum/reagent/cellulose = 3) diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm index 68f2acb5b52..25e5143f722 100644 --- a/code/modules/reagents/reagent_containers/cups/_cup.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -553,7 +553,7 @@ icon_state = "test_tube" fill_icon_state = "tube" inhand_icon_state = "atoxinbottle" - worn_icon_state = "test_tube" + worn_icon_state = "beaker" possible_transfer_amounts = list(5, 10, 15, 30) volume = 30 fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index c0e0f5194f8..03791bf9d7a 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -7,7 +7,6 @@ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' icon_state = "hypo" - worn_icon_state = "hypo" amount_per_transfer_from_this = 5 volume = 30 possible_transfer_amounts = list(5) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 2a2cc7aeb0a..e01d0540717 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/medical/chemical.dmi' icon_state = "pill" inhand_icon_state = "pill" - worn_icon_state = "pen" + worn_icon_state = "nothing" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' possible_transfer_amounts = list() diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index 37ceec616c3..85974a2d329 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ