[MIRROR] the little construction pr

This commit is contained in:
Heroman3003
2023-07-07 17:29:50 +10:00
committed by CHOMPStation2
parent c8520a5525
commit e62d81af4b
13 changed files with 868 additions and 1 deletions

View File

@@ -21,14 +21,57 @@
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
=======
//crafting / welding vars
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/can_weld = FALSE //set to TRUE for tiles you can reforge into their components via welding, like metal
var/welds_into = /obj/item/stack/material/steel //what you get from the welding. defaults to steel.
var/default_type = DEFAULT_WALL_MATERIAL
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
/obj/item/stack/tile/Initialize()
. = ..()
randpixel_xy()
if(craftable)
material = get_material_by_name("[default_type]")
if(!material)
return INITIALIZE_HINT_QDEL
if(material) //sanity check
recipes = material.get_recipes()
stacktype = material.stack_type
/obj/item/stack/tile/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(can_weld == FALSE)
to_chat("You can't reform these into their original components.")
return
if(get_amount() < 4)
to_chat(user, "<span class='warning'>You need at least four tiles to do this.</span>")
return
if(WT.remove_fuel(0,user))
new welds_into(usr.loc)
usr.update_icon()
visible_message("<span class='notice'>\The [src] is shaped by [user.name] with the welding tool.</span>","You hear welding.")
var/obj/item/stack/tile/T = src
src = null
var/replace = (user.get_inactive_hand()==T)
T.use(4)
if (!T && replace)
user.put_in_hands(welds_into)
return TRUE
return ..()
/*
* Grass
@@ -38,6 +81,7 @@
singular_name = "grass floor tile"
desc = "A patch of grass like they often use on golf courses."
icon_state = "tile_grass"
default_type = "grass"
force = 1.0
throwforce = 1.0
throw_speed = 5
@@ -47,6 +91,7 @@
no_variants = FALSE
drop_sound = 'sound/items/drop/herb.ogg'
pickup_sound = 'sound/items/pickup/herb.ogg'
craftable = TRUE
/obj/item/stack/tile/grass/sif
name = "sivian grass tile"
@@ -203,6 +248,7 @@
throw_speed = 5
throw_range = 20
no_variants = FALSE
can_weld = TRUE
/obj/item/stack/tile/floor/red
name = "red floor tile"
@@ -234,6 +280,7 @@
singular_name = "steel floor tile"
icon_state = "tile_steel"
matter = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT / 4)
welds_into = /obj/item/stack/material/plasteel
no_variants = FALSE
/obj/item/stack/tile/floor/steel
@@ -241,6 +288,7 @@
singular_name = "steel floor tile"
icon_state = "tile_steel"
matter = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT / 4)
welds_into = /obj/item/stack/material/plasteel
no_variants = FALSE
/obj/item/stack/tile/floor/white
@@ -248,6 +296,7 @@
singular_name = "white floor tile"
icon_state = "tile_white"
matter = list(MAT_PLASTIC = SHEET_MATERIAL_AMOUNT / 4)
welds_into = /obj/item/stack/material/plastic
no_variants = FALSE
/obj/item/stack/tile/floor/yellow
@@ -262,6 +311,7 @@
singular_name = "dark floor tile"
icon_state = "tile_steel"
matter = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT / 4)
welds_into = /obj/item/stack/material/plasteel
no_variants = FALSE
/obj/item/stack/tile/floor/freezer
@@ -269,6 +319,7 @@
singular_name = "freezer floor tile"
icon_state = "tile_freezer"
matter = list(MAT_PLASTIC = SHEET_MATERIAL_AMOUNT / 4)
welds_into = /obj/item/stack/material/plastic
no_variants = FALSE
/obj/item/stack/tile/floor/cyborg
@@ -280,6 +331,7 @@
charge_costs = list(250)
stacktype = /obj/item/stack/tile/floor
build_type = /obj/item/stack/tile/floor
can_weld = FALSE //we're not going there
/obj/item/stack/tile/linoleum
name = "linoleum"
@@ -292,6 +344,7 @@
throw_range = 20
flags = 0
no_variants = FALSE
can_weld = FALSE
/obj/item/stack/tile/wmarble
name = "light marble tile"
@@ -304,6 +357,8 @@
throw_range = 20
flags = 0
no_variants = FALSE
can_weld = TRUE
welds_into = /obj/item/stack/material/marble
/obj/item/stack/tile/bmarble
name = "dark marble tile"
@@ -316,12 +371,15 @@
throw_range = 20
flags = 0
no_variants = FALSE
can_weld = TRUE
welds_into = /obj/item/stack/material/marble
/obj/item/stack/tile/roofing
name = "roofing"
singular_name = "roofing"
desc = "A section of roofing material. You can use it to repair the ceiling, or expand it."
icon_state = "techtile_grid"
can_weld = FALSE //roofing can also be made from wood, so let's not open that can of worms today
/obj/item/stack/tile/roofing/cyborg
name = "roofing synthesizer"
@@ -330,3 +388,7 @@
charge_costs = list(250)
stacktype = /obj/item/stack/tile/roofing
build_type = /obj/item/stack/tile/roofing
<<<<<<< HEAD
=======
can_weld = FALSE
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002