cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #16240 from ShadowLarkens/revert"

Browse Source 
This reverts commit 885171f985, reversing
changes made to 3e314f8064.
This commit is contained in:
ShadowLarkens
2024-09-07 14:11:15 -07:00
parent 49dda94177
commit f9052dbb60
186 changed files with 5029 additions and 2255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+5 -5
View File
@@ -326,7 +326,7 @@
else
playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
else
playsound(src, drop_sound, 30, preference = /datum/client_preference/drop_sounds)
playsound(src, drop_sound, 30, preference = /datum/preference/toggle/drop_sounds)
// apparently called whenever an item is removed from a slot, container, or anything else.
/obj/item/proc/dropped(mob/user as mob)
@@ -364,11 +364,11 @@
if(user.pulling == src) user.stop_pulling()
if(("[slot]" in slot_flags_enumeration) && (slot_flags & slot_flags_enumeration["[slot]"]))
if(equip_sound)
playsound(src, equip_sound, 20, preference = /datum/client_preference/pickup_sounds)
playsound(src, equip_sound, 20, preference = /datum/preference/toggle/pickup_sounds)
else
playsound(src, drop_sound, 20, preference = /datum/client_preference/pickup_sounds)
playsound(src, drop_sound, 20, preference = /datum/preference/toggle/pickup_sounds)
else if(slot == slot_l_hand || slot == slot_r_hand)
playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds)
playsound(src, pickup_sound, 20, preference = /datum/preference/toggle/pickup_sounds)
return
// As above but for items being equipped to an active module on a robot.
@@ -948,7 +948,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
/obj/item/MouseEntered(location,control,params)
. = ..()
if(usr.is_preference_enabled(/datum/client_preference/inv_tooltips) && ((src in usr) || isstorage(loc))) // If in inventory or in storage we're looking at
if(usr?.read_preference(/datum/preference/toggle/inv_tooltips) && ((src in usr) || isstorage(loc))) // If in inventory or in storage we're looking at
var/user = usr
tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), 5, TIMER_STOPPABLE)