cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 15:15:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ore.dm

Browse Source
This commit is contained in:
Novacat
2021-02-21 09:39:26 -05:00
committed by GitHub
parent 0c880712f2
commit e3a19bb2ea
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ore.dm
-7
View File
@@ -113,11 +113,7 @@
icon_state = "slag"
material = null
<<<<<<< HEAD
/obj/item/weapon/ore/New()
=======
/obj/item/weapon/ore/Initialize()
>>>>>>> e47f39e... Porting Fixes (#7891)
..()
randpixel_xy()
@@ -127,7 +123,6 @@
C.sample_item(src, user)
else
return ..()
<<<<<<< HEAD
//VOREStation Add
/obj/item/weapon/ore/attack(mob/living/M as mob, mob/living/user as mob)
@@ -140,5 +135,3 @@
return
..()
//VOREStation Add End
=======
>>>>>>> e47f39e... Porting Fixes (#7891)