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 tile_types.dm

Browse Source
This commit is contained in:
Raeschen
2023-07-07 09:49:15 +02:00
committed by GitHub
parent 2f18b1dc41
commit 083cf18632
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -21,12 +21,6 @@
drop_sound = 'sound/items/drop/axe.ogg' drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/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
=======
//crafting / welding vars //crafting / welding vars
var/datum/material/material //*sigh* i guess this is how we're doing this. var/datum/material/material //*sigh* i guess this is how we're doing this.
var/craftable = FALSE //set to TRUE for tiles you can craft stuff from directly, like grass var/craftable = FALSE //set to TRUE for tiles you can craft stuff from directly, like grass
@@ -34,8 +28,9 @@
var/welds_into = /obj/item/stack/material/steel //what you get from the welding. defaults to steel. var/welds_into = /obj/item/stack/material/steel //what you get from the welding. defaults to steel.
var/default_type = DEFAULT_WALL_MATERIAL var/default_type = DEFAULT_WALL_MATERIAL
var/perunit = SHEET_MATERIAL_AMOUNT //ChompEDIT
ar/apply_colour //ChompEDIT
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
/obj/item/stack/tile/Initialize() /obj/item/stack/tile/Initialize()
. = ..() . = ..()
@@ -388,7 +383,4 @@
charge_costs = list(250) charge_costs = list(250)
stacktype = /obj/item/stack/tile/roofing stacktype = /obj/item/stack/tile/roofing
build_type = /obj/item/stack/tile/roofing build_type = /obj/item/stack/tile/roofing
<<<<<<< HEAD
=======
can_weld = FALSE can_weld = FALSE
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002