cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 14:16:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update tile_types.dm

Browse Source
This commit is contained in:
cadyn
2021-02-27 14:53:42 -08:00
committed by GitHub
parent 8b10504a5c
commit 14c7647f5f
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/tile_types.dm
-8
View File
@@ -20,21 +20,13 @@
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
<<<<<<< HEAD
var/datum/material/material //CHOMPEDIT: Start, To make tiles have material variables
var/default_type = DEFAULT_WALL_MATERIAL
var/perunit = SHEET_MATERIAL_AMOUNT
var/apply_colour //CHOMPEDIT: End
/obj/item/stack/tile/New()
..()
||||||| parent of a55ce9bf09... Merge pull request #9772 from VOREStation/upstream-merge-7893
/obj/item/stack/tile/New()
..()
=======
/obj/item/stack/tile/Initialize()
. = ..()
>>>>>>> a55ce9bf09... Merge pull request #9772 from VOREStation/upstream-merge-7893
randpixel_xy()
/*