Merge pull request #6804 from Cerebulon/bigsounds

Big Bastard Incidental Sound Port
This commit is contained in:
Atermonera
2020-03-15 11:38:44 -07:00
committed by GitHub
179 changed files with 363 additions and 31 deletions

View File

@@ -222,6 +222,7 @@ var/global/list/PDA_Manifest = list()
throwforce = 0.0 throwforce = 0.0
throw_speed = 1 throw_speed = 1
throw_range = 20 throw_range = 20
drop_sound = 'sound/items/drop/rubber.ogg'
afterattack(atom/target as mob|obj|turf|area, mob/user as mob) afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
user.drop_item() user.drop_item()

View File

@@ -35,6 +35,7 @@
throwforce = 0 throwforce = 0
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20
drop_sound = 'sound/misc/slip.ogg'
/obj/item/weapon/soap/nanotrasen /obj/item/weapon/soap/nanotrasen
desc = "A NanoTrasen-brand bar of soap. Smells of phoron." desc = "A NanoTrasen-brand bar of soap. Smells of phoron."
@@ -105,7 +106,7 @@
if(concealed_blade) if(concealed_blade)
user.visible_message("<span class='warning'>[user] has unsheathed \a [concealed_blade] from [T.his] [src]!</span>", "You unsheathe \the [concealed_blade] from \the [src].") user.visible_message("<span class='warning'>[user] has unsheathed \a [concealed_blade] from [T.his] [src]!</span>", "You unsheathe \the [concealed_blade] from \the [src].")
// Calling drop/put in hands to properly call item drop/pickup procs // Calling drop/put in hands to properly call item drop/pickup procs
playsound(user.loc, 'sound/weapons/flipblade.ogg', 50, 1) playsound(user.loc, 'sound/weapons/holster/sheathout.ogg', 50, 1)
user.drop_from_inventory(src) user.drop_from_inventory(src)
user.put_in_hands(concealed_blade) user.put_in_hands(concealed_blade)
user.put_in_hands(src) user.put_in_hands(src)
@@ -119,6 +120,7 @@
if(!src.concealed_blade && istype(W)) if(!src.concealed_blade && istype(W))
var/datum/gender/T = gender_datums[user.get_visible_gender()] var/datum/gender/T = gender_datums[user.get_visible_gender()]
user.visible_message("<span class='warning'>[user] has sheathed \a [W] into [T.his] [src]!</span>", "You sheathe \the [W] into \the [src].") user.visible_message("<span class='warning'>[user] has sheathed \a [W] into [T.his] [src]!</span>", "You sheathe \the [W] into \the [src].")
playsound(user.loc, 'sound/weapons/holster/sheathin.ogg', 50, 1)
user.drop_from_inventory(W) user.drop_from_inventory(W)
W.loc = src W.loc = src
src.concealed_blade = W src.concealed_blade = W
@@ -487,6 +489,7 @@
icon = 'icons/obj/stock_parts.dmi' icon = 'icons/obj/stock_parts.dmi'
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
var/rating = 1 var/rating = 1
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/weapon/stock_parts/New() /obj/item/weapon/stock_parts/New()
src.pixel_x = rand(-5.0, 5) src.pixel_x = rand(-5.0, 5)

View File

@@ -130,5 +130,6 @@ datum/announcement/proc/Log(message as text, message_title as text)
rank = character.mind.role_alt_title rank = character.mind.role_alt_title
AnnounceArrivalSimple(character.real_name, rank, join_message) AnnounceArrivalSimple(character.real_name, rank, join_message)
/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle")
/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle", new_sound = 'sound/misc/notice3.ogg')
global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer") global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer")

View File

@@ -807,6 +807,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
var/datum/feed_message/important_message = null var/datum/feed_message/important_message = null
var/scribble="" var/scribble=""
var/scribble_page = null var/scribble_page = null
drop_sound = 'sound/items/drop/wrapper.ogg'
obj/item/weapon/newspaper/attack_self(mob/user as mob) obj/item/weapon/newspaper/attack_self(mob/user as mob)
if(ishuman(user)) if(ishuman(user))

View File

@@ -26,6 +26,7 @@
var/datum/stored_item/vending_product/currently_vending = null // What we're requesting payment for right now var/datum/stored_item/vending_product/currently_vending = null // What we're requesting payment for right now
var/status_message = "" // Status screen messages like "insufficient funds", displayed in NanoUI var/status_message = "" // Status screen messages like "insufficient funds", displayed in NanoUI
var/status_error = 0 // Set to 1 if status_message is an error var/status_error = 0 // Set to 1 if status_message is an error
var/vending_sound = "machines/vending/vending_drop.ogg"
/* /*
Variables used to initialize the product list Variables used to initialize the product list
@@ -508,8 +509,7 @@
sleep(3) sleep(3)
if(R.get_product(get_turf(src))) if(R.get_product(get_turf(src)))
visible_message("<span class='notice'>\The [src] clunks as it vends an additional item.</span>") visible_message("<span class='notice'>\The [src] clunks as it vends an additional item.</span>")
playsound(src.loc, "sound/[vending_sound]", 100, 1, 1)
playsound(src, 'sound/items/vending.ogg', 50, 1, 1)
status_message = "" status_message = ""
status_error = 0 status_error = 0
@@ -739,6 +739,7 @@
req_access = list(access_bar) req_access = list(access_bar)
req_log_access = access_bar req_log_access = access_bar
has_logs = 1 has_logs = 1
vending_sound = "machines/vending/vending_cans.ogg"
/obj/machinery/vending/assist /obj/machinery/vending/assist
products = list( /obj/item/device/assembly/prox_sensor = 5,/obj/item/device/assembly/igniter = 3,/obj/item/device/assembly/signaler = 4, products = list( /obj/item/device/assembly/prox_sensor = 5,/obj/item/device/assembly/igniter = 3,/obj/item/device/assembly/signaler = 4,
@@ -758,6 +759,7 @@
products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25) products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25)
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10)
prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 3, /obj/item/weapon/reagent_containers/food/drinks/tea = 3, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 3) prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 3, /obj/item/weapon/reagent_containers/food/drinks/tea = 3, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 3)
vending_sound = "machines/vending/vending_coffee.ogg"
/obj/machinery/vending/snack /obj/machinery/vending/snack
name = "Getmore Chocolate Corp" name = "Getmore Chocolate Corp"
@@ -791,6 +793,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 1, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1) /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
vending_sound = "machines/vending/vending_cans.ogg"
/obj/machinery/vending/fitness /obj/machinery/vending/fitness
name = "SweatMAX" name = "SweatMAX"
@@ -1053,6 +1056,7 @@
products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 30) // TODO Russian soda can products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 30) // TODO Russian soda can
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 20) // TODO Russian cola can contraband = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 20) // TODO Russian cola can
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
vending_sound = "machines/vending/vending_cans.ogg"
/obj/machinery/vending/tool /obj/machinery/vending/tool
name = "YouTool" name = "YouTool"

View File

@@ -92,6 +92,8 @@
var/icon/default_worn_icon //Default on-mob icon var/icon/default_worn_icon //Default on-mob icon
var/worn_layer //Default on-mob layer var/worn_layer //Default on-mob layer
var/drop_sound = 'sound/items/drop/device.ogg' // drop sound - this is the default
/obj/item/New() /obj/item/New()
..() ..()
if(embed_chance < 0) if(embed_chance < 0)
@@ -274,6 +276,11 @@
/obj/item/proc/moved(mob/user as mob, old_loc as turf) /obj/item/proc/moved(mob/user as mob, old_loc as turf)
return return
/obj/item/throw_impact(atom/hit_atom)
..()
if(drop_sound)
playsound(src, drop_sound, 50, 0, preference = /datum/client_preference/drop_sounds)
// apparently called whenever an item is removed from a slot, container, or anything else. // apparently called whenever an item is removed from a slot, container, or anything else.
/obj/item/proc/dropped(mob/user as mob) /obj/item/proc/dropped(mob/user as mob)
..() ..()

View File

@@ -1053,6 +1053,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/mob/M = loc var/mob/M = loc
M.put_in_hands(id) M.put_in_hands(id)
to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>") to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>")
playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1)
else else
id.loc = get_turf(src) id.loc = get_turf(src)
id = null id = null
@@ -1259,6 +1260,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (cartridge.radio) if (cartridge.radio)
cartridge.radio.hostpda = null cartridge.radio.hostpda = null
to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>") to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>")
playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1)
cartridge = null cartridge = null
/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.

View File

@@ -10,6 +10,7 @@
var/heal_brute = 0 var/heal_brute = 0
var/heal_burn = 0 var/heal_burn = 0
var/apply_sounds var/apply_sounds
drop_sound = 'sound/items/drop/box.ogg'
var/upgrade_to // The type path this stack can be upgraded to. var/upgrade_to // The type path this stack can be upgraded to.
@@ -143,6 +144,7 @@
origin_tech = list(TECH_BIO = 1) origin_tech = list(TECH_BIO = 1)
no_variants = FALSE no_variants = FALSE
apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg') apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg')
drop_sound = 'sound/items/drop/gloves.ogg'
upgrade_to = /obj/item/stack/medical/advanced/bruise_pack upgrade_to = /obj/item/stack/medical/advanced/bruise_pack
@@ -212,6 +214,7 @@
origin_tech = list(TECH_BIO = 1) origin_tech = list(TECH_BIO = 1)
no_variants = FALSE no_variants = FALSE
apply_sounds = list('sound/effects/ointment.ogg') apply_sounds = list('sound/effects/ointment.ogg')
drop_sound = 'sound/items/drop/herb.ogg'
/obj/item/stack/medical/ointment/attack(mob/living/carbon/M as mob, mob/user as mob) /obj/item/stack/medical/ointment/attack(mob/living/carbon/M as mob, mob/user as mob)
if(..()) if(..())
@@ -352,6 +355,7 @@
icon_state = "splint" icon_state = "splint"
amount = 5 amount = 5
max_amount = 5 max_amount = 5
drop_sound = 'sound/items/drop/hat.ogg'
var/list/splintable_organs = list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO) //List of organs you can splint, natch. var/list/splintable_organs = list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO) //List of organs you can splint, natch.

View File

@@ -16,6 +16,7 @@
icon_state = "sheet-glass" icon_state = "sheet-glass"
var/is_reinforced = 0 var/is_reinforced = 0
default_type = "glass" default_type = "glass"
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/stack/material/glass/attack_self(mob/user as mob) /obj/item/stack/material/glass/attack_self(mob/user as mob)
construct_window(user) construct_window(user)

View File

@@ -4,6 +4,7 @@
singular_name = "human skin piece" singular_name = "human skin piece"
icon_state = "sheet-hide" icon_state = "sheet-hide"
no_variants = FALSE no_variants = FALSE
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/stack/material/animalhide/human /obj/item/stack/material/animalhide/human
amount = 50 amount = 50

View File

@@ -17,6 +17,7 @@
randpixel = 7 randpixel = 7
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
max_amount = 60 max_amount = 60
drop_sound = 'sound/items/drop/axe.ogg'
/obj/item/stack/tile/New() /obj/item/stack/tile/New()
..() ..()
@@ -37,6 +38,7 @@
flags = 0 flags = 0
origin_tech = list(TECH_BIO = 1) origin_tech = list(TECH_BIO = 1)
no_variants = FALSE no_variants = FALSE
drop_sound = 'sound/items/drop/herb.ogg'
/* /*
* Wood * Wood
*/ */
@@ -51,6 +53,7 @@
throw_range = 20 throw_range = 20
flags = 0 flags = 0
no_variants = FALSE no_variants = FALSE
drop_sound = 'sound/items/drop/wooden.ogg'
/obj/item/stack/tile/wood/sif /obj/item/stack/tile/wood/sif
name = "alien wood tile" name = "alien wood tile"
@@ -80,6 +83,7 @@
throw_range = 20 throw_range = 20
flags = 0 flags = 0
no_variants = FALSE no_variants = FALSE
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/stack/tile/carpet/teal /obj/item/stack/tile/carpet/teal
name = "teal carpet" name = "teal carpet"

View File

@@ -26,6 +26,7 @@
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20
force = 0 force = 0
drop_sound = 'sound/items/drop/gloves.ogg'
/* /*
@@ -36,6 +37,7 @@
desc = "A translucent balloon. There's nothing in it." desc = "A translucent balloon. There's nothing in it."
icon = 'icons/obj/toy.dmi' icon = 'icons/obj/toy.dmi'
icon_state = "waterballoon-e" icon_state = "waterballoon-e"
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/toy/balloon/New() /obj/item/toy/balloon/New()
var/datum/reagents/R = new/datum/reagents(10) var/datum/reagents/R = new/datum/reagents(10)
@@ -99,6 +101,7 @@
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "syndballoon" icon_state = "syndballoon"
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/toy/nanotrasenballoon /obj/item/toy/nanotrasenballoon
name = "criminal balloon" name = "criminal balloon"
@@ -110,6 +113,7 @@
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "ntballoon" icon_state = "ntballoon"
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
drop_sound = 'sound/items/drop/rubber.ogg'
/* /*
* Fake telebeacon * Fake telebeacon
@@ -147,6 +151,7 @@
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
attack_verb = list("attacked", "struck", "hit") attack_verb = list("attacked", "struck", "hit")
var/bullets = 5 var/bullets = 5
drop_sound = 'sound/items/drop/gun.ogg'
examine(mob/user) examine(mob/user)
if(..(user, 2) && bullets) if(..(user, 2) && bullets)
@@ -239,6 +244,7 @@
icon_state = "foamdart" icon_state = "foamdart"
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
drop_sound = 'sound/items/drop/food.ogg'
/obj/effect/foam_dart_dummy /obj/effect/foam_dart_dummy
name = "" name = ""
@@ -256,6 +262,7 @@
desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up." desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "esword" icon_state = "esword"
drop_sound = 'sound/items/drop/gun.ogg'
var/lcolor var/lcolor
var/rainbow = FALSE var/rainbow = FALSE
item_icons = list( item_icons = list(
@@ -344,6 +351,7 @@
icon = 'icons/obj/toy.dmi' icon = 'icons/obj/toy.dmi'
icon_state = "snappop" icon_state = "snappop"
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
drop_sound = null
throw_impact(atom/hit_atom) throw_impact(atom/hit_atom)
..() ..()
@@ -378,6 +386,7 @@
name = "water flower" name = "water flower"
desc = "A seemingly innocent sunflower...with a twist." desc = "A seemingly innocent sunflower...with a twist."
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
drop_sound = 'sound/items/drop/food.ogg'
icon_state = "sunflower" icon_state = "sunflower"
item_state = "sunflower" item_state = "sunflower"
var/empty = 0 var/empty = 0
@@ -448,6 +457,7 @@
desc = "A genuine Admiral Krush Bosun's Whistle, for the aspiring ship's captain! Suitable for ages 8 and up, do not swallow." desc = "A genuine Admiral Krush Bosun's Whistle, for the aspiring ship's captain! Suitable for ages 8 and up, do not swallow."
icon = 'icons/obj/toy.dmi' icon = 'icons/obj/toy.dmi'
icon_state = "bosunwhistle" icon_state = "bosunwhistle"
drop_sound = 'sound/items/drop/card.ogg'
var/cooldown = 0 var/cooldown = 0
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS | SLOT_HOLSTER slot_flags = SLOT_EARS | SLOT_HOLSTER
@@ -465,6 +475,7 @@
icon = 'icons/obj/toy.dmi' icon = 'icons/obj/toy.dmi'
icon_state = "ripleytoy" icon_state = "ripleytoy"
var/cooldown = 0 var/cooldown = 0
drop_sound = 'sound/mecha/mechstep.ogg'
//all credit to skasi for toy mech fun ideas //all credit to skasi for toy mech fun ideas
/obj/item/toy/prize/attack_self(mob/user as mob) /obj/item/toy/prize/attack_self(mob/user as mob)
@@ -546,6 +557,7 @@
icon_state = "nuketoy" icon_state = "nuketoy"
var/cooldown = 0 var/cooldown = 0
var/toysay = "What the fuck did you do?" var/toysay = "What the fuck did you do?"
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/toy/figure/New() /obj/item/toy/figure/New()
..() ..()
@@ -970,6 +982,7 @@
desc = "A small toy plushie. It's very cute." desc = "A small toy plushie. It's very cute."
icon = 'icons/obj/toy.dmi' icon = 'icons/obj/toy.dmi'
icon_state = "nymphplushie" icon_state = "nymphplushie"
drop_sound = 'sound/items/drop/plushie.ogg'
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
var/last_message = 0 var/last_message = 0
var/pokephrase = "Uww!" var/pokephrase = "Uww!"
@@ -1007,6 +1020,7 @@
user.visible_message("<span class='warning'><b>\The [user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>") user.visible_message("<span class='warning'><b>\The [user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
else else
user.visible_message("<span class='notice'><b>\The [user]</b> pokes [src].</span>","<span class='notice'>You poke [src].</span>") user.visible_message("<span class='notice'><b>\The [user]</b> pokes [src].</span>","<span class='notice'>You poke [src].</span>")
playsound(src, 'sound/items/drop/plushie.ogg', 25, 0)
visible_message("[src] says, \"[pokephrase]\"") visible_message("[src] says, \"[pokephrase]\"")
last_message = world.time last_message = world.time
@@ -1488,6 +1502,7 @@
icon_state = "inflatable" icon_state = "inflatable"
icon = 'icons/obj/clothing/belts.dmi' icon = 'icons/obj/clothing/belts.dmi'
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/toy/xmastree /obj/item/toy/xmastree
name = "Miniature Christmas tree" name = "Miniature Christmas tree"
@@ -1497,3 +1512,4 @@
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
force = 1 force = 1
throwforce = 1 throwforce = 1
drop_sound = 'sound/items/drop/box.ogg'

View File

@@ -6,6 +6,7 @@
icon = 'icons/obj/trash.dmi' icon = 'icons/obj/trash.dmi'
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
desc = "This is rubbish." desc = "This is rubbish."
drop_sound = 'sound/items/drop/wrapper.ogg'
/obj/item/trash/raisins /obj/item/trash/raisins
name = "\improper 4no raisins" name = "\improper 4no raisins"
@@ -38,6 +39,7 @@
/obj/item/trash/unajerky /obj/item/trash/unajerky
name = "Moghes Imported Sissalik Jerky" name = "Moghes Imported Sissalik Jerky"
icon_state = "unathitinred" icon_state = "unathitinred"
drop_sound = 'sound/items/drop/soda.ogg'
/obj/item/trash/syndi_cakes /obj/item/trash/syndi_cakes
name = "syndi cakes" name = "syndi cakes"
@@ -66,6 +68,7 @@
/obj/item/trash/tray /obj/item/trash/tray
name = "tray" name = "tray"
icon_state = "tray" icon_state = "tray"
drop_sound = 'sound/items/trayhit1.ogg'
/obj/item/trash/candle /obj/item/trash/candle
name = "candle" name = "candle"

View File

@@ -34,6 +34,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
origin_tech = list(TECH_MATERIAL = 1) origin_tech = list(TECH_MATERIAL = 1)
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
attack_verb = list("burnt", "singed") attack_verb = list("burnt", "singed")
drop_sound = null
/obj/item/weapon/flame/match/process() /obj/item/weapon/flame/match/process()
if(isliving(loc)) if(isliving(loc))
@@ -90,6 +91,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/ignitermes = "USER lights NAME with FLAME" var/ignitermes = "USER lights NAME with FLAME"
var/brand var/brand
blood_sprite_state = null //Can't bloody these blood_sprite_state = null //Can't bloody these
drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg'
/obj/item/clothing/mask/smokable/Initialize() /obj/item/clothing/mask/smokable/Initialize()
. = ..() . = ..()
@@ -158,6 +160,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/proc/light(var/flavor_text = "[usr] lights the [name].") /obj/item/clothing/mask/smokable/proc/light(var/flavor_text = "[usr] lights the [name].")
if(!src.lit) if(!src.lit)
src.lit = 1 src.lit = 1
playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1)
damtype = "fire" damtype = "fire"
if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire
var/datum/effect/effect/system/reagents_explosion/e = new() var/datum/effect/effect/system/reagents_explosion/e = new()
@@ -182,6 +185,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0) /obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0)
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
set_light(0) set_light(0)
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
if (type_butt) if (type_butt)
var/obj/item/butt = new type_butt(T) var/obj/item/butt = new type_butt(T)
@@ -203,6 +207,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/mob/living/M = loc var/mob/living/M = loc
if (!nomessage) if (!nomessage)
to_chat(M, "<span class='notice'>Your [name] goes out, and you empty the ash.</span>") to_chat(M, "<span class='notice'>Your [name] goes out, and you empty the ash.</span>")
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
lit = 0 lit = 0
icon_state = initial(icon_state) icon_state = initial(icon_state)
item_state = initial(item_state) item_state = initial(item_state)
@@ -225,6 +230,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
to_chat(H, "<span class='warning'>\The [blocked] is in the way!</span>") to_chat(H, "<span class='warning'>\The [blocked] is in the way!</span>")
return 1 return 1
to_chat(H, "<span class='notice'>You take a drag on your [name].</span>") to_chat(H, "<span class='notice'>You take a drag on your [name].</span>")
playsound(src, 'sound/items/cigs_lighters/inhale.ogg', 50, 0, -1)
smoke(5) smoke(5)
return 1 return 1
return ..() return ..()
@@ -319,6 +325,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(lit == 1) if(lit == 1)
if(user.a_intent == I_HURT) if(user.a_intent == I_HURT)
user.visible_message("<span class='notice'>[user] drops and treads on the lit [src], putting it out instantly.</span>") user.visible_message("<span class='notice'>[user] drops and treads on the lit [src], putting it out instantly.</span>")
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
die(1) die(1)
else else
user.visible_message("<span class='notice'>[user] puts out \the [src].</span>") user.visible_message("<span class='notice'>[user] puts out \the [src].</span>")
@@ -412,6 +419,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(lit == 1) if(lit == 1)
if(user.a_intent == I_HURT) if(user.a_intent == I_HURT)
user.visible_message("<span class='notice'>[user] empties the lit [src] on the floor!.</span>") user.visible_message("<span class='notice'>[user] empties the lit [src] on the floor!.</span>")
playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
die(1) die(1)
else else
user.visible_message("<span class='notice'>[user] puts out \the [src].</span>") user.visible_message("<span class='notice'>[user] puts out \the [src].</span>")

View File

@@ -8,6 +8,7 @@
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
var/colour = "red" var/colour = "red"
var/open = 0 var/open = 0
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/weapon/lipstick/purple /obj/item/weapon/lipstick/purple
name = "purple lipstick" name = "purple lipstick"

View File

@@ -12,6 +12,7 @@
force = 10 force = 10
matter = list(DEFAULT_WALL_MATERIAL = 90) matter = list(DEFAULT_WALL_MATERIAL = 90)
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
drop_sound = 'sound/items/drop/gascan.ogg'
var/spray_particles = 3 var/spray_particles = 3
var/spray_amount = 10 //units of liquid per particle var/spray_amount = 10 //units of liquid per particle

View File

@@ -13,6 +13,7 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "gift1" icon_state = "gift1"
item_state = "gift1" item_state = "gift1"
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/weapon/a_gift/New() /obj/item/weapon/a_gift/New()
..() ..()
@@ -26,6 +27,7 @@
/obj/item/weapon/gift/attack_self(mob/user as mob) /obj/item/weapon/gift/attack_self(mob/user as mob)
user.drop_item() user.drop_item()
playsound(src.loc, 'sound/items/package_unwrap.ogg', 50,1)
if(src.gift) if(src.gift)
user.put_in_active_hand(gift) user.put_in_active_hand(gift)
src.gift.add_fingerprint(user) src.gift.add_fingerprint(user)

View File

@@ -11,6 +11,7 @@
throw_range = 5 throw_range = 5
origin_tech = list(TECH_MATERIAL = 1) origin_tech = list(TECH_MATERIAL = 1)
matter = list(DEFAULT_WALL_MATERIAL = 500) matter = list(DEFAULT_WALL_MATERIAL = 500)
drop_sound = 'sound/items/drop/accessory.ogg'
var/elastic var/elastic
var/dispenser = 0 var/dispenser = 0
var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes

View File

@@ -20,6 +20,7 @@
var/associated_account_number = 0 var/associated_account_number = 0
var/list/files = list( ) var/list/files = list( )
drop_sound = 'sound/items/drop/card.ogg'
/obj/item/weapon/card/data /obj/item/weapon/card/data
name = "data disk" name = "data disk"

View File

@@ -103,6 +103,7 @@
force_divisor = 0.7 // 10 when wielded with weight 15 (wood) force_divisor = 0.7 // 10 when wielded with weight 15 (wood)
dulled_divisor = 0.75 // Still a club dulled_divisor = 0.75 // Still a club
thrown_force_divisor = 1 // as above thrown_force_divisor = 1 // as above
drop_sound = 'sound/items/drop/wooden.ogg'
/obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) /obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
if ((CLUMSY in user.mutations) && prob(50)) if ((CLUMSY in user.mutations) && prob(50))

View File

@@ -9,6 +9,7 @@
attack_verb = list("patted", "tapped") attack_verb = list("patted", "tapped")
force_divisor = 0.25 // 15 when wielded with hardness 60 (steel) force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel) thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
drop_sound = 'sound/items/drop/knife.ogg'
/obj/item/weapon/material/butterfly/update_force() /obj/item/weapon/material/butterfly/update_force()
if(active) if(active)
@@ -65,6 +66,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 12000) matter = list(DEFAULT_WALL_MATERIAL = 12000)
origin_tech = list(TECH_MATERIAL = 1) origin_tech = list(TECH_MATERIAL = 1)
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
drop_sound = 'sound/items/drop/knife.ogg'
/obj/item/weapon/material/knife/suicide_act(mob/user) /obj/item/weapon/material/knife/suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()] var/datum/gender/TU = gender_datums[user.get_visible_gender()]

View File

@@ -21,6 +21,7 @@
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
attack_verb = list("chopped", "torn", "cut") attack_verb = list("chopped", "torn", "cut")
applies_material_colour = 0 applies_material_colour = 0
drop_sound = 'sound/items/drop/axe.ogg'
/obj/item/weapon/material/knife/machete/hatchet/unathiknife /obj/item/weapon/material/knife/machete/hatchet/unathiknife
name = "duelling knife" name = "duelling knife"

View File

@@ -9,6 +9,7 @@
edge = 1 edge = 1
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg' hitsound = 'sound/weapons/bladeslice.ogg'
drop_sound = 'sound/items/drop/sword.ogg'
/obj/item/weapon/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") /obj/item/weapon/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(unique_parry_check(user, attacker, damage_source) && prob(50)) if(unique_parry_check(user, attacker, damage_source) && prob(50))

View File

@@ -95,6 +95,7 @@
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
applies_material_colour = 0 applies_material_colour = 0
can_cleave = TRUE can_cleave = TRUE
drop_sound = 'sound/items/drop/axe.ogg'
/obj/item/weapon/material/twohanded/fireaxe/update_held_icon() /obj/item/weapon/material/twohanded/fireaxe/update_held_icon()
var/mob/living/M = loc var/mob/living/M = loc

View File

@@ -16,11 +16,8 @@
max_storage_space = INVENTORY_STANDARD_SPACE max_storage_space = INVENTORY_STANDARD_SPACE
var/flippable = 0 var/flippable = 0
var/side = 0 //0 = right, 1 = left var/side = 0 //0 = right, 1 = left
drop_sound = 'sound/items/drop/backpack.ogg'
/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (src.use_sound)
playsound(src.loc, src.use_sound, 50, 1, -5)
..()
/obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot) /obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot)
if (slot == slot_back && src.use_sound) if (slot == slot_back && src.use_sound)

View File

@@ -23,6 +23,7 @@
display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients
use_to_pickup = 1 use_to_pickup = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
drop_sound = 'sound/items/drop/backpack.ogg'
// ----------------------------- // -----------------------------
// Trash bag // Trash bag
@@ -33,6 +34,7 @@
icon = 'icons/obj/janitor.dmi' icon = 'icons/obj/janitor.dmi'
icon_state = "trashbag0" icon_state = "trashbag0"
item_state_slots = list(slot_r_hand_str = "trashbag", slot_l_hand_str = "trashbag") item_state_slots = list(slot_r_hand_str = "trashbag", slot_l_hand_str = "trashbag")
drop_sound = 'sound/items/drop/wrapper.ogg'
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
max_w_class = ITEMSIZE_SMALL max_w_class = ITEMSIZE_SMALL
@@ -59,6 +61,7 @@
desc = "It's a very flimsy, very noisy alternative to a bag." desc = "It's a very flimsy, very noisy alternative to a bag."
icon = 'icons/obj/trash.dmi' icon = 'icons/obj/trash.dmi'
icon_state = "plasticbag" icon_state = "plasticbag"
drop_sound = 'sound/items/drop/wrapper.ogg'
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
max_w_class = ITEMSIZE_SMALL max_w_class = ITEMSIZE_SMALL

View File

@@ -9,6 +9,7 @@
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined") attack_verb = list("whipped", "lashed", "disciplined")
sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi') sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi')
drop_sound = 'sound/items/drop/leather.ogg'
var/show_above_suit = 0 var/show_above_suit = 0

View File

@@ -7,6 +7,8 @@
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
var/mob/affecting = null var/mob/affecting = null
var/deity_name = "Christ" var/deity_name = "Christ"
use_sound = 'sound/bureaucracy/bookopen.ogg'
drop_sound = 'sound/bureaucracy/bookclose.ogg'
/obj/item/weapon/storage/bible/booze /obj/item/weapon/storage/bible/booze
name = "bible" name = "bible"

View File

@@ -28,6 +28,8 @@
var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
max_w_class = ITEMSIZE_SMALL max_w_class = ITEMSIZE_SMALL
max_storage_space = INVENTORY_BOX_SPACE max_storage_space = INVENTORY_BOX_SPACE
use_sound = 'sound/items/storage/box.ogg'
drop_sound = 'sound/items/drop/box.ogg'
// BubbleWrap - A box can be folded up to make card // BubbleWrap - A box can be folded up to make card
/obj/item/weapon/storage/box/attack_self(mob/user as mob) /obj/item/weapon/storage/box/attack_self(mob/user as mob)
@@ -50,6 +52,7 @@
return return
// Now make the cardboard // Now make the cardboard
to_chat(user, "<span class='notice'>You fold [src] flat.</span>") to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
playsound(src.loc, 'sound/items/storage/boxfold.ogg', 30, 1)
new foldable(get_turf(src)) new foldable(get_turf(src))
qdel(src) qdel(src)
@@ -406,10 +409,15 @@
/obj/item/weapon/storage/box/matches/attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob) /obj/item/weapon/storage/box/matches/attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob)
if(istype(W) && !W.lit && !W.burnt) if(istype(W) && !W.lit && !W.burnt)
W.lit = 1 if(prob(25))
W.damtype = "burn" playsound(src.loc, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1)
W.icon_state = "match_lit" user.visible_message("<span class='notice'>[user] manages to light the match on the matchbox.</span>")
START_PROCESSING(SSobj, W) W.lit = 1
W.damtype = "burn"
W.icon_state = "match_lit"
START_PROCESSING(SSprocessing, W)
else
playsound(src.loc, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1)
W.update_icon() W.update_icon()
return return

View File

@@ -8,6 +8,8 @@
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
max_w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL
max_storage_space = ITEMSIZE_COST_NORMAL * 4 max_storage_space = ITEMSIZE_COST_NORMAL * 4
use_sound = 'sound/items/storage/briefcase.ogg'
drop_sound = 'sound/items/drop/backpack.ogg'
/obj/item/weapon/storage/briefcase/clutch /obj/item/weapon/storage/briefcase/clutch
name = "clutch purse" name = "clutch purse"

View File

@@ -15,6 +15,7 @@
throw_range = 8 throw_range = 8
max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14 max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14
var/list/icon_variety var/list/icon_variety
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/weapon/storage/firstaid/Initialize() /obj/item/weapon/storage/firstaid/Initialize()
. = ..() . = ..()
@@ -171,13 +172,14 @@
desc = "It's an airtight container for storing medication." desc = "It's an airtight container for storing medication."
icon_state = "pill_canister" icon_state = "pill_canister"
icon = 'icons/obj/chemical.dmi' icon = 'icons/obj/chemical.dmi'
drop_sound = 'sound/items/drop/pillbottle.ogg'
item_state_slots = list(slot_r_hand_str = "contsolid", slot_l_hand_str = "contsolid") item_state_slots = list(slot_r_hand_str = "contsolid", slot_l_hand_str = "contsolid")
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper) can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper)
allow_quick_gather = 1 allow_quick_gather = 1
allow_quick_empty = 1 allow_quick_empty = 1
use_to_pickup = 1 use_to_pickup = 1
use_sound = null use_sound = 'sound/items/storage/pillbottle.ogg'
max_storage_space = ITEMSIZE_COST_TINY * 14 max_storage_space = ITEMSIZE_COST_TINY * 14
max_w_class = ITEMSIZE_TINY max_w_class = ITEMSIZE_TINY
var/wrapper_color var/wrapper_color

View File

@@ -26,6 +26,7 @@
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
max_w_class = ITEMSIZE_SMALL max_w_class = ITEMSIZE_SMALL
max_storage_space = ITEMSIZE_SMALL * 7 max_storage_space = ITEMSIZE_SMALL * 7
use_sound = 'sound/items/storage/briefcase.ogg'
examine(mob/user) examine(mob/user)
if(..(user, 1)) if(..(user, 1))

View File

@@ -141,8 +141,8 @@
is_seeing -= user is_seeing -= user
/obj/item/weapon/storage/proc/open(mob/user as mob) /obj/item/weapon/storage/proc/open(mob/user as mob)
if (src.use_sound && !isobserver(user)) if (use_sound)
playsound(src.loc, src.use_sound, 50, 1, -5) playsound(src.loc, src.use_sound, 50, 0, -5)
orient2hud(user) orient2hud(user)
if (user.s_active) if (user.s_active)

View File

@@ -14,6 +14,8 @@
max_storage_space = ITEMSIZE_COST_SMALL * 7 //enough to hold all starting contents max_storage_space = ITEMSIZE_COST_SMALL * 7 //enough to hold all starting contents
origin_tech = list(TECH_COMBAT = 1) origin_tech = list(TECH_COMBAT = 1)
attack_verb = list("robusted") attack_verb = list("robusted")
use_sound = 'sound/items/storage/toolbox.ogg'
drop_sound = 'sound/items/drop/metalboots.ogg'
/obj/item/weapon/storage/toolbox/emergency /obj/item/weapon/storage/toolbox/emergency
name = "emergency toolbox" name = "emergency toolbox"

View File

@@ -30,6 +30,7 @@
icon_state = "retractor" icon_state = "retractor"
matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000) matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000)
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
drop_sound = 'sound/items/drop/scrap.ogg'
/* /*
* Hemostat * Hemostat
@@ -41,6 +42,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500) matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("attacked", "pinched") attack_verb = list("attacked", "pinched")
drop_sound = 'sound/items/drop/scrap.ogg'
/* /*
* Cautery * Cautery
@@ -52,6 +54,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500) matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("burnt") attack_verb = list("burnt")
drop_sound = 'sound/items/drop/scrap.ogg'
/* /*
* Surgical Drill * Surgical Drill
@@ -66,6 +69,7 @@
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
attack_verb = list("drilled") attack_verb = list("drilled")
drop_sound = 'sound/items/drop/accessory.ogg'
suicide_act(mob/user) suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()] var/datum/gender/TU = gender_datums[user.get_visible_gender()]
@@ -91,6 +95,7 @@
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000) matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000)
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
drop_sound = 'sound/items/drop/knife.ogg'
suicide_act(mob/user) suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()] var/datum/gender/TU = gender_datums[user.get_visible_gender()]
@@ -145,6 +150,7 @@
desc = "For heavy duty cutting." desc = "For heavy duty cutting."
icon_state = "saw3" icon_state = "saw3"
hitsound = 'sound/weapons/circsawhit.ogg' hitsound = 'sound/weapons/circsawhit.ogg'
drop_sound = 'sound/items/drop/accessory.ogg'
force = 15.0 force = 15.0
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
throwforce = 9.0 throwforce = 9.0
@@ -176,6 +182,7 @@
icon_state = "bone-gel" icon_state = "bone-gel"
force = 0 force = 0
throwforce = 1.0 throwforce = 1.0
drop_sound = 'sound/items/drop/bottle.ogg'
/obj/item/weapon/surgical/FixOVein /obj/item/weapon/surgical/FixOVein
name = "FixOVein" name = "FixOVein"
@@ -185,6 +192,7 @@
throwforce = 1.0 throwforce = 1.0
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3)
var/usage_amount = 10 var/usage_amount = 10
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/weapon/surgical/bonesetter /obj/item/weapon/surgical/bonesetter
name = "bone setter" name = "bone setter"
@@ -195,6 +203,7 @@
throw_speed = 3 throw_speed = 3
throw_range = 5 throw_range = 5
attack_verb = list("attacked", "hit", "bludgeoned") attack_verb = list("attacked", "hit", "bludgeoned")
drop_sound = 'sound/items/drop/scrap.ogg'
/obj/item/weapon/surgical/bone_clamp /obj/item/weapon/surgical/bone_clamp
name = "bone clamp" name = "bone clamp"

View File

@@ -8,6 +8,17 @@
/* /*
* Classic Baton * Classic Baton
*/ */
/obj/item/weapon/melee
name = "weapon"
desc = "Murder device."
icon = 'icons/obj/weapons.dmi'
icon_state = "baton"
item_state = "classic_baton"
slot_flags = SLOT_BELT
force = 10
drop_sound = 'sound/items/drop/metalweapon.ogg'
/obj/item/weapon/melee/classic_baton /obj/item/weapon/melee/classic_baton
name = "police baton" name = "police baton"
desc = "A wooden truncheon for beating criminal scum." desc = "A wooden truncheon for beating criminal scum."

View File

@@ -10,6 +10,7 @@ var/list/global/tank_gauge_cache = list()
sprite_sheets = list( sprite_sheets = list(
SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi' SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi'
) )
drop_sound = 'sound/items/drop/gascan.ogg'
var/gauge_icon = "indicator_tank" var/gauge_icon = "indicator_tank"
var/last_gauge_pressure var/last_gauge_pressure

View File

@@ -4,6 +4,7 @@
icon = 'icons/obj/bureaucracy.dmi' icon = 'icons/obj/bureaucracy.dmi'
icon_state = "taperoll" icon_state = "taperoll"
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
drop_sound = 'sound/items/drop/box.ogg'
toolspeed = 2 //It is now used in surgery as a not awful, but probably dangerous option, due to speed. toolspeed = 2 //It is now used in surgery as a not awful, but probably dangerous option, due to speed.
@@ -141,6 +142,7 @@
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
plane = MOB_PLANE plane = MOB_PLANE
anchored = FALSE anchored = FALSE
drop_sound = null
var/obj/item/weapon/stuck = null var/obj/item/weapon/stuck = null

View File

@@ -17,6 +17,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 50) matter = list(DEFAULT_WALL_MATERIAL = 50)
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
usesound = 'sound/items/crowbar.ogg' usesound = 'sound/items/crowbar.ogg'
drop_sound = 'sound/items/drop/sword.ogg'
toolspeed = 1 toolspeed = 1
/obj/item/weapon/tool/crowbar/is_crowbar() /obj/item/weapon/tool/crowbar/is_crowbar()

View File

@@ -15,6 +15,7 @@
throw_range = 5 throw_range = 5
hitsound = 'sound/weapons/bladeslice.ogg' hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/screwdriver.ogg' usesound = 'sound/items/screwdriver.ogg'
drop_sound = 'sound/items/drop/scrap.ogg'
matter = list(DEFAULT_WALL_MATERIAL = 75) matter = list(DEFAULT_WALL_MATERIAL = 75)
attack_verb = list("stabbed") attack_verb = list("stabbed")
sharp = 1 sharp = 1

View File

@@ -37,6 +37,7 @@
var/burned_fuel_for = 0 // Keeps track of how long the welder's been on, used to gradually empty the welder if left one, without RNG. var/burned_fuel_for = 0 // Keeps track of how long the welder's been on, used to gradually empty the welder if left one, without RNG.
var/always_process = FALSE // If true, keeps the welder on the process list even if it's off. Used for when it needs to regenerate fuel. var/always_process = FALSE // If true, keeps the welder on the process list even if it's off. Used for when it needs to regenerate fuel.
toolspeed = 1 toolspeed = 1
drop_sound = 'sound/items/drop/scrap.ogg'
/obj/item/weapon/weldingtool/Initialize() /obj/item/weapon/weldingtool/Initialize()
. = ..() . = ..()

View File

@@ -17,6 +17,7 @@
attack_verb = list("pinched", "nipped") attack_verb = list("pinched", "nipped")
hitsound = 'sound/items/wirecutter.ogg' hitsound = 'sound/items/wirecutter.ogg'
usesound = 'sound/items/wirecutter.ogg' usesound = 'sound/items/wirecutter.ogg'
drop_sound = 'sound/items/drop/knife.ogg'
sharp = 1 sharp = 1
edge = 1 edge = 1
toolspeed = 1 toolspeed = 1

View File

@@ -15,6 +15,7 @@
attack_verb = list("bashed", "battered", "bludgeoned", "whacked") attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
usesound = 'sound/items/ratchet.ogg' usesound = 'sound/items/ratchet.ogg'
toolspeed = 1 toolspeed = 1
drop_sound = 'sound/items/drop/sword.ogg'
/obj/item/weapon/tool/wrench/is_wrench() /obj/item/weapon/tool/wrench/is_wrench()
return TRUE return TRUE

View File

@@ -8,6 +8,7 @@
attack_verb = list("whipped") attack_verb = list("whipped")
hitsound = 'sound/weapons/towelwhip.ogg' hitsound = 'sound/weapons/towelwhip.ogg'
desc = "A soft cotton towel." desc = "A soft cotton towel."
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/weapon/towel/attack_self(mob/living/user as mob) /obj/item/weapon/towel/attack_self(mob/living/user as mob)
user.visible_message(text("<span class='notice'>[] uses [] to towel themselves off.</span>", user, src)) user.visible_message(text("<span class='notice'>[] uses [] to towel themselves off.</span>", user, src))

View File

@@ -14,6 +14,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 3000) matter = list(DEFAULT_WALL_MATERIAL = 3000)
var/list/carrying = list() // List of things on the tray. - Doohl var/list/carrying = list() // List of things on the tray. - Doohl
var/max_carry = 10 var/max_carry = 10
drop_sound = 'sound/items/trayhit1.ogg'
/obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
user.setClickCooldown(user.get_attack_speed(src)) user.setClickCooldown(user.get_attack_speed(src))

View File

@@ -9,6 +9,7 @@
throw_range = 4 throw_range = 4
throwforce = 10 throwforce = 10
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
drop_sound = 'sound/items/drop/sword.ogg'
suicide_act(mob/user) suicide_act(mob/user)
var/datum/gender/T = gender_datums[user.get_visible_gender()] var/datum/gender/T = gender_datums[user.get_visible_gender()]

View File

@@ -9,6 +9,7 @@
var/obj/item/weapon/nozzle = null //Attached welder, or other spray device. var/obj/item/weapon/nozzle = null //Attached welder, or other spray device.
var/nozzle_type = /obj/item/weapon/weldingtool/tubefed var/nozzle_type = /obj/item/weapon/weldingtool/tubefed
var/nozzle_attached = 0 var/nozzle_attached = 0
drop_sound = 'sound/items/drop/backpack.ogg'
/obj/item/weapon/weldpack/Initialize() /obj/item/weapon/weldpack/Initialize()
. = ..() . = ..()

View File

@@ -16,6 +16,7 @@ LINEN BINS
throw_speed = 1 throw_speed = 1
throw_range = 2 throw_range = 2
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/weapon/bedsheet/attack_self(mob/user as mob) /obj/item/weapon/bedsheet/attack_self(mob/user as mob)
user.drop_item() user.drop_item()

View File

@@ -3,6 +3,7 @@
desc = "A folded membrane which rapidly expands into a large cubical shape on activation." desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
icon = 'icons/obj/inflatable.dmi' icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_wall" icon_state = "folded_wall"
drop_sound = 'sound/items/drop/rubber.ogg'
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
var/deploy_path = /obj/structure/inflatable var/deploy_path = /obj/structure/inflatable

View File

@@ -288,6 +288,7 @@
/obj/structure/bed/roller/Move() /obj/structure/bed/roller/Move()
..() ..()
playsound(src, 'sound/effects/roll.ogg', 100, 1)
if(has_buckled_mobs()) if(has_buckled_mobs())
for(var/A in buckled_mobs) for(var/A in buckled_mobs)
var/mob/living/L = A var/mob/living/L = A

View File

@@ -143,6 +143,7 @@
/obj/structure/bed/chair/office/Move() /obj/structure/bed/chair/office/Move()
..() ..()
playsound(src, 'sound/effects/roll.ogg', 100, 1)
if(has_buckled_mobs()) if(has_buckled_mobs())
for(var/A in buckled_mobs) for(var/A in buckled_mobs)
var/mob/living/occupant = A var/mob/living/occupant = A

View File

@@ -93,6 +93,8 @@
/obj/structure/bed/chair/wheelchair/Move() /obj/structure/bed/chair/wheelchair/Move()
..() ..()
cut_overlays()
playsound(src, 'sound/effects/roll.ogg', 75, 1)
if(has_buckled_mobs()) if(has_buckled_mobs())
for(var/A in buckled_mobs) for(var/A in buckled_mobs)
var/mob/living/occupant = A var/mob/living/occupant = A

View File

@@ -384,6 +384,7 @@
return return
to_chat(usr, "<span class='notice'>You start washing your hands.</span>") to_chat(usr, "<span class='notice'>You start washing your hands.</span>")
playsound(loc, 'sound/effects/sink_long.ogg', 75, 1)
busy = 1 busy = 1
sleep(40) sleep(40)
@@ -406,6 +407,7 @@
if (istype(RG) && RG.is_open_container()) if (istype(RG) && RG.is_open_container())
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
user.visible_message("<span class='notice'>[user] fills \the [RG] using \the [src].</span>","<span class='notice'>You fill \the [RG] using \the [src].</span>") user.visible_message("<span class='notice'>[user] fills \the [RG] using \the [src].</span>","<span class='notice'>You fill \the [RG] using \the [src].</span>")
playsound(loc, 'sound/effects/sink.ogg', 75, 1)
return 1 return 1
else if (istype(O, /obj/item/weapon/melee/baton)) else if (istype(O, /obj/item/weapon/melee/baton))

View File

@@ -135,6 +135,7 @@
if ("button") soundin = pick('sound/machines/button1.ogg','sound/machines/button2.ogg','sound/machines/button3.ogg','sound/machines/button4.ogg') if ("button") soundin = pick('sound/machines/button1.ogg','sound/machines/button2.ogg','sound/machines/button3.ogg','sound/machines/button4.ogg')
if ("switch") soundin = pick('sound/machines/switch1.ogg','sound/machines/switch2.ogg','sound/machines/switch3.ogg','sound/machines/switch4.ogg') if ("switch") soundin = pick('sound/machines/switch1.ogg','sound/machines/switch2.ogg','sound/machines/switch3.ogg','sound/machines/switch4.ogg')
if ("casing_sound") soundin = pick('sound/weapons/casingfall1.ogg','sound/weapons/casingfall2.ogg','sound/weapons/casingfall3.ogg') if ("casing_sound") soundin = pick('sound/weapons/casingfall1.ogg','sound/weapons/casingfall2.ogg','sound/weapons/casingfall3.ogg')
if ("pickaxe") soundin = pick('sound/weapons/mine/pickaxe1.ogg', 'sound/weapons/mine/pickaxe2.ogg','sound/weapons/mine/pickaxe3.ogg','sound/weapons/mine/pickaxe4.ogg')
return soundin return soundin
//Are these even used? //Are these even used?

View File

@@ -116,6 +116,12 @@ var/list/_client_preferences_by_type
enabled_description = "Audible" enabled_description = "Audible"
disabled_description = "Silent" disabled_description = "Silent"
/datum/client_preference/drop_sounds
description = "Dropped Item Sounds"
key = "SOUND_DROPPED"
enabled_description = "Enabled"
disabled_description = "Disabled"
/datum/client_preference/mob_tooltips /datum/client_preference/mob_tooltips
description ="Mob tooltips" description ="Mob tooltips"
key = "MOB_TOOLTIPS" key = "MOB_TOOLTIPS"

View File

@@ -239,6 +239,21 @@
feedback_add_details("admin_verb","TAirPumpNoise") feedback_add_details("admin_verb","TAirPumpNoise")
/client/verb/toggle_drop_sounds()
set name = "Toggle Dropped Item Sounds"
set category = "Preferences"
set desc = "Toggles sounds when items are dropped or thrown."
var/pref_path = /datum/client_preference/drop_sounds
toggle_preference(pref_path)
to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear sounds when items are dropped or thrown.")
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb", "TDropSounds")
/client/verb/toggle_safe_firing() /client/verb/toggle_safe_firing()
set name = "Toggle Gun Firing Intent Requirement" set name = "Toggle Gun Firing Intent Requirement"
set category = "Preferences" set category = "Preferences"

View File

@@ -1,6 +1,7 @@
/obj/item/clothing /obj/item/clothing
name = "clothing" name = "clothing"
siemens_coefficient = 0.9 siemens_coefficient = 0.9
drop_sound = 'sound/items/drop/clothing.ogg'
var/list/species_restricted = null //Only these species can wear this kit. var/list/species_restricted = null //Only these species can wear this kit.
var/gunshot_residue //Used by forensics. var/gunshot_residue //Used by forensics.
@@ -530,6 +531,7 @@
if(usr.put_in_hands(holding)) if(usr.put_in_hands(holding))
usr.visible_message("<span class='danger'>\The [usr] pulls a knife out of their boot!</span>") usr.visible_message("<span class='danger'>\The [usr] pulls a knife out of their boot!</span>")
playsound(get_turf(src), 'sound/weapons/holster/sheathout.ogg', 25)
holding = null holding = null
overlays -= image(icon, "[icon_state]_knife") overlays -= image(icon, "[icon_state]_knife")
else else

View File

@@ -53,6 +53,7 @@
desc = "A delicate golden chain worn by female skrell to decorate their head tails." desc = "A delicate golden chain worn by female skrell to decorate their head tails."
icon_state = "skrell_chain" icon_state = "skrell_chain"
item_state_slots = list(slot_r_hand_str = "egg5", slot_l_hand_str = "egg5") item_state_slots = list(slot_r_hand_str = "egg5", slot_l_hand_str = "egg5")
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/clothing/ears/skrell/chain/silver /obj/item/clothing/ears/skrell/chain/silver
name = "Silver headtail chains" name = "Silver headtail chains"
@@ -83,6 +84,7 @@
desc = "Golden metallic bands worn by male skrell to adorn their head tails." desc = "Golden metallic bands worn by male skrell to adorn their head tails."
icon_state = "skrell_band" icon_state = "skrell_band"
item_state_slots = list(slot_r_hand_str = "egg5", slot_l_hand_str = "egg5") item_state_slots = list(slot_r_hand_str = "egg5", slot_l_hand_str = "egg5")
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/clothing/ears/skrell/band/silver /obj/item/clothing/ears/skrell/band/silver
name = "Silver headtail bands" name = "Silver headtail bands"

View File

@@ -27,6 +27,7 @@ BLIND // can't see anything
var/activation_sound = 'sound/items/goggles_charge.ogg' var/activation_sound = 'sound/items/goggles_charge.ogg'
var/obj/screen/overlay = null var/obj/screen/overlay = null
var/list/away_planes //Holder for disabled planes var/list/away_planes //Holder for disabled planes
drop_sound = 'sound/items/drop/accessory.ogg'
sprite_sheets = list( sprite_sheets = list(
"Teshari" = 'icons/mob/species/seromi/eyes.dmi', "Teshari" = 'icons/mob/species/seromi/eyes.dmi',
@@ -159,6 +160,7 @@ BLIND // can't see anything
item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold")
body_parts_covered = 0 body_parts_covered = 0
var/eye = null var/eye = null
drop_sound = 'sound/items/drop/gloves.ogg'
/obj/item/clothing/glasses/eyepatch/verb/switcheye() /obj/item/clothing/glasses/eyepatch/verb/switcheye()
set name = "Switch Eyepatch" set name = "Switch Eyepatch"
@@ -340,6 +342,7 @@ BLIND // can't see anything
item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold")
flash_protection = FLASH_PROTECTION_MAJOR flash_protection = FLASH_PROTECTION_MAJOR
tint = BLIND tint = BLIND
drop_sound = 'sound/items/drop/gloves.ogg'
/obj/item/clothing/glasses/sunglasses/blindfold/tape /obj/item/clothing/glasses/sunglasses/blindfold/tape
name = "length of tape" name = "length of tape"

View File

@@ -5,6 +5,7 @@
overgloves = 1 overgloves = 1
punch_force = 3 punch_force = 3
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
drop_sound = 'sound/items/drop/metalshield.ogg'
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot) /obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot)
if(..()) //This will only run if no other problems occured when equiping. if(..()) //This will only run if no other problems occured when equiping.

View File

@@ -1,9 +1,17 @@
/obj/item/clothing/gloves
desc = "you aren't supposed to see this."
name = "strange gloves"
icon_state = "black"
item_state = "bgloves"
drop_sound = 'sound/items/drop/gloves.ogg'
/obj/item/clothing/gloves/yellow /obj/item/clothing/gloves/yellow
desc = "These gloves will protect the wearer from electric shock." desc = "These gloves will protect the wearer from electric shock."
name = "insulated gloves" name = "insulated gloves"
icon_state = "yellow" icon_state = "yellow"
siemens_coefficient = 0 siemens_coefficient = 0
permeability_coefficient = 0.05 permeability_coefficient = 0.05
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/clothing/gloves/fyellow //Cheap Chinese Crap /obj/item/clothing/gloves/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap copies of proper insulated gloves. No way this can end badly." desc = "These gloves are cheap copies of proper insulated gloves. No way this can end badly."
@@ -11,6 +19,7 @@
icon_state = "yellow" icon_state = "yellow"
siemens_coefficient = 1 //Set to a default of 1, gets overridden in initialize() siemens_coefficient = 1 //Set to a default of 1, gets overridden in initialize()
permeability_coefficient = 0.05 permeability_coefficient = 0.05
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/clothing/gloves/fyellow/Initialize() /obj/item/clothing/gloves/fyellow/Initialize()
. = ..() . = ..()

View File

@@ -56,6 +56,7 @@
permeability_coefficient = 0.01 permeability_coefficient = 0.01
germ_level = 0 germ_level = 0
fingerprint_chance = 25 fingerprint_chance = 25
drop_sound = 'sound/items/drop/rubber.ogg'
// var/balloonPath = /obj/item/latexballon // var/balloonPath = /obj/item/latexballon
//TODO: Make inflating gloves a thing //TODO: Make inflating gloves a thing
@@ -81,6 +82,7 @@
item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown") item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown")
permeability_coefficient = 0.05 permeability_coefficient = 0.05
siemens_coefficient = 0.75 //thick work gloves siemens_coefficient = 0.75 //thick work gloves
drop_sound = 'sound/items/drop/leather.ogg'
/obj/item/clothing/gloves/duty /obj/item/clothing/gloves/duty
desc = "These brown duty gloves are made from a durable synthetic." desc = "These brown duty gloves are made from a durable synthetic."
@@ -109,6 +111,7 @@
siemens_coefficient = 0 siemens_coefficient = 0
permeability_coefficient = 0.05 permeability_coefficient = 0.05
species_restricted = list("Vox") species_restricted = list("Vox")
drop_sound = 'sound/items/drop/metalboots.ogg'
cold_protection = HANDS cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
@@ -127,6 +130,7 @@
overgloves = 1 overgloves = 1
force = 5 force = 5
punch_force = 5 punch_force = 5
drop_sound = 'sound/items/drop/metalboots.ogg'
/obj/item/clothing/gloves/ranger /obj/item/clothing/gloves/ranger
var/glovecolor = "white" var/glovecolor = "white"

View File

@@ -1,6 +1,11 @@
//Hat Station 13 //Hat Station 13
/obj/item/clothing/head/
name = "hat"
desc = "Apply on head."
drop_sound = 'sound/items/drop/hat.ogg'
/obj/item/clothing/head/collectable /obj/item/clothing/head/collectable
name = "collectable hat" name = "collectable hat"
desc = "A rare collectable hat." desc = "A rare collectable hat."
@@ -37,6 +42,7 @@
desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians." desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians."
icon_state = "paper" icon_state = "paper"
body_parts_covered = 0 body_parts_covered = 0
drop_sound = 'sound/items/drop/paper.ogg'
/obj/item/clothing/head/collectable/tophat /obj/item/clothing/head/collectable/tophat
name = "collectable top hat" name = "collectable top hat"

View File

@@ -36,21 +36,25 @@
desc = "A flower crown weaved with sunflowers." desc = "A flower crown weaved with sunflowers."
icon_state = "sunflower_crown" icon_state = "sunflower_crown"
body_parts_covered = 0 body_parts_covered = 0
drop_sound = 'sound/items/drop/herb.ogg'
/obj/item/clothing/head/lavender_crown /obj/item/clothing/head/lavender_crown
name = "lavender crown" name = "lavender crown"
desc = "A flower crown weaved with lavender." desc = "A flower crown weaved with lavender."
icon_state = "lavender_crown" icon_state = "lavender_crown"
body_parts_covered = 0 body_parts_covered = 0
drop_sound = 'sound/items/drop/herb.ogg'
/obj/item/clothing/head/poppy_crown /obj/item/clothing/head/poppy_crown
name = "poppy crown" name = "poppy crown"
desc = "A flower crown weaved with poppies." desc = "A flower crown weaved with poppies."
icon_state = "poppy_crown" icon_state = "poppy_crown"
body_parts_covered = 0 body_parts_covered = 0
drop_sound = 'sound/items/drop/herb.ogg'
/obj/item/clothing/head/rose_crown /obj/item/clothing/head/rose_crown
name = "rose crown" name = "rose crown"
desc = "A flower crown weaved with roses." desc = "A flower crown weaved with roses."
icon_state = "poppy_crown" icon_state = "poppy_crown"
body_parts_covered = 0 body_parts_covered = 0
drop_sound = 'sound/items/drop/herb.ogg'

View File

@@ -10,6 +10,7 @@
action_button_name = "Toggle Head-light" action_button_name = "Toggle Head-light"
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
ear_protection = 1 ear_protection = 1
drop_sound = 'sound/items/drop/helm.ogg'
/obj/item/clothing/head/hardhat/orange /obj/item/clothing/head/hardhat/orange
icon_state = "hardhat0_orange" icon_state = "hardhat0_orange"

View File

@@ -14,6 +14,7 @@
siemens_coefficient = 0.7 siemens_coefficient = 0.7
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
ear_protection = 1 ear_protection = 1
drop_sound = 'sound/items/drop/helm.ogg'
/obj/item/clothing/head/helmet/solgov /obj/item/clothing/head/helmet/solgov
name = "\improper Solar Confederate Government helmet" name = "\improper Solar Confederate Government helmet"

View File

@@ -17,6 +17,7 @@
desc = "A nice hair pin." desc = "A nice hair pin."
slot_flags = SLOT_HEAD | SLOT_EARS slot_flags = SLOT_HEAD | SLOT_EARS
body_parts_covered = 0 body_parts_covered = 0
drop_sound = 'sound/items/drop/ring.ogg'
/obj/item/clothing/head/pin/pink /obj/item/clothing/head/pin/pink
icon_state = "pinkpin" icon_state = "pinkpin"
@@ -168,6 +169,7 @@
icon_state = "cardborg_h" icon_state = "cardborg_h"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
body_parts_covered = HEAD|FACE|EYES body_parts_covered = HEAD|FACE|EYES
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/clothing/head/justice /obj/item/clothing/head/justice
name = "justice hat" name = "justice hat"
@@ -420,6 +422,7 @@
desc = "A jeweled headpiece originating in India." desc = "A jeweled headpiece originating in India."
icon_state = "maangtikka" icon_state = "maangtikka"
body_parts_covered = 0 body_parts_covered = 0
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/clothing/head/jingasa /obj/item/clothing/head/jingasa
name = "jingasa" name = "jingasa"

View File

@@ -28,6 +28,7 @@
var/base_state var/base_state
flash_protection = FLASH_PROTECTION_MAJOR flash_protection = FLASH_PROTECTION_MAJOR
tint = TINT_HEAVY tint = TINT_HEAVY
drop_sound = 'sound/items/drop/helm.ogg'
/obj/item/clothing/head/welding/attack_self() /obj/item/clothing/head/welding/attack_self()
toggle() toggle()
@@ -167,6 +168,7 @@
brightness_on = 2 brightness_on = 2
light_overlay = "helmet_light" light_overlay = "helmet_light"
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
drop_sound = 'sound/items/drop/herb.ogg'
/* /*
* Kitty ears * Kitty ears

View File

@@ -1,3 +1,11 @@
//Generic Ring
/obj/item/clothing/ring
name = "generic ring"
desc = "Torus shaped finger decoration."
icon_state = "material"
drop_sound = 'sound/items/drop/ring.ogg'
///////////////////////////////////////// /////////////////////////////////////////
//Standard Rings //Standard Rings
/obj/item/clothing/gloves/ring/engagement /obj/item/clothing/gloves/ring/engagement

View File

@@ -5,11 +5,13 @@
force = 3 force = 3
can_hold_knife = 1 can_hold_knife = 1
step_volume_mod = 1.2 step_volume_mod = 1.2
drop_sound = 'sound/items/drop/boots.ogg'
/obj/item/clothing/shoes/boots/cowboy /obj/item/clothing/shoes/boots/cowboy
name = "cowboy boots" name = "cowboy boots"
desc = "Lacking a durasteel horse to ride." desc = "Lacking a durasteel horse to ride."
icon_state = "cowboy" icon_state = "cowboy"
drop_sound = 'sound/items/drop/leather.ogg'
/obj/item/clothing/shoes/boots/cowboy/classic /obj/item/clothing/shoes/boots/cowboy/classic
name = "classic cowboy boots" name = "classic cowboy boots"

View File

@@ -1,3 +1,9 @@
/obj/item/clothing/shoes
name = "shoes"
icon_state = "white"
desc = "A pair of shoes."
drop_sound = 'sound/items/drop/shoes.ogg'
/obj/item/clothing/shoes/black /obj/item/clothing/shoes/black
name = "black shoes" name = "black shoes"
icon_state = "black" icon_state = "black"
@@ -38,6 +44,7 @@
name = "leather shoes" name = "leather shoes"
desc = "A sturdy pair of leather shoes." desc = "A sturdy pair of leather shoes."
icon_state = "leather" icon_state = "leather"
drop_sound = 'sound/items/drop/leather.ogg'
/obj/item/clothing/shoes/rainbow /obj/item/clothing/shoes/rainbow
name = "rainbow shoes" name = "rainbow shoes"

View File

@@ -7,6 +7,7 @@
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
step_volume_mod = 1.3 step_volume_mod = 1.3
can_hold_knife = TRUE can_hold_knife = TRUE
drop_sound = 'sound/items/drop/boots.ogg'
/obj/item/clothing/shoes/leg_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) /obj/item/clothing/shoes/leg_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..()) //This will only run if no other problems occured when equiping. if(..()) //This will only run if no other problems occured when equiping.

View File

@@ -16,6 +16,7 @@
var/obj/item/clothing/shoes/shoes = null //Undershoes var/obj/item/clothing/shoes/shoes = null //Undershoes
var/mob/living/carbon/human/wearer = null //For shoe procs var/mob/living/carbon/human/wearer = null //For shoe procs
step_volume_mod = 1.3 step_volume_mod = 1.3
drop_sound = 'sound/items/drop/metalboots.ogg'
/obj/item/clothing/shoes/magboots/proc/set_slowdown() /obj/item/clothing/shoes/magboots/proc/set_slowdown()
slowdown = shoes? max(SHOES_SLOWDOWN, shoes.slowdown): SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster. slowdown = shoes? max(SHOES_SLOWDOWN, shoes.slowdown): SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster.
@@ -36,6 +37,7 @@
set_slowdown() set_slowdown()
force = 5 force = 5
if(icon_base) icon_state = "[icon_base]1" if(icon_base) icon_state = "[icon_base]1"
playsound(get_turf(src), 'sound/effects/magnetclamp.ogg', 20)
to_chat(user, "You enable the mag-pulse traction system.") to_chat(user, "You enable the mag-pulse traction system.")
user.update_inv_shoes() //so our mob-overlays update user.update_inv_shoes() //so our mob-overlays update
user.update_action_buttons() user.update_action_buttons()

View File

@@ -24,6 +24,7 @@
item_flags = NOSLIP item_flags = NOSLIP
slowdown = SHOES_SLOWDOWN+1 slowdown = SHOES_SLOWDOWN+1
species_restricted = null species_restricted = null
drop_sound = 'sound/items/drop/rubber.ogg'
/obj/item/clothing/shoes/dress /obj/item/clothing/shoes/dress
name = "dress shoes" name = "dress shoes"
@@ -98,6 +99,7 @@
force = 0 force = 0
species_restricted = null species_restricted = null
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/clothing/shoes/slippers_worn /obj/item/clothing/shoes/slippers_worn
name = "worn bunny slippers" name = "worn bunny slippers"
@@ -155,6 +157,7 @@
force = 0 force = 0
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
species_restricted = null species_restricted = null
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/clothing/shoes/boots/ranger /obj/item/clothing/shoes/boots/ranger
var/bootcolor = "white" var/bootcolor = "white"

View File

@@ -25,6 +25,7 @@
can_be_placed_into = null can_be_placed_into = null
flags = OPENCONTAINER | NOBLUDGEON flags = OPENCONTAINER | NOBLUDGEON
unacidable = 0 unacidable = 0
drop_sound = 'sound/items/drop/clothing.ogg'
var/on_fire = 0 var/on_fire = 0
var/burn_time = 20 //if the rag burns for too long it turns to ashes var/burn_time = 20 //if the rag burns for too long it turns to ashes

View File

@@ -15,6 +15,7 @@
var/access = list() var/access = list()
access = access_crate_cash access = access_crate_cash
var/worth = 0 var/worth = 0
drop_sound = 'sound/items/drop/paper.ogg'
/obj/item/weapon/spacecash/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/spacecash/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/spacecash)) if(istype(W, /obj/item/weapon/spacecash))
@@ -150,6 +151,7 @@ proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
name = "charge card" name = "charge card"
icon_state = "efundcard" icon_state = "efundcard"
desc = "A card that holds an amount of money." desc = "A card that holds an amount of money."
drop_sound = 'sound/items/drop/card.ogg'
var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions. var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions.
attack_self() return //Don't act attack_self() return //Don't act
attackby() return //like actual attackby() return //like actual

View File

@@ -8,6 +8,7 @@
possible_transfer_amounts = null possible_transfer_amounts = null
volume = 50 //Sets the default container amount for all food items. volume = 50 //Sets the default container amount for all food items.
var/filling_color = "#FFFFFF" //Used by sandwiches. var/filling_color = "#FFFFFF" //Used by sandwiches.
drop_sound = 'sound/items/drop/food.ogg'
/obj/item/weapon/reagent_containers/food/Initialize() /obj/item/weapon/reagent_containers/food/Initialize()
. = ..() . = ..()

View File

@@ -2,6 +2,7 @@
volume = 40 //just over one and a half cups volume = 40 //just over one and a half cups
amount_per_transfer_from_this = 5 amount_per_transfer_from_this = 5
flags = 0 //starts closed flags = 0 //starts closed
drop_sound = 'sound/items/drop/soda.ogg'
//DRINKS //DRINKS
@@ -20,6 +21,7 @@
desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles." desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles."
icon_state = "waterbottle" icon_state = "waterbottle"
center_of_mass = list("x"=16, "y"=8) center_of_mass = list("x"=16, "y"=8)
drop_sound = 'sound/items/drop/food.ogg'
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle/Initialize() /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle/Initialize()
. = ..() . = ..()

View File

@@ -5,6 +5,7 @@
name = "drink" name = "drink"
desc = "yummy" desc = "yummy"
icon = 'icons/obj/drinks.dmi' icon = 'icons/obj/drinks.dmi'
drop_sound = 'sound/items/drop/bottle.ogg'
icon_state = null icon_state = null
flags = OPENCONTAINER flags = OPENCONTAINER
amount_per_transfer_from_this = 5 amount_per_transfer_from_this = 5
@@ -116,6 +117,7 @@
icon_state = "milk" icon_state = "milk"
item_state = "carton" item_state = "carton"
center_of_mass = list("x"=16, "y"=9) center_of_mass = list("x"=16, "y"=9)
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/weapon/reagent_containers/food/drinks/milk/Initialize() /obj/item/weapon/reagent_containers/food/drinks/milk/Initialize()
. = ..() . = ..()
@@ -127,6 +129,8 @@
icon_state = "soymilk" icon_state = "soymilk"
item_state = "carton" item_state = "carton"
center_of_mass = list("x"=16, "y"=9) center_of_mass = list("x"=16, "y"=9)
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/weapon/reagent_containers/food/drinks/soymilk/Initialize() /obj/item/weapon/reagent_containers/food/drinks/soymilk/Initialize()
. = ..() . = ..()
reagents.add_reagent("soymilk", 50) reagents.add_reagent("soymilk", 50)
@@ -138,6 +142,8 @@
icon_state = "mini-milk" icon_state = "mini-milk"
item_state = "carton" item_state = "carton"
center_of_mass = list("x"=16, "y"=9) center_of_mass = list("x"=16, "y"=9)
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/weapon/reagent_containers/food/drinks/smallmilk/Initialize() /obj/item/weapon/reagent_containers/food/drinks/smallmilk/Initialize()
. = ..() . = ..()
reagents.add_reagent("milk", 30) reagents.add_reagent("milk", 30)
@@ -149,6 +155,8 @@
icon_state = "mini-milk_choco" icon_state = "mini-milk_choco"
item_state = "carton" item_state = "carton"
center_of_mass = list("x"=16, "y"=9) center_of_mass = list("x"=16, "y"=9)
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/weapon/reagent_containers/food/drinks/smallchocmilk/Initialize() /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk/Initialize()
. = ..() . = ..()
reagents.add_reagent("chocolate_milk", 30) reagents.add_reagent("chocolate_milk", 30)
@@ -158,6 +166,8 @@
desc = "Careful, the beverage you're about to enjoy is extremely hot." desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee" icon_state = "coffee"
center_of_mass = list("x"=15, "y"=10) center_of_mass = list("x"=15, "y"=10)
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/weapon/reagent_containers/food/drinks/coffee/Initialize() /obj/item/weapon/reagent_containers/food/drinks/coffee/Initialize()
. = ..() . = ..()
reagents.add_reagent("coffee", 30) reagents.add_reagent("coffee", 30)
@@ -209,6 +219,7 @@
possible_transfer_amounts = null possible_transfer_amounts = null
volume = 10 volume = 10
center_of_mass = list("x"=16, "y"=12) center_of_mass = list("x"=16, "y"=12)
drop_sound = 'sound/items/drop/paper.ogg'
/obj/item/weapon/reagent_containers/food/drinks/sillycup/Initialize() /obj/item/weapon/reagent_containers/food/drinks/sillycup/Initialize()
. = ..() . = ..()

View File

@@ -16,7 +16,9 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/Initialize() /obj/item/weapon/reagent_containers/food/drinks/bottle/Initialize()
. = ..() . = ..()
if(isGlass) unacidable = 1 if(isGlass)
unacidable = 1
drop_sound = 'sound/items/drop/bottle.ogg'
/obj/item/weapon/reagent_containers/food/drinks/bottle/Destroy() /obj/item/weapon/reagent_containers/food/drinks/bottle/Destroy()
if(rag) if(rag)

View File

@@ -340,6 +340,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u
name = "basketball" name = "basketball"
desc = "Here's your chance, do your dance at the Space Jam." desc = "Here's your chance, do your dance at the Space Jam."
w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets
drop_sound = 'sound/items/drop/basketball.ogg'
/obj/structure/holohoop /obj/structure/holohoop
name = "basketball hoop" name = "basketball hoop"

View File

@@ -7,6 +7,7 @@
desc = "Nutritious! Probably." desc = "Nutritious! Probably."
flags = NOCONDUCT flags = NOCONDUCT
slot_flags = SLOT_HOLSTER slot_flags = SLOT_HOLSTER
drop_sound = 'sound/items/drop/herb.ogg'
var/plantname var/plantname
var/datum/seed/seed var/datum/seed/seed
@@ -361,6 +362,7 @@ var/list/fruit_icon_cache = list()
name = "[S.seed_name] slice" name = "[S.seed_name] slice"
desc = "A slice of \a [S.seed_name]. Tasty, probably." desc = "A slice of \a [S.seed_name]. Tasty, probably."
drop_sound = 'sound/items/drop/herb.ogg'
var/rind_colour = S.get_trait(TRAIT_PRODUCT_COLOUR) var/rind_colour = S.get_trait(TRAIT_PRODUCT_COLOUR)
var/flesh_colour = S.get_trait(TRAIT_FLESH_COLOUR) var/flesh_colour = S.get_trait(TRAIT_FLESH_COLOUR)

View File

@@ -180,6 +180,7 @@ Book Cart End
var/title // The real name of the book. var/title // The real name of the book.
var/carved = 0 // Has the book been hollowed out for use as a secret storage item? var/carved = 0 // Has the book been hollowed out for use as a secret storage item?
var/obj/item/store //What's in the book? var/obj/item/store //What's in the book?
drop_sound = 'sound/bureaucracy/bookclose.ogg'
/obj/item/weapon/book/attack_self(var/mob/user as mob) /obj/item/weapon/book/attack_self(var/mob/user as mob)
if(carved) if(carved)
@@ -194,7 +195,9 @@ Book Cart End
if(src.dat) if(src.dat)
user << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book") user << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book")
user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.") user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.")
playsound(loc, 'sound/bureaucracy/bookopen.ogg', 50, 1)
onclose(user, "book") onclose(user, "book")
playsound(loc, 'sound/bureaucracy/bookclose.ogg', 50, 1)
else else
to_chat(user, "This book is completely blank!") to_chat(user, "This book is completely blank!")
@@ -277,6 +280,8 @@ Book Cart End
to_chat(user, "<span class='notice'>You begin to carve out [title].</span>") to_chat(user, "<span class='notice'>You begin to carve out [title].</span>")
if(do_after(user, 30)) if(do_after(user, 30))
to_chat(user, "<span class='notice'>You carve out the pages from [title]! You didn't want to read it anyway.</span>") to_chat(user, "<span class='notice'>You carve out the pages from [title]! You didn't want to read it anyway.</span>")
playsound(loc, 'sound/bureaucracy/papercrumple.ogg', 50, 1)
new /obj/item/weapon/shreddedp(get_turf(src))
carved = 1 carved = 1
return return
else else

View File

@@ -39,7 +39,7 @@
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
root_type = /datum/lore/codex/category/main_news root_type = /datum/lore/codex/category/main_news
libcategory = "Reference" libcategory = "Reference"
drop_sound = 'sound/items/drop/device.ogg'
// Combines SOP/Regs/Law // Combines SOP/Regs/Law
/obj/item/weapon/book/codex/corp_regs /obj/item/weapon/book/codex/corp_regs
name = "NanoTrasen Regulatory Compendium" name = "NanoTrasen Regulatory Compendium"

View File

@@ -17,6 +17,7 @@
var/material/material var/material/material
var/perunit = SHEET_MATERIAL_AMOUNT var/perunit = SHEET_MATERIAL_AMOUNT
var/apply_colour //temp pending icon rewrite var/apply_colour //temp pending icon rewrite
drop_sound = 'sound/items/drop/axe.ogg'
/obj/item/stack/material/New() /obj/item/stack/material/New()
..() ..()
@@ -106,17 +107,20 @@
icon_state = "sheet-sandstone" icon_state = "sheet-sandstone"
default_type = "sandstone" default_type = "sandstone"
no_variants = FALSE no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
/obj/item/stack/material/marble /obj/item/stack/material/marble
name = "marble brick" name = "marble brick"
icon_state = "sheet-marble" icon_state = "sheet-marble"
default_type = "marble" default_type = "marble"
no_variants = FALSE no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
/obj/item/stack/material/diamond /obj/item/stack/material/diamond
name = "diamond" name = "diamond"
icon_state = "sheet-diamond" icon_state = "sheet-diamond"
default_type = "diamond" default_type = "diamond"
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/stack/material/uranium /obj/item/stack/material/uranium
name = "uranium" name = "uranium"
@@ -129,6 +133,7 @@
icon_state = "sheet-phoron" icon_state = "sheet-phoron"
default_type = "phoron" default_type = "phoron"
no_variants = FALSE no_variants = FALSE
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/stack/material/plastic /obj/item/stack/material/plastic
name = "plastic" name = "plastic"
@@ -324,6 +329,7 @@
icon_state = "sheet-wood" icon_state = "sheet-wood"
default_type = MAT_WOOD default_type = MAT_WOOD
strict_color_stacking = TRUE strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/wooden.ogg'
/obj/item/stack/material/wood/sif /obj/item/stack/material/wood/sif
name = "alien wooden plank" name = "alien wooden plank"
@@ -340,6 +346,7 @@
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE
description_info = "Use inhand to craft things, or use a sharp and edged object on this to convert it into two wooden planks." description_info = "Use inhand to craft things, or use a sharp and edged object on this to convert it into two wooden planks."
var/plank_type = /obj/item/stack/material/wood var/plank_type = /obj/item/stack/material/wood
drop_sound = 'sound/items/drop/wooden.ogg'
/obj/item/stack/material/log/sif /obj/item/stack/material/log/sif
name = "alien log" name = "alien log"
@@ -377,6 +384,7 @@
no_variants = FALSE no_variants = FALSE
pass_color = TRUE pass_color = TRUE
strict_color_stacking = TRUE strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/stack/material/resin /obj/item/stack/material/resin
name = "resin" name = "resin"
@@ -394,6 +402,7 @@
no_variants = FALSE no_variants = FALSE
pass_color = TRUE pass_color = TRUE
strict_color_stacking = TRUE strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/stack/material/snow /obj/item/stack/material/snow
name = "snow" name = "snow"
@@ -415,12 +424,14 @@
no_variants = FALSE no_variants = FALSE
pass_color = TRUE pass_color = TRUE
strict_color_stacking = TRUE strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/stack/material/glass /obj/item/stack/material/glass
name = "glass" name = "glass"
icon_state = "sheet-glass" icon_state = "sheet-glass"
default_type = "glass" default_type = "glass"
no_variants = FALSE no_variants = FALSE
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/stack/material/glass/reinforced /obj/item/stack/material/glass/reinforced
name = "reinforced glass" name = "reinforced glass"

View File

@@ -12,6 +12,7 @@
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
var/string_attached var/string_attached
var/sides = 2 var/sides = 2
drop_sound = 'sound/items/drop/ring.ogg'
/obj/item/weapon/coin/New() /obj/item/weapon/coin/New()
randpixel_xy() randpixel_xy()

View File

@@ -23,7 +23,7 @@
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
attack_verb = list("hit", "pierced", "sliced", "attacked") attack_verb = list("hit", "pierced", "sliced", "attacked")
var/drill_sound = 'sound/weapons/Genhit.ogg' var/drill_sound = "pickaxe"
var/drill_verb = "drilling" var/drill_verb = "drilling"
sharp = 1 sharp = 1

View File

@@ -156,7 +156,6 @@ var/list/slot_equipment_priority = list( \
//Drops the item in our active hand. TODO: rename this to drop_active_hand or something //Drops the item in our active hand. TODO: rename this to drop_active_hand or something
/mob/proc/drop_item(var/atom/Target) /mob/proc/drop_item(var/atom/Target)
return return
/* /*
Removes the object from any slots the mob might have, calling the appropriate icon update proc. Removes the object from any slots the mob might have, calling the appropriate icon update proc.
Does nothing else. Does nothing else.

View File

@@ -33,8 +33,25 @@
//Drops the item in our active hand. TODO: rename this to drop_active_hand or something //Drops the item in our active hand. TODO: rename this to drop_active_hand or something
/mob/living/drop_item(var/atom/Target) /mob/living/drop_item(var/atom/Target)
if(hand) return drop_l_hand(Target) var/obj/item/item_dropped = null
else return drop_r_hand(Target)
if (hand)
item_dropped = l_hand
. = drop_l_hand(Target)
else
item_dropped = r_hand
. = drop_r_hand(Target)
if (istype(item_dropped) && !QDELETED(item_dropped) && is_preference_enabled(/datum/client_preference/drop_sounds))
addtimer(CALLBACK(src, .proc/make_item_drop_sound, item_dropped), 1)
/mob/proc/make_item_drop_sound(obj/item/I)
if(QDELETED(I))
return
if(I.drop_sound)
playsound(I, I.drop_sound, 25, 0, preference = /datum/client_preference/drop_sounds)
//Drops the item in our left hand //Drops the item in our left hand
/mob/living/drop_l_hand(var/atom/Target) /mob/living/drop_l_hand(var/atom/Target)

View File

@@ -4,6 +4,7 @@ var/list/organ_cache = list()
name = "organ" name = "organ"
icon = 'icons/obj/surgery.dmi' icon = 'icons/obj/surgery.dmi'
germ_level = 0 germ_level = 0
drop_sound = 'sound/items/drop/flesh.ogg'
// Strings. // Strings.
var/organ_tag = "organ" // Unique identifier. var/organ_tag = "organ" // Unique identifier.

View File

@@ -37,7 +37,9 @@
user.drop_item() user.drop_item()
P.loc = src P.loc = src
icon_state = "[initial(icon_state)]-open" icon_state = "[initial(icon_state)]-open"
sleep(5) flick("[initial(icon_state)]-open",src)
playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1)
sleep(40)
icon_state = initial(icon_state) icon_state = initial(icon_state)
updateUsrDialog() updateUsrDialog()
else if(P.is_wrench()) else if(P.is_wrench())
@@ -98,9 +100,10 @@
if(istype(P) && (P.loc == src) && src.Adjacent(usr)) if(istype(P) && (P.loc == src) && src.Adjacent(usr))
usr.put_in_hands(P) usr.put_in_hands(P)
updateUsrDialog() updateUsrDialog()
icon_state = "[initial(icon_state)]-open" flick("[initial(icon_state)]-open",src)
playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1)
spawn(0) spawn(0)
sleep(5) sleep(20)
icon_state = initial(icon_state) icon_state = initial(icon_state)
/* /*

View File

@@ -5,6 +5,7 @@
icon_state = "folder" icon_state = "folder"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
pressure_resistance = 2 pressure_resistance = 2
drop_sound = 'sound/items/drop/paper.ogg'
/obj/item/weapon/folder/blue /obj/item/weapon/folder/blue
desc = "A blue folder." desc = "A blue folder."

View File

@@ -19,6 +19,7 @@
slot_flags = SLOT_HEAD slot_flags = SLOT_HEAD
body_parts_covered = HEAD body_parts_covered = HEAD
attack_verb = list("bapped") attack_verb = list("bapped")
drop_sound = 'sound/items/drop/paper.ogg'
var/info //What's actually written on the paper. var/info //What's actually written on the paper.
var/info_links //A different version of the paper which includes html links at fields and EOF var/info_links //A different version of the paper which includes html links at fields and EOF
@@ -177,6 +178,7 @@
//crumple dat paper //crumple dat paper
info = stars(info,85) info = stars(info,85)
user.visible_message("\The [user] crumples \the [src] into a ball!") user.visible_message("\The [user] crumples \the [src] into a ball!")
playsound(src, 'sound/bureaucracy/papercrumple.ogg', 50, 1)
icon_state = "scrap" icon_state = "scrap"
return return
user.examinate(src) user.examinate(src)
@@ -368,6 +370,7 @@
user.visible_message("<span class='[class]'>[user] holds \the [P] up to \the [src], it looks like [TU.hes] trying to burn it!</span>", \ user.visible_message("<span class='[class]'>[user] holds \the [P] up to \the [src], it looks like [TU.hes] trying to burn it!</span>", \
"<span class='[class]'>You hold \the [P] up to \the [src], burning it slowly.</span>") "<span class='[class]'>You hold \the [P] up to \the [src], burning it slowly.</span>")
playsound(src.loc, 'sound/bureaucracy/paperburn.ogg', 50, 1)
spawn(20) spawn(20)
if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit) if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
@@ -461,6 +464,8 @@
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links][stamps]</BODY></HTML>", "window=[name]") // Update the window usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links][stamps]</BODY></HTML>", "window=[name]") // Update the window
playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 10)
update_icon() update_icon()
/obj/item/weapon/paper/get_worn_icon_state(var/slot_name) /obj/item/weapon/paper/get_worn_icon_state(var/slot_name)
@@ -573,6 +578,7 @@
stamped += P.type stamped += P.type
overlays += stampoverlay overlays += stampoverlay
playsound(src, 'sound/bureaucracy/stamp.ogg', 50, 1)
to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp.</span>") to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp.</span>")
else if(istype(P, /obj/item/weapon/flame)) else if(istype(P, /obj/item/weapon/flame))

View File

@@ -12,6 +12,7 @@
layer = MOB_LAYER layer = MOB_LAYER
pressure_resistance = 1 pressure_resistance = 1
attack_verb = list("bapped") attack_verb = list("bapped")
drop_sound = 'sound/items/drop/paper.ogg'
var/page = 1 // current page var/page = 1 // current page
var/list/pages = list() // Ordered list of pages as they are to be displayed. Can be different order than src.contents. var/list/pages = list() // Ordered list of pages as they are to be displayed. Can be different order than src.contents.

View File

@@ -23,6 +23,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 10) matter = list(DEFAULT_WALL_MATERIAL = 10)
var/colour = "black" //what colour the ink is! var/colour = "black" //what colour the ink is!
pressure_resistance = 2 pressure_resistance = 2
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/weapon/pen/attack_self(var/mob/user) /obj/item/weapon/pen/attack_self(var/mob/user)
to_chat(user, "<span class='notice'>Click.</span>") to_chat(user, "<span class='notice'>Click.</span>")

View File

@@ -515,6 +515,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
item_state = "coil" item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged") attack_verb = list("whipped", "lashed", "disciplined", "flogged")
stacktype = /obj/item/stack/cable_coil stacktype = /obj/item/stack/cable_coil
drop_sound = 'sound/items/drop/accessory.ogg'
/obj/item/stack/cable_coil/cyborg /obj/item/stack/cable_coil/cyborg
name = "cable coil synthesizer" name = "cable coil synthesizer"

View File

@@ -8,6 +8,7 @@
throwforce = 1 throwforce = 1
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
preserve_item = 1 preserve_item = 1
drop_sound = 'sound/items/drop/ring.ogg'
var/leaves_residue = 1 var/leaves_residue = 1
var/caliber = "" //Which kind of guns it can be loaded into var/caliber = "" //Which kind of guns it can be loaded into

View File

@@ -49,6 +49,7 @@
origin_tech = list(TECH_COMBAT = 1) origin_tech = list(TECH_COMBAT = 1)
attack_verb = list("struck", "hit", "bashed") attack_verb = list("struck", "hit", "bashed")
zoomdevicename = "scope" zoomdevicename = "scope"
drop_sound = 'sound/items/drop/gun.ogg'
var/automatic = 0 var/automatic = 0
var/burst = 1 var/burst = 1

View File

@@ -160,6 +160,7 @@
var/label = href_list["dispense"] var/label = href_list["dispense"]
if(cartridges[label] && container && container.is_open_container()) if(cartridges[label] && container && container.is_open_container())
var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label] var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label]
playsound(src.loc, 'sound/machines/reagent_dispense.ogg', 25, 1)
C.reagents.trans_to(container, amount) C.reagents.trans_to(container, amount)
else if(href_list["ejectBeaker"]) else if(href_list["ejectBeaker"])

View File

@@ -21,6 +21,7 @@
icon = 'icons/obj/bloodpack.dmi' icon = 'icons/obj/bloodpack.dmi'
icon_state = "empty" icon_state = "empty"
item_state = "bloodpack_empty" item_state = "bloodpack_empty"
drop_sound = 'sound/items/drop/food.ogg'
volume = 200 volume = 200
var/label_text = "" var/label_text = ""

Some files were not shown because too many files have changed in this diff Show More