Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sentinel buffs #7197

Merged
merged 13 commits into from
Nov 2, 2024
Merged

Sentinel buffs #7197

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
19cc26d
Neuro scatter.dm
GoldenDarkness55 Sep 22, 2024
48a800a
hibernate sentinel_abilities.dm
GoldenDarkness55 Sep 22, 2024
ad3fda7
hibernate sentinel_macros.dm
GoldenDarkness55 Sep 22, 2024
bd87da8
hibernate sentinel_powers.dm
GoldenDarkness55 Sep 22, 2024
ead0771
paralyzing slash Sentinel.dm
GoldenDarkness55 Sep 22, 2024
20e6b9d
sent neuro slow xeno.dm
GoldenDarkness55 Sep 22, 2024
8808093
sent neuro superslow xeno.dm
GoldenDarkness55 Sep 22, 2024
180a06f
sent spit slow xeno.dm
GoldenDarkness55 Sep 22, 2024
38a697d
Update sentinel_abilities.dm
GoldenDarkness55 Nov 1, 2024
14dc218
Update sentinel_macros.dm
GoldenDarkness55 Nov 1, 2024
42254b1
Update sentinel_powers.dm
GoldenDarkness55 Nov 1, 2024
2a5934a
Update Sentinel.dm
GoldenDarkness55 Nov 1, 2024
8e65168
speed Sentinel.dm
GoldenDarkness55 Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/__DEFINES/weapon_stats.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ It DOES NOT control where your bullets go, that's scatter and projectile varianc
////SCATTER////
*/

#define SCATTER_AMOUNT_NEURO 60
#define SCATTER_AMOUNT_NEURO 45
#define SCATTER_AMOUNT_TIER_1 15
#define SCATTER_AMOUNT_TIER_2 10
#define SCATTER_AMOUNT_TIER_3 8
Expand Down
2 changes: 1 addition & 1 deletion code/datums/ammo/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
return

if(ishuman(M))
M.apply_effect(2.5, SUPERSLOW)
M.apply_effect(4, SUPERSLOW)
M.visible_message(SPAN_DANGER("[M]'s movements are slowed."))

var/no_clothes_neuro = FALSE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
macro_path = /datum/action/xeno_action/verb/verb_slowing_spit
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
xeno_cooldown = 1.5 SECONDS
xeno_cooldown = 2 SECONDS
plasma_cost = 20

// Scatterspit
Expand All @@ -17,7 +17,7 @@
macro_path = /datum/action/xeno_action/verb/verb_scattered_spit
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
xeno_cooldown = 8 SECONDS
xeno_cooldown = 6 SECONDS
plasma_cost = 30

// Paralyzing slash
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_1
armor_deflection = XENO_NO_ARMOR
evasion = XENO_EVASION_NONE
speed = XENO_SPEED_TIER_7
speed = XENO_SPEED_HELLHOUND

caste_desc = "A weak ranged combat alien."
evolves_to = list(XENO_CASTE_SPITTER)
Expand Down Expand Up @@ -68,7 +68,7 @@
// State
var/next_slash_buffed = FALSE

#define NEURO_TOUCH_DELAY 4 SECONDS
#define NEURO_TOUCH_DELAY 3 SECONDS

/datum/behavior_delegate/sentinel_base/melee_attack_modify_damage(original_damage, mob/living/carbon/carbon_target)
if (!next_slash_buffed)
Expand Down Expand Up @@ -103,6 +103,6 @@
#undef NEURO_TOUCH_DELAY

/datum/behavior_delegate/sentinel_base/proc/paralyzing_slash(mob/living/carbon/human/human_target)
human_target.KnockDown(2)
human_target.Stun(2)
human_target.KnockDown(2.5)
human_target.Stun(2.5)
to_chat(human_target, SPAN_XENOHIGHDANGER("You fall over, paralyzed by the toxin!"))
Loading