Ports TG Pickup, Equip, and Drop Sounds (#15572)

* Ports TG Pickup, Equip, and Drop Sounds

* really
This commit is contained in:
Fox McCloud
2021-02-24 12:51:59 +00:00
committed by GitHub
parent 7b7ea0a191
commit efa3aecb61
95 changed files with 271 additions and 139 deletions
+2
View File
@@ -3,3 +3,5 @@
w_class = WEIGHT_CLASS_TINY
item_state = "card-id"
icon_state = "datadisk0"
drop_sound = 'sound/items/handling/disk_drop.ogg'
pickup_sound = 'sound/items/handling/disk_pickup.ogg'
@@ -9,6 +9,7 @@
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined")
max_integrity = 300
equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
var/use_item_overlays = 0 // Do we have overlays for items held inside the belt?
/obj/item/storage/belt/update_icon()
@@ -29,10 +30,10 @@
if(!M.restrained() && !M.stat && can_use())
switch(over_object.name)
if("r_hand")
M.unEquip(src)
M.unEquip(src, silent = TRUE)
M.put_in_r_hand(src)
if("l_hand")
M.unEquip(src)
M.unEquip(src, silent = TRUE)
M.put_in_l_hand(src)
src.add_fingerprint(usr)
return
@@ -47,6 +48,8 @@
icon_state = "utilitybelt"
item_state = "utility"
use_item_overlays = 1
drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
pickup_sound = 'sound/items/handling/toolbelt_pickup.ogg'
can_hold = list(
/obj/item/crowbar,
/obj/item/screwdriver,
@@ -6,6 +6,8 @@
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
resistance_flags = FIRE_PROOF
drop_sound = 'sound/items/handling/book_drop.ogg'
pickup_sound = 'sound/items/handling/book_pickup.ogg'
var/mob/affecting = null
var/deity_name = "Christ"
/// Is the sprite of this bible customisable
@@ -25,6 +25,8 @@
icon_state = "box"
item_state = "syringe_kit"
resistance_flags = FLAMMABLE
drop_sound = 'sound/items/handling/cardboardbox_drop.ogg'
pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg'
foldable = /obj/item/stack/sheet/cardboard
foldable_amt = 1
@@ -828,6 +830,8 @@
w_class = WEIGHT_CLASS_TINY
max_w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
can_hold = list(/obj/item/match)
/obj/item/storage/box/matches/New()
@@ -50,10 +50,10 @@
if(!( user.restrained() ) && !( user.stat ))
switch(over_object.name)
if("r_hand")
user.unEquip(master_item)
user.unEquip(master_item, silent = TRUE)
user.put_in_r_hand(master_item)
if("l_hand")
user.unEquip(master_item)
user.unEquip(master_item, silent = TRUE)
user.put_in_l_hand(master_item)
master_item.add_fingerprint(user)
return 0
@@ -71,11 +71,11 @@
if(!(M.restrained()) && !(M.stat))
switch(over_object.name)
if("r_hand")
if(!M.unEquip(src))
if(!M.unEquip(src, silent = TRUE))
return
M.put_in_r_hand(src)
if("l_hand")
if(!M.unEquip(src))
if(!M.unEquip(src, silent = TRUE))
return
M.put_in_l_hand(src)
add_fingerprint(usr)
@@ -297,7 +297,7 @@
if(!istype(W))
return FALSE
if(usr)
if(!usr.unEquip(W))
if(!usr.unEquip(W, silent = TRUE))
return FALSE
usr.update_icons() //update our overlays
if(silent)
@@ -307,7 +307,7 @@
if(usr)
if(usr.client && usr.s_active != src)
usr.client.screen -= W
W.dropped(usr)
W.dropped(usr, TRUE)
add_fingerprint(usr)
if(!prevent_warning && !istype(W, /obj/item/gun/energy/kinetic_accelerator/crossbow))
@@ -343,7 +343,7 @@
if(new_location)
if(ismob(loc))
W.dropped(usr)
W.dropped(usr, TRUE)
if(ismob(new_location))
W.layer = ABOVE_HUD_LAYER
W.plane = ABOVE_HUD_PLANE
@@ -14,6 +14,8 @@
origin_tech = "combat=1;engineering=1"
attack_verb = list("robusted")
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
/obj/item/storage/toolbox/emergency
name = "emergency toolbox"