Skip to content

Commit

Permalink
Resprite of xeno spits and abom action icons (#7946)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request

Title

Before:

![dreamseeker_0X1XlVYSUX](https://github.com/user-attachments/assets/c814b173-8320-4ffe-868a-1bbcb391fbc6)


![dreammaker_39cBAo5dI9](https://github.com/user-attachments/assets/39d6f4bc-1020-45bf-a6bf-eab981a2330b)


After:

![dreamseeker_xb77R37x7s](https://github.com/user-attachments/assets/aa24ce88-a542-480e-aed2-3df514fd1915)


![dreammaker_PtJeKcAoDo](https://github.com/user-attachments/assets/62e75053-9eaa-4790-b477-13ec7fd3b1eb)


Now spits that do different damage, have unique sprites, acid spits been
reanimated and reshaded, now having overall better sprite.

Neurotoxin now uses color that actually matches neurotoxin.

All new sprites by Crowford, discord tag sir.crow

Basically port of my thing from
Cosmic-Overlord/RU-TerraGov-Marine-Corps@9532a22

# Explain why it's good for the game

Legacy sprites bad, also better identification of projectiles is good.


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
add: different xeno spits now have different icon depending on their
damage
imageadd: new neurotoxin spit sprite
imageadd: new predalien action icons
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
  • Loading branch information
Blundir authored Jan 10, 2025
1 parent a05f969 commit fa49380
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 26 deletions.
8 changes: 4 additions & 4 deletions code/datums/ammo/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@

/datum/ammo/xeno/acid
name = "acid spit"
icon_state = "xeno_acid"
icon_state = "xeno_acid_weak"
sound_hit = "acid_hit"
sound_bounce = "acid_bounce"
damage_type = BURN
Expand All @@ -166,7 +166,7 @@

/datum/ammo/xeno/acid/spatter
name = "acid spatter"

icon_state = "xeno_acid_strong"
damage = 30
max_range = 6

Expand All @@ -179,7 +179,7 @@

/datum/ammo/xeno/acid/praetorian
name = "acid splash"

icon_state = "xeno_acid_strong"
accuracy = HIT_ACCURACY_TIER_10 + HIT_ACCURACY_TIER_5
max_range = 8
damage = 30
Expand All @@ -191,7 +191,7 @@

/datum/ammo/xeno/acid/prae_nade // Used by base prae's acid nade
name = "acid scatter"

icon_state = "xeno_acid_normal"
flags_ammo_behavior = AMMO_ACIDIC|AMMO_XENO|AMMO_STOPPED_BY_COVER
accuracy = HIT_ACCURACY_TIER_5
accurate_range = 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/datum/action/xeno_action/onclick/feralrush
name = "Feral Rush"
action_icon_state = "charge_spit"
action_icon_state = "rage"
macro_path = /datum/action/xeno_action/verb/verb_feralrush
ability_primacy = XENO_PRIMARY_ACTION_1
action_type = XENO_ACTION_ACTIVATE
Expand All @@ -19,7 +19,7 @@

/datum/action/xeno_action/onclick/predalien_roar
name = "Roar"
action_icon_state = "screech"
action_icon_state = "rage_screech"
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
macro_path = /datum/action/xeno_action/verb/verb_predalien_roar
Expand All @@ -30,7 +30,7 @@

/datum/action/xeno_action/activable/feral_smash
name = "Feral Smash"
action_icon_state = "lunge"
action_icon_state = "powerful_pounce"
action_type = XENO_ACTION_CLICK
macro_path = /datum/action/xeno_action/verb/feral_smash
ability_primacy = XENO_PRIMARY_ACTION_3
Expand All @@ -45,7 +45,7 @@

/datum/action/xeno_action/activable/feralfrenzy
name = "Feral Frenzy"
action_icon_state = "rav_eviscerate"
action_icon_state = "butchering"
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_4
macro_path = /datum/action/xeno_action/verb/verb_feralfrenzy
Expand All @@ -65,7 +65,7 @@

/datum/action/xeno_action/onclick/toggle_gut_targeting
name = "Toggle Gutting Type"
action_icon_state = "gut" // starting targetting is SINGLETARGETGUT
action_icon_state = "rav_shard_shed" // 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
Expand Up @@ -191,7 +191,7 @@
guttype.targeting = AOETARGETGUT
to_chat(xeno, SPAN_XENOWARNING("We will now attack everyone around us during a Feral Frenzy."))
else
action_icon_result = "gut"
action_icon_result = "rav_shard_shed"
guttype.targeting = SINGLETARGETGUT
to_chat(xeno, SPAN_XENOWARNING("We will now focus our Feral Frenzy on one person!"))

Expand Down
16 changes: 0 additions & 16 deletions code/modules/mob/living/simple_animal/hostile/alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,19 +176,3 @@

pixel_x = -12
old_x = -12

// Still using old projectile code - commenting this out for now
// /mob/living/simple_animal/hostile/alien/sentinel
// name = "alien sentinel"
// icon_state = "Sentinel Running"
// icon_living = "Sentinel Running"
// icon_dead = "Sentinel Dead"
// health = 120
// melee_damage_lower = 15
// melee_damage_upper = 15
// ranged = 1
// projectiletype = /obj/projectile/neurotox
// projectilesound = 'sound/weapons/pierce.ogg'
/obj/projectile/neurotox
damage = 30
icon_state = "toxin"
Binary file modified icons/mob/hud/actions_xeno.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/projectiles.dmi
Binary file not shown.

0 comments on commit fa49380

Please sign in to comment.