diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 1b4a043678a..ec7d26d4da0 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -824,7 +824,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." name = "Revival" desc = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!" icon_state = "template" - timeout = 300 + timeout = 30 SECONDS clickable_glow = TRUE /atom/movable/screen/alert/revival/Click() diff --git a/code/datums/actions/mobs/blood_warp.dm b/code/datums/actions/mobs/blood_warp.dm index d65c941f5df..0cf7f42fd9d 100644 --- a/code/datums/actions/mobs/blood_warp.dm +++ b/code/datums/actions/mobs/blood_warp.dm @@ -3,7 +3,7 @@ button_icon = 'icons/effects/blood.dmi' button_icon_state = "floor1" desc = "Allows you to teleport to blood at a clicked position." - cooldown_time = 0 + cooldown_time = 0 SECONDS /// The range of turfs to try to jaunt to from around the target var/pick_range = 5 /// The range of turfs if a client is using this ability diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm index 3e3c4bd6153..99cbaab630d 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -12,8 +12,8 @@ var/datum/antagonist/obsessed/antagonist var/viewing = FALSE //it's a lot better to store if the owner is watching the obsession than checking it twice between two procs - var/total_time_creeping = 0 //just for round end fun - var/time_spent_away = 0 + var/total_time_creeping = 0 SECONDS //just for round end fun + var/time_spent_away = 0 SECONDS var/obsession_hug_count = 0 /datum/brain_trauma/special/obsessed/on_gain() @@ -50,15 +50,15 @@ if(viewing) owner.add_mood_event("creeping", /datum/mood_event/creeping, obsession.name) total_time_creeping += seconds_per_tick SECONDS - time_spent_away = 0 + time_spent_away = 0 SECONDS if(attachedobsessedobj)//if an objective needs to tick down, we can do that since traumas coexist with the antagonist datum attachedobsessedobj.timer -= seconds_per_tick SECONDS //mob subsystem ticks every 2 seconds(?), remove 20 deciseconds from the timer. sure, that makes sense. else out_of_view() /datum/brain_trauma/special/obsessed/proc/out_of_view() - time_spent_away += 20 - if(time_spent_away > 1800) //3 minutes + time_spent_away += 2 SECONDS + if(time_spent_away > 3 MINUTES) //3 minutes owner.add_mood_event("creeping", /datum/mood_event/notcreepingsevere, obsession.name) else owner.add_mood_event("creeping", /datum/mood_event/notcreeping, obsession.name) diff --git a/code/datums/components/crafting/equipment.dm b/code/datums/components/crafting/equipment.dm index cc57f4c1641..84c031afe11 100644 --- a/code/datums/components/crafting/equipment.dm +++ b/code/datums/components/crafting/equipment.dm @@ -151,7 +151,7 @@ /datum/crafting_recipe/flashlight_eyes name = "Flashlight Eyes" result = /obj/item/organ/eyes/robotic/flashlight - time = 10 + time = 1 SECONDS reqs = list( /obj/item/flashlight = 2, /obj/item/restraints/handcuffs/cable = 1 @@ -225,7 +225,7 @@ /datum/crafting_recipe/ghettojetpack name = "Improvised Jetpack" result = /obj/item/tank/jetpack/improvised - time = 30 + time = 3 SECONDS reqs = list( /obj/item/tank/internals/oxygen = 2, /obj/item/extinguisher = 1, @@ -262,7 +262,7 @@ /datum/crafting_recipe/rebar_quiver name = "Rebar Storage Quiver" result = /obj/item/storage/bag/rebar_quiver - time = 10 + time = 1 SECONDS reqs = list( /obj/item/tank/internals/oxygen = 1, /obj/item/stack/cable_coil = 15, @@ -273,7 +273,7 @@ /datum/crafting_recipe/arrow_quiver name = "Archery Quiver" result = /obj/item/storage/bag/quiver/lesser - time = 10 + time = 1 SECONDS reqs = list( /obj/item/stack/sheet/leather = 4, /obj/item/stack/sheet/cardboard = 4 diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 5520558c154..f7a95156784 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -237,7 +237,7 @@ icon_state = "black" greyscale_colors = "#2f2e31" siemens_coefficient = 0 - strip_delay = 80 + strip_delay = 8 SECONDS cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS diff --git a/code/game/machinery/drone_dispenser.dm b/code/game/machinery/drone_dispenser.dm index 82fdf1fad49..0cee62cc1e5 100644 --- a/code/game/machinery/drone_dispenser.dm +++ b/code/game/machinery/drone_dispenser.dm @@ -95,7 +95,7 @@ desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with iron and glass. Disgusting." dispense_type = list(/obj/effect/mob_spawn/ghost_role/drone/syndrone) //If we're gonna be a jackass, go the full mile - 10 second recharge timer - cooldownTime = 100 + cooldownTime = 10 SECONDS end_create_message = "dispenses a suspicious drone shell." starting_amount = SHEET_MATERIAL_AMOUNT * 12.5 @@ -126,7 +126,7 @@ iron_cost = SHEET_MATERIAL_AMOUNT * 5 glass_cost = SHEET_MATERIAL_AMOUNT * 2.5 starting_amount = 0 - cooldownTime = 600 + cooldownTime = 60 SECONDS /obj/machinery/drone_dispenser/classic name = "classic drone shell dispenser" @@ -148,7 +148,7 @@ iron_cost = 0 glass_cost = 0 energy_used = 0 - cooldownTime = 10 //Only 1 second - hivebots are extremely weak + cooldownTime = 1 SECONDS //Only 1 second - hivebots are extremely weak dispense_type = list(/mob/living/basic/hivebot) begin_create_message = "closes and begins fabricating something within." end_create_message = "slams open, revealing a hivebot!" diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 977f0277859..d606556985b 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -428,7 +428,7 @@ /datum/crafting_recipe/iv_drip name = "IV drip" result = /obj/machinery/iv_drip - time = 30 + time = 3 SECONDS tool_behaviors = list(TOOL_SCREWDRIVER) reqs = list( /obj/item/stack/rods = 2, diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 433a8f55285..5b0bd0ada2c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -155,11 +155,11 @@ /// The click cooldown on secondary attacks. Lower numbers mean faster attacks. Will use attack_speed if undefined. var/secondary_attack_speed ///In deciseconds, how long an item takes to equip; counts only for normal clothing slots, not pockets etc. - var/equip_delay_self = 0 + var/equip_delay_self = 0 SECONDS ///In deciseconds, how long an item takes to put on another person - var/equip_delay_other = 20 + var/equip_delay_other = 2 SECONDS ///In deciseconds, how long an item takes to remove from another person - var/strip_delay = 40 + var/strip_delay = 4 SECONDS ///How long it takes to resist out of the item (cuffs and such) var/breakouttime = 0 diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 7d91b02eb4a..25790cada0a 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -97,7 +97,7 @@ /datum/crafting_recipe/security_banner name = "Securistan Banner" result = /obj/item/banner/security/mundane - time = 40 + time = 4 SECONDS reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/security/officer = 1) category = CAT_MISC @@ -122,7 +122,7 @@ /datum/crafting_recipe/medical_banner name = "Meditopia Banner" result = /obj/item/banner/medical/mundane - time = 40 + time = 4 SECONDS reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/medical/doctor = 1) category = CAT_MISC @@ -155,7 +155,7 @@ /datum/crafting_recipe/science_banner name = "Sciencia Banner" result = /obj/item/banner/science/mundane - time = 40 + time = 4 SECONDS reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/rnd/scientist = 1) category = CAT_MISC @@ -177,7 +177,7 @@ /datum/crafting_recipe/cargo_banner name = "Cargonia Banner" result = /obj/item/banner/cargo/mundane - time = 40 + time = 4 SECONDS reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/cargo/tech = 1) category = CAT_MISC @@ -202,7 +202,7 @@ /datum/crafting_recipe/engineering_banner name = "Engitopia Banner" result = /obj/item/banner/engineering/mundane - time = 40 + time = 4 SECONDS reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/engineering/engineer = 1) category = CAT_MISC @@ -226,7 +226,7 @@ /datum/crafting_recipe/command_banner name = "Command Banner" result = /obj/item/banner/command/mundane - time = 40 + time = 4 SECONDS reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/captain/parade = 1) category = CAT_MISC diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index a725791e238..671cad6780f 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -74,5 +74,5 @@ result = /obj/item/picket_sign reqs = list(/obj/item/stack/rods = 1, /obj/item/stack/sheet/cardboard = 2) - time = 80 + time = 8 SECONDS category = CAT_ENTERTAINMENT diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm index 11d5315e5f6..f507e2fc784 100644 --- a/code/game/objects/items/stacks/stack_recipe.dm +++ b/code/game/objects/items/stacks/stack_recipe.dm @@ -35,7 +35,7 @@ req_amount = 1, res_amount = 1, max_res_amount = 1, - time = 0, + time = 0 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY, placement_checks = NONE, trait_booster, @@ -74,7 +74,7 @@ req_amount = 1, res_amount = 1, max_res_amount = 1, - time = 0, + time = 0 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY, placement_checks = NONE, trait_booster, diff --git a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm index 790dd0f8e53..07be8836f97 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm @@ -27,7 +27,7 @@ /datum/surgery_step/extract_organ name = "remove heart" accept_hand = 1 - time = 32 + time = 3.2 SECONDS var/obj/item/organ/IC = null var/list/organ_types = list(/obj/item/organ/heart) @@ -51,7 +51,7 @@ /datum/surgery_step/gland_insert name = "insert gland" implements = list(/obj/item/organ/heart/gland = 100) - time = 32 + time = 3.2 SECONDS /datum/surgery_step/gland_insert/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message(span_notice("[user] starts to insert [tool] into [target]."), span_notice("You start to insert [tool] into [target]...")) diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm index c66df8215ca..cba33a91802 100644 --- a/code/modules/antagonists/clown_ops/clown_weapons.dm +++ b/code/modules/antagonists/clown_ops/clown_weapons.dm @@ -19,7 +19,7 @@ slowdown = SHOES_SLOWDOWN body_parts_covered = FEET|LEGS armor_type = /datum/armor/clown_shoes_combat - strip_delay = 70 + strip_delay = 7 SECONDS resistance_flags = NONE /datum/armor/clown_shoes_combat @@ -47,7 +47,7 @@ desc = "The culmination of years of clown combat research, these shoes leave a trail of chaos in their wake. They will slowly recharge themselves over time, or can be manually charged with bananium." slowdown = SHOES_SLOWDOWN armor_type = /datum/armor/banana_shoes_combat - strip_delay = 70 + strip_delay = 7 SECONDS resistance_flags = NONE always_noslip = TRUE body_parts_covered = FEET|LEGS diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm index dcedaf03cec..7dc39389a56 100644 --- a/code/modules/antagonists/heretic/magic/ash_ascension.dm +++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm @@ -110,7 +110,7 @@ ranged_mousepointer = 'icons/effects/mouse_pointers/throw_target.dmi' school = SCHOOL_FORBIDDEN - cooldown_time = 300 + cooldown_time = 30 SECONDS invocation = "F'R." invocation_type = INVOCATION_WHISPER diff --git a/code/modules/cargo/markets/market_uplink.dm b/code/modules/cargo/markets/market_uplink.dm index 3c60bc29a7b..9a5509b5e8b 100644 --- a/code/modules/cargo/markets/market_uplink.dm +++ b/code/modules/cargo/markets/market_uplink.dm @@ -165,7 +165,7 @@ /datum/crafting_recipe/blackmarket_uplink name = "Black Market Uplink" result = /obj/item/market_uplink/blackmarket - time = 30 + time = 3 SECONDS tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER, TOOL_MULTITOOL) reqs = list( /obj/item/stock_parts/micro_laser = 1, diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index fe16215c70f..e14fb8a13dd 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -16,8 +16,8 @@ icon_state = "earmuffs" inhand_icon_state = "earmuffs" clothing_traits = list(TRAIT_DEAF) - strip_delay = 15 - equip_delay_other = 25 + strip_delay = 1.5 SECONDS + equip_delay_other = 2.5 SECONDS resistance_flags = FLAMMABLE custom_price = PAYCHECK_COMMAND * 1.5 flags_cover = EARS_COVERED diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index b052529ca66..9147a0e1e15 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -6,8 +6,8 @@ righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi' w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_EYES - strip_delay = 20 - equip_delay_other = 25 + strip_delay = 2 SECONDS + equip_delay_other = 2.5 SECONDS resistance_flags = NONE custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*2.5) gender = PLURAL diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index a0d62978529..f1c7785e323 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -16,8 +16,8 @@ pickup_sound = 'sound/items/handling/glove_pick_up.ogg' attack_verb_continuous = list("challenges") attack_verb_simple = list("challenge") - strip_delay = 20 - equip_delay_other = 40 + strip_delay = 2 SECONDS + equip_delay_other = 4 SECONDS article = "a pair of" // Path variable. If defined, will produced the type through interaction with wirecutters. diff --git a/code/modules/clothing/gloves/bone.dm b/code/modules/clothing/gloves/bone.dm index 24dfb5de5a9..a29d4cfd223 100644 --- a/code/modules/clothing/gloves/bone.dm +++ b/code/modules/clothing/gloves/bone.dm @@ -3,8 +3,8 @@ desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms." icon_state = "bracers" inhand_icon_state = null - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS body_parts_covered = ARMS cold_protection = ARMS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index 6ea7ed438f2..cfad83432e7 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -3,7 +3,7 @@ desc = "Because you really needed another excuse to punch your crewmates." icon_state = "boxing" greyscale_colors = "#f32110" - equip_delay_other = 60 + equip_delay_other = 6 SECONDS species_exception = list(/datum/species/golem) // now you too can be a golem boxing champion clothing_traits = list(TRAIT_CHUNKYFINGERS) equip_sound = 'sound/items/equip/glove_equip.ogg' @@ -46,7 +46,7 @@ icon_state = "boxinggold" custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT*1) //LITERALLY GOLD material_flags = MATERIAL_EFFECTS | MATERIAL_AFFECT_STATISTICS - equip_delay_other = 120 + equip_delay_other = 12 SECONDS resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE /obj/item/clothing/gloves/boxing/golden/Initialize(mapload) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 9868392ecb0..b9f82135c47 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -33,8 +33,8 @@ desc = "Plain black gloves without fingertips for the hard-working." icon_state = "fingerless" greyscale_colors = "#2f2e31" - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT custom_price = PAYCHECK_CREW * 1.5 diff --git a/code/modules/clothing/gloves/combat.dm b/code/modules/clothing/gloves/combat.dm index e7e12c8ee4b..5ae715e1320 100644 --- a/code/modules/clothing/gloves/combat.dm +++ b/code/modules/clothing/gloves/combat.dm @@ -4,7 +4,7 @@ icon_state = "black" greyscale_colors = "#2f2e31" siemens_coefficient = 0 - strip_delay = 80 + strip_delay = 8 SECONDS cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm index 8aa8c6ee5c2..6d0fe95bcf5 100644 --- a/code/modules/clothing/gloves/special.dm +++ b/code/modules/clothing/gloves/special.dm @@ -91,7 +91,7 @@ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT - strip_delay = 60 + strip_delay = 6 SECONDS armor_type = /datum/armor/captain_gloves resistance_flags = NONE clothing_traits = list(TRAIT_FAST_CUFFING) diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 6a6153897f3..5ed1725101b 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -9,7 +9,7 @@ inhand_icon_state = "that" flags_inv = 0 armor_type = /datum/armor/hats_centhat - strip_delay = 80 + strip_delay = 8 SECONDS /datum/armor/hats_centhat melee = 30 @@ -304,7 +304,7 @@ inhand_icon_state = "that" flags_inv = 0 armor_type = /datum/armor/hats_centcom_cap - strip_delay = (8 SECONDS) + strip_delay = 8 SECONDS /datum/armor/hats_centcom_cap melee = 30 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index b7530505ed7..c33960f8115 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -11,7 +11,7 @@ min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT heat_protection = HEAD max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT - strip_delay = 60 + strip_delay = 6 SECONDS clothing_flags = SNUG_FIT | STACKABLE_HELMET_EXEMPT flags_cover = HEADCOVERSEYES|EARS_COVERED flags_inv = HIDEHAIR @@ -234,7 +234,7 @@ alt_toggle_message = "You push the visor up on" armor_type = /datum/armor/toggleable_riot flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDESNOUT - strip_delay = 80 + strip_delay = 8 SECONDS actions_types = list(/datum/action/item_action/toggle) visor_flags_inv = HIDEFACE|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF @@ -331,7 +331,7 @@ heat_protection = HEAD max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT clothing_flags = STOPSPRESSUREDAMAGE | STACKABLE_HELMET_EXEMPT - strip_delay = 80 + strip_delay = 8 SECONDS resistance_flags = FIRE_PROOF | ACID_PROOF dog_fashion = null clothing_traits = list(TRAIT_HEAD_INJURY_BLOCKED) @@ -379,7 +379,7 @@ min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT heat_protection = HEAD max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT - strip_delay = 80 + strip_delay = 8 SECONDS dog_fashion = null /datum/armor/helmet_thunderdome @@ -410,7 +410,7 @@ resistance_flags = FIRE_PROOF icon_state = "roman" inhand_icon_state = "roman_helmet" - strip_delay = 100 + strip_delay = 10 SECONDS dog_fashion = null /datum/armor/helmet_roman @@ -483,7 +483,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH resistance_flags = NONE - strip_delay = 80 + strip_delay = 8 SECONDS dog_fashion = null clothing_traits = list(TRAIT_HEAD_INJURY_BLOCKED) @@ -523,7 +523,7 @@ inhand_icon_state = "durathread_helmet" resistance_flags = FLAMMABLE armor_type = /datum/armor/helmet_durathread - strip_delay = 60 + strip_delay = 6 SECONDS /datum/armor/helmet_durathread melee = 20 @@ -610,7 +610,7 @@ flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF flash_protect = FLASH_PROTECTION_FLASH - strip_delay = 80 + strip_delay = 8 SECONDS dog_fashion = null armor_type = /datum/armor/helmet_military sound_vary = TRUE diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 37a0ac84f8f..d593119dafe 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -10,8 +10,8 @@ inhand_icon_state = "chefhat" icon_state = "chef" desc = "The commander in chef's head wear." - strip_delay = 10 - equip_delay_other = 10 + strip_delay = 1 SECONDS + equip_delay_other = 1 SECONDS dog_fashion = /datum/dog_fashion/head/chef /// The chance that the movements of a mouse inside of this hat get relayed to the human wearing the hat var/mouse_control_probability = 20 @@ -101,7 +101,7 @@ inhand_icon_state = "that" flags_inv = 0 armor_type = /datum/armor/hats_caphat - strip_delay = 60 + strip_delay = 6 SECONDS dog_fashion = /datum/dog_fashion/head/captain //Captain: This is no longer space-worthy @@ -467,7 +467,7 @@ desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts." icon_state = "policehelm" armor_type = /datum/armor/hats_warden - strip_delay = 60 + strip_delay = 6 SECONDS dog_fashion = /datum/dog_fashion/head/warden /datum/armor/hats_warden @@ -568,7 +568,7 @@ greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#a52f29#F2F2F2" armor_type = /datum/armor/cosmetic_sec - strip_delay = 60 + strip_delay = 6 SECONDS dog_fashion = null flags_1 = NONE @@ -587,7 +587,7 @@ desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class." icon_state = "/obj/item/clothing/head/beret/sec/navywarden" greyscale_colors = "#638799#ebebeb" - strip_delay = 60 + strip_delay = 6 SECONDS /obj/item/clothing/head/beret/sec/navyofficer desc = "A special beret with the security insignia emblazoned on it. For officers with class." diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm index 4aafaa4dfc1..0020c43f2c9 100644 --- a/code/modules/clothing/head/mind_monkey_helmet.dm +++ b/code/modules/clothing/head/mind_monkey_helmet.dm @@ -6,7 +6,7 @@ desc = "A fragile, circuitry embedded helmet for boosting the intelligence of a monkey to a higher level. You see several warning labels..." icon_state = "monkeymind" inhand_icon_state = null - strip_delay = 100 + strip_delay = 10 SECONDS var/mob/living/carbon/human/magnification = null ///if the helmet is on a valid target (just works like a normal helmet if not (cargo please stop)) var/polling = FALSE///if the helmet is currently polling for targets (special code for removal) var/light_colors = 1 ///which icon state color this is (red, blue, yellow) diff --git a/code/modules/clothing/head/pirate.dm b/code/modules/clothing/head/pirate.dm index 0f1ede82e5a..94f14841d3a 100644 --- a/code/modules/clothing/head/pirate.dm +++ b/code/modules/clothing/head/pirate.dm @@ -25,8 +25,8 @@ /obj/item/clothing/head/costume/pirate/armored armor_type = /datum/armor/pirate_armored - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS /datum/armor/pirate_armored melee = 30 @@ -51,8 +51,8 @@ /obj/item/clothing/head/costume/pirate/bandana/armored armor_type = /datum/armor/bandana_armored - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS /datum/armor/bandana_armored melee = 30 diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 2b7913b42c2..a074358e379 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -125,7 +125,7 @@ icon_state = "secsoft" soft_type = "sec" armor_type = /datum/armor/cosmetic_sec - strip_delay = 60 + strip_delay = 6 SECONDS dog_fashion = null /obj/item/clothing/head/soft/veteran @@ -134,7 +134,7 @@ icon_state = "veteransoft" soft_type = "veteran" armor_type = /datum/armor/cosmetic_sec - strip_delay = 60 + strip_delay = 6 SECONDS dog_fashion = null /obj/item/clothing/head/soft/paramedic diff --git a/code/modules/clothing/head/tinfoilhat.dm b/code/modules/clothing/head/tinfoilhat.dm index daaf90378c9..18cd6fd931a 100644 --- a/code/modules/clothing/head/tinfoilhat.dm +++ b/code/modules/clothing/head/tinfoilhat.dm @@ -4,7 +4,7 @@ icon_state = "foilhat" inhand_icon_state = null armor_type = /datum/armor/costume_foilhat - equip_delay_other = 140 + equip_delay_other = 14 SECONDS clothing_flags = ANTI_TINFOIL_MANEUVER var/datum/brain_trauma/mild/phobia/conspiracies/paranoia var/warped = FALSE diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index 9cafd6c1c3a..bed6d8afab7 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -5,8 +5,8 @@ righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi' body_parts_covered = HEAD slot_flags = ITEM_SLOT_MASK - strip_delay = 40 - equip_delay_other = 40 + strip_delay = 4 SECONDS + equip_delay_other = 4 SECONDS visor_vars_to_toggle = NONE unique_reskin_changes_base_icon_state = TRUE diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 62ec778d49c..a8a844a3a83 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -38,7 +38,7 @@ icon_state = "medical" inhand_icon_state = "m_mask" armor_type = /datum/armor/breath_medical - equip_delay_other = 10 + equip_delay_other = 1 SECONDS /datum/armor/breath_medical bio = 90 @@ -53,7 +53,7 @@ body_parts_covered = NONE flags_cover = NONE armor_type = /datum/armor/breath_muzzle - equip_delay_other = 25 // my sprite has 4 straps, a-la a head harness. takes a while to equip, longer than a muzzle + equip_delay_other = 2.5 SECONDS // my sprite has 4 straps, a-la a head harness. takes a while to equip, longer than a muzzle /obj/item/clothing/mask/breath/muzzle/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 64970387bf7..2dd08960bfa 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -273,7 +273,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( icon_state = "syndicate" inhand_icon_state = "syndicate_gasmask" resistance_flags = FIRE_PROOF | ACID_PROOF - strip_delay = 60 + strip_delay = 6 SECONDS w_class = WEIGHT_CLASS_SMALL fishing_modifier = 0 pepper_tint = FALSE diff --git a/code/modules/clothing/masks/muzzle.dm b/code/modules/clothing/masks/muzzle.dm index b6dd6faf7ba..9508036902a 100644 --- a/code/modules/clothing/masks/muzzle.dm +++ b/code/modules/clothing/masks/muzzle.dm @@ -7,7 +7,7 @@ righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi' flags_cover = MASKCOVERSMOUTH w_class = WEIGHT_CLASS_SMALL - equip_delay_other = 20 + equip_delay_other = 2 SECONDS /obj/item/clothing/mask/muzzle/Initialize(mapload) . = ..() @@ -28,8 +28,8 @@ inhand_icon_state = null w_class = WEIGHT_CLASS_TINY clothing_flags = INEDIBLE_CLOTHING - equip_delay_other = 40 - strip_delay = 40 + equip_delay_other = 4 SECONDS + strip_delay = 4 SECONDS icon = 'icons/map_icons/clothing/mask.dmi' icon_state = "/obj/item/clothing/mask/muzzle/tape" post_init_icon_state = "tape_piece" @@ -76,15 +76,15 @@ desc = "A piece of tape that can be put over someone's mouth. This one has extra strength." icon_state = "/obj/item/clothing/mask/muzzle/tape/super" greyscale_colors = "#4D4D4D" - strip_delay = 80 + strip_delay = 8 SECONDS /obj/item/clothing/mask/muzzle/tape/surgical name = "surgical tape piece" desc = "A piece of tape that can be put over someone's mouth. As long as you apply this to your patient, you won't hear their screams of pain!" icon_state = "/obj/item/clothing/mask/muzzle/tape/surgical" greyscale_colors = "#70BAE7" - equip_delay_other = 30 - strip_delay = 30 + equip_delay_other = 3 SECONDS + strip_delay = 3 SECONDS /obj/item/clothing/mask/muzzle/tape/pointy name = "pointy tape piece" @@ -104,5 +104,5 @@ desc = "A piece of tape that can be put over someone's mouth. This thing could rip your face into a thousand pieces if ripped off." icon_state = "/obj/item/clothing/mask/muzzle/tape/pointy/super" greyscale_colors = "#8C0A00#300008" - strip_delay = 60 + strip_delay = 6 SECONDS stripping_damage = 20 diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 236238a2272..3a5982712bd 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -4,8 +4,8 @@ body_parts_covered = NECK slot_flags = ITEM_SLOT_NECK interaction_flags_click = NEED_DEXTERITY - strip_delay = 40 - equip_delay_other = 40 + strip_delay = 4 SECONDS + equip_delay_other = 4 SECONDS /obj/item/clothing/neck/worn_overlays(mutable_appearance/standing, isinhands = FALSE) . = ..() @@ -131,7 +131,7 @@ icon_state = "tie_greyscale_untied" strip_delay = 1 SECONDS equip_delay_other = 1 SECONDS - equip_delay_self = 0 + equip_delay_self = 0 SECONDS /obj/item/clothing/neck/tie/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = ..() diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index d0c9b1fcd44..e221a857fd0 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -6,7 +6,7 @@ supports_variations_flags = CLOTHING_DIGITIGRADE_MASK body_parts_covered = FEET|LEGS armor_type = /datum/armor/shoes_combat - strip_delay = 40 + strip_delay = 4 SECONDS resistance_flags = NONE lace_time = 12 SECONDS @@ -47,8 +47,8 @@ icon_state = "jackboots" inhand_icon_state = "jackboots" supports_variations_flags = CLOTHING_DIGITIGRADE_MASK - strip_delay = 30 - equip_delay_other = 50 + strip_delay = 3 SECONDS + equip_delay_other = 5 SECONDS resistance_flags = NONE armor_type = /datum/armor/shoes_jackboots fastening_type = SHOES_SLIPON @@ -136,8 +136,8 @@ inhand_icon_state = "jackboots" armor_type = /datum/armor/shoes_workboots supports_variations_flags = CLOTHING_DIGITIGRADE_MASK - strip_delay = 20 - equip_delay_other = 40 + strip_delay = 2 SECONDS + equip_delay_other = 4 SECONDS lace_time = 8 SECONDS /datum/armor/shoes_workboots @@ -196,7 +196,7 @@ /obj/item/clothing/shoes/pirate/armored armor_type = /datum/armor/shoes_pirate - strip_delay = 40 + strip_delay = 4 SECONDS resistance_flags = NONE lace_time = 12 SECONDS body_parts_covered = FEET|LEGS diff --git a/code/modules/clothing/shoes/costume.dm b/code/modules/clothing/shoes/costume.dm index c836af89a9d..58b8e07f6a2 100644 --- a/code/modules/clothing/shoes/costume.dm +++ b/code/modules/clothing/shoes/costume.dm @@ -3,8 +3,8 @@ desc = "Sandals with buckled leather straps on it." icon_state = "roman" inhand_icon_state = "wizshoe" - strip_delay = 100 - equip_delay_other = 100 + strip_delay = 10 SECONDS + equip_delay_other = 10 SECONDS armor_type = /datum/armor/shoes_roman fastening_type = SHOES_STRAPS @@ -27,13 +27,13 @@ name = "yellow performer's boots" desc = "These boots were made for dancing." icon_state = "ysing" - equip_delay_other = 50 + equip_delay_other = 5 SECONDS /obj/item/clothing/shoes/singerb name = "blue performer's boots" desc = "These boots were made for dancing." icon_state = "bsing" - equip_delay_other = 50 + equip_delay_other = 5 SECONDS /obj/item/clothing/shoes/bronze name = "bronze boots" diff --git a/code/modules/clothing/shoes/galoshes.dm b/code/modules/clothing/shoes/galoshes.dm index 5e785f20a68..7b866d3ef41 100644 --- a/code/modules/clothing/shoes/galoshes.dm +++ b/code/modules/clothing/shoes/galoshes.dm @@ -5,8 +5,8 @@ inhand_icon_state = "galoshes" clothing_traits = list(TRAIT_NO_SLIP_WATER) slowdown = SHOES_SLOWDOWN+1 - strip_delay = 30 - equip_delay_other = 50 + strip_delay = 3 SECONDS + equip_delay_other = 5 SECONDS resistance_flags = NONE armor_type = /datum/armor/shoes_galoshes can_be_bloody = FALSE diff --git a/code/modules/clothing/shoes/jumpboots.dm b/code/modules/clothing/shoes/jumpboots.dm index 1816a68cefd..d91a792533e 100644 --- a/code/modules/clothing/shoes/jumpboots.dm +++ b/code/modules/clothing/shoes/jumpboots.dm @@ -6,7 +6,7 @@ resistance_flags = FIRE_PROOF actions_types = list(/datum/action/item_action/bhop) armor_type = /datum/armor/shoes_bhop - strip_delay = 30 + strip_delay = 3 SECONDS var/jumpdistance = 5 //-1 from to see the actual distance, e.g 4 goes over 3 tiles var/jumpspeed = 3 var/recharging_rate = 60 //default 6 seconds between each dash diff --git a/code/modules/clothing/shoes/laceup.dm b/code/modules/clothing/shoes/laceup.dm index 808bf22f508..0ef4f4555bc 100644 --- a/code/modules/clothing/shoes/laceup.dm +++ b/code/modules/clothing/shoes/laceup.dm @@ -2,7 +2,7 @@ name = "laceup shoes" desc = "The height of fashion, and they're pre-polished!" icon_state = "laceups" - equip_delay_other = 50 + equip_delay_other = 5 SECONDS /obj/item/clothing/shoes/laceup/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 2210eff12a6..b6227c6266f 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -9,8 +9,8 @@ inhand_icon_state = "magboots" armor_type = /datum/armor/shoes_magboots actions_types = list(/datum/action/item_action/toggle) - strip_delay = 70 - equip_delay_other = 70 + strip_delay = 7 SECONDS + equip_delay_other = 7 SECONDS resistance_flags = FIRE_PROOF clothing_flags = parent_type::clothing_flags | STOPSPRESSUREDAMAGE slowdown = SHOES_SLOWDOWN diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm index c31ad6f3d5e..a529839b91a 100644 --- a/code/modules/clothing/shoes/sandals.dm +++ b/code/modules/clothing/shoes/sandals.dm @@ -5,8 +5,8 @@ inhand_icon_state = "wizshoe" custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 0.5) resistance_flags = FLAMMABLE - strip_delay = 5 - equip_delay_other = 50 + strip_delay = 0.5 SECONDS + equip_delay_other = 5 SECONDS armor_type = /datum/armor/shoes_sandal fastening_type = SHOES_SLIPON species_exception = list(/datum/species/golem) diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index a431544298a..5a1826d55e7 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -196,8 +196,8 @@ greyscale_config = /datum/greyscale_config/sneakers_marisa greyscale_config_worn = /datum/greyscale_config/sneakers_marisa/worn greyscale_colors = "#2d2d33#ffffff" - strip_delay = 5 - equip_delay_other = 50 + strip_delay = 0.5 SECONDS + equip_delay_other = 5 SECONDS fastening_type = SHOES_SLIPON resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index af27cc3f995..66e98ba27a9 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -19,8 +19,8 @@ heat_protection = HEAD max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT flash_protect = FLASH_PROTECTION_WELDER - strip_delay = 50 - equip_delay_other = 50 + strip_delay = 5 SECONDS + equip_delay_other = 5 SECONDS flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF resistance_flags = NONE dog_fashion = null @@ -73,8 +73,8 @@ min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT_OFF heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT - strip_delay = 80 - equip_delay_other = 80 + strip_delay = 8 SECONDS + equip_delay_other = 8 SECONDS resistance_flags = NONE actions_types = list(/datum/action/item_action/toggle_spacesuit) interaction_flags_click = NEED_DEXTERITY|ALLOW_RESTING diff --git a/code/modules/clothing/spacesuits/bountyhunter.dm b/code/modules/clothing/spacesuits/bountyhunter.dm index cb8498dac14..1284f89daba 100644 --- a/code/modules/clothing/spacesuits/bountyhunter.dm +++ b/code/modules/clothing/spacesuits/bountyhunter.dm @@ -5,7 +5,7 @@ inhand_icon_state = "swat_suit" allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/knife/combat) armor_type = /datum/armor/space_hunter - strip_delay = 130 + strip_delay = 13 SECONDS resistance_flags = FIRE_PROOF | ACID_PROOF cell = /obj/item/stock_parts/power_store/cell/hyper diff --git a/code/modules/clothing/spacesuits/freedom.dm b/code/modules/clothing/spacesuits/freedom.dm index dfc54db118a..c43ff6c90d7 100644 --- a/code/modules/clothing/spacesuits/freedom.dm +++ b/code/modules/clothing/spacesuits/freedom.dm @@ -6,7 +6,7 @@ icon_state = "griffinhat" inhand_icon_state = null armor_type = /datum/armor/space_freedom - strip_delay = 130 + strip_delay = 13 SECONDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = ACID_PROOF | FIRE_PROOF fishing_modifier = 0 @@ -29,7 +29,7 @@ inhand_icon_state = null allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) armor_type = /datum/armor/space_freedom - strip_delay = 130 + strip_delay = 13 SECONDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = ACID_PROOF | FIRE_PROOF slowdown = 0 diff --git a/code/modules/clothing/spacesuits/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm index b7f4640c63b..1a0dcca025d 100644 --- a/code/modules/clothing/spacesuits/pirate.dm +++ b/code/modules/clothing/spacesuits/pirate.dm @@ -4,8 +4,8 @@ icon_state = "spacepirate" inhand_icon_state = "space_pirate_helmet" armor_type = /datum/armor/space_pirate - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS fishing_modifier = -2 visor_dirt = null @@ -30,8 +30,8 @@ allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum) slowdown = 0 armor_type = /datum/armor/space_pirate - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS fishing_modifier = -3 /obj/item/clothing/head/helmet/space/pirate/tophat diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index eafcc66b5ee..0a6affdafd1 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -78,7 +78,7 @@ clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | STACKABLE_HELMET_EXEMPT | PLASMAMAN_PREVENT_IGNITION | HEADINTERNALS icon_state = "plasmaman-helm" inhand_icon_state = "plasmaman-helm" - strip_delay = 80 + strip_delay = 8 SECONDS flash_protect = FLASH_PROTECTION_WELDER tint = 2 armor_type = /datum/armor/space_plasmaman diff --git a/code/modules/clothing/spacesuits/softsuit.dm b/code/modules/clothing/spacesuits/softsuit.dm index 445af2ea1b6..72841de62df 100644 --- a/code/modules/clothing/spacesuits/softsuit.dm +++ b/code/modules/clothing/spacesuits/softsuit.dm @@ -73,7 +73,7 @@ icon_state = "syndicate-helm-orange" inhand_icon_state = "syndicate-helm-orange" //resprite? armor_type = /datum/armor/space_fragile - strip_delay = 65 + strip_delay = 6.5 SECONDS /obj/item/clothing/suit/space/fragile name = "emergency space suit" @@ -83,7 +83,7 @@ inhand_icon_state = "syndicate-orange" slowdown = 2 armor_type = /datum/armor/space_fragile - strip_delay = 65 + strip_delay = 6.5 SECONDS /datum/armor/space_fragile melee = 5 diff --git a/code/modules/clothing/spacesuits/specialops.dm b/code/modules/clothing/spacesuits/specialops.dm index 066a80cddd5..d0f06f89a67 100644 --- a/code/modules/clothing/spacesuits/specialops.dm +++ b/code/modules/clothing/spacesuits/specialops.dm @@ -11,7 +11,7 @@ clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT flags_inv = 0 armor_type = /datum/armor/space_beret - strip_delay = 130 + strip_delay = 13 SECONDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF fishing_modifier = 0 @@ -42,7 +42,7 @@ w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) armor_type = /datum/armor/space_officer - strip_delay = 130 + strip_delay = 13 SECONDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF fishing_modifier = 0 diff --git a/code/modules/clothing/suits/ablativecoat.dm b/code/modules/clothing/suits/ablativecoat.dm index 32233f23400..3d4b793c663 100644 --- a/code/modules/clothing/suits/ablativecoat.dm +++ b/code/modules/clothing/suits/ablativecoat.dm @@ -6,7 +6,7 @@ icon_state = "ablativehood" flags_inv = HIDEHAIR|HIDEEARS armor_type = /datum/armor/hooded_ablative - strip_delay = 30 + strip_delay = 3 SECONDS var/hit_reflect_chance = 50 /datum/armor/hooded_ablative @@ -33,8 +33,8 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS armor_type = /datum/armor/hooded_ablative hoodtype = /obj/item/clothing/head/hooded/ablative - strip_delay = 30 - equip_delay_other = 40 + strip_delay = 3 SECONDS + equip_delay_other = 4 SECONDS var/hit_reflect_chance = 50 /obj/item/clothing/suit/hooded/ablative/Initialize(mapload) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 4472408716d..939912dd95e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -8,8 +8,8 @@ min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT heat_protection = CHEST|GROIN max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT - strip_delay = 60 - equip_delay_other = 40 + strip_delay = 6 SECONDS + equip_delay_other = 4 SECONDS max_integrity = 250 resistance_flags = NONE armor_type = /datum/armor/suit_armor @@ -158,7 +158,7 @@ armor_type = /datum/armor/armor_hos cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS - strip_delay = 80 + strip_delay = 8 SECONDS /datum/armor/armor_hos melee = 30 @@ -176,7 +176,7 @@ icon_state = "hostrench" inhand_icon_state = "hostrench" flags_inv = 0 - strip_delay = 80 + strip_delay = 8 SECONDS /obj/item/clothing/suit/armor/hos/trenchcoat/winter name = "head of security's winter trenchcoat" @@ -203,7 +203,7 @@ body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS|HANDS heat_protection = CHEST|GROIN|ARMS|HANDS - strip_delay = 70 + strip_delay = 7 SECONDS resistance_flags = FLAMMABLE dog_fashion = null @@ -294,8 +294,8 @@ cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/armor_riot - strip_delay = 80 - equip_delay_other = 60 + strip_delay = 8 SECONDS + equip_delay_other = 6 SECONDS clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED) /obj/item/clothing/suit/armor/riot/Initialize(mapload) @@ -323,8 +323,8 @@ blood_overlay_type = "armor" armor_type = /datum/armor/balloon_vest siemens_coefficient = 0 - strip_delay = 70 - equip_delay_other = 50 + strip_delay = 7 SECONDS + equip_delay_other = 5 SECONDS /datum/armor/balloon_vest melee = 10 @@ -356,8 +356,8 @@ inhand_icon_state = "armor" blood_overlay_type = "armor" armor_type = /datum/armor/armor_bulletproof - strip_delay = 70 - equip_delay_other = 50 + strip_delay = 7 SECONDS + equip_delay_other = 5 SECONDS /datum/armor/armor_bulletproof melee = 15 @@ -414,7 +414,7 @@ icon_state = "heavy" inhand_icon_state = "swat_suit" armor_type = /datum/armor/armor_swat - strip_delay = 120 + strip_delay = 12 SECONDS resistance_flags = FIRE_PROOF | ACID_PROOF clothing_flags = THICKMATERIAL cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS @@ -569,8 +569,8 @@ desc = "A vest made of durathread with strips of leather acting as trauma plates." icon_state = "durathread" inhand_icon_state = null - strip_delay = 60 - equip_delay_other = 40 + strip_delay = 6 SECONDS + equip_delay_other = 4 SECONDS max_integrity = 200 resistance_flags = FLAMMABLE armor_type = /datum/armor/vest_durathread @@ -765,8 +765,8 @@ inhand_icon_state = null body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/watermelon - strip_delay = 60 - equip_delay_other = 40 + strip_delay = 6 SECONDS + equip_delay_other = 4 SECONDS clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED) max_integrity = 15 @@ -799,8 +799,8 @@ inhand_icon_state = null body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/watermelon - strip_delay = 60 - equip_delay_other = 40 + strip_delay = 6 SECONDS + equip_delay_other = 4 SECONDS clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED) max_integrity = 15 @@ -834,8 +834,8 @@ inhand_icon_state = null body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/barrelmelon - strip_delay = 60 - equip_delay_other = 40 + strip_delay = 6 SECONDS + equip_delay_other = 4 SECONDS clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED) max_integrity = 10 diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index a14b3fcd77b..a6f0e7807bd 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -40,8 +40,8 @@ allowed = list(/obj/item/tank/internals, /obj/item/reagent_containers/dropper, /obj/item/flashlight/pen, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/cup/beaker, /obj/item/gun/syringe) armor_type = /datum/armor/suit_bio_suit flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDEBELT - strip_delay = 70 - equip_delay_other = 70 + strip_delay = 7 SECONDS + equip_delay_other = 7 SECONDS resistance_flags = ACID_PROOF /obj/item/clothing/suit/bio_suit/Initialize(mapload) @@ -135,8 +135,8 @@ desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses." icon_state = "plaguedoctor" inhand_icon_state = "bio_suit" - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS /obj/item/clothing/suit/bio_suit/plaguedoctorsuit/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index a85a0f78603..77c3478abdb 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -42,8 +42,8 @@ /obj/item/clothing/suit/costume/pirate/armored armor_type = /datum/armor/pirate_armored - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS species_exception = null /obj/item/clothing/suit/costume/pirate/captain @@ -54,8 +54,8 @@ /obj/item/clothing/suit/costume/pirate/captain/armored armor_type = /datum/armor/pirate_armored - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS species_exception = null /obj/item/clothing/suit/costume/cyborg_suit diff --git a/code/modules/clothing/suits/straightjacket.dm b/code/modules/clothing/suits/straightjacket.dm index 4ef22a1a438..5212aec6eed 100644 --- a/code/modules/clothing/suits/straightjacket.dm +++ b/code/modules/clothing/suits/straightjacket.dm @@ -5,8 +5,8 @@ inhand_icon_state = "straight_jacket" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - equip_delay_self = 50 - strip_delay = 60 + equip_delay_self = 5 SECONDS + strip_delay = 6 SECONDS breakouttime = 5 MINUTES /obj/item/clothing/suit/jacket/straight_jacket/Initialize(mapload) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index e4e4ec849f2..b16526d29be 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -35,8 +35,8 @@ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT - strip_delay = 60 - equip_delay_other = 60 + strip_delay = 6 SECONDS + equip_delay_other = 6 SECONDS resistance_flags = FIRE_PROOF /obj/item/clothing/suit/utility/fire/Initialize(mapload) @@ -99,8 +99,8 @@ min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT heat_protection = HEAD max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT - strip_delay = 70 - equip_delay_other = 70 + strip_delay = 7 SECONDS + equip_delay_other = 7 SECONDS flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF resistance_flags = NONE @@ -134,8 +134,8 @@ max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT - strip_delay = 70 - equip_delay_other = 70 + strip_delay = 7 SECONDS + equip_delay_other = 7 SECONDS resistance_flags = NONE /obj/item/clothing/suit/utility/bomb_suit/Initialize(mapload) @@ -179,8 +179,8 @@ clothing_flags = THICKMATERIAL | SNUG_FIT flags_inv = HIDEMASK|HIDEEARS|HIDEFACE|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT armor_type = /datum/armor/utility_radiation - strip_delay = 60 - equip_delay_other = 60 + strip_delay = 6 SECONDS + equip_delay_other = 6 SECONDS flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF resistance_flags = NONE @@ -211,8 +211,8 @@ ) slowdown = 1.5 armor_type = /datum/armor/utility_radiation - strip_delay = 60 - equip_delay_other = 60 + strip_delay = 6 SECONDS + equip_delay_other = 6 SECONDS flags_inv = HIDEJUMPSUIT resistance_flags = NONE diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 4c3de4475f5..fedcbc28b02 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -6,8 +6,8 @@ icon_state = "wizard" inhand_icon_state = "wizhat" armor_type = /datum/armor/head_wizard - strip_delay = 50 - equip_delay_other = 50 + strip_delay = 5 SECONDS + equip_delay_other = 5 SECONDS clothing_flags = SNUG_FIT | CASTING_CLOTHES resistance_flags = FIRE_PROOF | ACID_PROOF dog_fashion = /datum/dog_fashion/head/blue_wizard @@ -119,8 +119,8 @@ armor_type = /datum/armor/suit_wizrobe allowed = list(/obj/item/teleportation_scroll, /obj/item/highfrequencyblade/wizard) flags_inv = HIDEJUMPSUIT - strip_delay = 50 - equip_delay_other = 50 + strip_delay = 5 SECONDS + equip_delay_other = 5 SECONDS clothing_flags = CASTING_CLOTHES resistance_flags = FIRE_PROOF | ACID_PROOF ///How much this robe affects fishing difficulty diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index a3246ff4da4..dfa93c6862f 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -8,7 +8,7 @@ icon_state = "roman" inhand_icon_state = "armor" can_adjust = FALSE - strip_delay = 100 + strip_delay = 10 SECONDS resistance_flags = NONE /obj/item/clothing/under/costume/jabroni @@ -297,7 +297,7 @@ worn_icon = 'icons/mob/clothing/under/security.dmi' alt_covers_chest = TRUE armor_type = /datum/armor/clothing_under/costume_russian_officer - strip_delay = 50 + strip_delay = 5 SECONDS sensor_mode = SENSOR_COORDS random_sensor = FALSE can_adjust = FALSE diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm index 10bf4e66e15..bd2c358551a 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm @@ -10,7 +10,7 @@ armor_type = /datum/armor/clothing_under/plasmaman body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS can_adjust = FALSE - strip_delay = 80 + strip_delay = 8 SECONDS COOLDOWN_DECLARE(extinguish_timer) var/extinguish_cooldown = 100 var/extinguishes_left = 5 diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 2730ed47a6d..1753c9311e1 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -13,7 +13,7 @@ icon = 'icons/obj/clothing/under/security.dmi' worn_icon = 'icons/mob/clothing/under/security.dmi' armor_type = /datum/armor/clothing_under/rank_security - strip_delay = 50 + strip_delay = 5 SECONDS sensor_mode = SENSOR_COORDS random_sensor = FALSE @@ -145,7 +145,7 @@ icon_state = "rhos" inhand_icon_state = "r_suit" armor_type = /datum/armor/clothing_under/security_head_of_security - strip_delay = 60 + strip_delay = 6 SECONDS /datum/armor/clothing_under/security_head_of_security melee = 10 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index c09767282c3..574b70ce41f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -88,7 +88,7 @@ /datum/crafting_recipe/food/garlicbread name = "Garlic Bread" - time = 40 + time = 4 SECONDS reqs = list(/obj/item/food/grown/garlic = 1, /obj/item/food/breadslice/plain = 1, /obj/item/food/butterslice = 1 @@ -117,7 +117,7 @@ /datum/crafting_recipe/food/baguette name = "Baguette" - time = 40 + time = 4 SECONDS reqs = list(/datum/reagent/consumable/salt = 1, /datum/reagent/consumable/blackpepper = 1, /obj/item/food/doughslice = 2, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm index 74c1ce5f6d3..3f62c324a12 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm @@ -4,7 +4,7 @@ /datum/crafting_recipe/lizardwine name = "Lizard Wine" - time = 40 + time = 4 SECONDS reqs = list( /obj/item/organ/tail/lizard = 1, /datum/reagent/consumable/ethanol = 100 @@ -15,7 +15,7 @@ /datum/crafting_recipe/moonshinejug name = "Moonshine Jug" - time = 30 + time = 3 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle = 1, /datum/reagent/consumable/ethanol/moonshine = 100 @@ -25,7 +25,7 @@ /datum/crafting_recipe/hoochbottle name = "Hooch Bottle" - time = 30 + time = 3 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle = 1, /obj/item/storage/box/papersack = 1, @@ -36,7 +36,7 @@ /datum/crafting_recipe/blazaambottle name = "Blazaam Bottle" - time = 20 + time = 2 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle = 1, /datum/reagent/consumable/ethanol/blazaam = 100 @@ -46,7 +46,7 @@ /datum/crafting_recipe/champagnebottle name = "Champagne Bottle" - time = 30 + time = 3 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle = 1, /datum/reagent/consumable/ethanol/champagne = 100 @@ -56,7 +56,7 @@ /datum/crafting_recipe/trappistbottle name = "Trappist Bottle" - time = 15 + time = 1.5 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle/small = 1, /datum/reagent/consumable/ethanol/trappist = 50 @@ -66,7 +66,7 @@ /datum/crafting_recipe/goldschlagerbottle name = "Goldschlager Bottle" - time = 30 + time = 3 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle = 1, /datum/reagent/consumable/ethanol/goldschlager = 100 @@ -76,7 +76,7 @@ /datum/crafting_recipe/patronbottle name = "Patron Bottle" - time = 30 + time = 3 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle = 1, /datum/reagent/consumable/ethanol/patron = 100 @@ -88,7 +88,7 @@ /datum/crafting_recipe/holybottle name = "Holy Water Flask" - time = 30 + time = 3 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle = 1, /datum/reagent/water/holywater = 100 @@ -100,7 +100,7 @@ /datum/crafting_recipe/nothingbottle name = "Nothing Bottle" - time = 30 + time = 3 SECONDS reqs = list( /obj/item/reagent_containers/cup/glass/bottle = 1, /datum/reagent/consumable/nothing = 100 @@ -111,14 +111,14 @@ /datum/crafting_recipe/smallcarton name = "Small Carton" result = /obj/item/reagent_containers/cup/glass/bottle/juice/smallcarton - time = 10 + time = 1 SECONDS reqs = list(/obj/item/stack/sheet/cardboard = 1) category = CAT_CONTAINERS /datum/crafting_recipe/candycornliquor name = "candy corn liquor" result = /obj/item/reagent_containers/cup/glass/bottle/candycornliquor - time = 30 + time = 3 SECONDS reqs = list(/datum/reagent/consumable/ethanol/whiskey = 100, /obj/item/food/candy_corn = 1, /obj/item/reagent_containers/cup/glass/bottle = 1) @@ -127,7 +127,7 @@ /datum/crafting_recipe/kong name = "Kong" result = /obj/item/reagent_containers/cup/glass/bottle/kong - time = 30 + time = 3 SECONDS reqs = list(/datum/reagent/consumable/ethanol/whiskey = 100, /obj/item/food/monkeycube = 1, /obj/item/reagent_containers/cup/glass/bottle = 1) @@ -136,7 +136,7 @@ /datum/crafting_recipe/pruno name = "pruno mix" result = /obj/item/reagent_containers/cup/glass/bottle/pruno - time = 30 + time = 3 SECONDS reqs = list(/obj/item/storage/bag/trash = 1, /obj/item/food/breadslice/moldy = 1, /obj/item/food/grown = 4, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm index 2991d9d5c11..a9ad9debd01 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm @@ -107,7 +107,7 @@ /datum/crafting_recipe/food/stuffedlegion name = "Stuffed legion" - time = 40 + time = 4 SECONDS reqs = list( /obj/item/food/meat/steak/goliath = 1, /obj/item/organ/monster_core/regenerative_core/legion = 1, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 40051d67cb5..1dead375c9f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -72,7 +72,7 @@ /datum/crafting_recipe/food/beans name = "Beans" - time = 40 + time = 4 SECONDS reqs = list(/datum/reagent/consumable/ketchup = 5, /obj/item/food/grown/soybeans = 2 ) @@ -111,7 +111,7 @@ /datum/crafting_recipe/food/powercrepe name = "Powercrepe" - time = 40 + time = 4 SECONDS reqs = list( /obj/item/food/flatdough = 1, /datum/reagent/consumable/milk = 1, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index d3c761a64f1..acf3109431c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -4,7 +4,7 @@ ////////////////////////////////////////////////DONUTS//////////////////////////////////////////////// /datum/crafting_recipe/food/donut - time = 15 + time = 1.5 SECONDS name = "Donut" reqs = list( /datum/reagent/consumable/sugar = 1, @@ -26,7 +26,7 @@ result = /obj/item/food/donut/chaos /datum/crafting_recipe/food/donut/meat - time = 15 + time = 1.5 SECONDS name = "Meat donut" reqs = list( /obj/item/food/meat/rawcutlet = 1, @@ -287,7 +287,7 @@ ////////////////////////////////////////////////WAFFLES//////////////////////////////////////////////// /datum/crafting_recipe/food/waffles - time = 15 + time = 1.5 SECONDS name = "Waffles" reqs = list( /obj/item/food/pastrybase = 2 @@ -330,7 +330,7 @@ ////////////////////////////////////////////////DONKPOCCKETS//////////////////////////////////////////////// /datum/crafting_recipe/food/donkpocket - time = 15 + time = 1.5 SECONDS name = "Donk-pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -340,7 +340,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/dankpocket - time = 15 + time = 1.5 SECONDS name = "Dank-pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -350,7 +350,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/spicy - time = 15 + time = 1.5 SECONDS name = "Spicy-pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -361,7 +361,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/teriyaki - time = 15 + time = 1.5 SECONDS name = "Teriyaki-pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -372,7 +372,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/pizza - time = 15 + time = 1.5 SECONDS name = "Pizza-pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -383,7 +383,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/honk - time = 15 + time = 1.5 SECONDS name = "Honk-Pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -395,7 +395,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/berry - time = 15 + time = 1.5 SECONDS name = "Berry-pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -406,7 +406,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/gondola - time = 15 + time = 1.5 SECONDS name = "Gondola-pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -417,7 +417,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/deluxe - time = 15 + time = 1.5 SECONDS name = "Deluxe Donk-pocket" reqs = list( /obj/item/food/doughslice = 1, @@ -431,7 +431,7 @@ crafting_flags = parent_type::crafting_flags | CRAFT_MUST_BE_LEARNED /datum/crafting_recipe/food/donkpocket/deluxe/nocarb - time = 15 + time = 1.5 SECONDS name = "Deluxe Meat-pocket" reqs = list( /obj/item/organ/heart = 1, @@ -444,7 +444,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/deluxe/vegan - time = 15 + time = 1.5 SECONDS name = "Deluxe Donk-roll" reqs = list( /obj/item/food/doughslice = 1, @@ -459,7 +459,7 @@ ////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// /datum/crafting_recipe/food/muffin - time = 15 + time = 1.5 SECONDS name = "Muffin" reqs = list( /datum/reagent/consumable/milk = 5, @@ -508,7 +508,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/sugarcookie - time = 15 + time = 1.5 SECONDS name = "Sugar cookie" reqs = list( /datum/reagent/consumable/sugar = 5, @@ -519,7 +519,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/spookyskull - time = 15 + time = 1.5 SECONDS name = "Skull cookie" reqs = list( /obj/item/food/pastrybase = 1, @@ -531,7 +531,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/spookycoffin - time = 15 + time = 1.5 SECONDS name = "Coffin cookie" reqs = list( /obj/item/food/pastrybase = 1, @@ -543,7 +543,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/fortunecookie - time = 15 + time = 1.5 SECONDS name = "Fortune cookie" reqs = list( /obj/item/food/pastrybase = 1, @@ -557,7 +557,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/poppypretzel - time = 15 + time = 1.5 SECONDS name = "Poppy pretzel" reqs = list( /obj/item/seeds/poppy = 1, @@ -568,7 +568,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/plumphelmetbiscuit - time = 15 + time = 1.5 SECONDS name = "Plumphelmet biscuit" reqs = list( /obj/item/food/pastrybase = 1, @@ -578,7 +578,7 @@ category = CAT_PASTRY /datum/crafting_recipe/food/cracker - time = 15 + time = 1.5 SECONDS name = "Cracker" reqs = list( /datum/reagent/consumable/salt = 1, diff --git a/code/modules/instruments/piano_synth.dm b/code/modules/instruments/piano_synth.dm index 25c65e656c3..f0357eb789c 100644 --- a/code/modules/instruments/piano_synth.dm +++ b/code/modules/instruments/piano_synth.dm @@ -63,7 +63,7 @@ worn_icon = 'icons/mob/clothing/ears.dmi' inhand_icon_state = null slot_flags = ITEM_SLOT_EARS - strip_delay = 100 //air pods don't fall out + strip_delay = 10 SECONDS //air pods don't fall out instrument_range = 0 //you're paying for quality here custom_premium_price = PAYCHECK_CREW * 36 //Save up 5 shifts worth of pay just to lose it down a drainpipe on the sidewalk diff --git a/code/modules/jobs/job_types/chaplain/chaplain_divine_archer.dm b/code/modules/jobs/job_types/chaplain/chaplain_divine_archer.dm index 8c6d1a8c6a3..c0c2a499d3f 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_divine_archer.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_divine_archer.dm @@ -20,8 +20,8 @@ cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/chaplainsuit_armor_weaker - strip_delay = 80 - equip_delay_other = 60 + strip_delay = 8 SECONDS + equip_delay_other = 6 SECONDS hoodtype = /obj/item/clothing/head/hooded/chaplain_hood/divine_archer hood_up_affix = "" @@ -48,8 +48,8 @@ icon_state = "archerbracers" inhand_icon_state = "archerbracers" body_parts_covered = ARMS|HANDS - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS resistance_flags = NONE armor_type = /datum/armor/chaplainsuit_armor_weaker @@ -60,8 +60,8 @@ icon_state = "archerboots" inhand_icon_state = "archerboots" body_parts_covered = LEGS|FEET - strip_delay = 30 - equip_delay_other = 50 + strip_delay = 3 SECONDS + equip_delay_other = 5 SECONDS resistance_flags = NONE fastening_type = SHOES_SLIPON armor_type = /datum/armor/shoes_divine_archer diff --git a/code/modules/mapfluff/ruins/spaceruin_code/cyborgmothership.dm b/code/modules/mapfluff/ruins/spaceruin_code/cyborgmothership.dm index cad1c8488f9..46f2b0c3d77 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/cyborgmothership.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/cyborgmothership.dm @@ -15,7 +15,7 @@ width = 23 height = 23 launch_status = 0 - callTime = 250 + callTime = 25 SECONDS movement_force = list("KNOCKDOWN" = 0,"THROW" = 0) /obj/item/circuitboard/computer/cyborg_mothership diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index fa2717ca5d1..4c3a9cb529b 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -205,7 +205,7 @@ desc = "An intimidating tribal helmet, it doesn't look very comfortable." icon_state = "skull" inhand_icon_state = null - strip_delay = 100 + strip_delay = 10 SECONDS flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT flags_cover = HEADCOVERSEYES cold_protection = HEAD diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 4aa17da2b6e..e5d6e82cf74 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -377,7 +377,7 @@ name = "Mushroom Bowl" result = /obj/item/reagent_containers/cup/bowl/mushroom_bowl reqs = list(/obj/item/food/grown/ash_flora/shavings = 5) - time = 30 + time = 3 SECONDS category = CAT_CONTAINERS /obj/item/reagent_containers/cup/bowl/mushroom_bowl diff --git a/code/modules/mining/lavaland/mining_loot/clothing.dm b/code/modules/mining/lavaland/mining_loot/clothing.dm index f64bda23672..360388b61b6 100644 --- a/code/modules/mining/lavaland/mining_loot/clothing.dm +++ b/code/modules/mining/lavaland/mining_loot/clothing.dm @@ -95,8 +95,8 @@ icon_state = "concussive_gauntlets" inhand_icon_state = null toolspeed = 0.1 - strip_delay = 40 - equip_delay_other = 20 + strip_delay = 4 SECONDS + equip_delay_other = 2 SECONDS cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm index d09c196ec54..0ae07a4d3a1 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult.dm @@ -13,7 +13,7 @@ var/alt_icon = 'icons/mob/nonhuman-player/alienleap.dmi' //used to switch between the two alien icon files. var/leap_on_click = 0 var/pounce_cooldown = 0 - var/pounce_cooldown_time = 30 + var/pounce_cooldown_time = 3 SECONDS death_sound = 'sound/mobs/non-humanoids/hiss/hiss6.ogg' bodyparts = list( /obj/item/bodypart/chest/alien, diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 770cca76ea4..c6e03028a26 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -48,7 +48,7 @@ ///What the current cooldown on ranged attacks is, generally world.time + ranged_cooldown_time var/ranged_cooldown = 0 ///How long, in deciseconds, the cooldown of ranged attacks is - var/ranged_cooldown_time = 30 + var/ranged_cooldown_time = 3 SECONDS ///if it'll fire ranged attacks even if it lacks vision on its target, only works with environment smash var/ranged_ignores_vision = FALSE ///Should the ranged mob check for friendlies when shooting @@ -71,7 +71,7 @@ ///Timer for regaining our old search_objects value after being attacked var/search_objects_timer_id ///The delay between being attacked and gaining our old search_objects value back - var/search_objects_regain_time = 30 + var/search_objects_regain_time = 3 SECONDS ///A typecache of objects types that will be checked against to attack, should we have search_objects enabled var/list/wanted_objects = list() ///Mobs ignore mob/living targets with a stat lower than that of stat_attack. If set to DEAD, then they'll include corpses in their targets, if to HARD_CRIT they'll keep attacking until they kill, and so on. @@ -90,7 +90,7 @@ ///id for a timer to call LoseTarget(), used to stop mobs fixating on a target they can't reach var/lose_patience_timer_id ///30 seconds by default, so there's no major changes to AI behaviour, beyond actually bailing if stuck forever - var/lose_patience_timeout = 300 + var/lose_patience_timeout = 30 SECONDS /mob/living/simple_animal/hostile/Initialize(mapload) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index d829d704c00..9746fef4675 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -47,7 +47,7 @@ /datum/action/innate/elite_attack/aoe_squares) var/sing_shot_length = 8 - var/cooldown_time = 20 + var/cooldown_time = 2 SECONDS /datum/action/innate/elite_attack/singular_shot name = "Singular Shot" diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index 2c8e2e7e008..d8449338f7b 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -465,7 +465,7 @@ device = /obj/item/gun/medbeam/mod incompatible_modules = list(/obj/item/mod/module/medbeam) removable = TRUE - cooldown_time = 0.5 + cooldown_time = 0.05 SECONDS required_slots = list(ITEM_SLOT_BACK) /obj/item/gun/medbeam/mod diff --git a/code/modules/research/xenobiology/vatgrowing/microscope.dm b/code/modules/research/xenobiology/vatgrowing/microscope.dm index 7be87c0d1e9..d96f577db66 100644 --- a/code/modules/research/xenobiology/vatgrowing/microscope.dm +++ b/code/modules/research/xenobiology/vatgrowing/microscope.dm @@ -126,7 +126,7 @@ /datum/crafting_recipe/microscope name = "Microscope" result = /obj/structure/microscope - time = 30 + time = 3 SECONDS tool_behaviors = list(TOOL_SCREWDRIVER) reqs = list( /obj/item/stack/sheet/glass = 1, diff --git a/code/modules/shuttle/mobile_port/mobile_port.dm b/code/modules/shuttle/mobile_port/mobile_port.dm index 2d22cd28ccd..a55cb09d6c7 100644 --- a/code/modules/shuttle/mobile_port/mobile_port.dm +++ b/code/modules/shuttle/mobile_port/mobile_port.dm @@ -23,13 +23,13 @@ ///current shuttle mode var/mode = SHUTTLE_IDLE ///time spent in transit (deciseconds). Should not be lower then 10 seconds without editing the animation of the hyperspace ripples. - var/callTime = 100 + var/callTime = 10 SECONDS /// time spent "starting the engines". Also rate limits how often we try to reserve transit space if its ever full of transiting shuttles. - var/ignitionTime = 55 + var/ignitionTime = 5.5 SECONDS /// time spent after arrival before being able to begin ignition - var/rechargeTime = 0 + var/rechargeTime = 0 SECONDS /// time spent after transit 'landing' before actually arriving - var/prearrivalTime = 0 + var/prearrivalTime = 0 SECONDS /// The direction the shuttle prefers to travel in, ie what direction the animation will cause it to appear to be traveling in var/preferred_direction = NORTH diff --git a/code/modules/shuttle/mobile_port/variants/arrivals.dm b/code/modules/shuttle/mobile_port/variants/arrivals.dm index df3126081b2..4a1bc5744d8 100644 --- a/code/modules/shuttle/mobile_port/variants/arrivals.dm +++ b/code/modules/shuttle/mobile_port/variants/arrivals.dm @@ -6,7 +6,7 @@ port_direction = SOUTH callTime = INFINITY - ignitionTime = 50 + ignitionTime = 5 SECONDS movement_force = list("KNOCKDOWN" = 3, "THROW" = 0) diff --git a/code/modules/shuttle/mobile_port/variants/supply.dm b/code/modules/shuttle/mobile_port/variants/supply.dm index 65d32186a08..c48ab01178e 100644 --- a/code/modules/shuttle/mobile_port/variants/supply.dm +++ b/code/modules/shuttle/mobile_port/variants/supply.dm @@ -44,7 +44,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /obj/docking_port/mobile/supply name = "supply shuttle" shuttle_id = "cargo" - callTime = 600 + callTime = 60 SECONDS dir = WEST port_direction = EAST diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index 34d4e065e13..fb12ecd6e35 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -48,7 +48,7 @@ TOOL_WIRECUTTER = 50, /obj/item/stack/package_wrap = 35, /obj/item/stack/cable_coil = 15) - time = 200 + time = 20 SECONDS preop_sound = 'sound/items/handling/surgery/hemostat1.ogg' success_sound = 'sound/items/handling/surgery/hemostat1.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm index c0206d59f37..e15228976f0 100644 --- a/code/modules/surgery/advanced/lobotomy.dm +++ b/code/modules/surgery/advanced/lobotomy.dm @@ -43,7 +43,7 @@ /obj/item/shard = 25, /obj/item = 20, ) - time = 100 + time = 10 SECONDS preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/scalpel2.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' diff --git a/code/modules/surgery/advanced/necrotic_revival.dm b/code/modules/surgery/advanced/necrotic_revival.dm index 9b537bf0155..a791a70494d 100644 --- a/code/modules/surgery/advanced/necrotic_revival.dm +++ b/code/modules/surgery/advanced/necrotic_revival.dm @@ -23,7 +23,7 @@ implements = list( /obj/item/reagent_containers/syringe = 100, /obj/item/pen = 30) - time = 50 + time = 5 SECONDS chems_needed = list(/datum/reagent/toxin/zombiepowder, /datum/reagent/medicine/rezadone) require_all_chems = FALSE diff --git a/code/modules/surgery/advanced/pacification.dm b/code/modules/surgery/advanced/pacification.dm index 5f0c165ac5b..0c4f0e7371d 100644 --- a/code/modules/surgery/advanced/pacification.dm +++ b/code/modules/surgery/advanced/pacification.dm @@ -38,7 +38,7 @@ TOOL_SCREWDRIVER = 35, /obj/item/pen = 15, ) - time = 40 + time = 4 SECONDS preop_sound = 'sound/items/handling/surgery/hemostat1.ogg' success_sound = 'sound/items/handling/surgery/hemostat1.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' diff --git a/code/modules/surgery/advanced/viral_bonding.dm b/code/modules/surgery/advanced/viral_bonding.dm index f57e49ec1bd..be7e2969a0b 100644 --- a/code/modules/surgery/advanced/viral_bonding.dm +++ b/code/modules/surgery/advanced/viral_bonding.dm @@ -26,7 +26,7 @@ TOOL_CAUTERY = 100, TOOL_WELDER = 50, /obj/item = 30) // 30% success with any hot item. - time = 100 + time = 10 SECONDS chems_needed = list(/datum/reagent/medicine/spaceacillin,/datum/reagent/consumable/virus_food,/datum/reagent/toxin/formaldehyde) /datum/surgery_step/viral_bond/tool_check(mob/user, obj/item/tool) diff --git a/code/modules/surgery/advanced/wingreconstruction.dm b/code/modules/surgery/advanced/wingreconstruction.dm index a3931dd4e5e..3a27a19c391 100644 --- a/code/modules/surgery/advanced/wingreconstruction.dm +++ b/code/modules/surgery/advanced/wingreconstruction.dm @@ -23,7 +23,7 @@ TOOL_HEMOSTAT = 85, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15) - time = 200 + time = 20 SECONDS chems_needed = list(/datum/reagent/medicine/c2/synthflesh) require_all_chems = FALSE diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm index 0bcf408b2a7..be4fbf7ea5f 100644 --- a/code/modules/surgery/amputation.dm +++ b/code/modules/surgery/amputation.dm @@ -51,7 +51,7 @@ /obj/item/hatchet = 40, /obj/item/knife/butcher = 25, ) - time = 64 + time = 6.4 SECONDS preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/organ2.ogg' surgery_effects_mood = TRUE @@ -78,7 +78,7 @@ /obj/item/hatchet = 75, TOOL_SCALPEL = 25, ) - time = 30 + time = 3 SECONDS preop_sound = 'sound/items/handling/surgery/saw.ogg' success_sound = 'sound/items/handling/materials/wood_drop.ogg' diff --git a/code/modules/surgery/bone_mending.dm b/code/modules/surgery/bone_mending.dm index 8afffb232fb..24cea41ce30 100644 --- a/code/modules/surgery/bone_mending.dm +++ b/code/modules/surgery/bone_mending.dm @@ -53,7 +53,7 @@ /obj/item/stack/sticky_tape/surgical = 100, /obj/item/stack/sticky_tape/super = 50, /obj/item/stack/sticky_tape = 30) - time = 40 + time = 4 SECONDS /datum/surgery_step/repair_bone_hairline/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(surgery.operated_wound) @@ -102,7 +102,7 @@ /obj/item/stack/sticky_tape/surgical = 60, /obj/item/stack/sticky_tape/super = 40, /obj/item/stack/sticky_tape = 20) - time = 40 + time = 4 SECONDS /datum/surgery_step/reset_compound_fracture/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(surgery.operated_wound) @@ -152,7 +152,7 @@ /datum/surgery_step/repair_bone_compound name = "repair compound fracture (bone gel/tape)" implements = IMPLEMENTS_THAT_FIX_BONES - time = 40 + time = 4 SECONDS /datum/surgery_step/repair_bone_compound/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(surgery.operated_wound) diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm index 54aa82f43b4..2e87d6b51b7 100644 --- a/code/modules/surgery/burn_dressing.dm +++ b/code/modules/surgery/burn_dressing.dm @@ -39,7 +39,7 @@ TOOL_SCALPEL = 85, TOOL_SAW = 60, TOOL_WIRECUTTER = 40) - time = 30 + time = 3 SECONDS repeatable = TRUE preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/retractor2.ogg' @@ -134,7 +134,7 @@ implements = list( /obj/item/stack/medical/gauze = 100, /obj/item/stack/sticky_tape/surgical = 100) - time = 40 + time = 4 SECONDS /// How much sanitization is added var/sanitization_added = 3 /// How much flesh healing is added diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index b07b562aa8d..cfab9cf7424 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(heavy_cavity_implants, typecacheof(list(/obj/item/transfer_valv accept_hand = 1 implements = list(/obj/item = 100) repeatable = TRUE - time = 32 + time = 3.2 SECONDS preop_sound = 'sound/items/handling/surgery/organ1.ogg' success_sound = 'sound/items/handling/surgery/organ2.ogg' var/obj/item/item_for_cavity diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm index 4c7382f3dae..890d62413f2 100644 --- a/code/modules/surgery/core_removal.dm +++ b/code/modules/surgery/core_removal.dm @@ -24,7 +24,7 @@ implements = list( TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 100) - time = 16 + time = 1.6 SECONDS /datum/surgery_step/extract_core/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm index 7b0536367f1..75357ba4908 100644 --- a/code/modules/surgery/coronary_bypass.dm +++ b/code/modules/surgery/coronary_bypass.dm @@ -40,7 +40,7 @@ /obj/item/melee/energy/sword = 45, /obj/item/knife = 45, /obj/item/shard = 25) - time = 16 + time = 1.6 SECONDS preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/scalpel2.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' @@ -108,7 +108,7 @@ TOOL_WIRECUTTER = 35, /obj/item/stack/package_wrap = 15, /obj/item/stack/cable_coil = 5) - time = 90 + time = 9 SECONDS preop_sound = 'sound/items/handling/surgery/hemostat1.ogg' success_sound = 'sound/items/handling/surgery/hemostat1.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 96208396b6e..f12064a42c1 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -31,7 +31,7 @@ /datum/surgery_step/insert_pill name = "insert pill" implements = list(/obj/item/reagent_containers/applicator/pill = 100) - time = 16 + time = 1.6 SECONDS /datum/surgery_step/insert_pill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/code/modules/surgery/ear_surgery.dm b/code/modules/surgery/ear_surgery.dm index 9e363e2ae9b..9f41949f763 100644 --- a/code/modules/surgery/ear_surgery.dm +++ b/code/modules/surgery/ear_surgery.dm @@ -20,7 +20,7 @@ TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 45, /obj/item/pen = 25) - time = 64 + time = 6.4 SECONDS /datum/surgery/ear_surgery/can_start(mob/user, mob/living/carbon/target) return target.get_organ_slot(ORGAN_SLOT_EARS) && ..() diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm index 3a0f7140091..31a4fe261d4 100644 --- a/code/modules/surgery/eye_surgery.dm +++ b/code/modules/surgery/eye_surgery.dm @@ -18,7 +18,7 @@ TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 45, /obj/item/pen = 25) - time = 64 + time = 6.4 SECONDS /datum/surgery/eye_surgery/can_start(mob/user, mob/living/carbon/target) return target.get_organ_slot(ORGAN_SLOT_EYES) && ..() diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm index d09933f303f..caae23b2552 100644 --- a/code/modules/surgery/gastrectomy.dm +++ b/code/modules/surgery/gastrectomy.dm @@ -41,7 +41,7 @@ /obj/item/melee/energy/sword = 65, /obj/item/knife = 45, /obj/item/shard = 35) - time = 52 + time = 5.2 SECONDS preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/organ1.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index 12540945a52..dfabe24234d 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -41,7 +41,7 @@ TOOL_WIRECUTTER = 60, /obj/item/pen = 55) repeatable = TRUE - time = 25 + time = 2.5 SECONDS success_sound = 'sound/items/handling/surgery/retractor2.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' var/brutehealing = 0 @@ -330,7 +330,7 @@ burnhealing = 3 brute_multiplier = 0.07 burn_multiplier = 0.07 - time = 10 + time = 1 SECONDS /datum/surgery_step/heal/combo/upgraded brutehealing = 3 diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm index 82921c3f275..ebde9505214 100644 --- a/code/modules/surgery/hepatectomy.dm +++ b/code/modules/surgery/hepatectomy.dm @@ -40,7 +40,7 @@ /obj/item/melee/energy/sword = 65, /obj/item/knife = 45, /obj/item/shard = 35) - time = 52 + time = 5.2 SECONDS preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/organ1.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 51c279d32cd..7893f33ec4d 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -18,7 +18,7 @@ TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 65, /obj/item/kitchen/fork = 35) - time = 64 + time = 6.4 SECONDS success_sound = 'sound/items/handling/surgery/hemostat1.ogg' var/obj/item/implant/implant diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index 5276111e567..b9b1356db89 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -9,7 +9,7 @@ implements = list( /obj/item/bodypart = 100, /obj/item/borg/apparatus/organ_storage = 100) - time = 32 + time = 3.2 SECONDS var/obj/item/bodypart/target_limb diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm index 975df4a8bdf..3183c968f70 100644 --- a/code/modules/surgery/lipoplasty.dm +++ b/code/modules/surgery/lipoplasty.dm @@ -37,7 +37,7 @@ /obj/item/hatchet = 35, /obj/item/knife/butcher = 25, ) - time = 64 + time = 6.4 SECONDS surgery_effects_mood = TRUE preop_sound = list( /obj/item/circular_saw = 'sound/items/handling/surgery/saw.ogg', @@ -87,7 +87,7 @@ TOOL_SCREWDRIVER = 45, TOOL_WIRECUTTER = 35, ) - time = 32 + time = 3.2 SECONDS preop_sound = 'sound/items/handling/surgery/retractor1.ogg' success_sound = 'sound/items/handling/surgery/retractor2.ogg' diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm index e0988c8376c..4f1c32873d8 100644 --- a/code/modules/surgery/lobectomy.dm +++ b/code/modules/surgery/lobectomy.dm @@ -37,7 +37,7 @@ /obj/item/melee/energy/sword = 65, /obj/item/knife = 45, /obj/item/shard = 35) - time = 42 + time = 4.2 SECONDS preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/organ1.ogg' failure_sound = 'sound/items/handling/surgery/organ2.ogg' diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm index 44be32bc858..dab8730c2ed 100644 --- a/code/modules/surgery/mechanic_steps.dm +++ b/code/modules/surgery/mechanic_steps.dm @@ -6,7 +6,7 @@ TOOL_SCALPEL = 75, // med borgs could try to unscrew shell with scalpel /obj/item/knife = 50, /obj/item = 10) // 10% success with any sharp item. - time = 24 + time = 2.4 SECONDS preop_sound = 'sound/items/tools/screwdriver.ogg' success_sound = 'sound/items/tools/screwdriver2.ogg' @@ -36,7 +36,7 @@ TOOL_SCALPEL = 75, /obj/item/knife = 50, /obj/item = 10) // 10% success with any sharp item. - time = 24 + time = 2.4 SECONDS preop_sound = 'sound/items/tools/screwdriver.ogg' success_sound = 'sound/items/tools/screwdriver2.ogg' @@ -64,7 +64,7 @@ implements = list( TOOL_MULTITOOL = 100, TOOL_HEMOSTAT = 75) - time = 24 + time = 2.4 SECONDS preop_sound = 'sound/items/taperecorder/tape_flip.ogg' success_sound = 'sound/items/taperecorder/taperecorder_close.ogg' @@ -84,7 +84,7 @@ implements = list( TOOL_WRENCH = 100, TOOL_RETRACTOR = 75) - time = 24 + time = 2.4 SECONDS preop_sound = 'sound/items/tools/ratchet.ogg' /datum/surgery_step/mechanic_unwrench/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -109,7 +109,7 @@ implements = list( TOOL_WRENCH = 100, TOOL_RETRACTOR = 75) - time = 24 + time = 2.4 SECONDS preop_sound = 'sound/items/tools/ratchet.ogg' /datum/surgery_step/mechanic_wrench/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -132,7 +132,7 @@ /datum/surgery_step/open_hatch name = "open the hatch (hand)" accept_hand = TRUE - time = 10 + time = 1 SECONDS preop_sound = 'sound/items/tools/ratchet.ogg' preop_sound = 'sound/machines/airlock/doorclick.ogg' diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index cdcb324c867..30a06d70ff7 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -8,7 +8,7 @@ /obj/item/knife = 65, /obj/item/shard = 45, /obj/item = 30) // 30% success with any sharp item. - time = 16 + time = 1.6 SECONDS preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/scalpel2.ogg' surgery_effects_mood = TRUE @@ -64,7 +64,7 @@ TOOL_WIRECUTTER = 60, /obj/item/stack/package_wrap = 35, /obj/item/stack/cable_coil = 15) - time = 24 + time = 2.4 SECONDS preop_sound = 'sound/items/handling/surgery/hemostat1.ogg' /datum/surgery_step/clamp_bleeders/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -95,7 +95,7 @@ TOOL_SCREWDRIVER = 45, TOOL_WIRECUTTER = 35, /obj/item/stack/rods = 35) - time = 24 + time = 2.4 SECONDS preop_sound = 'sound/items/handling/surgery/retractor1.ogg' success_sound = 'sound/items/handling/surgery/retractor2.ogg' @@ -117,7 +117,7 @@ /obj/item/gun/energy/laser = 90, TOOL_WELDER = 70, /obj/item = 30) // 30% success with any hot item. - time = 24 + time = 2.4 SECONDS preop_sound = 'sound/items/handling/surgery/cautery1.ogg' success_sound = 'sound/items/handling/surgery/cautery2.ogg' @@ -160,7 +160,7 @@ /obj/item/hatchet = 35, /obj/item/knife/butcher = 35, /obj/item = 25) //20% success (sort of) with any sharp item with a force >= 10 - time = 54 + time = 5.4 SECONDS preop_sound = list( /obj/item/circular_saw = 'sound/items/handling/surgery/saw.ogg', /obj/item/melee/arm_blade = 'sound/items/handling/surgery/scalpel1.ogg', @@ -208,7 +208,7 @@ /obj/item/pickaxe/drill = 60, TOOL_SCREWDRIVER = 25, /obj/item/kitchen/spoon = 20) - time = 30 + time = 3 SECONDS /datum/surgery_step/drill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm index 5978bfb1676..bedb2176d3d 100644 --- a/code/modules/surgery/plastic_surgery.dm +++ b/code/modules/surgery/plastic_surgery.dm @@ -59,7 +59,7 @@ TOOL_SCALPEL = 100, /obj/item/knife = 50, TOOL_WIRECUTTER = 35) - time = 64 + time = 6.4 SECONDS surgery_effects_mood = TRUE /datum/surgery_step/reshape_face/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/code/modules/surgery/stomachpump.dm b/code/modules/surgery/stomachpump.dm index 47f25074c3a..be298cfd45c 100644 --- a/code/modules/surgery/stomachpump.dm +++ b/code/modules/surgery/stomachpump.dm @@ -35,7 +35,7 @@ name = "pump stomach (hand)" accept_hand = TRUE repeatable = TRUE - time = 20 + time = 2 SECONDS success_sound = 'sound/items/handling/surgery/organ2.ogg' /datum/surgery_step/stomach_pump/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index b34de84da99..672d29ad825 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -9,7 +9,7 @@ var/implement_type = null //the current type of implement used. This has to be stored, as the actual typepath of the tool may not match the list type. var/accept_hand = FALSE //does the surgery step require an open hand? If true, ignores implements. Compatible with accept_any_item. var/accept_any_item = FALSE //does the surgery step accept any item? If true, ignores implements. Compatible with require_hand. - var/time = 10 //how long does the step take? + var/time = 1 SECONDS //how long does the step take? var/repeatable = FALSE //can this step be repeated? Make shure it isn't last step, or else the surgeon will be stuck in the loop var/list/chems_needed = list() //list of chems needed to complete the step. Even on success, the step will have no effect if there aren't the chems required in the mob. var/require_all_chems = TRUE //any on the list or all on the list? diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 6bfbc1bbae1..eeacfbc1776 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -17,7 +17,7 @@ ///list of headlight colors we use to pick through when we have party mode due to emag var/headlight_colors = list(COLOR_RED, COLOR_ORANGE, COLOR_YELLOW, COLOR_LIME, COLOR_BRIGHT_BLUE, COLOR_CYAN, COLOR_PURPLE) ///Cooldown time inbetween [/obj/vehicle/sealed/car/clowncar/proc/roll_the_dice()] usages - var/dice_cooldown_time = 150 + var/dice_cooldown_time = 15 SECONDS ///How many times kidnappers in the clown car said thanks var/thankscount = 0 ///Current status of the cannon, alternates between CLOWN_CANNON_INACTIVE, CLOWN_CANNON_BUSY and CLOWN_CANNON_READY diff --git a/code/modules/vehicles/lavaboat.dm b/code/modules/vehicles/lavaboat.dm index 3c9046b399e..3a8d86879bc 100644 --- a/code/modules/vehicles/lavaboat.dm +++ b/code/modules/vehicles/lavaboat.dm @@ -33,14 +33,14 @@ name = "Goliath Bone Oar" result = /obj/item/oar reqs = list(/obj/item/stack/sheet/bone = 2) - time = 15 + time = 1.5 SECONDS category = CAT_TOOLS /datum/crafting_recipe/boat name = "Goliath Hide Boat" result = /obj/vehicle/ridden/lavaboat reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3) - time = 50 + time = 5 SECONDS category = CAT_TOOLS /obj/vehicle/ridden/lavaboat/plasma diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 5a70881851e..10f1b5cf1c8 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -6,11 +6,11 @@ icon_state = "blacktumor" var/causes_damage = TRUE var/datum/species/old_species = /datum/species/human - var/living_transformation_time = 30 + var/living_transformation_time = 3 SECONDS var/converts_living = FALSE - var/revive_time_min = 450 - var/revive_time_max = 700 + var/revive_time_min = 45 SECONDS + var/revive_time_max = 70 SECONDS var/timer_id /obj/item/organ/zombie_infection/Initialize(mapload)