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

[MIRROR] Replaces a number of deciseconds into SECONDS (#27188)

Browse Source 
* Replaces a number of deciseconds into SECONDS

* blep

---------

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Waterpig <wtryoutube@seznam.cz>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-04-16 10:17:58 +02:00
committed by GitHub
co-authored by Jeremiah Waterpig Waterpig
parent 902c834e83
commit c72d1dcf48
78 changed files with 137 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/ai_core.dm
+2 -2
View File
@@ -214,7 +214,7 @@
if(C.get_amount() >= 5)
playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
balloon_alert(user, "adding cables to frame...")
if(do_after(user, 20, target = src) && state == SCREWED_CORE && C.use(5))
if(do_after(user, 2 SECONDS, target = src) && state == SCREWED_CORE && C.use(5))
balloon_alert(user, "added cables to frame.")
state = CABLED_CORE
update_appearance()
@@ -241,7 +241,7 @@
if(G.get_amount() >= 2)
playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
balloon_alert(user, "adding glass panel...")
if(do_after(user, 20, target = src) && state == CABLED_CORE && G.use(2))
if(do_after(user, 2 SECONDS, target = src) && state == CABLED_CORE && G.use(2))
balloon_alert(user, "added glass panel")
state = GLASS_CORE
update_appearance()
code/game/objects/structures/bonfire.dm
+1 -1
View File
@@ -85,7 +85,7 @@
if(burning)
to_chat(user, span_warning("You need to extinguish [src] before removing the logs!"))
return
if(!has_buckled_mobs() && do_after(user, 50, target = src))
if(!has_buckled_mobs() && do_after(user, 5 SECONDS, target = src))
for(var/obj/item/grown/log/bonfire_log in contents)
bonfire_log.forceMove(drop_location())
bonfire_log.pixel_x += rand(1,4)
code/game/objects/structures/displaycase.dm
+2 -2
View File
@@ -168,7 +168,7 @@
to_chat(user, span_warning("You need two glass sheets to fix the case!"))
return
to_chat(user, span_notice("You start fixing [src]..."))
if(do_after(user, 20, target = src))
if(do_after(user, 2 SECONDS, target = src))
glass_sheet.use(2)
broken = FALSE
atom_integrity = max_integrity
@@ -630,7 +630,7 @@
. = ..()
if(atom_integrity <= (integrity_failure * max_integrity))
to_chat(user, span_notice("You start recalibrating [src]'s hover field..."))
if(do_after(user, 20, target = src))
if(do_after(user, 2 SECONDS, target = src))
broken = FALSE
atom_integrity = max_integrity
update_appearance()
code/game/objects/structures/door_assembly.dm
+3 -3
View File
@@ -184,7 +184,7 @@
W.play_tool_sound(src, 100)
user.visible_message(span_notice("[user] installs the electronics into the airlock assembly."), \
span_notice("You start to install electronics into the airlock assembly..."))
if(do_after(user, 40, target = src))
if(do_after(user, 4 SECONDS, target = src))
if( state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
return
if(!user.transferItemToLoc(W, src))
@@ -224,7 +224,7 @@
playsound(src, 'sound/items/crowbar.ogg', 100, TRUE)
user.visible_message(span_notice("[user] adds [G.name] to the airlock assembly."), \
span_notice("You start to install [G.name] into the airlock assembly..."))
if(do_after(user, 40, target = src))
if(do_after(user, 4 SECONDS, target = src))
if(G.get_amount() < 1 || glass)
return
if(G.type == /obj/item/stack/sheet/rglass)
@@ -247,7 +247,7 @@
playsound(src, 'sound/items/crowbar.ogg', 100, TRUE)
user.visible_message(span_notice("[user] adds [G.name] to the airlock assembly."), \
span_notice("You start to install [G.name] into the airlock assembly..."))
if(do_after(user, 40, target = src))
if(do_after(user, 4 SECONDS, target = src))
if(G.get_amount() < 2 || mineral)
return
to_chat(user, span_notice("You install [M] plating into the airlock assembly."))
code/game/objects/structures/girders.dm
+7 -7
View File
@@ -81,7 +81,7 @@
balloon_alert(user, "need [amount] rods!")
return
balloon_alert(user, "concealing entrance...")
if(do_after(user, 20, target = src))
if(do_after(user, 2 SECONDS, target = src))
if(rod.get_amount() < amount)
return
rod.use(amount)
@@ -94,7 +94,7 @@
balloon_alert(user, "need [amount] rods!")
return
balloon_alert(user, "adding plating...")
if(do_after(user, 40, target = src))
if(do_after(user, 4 SECONDS, target = src))
if(rod.get_amount() < amount)
return
rod.use(amount)
@@ -176,7 +176,7 @@
balloon_alert(user, "need [amount] sheets!")
return
balloon_alert(user, "concealing entrance...")
if(do_after(user, 20, target = src))
if(do_after(user, 2 SECONDS, target = src))
if(sheets.get_amount() < amount)
return
sheets.use(amount)
@@ -242,7 +242,7 @@
balloon_alert(user, "need [amount] sheets!")
return
balloon_alert(user, "concealing entrance...")
if(do_after(user, 20, target = src))
if(do_after(user, 2 SECONDS, target = src))
if(sheets.get_amount() < amount)
return
sheets.use(amount)
@@ -264,7 +264,7 @@
balloon_alert(user, "need [amount] sheets!")
return
balloon_alert(user, "adding plating...")
if (do_after(user, 40, target = src))
if (do_after(user, 4 SECONDS, target = src))
if(sheets.get_amount() < amount)
return
sheets.use(amount)
@@ -446,7 +446,7 @@
balloon_alert(user, "need [amount] sheet!")
return
balloon_alert(user, "adding plating...")
if(do_after(user, 50, target = src))
if(do_after(user, 5 SECONDS, target = src))
if(R.get_amount() < amount)
return
R.use(amount)
@@ -518,7 +518,7 @@
balloon_alert(user, "need [amount] sheets!")
return
balloon_alert(user, "adding plating...")
if(do_after(user, 50, target = src))
if(do_after(user, 5 SECONDS, target = src))
if(B.get_amount() < amount)
return
B.use(amount)
code/game/objects/structures/guillotine.dm
+1 -1
View File
@@ -192,7 +192,7 @@
if (blade_status == GUILLOTINE_BLADE_RAISED)
if (blade_sharpness < GUILLOTINE_BLADE_MAX_SHARP)
blade_status = GUILLOTINE_BLADE_SHARPENING
if(do_after(user, 7, target = src))
if(do_after(user, 0.7 SECONDS, target = src))
blade_status = GUILLOTINE_BLADE_RAISED
user.visible_message(span_notice("[user] sharpens the large blade of the guillotine."),
span_notice("You sharpen the large blade of the guillotine."))
code/game/objects/structures/plaques/_plaques.dm
+1 -1
View File
@@ -169,7 +169,7 @@
return
user.visible_message(span_notice("[user] begins engraving [src]."), \
span_notice("You begin engraving [src]."))
if(!do_after(user, 40, target = src)) //This spits out a visible message that somebody is engraving a plaque, then has a delay.
if(!do_after(user, 4 SECONDS, target = src)) //This spits out a visible message that somebody is engraving a plaque, then has a delay.
return
name = "\improper [namechoice]" //We want improper here so examine doesn't get weird if somebody capitalizes the plaque title.
desc = "The plaque reads: '[descriptionchoice]'"
code/game/objects/structures/table_frames.dm
+1 -1
View File
@@ -110,7 +110,7 @@
to_chat(user, span_warning("You need one [material.name] sheet to do this!"))
return
to_chat(user, span_notice("You start adding [material] to [src]..."))
if(do_after(user, 20, target = src) && material.use(1))
if(do_after(user, 2 SECONDS, target = src) && material.use(1))
make_new_table(toConstruct, null, carpet_type)
else
return ..()
code/game/objects/structures/tables_racks.dm
+1 -1
View File
@@ -963,7 +963,7 @@
return
building = TRUE
to_chat(user, span_notice("You start constructing a rack..."))
if(do_after(user, 50, target = user, progress=TRUE))
if(do_after(user, 5 SECONDS, target = user, progress=TRUE))
if(!user.temporarilyRemoveItemFromInventory(src))
return
var/obj/structure/rack/R = new /obj/structure/rack(get_turf(src))
code/game/objects/structures/transit_tubes/station.dm
+2 -2
View File
@@ -73,7 +73,7 @@
return
for(var/obj/structure/transit_tube_pod/pod in loc)
pod.visible_message(span_warning("[user] starts putting [GM] into the [pod]!"))
if(do_after(user, 15, target = src))
if(do_after(user, 1.5 SECONDS, target = src))
if(open_status == STATION_TUBE_OPEN && GM && user.grab_state >= GRAB_AGGRESSIVE && user.pulling == GM && !GM.buckled && !GM.has_buckled_mobs())
GM.Paralyze(100)
src.Bumped(GM)
@@ -87,7 +87,7 @@
else if(open_status == STATION_TUBE_OPEN)
if(pod.contents.len && user.loc != pod)
user.visible_message(span_notice("[user] starts emptying [pod]'s contents onto the floor."), span_notice("You start emptying [pod]'s contents onto the floor..."))
if(do_after(user, 10, target = src)) //So it doesn't default to close_animation() on fail
if(do_after(user, 1 SECONDS, target = src)) //So it doesn't default to close_animation() on fail
if(pod && pod.loc == loc)
for(var/atom/movable/AM in pod)
AM.forceMove(get_turf(user))
code/game/objects/structures/watercloset.dm
+2 -2
View File
@@ -357,7 +357,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
span_notice("You start washing your [washing_face ? "face" : "hands"]..."))
busy = TRUE
if(!do_after(user, 40, target = src))
if(!do_after(user, 4 SECONDS, target = src))
busy = FALSE
return
@@ -483,7 +483,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
if(!user.combat_mode)
to_chat(user, span_notice("You start washing [O]..."))
busy = TRUE
if(!do_after(user, 40, target = src))
if(!do_after(user, 4 SECONDS, target = src))
busy = FALSE
return 1
busy = FALSE
code/game/objects/structures/windoor_assembly.dm
+2 -2
View File
@@ -178,7 +178,7 @@
else if(istype(W, /obj/item/stack/cable_coil) && anchored)
user.visible_message(span_notice("[user] wires the windoor assembly."), span_notice("You start to wire the windoor assembly..."))
if(do_after(user, 40, target = src))
if(do_after(user, 4 SECONDS, target = src))
if(!src || !anchored || src.state != "01")
return
var/obj/item/stack/cable_coil/CC = W
@@ -220,7 +220,7 @@
user.visible_message(span_notice("[user] installs the electronics into the airlock assembly."),
span_notice("You start to install electronics into the airlock assembly..."))
if(do_after(user, 40, target = src))
if(do_after(user, 4 SECONDS, target = src))
if(!src || electronics)
W.forceMove(drop_location())
return
code/game/objects/structures/window.dm
+1 -1
View File
@@ -915,7 +915,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
return ..()
if(istype(W, /obj/item/paper) && atom_integrity < max_integrity)
user.visible_message(span_notice("[user] starts to patch the holes in \the [src]."))
if(do_after(user, 20, target = src))
if(do_after(user, 2 SECONDS, target = src))
atom_integrity = min(atom_integrity+4,max_integrity)
qdel(W)
user.visible_message(span_notice("[user] patches some of the holes in \the [src]."))