cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes borgs not being able to finish scooters + misc changes.

Browse Source
This commit is contained in:
Firecage
2016-07-18 16:25:09 +02:00
parent b73fd0b457
commit 58ee32f8e3
9 changed files with 71 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/girders.dm
+31 -27
View File
@@ -99,12 +99,12 @@
if(istype(W,/obj/item/stack/rods))
var/obj/item/stack/rods/S = W
if(state == GIRDER_DISPLACED)
if(S.amount < 2)
if(S.get_amount() < 2)
user << "<span class='warning'>You need at least two rods to create a false wall!</span>"
return
user << "<span class='notice'>You start building a reinforced false wall...</span>"
if(do_after(user, 20, target = src))
if(!src.loc || !S || S.amount < 2)
if(!src.loc || !S || S.get_amount() < 2)
return
S.use(2)
user << "<span class='notice'>You create a false wall. Push on it to open or close the passage.</span>"
@@ -112,12 +112,12 @@
transfer_fingerprints_to(FW)
qdel(src)
else
if(S.amount < 5)
if(S.get_amount() < 5)
user << "<span class='warning'>You need at least five rods to add plating!</span>"
return
user << "<span class='notice'>You start adding plating...</span>"
if (do_after(user, 40, target = src))
if(!src.loc || !S || S.amount < 5)
if(!src.loc || !S || S.get_amount() < 5)
return
S.use(5)
user << "<span class='notice'>You add the plating.</span>"
@@ -163,12 +163,12 @@
if(istype(S,/obj/item/stack/sheet/plasteel))
if(state == GIRDER_DISPLACED)
if(S.amount < 2)
if(S.get_amount() < 2)
user << "<span class='warning'>You need at least two sheets to create a false wall!</span>"
return
user << "<span class='notice'>You start building a reinforced false wall...</span>"
if(do_after(user, 20, target = src))
if(!src.loc || !S || S.amount < 2)
if(!src.loc || !S || S.get_amount() < 2)
return
S.use(2)
user << "<span class='notice'>You create a reinforced false wall. Push on it to open or close the passage.</span>"
@@ -177,11 +177,11 @@
qdel(src)
else
if(state == GIRDER_REINF)
if(S.amount < 1)
if(S.get_amount() < 1)
return
user << "<span class='notice'>You start finalizing the reinforced wall...</span>"
if(do_after(user, 50, target = src))
if(!src.loc || !S || S.amount < 1)
if(!src.loc || !S || S.get_amount() < 1)
return
S.use(1)
user << "<span class='notice'>You fully reinforce the wall.</span>"
@@ -191,11 +191,11 @@
qdel(src)
return
else
if(S.amount < 1)
if(S.get_amount() < 1)
return
user << "<span class='notice'>You start reinforcing the girder...</span>"
if (do_after(user, 60, target = src))
if(!src.loc || !S || S.amount < 1)
if(!src.loc || !S || S.get_amount() < 1)
return
S.use(1)
user << "<span class='notice'>You reinforce the girder.</span>"
@@ -207,22 +207,25 @@
if(S.sheettype)
var/M = S.sheettype
if(state == GIRDER_DISPLACED)
if(S.amount < 2)
if(S.get_amount() < 2)
user << "<span class='warning'>You need at least two sheets to create a false wall!</span>"
return
S.use(2)
user << "<span class='notice'>You create a false wall. Push on it to open or close the passage.</span>"
var/F = text2path("/obj/structure/falsewall/[M]")
var/obj/structure/FW = new F (loc)
transfer_fingerprints_to(FW)
qdel(src)
if(do_after(user, 20, target = src))
if(!src.loc || !S || S.get_amount() < 2)
return
S.use(2)
user << "<span class='notice'>You create a false wall. Push on it to open or close the passage.</span>"
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)
if(S.get_amount() < 2)
user << "<span class='warning'>You need at least two sheets to add plating!</span>"
return
user << "<span class='notice'>You start adding plating...</span>"
if (do_after(user, 40, target = src))
if(!src.loc || !S || S.amount < 2)
if(!src.loc || !S || S.get_amount() < 2)
return
S.use(2)
user << "<span class='notice'>You add the plating.</span>"
@@ -366,17 +369,18 @@
else if(istype(W, /obj/item/stack/sheet/runed_metal))
var/obj/item/stack/sheet/runed_metal/R = W
if(R.amount < 1)
if(R.get_amount() < 1)
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))
return 0
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/closed/wall/mineral/cult)
qdel(src)
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/closed/wall/mineral/cult)
qdel(src)
else
return ..()
code/game/objects/structures/windoor_assembly.dm
+2 -2
View File
@@ -136,13 +136,13 @@
//Adding plasteel makes the assembly a secure windoor assembly. Step 2 (optional) complete.
else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure)
var/obj/item/stack/sheet/plasteel/P = W
if(P.amount < 2)
if(P.get_amount() < 2)
user << "<span class='warning'>You need more plasteel to do this!</span>"
return
user << "<span class='notice'>You start to reinforce the windoor with plasteel...</span>"
if(do_after(user,40, target = src))
if(!src || secure)
if(!src || secure || P.get_amount() < 2)
return
P.use(2)