Skip to content

Commit

Permalink
Streamlining: mostly engineering-facing (UristMcStation#1417)
Browse files Browse the repository at this point in the history
* Captain's locker typo

* Construction and deconstruction steps sped up

* Pull speed increased

* requested changes - removed timers are 0.1

* travis

* puts the wall timers back

* S
  • Loading branch information
ggermanicus authored Apr 8, 2024
1 parent 94fc18c commit 79d7fe8
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
32 changes: 16 additions & 16 deletions code/modules/materials/recipes_furniture.dm
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ ARMCHAIR(yellow)
title = "door"
result_type = /obj/machinery/door/unpowered/simple
req_amount = 10
time = 50
time = 40

/datum/stack_recipe/furniture/barricade
title = "barricade"
result_type = /obj/structure/barricade
req_amount = 5
time = 50
time = 20

/datum/stack_recipe/furniture/stool
title = "stool"
Expand Down Expand Up @@ -152,7 +152,7 @@ ARMCHAIR(yellow)
/datum/stack_recipe/furniture/table_frame
title = "table frame"
result_type = /obj/structure/table
time = 10
time = 5

/datum/stack_recipe/furniture/rack
title = "rack"
Expand All @@ -163,7 +163,7 @@ ARMCHAIR(yellow)
title = "closet"
result_type = /obj/structure/closet
req_amount = 2
time = 15
time = 10

/datum/stack_recipe/furniture/canister
title = "canister"
Expand All @@ -183,37 +183,37 @@ ARMCHAIR(yellow)
title = "computer frame"
result_type = /obj/machinery/constructable_frame/computerframe
req_amount = 5
time = 25
time = 20

/datum/stack_recipe/furniture/girder
title = "wall girders"
result_type = /obj/structure/girder
req_amount = 2
time = 50
time = 20

/datum/stack_recipe/furniture/wall_frame
title = "low wall frame"
result_type = /obj/structure/wall_frame
req_amount = 3
time = 50
time = 20

/datum/stack_recipe/furniture/machine
title = "machine frame"
result_type = /obj/machinery/constructable_frame/machine_frame
req_amount = 5
time = 25
time = 20
send_material_data = 0

/datum/stack_recipe/furniture/turret
title = "turret frame"
result_type = /obj/machinery/porta_turret_construct
req_amount = 5
time = 25
time = 20
send_material_data = 0

/datum/stack_recipe/furniture/door_assembly
req_amount = 4
time = 50
time = 30

/datum/stack_recipe/furniture/door_assembly/standard
title = "standard airlock assembly"
Expand Down Expand Up @@ -243,7 +243,7 @@ ARMCHAIR(yellow)
title = "crate"
result_type = /obj/structure/closet/crate
req_amount = 10
time = 50
time = 20

/datum/stack_recipe/furniture/crate/plastic
result_type = /obj/structure/closet/crate/plastic
Expand All @@ -258,25 +258,25 @@ ARMCHAIR(yellow)
title = "coffin"
result_type = /obj/structure/closet/coffin
req_amount = 5
time = 15
time = 10

/datum/stack_recipe/furniture/coffin/wooden
title = "coffin"
result_type = /obj/structure/closet/coffin/wooden
req_amount = 5
time = 15
time = 10

/datum/stack_recipe/furniture/bookcase
title = "book shelf"
result_type = /obj/structure/bookcase
req_amount = 5
time = 15
time = 10

/datum/stack_recipe/furniture/truss
title = "truss"
result_type = /obj/structure/kitchenspike/improvised
req_amount = 10
time = 20
time = 15

/datum/stack_recipe/furniture/planting_bed
title = "planting bed"
Expand All @@ -289,7 +289,7 @@ ARMCHAIR(yellow)
title = "full-tile window"
result_type = /obj/structure/window
req_amount = 4
time = 15
time = 10
one_per_turf = 0

/datum/stack_recipe/furniture/fullwindow/can_make(mob/user)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
if(pulling)
if(istype(pulling, /obj))
var/obj/O = pulling
. += clamp(O.w_class, 0, ITEM_SIZE_GARGANTUAN) / 5
. += clamp(O.w_class, 0, ITEM_SIZE_GARGANTUAN) / 10
else if(istype(pulling, /mob))
var/mob/M = pulling
. += max(0, M.mob_size) / MOB_MEDIUM
Expand Down
4 changes: 2 additions & 2 deletions code/modules/power/smes_construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
if(output_attempt || input_attempt)
to_chat(user, SPAN_WARNING("Turn \the [src] off first!"))
return FALSE
if(!do_after(user, 5 SECONDS, src, DO_REPAIR_CONSTRUCT) || check_total_system_failure(user))
if(!do_after(user, 0.1 SECONDS, src, DO_REPAIR_CONSTRUCT) || check_total_system_failure(user))
return FALSE

/obj/machinery/power/smes/buildable/remove_part_and_give_to_user(path, mob/user)
Expand All @@ -326,7 +326,7 @@
if(output_attempt || input_attempt)
to_chat(user, SPAN_WARNING("Turn \the [src] off first!"))
return
if(!do_after(user, 5 SECONDS, src, DO_REPAIR_CONSTRUCT) || check_total_system_failure(user))
if(!do_after(user, 0.1 SECONDS, src, DO_REPAIR_CONSTRUCT) || check_total_system_failure(user))
return
..()

Expand Down
2 changes: 1 addition & 1 deletion maps/nerva/obj/nerva_closets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
)

/obj/structure/closet/secure_closet/nervacap
name = "captains's locker"
name = "captain's locker"
req_access = list(access_captain)
closet_appearance = /singleton/closet_appearance/secure_closet/command/nervacap

Expand Down

0 comments on commit 79d7fe8

Please sign in to comment.