From 1e7575afde38bdc4e1ae7fb891a8ef9e53d24900 Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Sat, 30 Sep 2017 15:36:32 +0200 Subject: [PATCH] Adjusted ghetto surgery tool chances to keep ghetto surgery chances overall roughly equal. Also added rigsuit removal to list of surgeries that don't care about pain. --- code/modules/surgery/bones.dm | 8 +++--- code/modules/surgery/cavity_implant.dm | 10 ++++---- code/modules/surgery/encased.dm | 8 +++--- code/modules/surgery/face.dm | 18 ++++++------- code/modules/surgery/generic.dm | 30 +++++++++++----------- code/modules/surgery/limb_reattach.dm | 4 +-- code/modules/surgery/organs_internal.dm | 34 ++++++++++++------------- code/modules/surgery/other.dm | 18 ++++++------- code/modules/surgery/slime.dm | 10 ++++---- code/modules/surgery/surgery.dm | 2 +- 10 files changed, 71 insertions(+), 71 deletions(-) diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index a7aaa538eed..80ae04dfaaf 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -34,7 +34,7 @@ allowed_tools = list( /obj/item/weapon/bonegel = 100, \ - /obj/item/weapon/screwdriver = 75 + /obj/item/weapon/screwdriver = 90 ) can_infect = 1 blood_level = 1 @@ -70,7 +70,7 @@ allowed_tools = list( /obj/item/weapon/bonesetter = 100, \ - /obj/item/weapon/wrench = 75 \ + /obj/item/weapon/wrench = 90 \ ) time = 32 @@ -109,7 +109,7 @@ allowed_tools = list( /obj/item/weapon/bonesetter = 100, \ - /obj/item/weapon/wrench = 75 \ + /obj/item/weapon/wrench = 90 \ ) time = 32 @@ -144,7 +144,7 @@ allowed_tools = list( /obj/item/weapon/bonegel = 100, \ - /obj/item/weapon/screwdriver = 75 + /obj/item/weapon/screwdriver = 90 ) can_infect = 1 blood_level = 1 diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index 6670b6b0c87..269980346a8 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -68,8 +68,8 @@ name = "make cavity space" allowed_tools = list( /obj/item/weapon/surgicaldrill = 100, \ - /obj/item/weapon/pen = 75, \ - /obj/item/stack/rods = 50 + /obj/item/weapon/pen = 90, \ + /obj/item/stack/rods = 60 ) time = 54 @@ -93,9 +93,9 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser = 100, \ /obj/item/weapon/cautery = 100, \ - /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ - /obj/item/weapon/weldingtool = 25 + /obj/item/clothing/mask/cigarette = 90, \ + /obj/item/weapon/lighter = 60, \ + /obj/item/weapon/weldingtool = 30 ) time = 24 diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index 4d46bb69d75..decc2d05c19 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -25,7 +25,7 @@ allowed_tools = list( /obj/item/weapon/circular_saw = 100, \ /obj/item/weapon/melee/energy/sword/cyborg/saw = 100, \ - /obj/item/weapon/hatchet = 75 + /obj/item/weapon/hatchet = 90 ) time = 54 @@ -72,7 +72,7 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ - /obj/item/weapon/crowbar = 75 + /obj/item/weapon/crowbar = 90 ) time = 24 @@ -123,7 +123,7 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ - /obj/item/weapon/crowbar = 75 + /obj/item/weapon/crowbar = 90 ) time = 24 @@ -173,7 +173,7 @@ name = "mend bone" allowed_tools = list( /obj/item/weapon/bonegel = 100, \ - /obj/item/weapon/screwdriver = 75 + /obj/item/weapon/screwdriver = 90 ) time = 24 diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index b5c2bfa013c..7f3d49c6045 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -29,8 +29,8 @@ name = "make incision" allowed_tools = list( /obj/item/weapon/scalpel = 100, \ - /obj/item/weapon/kitchen/knife = 75, \ - /obj/item/weapon/shard = 50, \ + /obj/item/weapon/kitchen/knife = 90, \ + /obj/item/weapon/shard = 60, \ ) time = 16 @@ -60,8 +60,8 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/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. + /obj/item/stack/cable_coil = 90, \ + /obj/item/device/assembly/mousetrap = 12 //I don't know. Don't ask me. But I'm leaving it because hilarity. ) time = 24 @@ -87,8 +87,8 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ - /obj/item/weapon/crowbar = 55, \ - /obj/item/weapon/kitchen/utensil/fork = 75) + /obj/item/weapon/crowbar = 65, \ + /obj/item/weapon/kitchen/utensil/fork = 90) time = 64 @@ -114,9 +114,9 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser = 100, \ /obj/item/weapon/cautery = 100, \ - /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ - /obj/item/weapon/weldingtool = 25 + /obj/item/clothing/mask/cigarette = 90, \ + /obj/item/weapon/lighter = 60, \ + /obj/item/weapon/weldingtool = 30 ) time = 24 diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 52c2c89ff0a..e07fd0c4725 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -22,13 +22,13 @@ allowed_tools = list( /obj/item/weapon/scalpel = 100, \ - /obj/item/weapon/kitchen/knife = 75, \ - /obj/item/weapon/shard = 50, \ - /obj/item/weapon/scissors = 10, \ + /obj/item/weapon/kitchen/knife = 90, \ + /obj/item/weapon/shard = 60, \ + /obj/item/weapon/scissors = 12, \ /obj/item/weapon/twohanded/chainsaw = 1, \ - /obj/item/weapon/claymore = 5, \ - /obj/item/weapon/melee/energy/ = 5, \ - /obj/item/weapon/pen/edagger = 5, \ + /obj/item/weapon/claymore = 6, \ + /obj/item/weapon/melee/energy/ = 6, \ + /obj/item/weapon/pen/edagger = 6, \ ) time = 16 @@ -60,8 +60,8 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser = 100, \ /obj/item/weapon/hemostat = 100, \ - /obj/item/stack/cable_coil = 75, \ - /obj/item/device/assembly/mousetrap = 20 + /obj/item/stack/cable_coil = 90, \ + /obj/item/device/assembly/mousetrap = 25 ) time = 24 @@ -94,8 +94,8 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ - /obj/item/weapon/crowbar = 75, \ - /obj/item/weapon/kitchen/utensil/fork = 50 + /obj/item/weapon/crowbar = 90, \ + /obj/item/weapon/kitchen/utensil/fork = 60 ) time = 24 @@ -149,9 +149,9 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser = 100, \ /obj/item/weapon/cautery = 100, \ - /obj/item/clothing/mask/cigarette = 75, \ - /obj/item/weapon/lighter = 50, \ - /obj/item/weapon/weldingtool = 25 + /obj/item/clothing/mask/cigarette = 90, \ + /obj/item/weapon/lighter = 60, \ + /obj/item/weapon/weldingtool = 30 ) time = 24 @@ -199,8 +199,8 @@ allowed_tools = list( /obj/item/weapon/circular_saw = 100, \ /obj/item/weapon/melee/energy/sword/cyborg/saw = 100, \ - /obj/item/weapon/hatchet = 75, \ - /obj/item/weapon/melee/arm_blade = 60 + /obj/item/weapon/hatchet = 90, \ + /obj/item/weapon/melee/arm_blade = 75 ) time = 100 diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index a24145055f0..867c6ed896a 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -171,8 +171,8 @@ name = "connect limb" allowed_tools = list( /obj/item/weapon/hemostat = 100, \ - /obj/item/stack/cable_coil = 75, \ - /obj/item/device/assembly/mousetrap = 20 + /obj/item/stack/cable_coil = 90, \ + /obj/item/device/assembly/mousetrap = 25 ) can_infect = 1 diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index ea6f293c7d2..0b3ac65974d 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -68,17 +68,17 @@ /datum/surgery_step/internal/manipulate_organs name = "manipulate organs" allowed_tools = list(/obj/item/organ/internal = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0) - var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/kitchen/utensil/fork = 55) + var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/kitchen/utensil/fork = 70) var/implements_mend = list(/obj/item/stack/medical/bruise_pack = 20,/obj/item/stack/medical/bruise_pack/advanced = 100,/obj/item/stack/nanopaste = 100) var/implements_clean = list(/obj/item/weapon/reagent_containers/dropper = 100, - /obj/item/weapon/reagent_containers/glass/bottle = 75, - /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 70, - /obj/item/weapon/reagent_containers/food/drinks/bottle = 65, - /obj/item/weapon/reagent_containers/glass/beaker = 60, - /obj/item/weapon/reagent_containers/spray = 50, - /obj/item/weapon/reagent_containers/glass/bucket = 40) + /obj/item/weapon/reagent_containers/glass/bottle = 90, + /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 85, + /obj/item/weapon/reagent_containers/food/drinks/bottle = 80, + /obj/item/weapon/reagent_containers/glass/beaker = 75, + /obj/item/weapon/reagent_containers/spray = 60, + /obj/item/weapon/reagent_containers/glass/bucket = 50) //Finish is just so you can close up after you do other things. - var/implements_finsh = list(/obj/item/weapon/scalpel/laser/manager = 100,/obj/item/weapon/retractor = 100 ,/obj/item/weapon/crowbar = 75) + var/implements_finsh = list(/obj/item/weapon/scalpel/laser/manager = 100,/obj/item/weapon/retractor = 100 ,/obj/item/weapon/crowbar = 90) var/current_type var/obj/item/organ/internal/I = null var/obj/item/organ/external/affected = null @@ -436,7 +436,7 @@ allowed_tools = list( /obj/item/weapon/circular_saw = 100, \ /obj/item/weapon/melee/energy/sword/cyborg/saw = 100, \ - /obj/item/weapon/hatchet = 75 + /obj/item/weapon/hatchet = 90 ) time = 54 @@ -464,13 +464,13 @@ name = "cut carapace" allowed_tools = list( /obj/item/weapon/scalpel = 100, \ - /obj/item/weapon/kitchen/knife = 75, \ - /obj/item/weapon/shard = 50, \ - /obj/item/weapon/scissors = 10, \ + /obj/item/weapon/kitchen/knife = 90, \ + /obj/item/weapon/shard = 60, \ + /obj/item/weapon/scissors = 12, \ /obj/item/weapon/twohanded/chainsaw = 1, \ - /obj/item/weapon/claymore = 5, \ - /obj/item/weapon/melee/energy/ = 5, \ - /obj/item/weapon/pen/edagger = 5, \ + /obj/item/weapon/claymore = 6, \ + /obj/item/weapon/melee/energy/ = 6, \ + /obj/item/weapon/pen/edagger = 6, \ ) time = 16 @@ -499,8 +499,8 @@ allowed_tools = list( /obj/item/weapon/scalpel/laser/manager = 100, \ /obj/item/weapon/retractor = 100, \ - /obj/item/weapon/crowbar = 75, \ - /obj/item/weapon/kitchen/utensil/fork = 50 + /obj/item/weapon/crowbar = 90, \ + /obj/item/weapon/kitchen/utensil/fork = 60 ) time = 24 diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index b4272364578..233b6f56a33 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -62,7 +62,7 @@ name = "mend internal bleeding" allowed_tools = list( /obj/item/weapon/FixOVein = 100, \ - /obj/item/stack/cable_coil = 75 + /obj/item/stack/cable_coil = 90 ) can_infect = 1 blood_level = 1 @@ -107,8 +107,8 @@ name = "remove dead tissue" allowed_tools = list( /obj/item/weapon/scalpel = 100, \ - /obj/item/weapon/kitchen/knife = 75, \ - /obj/item/weapon/shard = 50, \ + /obj/item/weapon/kitchen/knife = 90, \ + /obj/item/weapon/shard = 60, \ ) can_infect = 1 @@ -156,12 +156,12 @@ name = "treat necrosis" allowed_tools = list( /obj/item/weapon/reagent_containers/dropper = 100, - /obj/item/weapon/reagent_containers/glass/bottle = 75, - /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 70, - /obj/item/weapon/reagent_containers/food/drinks/bottle = 65, - /obj/item/weapon/reagent_containers/glass/beaker = 60, - /obj/item/weapon/reagent_containers/spray = 50, - /obj/item/weapon/reagent_containers/glass/bucket = 40 + /obj/item/weapon/reagent_containers/glass/bottle = 90, + /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 85, + /obj/item/weapon/reagent_containers/food/drinks/bottle = 80, + /obj/item/weapon/reagent_containers/glass/beaker = 75, + /obj/item/weapon/reagent_containers/spray = 60, + /obj/item/weapon/reagent_containers/glass/bucket = 50 ) can_infect = 0 diff --git a/code/modules/surgery/slime.dm b/code/modules/surgery/slime.dm index 6552d4f21d2..99b58a01a80 100644 --- a/code/modules/surgery/slime.dm +++ b/code/modules/surgery/slime.dm @@ -18,8 +18,8 @@ /datum/surgery_step/slime/cut_flesh allowed_tools = list( /obj/item/weapon/scalpel = 100, \ - /obj/item/weapon/kitchen/knife = 75, \ - /obj/item/weapon/shard = 50, \ + /obj/item/weapon/kitchen/knife = 90, \ + /obj/item/weapon/shard = 60, \ ) time = 16 @@ -46,8 +46,8 @@ /datum/surgery_step/slime/cut_innards allowed_tools = list( /obj/item/weapon/scalpel = 100, \ - /obj/item/weapon/kitchen/knife = 75, \ - /obj/item/weapon/shard = 50, \ + /obj/item/weapon/kitchen/knife = 90, \ + /obj/item/weapon/shard = 60, \ ) time = 16 @@ -73,7 +73,7 @@ /datum/surgery_step/slime/saw_core allowed_tools = list( /obj/item/weapon/circular_saw = 100, \ - /obj/item/weapon/hatchet = 75 + /obj/item/weapon/hatchet = 90 ) time = 16 diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 1d836259cbe..f5d49f100d2 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -117,7 +117,7 @@ prob_chance *= get_location_modifier(target) - if(!ispath(surgery.steps[surgery.status], /datum/surgery_step/robotics))//Repairing robotic limbs doesn't hurt + if(!ispath(surgery.steps[surgery.status], /datum/surgery_step/robotics) && !ispath(surgery.steps[surgery.status], /datum/surgery_step/rigsuit))//Repairing robotic limbs doesn't hurt, and neither does cutting someone out of a rig if(ishuman(target)) var/mob/living/carbon/human/H = target //typecast to human prob_chance *= get_pain_modifier(H)//operating on conscious people is hard.