diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 5c823178fad..781cc48cf99 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -59,27 +59,57 @@
return
switch(state)
if(1)
+ if(istype(P, /obj/item/weapon/circuitboard))
+ user << "The frame needs wiring first!"
+ return
if(istype(P, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = P
if(C.get_amount() >= 5)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
- user << "You start to add cables to the frame."
- if(do_after(user, 20))
+ user << "You start to add cables to the frame..."
+ if(do_after(user, 20, target = src))
if(C.get_amount() >= 5 && state == 1)
C.use(5)
user << "You add cables to the frame."
state = 2
icon_state = "box_1"
else
- user << "You need five length of cable to wire the frame."
+ user << "You need five length of cable to wire the frame!"
return
+ if(istype(P, /obj/item/weapon/weldingtool) && !anchored)
+ var/obj/item/weapon/weldingtool/WT = P
+ if(WT.remove_fuel(0,user))
+ playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+ user.visible_message("[user] disassembles the frame.", \
+ "You start to disassemble the frame...", "You hear welding and clanking.")
+ if(do_after(user, 40, target = src))
+ if( !WT.isOn() )
+ return
+ if(state == 1)
+ user << "You disassemble the frame."
+ var/obj/item/stack/sheet/metal/M = new (loc, 5)
+ M.add_fingerprint(user)
+ qdel(src)
if(istype(P, /obj/item/weapon/wrench))
+ user << "You start [anchored ? "un" : ""]securing [name]..."
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
- user << "You dismantle the frame."
- new /obj/item/stack/sheet/metal(src.loc, 5)
- qdel(src)
+ if(do_after(user, 40, target = src))
+ if(state == 1)
+ user << "You [anchored ? "un" : ""]secure [name]."
+ anchored = !anchored
+
if(2)
+ if(istype(P, /obj/item/weapon/wrench))
+ user << "You start [anchored ? "un" : ""]securing [name]..."
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+ if(do_after(user, 40, target = src))
+ user << "You [anchored ? "un" : ""]secure [name]."
+ anchored = !anchored
+
if(istype(P, /obj/item/weapon/circuitboard))
+ if(!anchored)
+ user << "The frame needs to be secured first!"
+ return
var/obj/item/weapon/circuitboard/B = P
if(B.board_type == "machine")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
@@ -94,7 +124,7 @@
update_namelist()
update_req_desc()
else
- user << "This frame does not accept circuit boards of this type!"
+ user << "This frame does not accept circuit boards of this type!"
if(istype(P, /obj/item/weapon/wirecutters))
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
user << "You remove the cables."
@@ -381,7 +411,7 @@ to destroy them and players will be able to make replacements.
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/weapon/stock_parts/cell = 1)
-
+
/obj/item/weapon/circuitboard/chem_master
name = "circuit board (Chem Master 2999)"
build_path = /obj/machinery/chem_master/constructable
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index e14abdc52d2..c4ebdb69737 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -1,51 +1,58 @@
+#define GIRDER_NORMAL 0
+#define GIRDER_REINF_STRUTS 1
+#define GIRDER_REINF 2
+#define GIRDER_DISPLACED 3
+
/obj/structure/girder
name = "girder"
icon_state = "girder"
anchored = 1
density = 1
layer = 2
- var/state = 0
+ var/state = GIRDER_NORMAL
var/girderpasschance = 20 // percentage chance that a projectile passes through the girder.
/obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob, params)
add_fingerprint(user)
- if(istype(W, /obj/item/weapon/wrench) && state == 0)
- if(anchored && !istype(src,/obj/structure/girder/displaced))
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "Now disassembling the girder..."
- if(do_after(user,40))
- if(!src.loc)
+ if(istype(W, /obj/item/weapon/weldingtool) && state == GIRDER_DISPLACED)
+ var/obj/item/weapon/weldingtool/WT = W
+ if(WT.remove_fuel(0,user))
+ playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+ user.visible_message("[user] disassembles the girder.", \
+ "You start to disassemble the girder...", "You hear welding and clanking.")
+ if(do_after(user, 40, target = src))
+ if( !WT.isOn() )
return
- user << "You dissasembled the girder!"
- new /obj/item/stack/sheet/metal(get_turf(src))
- qdel(src)
- else if(!anchored)
- if (!istype(src.loc, /turf/simulated/floor))
- usr << "A floor must be present to secure the girder!"
- return
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "Now securing the girder..."
- if(do_after(user, 40))
- if(!src.loc)
- return
- user << "You secured the girder!"
- var/obj/structure/girder/G = new (loc)
- transfer_fingerprints_to(G)
- qdel(src)
+ if(state == 1)
+ user << "You disassemble the girder."
+ var/obj/item/stack/sheet/metal/M = new (loc, 2)
+ M.add_fingerprint(user)
+ qdel(src)
+
+ else if(istype(W, /obj/item/weapon/wrench) && state == GIRDER_DISPLACED)
+ if (!istype(src.loc, /turf/simulated/floor))
+ usr << "A floor must be present to secure the girder!"
+ return
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+ user << "You start securing the girder..."
+ if(do_after(user, 40, target = src))
+ user << "You secure the girder."
+ var/obj/structure/girder/G = new (loc)
+ transfer_fingerprints_to(G)
+ qdel(src)
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
- user << "Now slicing apart the girder..."
- if(do_after(user,30))
- if(!src.loc)
- return
- user << "You slice apart the girder!"
- new /obj/item/stack/sheet/metal(get_turf(src))
+ user << "You start slicing apart the girder..."
+ if(do_after(user, 30, target = src))
+ user << "You slice apart the girder."
+ var/obj/item/stack/sheet/metal/M = new (loc, 2)
+ M.add_fingerprint(user)
qdel(src)
else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
if(!D.bcell.use(D.drillcost))
- user << "Your [D.name] doesn't have enough power to break through the [name]."
+ user << "Your [D.name] doesn't have enough power to break through the [name]!"
return
D.update_icon()
user << "You smash through the girder!"
@@ -53,40 +60,35 @@
D.playDigSound()
qdel(src)
- else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced))
+ else if(istype(W, /obj/item/weapon/screwdriver) && state == GIRDER_REINF)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
- user << "Now unsecuring support struts..."
- if(do_after(user,40))
- if(!src.loc)
- return
- user << "You unsecured the support struts!"
- state = 1
+ user << "You start unsecuring support struts..."
+ if(do_after(user, 40, target = src))
+ user << "You unsecure the support struts."
+ state = GIRDER_REINF_STRUTS
- else if(istype(W, /obj/item/weapon/wirecutters) && istype(src,/obj/structure/girder/reinforced) && state == 1)
+ else if(istype(W, /obj/item/weapon/wirecutters) && state == GIRDER_REINF_STRUTS)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
- user << "Now removing support struts..."
- if(do_after(user,40))
- if(!src.loc)
- return
- user << "You removed the support struts!"
+ user << "You start removing support struts..."
+ if(do_after(user, 40, target = src))
+ user << "You remove the support struts."
+ new /obj/item/stack/sheet/plasteel(get_turf(src))
var/obj/structure/girder/G = new (loc)
transfer_fingerprints_to(G)
qdel(src)
- else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored )
- playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
- user << "Now dislodging the girder..."
- if(do_after(user, 40))
- if(!src.loc)
- return
- user << "You dislodged the girder!"
+ else if(istype(W, /obj/item/weapon/wrench) && state == GIRDER_NORMAL && anchored )
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+ user << "You start unsecuring the girder..."
+ if(do_after(user, 40, target = src))
+ user << "You unsecure the girder."
var/obj/structure/girder/displaced/D = new (loc)
transfer_fingerprints_to(D)
qdel(src)
else if(istype(W, /obj/item/stack/sheet))
if (!istype(src.loc, /turf/simulated/floor))
- usr << "The girder is too unstable to build anything!"
+ usr << "A floor must be present to build a false wall!"
return
var/obj/item/stack/sheet/S = W
@@ -94,24 +96,28 @@
if(/obj/item/stack/sheet/metal, /obj/item/stack/sheet/metal/cyborg)
if(!anchored)
- if (S.use(2))
- user << "You create a false wall! Push on it to open or close the passage."
+ if(S.get_amount() < 2)
+ user << "You need two sheets of metal to create a false wall!"
+ return
+ user << "You start building a false wall..."
+ if(do_after(user, 20, target = src))
+ if(!src.loc || !S || S.amount < 2)
+ return
+ S.use(2)
+ user << "You create a false wall. Push on it to open or close the passage."
var/obj/structure/falsewall/F = new (loc)
transfer_fingerprints_to(F)
qdel(src)
- else
- user << "You need two sheets of metal to create a false wall."
- return
else
if(S.get_amount() < 2)
- user << "You need two sheets of metal to finish a wall."
+ user << "You need two sheets of metal to finish a wall!"
return
- user << "Now adding plating..."
+ user << "You start adding plating..."
if (do_after(user, 40))
if(loc == null || S.get_amount() < 2)
return
S.use(2)
- user << "You added the plating!"
+ user << "You add the plating."
var/turf/Tsrc = get_turf(src)
Tsrc.ChangeTurf(/turf/simulated/wall)
for(var/turf/simulated/wall/X in Tsrc.loc)
@@ -123,22 +129,26 @@
if(/obj/item/stack/sheet/plasteel)
if(!anchored)
if(S.amount < 2)
- user << "You need at least two sheets to create a false wall."
+ user << "You need at least two sheets to create a false wall!"
return
- S.use(2)
- user << "You create a false wall! Push on it to open or close the passage."
- var/obj/structure/falsewall/reinforced/FW = new (loc)
- transfer_fingerprints_to(FW)
- qdel(src)
+ user << "You start building a reinforced false wall..."
+ if(do_after(user, 20, target = src))
+ if(!src.loc || !S || S.amount < 2)
+ return
+ S.use(2)
+ user << "You create a reinforced false wall. Push on it to open or close the passage."
+ var/obj/structure/falsewall/reinforced/FW = new (loc)
+ transfer_fingerprints_to(FW)
+ qdel(src)
else
if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
if(S.amount < 1) return ..()
- user << "Now finalising reinforced wall..."
+ user << "You start finalizing the reinforced wall..."
if(do_after(user, 50))
if(!src.loc || !S || S.amount < 1)
return
S.use(1)
- user << "Wall fully reinforced!"
+ user << "You fully reinforce the wall."
var/turf/Tsrc = get_turf(src)
Tsrc.ChangeTurf(/turf/simulated/wall/r_wall)
for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
@@ -147,12 +157,12 @@
return
else
if(S.amount < 1) return ..()
- user << "Now reinforcing girders..."
- if (do_after(user,60))
+ user << "You start reinforcing the girder..."
+ if (do_after(user, 60))
if(!src.loc || !S || S.amount < 1)
return
S.use(1)
- user << "Girders reinforced!"
+ user << "You reinforce the girder."
var/obj/structure/girder/reinforced/R = new (loc)
transfer_fingerprints_to(R)
qdel(src)
@@ -162,22 +172,22 @@
var/M = S.sheettype
if(!anchored)
if(S.amount < 2)
- user << "You need at least two sheets to create a false wall."
+ user << "You need at least two sheets to create a false wall!"
return
S.use(2)
- user << "You create a false wall! Push on it to open or close the passage."
+ user << "You create a false wall. Push on it to open or close the passage."
var/F = text2path("/obj/structure/falsewall/[M]")
var/obj/structure/FW = new F (loc)
transfer_fingerprints_to(FW)
qdel(src)
else
if(S.amount < 2) return ..()
- user << "Now adding plating..."
- if (do_after(user,40))
+ user << "You start adding plating..."
+ if (do_after(user, 40))
if(!src.loc || !S || S.amount < 2)
return
S.use(2)
- user << "You added the plating!"
+ user << "You add the plating."
var/turf/Tsrc = get_turf(src)
Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
@@ -192,7 +202,7 @@
if (P.pipe_type in list(0, 1, 5)) //simple pipes, simple bends, and simple manifolds.
user.drop_item()
P.loc = src.loc
- user << "You fit the pipe into \the [src]!"
+ user << "You fit the pipe into \the [src]."
else
..()
@@ -236,12 +246,14 @@
name = "displaced girder"
icon_state = "displaced"
anchored = 0
+ state = GIRDER_DISPLACED
girderpasschance = 25
+ layer = 2.45
/obj/structure/girder/reinforced
name = "reinforced girder"
icon_state = "reinforced"
- state = 2
+ state = GIRDER_REINF
girderpasschance = 0
/obj/structure/girder/reinforced/ex_act(severity, target)
@@ -271,24 +283,29 @@
layer = 2
/obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/weapon/wrench))
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "Now disassembling the girder..."
- if(do_after(user,40))
- user << "You dissasembled the girder!"
- var/obj/effect/decal/remains/human/R = new (get_turf(src))
- transfer_fingerprints_to(R)
- qdel(src)
+ add_fingerprint(user)
+ if(istype(W, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = W
+ if(WT.remove_fuel(0,user))
+ playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+ user.visible_message("[user] disassembles the girder.", \
+ "You start to disassemble the girder...", "You hear welding and clanking.")
+ if(do_after(user, 40))
+ if( !WT.isOn() )
+ return
+ user << "You disassemble the girder."
+ var/obj/effect/decal/remains/human/R = new (get_turf(src))
+ transfer_fingerprints_to(R)
+ qdel(src)
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
- user << "Now slicing apart the girder..."
- if(do_after(user,30))
- user << "You slice apart the girder!"
+ user << "You start slicing apart the girder..."
+ if(do_after(user, 30))
+ user << "You slice apart the girder."
var/obj/effect/decal/remains/human/R = new (get_turf(src))
transfer_fingerprints_to(R)
qdel(src)
-
else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
if(!D.bcell.use(D.drillcost))
@@ -321,4 +338,4 @@
qdel(src)
return
else
- return
\ No newline at end of file
+ return
diff --git a/html/changelogs/kingofkosmos-girderrakennus.yml b/html/changelogs/kingofkosmos-girderrakennus.yml
new file mode 100644
index 00000000000..3634d975887
--- /dev/null
+++ b/html/changelogs/kingofkosmos-girderrakennus.yml
@@ -0,0 +1,6 @@
+author: kingofkosmos
+
+delete-after: True
+
+changes:
+ - wip: "Girder and machine frame construction protocols has been changed. They can now be secured/unsecured with a wrench and disassembled with a welder."