Merge pull request #10531 from duncathan/rpddelay

Speeds up RPD and pipe unwrenching
This commit is contained in:
Swag McYolosteinen
2015-07-12 12:41:49 +02:00
3 changed files with 11 additions and 5 deletions
+1 -1
View File
@@ -120,7 +120,7 @@ Pipelines + Other Objects -> Pipe network
user << "<span class='warning'>As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?</span>"
unsafe_wrenching = TRUE //Oh dear oh dear
if (do_after(user, 40, target = src) && !gc_destroyed)
if (do_after(user, 20, target = src) && !gc_destroyed)
user.visible_message( \
"[user] unfastens \the [src].", \
"<span class='notice'>You unfasten \the [src].</span>", \
+4 -4
View File
@@ -533,7 +533,7 @@ var/global/list/RPD_recipes=list(
if(istype(A,/obj/item/pipe) || istype(A,/obj/item/pipe_meter) || istype(A,/obj/structure/disposalconstruct))
user << "<span class='notice'>You start destroying pipe...</span>"
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 5, target = A))
if(do_after(user, 2, target = A))
activate()
qdel(A)
return 1
@@ -548,7 +548,7 @@ var/global/list/RPD_recipes=list(
return 0
user << "<span class='notice'>You start building pipes...</span>"
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20, target = A))
if(do_after(user, 2, target = A))
activate()
var/obj/item/pipe/P = new (A, pipe_type=queued_p_type, dir=queued_p_dir)
P.flipped = queued_p_flipped
@@ -563,7 +563,7 @@ var/global/list/RPD_recipes=list(
return 0
user << "<span class='notice'>You start building meter...</span>"
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20, target = A))
if(do_after(user, 2, target = A))
activate()
new /obj/item/pipe_meter(A)
return 1
@@ -575,7 +575,7 @@ var/global/list/RPD_recipes=list(
return 0
user << "<span class='notice'>You start building pipes...</span>"
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20, target = A))
if(do_after(user, 2, target = A))
var/obj/structure/disposalconstruct/C = new (A, queued_p_type ,queued_p_dir)
if(!C.can_place())
+6
View File
@@ -0,0 +1,6 @@
author: duncathan
delete-after: True
changes:
- tweak: "Greatly shortened the time it takes to lay pipes with the RPD and to unwrench pipes in general."