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

Update ore.dm

Browse Source
This commit is contained in:
Razgriz
2021-02-23 03:24:24 -07:00
committed by GitHub
parent f55f171cdf
commit 32312e22b6
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/mining/ore.dm
View File

@@ -113,15 +113,8 @@
icon_state = "slag" icon_state = "slag"
material = null material = null
<<<<<<< HEAD
/obj/item/weapon/ore/New()
||||||| parent of 278c3eaa3f... Merge pull request #9761 from VOREStation/upstream-merge-7891
/obj/item/weapon/ore/New()
..()
=======
/obj/item/weapon/ore/Initialize() /obj/item/weapon/ore/Initialize()
..() ..()
>>>>>>> 278c3eaa3f... Merge pull request #9761 from VOREStation/upstream-merge-7891
randpixel_xy() randpixel_xy()
/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)