Bedsheet inhands and other fixes (#7559)

Adds more bedsheet inhands, because immersion.
Penlight has an inhand now.
Lanterns have new inhands.
Ashtray cigarette extinguish now properly plays the sound.
You can put cigarette butts in cigarette packets

also some more stupid drop sounds
This commit is contained in:
Wowzewow (Wezzy)
2019-12-05 23:43:49 +02:00
committed by Erki
parent b56629f846
commit a6688878a4
25 changed files with 139 additions and 19 deletions
@@ -45,7 +45,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
origin_tech = list(TECH_MATERIAL = 1)
slot_flags = SLOT_EARS
attack_verb = list("burnt", "singed")
drop_sound = null
drop_sound = 'sound/items/drop/food.ogg'
/obj/item/flame/match/process()
if(isliving(loc))
@@ -100,7 +100,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/ignitermes = "USER lights NAME with FLAME"
var/initial_volume = 0
var/burn_rate = 0
drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg'
drop_sound = 'sound/items/drop/food.ogg'
/obj/item/clothing/mask/smokable/Initialize()
. = ..()
@@ -337,6 +337,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
zippomes = "<span class='notice'>With a flick of their wrist, USER lights their NAME with their FLAME.</span>"
weldermes = "<span class='notice'>USER insults NAME by lighting it with FLAME.</span>"
ignitermes = "<span class='notice'>USER fiddles with FLAME, and manages to light their NAME with the power of science.</span>"
drop_sound = 'sound/items/drop/gloves.ogg'
/obj/item/clothing/mask/smokable/cigarette/cigar/Initialize()
. = ..()
@@ -383,6 +384,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
w_class = 1
slot_flags = SLOT_EARS
throwforce = 1
drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg'
/obj/item/cigbutt/Initialize()
. = ..()
@@ -418,6 +420,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
zippomes = "<span class='notice'>With much care, USER lights their NAME with their FLAME.</span>"
weldermes = "<span class='notice'>USER recklessly lights NAME with FLAME.</span>"
ignitermes = "<span class='notice'>USER fiddles with FLAME, and manages to light their NAME with the power of science.</span>"
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/clothing/mask/smokable/pipe/Initialize()
. = ..()
@@ -523,6 +526,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
'sound/items/cigs_lighters/cheap_on3.ogg',
)
var/deactivation_sound = 'sound/items/cigs_lighters/cheap_off.ogg'
drop_sound = 'sound/items/drop/card.ogg'
/obj/item/flame/lighter/zippo
name = "\improper Zippo lighter"
@@ -531,6 +535,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = "zippo"
activation_sound = 'sound/items/cigs_lighters/zippo_on.ogg'
deactivation_sound = 'sound/items/cigs_lighters/zippo_off.ogg'
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/flame/lighter/random
New()
@@ -52,6 +52,7 @@
var/obj/item/clothing/mask/smokable/cigarette/cig = W
if (cig.lit == 1)
src.visible_message("[user] crushes [cig] in \the [src], putting it out.")
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
STOP_PROCESSING(SSprocessing, cig)
var/obj/item/butt = new cig.type_butt(src)
cig.transfer_fingerprints_to(butt)
@@ -5,6 +5,7 @@
* Utensils
*/
/obj/item/material/kitchen/utensil
drop_sound = 'sound/items/drop/knife.ogg'
w_class = 1
thrown_force_divisor = 1
origin_tech = list(TECH_MATERIAL = 1)
@@ -30,6 +30,7 @@
action_button_name = "Wield two-handed weapon"
icon = 'icons/obj/weapons.dmi'
hitsound = "swing_hit"
drop_sound = 'sound/items/drop/sword.ogg'
/obj/item/material/twohanded/proc/unwield()
wielded = 0
@@ -344,6 +345,7 @@
var/cutting = 0 //Ignore
var/powered = 0 //Ignore
drop_sound = 'sound/items/drop/metalshield.ogg'
/obj/item/material/twohanded/chainsaw/Initialize()
. = ..()
@@ -535,6 +537,7 @@
reach = 2
applies_material_colour = 0
can_embed = 0
drop_sound = 'sound/items/drop/woodweapon.ogg'
/obj/item/material/twohanded/pike/halberd
icon_state = "halberd0"
@@ -162,7 +162,7 @@
slot_flags = SLOT_BELT
storage_slots = 6
var/cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette
can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter)
can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/cigbutt)
icon_type = "cigarette"
/obj/item/storage/fancy/cigarettes/Initialize()