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

Update ore_box.dm

Browse Source
This commit is contained in:
Novacat
2020-02-17 01:31:48 -05:00
committed by GitHub
parent e8526a420c
commit 332e3271d9
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mining/ore_box.dm
View File

@@ -40,15 +40,11 @@
/obj/structure/ore_box/examine(mob/user) /obj/structure/ore_box/examine(mob/user)
to_chat(user, "That's an [src].") to_chat(user, "That's an [src].")
<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm to_chat(user, desc)
to_chat(user,desc)
// Borgs can now check contents too. // Borgs can now check contents too.
if((!istype(user, /mob/living/carbon/human)) && (!istype(user, /mob/living/silicon/robot))) if((!istype(user, /mob/living/carbon/human)) && (!istype(user, /mob/living/silicon/robot)))
return return
=======
to_chat(user, desc)
>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
if(!Adjacent(user)) //Can only check the contents of ore boxes if you can physically reach them. if(!Adjacent(user)) //Can only check the contents of ore boxes if you can physically reach them.
return return
@@ -116,4 +112,4 @@
O.loc = src.loc O.loc = src.loc
O.ex_act(severity++) O.ex_act(severity++)
qdel(src) qdel(src)
return return