Skip to content

queen caste buffs #979

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

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

queen caste buffs #979

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ca20749
first pass
Yorkoh May 22, 2025
6db0613
Merge remote-tracking branch 'upstream/master' into queen-caste-buffs
Yorkoh May 22, 2025
fa01c05
upped acid blood dmg
Yorkoh May 22, 2025
2140bd4
Merge branch 'master' into queen-caste-buffs
Yorkoh May 22, 2025
b69e190
acid blood dmg but properly
Yorkoh May 22, 2025
89c7ced
Merge branch 'queen-caste-buffs' of https://github.com/Yorkoh/cmss13-…
Yorkoh May 22, 2025
ed9988f
actually doing acid blood for real this time
Yorkoh May 22, 2025
35e67be
fix accidental soldier edit
Yorkoh May 23, 2025
4659105
fix accidental soldier edit
Yorkoh May 23, 2025
320f36f
Merge branch 'queen-caste-buffs' of https://github.com/Yorkoh/cmss13-…
Yorkoh May 23, 2025
576337b
Merge branch 'master' into queen-caste-buffs
Yorkoh May 23, 2025
3387b03
tryna dump the accidental soldier changes properly this time
Yorkoh May 23, 2025
91ef47c
Merge branch 'queen-caste-buffs' of https://github.com/Yorkoh/cmss13-…
Yorkoh May 23, 2025
258a3c2
GAHH
Yorkoh May 23, 2025
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
2 changes: 1 addition & 1 deletion code/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@
#define XENO_EVASION_HIGH 20

// Speeds
#define XENO_SPEED_QUEEN 0.6
#define XENO_SPEED_QUEEN 0.5
#define XENO_SPEED_TIER_1 0.4
#define XENO_SPEED_TIER_2 0.2
#define XENO_SPEED_TIER_3 0
Expand Down
12 changes: 7 additions & 5 deletions code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
caste_type = XENO_CASTE_QUEEN
tier = 0

melee_damage_lower = XENO_DAMAGE_TIER_4
melee_damage_upper = XENO_DAMAGE_TIER_6
melee_damage_lower = XENO_DAMAGE_TIER_5
melee_damage_upper = XENO_DAMAGE_TIER_7
melee_vehicle_damage = XENO_DAMAGE_TIER_9 //Queen and Ravs have extra multiplier when dealing damage in multitile_interaction.dm
max_health = XENO_HEALTH_QUEEN
max_health = XENO_HEALTH_QUEEN * 5 // PVE boss edition
plasma_gain = XENO_PLASMA_GAIN_TIER_7
plasma_max = XENO_PLASMA_TIER_10
plasma_max = XENO_PLASMA_TIER_10 * 3 // PVE boss edition
xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_10
armor_deflection = XENO_ARMOR_TIER_2
armor_deflection = XENO_ARMOR_TIER_4
evasion = XENO_EVASION_NONE
speed = XENO_SPEED_QUEEN

Expand Down Expand Up @@ -274,6 +274,8 @@
pull_speed = 3 //screech/neurodragging is cancer, at the very absolute least get some runner to do it for teamwork
organ_value = 8000 // queen is expensive

acid_blood_damage = 60 /// Strong acid blood. Don't get too close!

icon_xeno = 'icons/mob/xenos/queen.dmi'
icon_xenonid = 'icons/mob/xenonids/queen.dmi'

Expand Down
3 changes: 1 addition & 2 deletions code/modules/mob/living/carbon/xenomorph/castes/Soldier.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
claw_type = CLAW_TYPE_SHARP
pull_multiplier = 0.2 /// Pretty much no pull delay, for those quick drags.

acid_blood_damage = 35 /// Strong acid blood. Should be a define in the future.
acid_blood_spatter = TRUE /// Testing variable, means that their blood can melt objects in the environment. Primarily barricades.
acid_blood_damage = 60 /// Strong acid blood. Don't get too close!

icon_xeno = 'icons/mob/xenos/soldier.dmi'
icon_xenonid = 'icons/mob/xenonids/drone.dmi'
Expand Down
Loading