cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-07 15:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates

Browse Source 
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
This commit is contained in:
Markolie
2017-02-06 20:37:03 +01:00
parent 7513c5d396 550c196da2
commit 1d6754728b
59 changed files with 728 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,9 @@
pressure_resistance = 5*ONE_ATMOSPHERE
/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/device/t_scanner/adv_mining_scanner))
attack_hand(user)
return
if(istype(W, /obj/item/weapon/ore))
if(!user.drop_item())
return