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
+2
View File
@@ -292,6 +292,7 @@ BLIND // can't see anything
user.drop_item()
qdel(W)
to_chat(user, "<span class='notice'>You attach a set of medical HUDs to your glasses.</span>")
playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
var/turf/T = get_turf(src)
new /obj/item/clothing/glasses/hud/health/prescription(T)
qdel(src)
@@ -299,6 +300,7 @@ BLIND // can't see anything
user.drop_item()
qdel(W)
to_chat(user, "<span class='notice'>You attach a set of security HUDs to your glasses.</span>")
playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
var/turf/T = get_turf(src)
new /obj/item/clothing/glasses/hud/security/prescription(T)
qdel(src)
+2
View File
@@ -31,6 +31,7 @@
/obj/item/clothing/glasses/hud/health/prescription/attack_self(mob/user)
to_chat(user, "<span class='notice'>You detach a set of medical HUDs form your glasses.</span>")
playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1)
var/turf/T = get_turf(src)
new /obj/item/clothing/glasses/hud/health(T)
new /obj/item/clothing/glasses/regular(T)
@@ -53,6 +54,7 @@
/obj/item/clothing/glasses/hud/security/prescription/attack_self(mob/user)
to_chat(user, "<span class='notice'>You detach a set of security HUDs form your glasses.</span>")
playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1)
var/turf/T = get_turf(src)
new /obj/item/clothing/glasses/hud/health(T)
new /obj/item/clothing/glasses/regular(T)
+1
View File
@@ -3,6 +3,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper_bin1"
item_state = "sheet-metal"
drop_sound = 'sound/items/drop/box.ogg'
throwforce = 1
w_class = 5
throw_speed = 3
@@ -11,6 +11,7 @@
sharp = 1
edge = 0
hitsound = "swing_hit"
drop_sound = 'sound/items/drop/sword.ogg'
/obj/item/arrow/proc/removed() //Helper for metal rods falling apart.
return
@@ -25,6 +26,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "metal-rod"
item_state = "bolt"
drop_sound = 'sound/items/drop/sword.ogg'
/obj/item/arrow/quill
name = "vox quill"
@@ -33,6 +35,7 @@
icon_state = "quill"
item_state = "quill"
throwforce = 8
drop_sound = 'sound/items/drop/knife.ogg'
/obj/item/arrow/rod
name = "metal rod"
@@ -3869,6 +3869,7 @@
desc = "A box suited for pizzas."
icon = 'icons/obj/food.dmi'
icon_state = "pizzabox1"
drop_sound = 'sound/items/drop/box.ogg'
center_of_mass = list("x" = 16,"y" = 6)
var/open = 0 // Is the box open?
@@ -5389,7 +5390,7 @@
/obj/item/reagent_containers/food/snacks/tuna
name = "\improper Tuna Snax"
desc = "A packaged fish snack, guaranteed to do not contain space carp."
desc = "A packaged fish snack. Guaranteed to not contain space carp."
icon_state = "tuna"
filling_color = "#FFDEFE"
center_of_mass = list("x"=17, "y"=13)
@@ -16,7 +16,7 @@
w_class = 2
flags = OPENCONTAINER
unacidable = 1 //glass doesn't dissolve in acid
drop_sound = 'sound/items/drop/bottle.ogg'
var/label_text = ""
/obj/item/reagent_containers/glass/Initialize()
@@ -77,7 +77,6 @@
item_state = "beaker"
center_of_mass = list("x" = 15,"y" = 11)
matter = list("glass" = 500)
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/reagent_containers/glass/beaker/Initialize()
. = ..()