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.

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

Abomination rework and predator plasma rifle buff. #5432

Merged
merged 88 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
0a8d8dd
firsts
Jan 2, 2024
351b275
yea
Jan 2, 2024
7dbe14b
predalien stuff
Jan 12, 2024
5ebdac4
Merge branch 'master' into predandpredalienstuff
Red-byte3D Jan 12, 2024
a41e142
yautja weapons
Jan 12, 2024
b536b00
Merge branch 'predandpredalienstuff' of https://github.com/InsaneRed/…
Jan 12, 2024
67760b2
balloon
Jan 12, 2024
f172b5f
sound and plasma
Jan 12, 2024
5d51568
text
Jan 12, 2024
50cc99b
signal removal
Jan 12, 2024
d08bb24
requested
Jan 12, 2024
dfe67b0
forgo(r)
Jan 12, 2024
cbb056d
moreq reuests
Jan 12, 2024
55d6e10
Merge branch 'master' into predandpredalienstuff
Red-byte3D Jan 12, 2024
fc11264
removes can use
Jan 12, 2024
70aaf04
Merge branch 'predandpredalienstuff' of https://github.com/InsaneRed/…
Jan 12, 2024
12cdff6
Merge branch 'master' into predandpredalienstuff
Red-byte3D Jan 13, 2024
2a3bc9d
Merge branch 'master' into predandpredalienstuff
Red-byte3D Jan 13, 2024
33ab8dd
Update code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm
Red-byte3D Jan 14, 2024
3915f51
Update code/__DEFINES/xeno.dm
Red-byte3D Jan 14, 2024
d4d75f4
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Jan 14, 2024
5f6966e
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Jan 14, 2024
88c3597
Merge branch 'master' into predandpredalienstuff
Red-byte3D Jan 14, 2024
dffd517
hitreg
Jan 14, 2024
1ea2c5e
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Jan 14, 2024
a2ff385
macros
Jan 14, 2024
f0a8b61
Merge branch 'predandpredalienstuff' of https://github.com/InsaneRed/…
Jan 14, 2024
328f09f
requests
Jan 14, 2024
f917c41
Merge branch 'master' into predandpredalienstuff
Red-byte3D Jan 14, 2024
b0bd12d
Merge branch 'master' into predandpredalienstuff
Red-byte3D Jan 15, 2024
54f81aa
removes screenshake
Jan 23, 2024
fdb94c8
on shift clcik kill counter
Jan 23, 2024
84a1ad0
Merge branch 'predandpredalienstuff' of https://github.com/InsaneRed/…
Jan 23, 2024
2aa8021
sharp claws
Jan 23, 2024
2296232
Merge branch 'master' into predandpredalienstuff
Red-byte3D Jan 23, 2024
4bf6b79
clawfix
Jan 23, 2024
bd0d53f
Merge branch 'predandpredalienstuff' of https://github.com/InsaneRed/…
Jan 23, 2024
2245ddf
tailstab, armor delay, and flags
Jan 29, 2024
49c3665
deletes an unused gib var
Jan 29, 2024
e93bc71
feral samsh
Feb 5, 2024
3d797e7
feral smash
Feb 5, 2024
0bbe85f
fix
Feb 5, 2024
351b726
tehee(fix)
Feb 5, 2024
8294963
tailstab removal
Feb 5, 2024
a3d92f5
line del
Feb 5, 2024
fbe0edc
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 10, 2024
e021f82
line undel
Feb 10, 2024
5a0dc98
requested changes more
Feb 10, 2024
718a2d1
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 10, 2024
3fb9c49
more changes
Feb 10, 2024
4777b2b
Merge branch 'predandpredalienstuff' of https://github.com/InsaneRed/…
Feb 10, 2024
34edbb6
more changes
Feb 10, 2024
667a736
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 15, 2024
8c45ebd
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 15, 2024
b519ccf
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 15, 2024
c766fe5
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 15, 2024
8e2df1b
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 15, 2024
1df5564
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 15, 2024
1d83003
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 15, 2024
952b310
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 15, 2024
fc4c6b1
requested change bulk
Feb 15, 2024
6d84253
Merge branch 'predandpredalienstuff' of https://github.com/InsaneRed/…
Feb 15, 2024
0e80c57
fix
Feb 15, 2024
ca37ff6
small text change
Feb 15, 2024
11a0ca5
text changes
Feb 15, 2024
4f50dd0
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 16, 2024
286b65d
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 16, 2024
993f8a9
Update code/modules/mob/living/carbon/xenomorph/abilities/predalien/p…
Red-byte3D Feb 16, 2024
21371bb
morefixes
Feb 16, 2024
cd56227
Merge branch 'predandpredalienstuff' of https://github.com/InsaneRed/…
Feb 16, 2024
98e3386
I HAET GITHUB
Feb 16, 2024
9a5b3c7
more changes for real this time
Feb 16, 2024
13ade73
bulk
Red-byte3D Feb 17, 2024
ef170da
changes
Feb 17, 2024
3ded03a
requested changes part 2
Feb 17, 2024
c9ad2e9
targetting to targeting
Feb 17, 2024
360f84a
targetting to targeting verb
Feb 17, 2024
b92039d
macro
Feb 17, 2024
9362e1b
small grammar msitake
Feb 17, 2024
9ea54fb
if moved back also spaces removed
Feb 17, 2024
74defa0
force.move removed, commits fixed
Feb 17, 2024
666cbd3
visiblility and comment
Feb 17, 2024
16878e7
!isliving check
Feb 18, 2024
fe6c7f3
fix from last co
Feb 18, 2024
a7a2e82
im slowly losing it
Feb 18, 2024
d7dc62b
faster activation delay and comments
Feb 20, 2024
d8872db
resist speed
Feb 20, 2024
090f727
target fix / girder fix
Feb 20, 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
3 changes: 3 additions & 0 deletions code/__DEFINES/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@

#define ACID_SPRAY_LINE 0
#define ACID_SPRAY_CONE 1
/// Defines for Abomination ability /datum/action/xeno_action/activable/feralfrenzy
#define SINGLETARGETGUT 0
#define AOETARGETGUT 1
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved

#define WARDEN_HEAL_SHIELD 0
#define WARDEN_HEAL_HP 1
Expand Down
7 changes: 7 additions & 0 deletions code/datums/ammo/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,10 @@
var/mob/living/carbon/xenomorph/xeno = hit_mob
xeno.apply_damage(damage * 0.75, BURN)
xeno.interference = 30

/datum/ammo/energy/yautja/rifle/bolt/set_bullet_traits()
. = ..()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary)
))

2 changes: 1 addition & 1 deletion code/modules/cm_preds/yaut_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@

/obj/item/weapon/gun/energy/yautja/plasmarifle/set_gun_config_values()
..()
set_fire_delay(FIRE_DELAY_TIER_6*2)
set_fire_delay(FIRE_DELAY_TIER_4*2)
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_10
accuracy_mult_unwielded = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_10
scatter = SCATTER_AMOUNT_TIER_6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,52 +1,76 @@
/datum/action/xeno_action/activable/pounce/predalien
name = "Leap"

/datum/action/xeno_action/onclick/feralrush
name = "Feral Rush"
action_icon_state = "charge_spit"
ability_name = "toughen up"
macro_path = /datum/action/xeno_action/verb/verb_feralrush
ability_primacy = XENO_PRIMARY_ACTION_1
action_type = XENO_ACTION_ACTIVATE
xeno_cooldown = 12 SECONDS

// Config
var/speed_duration = 3 SECONDS
var/armor_duration = 6 SECONDS
var/speed_buff_amount = 0.8 // Go from shit slow to kindafast
var/armor_buff_amount = 10 // hopefully-minor buff so they can close the distance

knockdown = FALSE
var/speed_buff = FALSE
var/armor_buff = FALSE

distance = 5
knockdown = FALSE // Should we knock down the target?
slash = FALSE // Do we slash upon reception?
freeze_self = FALSE // Should we freeze ourselves after the lunge?
should_destroy_objects = TRUE // Only used for ravager charge

/datum/action/xeno_action/onclick/predalien_roar
name = "Roar"
action_icon_state = "screech"
ability_name = "roar"
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
macro_path = /datum/action/xeno_action/verb/verb_predalien_roar
xeno_cooldown = 25 SECONDS
plasma_cost = 50

var/predalien_roar = list("sound/voice/predalien_roar.ogg")
var/bonus_damage_scale = 2.5
var/bonus_speed_scale = 0.05

Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
/datum/action/xeno_action/onclick/smash
name = "Smash"
action_icon_state = "stomp"
ability_name = "smash"
/datum/action/xeno_action/activable/feral_smash
name = "Feral Smash"
ability_name = "Feral Smash"
action_icon_state = "lunge"
action_type = XENO_ACTION_CLICK
macro_path = /datum/action/xeno_action/verb/feral_smash
ability_primacy = XENO_PRIMARY_ACTION_3
xeno_cooldown = 20 SECONDS
plasma_cost = 80

var/freeze_duration = 1.5 SECONDS

var/activation_delay = 1 SECONDS
var/smash_sounds = list('sound/effects/alien_footstep_charge1.ogg', 'sound/effects/alien_footstep_charge2.ogg', 'sound/effects/alien_footstep_charge3.ogg')
// Configurables
var/grab_range = 4
var/click_miss_cooldown = 15
var/twitch_message_cooldown = 0 //apparently this is necessary for a tiny code that makes the lunge message on cooldown not be spammable, doesn't need to be big so 5 will do.
var/smash_damage = 20
var/smash_scale = 10
var/stun_duration = 2 SECONDS

/datum/action/xeno_action/activable/devastate
name = "Devastate"
action_icon_state = "gut"
ability_name = "devastate"
/datum/action/xeno_action/activable/feralfrenzy
name = "Feral Frenzy"
action_icon_state = "rav_eviscerate"
ability_name = "Feral Frenzy"
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_4
xeno_cooldown = 20 SECONDS
plasma_cost = 110

var/activation_delay = 1 SECONDS
macro_path = /datum/action/xeno_action/verb/verb_feralfrenzy
xeno_cooldown = 15 SECONDS

//AOE
var/activation_delay_aoe = 1 SECONDS
var/base_damage_aoe = 15
var/damage_scale_aoe = 10
//SINGLE TARGET
var/activation_delay = 0.5 SECONDS
var/base_damage = 25
var/damage_scale = 10 // How much it scales by every kill
var/damage_scale = 10
var/targeting = SINGLETARGETGUT
/// The orange used for a AOETARGETGUT
var/range = 2

Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
/datum/action/xeno_action/onclick/toggle_gut_targeting
name = "Toggle Gutting Type"
action_icon_state = "gut" // starting targetting is SINGLETARGETGUT
macro_path = /datum/action/xeno_action/verb/verb_toggle_gut_targeting
action_type = XENO_ACTION_ACTIVATE
ability_primacy = XENO_PRIMARY_ACTION_5
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/datum/action/xeno_action/verb/verb_feralfrenzy()
set category = "Alien"
set name = "Feral Frenzy"
set hidden = TRUE
var/action_name = "Feral Frenzy"
handle_xeno_macro(src, action_name)

/datum/action/xeno_action/verb/verb_toggle_gut_targeting()
set category = "Alien"
set name = "Toggle Gutting Type"
set hidden = TRUE
var/action_name = "Toggle Gutting Type"
handle_xeno_macro(src, action_name)


/datum/action/xeno_action/verb/verb_feralrush()
set category = "Alien"
set name = "Feral Rush"
set hidden = TRUE
var/action_name = "Feral Rush"
handle_xeno_macro(src, action_name)

/datum/action/xeno_action/verb/verb_predalien_roar()
set category = "Alien"
set name = "Predalien Roar"
set hidden = TRUE
var/action_name = "Roar"
handle_xeno_macro(src, action_name)

/datum/action/xeno_action/verb/feral_smash()
set category = "Alien"
set name = "Feral Smash"
set hidden = TRUE
var/action_name = "Feral Smash"
handle_xeno_macro(src, action_name)
Loading
Loading