Merge pull request #11433 from Core0verload/framed

Buttons and wall frames rework

code/game/objects/items/apc_frame.dm

@@ -1,32 +1,78 @@
-// APC HULL
+/obj/item/wallframe
+	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT*2)
+	flags = CONDUCT
+	origin_tech = "materials=1;engineering=1"
+	item_state = "syringe_kit"
+	w_class = 2
+	var/result_path
+	var/inverse = 0
+	// For inverse dir frames like light fixtures.
 
-/obj/item/apc_frame
+/obj/item/wallframe/proc/try_build(turf/on_wall)
+	if(get_dist(on_wall,usr)>1)
+		return
+	var/ndir = get_dir(on_wall, usr)
+	if(!(ndir in cardinal))
+		return
+	var/turf/loc = get_turf(usr)
+	var/area/A = loc.loc
+	if(!istype(loc, /turf/simulated/floor))
+		usr << "<span class='warning'>You cannot place [src] on this spot!</span>"
+		return
+	if(A.requires_power == 0 || istype(A, /area/space))
+		usr << "<span class='warning'>You cannot place [src] in this area!</span>"
+		return
+	if(gotwallitem(loc, ndir, inverse*2))
+		usr << "<span class='warning'>There's already an item on this wall!</span>"
+		return
+
+	return 1
+
+/obj/item/wallframe/proc/attach(turf/on_wall)
+	if(result_path)
+		playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
+		usr.visible_message("[usr.name] attaches [src] to the wall.",
+			"<span class='notice'>You attach [src] to the wall.</span>",
+			"<span class='italics'>You hear clicking.</span>")
+		var/ndir = get_dir(on_wall,usr)
+		if(inverse)
+			ndir = turn(ndir, 180)
+
+		var/obj/O = new result_path(get_turf(usr), ndir, 1)
+		transfer_fingerprints_to(O)
+
+	qdel(src)
+
+
+/obj/item/wallframe/attackby(obj/item/weapon/W, mob/user, params)
+	..()
+	var/metal_amt = round(materials[MAT_METAL]/MINERAL_MATERIAL_AMOUNT)
+	var/glass_amt = round(materials[MAT_GLASS]/MINERAL_MATERIAL_AMOUNT)
+
+	if (istype(W, /obj/item/weapon/wrench) && (metal_amt || glass_amt))
+		user << "<span class='notice'>You dismantle [src].</span>"
+		if(metal_amt)
+			new /obj/item/stack/sheet/metal(get_turf(src), metal_amt)
+		if(glass_amt)
+			new /obj/item/stack/sheet/glass(get_turf(src), glass_amt)
+		qdel(src)
+
+
+
+// APC HULL
+/obj/item/wallframe/apc
 	name = "\improper APC frame"
 	desc = "Used for repairing or building APCs"
 	icon = 'icons/obj/apc_repair.dmi'
 	icon_state = "apc_frame"
-	flags = CONDUCT
+	result_path = /obj/machinery/power/apc
 
-/obj/item/apc_frame/attackby(obj/item/weapon/W, mob/user, params)
-	..()
-	if (istype(W, /obj/item/weapon/wrench))
-		new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 )
-		qdel(src)
 
-/obj/item/apc_frame/proc/try_build(turf/on_wall)
-	if (get_dist(on_wall,usr)>1)
-		return
-	var/ndir = get_dir(usr,on_wall)
-	if (!(ndir in cardinal))
+/obj/item/wallframe/apc/try_build(turf/on_wall)
+	if(!..())
 		return
 	var/turf/loc = get_turf(usr)
 	var/area/A = loc.loc
-	if (!istype(loc, /turf/simulated/floor))
-		usr << "<span class='warning'>APC cannot be placed on this spot!</span>"
-		return
-	if (A.requires_power == 0 || istype(A, /area/space))
-		usr << "<span class='warning'>APC cannot be placed in this area!</span>"
-		return
 	if (A.get_apc())
 		usr << "<span class='warning'>This area already has APC!</span>"
 		return //only one APC per area
@@ -39,5 +85,15 @@
 			C.amount = 10
 			usr << "<span class='notice'>You cut the cables and disassemble the unused power terminal.</span>"
 			qdel(T)
-	new /obj/machinery/power/apc(loc, ndir, 1)
-	qdel(src)
+	return 1
+
+
+/obj/item/weapon/electronics
+	desc = "Looks like a circuit. Probably is."
+	icon = 'icons/obj/module.dmi'
+	icon_state = "door_electronics"
+	item_state = "electronic"
+	flags = CONDUCT
+	w_class = 2
+	origin_tech = "engineering=2;programming=1"
+	materials = list(MAT_METAL=50, MAT_GLASS=50)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -33,12 +33,13 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade), \
-	new/datum/stack_recipe("light fixture frame", /obj/item/light_fixture_frame, 2), \
-	new/datum/stack_recipe("small light fixture frame", /obj/item/light_fixture_frame/small, 1), \
+	new/datum/stack_recipe("light fixture frame", /obj/item/wallframe/light_fixture, 2), \
+	new/datum/stack_recipe("small light fixture frame", /obj/item/wallframe/light_fixture/small, 1), \
 	null, \
-	new/datum/stack_recipe("apc frame", /obj/item/apc_frame, 2), \
-	new/datum/stack_recipe("air alarm frame", /obj/item/alarm_frame, 2), \
-	new/datum/stack_recipe("fire alarm frame", /obj/item/firealarm_frame, 2), \
+	new/datum/stack_recipe("apc frame", /obj/item/wallframe/apc, 2), \
+	new/datum/stack_recipe("air alarm frame", /obj/item/wallframe/alarm, 2), \
+	new/datum/stack_recipe("fire alarm frame", /obj/item/wallframe/firealarm, 2), \
+	new/datum/stack_recipe("button frame", /obj/item/wallframe/button, 1), \
 	null, \
 	new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \
 )

code/game/objects/items/weapons/RCD.dm

@@ -357,7 +357,7 @@ RCD
 							activate()
 							var/obj/machinery/door/airlock/T = new airlock_type( A )
 
-							T.electronics = new/obj/item/weapon/airlock_electronics( src.loc )
+							T.electronics = new/obj/item/weapon/electronics/airlock( src.loc )
 
 							if(conf_access)
 								T.electronics.conf_access = conf_access.Copy()