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

Add carrier changes #633

Merged
merged 5 commits into from
Nov 22, 2024
Merged

Add carrier changes #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
077d3fd
Добавление неста карриеру и изменение характеристик
mister-onion Nov 8, 2024
3f5313c
Небольшие изменение характеристик
mister-onion Nov 8, 2024
33570db
небольшие доп. изменения способности
mister-onion Nov 8, 2024
e28705d
Merge branch 'master' into Alien-nest-for-carrier
mister-onion Nov 8, 2024
168f798
изменение количество хаггеров
mister-onion Nov 9, 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
59 changes: 56 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list(
keybinding_signals = list(
KEYBINDING_NORMAL = COMSIG_XENOABILITY_THROW_HUGGER,
)
cooldown_duration = 3 SECONDS
cooldown_duration = 2 SECONDS

/datum/action/ability/activable/xeno/throw_hugger/get_cooldown()
var/mob/living/carbon/xenomorph/carrier/caster = owner
Expand Down Expand Up @@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list(
action_icon_state = "spawn_hugger"
desc = "Spawn a facehugger that is stored on your body."
ability_cost = 100
cooldown_duration = 10 SECONDS
cooldown_duration = 5 SECONDS
keybinding_signals = list(
KEYBINDING_NORMAL = COMSIG_XENOABILITY_SPAWN_HUGGER,
)
Expand Down Expand Up @@ -378,7 +378,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list(
action_icon_state = "call_younger"
desc = "Appeals to the larva inside the Marine. The Marine loses his balance, and larva's progress accelerates."
ability_cost = 150
cooldown_duration = 20 SECONDS
cooldown_duration = 10 SECONDS
keybinding_signals = list(
KEYBINDING_NORMAL = COMSIG_XENOABILITY_CALL_YOUNGER,
)
Expand Down Expand Up @@ -456,3 +456,56 @@ GLOBAL_LIST_INIT(hugger_images_list, list(

succeed_activate()
add_cooldown()

// ***************************************
// *********** Build nest
// ***************************************

/datum/action/ability/xeno_action/build_nest
name = "Build nest"
action_icon_state = ALIEN_NEST
desc = "Build nest for host"
ability_cost = 200
cooldown_duration = 20 SECONDS
keybinding_signals = list(
KEYBINDING_NORMAL = COMSIG_XENOABILITY_SECRETE_RESIN,
)

/datum/action/ability/xeno_action/build_nest/can_use_action(silent, override_flags)
. = ..()
var/turf/T = get_turf(owner)
var/mob/living/carbon/xenomorph/blocker = locate() in T
if(blocker && blocker != owner && blocker.stat != DEAD)
if(!silent)
to_chat(owner, span_xenowarning("You cannot build with [blocker] in the way!"))
return FALSE

if(!T.is_weedable())
return FALSE

var/mob/living/carbon/xenomorph/owner_xeno = owner
if(!owner_xeno.loc_weeds_type)
if(!silent)
to_chat(owner, span_xenowarning("No weeds here!"))
return FALSE

if(!T.check_alien_construction(owner, silent, /obj/structure/bed/nest) || !T.check_disallow_alien_fortification(owner))
return FALSE

/datum/action/ability/xeno_action/build_nest/action_activate()

var/turf/T = get_turf(owner)
for(var/obj/structure/bed/nest/nest in range(2, T))
owner.balloon_alert(owner, "Another nest too close!")
return FALSE

if(!do_after(owner, 2 SECONDS, NONE, owner, BUSY_ICON_BUILD))
return FALSE

if(!can_use_action())
return FALSE

new /obj/structure/bed/nest(T)
playsound(T, "alien_resin_build", 25)
succeed_activate()
add_cooldown()
16 changes: 9 additions & 7 deletions code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
wound_type = "carrier" //used to match appropriate wound overlays

// *** Melee Attacks *** //
melee_damage = 20
melee_damage = 22

// *** Speed *** //
speed = -0.4

// *** Plasma *** //
plasma_max = 800
plasma_gain = 38
plasma_max = 1000
plasma_gain = 45

// *** Health *** //
max_health = 325
max_health = 425

// *** Evolution *** //
evolution_threshold = 225
Expand All @@ -33,7 +33,7 @@
caste_traits = null

// *** Defense *** //
soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 0, BIO = 5, FIRE = 0, ACID = 5)
soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 0, BIO = 5, FIRE = 25, ACID = 5)

// *** Pheromones *** //
aura_strength = 2.5
Expand All @@ -42,8 +42,8 @@
minimap_icon = "carrier"

// *** Carrier Abilities *** //
huggers_max = 7
hugger_delay = 1.5 SECONDS
huggers_max = 9
hugger_delay = 1.25 SECONDS

actions = list(
/datum/action/ability/xeno_action/xeno_resting,
Expand All @@ -61,6 +61,7 @@
/datum/action/ability/xeno_action/pheromones/emit_warding,
/datum/action/ability/xeno_action/pheromones/emit_frenzy,
/datum/action/ability/xeno_action/carrier_panic,
/datum/action/ability/xeno_action/build_nest,
/datum/action/ability/xeno_action/choose_hugger_type,
/datum/action/ability/xeno_action/set_hugger_reserve,
)
Expand Down Expand Up @@ -90,6 +91,7 @@
/datum/action/ability/xeno_action/pheromones/emit_warding,
/datum/action/ability/xeno_action/pheromones/emit_frenzy,
/datum/action/ability/xeno_action/carrier_panic,
/datum/action/ability/xeno_action/build_nest,
/datum/action/ability/xeno_action/choose_hugger_type,
/datum/action/ability/xeno_action/set_hugger_reserve,
/datum/action/ability/xeno_action/build_hugger_turret,
Expand Down
Loading