cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 00:49:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes Weapons (#7415)

Browse Source 
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bones.dm
+8 -8
View File
@@ -5,8 +5,8 @@
/datum/surgery_step/glue_bone
allowed_tools = list(
/obj/item/weapon/bonegel = 100, \
/obj/item/weapon/tape_roll = 60
/obj/item/bonegel = 100, \
/obj/item/tape_roll = 60
)
can_infect = 1
blood_level = 1
@@ -41,8 +41,8 @@
/datum/surgery_step/set_bone
allowed_tools = list(
/obj/item/weapon/bonesetter = 100, \
/obj/item/weapon/wrench = 75 \
/obj/item/bonesetter = 100, \
/obj/item/wrench = 75 \
)
min_duration = 60
@@ -80,8 +80,8 @@
/datum/surgery_step/mend_skull
allowed_tools = list(
/obj/item/weapon/bonesetter = 100, \
/obj/item/weapon/wrench = 75 \
/obj/item/bonesetter = 100, \
/obj/item/wrench = 75 \
)
min_duration = 60
@@ -114,8 +114,8 @@
/datum/surgery_step/finish_bone
allowed_tools = list(
/obj/item/weapon/bonegel = 100, \
/obj/item/weapon/tape_roll = 60
/obj/item/bonegel = 100, \
/obj/item/tape_roll = 60
)
can_infect = 1
blood_level = 1
code/modules/surgery/encased.dm
+10 -10
View File
@@ -17,10 +17,10 @@
/datum/surgery_step/open_encased/saw
allowed_tools = list(
/obj/item/weapon/circular_saw = 100,
/obj/item/weapon/melee/energy = 100,
/obj/item/weapon/melee/chainsword = 70,
/obj/item/weapon/material/hatchet = 75
/obj/item/circular_saw = 100,
/obj/item/melee/energy = 100,
/obj/item/melee/chainsword = 70,
/obj/item/material/hatchet = 75
)
min_duration = 50
@@ -68,8 +68,8 @@
/datum/surgery_step/open_encased/retract
allowed_tools = list(
/obj/item/weapon/retractor = 100, \
/obj/item/weapon/crowbar = 75
/obj/item/retractor = 100, \
/obj/item/crowbar = 75
)
min_duration = 30
@@ -124,8 +124,8 @@
/datum/surgery_step/open_encased/close
allowed_tools = list(
/obj/item/weapon/retractor = 100, \
/obj/item/weapon/crowbar = 75
/obj/item/retractor = 100, \
/obj/item/crowbar = 75
)
min_duration = 20
@@ -183,8 +183,8 @@
/datum/surgery_step/open_encased/mend
allowed_tools = list(
/obj/item/weapon/bonegel = 100, \
/obj/item/weapon/tape_roll = 60
/obj/item/bonegel = 100, \
/obj/item/tape_roll = 60
)
min_duration = 20
code/modules/surgery/face.dm
+6 -6
View File
@@ -16,9 +16,9 @@
/datum/surgery_step/generic/cut_face
allowed_tools = list(
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
/obj/item/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
min_duration = 90
@@ -53,9 +53,9 @@
/datum/surgery_step/robotics/face/synthskin
allowed_tools = list(
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
/obj/item/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
min_duration = 90
code/modules/surgery/facial_surgery.dm
+14 -14
View File
@@ -20,8 +20,8 @@
/datum/surgery_step/generic/prepare_face
allowed_tools = list(
/obj/item/weapon/retractor = 100,
/obj/item/weapon/material/knife/tacknife = 75
/obj/item/retractor = 100,
/obj/item/material/knife/tacknife = 75
)
min_duration = 90
@@ -50,7 +50,7 @@
/datum/surgery_step/generic/alter_face
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/hemostat = 100, \
/obj/item/stack/cable_coil = 75, \
/obj/item/device/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity.
)
@@ -94,10 +94,10 @@
/datum/surgery_step/face/cauterize
allowed_tools = list(
/obj/item/weapon/cautery = 100, \
/obj/item/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/weapon/flame/lighter = 50, \
/obj/item/weapon/weldingtool = 25
/obj/item/flame/lighter = 50, \
/obj/item/weldingtool = 25
)
min_duration = 70
@@ -137,9 +137,9 @@
/datum/surgery_step/robotics/face/synthskinopen
allowed_tools = list(
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
/obj/item/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
min_duration = 90
@@ -167,8 +167,8 @@
/datum/surgery_step/robotics/face/prepare_face
allowed_tools = list(
/obj/item/weapon/retractor = 100,
/obj/item/weapon/material/knife/tacknife = 75
/obj/item/retractor = 100,
/obj/item/material/knife/tacknife = 75
)
min_duration = 90
@@ -239,10 +239,10 @@
/datum/surgery_step/robotics/face/seal_face
allowed_tools = list(
/obj/item/weapon/cautery = 100, \
/obj/item/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/weapon/flame/lighter = 50, \
/obj/item/weapon/weldingtool = 25
/obj/item/flame/lighter = 50, \
/obj/item/weldingtool = 25
)
min_duration = 70
code/modules/surgery/generic.dm
+26 -26
View File
@@ -23,9 +23,9 @@
/datum/surgery_step/generic/cut_with_laser
allowed_tools = list(
/obj/item/weapon/scalpel/laser3 = 95, \
/obj/item/weapon/scalpel/laser2 = 85, \
/obj/item/weapon/scalpel/laser1 = 75, \
/obj/item/scalpel/laser3 = 95, \
/obj/item/scalpel/laser2 = 85, \
/obj/item/scalpel/laser1 = 75, \
//Removed energy sword from here. with a 5% chance of success, it's a feature nobody ever used anyway
//Energy swords amputate instead now
)
@@ -69,7 +69,7 @@
/datum/surgery_step/generic/incision_manager
allowed_tools = list(
/obj/item/weapon/scalpel/manager = 100
/obj/item/scalpel/manager = 100
)
priority = 2
min_duration = 80
@@ -109,9 +109,9 @@
/datum/surgery_step/generic/cut_open
allowed_tools = list(
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
/obj/item/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
min_duration = 90
@@ -152,8 +152,8 @@
/datum/surgery_step/generic/cut_openvaurca
allowed_tools = list(
/obj/item/weapon/surgicaldrill = 85,
/obj/item/weapon/pickaxe/ = 15
/obj/item/surgicaldrill = 85,
/obj/item/pickaxe/ = 15
)
min_duration = 110
@@ -193,7 +193,7 @@
/datum/surgery_step/generic/clamp_bleeders
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/hemostat = 100, \
/obj/item/stack/cable_coil = 75, \
/obj/item/device/assembly/mousetrap = 20
)
@@ -228,9 +228,9 @@
/datum/surgery_step/generic/retract_skin
allowed_tools = list(
/obj/item/weapon/retractor = 100, \
/obj/item/weapon/crowbar = 75, \
/obj/item/weapon/material/kitchen/utensil/fork = 50
/obj/item/retractor = 100, \
/obj/item/crowbar = 75, \
/obj/item/material/kitchen/utensil/fork = 50
)
min_duration = 30
@@ -284,10 +284,10 @@
/datum/surgery_step/generic/cauterize
//Fixed these tool probabilities because they were dumb
allowed_tools = list(
/obj/item/weapon/cautery = 100,
/obj/item/cautery = 100,
/obj/item/clothing/mask/smokable/cigarette = 25,
/obj/item/weapon/flame/lighter = 50,
/obj/item/weapon/weldingtool = 75
/obj/item/flame/lighter = 50,
/obj/item/weldingtool = 75
)
min_duration = 70
@@ -321,10 +321,10 @@
/datum/surgery_step/generic/amputate
allowed_tools = list(
/obj/item/weapon/circular_saw = 100,
/obj/item/weapon/melee/energy = 100,
/obj/item/weapon/melee/chainsword = 100,
/obj/item/weapon/material/hatchet = 55
/obj/item/circular_saw = 100,
/obj/item/melee/energy = 100,
/obj/item/melee/chainsword = 100,
/obj/item/material/hatchet = 55
)
min_duration = 110
@@ -339,14 +339,14 @@
if (affected == null)
return 0
if (istype(tool, /obj/item/weapon/melee/energy))
var/obj/item/weapon/melee/energy/E = tool
if (istype(tool, /obj/item/melee/energy))
var/obj/item/melee/energy/E = tool
if (!E.active)
to_chat(user, "<span class='warning'>The energy blade is not turned on!</span>")
return 0
if (istype(tool, /obj/item/weapon/melee/chainsword))
var/obj/item/weapon/melee/chainsword/E = tool
if (istype(tool, /obj/item/melee/chainsword))
var/obj/item/melee/chainsword/E = tool
if (!E.active)
to_chat(user, "<span class='warning'>The blades aren't spinning, you can't cut anything!</span>")
return 0
@@ -367,13 +367,13 @@
"<span class='danger'>You amputate [target]'s [affected.name] with \the [tool].</span>")
var/clean = 1
if (istype(tool, /obj/item/weapon/melee/chainsword))//Chainswords rip and tear, so the limb removal is not clean
if (istype(tool, /obj/item/melee/chainsword))//Chainswords rip and tear, so the limb removal is not clean
clean = 0
var/var/obj/item/organ/external/parent = affected.parent//Cache the parent organ of the limb before we sever it
affected.droplimb(clean,DROPLIMB_EDGE)
if (istype(tool, /obj/item/weapon/melee/energy))//Code for energy weapons cauterising the cut
if (istype(tool, /obj/item/melee/energy))//Code for energy weapons cauterising the cut
spawn(1)
affected = parent
affected.open = 0//Close open wounds
code/modules/surgery/implant.dm
+14 -14
View File
@@ -40,8 +40,8 @@
/datum/surgery_step/cavity/make_space
allowed_tools = list(
/obj/item/weapon/surgicaldrill = 100, \
/obj/item/weapon/pen = 75, \
/obj/item/surgicaldrill = 100, \
/obj/item/pen = 75, \
/obj/item/stack/rods = 50
)
@@ -69,10 +69,10 @@
/datum/surgery_step/cavity/close_space
priority = 2
allowed_tools = list(
/obj/item/weapon/cautery = 100, \
/obj/item/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/weapon/flame/lighter = 50, \
/obj/item/weapon/weldingtool = 25
/obj/item/flame/lighter = 50, \
/obj/item/weldingtool = 25
)
min_duration = 60
@@ -111,7 +111,7 @@
if(affected && affected.cavity)
var/total_volume = tool.w_class
for(var/obj/item/I in affected.implants)
if(istype(I,/obj/item/weapon/implant))
if(istype(I,/obj/item/implant))
continue
total_volume += I.w_class
return total_volume <= get_max_wclass(affected)
@@ -145,9 +145,9 @@
/datum/surgery_step/cavity/implant_removal
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/weapon/wirecutters = 75, \
/obj/item/weapon/material/kitchen/utensil/fork = 20
/obj/item/hemostat = 100, \
/obj/item/wirecutters = 75, \
/obj/item/material/kitchen/utensil/fork = 20
)
min_duration = 80
@@ -173,8 +173,8 @@
var/obj/item/obj = pick(affected.implants)
if(istype(obj,/obj/item/weapon/implant))
var/obj/item/weapon/implant/imp = obj
if(istype(obj,/obj/item/implant))
var/obj/item/implant/imp = obj
if (imp.islegal())
find_prob +=60
else
@@ -200,8 +200,8 @@
obj.forceMove(get_turf(target))
obj.add_blood(target)
obj.update_icon()
if(istype(obj,/obj/item/weapon/implant))
var/obj/item/weapon/implant/imp = obj
if(istype(obj,/obj/item/implant))
var/obj/item/implant/imp = obj
imp.imp_in = null
imp.implanted = 0
playsound(target.loc, 'sound/effects/squelch1.ogg', 50, 1)
@@ -219,7 +219,7 @@
var/fail_prob = 10
fail_prob += 100 - tool_quality(tool)
if (prob(fail_prob))
var/obj/item/weapon/implant/imp = affected.implants[1]
var/obj/item/implant/imp = affected.implants[1]
user.visible_message("<span class='warning'>Something beeps inside [target]'s [affected.name]!</span>")
playsound(imp.loc, 'sound/items/countdown.ogg', 75, 1, -3)
spawn(25)
code/modules/surgery/limb_reattach.dm
+1 -1
View File
@@ -44,7 +44,7 @@
/datum/surgery_step/limb/connect
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/hemostat = 100, \
/obj/item/stack/cable_coil = 75, \
/obj/item/device/assembly/mousetrap = 20
)
code/modules/surgery/organs_internal.dm
+13 -13
View File
@@ -104,9 +104,9 @@
/datum/surgery_step/internal/detatch_organ
allowed_tools = list(
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
/obj/item/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
min_duration = 90
@@ -164,9 +164,9 @@
/datum/surgery_step/internal/remove_organ
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/weapon/wirecutters = 75, \
/obj/item/weapon/material/kitchen/utensil/fork = 20
/obj/item/hemostat = 100, \
/obj/item/wirecutters = 75, \
/obj/item/material/kitchen/utensil/fork = 20
)
min_duration = 60
@@ -298,7 +298,7 @@
/datum/surgery_step/internal/attach_organ
allowed_tools = list(
/obj/item/weapon/FixOVein = 100, \
/obj/item/FixOVein = 100, \
/obj/item/stack/cable_coil = 75
)
@@ -347,9 +347,9 @@
/datum/surgery_step/internal/lobotomize
allowed_tools = list(
/obj/item/weapon/scalpel/manager = 95,
/obj/item/weapon/surgicaldrill = 75,
/obj/item/weapon/pickaxe/ = 5
/obj/item/scalpel/manager = 95,
/obj/item/surgicaldrill = 75,
/obj/item/pickaxe/ = 5
)
min_duration = 100
@@ -396,9 +396,9 @@
// To be finished after some tests.
// /datum/surgery_step/ribcage/heart/cut
// allowed_tools = list(
// /obj/item/weapon/scalpel = 100, \
// /obj/item/weapon/material/knife = 75, \
// /obj/item/weapon/material/shard = 50, \
// /obj/item/scalpel = 100, \
// /obj/item/material/knife = 75, \
// /obj/item/material/shard = 50, \
// )
// min_duration = 30
code/modules/surgery/other.dm
+21 -21
View File
@@ -7,7 +7,7 @@
/datum/surgery_step/fix_vein
priority = 2
allowed_tools = list(
/obj/item/weapon/FixOVein = 100, \
/obj/item/FixOVein = 100, \
/obj/item/stack/cable_coil = 75
)
can_infect = 1
@@ -55,9 +55,9 @@
/datum/surgery_step/fix_dead_tissue //Debridement
priority = 2
allowed_tools = list(
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
/obj/item/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
can_infect = 1
@@ -99,11 +99,11 @@
/datum/surgery_step/treat_necrosis
priority = 2
allowed_tools = list(
/obj/item/weapon/reagent_containers/dropper = 100,
/obj/item/weapon/reagent_containers/glass/bottle = 75,
/obj/item/weapon/reagent_containers/glass/beaker = 75,
/obj/item/weapon/reagent_containers/spray = 50,
/obj/item/weapon/reagent_containers/glass/bucket = 50
/obj/item/reagent_containers/dropper = 100,
/obj/item/reagent_containers/glass/bottle = 75,
/obj/item/reagent_containers/glass/beaker = 75,
/obj/item/reagent_containers/spray = 50,
/obj/item/reagent_containers/glass/bucket = 50
)
can_infect = 0
@@ -113,10 +113,10 @@
max_duration = 60
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if (!istype(tool, /obj/item/weapon/reagent_containers))
if (!istype(tool, /obj/item/reagent_containers))
return 0
var/obj/item/weapon/reagent_containers/container = tool
var/obj/item/reagent_containers/container = tool
if(!container.reagents.has_reagent("peridaxon"))
return 0
@@ -139,10 +139,10 @@
end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if (!istype(tool, /obj/item/weapon/reagent_containers))
if (!istype(tool, /obj/item/reagent_containers))
return
var/obj/item/weapon/reagent_containers/container = tool
var/obj/item/reagent_containers/container = tool
var/trans = container.reagents.trans_to_mob(target, container.amount_per_transfer_from_this, CHEM_BLOOD) //technically it's contact, but the reagents are being applied to internal tissue
if (trans > 0)
@@ -157,10 +157,10 @@
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if (!istype(tool, /obj/item/weapon/reagent_containers))
if (!istype(tool, /obj/item/reagent_containers))
return
var/obj/item/weapon/reagent_containers/container = tool
var/obj/item/reagent_containers/container = tool
var/trans = container.reagents.trans_to_mob(target, container.amount_per_transfer_from_this, CHEM_BLOOD)
@@ -171,9 +171,9 @@
/datum/surgery_step/hardsuit
allowed_tools = list(
/obj/item/weapon/weldingtool = 80,
/obj/item/weapon/circular_saw = 60,
/obj/item/weapon/gun/energy/plasmacutter = 100
/obj/item/weldingtool = 80,
/obj/item/circular_saw = 60,
/obj/item/gun/energy/plasmacutter = 100
)
can_infect = 0
@@ -186,10 +186,10 @@
if(!istype(target))
return 0
if(tool.iswelder())
var/obj/item/weapon/weldingtool/welder = tool
var/obj/item/weldingtool/welder = tool
if(!welder.isOn() || !welder.remove_fuel(1,user))
return 0
return (target_zone == "chest") && istype(target.back, /obj/item/weapon/rig) && !(target.back.canremove)
return (target_zone == "chest") && istype(target.back, /obj/item/rig) && !(target.back.canremove)
begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("[user] starts cutting through the support systems of [target]'s [target.back] with \the [tool]." , \
@@ -198,7 +198,7 @@
end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/weapon/rig/rig = target.back
var/obj/item/rig/rig = target.back
if(!istype(rig))
return
rig.reset()
code/modules/surgery/robotics.dm
+15 -15
View File
@@ -23,9 +23,9 @@
/datum/surgery_step/robotics/unscrew_hatch
allowed_tools = list(
/obj/item/weapon/screwdriver = 100,
/obj/item/weapon/coin = 50,
/obj/item/weapon/material/kitchen/utensil/knife = 50
/obj/item/screwdriver = 100,
/obj/item/coin = 50,
/obj/item/material/kitchen/utensil/knife = 50
)
min_duration = 90
@@ -55,9 +55,9 @@
/datum/surgery_step/robotics/open_hatch
allowed_tools = list(
/obj/item/weapon/retractor = 100,
/obj/item/weapon/crowbar = 100,
/obj/item/weapon/material/kitchen/utensil = 50
/obj/item/retractor = 100,
/obj/item/crowbar = 100,
/obj/item/material/kitchen/utensil = 50
)
min_duration = 30
@@ -87,9 +87,9 @@
/datum/surgery_step/robotics/close_hatch
allowed_tools = list(
/obj/item/weapon/retractor = 100,
/obj/item/weapon/crowbar = 100,
/obj/item/weapon/material/kitchen/utensil = 50
/obj/item/retractor = 100,
/obj/item/crowbar = 100,
/obj/item/material/kitchen/utensil = 50
)
min_duration = 70
@@ -120,8 +120,8 @@
/datum/surgery_step/robotics/repair_brute
allowed_tools = list(
/obj/item/weapon/weldingtool = 100,
/obj/item/weapon/gun/energy/plasmacutter = 50
/obj/item/weldingtool = 100,
/obj/item/gun/energy/plasmacutter = 50
)
min_duration = 50
@@ -131,7 +131,7 @@
if(..())
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(tool.iswelder())
var/obj/item/weapon/weldingtool/welder = tool
var/obj/item/weldingtool/welder = tool
if(!welder.isOn() || !welder.remove_fuel(1,user))
return 0
return affected && affected.open == 3 && affected.brute_dam > 0 && target_zone != "mouth"
@@ -197,8 +197,8 @@
/datum/surgery_step/robotics/fix_organ_robotic //For artificial organs
allowed_tools = list(
/obj/item/stack/nanopaste = 100,
/obj/item/weapon/bonegel = 30,
/obj/item/weapon/screwdriver = 70
/obj/item/bonegel = 30,
/obj/item/screwdriver = 70
)
min_duration = 70
@@ -317,7 +317,7 @@
/datum/surgery_step/robotics/attach_organ_robotic
allowed_tools = list(
/obj/item/weapon/screwdriver = 100
/obj/item/screwdriver = 100
)
min_duration = 100
code/modules/surgery/slimes.dm
+8 -8
View File
@@ -11,9 +11,9 @@
/datum/surgery_step/slime/cut_flesh
allowed_tools = list(
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
/obj/item/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
min_duration = 10
@@ -37,9 +37,9 @@
/datum/surgery_step/slime/cut_innards
allowed_tools = list(
/obj/item/weapon/scalpel = 100,
/obj/item/weapon/material/knife = 75,
/obj/item/weapon/material/shard = 50
/obj/item/scalpel = 100,
/obj/item/material/knife = 75,
/obj/item/material/shard = 50
)
min_duration = 20
@@ -63,8 +63,8 @@
/datum/surgery_step/slime/saw_core
allowed_tools = list(
/obj/item/weapon/circular_saw = 100, \
/obj/item/weapon/material/hatchet = 75
/obj/item/circular_saw = 100, \
/obj/item/material/hatchet = 75
)
min_duration = 35