cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes name of trait "STUNRESISTANCE" to trait "BATON_RESISTANCE", changes some descriptions (#66788)

Browse Source 
it will make a whole lot more sense when you look at the trait and see what it does, instead of assuming what it does based on its very clear name
This commit is contained in:
private-tristan
2022-05-09 10:19:52 -04:00
committed by GitHub
parent 9897ca46e0
commit 14e45f5703
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/traits.dm
+1 -1
View File
@@ -171,7 +171,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Tracks whether we're gonna be a baby alien's mummy.
#define TRAIT_XENO_HOST "xeno_host"
#define TRAIT_STUNIMMUNE "stun_immunity"
#define TRAIT_STUNRESISTANCE "stun_resistance"
#define TRAIT_BATON_RESISTANCE "baton_resistance"
/// Anti Dual-baton cooldown bypass exploit.
#define TRAIT_IWASBATONED "iwasbatoned"
#define TRAIT_SLEEPIMMUNE "sleep_immunity"
code/_globalvars/traits.dm
+1 -1
View File
@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_DISFIGURED" = TRAIT_DISFIGURED,
"TRAIT_XENO_HOST" = TRAIT_XENO_HOST,
"TRAIT_STUNIMMUNE" = TRAIT_STUNIMMUNE,
"TRAIT_STUNRESISTANCE" = TRAIT_STUNRESISTANCE,
"TRAIT_BATON_RESISTANCE" = TRAIT_BATON_RESISTANCE,
"TRAIT_IWASBATONED" = TRAIT_IWASBATONED,
"TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE,
"TRAIT_PUSHIMMUNE" = TRAIT_PUSHIMMUNE,
code/game/objects/items/melee/baton.dm
+2 -2
View File
@@ -180,7 +180,7 @@
set_batoned(target, user, cooldown)
/obj/item/melee/baton/proc/baton_effect(mob/living/target, mob/living/user, modifiers, stun_override)
var/trait_check = HAS_TRAIT(target, TRAIT_STUNRESISTANCE)
var/trait_check = HAS_TRAIT(target, TRAIT_BATON_RESISTANCE)
if(iscyborg(target))
if(!affect_cyborg)
return FALSE
@@ -571,7 +571,7 @@
/// After the initial stun period, we check to see if the target needs to have the stun applied.
/obj/item/melee/baton/security/proc/apply_stun_effect_end(mob/living/target)
var/trait_check = HAS_TRAIT(target, TRAIT_STUNRESISTANCE) //var since we check it in out to_chat as well as determine stun duration
var/trait_check = HAS_TRAIT(target, TRAIT_BATON_RESISTANCE) //var since we check it in out to_chat as well as determine stun duration
if(!target.IsKnockdown())
to_chat(target, span_warning("Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]"))
code/modules/antagonists/abductor/equipment/abduction_gear.dm
+1 -1
View File
@@ -516,7 +516,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
target.set_confusion(max(10, target.get_confusion()))
target.set_timed_status_effect(16 SECONDS, /datum/status_effect/speech/stutter, only_if_higher = TRUE)
SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
target.Paralyze(knockdown_time * (HAS_TRAIT(target, TRAIT_STUNRESISTANCE) ? 0.1 : 1))
target.Paralyze(knockdown_time * (HAS_TRAIT(target, TRAIT_BATON_RESISTANCE) ? 0.1 : 1))
if(BATON_SLEEP)
SleepAttack(target,user)
if(BATON_CUFF)
code/modules/antagonists/heretic/knowledge/blade_lore.dm
+5 -5
View File
@@ -224,7 +224,7 @@
name = "Stance of the Scarred Duelist"
desc = "Grants resilience to blood loss from wounds and immunity to having your limbs dismembered. \
Additionally, when damaged below 50% of your maximum health, \
you gain increased resistance to gaining wounds and stun resistance."
you gain increased resistance to gaining wounds and resistance to batons."
gain_text = "The Colonel was many things though out the age. But now, he is blind; he is deaf; \
he cannot be wounded; and he cannot be denied. His methods ensure that."
next_knowledge = list(
@@ -250,7 +250,7 @@
REMOVE_TRAIT(user, TRAIT_NODISMEMBER, type)
if(in_duelist_stance)
REMOVE_TRAIT(user, TRAIT_HARDLY_WOUNDED, type)
REMOVE_TRAIT(user, TRAIT_STUNRESISTANCE, type)
REMOVE_TRAIT(user, TRAIT_BATON_RESISTANCE, type)
UnregisterSignal(user, list(COMSIG_PARENT_EXAMINE, COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_HEALTH_UPDATE))
@@ -276,14 +276,14 @@
source.balloon_alert(source, "exited duelist stance")
in_duelist_stance = FALSE
REMOVE_TRAIT(source, TRAIT_HARDLY_WOUNDED, type)
REMOVE_TRAIT(source, TRAIT_STUNRESISTANCE, type)
REMOVE_TRAIT(source, TRAIT_BATON_RESISTANCE, type)
return
if(!in_duelist_stance && source.health <= source.maxHealth * 0.5)
source.balloon_alert(source, "entered duelist stance")
in_duelist_stance = TRUE
ADD_TRAIT(source, TRAIT_HARDLY_WOUNDED, type)
ADD_TRAIT(source, TRAIT_STUNRESISTANCE, type)
ADD_TRAIT(source, TRAIT_BATON_RESISTANCE, type)
return
#undef BLOOD_FLOW_PER_SEVEIRTY
@@ -369,7 +369,7 @@
. = ..()
priority_announce("[generate_heretic_text()] Master of blades, the Colonel's disciple, [user.real_name] has ascended! Their steel is that which will cut reality in a maelstom of silver! [generate_heretic_text()]","[generate_heretic_text()]", ANNOUNCER_SPANOMALIES)
user.client?.give_award(/datum/award/achievement/misc/blade_ascension, user)
ADD_TRAIT(user, TRAIT_STUNIMMUNE, name)
ADD_TRAIT(user, TRAIT_BATON_RESISTANCE, name)
ADD_TRAIT(user, TRAIT_NEVER_WOUNDED, name)
RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade)
user.apply_status_effect(/datum/status_effect/protective_blades/recharging, null, 8, 30, 0.25 SECONDS, 1 MINUTES)
code/modules/antagonists/heretic/knowledge/rust_lore.dm
+6 -6
View File
@@ -76,7 +76,7 @@
/datum/heretic_knowledge/rust_regen
name = "Leeching Walk"
desc = "Grants you passive healing and stun resistance while standing over rust."
desc = "Grants you passive healing and resistance to batons while standing over rust."
gain_text = "The speed was unparalleled, the strength unnatural. The Blacksmith was smiling."
next_knowledge = list(
/datum/heretic_knowledge/mark/rust_mark,
@@ -97,23 +97,23 @@
/*
* Signal proc for [COMSIG_MOVABLE_MOVED].
*
* Checks if we should have stun resistance on the new turf.
* Checks if we should have baton resistance on the new turf.
*/
/datum/heretic_knowledge/rust_regen/proc/on_move(mob/source, atom/old_loc, dir, forced, list/old_locs)
SIGNAL_HANDLER
var/turf/mover_turf = get_turf(source)
if(HAS_TRAIT(mover_turf, TRAIT_RUSTY))
ADD_TRAIT(source, TRAIT_STUNRESISTANCE, type)
ADD_TRAIT(source, TRAIT_BATON_RESISTANCE, type)
return
REMOVE_TRAIT(source, TRAIT_STUNRESISTANCE, type)
REMOVE_TRAIT(source, TRAIT_BATON_RESISTANCE, type)
/**
* Signal proc for [COMSIG_LIVING_LIFE].
*
* Gradually heals the heretic ([source]) on rust,
* including stuns and stamina damage.
* including baton knockdown and stamina damage.
*/
/datum/heretic_knowledge/rust_regen/proc/on_life(mob/living/source, delta_time, times_fired)
SIGNAL_HANDLER
@@ -201,7 +201,7 @@
var/area/ritual_location = /area/station/command/bridge
/// A static list of traits we give to the heretic when on rust.
var/static/list/conditional_immunities = list(
TRAIT_STUNIMMUNE,
TRAIT_BATON_RESISTANCE,
TRAIT_SLEEPIMMUNE,
TRAIT_PUSHIMMUNE,
TRAIT_SHOCKIMMUNE,
code/modules/reagents/chemistry/reagents/drug_reagents.dm
+2 -2
View File
@@ -315,10 +315,10 @@
/datum/reagent/drug/pumpup/on_mob_metabolize(mob/living/L)
..()
ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
ADD_TRAIT(L, TRAIT_BATON_RESISTANCE, type)
/datum/reagent/drug/pumpup/on_mob_end_metabolize(mob/living/L)
REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
REMOVE_TRAIT(L, TRAIT_BATON_RESISTANCE, type)
..()
/datum/reagent/drug/pumpup/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+8 -8
View File
@@ -528,7 +528,7 @@
/datum/reagent/medicine/ephedrine
name = "Ephedrine"
description = "Increases stun resistance and movement speed, giving you hand cramps. Overdose deals toxin damage and inhibits breathing."
description = "Increases resistance to batons and movement speed, giving you hand cramps. Overdose deals toxin damage and inhibits breathing."
reagent_state = LIQUID
color = "#D2FFFA"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -543,11 +543,11 @@
/datum/reagent/medicine/ephedrine/on_mob_metabolize(mob/living/L)
..()
L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
ADD_TRAIT(L, TRAIT_BATON_RESISTANCE, type)
/datum/reagent/medicine/ephedrine/on_mob_end_metabolize(mob/living/L)
L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
REMOVE_TRAIT(L, TRAIT_BATON_RESISTANCE, type)
..()
/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
@@ -1003,7 +1003,7 @@
/datum/reagent/medicine/stimulants
name = "Stimulants"
description = "Increases stun resistance and movement speed in addition to restoring minor damage and weakness. Overdose causes weakness and toxin damage."
description = "Increases resistance to batons and movement speed in addition to restoring minor damage and weakness. Overdose causes weakness and toxin damage."
color = "#78008C"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 60
@@ -1014,11 +1014,11 @@
/datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/L)
..()
L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
ADD_TRAIT(L, TRAIT_BATON_RESISTANCE, type)
/datum/reagent/medicine/stimulants/on_mob_end_metabolize(mob/living/L)
L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
REMOVE_TRAIT(L, TRAIT_BATON_RESISTANCE, type)
..()
/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
@@ -1219,13 +1219,13 @@
/datum/reagent/medicine/changelingadrenaline/on_mob_metabolize(mob/living/L)
..()
ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
ADD_TRAIT(L, TRAIT_BATON_RESISTANCE, type)
L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
/datum/reagent/medicine/changelingadrenaline/on_mob_end_metabolize(mob/living/L)
..()
REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
REMOVE_TRAIT(L, TRAIT_BATON_RESISTANCE, type)
L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
L.remove_status_effect(/datum/status_effect/dizziness)
L.Jitter(0)