Merge pull request #7167 from uraniummeltdown/wall

Simplify some wall code and minor cult changes

code/datums/spells/construct_spells.dm

@@ -6,7 +6,7 @@
 	action_background_icon_state = "bg_cult"
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/floor
-	name = "Floor Construction"
+	name = "Summon Cult Floor"
 	desc = "This spell constructs a cult floor"
 	action_icon_state = "floorconstruct"
 	action_background_icon_state = "bg_cult"
@@ -20,7 +20,7 @@
 	centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/wall
-	name = "Lesser Construction"
+	name = "Summon Cult Wall"
 	desc = "This spell constructs a cult wall"
 	action_icon_state = "lesserconstruct"
 	action_background_icon_state = "bg_cult"
@@ -30,7 +30,7 @@
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
-	summon_type = list(/turf/simulated/wall/cult)
+	summon_type = list(/turf/simulated/wall/cult/artificer) //we don't want artificer-based runed metal farms
 	centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced

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

@@ -257,7 +257,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list (
 
 var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
 	new/datum/stack_recipe("runed door", /obj/machinery/door/airlock/cult, 1, time = 50, one_per_turf = 1, on_floor = 1),
-	new/datum/stack_recipe("runed girder", /obj/structure/cultgirder, 1, time = 50, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("runed girder", /obj/structure/girder/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("pylon", /obj/structure/cult/functional/pylon, 3, time = 40, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("forge", /obj/structure/cult/functional/forge, 5, time = 40, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("archives", /obj/structure/cult/functional/tome, 2, time = 40, one_per_turf = 1, on_floor = 1), \

code/game/objects/structures/girders.dm

@@ -1,8 +1,9 @@
 /obj/structure/girder
+	name = "girder"
 	icon_state = "girder"
 	anchored = 1
 	density = 1
-	layer = TURF_LAYER + 0.9
+	layer = BELOW_OBJ_LAYER
 	var/state = 0
 	var/health = 200
 	var/metalUsed = 2 //used to determine amount returned in deconstruction
@@ -191,7 +192,7 @@
 
 /obj/structure/girder/narsie_act()
 	if(prob(25))
-		new /obj/structure/cultgirder(loc)
+		new /obj/structure/girder/cult(loc)
 		qdel(src)
 
 /obj/structure/girder/bullet_act(var/obj/item/projectile/Proj)
@@ -223,70 +224,91 @@
 	return
 
 /obj/structure/girder/displaced
+	name = "displaced girder"
 	icon_state = "displaced"
 	anchored = 0
 	health = 50
 
 /obj/structure/girder/reinforced
+	name = "reinforced girder"
 	icon_state = "reinforced"
 	state = 2
 	health = 500
 
-/obj/structure/cultgirder
+/obj/structure/girder/cult
+	name = "runed girder"
+	desc = "Framework made of a strange and shockingly cold metal. It doesn't seem to have any bolts."
 	icon= 'icons/obj/cult.dmi'
 	icon_state= "cultgirder"
 	anchored = 1
 	density = 1
-	var/health = 250
+	metalUsed = 1
+	health = 250
 
-/obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wrench))
-		playsound(loc, W.usesound, 100, 1)
-		to_chat(user, "<span class='notice'>Now disassembling the girder</span>")
-		if(do_after(user, 40 * W.toolspeed, target = src))
-			to_chat(user, "<span class='notice'>You dissasembled the girder!</span>")
-			dismantle()
+/obj/structure/girder/cult/refundMetal(metalAmount)
+	for(var/i=0;i < metalAmount;i++)
+		new /obj/item/stack/sheet/runed_metal(get_turf(src))
+
+/obj/structure/girder/cult/attackby(obj/item/W, mob/user, params)
+	add_fingerprint(user)
+	if(istype(W, /obj/item/weapon/tome) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes
+		user.visible_message("<span class='warning'>[user] strikes [src] with [W]!</span>", "<span class='notice'>You demolish [src].</span>")
+		refundMetal(metalUsed)
+		qdel(src)
+
+	else if(iswelder(W))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(WT.remove_fuel(0,user))
+			playsound(loc, W.usesound, 50, 1)
+			to_chat(user, "<span class='notice'>You start slicing apart the girder...</span>")
+			if(do_after(user, 40*W.toolspeed, target = src))
+				if(!WT.isOn())
+					return
+				to_chat(user, "<span class='notice'>You slice apart the girder.</span>")
+				var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
+				R.amount = 1
+				transfer_fingerprints_to(R)
+				qdel(src)
 
 	else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
-		to_chat(user, "<span class='notice'>Now slicing apart the girder</span>")
-		if(do_after(user, 30 * W.toolspeed, target = src))
+		to_chat(user, "<span class='notice'>You start slicing apart the girder...</span>")
+		if(do_after(user, 40* W.toolspeed, target = src))
 			playsound(loc, W.usesound, 100, 1)
-			to_chat(user, "<span class='notice'>You slice apart the girder!</span>")
-			dismantle()
-
-	else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill))
-		to_chat(user, "<span class='notice'>You drill through the girder!</span>")
-		dismantle()
-
-/obj/structure/cultgirder/proc/dismantle()
-	new /obj/effect/decal/remains/human(get_turf(src))
-	qdel(src)
-
-/obj/structure/cultgirder/blob_act()
-	if(prob(40))
-		dismantle()
-
-/obj/structure/cultgirder/bullet_act(var/obj/item/projectile/Proj) //No beam check- How else will you destroy the cult girder with silver bullets?????
-	health -= Proj.damage
-	..()
-	if(health <= 0)
-		dismantle()
-	return
-
-/obj/structure/cultgirder/ex_act(severity)
-	switch(severity)
-		if(1.0)
+			to_chat(user, "<span class='notice'>You slice apart the girder.</span>")
+			var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
+			R.amount = 1
+			transfer_fingerprints_to(R)
 			qdel(src)
-			return
-		if(2.0)
-			if(prob(30))
-				new /obj/effect/decal/remains/human(loc)
-				qdel(src)
-			return
-		if(3.0)
-			if(prob(5))
-				new /obj/effect/decal/remains/human(loc)
-				qdel(src)
-			return
-		else
-	return
+
+	else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
+		var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
+		to_chat(user, "<span class='notice'>Your jackhammer smashes through the girder!</span>")
+		var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
+		R.amount = 1
+		transfer_fingerprints_to(R)
+		D.playDigSound()
+		qdel(src)
+
+	else if(istype(W, /obj/item/stack/sheet/runed_metal))
+		var/obj/item/stack/sheet/runed_metal/R = W
+		if(R.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need at least one sheet of runed metal to construct a runed wall!</span>")
+			return 0
+		user.visible_message("<span class='notice'>[user] begins laying runed metal on [src]...</span>", "<span class='notice'>You begin constructing a runed wall...</span>")
+		if(do_after(user, 50, target = src))
+			if(R.get_amount() < 1 || !R)
+				return
+			user.visible_message("<span class='notice'>[user] plates [src] with runed metal.</span>", "<span class='notice'>You construct a runed wall.</span>")
+			R.use(1)
+			var/turf/T = get_turf(src)
+			T.ChangeTurf(/turf/simulated/wall/cult)
+			qdel(src)
+
+/obj/structure/girder/cult/take_damage(amount)
+	health -= amount
+	if(health <= 0)
+		new /obj/item/stack/sheet/runed_metal(get_turf(src))
+		qdel(src)
+
+/obj/structure/girder/cult/narsie_act()
+	return

code/game/turfs/simulated/walls.dm

@@ -25,6 +25,8 @@
 	var/engraving, engraving_quality //engraving on the wall
 
 	var/sheet_type = /obj/item/stack/sheet/metal
+	var/sheet_amount = 2
+	var/girder_type = /obj/structure/girder
 	var/obj/item/stack/sheet/builtin_sheet = null
 
 	canSmoothWith = list(
@@ -139,13 +141,11 @@
 	ChangeTurf(/turf/simulated/floor/plating)
 
 /turf/simulated/wall/proc/break_wall()
-	builtin_sheet.amount = 2
-	builtin_sheet.loc = src
-	return (new /obj/structure/girder(src))
+	new sheet_type(src, sheet_amount)
+	return new girder_type(src)
 
 /turf/simulated/wall/proc/devastate_wall()
-	builtin_sheet.amount = 2
-	builtin_sheet.loc = src
+	new sheet_type(src, sheet_amount)
 	new /obj/item/stack/sheet/metal(src)
 
 /turf/simulated/wall/ex_act(severity)

code/game/turfs/simulated/walls_mineral.dm

@@ -101,9 +101,8 @@
 	..()
 
 /turf/simulated/wall/mineral/plasma/proc/PlasmaBurn(temperature)
-	spawn(2)
-	new /obj/structure/girder(src)
-	src.ChangeTurf(/turf/simulated/floor)
+	new girder_type(src)
+	ChangeTurf(/turf/simulated/floor)
 	atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 400)
 
 /turf/simulated/wall/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :(

code/game/turfs/simulated/walls_misc.dm

@@ -1,11 +1,14 @@
 /turf/simulated/wall/cult
-	name = "wall"
-	desc = "The patterns engraved on the wall seem to shift as you try to focus on them. You feel sick"
+	name = "runed metal wall"
+	desc = "A cold metal wall engraved with indecipherable symbols. Studying them causes your head to pound."
 	icon = 'icons/turf/walls/cult_wall.dmi'
 	icon_state = "cult"
 	builtin_sheet = null
 	canSmoothWith = null
 	smooth = SMOOTH_FALSE
+	sheet_type = /obj/item/stack/sheet/runed_metal
+	sheet_amount = 1
+	girder_type = /obj/structure/girder/cult
 
 /turf/simulated/wall/cult/New()
 	..()
@@ -17,17 +20,18 @@
 	name = "runed stone wall"
 	desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound."
 
+/turf/simulated/wall/cult/artificer/break_wall()
+	new /obj/effect/overlay/temp/cult/turf(get_turf(src))
+	return null //excuse me we want no runed metal here
+
+/turf/simulated/wall/cult/artificer/devastate_wall()
+	new /obj/effect/overlay/temp/cult/turf(get_turf(src))
 
 /turf/simulated/wall/cult/narsie_act()
 	return
 
-/turf/simulated/wall/cult/break_wall()
-	new /obj/effect/decal/cleanable/blood(src)
-	return (new /obj/structure/cultgirder(src))
-
 /turf/simulated/wall/cult/devastate_wall()
-	new /obj/effect/decal/cleanable/blood(src)
-	new /obj/effect/decal/remains/human(src)
+	new sheet_type(get_turf(src), sheet_amount)
 
 /turf/simulated/wall/rust
 	name = "rusted wall"

code/game/turfs/simulated/walls_reinforced.dm

@@ -10,7 +10,8 @@
 	max_temperature = 6000
 	hardness = 10
 	sheet_type = /obj/item/stack/sheet/plasteel
-
+	sheet_amount = 1
+	girder_type = /obj/structure/girder/reinforced
 	var/d_state = 0
 	var/can_be_reinforced = 1
 
@@ -313,3 +314,7 @@
 	else
 		smooth = SMOOTH_TRUE
 		icon_state = ""
+
+/turf/simulated/wall/r_wall/devastate_wall()
+	new sheet_type(src, sheet_amount)
+	new /obj/item/stack/sheet/metal(src, 2)

code/modules/mob/living/simple_animal/constructs.dm

@@ -303,11 +303,13 @@
 	melee_damage_upper = 5
 	attacktext = "prods"
 	speed = 0
-	environment_smash = 1
+	environment_smash = 3
 	see_in_dark = 8
 	attack_sound = 'sound/weapons/tap.ogg'
 	const_type = "harvester"
-	construct_spells = list(/obj/effect/proc_holder/spell/targeted/smoke/disable)
+	construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
+							/obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
+							/obj/effect/proc_holder/spell/targeted/smoke/disable)
 	retreat_distance = 2 //AI harvesters will move in and out of combat, like wraiths, but shittier
 	playstyle_string = "<B>You are a Harvester. You are not strong, but your powers of domination will assist you in your role: \
 						Bring those who still cling to this world of illusion back to the master so they may know Truth.</B>"
@@ -319,7 +321,7 @@
 
 /mob/living/simple_animal/hostile/construct/harvester/hostile //actually hostile, will move around, hit things
 	AIStatus = AI_ON
-
+	environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP
 
 ////////////////Glow////////////////////
 /mob/living/simple_animal/hostile/construct/proc/updateglow()