cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update inventory.dm

Browse Source
This commit is contained in:
SpaceLoveSs13
2024-05-09 15:11:32 +05:30
committed by GitHub
parent 3a6aab6f27
commit 4fcd6aac6e
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/inventory.dm
-6
View File
@@ -468,11 +468,6 @@
if(user.active_storage?.attempt_insert(src, user, messages = FALSE))
return TRUE
<<<<<<< HEAD
var/list/obj/item/possible = list(M.get_inactive_held_item(), M.get_item_by_slot(ITEM_SLOT_BELT), M.get_item_by_slot(ITEM_SLOT_DEX_STORAGE), M.get_item_by_slot(ITEM_SLOT_BACK))
for(var/i in possible)
if(!i)
=======
var/list/obj/item/possible = list(
user.get_inactive_held_item(),
user.get_item_by_slot(ITEM_SLOT_BELT),
@@ -481,7 +476,6 @@
)
for(var/thing in possible)
if(isnull(thing))
>>>>>>> 177a2edfe59 (Quick equip no longer throws balloon alerts (#83117))
continue
var/obj/item/gear = thing
if(gear.atom_storage?.attempt_insert(src, user, messages = FALSE))