cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed ore boxes not being properly loaded from mining satchels.

Browse Source 
- Fixed it being possible to drag-drop any storage item to either hand from.. anywhere... You can now only do that if the backpack is somewhere on you.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4485 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-08-18 01:44:00 +00:00
parent 73ec1110cd
commit e45aec98e7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/storage/backpack.dm
View File

@@ -3,8 +3,10 @@
var/mob/M = usr var/mob/M = usr
if (!( istype(over_object, /obj/screen) )) if (!( istype(over_object, /obj/screen) ))
return ..() return ..()
if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
return
playsound(src.loc, "rustle", 50, 1, -5) playsound(src.loc, "rustle", 50, 1, -5)
if ((!( M.restrained() ) && !( M.stat )) if (!( M.restrained() ) && !( M.stat ))
switch(over_object.name) switch(over_object.name)
if("r_hand") if("r_hand")
M.u_equip(src) M.u_equip(src)

3
code/modules/mining/satchel_ore_boxdm.dm
View File

@@ -13,8 +13,9 @@
src.contents += W; src.contents += W;
if (istype(W, /obj/item/weapon/storage)) if (istype(W, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = W var/obj/item/weapon/storage/S = W
S.hide_from(usr)
for(var/obj/item/weapon/ore/O in S.contents) for(var/obj/item/weapon/ore/O in S.contents)
S.remove_from_storage(W,src) //This will move the item to this item's contents S.remove_from_storage(O, src) //This will move the item to this item's contents
user << "\blue You empty the satchel into the box." user << "\blue You empty the satchel into the box."
return return