diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm
index 8632b89df12..7ddbd85166d 100644
--- a/code/datums/spells/construct_spells.dm
+++ b/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
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index fd7d10c6612..ca0eee74e8b 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/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), \
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 793398a9c07..5577f566416 100644
--- a/code/game/objects/structures/girders.dm
+++ b/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, "Now disassembling the girder")
- if(do_after(user, 40 * W.toolspeed, target = src))
- to_chat(user, "You dissasembled the girder!")
- 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("[user] strikes [src] with [W]!", "You demolish [src].")
+ 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, "You start slicing apart the girder...")
+ if(do_after(user, 40*W.toolspeed, target = src))
+ if(!WT.isOn())
+ return
+ to_chat(user, "You slice apart the girder.")
+ 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, "Now slicing apart the girder")
- if(do_after(user, 30 * W.toolspeed, target = src))
+ to_chat(user, "You start slicing apart the girder...")
+ if(do_after(user, 40* W.toolspeed, target = src))
playsound(loc, W.usesound, 100, 1)
- to_chat(user, "You slice apart the girder!")
- dismantle()
-
- else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill))
- to_chat(user, "You drill through the girder!")
- 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, "You slice apart the girder.")
+ 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
\ No newline at end of file
+
+ else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
+ var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
+ to_chat(user, "Your jackhammer smashes through the girder!")
+ 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, "You need at least one sheet of runed metal to construct a runed wall!")
+ return 0
+ user.visible_message("[user] begins laying runed metal on [src]...", "You begin constructing a runed wall...")
+ if(do_after(user, 50, target = src))
+ if(R.get_amount() < 1 || !R)
+ return
+ user.visible_message("[user] plates [src] with runed metal.", "You construct a runed wall.")
+ 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
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 528d29e5e3b..d0b0a3c8960 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -1,6 +1,6 @@
/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
@@ -8,7 +8,7 @@
smooth = SMOOTH_FALSE
sheet_type = /obj/item/stack/sheet/runed_metal
sheet_amount = 1
- girder_type = /obj/structure/cultgirder
+ girder_type = /obj/structure/girder/cult
/turf/simulated/wall/cult/New()
..()
@@ -20,6 +20,12 @@
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
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index fd1b35efeca..54cf810a081 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/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 = "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."
@@ -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()
diff --git a/icons/obj/cult.dmi b/icons/obj/cult.dmi
index 6901e1c25a2..40eb2deda62 100644
Binary files a/icons/obj/cult.dmi and b/icons/obj/cult.dmi differ