diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index a1c86562bc33c..0ca5c54590ff6 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -8,6 +8,7 @@ icon_state = "utilitybelt" item_state = "utility" storage_slots = 7 + force = 2 item_flags = ITEM_FLAG_IS_BELT max_w_class = ITEM_SIZE_NORMAL slot_flags = SLOT_BELT @@ -106,7 +107,6 @@ item_state = "utility" overlay_flags = BELT_OVERLAY_ITEMS can_hold = list( - ///obj/item/combitool, /obj/item/crowbar, /obj/item/screwdriver, /obj/item/weldingtool, @@ -132,7 +132,8 @@ /obj/item/tape_roll, /obj/item/clothing/head/beret, /obj/item/material/knife/folding, - /obj/item/swapper + /obj/item/swapper, + /obj/item/device/drone_designator ) @@ -496,7 +497,8 @@ /obj/item/clothing/head/beret, /obj/item/material/knife/folding, /obj/item/storage/firstaid/light, - /obj/item/device/flash + /obj/item/device/flash, + /obj/item/device/drone_designator ) can_holster = list(/obj/item/material/hatchet/machete) sound_in = 'sound/effects/holster/sheathin.ogg' diff --git a/code/modules/clothing/masks/chewable.dm b/code/modules/clothing/masks/chewable.dm index 41e6c9432acb7..8f74d804acb86 100644 --- a/code/modules/clothing/masks/chewable.dm +++ b/code/modules/clothing/masks/chewable.dm @@ -1,9 +1,7 @@ /obj/item/clothing/mask/chewable - name = "chewable item master" - desc = "You're not sure what this is. You should probably ahelp it." icon = 'icons/obj/clothing/obj_mask.dmi' body_parts_covered = 0 - + abstract_type = /obj/item/clothing/mask/chewable var/type_butt = null var/chem_volume = 0 var/chewtime = 0 @@ -54,7 +52,7 @@ /obj/item/clothing/mask/chewable/Process() chew(1) if(chewtime < 1) - extinguish() + spit_out() /obj/item/clothing/mask/chewable/tobacco name = "wad" @@ -73,19 +71,26 @@ desc = "A disgusting spitwad." icon_state = "spit-chew" -/obj/item/clothing/mask/chewable/proc/extinguish(mob/user, no_message) +/obj/item/clothing/mask/chewable/proc/spit_out(no_message) STOP_PROCESSING(SSobj, src) + var/mob/chewer + if (ismob(loc)) + chewer = loc + if (!no_message) + to_chat(chewer, SPAN_NOTICE("You spit out \the [name].")) + if (type_butt) - var/obj/item/butt = new type_butt(get_turf(src)) + var/obj/item/butt = new type_butt() + if (chewer) + chewer.put_in_hands(butt) + else + butt.forceMove(get_turf(src)) transfer_fingerprints_to(butt) butt.color = color if(brand) butt.desc += " This one is \a [brand]." - if(ismob(loc)) - var/mob/living/M = loc - if (!no_message) - to_chat(M, SPAN_NOTICE("You spit out the [name].")) - qdel(src) + + qdel(src) /obj/item/clothing/mask/chewable/tobacco/lenni name = "chewing tobacco"