Fixes missing cigarette onmobs and cigroll icon updates (#7780)

This commit is contained in:
Wowzewow (Wezzy)
2019-12-25 02:17:37 +01:00
committed by Werner
parent 694f075138
commit b15e865db0
8 changed files with 53 additions and 0 deletions
@@ -716,10 +716,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/cigarette/rolled/update_icon()
. = ..()
icon_on = filter ? "cigon" : "cigrollon"
icon_off = filter ? "cigoff" : "cigrolloff"
if(!lit)
icon_state = filter ? "cigoff" : "cigrolloff"
else
icon_state = filter ? "cigon" : "cigrollon"
update_clothing_icon()
/obj/item/paper/cig
name = "rolling paper"
@@ -769,6 +772,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
return
if(user.unEquip(I))
to_chat(user, span("notice", "You stick [I] into \the [src]"))
playsound(src, 'sound/items/drop/gloves.ogg', 25, 1)
filter = 1
name = "filtered [name]"
update_icon()
@@ -786,6 +790,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
R.chem_volume = reagents.total_volume
reagents.trans_to_holder(R.reagents, R.chem_volume)
to_chat(user, span("notice", "You roll \the [src] into \the [I]"))
playsound(src, 'sound/bureaucracy/paperfold.ogg', 25, 1)
user.put_in_active_hand(R)
qdel(I)
qdel(src)
@@ -82,9 +82,15 @@
icon = 'icons/obj/cigs_lighters.dmi'
icon_state = "cigfilters_generic"
item_state = "cigpacket"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
)
w_class = 2
starts_with = list(/obj/item/paper/cig/filter = 10)
make_exact_fit()
drop_sound = 'sound/items/drop/gloves.ogg'
use_sound = 'sound/items/drop/paper.ogg'
/obj/item/storage/fancy/cigpaper/fine
name = "\improper Trident cigarette paper"