Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

[SEMI-MODULAR] Ravager changes #97

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@
UnregisterSignal(xeno, COMSIG_XENOMORPH_ATTACK_LIVING)
to_chat(xeno, span_xenonotice("You will now[xeno.vampirism ? "" : " no longer"] heal from attacking"))

///Adds the slashed mob to tracked damage mobs
/*///Adds the slashed mob to tracked damage mobs
/datum/action/xeno_action/vampirism/proc/on_slash(datum/source, mob/living/target, damage, list/damage_mod, list/armor_mod)
SIGNAL_HANDLER
if(target.stat == DEAD)
Expand All @@ -564,4 +564,4 @@
particle_holder = new(x, /particles/xeno_slash/vampirism)
particle_holder.pixel_y = 18
particle_holder.pixel_x = 18
timer_ref = QDEL_NULL_IN(src, particle_holder, heal_delay)
timer_ref = QDEL_NULL_IN(src, particle_holder, heal_delay)*/
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/datum/action/xeno_action/activable/charge
cooldown_timer = 14 SECONDS

/datum/action/xeno_action/vampirism/proc/on_slash(datum/source, mob/living/target, damage, list/damage_mod, list/armor_mod)
SIGNAL_HANDLER
if(target.stat == DEAD)
return
if(!ishuman(target)) // no farming on animals/dead
return
if(timeleft(timer_ref) > 0)
return
var/mob/living/carbon/xenomorph/x = owner
x.adjustBruteLoss(-x.bruteloss * 0.2)
x.adjustFireLoss(-x.fireloss * 0.2)
update_button_icon()
particle_holder = new(x, /particles/xeno_slash/vampirism)
particle_holder.pixel_y = 18
particle_holder.pixel_x = 18
timer_ref = QDEL_NULL_IN(src, particle_holder, heal_delay)
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/datum/xeno_caste/ravager
plasma_regen_limit = 0.7

// *** Defense *** //
soft_armor = list(MELEE = 55, BULLET = 60, LASER = 60, ENERGY = 50, BOMB = 10, BIO = 40, FIRE = 70, ACID = 40)

// *** Abilities *** //
actions = list(
/datum/action/xeno_action/xeno_resting,
/datum/action/xeno_action/watch_xeno,
/datum/action/xeno_action/activable/psydrain,
/datum/action/xeno_action/activable/charge,
/datum/action/xeno_action/activable/ravage,
)

/datum/xeno_caste/ravager/on_caste_applied(mob/xenomorph)
. = ..()
xenomorph.AddElement(/datum/element/plasma_on_attack, 1.8)
xenomorph.AddElement(/datum/element/plasma_on_attacked, 0.8)

/datum/xeno_caste/ravager/on_caste_removed(mob/xenomorph)
. = ..()
xenomorph.RemoveElement(/datum/element/plasma_on_attack, 1.8)
xenomorph.RemoveElement(/datum/element/plasma_on_attacked, 0.8)

/datum/xeno_caste/ravager/primordial
// *** Abilities *** //
actions = list(
/datum/action/xeno_action/xeno_resting,
/datum/action/xeno_action/watch_xeno,
/datum/action/xeno_action/activable/psydrain,
/datum/action/xeno_action/activable/charge,
/datum/action/xeno_action/activable/ravage,
/datum/action/xeno_action/vampirism,
)
2 changes: 2 additions & 0 deletions modular_RUtgmc/includes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,5 @@
#include "code\modules\clothing\modular_armor\jaeger.dm"
#include "code\modules\clothing\modular_armor\attachments\chest_plates.dm"
#include "code\modules\reagents\reactions\medical.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\ravager\castedatum_ravager.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\ravager\abilities_ravager.dm"
Loading