Merge pull request #14638 from VOREStation/upstream-merge-9002

[MIRROR] the little construction pr

code/__defines/materials.dm

@@ -56,6 +56,7 @@
 #define MAT_DEUTERIUM		"deuterium"
 #define MAT_CONCRETE		"concrete"
 #define MAT_PLASTEELREBAR	"plasteel rebar"
+#define MAT_GRASS			"grass"
 
 
 #define DEFAULT_TABLE_MATERIAL MAT_PLASTIC

code/datums/autolathe/engineering.dm

@@ -78,6 +78,10 @@
 	name = "request console electronics"
 	path =/obj/item/weapon/circuitboard/request
 
+/datum/category_item/autolathe/engineering/electrochromic
+	name = "electrochromic window control electronics"
+	path =/obj/item/weapon/circuitboard/electrochromic
+
 /datum/category_item/autolathe/engineering/pipelayer
 	name = "pipe layer electronics"
 	path =/obj/item/weapon/circuitboard/pipelayer

code/game/machinery/computer/arcade.dm

@@ -1337,3 +1337,5 @@
 		O = T
 		to_chat(user, "<span class='notice'>You turn in 2 tickets to the [src] and claim a prize!</span>")
 		return
+	else
+		..() //You can now actually deconstruct these.

code/game/machinery/frame.dm

@@ -208,6 +208,14 @@
 	circuit = /obj/machinery/atmospheric_field_generator
 	frame_size = 3
 
+/datum/frame/frame_types/electrochromic_button
+	name = "Electrochromic Window Button"
+	frame_class = FRAME_CLASS_ALARM
+	frame_size = 1
+	frame_style = FRAME_STYLE_WALL
+	x_offset = 24
+	y_offset = 24
+
 //////////////////////////////
 // Frame Object (Structure)
 //////////////////////////////

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -20,9 +20,50 @@
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
 
+//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
+
+
+
 /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
@@ -32,6 +73,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
@@ -41,6 +83,7 @@
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/herb.ogg'
 	pickup_sound = 'sound/items/pickup/herb.ogg'
+	craftable = TRUE
 
 /*
  * Wood
@@ -187,6 +230,7 @@
 	throw_speed = 5
 	throw_range = 20
 	no_variants = FALSE
+	can_weld = TRUE
 
 /obj/item/stack/tile/floor/red
 	name = "red floor tile"
@@ -218,6 +262,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
@@ -225,6 +270,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
@@ -232,6 +278,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
@@ -246,6 +293,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
@@ -253,6 +301,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
@@ -264,6 +313,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"
@@ -276,6 +326,7 @@
 	throw_range = 20
 	flags = 0
 	no_variants = FALSE
+	can_weld = FALSE
 
 /obj/item/stack/tile/wmarble
 	name = "light marble tile"
@@ -288,6 +339,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"
@@ -300,12 +353,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"
@@ -313,4 +369,5 @@
 	uses_charge = 1
 	charge_costs = list(250)
 	stacktype = /obj/item/stack/tile/roofing
-	build_type = /obj/item/stack/tile/roofing
+	build_type = /obj/item/stack/tile/roofing
+	can_weld = FALSE

code/game/objects/items/weapons/circuitboards/frame.dm

@@ -74,6 +74,12 @@
 	board_type = new /datum/frame/frame_types/geiger
 	matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
 
+/obj/item/weapon/circuitboard/electrochromic
+	name = T_BOARD("electrochromic button")
+	build_path = /obj/machinery/button/windowtint
+	board_type = new /datum/frame/frame_types/electrochromic_button
+	matter = list(MAT_STEEL = 50, "glass" = 50)
+
 //Computer
 
 /obj/item/weapon/circuitboard/holopad

code/game/objects/structures/lattice.dm

@@ -69,9 +69,12 @@
 		return
 	if (istype(C, /obj/item/stack/rods))
 		var/obj/item/stack/rods/R = C
-		if(R.use(2))
+		if(R.get_amount() < 2)
+			to_chat(user, "<span class='notice'>You need at least two rods to form a catwalk here.</span>")
+		else
 			to_chat(user, "<span class='notice'>You start connecting \the [R.name] to \the [src.name] ...</span>")
 			if(do_after(user, 5 SECONDS))
+				R.use(2) //2023-02-27 bugfix to prevent rods being used without catwalk creation
 				src.alpha = 0 // Note: I don't know why this is set, Eris did it, just trusting for now. ~Leshana
 				new /obj/structure/catwalk(src.loc)
 				qdel(src)

code/modules/materials/materials/organic/grass.dm

@@ -0,0 +1,31 @@
+/datum/material/grass
+	name = MAT_GRASS
+	display_name = "grass"
+	stack_type = /obj/item/stack/tile/grass
+	ignition_point = T0C+300
+	melting_point = T0C+300
+	protectiveness = 0
+	conductive = 0
+	integrity = 10
+	supply_conversion_value = 1
+
+/datum/material/grass/generate_recipes()
+	recipes = list(
+		new /datum/stack_recipe_list("bushes and flowers",list(
+			new /datum/stack_recipe("bush", /obj/structure/flora/ausbushes, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("reed bush", /obj/structure/flora/ausbushes/reedbush, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("leafy bush", /obj/structure/flora/ausbushes/leafybush, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("pale bush", /obj/structure/flora/ausbushes/palebush, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("stalky bush", /obj/structure/flora/ausbushes/stalkybush, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("grassy bush", /obj/structure/flora/ausbushes/grassybush, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("ferny bush", /obj/structure/flora/ausbushes/fernybush, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("sunny bush", /obj/structure/flora/ausbushes/sunnybush, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("pointy bush", /obj/structure/flora/ausbushes/pointybush, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("lavender grass", /obj/structure/flora/ausbushes/lavendergrass, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("yellow-and-white flowers", /obj/structure/flora/ausbushes/ywflowers, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("blue-and-red flowers", /obj/structure/flora/ausbushes/brflowers, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("pink-and-purple flowers", /obj/structure/flora/ausbushes/ppflowers, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("sparse grass", /obj/structure/flora/ausbushes/sparsegrass, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"),
+			new /datum/stack_recipe("full grass", /obj/structure/flora/ausbushes/fullgrass, 3, one_per_turf = 0, on_floor = 1, recycle_material = "[name]")
+			))
+	)

vorestation.dme

@@ -2646,6 +2646,7 @@
 #include "code\modules\materials\materials\metals\steel_vr.dm"
 #include "code\modules\materials\materials\organic\animal_products.dm"
 #include "code\modules\materials\materials\organic\cloth.dm"
+#include "code\modules\materials\materials\organic\grass.dm"
 #include "code\modules\materials\materials\organic\leather.dm"
 #include "code\modules\materials\materials\organic\resin.dm"
 #include "code\modules\materials\materials\organic\wood.dm"