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

Xeno Mutations/Personal Upgrades #16711

Open
wants to merge 92 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 54 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
02afac8
screen alert sprites
Runian Oct 28, 2024
510f5a5
xeno building sprites
Runian Oct 28, 2024
76ff07b
map blips sprite (resized)
Runian Oct 28, 2024
3d8d759
buyable icons sprites
Runian Oct 28, 2024
fff3169
define signals
Runian Oct 28, 2024
442f12e
define movespeed modification
Runian Oct 28, 2024
efe366e
upgrade_chambers.dm initial
Runian Oct 28, 2024
4ed1135
hive datum initial
Runian Oct 28, 2024
7fc2297
grammar / comment changes
Runian Oct 28, 2024
ceebcd2
define biomass
Runian Oct 28, 2024
dac3515
carry over biomass over evo
Runian Oct 28, 2024
ead6f83
status effects
Runian Oct 28, 2024
76e59f2
define xeno upgrades
Runian Oct 28, 2024
da8450e
define status effects
Runian Oct 28, 2024
38e6fe0
drain/cocoon give biomass
Runian Oct 28, 2024
7f12b3b
hive upgrades
Runian Oct 28, 2024
dff2362
upgrade menu / topics
Runian Oct 28, 2024
d091ed5
missing status effect (upgrade_carapace)
Runian Oct 28, 2024
bfbce44
we dont have DEFILER_ACID
Runian Oct 28, 2024
86b0ee3
flags_upgrade -> gamemode_flags
Runian Oct 28, 2024
75a3300
untab
Runian Oct 28, 2024
ff86716
correct image path
Runian Oct 28, 2024
6243f17
build below
Runian Oct 28, 2024
aadd644
typo
Runian Oct 28, 2024
84e5796
regen phero does not increase plasma regen
Runian Oct 28, 2024
d063ba3
unused selectable
Runian Oct 28, 2024
af60348
reduce to 1-3 from 2-4
Runian Oct 28, 2024
bb17a75
typo
Runian Oct 28, 2024
32b70b3
Merge branch 'master' into xeno-scale-structures
Runian Oct 28, 2024
525fce6
chamber building costs increase by 100
Runian Oct 29, 2024
286fff2
up biomass cost by 5
Runian Oct 29, 2024
90f4db1
carapace: 5 -> 2.5
Runian Oct 29, 2024
33cad2c
regeneration rework -> less health, but on life cycle
Runian Oct 29, 2024
c27fe83
typo
Runian Oct 29, 2024
1c94a40
forgot to return true
Runian Oct 29, 2024
593069a
does not require any regen power
Runian Oct 29, 2024
65ec725
even less regen & more comments
Runian Oct 29, 2024
7b74ce0
adrenaline every plasma update / reduce
Runian Oct 29, 2024
d4ff466
unwanted tick_interval
Runian Oct 29, 2024
7e4ad41
typo that was stopping adrenaline from buying
Runian Oct 29, 2024
2b410da
reworked plasma regen pt. 2
Runian Oct 29, 2024
e41c556
crush changes
Runian Oct 29, 2024
ab20b36
more comments
Runian Oct 29, 2024
9a6ff07
crush and defiler fixes
Runian Oct 29, 2024
63c6902
fixes up pheromones and trail
Runian Oct 29, 2024
275ad77
decrease health regen a little and halve sunder
Runian Oct 29, 2024
1995997
take_damage fixes
Runian Oct 29, 2024
d110f44
tgui
Runian Oct 29, 2024
442ed41
finishing up tgui
Runian Oct 29, 2024
9ba5c50
more leftovers
Runian Oct 29, 2024
2b5ef8e
threw this into Prettier.io
Runian Oct 29, 2024
e010971
okay installed the Prettier for VSC instead
Runian Oct 29, 2024
20ebf1e
"click to change"... for all veil status effect descs
Runian Oct 29, 2024
4cd658c
use/gain_biomass()
Runian Oct 29, 2024
8d86c4f
address all tgui review issues
Runian Oct 29, 2024
bce0dbe
psydrain/cocoon is now socialism at range 7
Runian Oct 29, 2024
e9dfb32
unneeded checks
Runian Oct 29, 2024
6ecfacb
ignore this terrible mistake :)
Runian Oct 29, 2024
d1a8597
autodoc
Runian Oct 29, 2024
a0e5590
Merge branch 'master' into xeno-scale-structures
Runian Oct 30, 2024
2197116
unused defines & addresses latest comment/review
Runian Oct 30, 2024
c52be9c
typo comment
Runian Oct 30, 2024
69a768e
sorting
Runian Oct 30, 2024
236d1fc
unwanted TRUE
Runian Oct 30, 2024
f039fc6
Merge branch 'master' into xeno-scale-structures
Runian Oct 31, 2024
f75896e
halve regeneration & vamp
Runian Nov 2, 2024
692e092
nerf celerity in half for test merge
Runian Nov 2, 2024
81928b1
autodoc pt. 1 of 2
Runian Nov 2, 2024
3735d5f
autodoc pt. 2 of 2
Runian Nov 2, 2024
75b5696
autodoc pt. 3 of 2 :)
Runian Nov 2, 2024
63dba11
ui_static_data
Runian Nov 3, 2024
2d83b78
remove verb, add button to hive status
Runian Nov 3, 2024
c62e052
update desc
Runian Nov 3, 2024
c5736fc
updated tgui appearance
Runian Nov 3, 2024
7166d04
unneeded vars + theme
Runian Nov 3, 2024
15b3fc9
sectioned + smaller width height
Runian Nov 3, 2024
6a9bc3a
dropdown menus + enabled if already owned
Runian Nov 3, 2024
fe49518
section name -> collapsible name
Runian Nov 3, 2024
f166bfc
no phero if no chambers
Runian Nov 10, 2024
7d15379
cocoon: 10 initial shared, 6 overtime to all, 2.5 complete to all
Runian Nov 10, 2024
392eceb
comment
Runian Nov 10, 2024
73606d3
0 initial, 9 overtime to all, 3.5 completion
Runian Nov 10, 2024
4f45621
extra space
Runian Nov 10, 2024
2ea4964
100 biomass for Valhalla/Fallen xenos
Runian Nov 10, 2024
e8a7ad6
trail now buyable :)
Runian Nov 10, 2024
68bc531
nerfs(?) Toxin upgrade
Runian Nov 12, 2024
afef995
temporary sticky thin resin
Runian Nov 12, 2024
fc202da
caste_flag for no biomass gain instead of doing by ability ownership
Runian Nov 12, 2024
a756471
Biomass in status tab
Runian Nov 12, 2024
b70f272
forgot this for CASTE_NO_BIOMASS
Runian Nov 12, 2024
8cd05a2
6 overtime, 4 completion
Runian Nov 12, 2024
0c9156f
no trail if no chambers
Runian Nov 16, 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
5 changes: 5 additions & 0 deletions code/__DEFINES/dcs/signals/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,11 @@

#define COMSIG_XENOMORPH_LEAP_BUMP "xenomorph_leap_bump" //from /mob/living/carbon/xenomorph/bump

// Xeno upgrade chambers
#define COMSIG_UPGRADE_CHAMBER_SURVIVAL "upgrade_chamber_survival"
#define COMSIG_UPGRADE_CHAMBER_ATTACK "upgrade_chamber_attack"
#define COMSIG_UPGRADE_CHAMBER_UTILITY "upgrade_chamber_utility"

//human signals
#define COMSIG_CLICK_QUICKEQUIP "click_quickequip"

Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/movespeed_modification.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#define MOVESPEED_ID_WARLOCK_CHANNELING "WARLOCK_CHANNELING"
#define MOVESPEED_ID_XENO_DREAD "DREADXENO"
#define MOVESPEED_ID_BEHEMOTH_PRIMAL_WRATH "BEHEMOTH_PRIMAL_WRATH"
#define MOVESPEED_ID_CELERITY_BUFF "UPGRADE_CHAMBER_CELERITY_BUFF"

#define MOVESPEED_ID_SIMPLEMOB_VARSPEED "SIMPLEMOB_VARSPEED_MODIFIER"

Expand Down
18 changes: 18 additions & 0 deletions code/__DEFINES/status_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,24 @@

#define STATUS_EFFECT_DRAIN_SURGE /datum/status_effect/drain_surge

#define STATUS_EFFECT_UPGRADE_CARAPACE /datum/status_effect/upgrade_carapace

#define STATUS_EFFECT_UPGRADE_REGENERATION /datum/status_effect/upgrade_regeneration

#define STATUS_EFFECT_UPGRADE_VAMPIRISM /datum/status_effect/upgrade_vampirism

#define STATUS_EFFECT_UPGRADE_CELERITY /datum/status_effect/upgrade_celerity

#define STATUS_EFFECT_UPGRADE_ADRENALINE /datum/status_effect/upgrade_adrenaline

#define STATUS_EFFECT_UPGRADE_CRUSH /datum/status_effect/upgrade_crush

#define STATUS_EFFECT_UPGRADE_TOXIN /datum/status_effect/upgrade_toxin

#define STATUS_EFFECT_UPGRADE_PHERO /datum/status_effect/upgrade_pheromones

#define STATUS_EFFECT_UPGRADE_TRAIL /datum/status_effect/upgrade_trail

#define STATUS_EFFECT_MINDMEND /datum/status_effect/mindmeld

#define STATUS_EFFECT_REKNIT_FORM /datum/status_effect/reknit_form
Expand Down
31 changes: 31 additions & 0 deletions code/__DEFINES/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ GLOBAL_LIST_INIT(defiler_toxin_type_list, list(
/datum/reagent/toxin/xeno_ozelomelyn,
))

//List of Defiler toxin images
GLOBAL_LIST_INIT(defiler_toxin_images_list, list(
DEFILER_OZELOMELYN = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_OZELOMELYN),
DEFILER_HEMODILE = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_HEMODILE),
DEFILER_TRANSVITOX = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_TRANSVITOX),
DEFILER_NEUROTOXIN = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_NEUROTOXIN)
))

//List of toxins improving defile's damage
GLOBAL_LIST_INIT(defiler_toxins_typecache_list, typecacheof(list(
/datum/reagent/toxin/xeno_ozelomelyn,
Expand Down Expand Up @@ -210,3 +218,26 @@ GLOBAL_LIST_INIT(xeno_ai_spawnable, list(

/// Life runs every 2 seconds, but we don't want to multiply all healing by 2 due to seconds_per_tick
#define XENO_PER_SECOND_LIFE_MOD 0.5

GLOBAL_LIST_INIT(xeno_survival_upgrades, list(
/datum/status_effect/upgrade_carapace,
/datum/status_effect/upgrade_regeneration,
/datum/status_effect/upgrade_vampirism,
))

GLOBAL_LIST_INIT(xeno_attack_upgrades, list(
/datum/status_effect/upgrade_celerity,
/datum/status_effect/upgrade_adrenaline,
/datum/status_effect/upgrade_crush,
))

GLOBAL_LIST_INIT(xeno_utility_upgrades, list(
/datum/status_effect/upgrade_toxin,
/datum/status_effect/upgrade_pheromones,
/datum/status_effect/upgrade_trail,
))

#define XENO_UPGRADE_BIOMASS_COST_T1 15
#define XENO_UPGRADE_BIOMASS_COST_T2 20
#define XENO_UPGRADE_BIOMASS_COST_T3 25
#define XENO_UPGRADE_BIOMASS_COST_T4 30
Loading
Loading