From 8710731b870287b75a3f134fccc7ffed30a4ed6b Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 1 Jul 2021 20:42:55 -0700 Subject: [PATCH] tweaks --- code/game/machinery/cloning.dm | 2 +- code/game/objects/effects/anomalies.dm | 2 +- code/game/objects/items/defib.dm | 2 +- code/game/objects/items/devices/paicard.dm | 2 +- code/game/objects/items/melee/misc.dm | 18 +++++++++++------- .../chemistry/reagents/medicine_reagents.dm | 2 +- code/modules/surgery/advanced/revival.dm | 2 +- code/modules/surgery/emergency_reboot.dm | 2 +- code/modules/surgery/organs/vocal_cords.dm | 7 +++++-- code/modules/vehicles/atv.dm | 2 +- .../reagents/chemistry/reagents/SDGF.dm | 4 ++-- 11 files changed, 26 insertions(+), 19 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index e95543cffb..30bc5f4ccf 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -384,7 +384,7 @@ to_chat(occupant, "There is a bright flash!
You feel like a new being.") mob_occupant.flash_act() - var/list/policies = CONFIG_GET(keyed_list/policyconfig) + var/list/policies = CONFIG_GET(keyed_list/policy) var/policy = policies[POLICYCONFIG_ON_CLONE] if(policy) to_chat(occupant, policy) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 8f8b83bfde..66579c90f3 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -296,7 +296,7 @@ var/mob/C = pick(candidates) message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(S)])") C.transfer_ckey(S, FALSE) - var/list/policies = CONFIG_GET(keyed_list/policyconfig) + var/list/policies = CONFIG_GET(keyed_list/policy) var/policy = policies[POLICYCONFIG_ON_PYROCLASTIC_SENTIENT] if(policy) to_chat(S,policy) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index c601624072..ee65bd5c96 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -620,7 +620,7 @@ if(req_defib) if(defib.healdisk) H.heal_overall_damage(25, 25) - var/list/policies = CONFIG_GET(keyed_list/policyconfig) + var/list/policies = CONFIG_GET(keyed_list/policy) var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) * 10 //the config is in seconds, not deciseconds var/late = timelimit && (tplus > timelimit) var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT] diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index e7a9d51ebe..d54911528d 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -122,7 +122,7 @@ /obj/item/paicard/proc/setPersonality(mob/living/silicon/pai/personality) src.pai = personality src.add_overlay("pai-null") - var/list/policies = CONFIG_GET(keyed_list/policyconfig) + var/list/policies = CONFIG_GET(keyed_list/policy) var/policy = policies[POLICYCONFIG_PAI] if(policy) to_chat(personality, policy) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 8a9b6a5235..1238938cc6 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -73,14 +73,14 @@ /datum/block_parry_data/captain_saber parry_time_windup = 0 - parry_time_active = 6 + parry_time_active = 10 parry_time_spindown = 0 parry_time_perfect = 0.75 - parry_time_perfect_leeway = 0.75 + parry_time_perfect_leeway = 1.5 parry_imperfect_falloff_percent = 30 parry_efficiency_perfect = 100 parry_failed_stagger_duration = 3 SECONDS - parry_failed_clickcd_duration = 1 SECONDS + parry_failed_clickcd_duration = 0 parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK parry_automatic_enabled = TRUE @@ -179,19 +179,23 @@ // Fast, efficient parry. /datum/block_parry_data/traitor_rapier parry_time_windup = 0 - parry_time_active = 6 + parry_time_active = 10 parry_time_spindown = 0 parry_time_active_visual_override = 3 parry_time_spindown_visual_override = 2 parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING - parry_time_perfect = 1 - parry_time_perfect_leeway = 1 + parry_time_perfect = 2 + parry_time_perfect_leeway = 2 parry_time_perfect_leeway_override = list( TEXT_ATTACK_TYPE_PROJECTILE = 1 ) parry_imperfect_falloff_percent = 30 - parry_efficiency_to_counterattack = INFINITY + parry_efficiency_to_counterattack = 100 parry_efficiency_considered_successful = 1 + parry_data = list( + PARRY_KNOCKDOWN_ATTACKER = 10, + PARRY_DISARM_ATTACKER = TRUE + ) parry_efficiency_perfect = 100 parry_stamina_cost = 5 parry_failed_stagger_duration = 2 SECONDS diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 71bc6ae607..fe843fff36 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1002,7 +1002,7 @@ M.grab_ghost() M.emote("gasp") log_combat(M, M, "revived", src) - var/list/policies = CONFIG_GET(keyed_list/policyconfig) + var/list/policies = CONFIG_GET(keyed_list/policy) var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) * 10 //the config is in seconds, not deciseconds var/late = timelimit && (tplus > timelimit) var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT] diff --git a/code/modules/surgery/advanced/revival.dm b/code/modules/surgery/advanced/revival.dm index 0b864958a0..a8d7deb803 100644 --- a/code/modules/surgery/advanced/revival.dm +++ b/code/modules/surgery/advanced/revival.dm @@ -69,7 +69,7 @@ for(var/obj/item/organ/O in target.internal_organs)//zap those buggers back to life! if(O.organ_flags & ORGAN_FAILING) O.applyOrganDamage(-5) - var/list/policies = CONFIG_GET(keyed_list/policyconfig) + var/list/policies = CONFIG_GET(keyed_list/policy) var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) * 10 //the config is in seconds, not deciseconds var/late = timelimit && (tplus > timelimit) var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT] diff --git a/code/modules/surgery/emergency_reboot.dm b/code/modules/surgery/emergency_reboot.dm index 046edd884c..5023480b51 100644 --- a/code/modules/surgery/emergency_reboot.dm +++ b/code/modules/surgery/emergency_reboot.dm @@ -42,7 +42,7 @@ if(target.revive()) target.visible_message("...[target]'s posibrain flickers to life once again!") target.emote("ping") - var/list/policies = CONFIG_GET(keyed_list/policyconfig) + var/list/policies = CONFIG_GET(keyed_list/policy) var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) * 10 //the config is in seconds, not deciseconds var/late = timelimit && (tplus > timelimit) var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT] diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index a39d051b4d..e41980cdd3 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -164,6 +164,7 @@ //Try to check if the speaker specified a name or a job to focus on var/list/specific_listeners = list() var/found_string = null + var/devil_target = FALSE //Get the proper job titles message = get_full_job_name(message) @@ -177,7 +178,7 @@ if(devilinfo && findtext(message, devilinfo.truename)) var/start = findtext(message, devilinfo.truename) listeners = list(L) //Devil names are unique. - power_multiplier *= 5 //if you're a devil and god himself addressed you, you fucked up + devil_target = TRUE //if you're a devil and god himself addressed you, you fucked up //Cut out the name so it doesn't trigger commands message = copytext(message, 1, start) + copytext(message, start + length(devilinfo.truename)) break @@ -198,6 +199,8 @@ var/power_multiplier = get_vog_multiplier(user, base_multiplier, specific_listeners) var/adminbus = power_multiplier > VOG_MAX_STANDARD_POWER // an admin is being a dunce, bypass hard scaling limits on this message + if(devil_target) + power_multiplier = max(power_multiplier, 5) if(specific_listeners.len) message = copytext(message, length(found_string) + 1) @@ -304,7 +307,7 @@ cooldown = COOLDOWN_DAMAGE for(var/V in listeners) var/mob/living/L = V - L.apply_damage(min(20 * power_multiplier, adminbus? INFINTIY : VOG_MAX_BURST_DAMAGE), def_zone = BODY_ZONE_CHEST, wound_bonus = CANT_WOUND) + L.apply_damage(min(20 * power_multiplier, adminbus? INFINITY : VOG_MAX_BURST_DAMAGE), def_zone = BODY_ZONE_CHEST, wound_bonus = CANT_WOUND) //BLEED else if((findtext(message, bleed_words))) diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index d125453e5a..d5ddfe63cc 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -9,7 +9,7 @@ /obj/vehicle/ridden/atv/Initialize() . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.vehicle_move_delay = 1 + D.vehicle_move_delay = CONFIG_GET(number/movedelay/run_delay) D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(0, 4), TEXT_WEST = list( 0, 4))) D.set_vehicle_dir_layer(SOUTH, ABOVE_MOB_LAYER) D.set_vehicle_dir_layer(NORTH, OBJ_LAYER) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm index 60c009bc29..043d9e5603 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm @@ -109,7 +109,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING ZI.Insert(SM) log_reagent("FERMICHEM: [M] ckey: [M.key]'s zombie_infection has been transferred to their clone") - var/list/policies = CONFIG_GET(keyed_list/policyconfig) + var/list/policies = CONFIG_GET(keyed_list/policy) var/policy = policies[POLICYCONFIG_SDGF] if(policy) to_chat(SM,policy) @@ -127,7 +127,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING else to_chat(SM, "While you find your newfound existence strange, you share the same memories as [M.real_name]. However, You find yourself indifferent to the goals you previously had, and take more interest in your newfound independence, but still have an indescribable care for the safety of your original.") log_reagent("FERMICHEM: [SM] ckey: [SM.key]'s is not bound by [M] ckey [M.key]'s will, and is free to determine their own goals, while respecting and acting as their origin.") - + to_chat(SM, "You feel a strange sensation building in your mind as you realise there's two of you. Before you get a chance to think about it, you suddenly split from your old body, and find yourself face to face with your original, a perfect clone of your origin.") SM.client?.change_view(CONFIG_GET(string/default_view)) to_chat(M, "You feel a strange sensation building in your mind as you realise there's two of you. Before you get a chance to think about it, a mass splits from you, and find yourself face to face with yourself.")