Skip to content

Commit

Permalink
[MIRROR] Chewable spit out and drone designator in belt
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuelbassil authored and SuhEugene committed Oct 19, 2023
1 parent 6e7072c commit 8715cc9
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
8 changes: 5 additions & 3 deletions code/game/objects/items/weapons/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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
)


Expand Down Expand Up @@ -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'
Expand Down
27 changes: 16 additions & 11 deletions code/modules/clothing/masks/chewable.dm
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit 8715cc9

Please sign in to comment.