From 3d7c896100d19cd5ce957a84ac2e9c37d8e36d80 Mon Sep 17 00:00:00 2001 From: keronshb Date: Tue, 15 Dec 2020 20:10:21 -0500 Subject: [PATCH] Scarp Changes and Bundle This should really fix it now. --- code/datums/martial/sleeping_carp.dm | 28 +++++++++++++++++-- .../game/objects/items/storage/uplink_kits.dm | 6 ++++ code/modules/clothing/suits/miscellaneous.dm | 2 +- .../mob/living/carbon/human/physiology.dm | 1 + .../uplink/uplink_items/uplink_bundles.dm | 9 ++++++ 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 81b7ea0628..8af80dc6b8 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -134,6 +134,28 @@ return BULLET_ACT_FORCE_PIERCE return BULLET_ACT_HIT +/datum/block_parry_data/sleeping_carp + parry_time_windup = 0 + parry_time_active = 25 + parry_time_spindown = 0 + // we want to signal to players the most dangerous phase, the time when automatic counterattack is a thing. + parry_time_windup_visual_override = 1 + parry_time_active_visual_override = 3 + parry_time_spindown_visual_override = 12 + parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK //can attack while + parry_time_perfect = 2.5 // first ds isn't perfect + parry_time_perfect_leeway = 1.5 + parry_imperfect_falloff_percent = 5 + parry_efficiency_to_counterattack = 100 + parry_efficiency_considered_successful = 65 // VERY generous + parry_efficiency_perfect = 100 + parry_failed_stagger_duration = 4 SECONDS + parry_cooldown = 0.5 SECONDS + +/mob/living/carbon/human/UseStaminaBuffer(amount, warn = FALSE, considered_action = TRUE) + amount *= physiology? physiology.stamina_buffer_mod : 1 + return ..() + /datum/martial_art/the_sleeping_carp/teach(mob/living/carbon/human/H, make_temporary = FALSE) . = ..() if(!.) @@ -144,12 +166,12 @@ ADD_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEPING_CARP_TRAIT) H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant - H.physiology.stamina_mod *= 0.5 //You take less stamina damage overall, but you do not reduce the damage from stun batons + H.physiology.stamina_mod *= 0.4 //You take less stamina damage overall, but you do not reduce the damage from stun batons as much H.physiology.stun_mod *= 0.3 //for those rare stuns H.physiology.pressure_mod *= 0.3 //go hang out with carp H.physiology.cold_mod *= 0.3 //cold mods are different to burn mods, they do stack however H.physiology.heat_mod *= 2 //this is mostly so sleeping carp has a viable weakness. Cooking them alive. Setting them on fire and heating them will be their biggest weakness. The reason for this is....filet jokes. - + H.physiology.stamina_buffer_mod *= 0.75 //to help with some stamina H.faction |= "carp" //:D /datum/martial_art/the_sleeping_carp/on_remove(mob/living/carbon/human/H) @@ -165,7 +187,7 @@ H.physiology.pressure_mod = initial(H.physiology.pressure_mod) //no more carpies H.physiology.cold_mod = initial(H.physiology.cold_mod) H.physiology.heat_mod = initial(H.physiology.heat_mod) - + H.physiology.stamina_buffer_mod = initial(H.physiology.stamina_buffer_mod) H.faction -= "carp" //:( /mob/living/carbon/human/proc/sleeping_carp_help() diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 442228ef31..97012528a0 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -520,3 +520,9 @@ new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) new /obj/item/lighter(src) +/obj/item/storage/box/syndie_kit/scarp + +/obj/item/storage/box/syndie_kit/scarp/PopulateContents() + new /obj/item/book/granter/martial/carp(src) + new /obj/item/clothing/suit/hooded/carp_costume(src) + new /obj/item/staff/bostaff(src) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 9d83752081..149f17f4d6 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -280,7 +280,7 @@ body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET cold_protection = CHEST|GROIN|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too - allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/gun/ballistic/automatic/speargun) + allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/gun/ballistic/automatic/speargun, /obj/item/staff/bostaff) hoodtype = /obj/item/clothing/head/hooded/carp_hood /obj/item/clothing/head/hooded/carp_hood diff --git a/code/modules/mob/living/carbon/human/physiology.dm b/code/modules/mob/living/carbon/human/physiology.dm index 22c197f7de..7f732df960 100644 --- a/code/modules/mob/living/carbon/human/physiology.dm +++ b/code/modules/mob/living/carbon/human/physiology.dm @@ -7,6 +7,7 @@ var/oxy_mod = 1 // % of oxygen damage taken from all sources var/clone_mod = 1 // % of clone damage taken from all sources var/stamina_mod = 1 // % of stamina damage taken from all sources + var/stamina_buffer_mod = 1 // % of stamina buffer var/brain_mod = 1 // % of brain damage taken from all sources var/pressure_mod = 1 // % of brute damage taken from low or high pressure (stacks with brute_mod) diff --git a/code/modules/uplink/uplink_items/uplink_bundles.dm b/code/modules/uplink/uplink_items/uplink_bundles.dm index 1b7909a50d..d01c3ae96a 100644 --- a/code/modules/uplink/uplink_items/uplink_bundles.dm +++ b/code/modules/uplink/uplink_items/uplink_bundles.dm @@ -52,6 +52,15 @@ cost = 20 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs) +/datum/uplink_item/bundles_TC/scarp_bundle + name = "Sleeping Carp Bundle" + desc = "Become one with your inner carp! Your ancient fish masters leave behind their legacy, and bestow to you their teachings, sacred uniform, and staff. \ + Please be aware that you will not be able to use dishonerable ranged weapons." + item = /obj/item/storage/box/syndie_kit/scarp + cost = 20 + player_minimum = 20 + exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs) + /datum/uplink_item/suits/infiltrator_bundle name = "Insidious Infiltration Gear Case" desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \