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

Re-balances acid damage #3749

Merged
merged 6 commits into from
Jul 19, 2023
Merged

Re-balances acid damage #3749

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a39571
scalding acid
Diegoflores31 Jun 27, 2023
da87894
fix
Diegoflores31 Jun 27, 2023
d3bb206
upsie :3
Diegoflores31 Jun 27, 2023
65d124e
meow
Diegoflores31 Jun 28, 2023
5c7125d
mowwow
Diegoflores31 Jul 13, 2023
19f32df
a
Diegoflores31 Jul 14, 2023
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
1 change: 1 addition & 0 deletions code/__DEFINES/conflict.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@

// human armor
#define CLOTHING_ARMOR_NONE 0
#define CLOTHING_ARMOR_VERYLOW 5
#define CLOTHING_ARMOR_LOW 10
#define CLOTHING_ARMOR_MEDIUMLOW 15
#define CLOTHING_ARMOR_MEDIUM 20
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/suits/marine_armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_MEDIUMLOW
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
armor_bio = CLOTHING_ARMOR_MEDIUMLOW
armor_rad = CLOTHING_ARMOR_MEDIUMHIGH
armor_internaldamage = CLOTHING_ARMOR_LOW
storage_slots = 2
Expand Down Expand Up @@ -549,7 +549,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150
armor_bullet = CLOTHING_ARMOR_HIGH
armor_energy = CLOTHING_ARMOR_LOW
armor_bomb = CLOTHING_ARMOR_LOW
armor_bio = CLOTHING_ARMOR_NONE
armor_bio = CLOTHING_ARMOR_VERYLOW
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
storage_slots = 1
Expand Down Expand Up @@ -589,15 +589,15 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150

/obj/item/clothing/suit/storage/marine/heavy
name = "\improper M3-EOD pattern heavy armor"
desc = "A heavier version of the standard M3 pattern armor, the armor is primarily designed to withstand ballistic, explosive, and internal damage, with the drawback of increased bulk and thus reduced movement speed, alongside little additional protection from standard blunt force impacts and none from biological threats."
desc = "A heavier version of the standard M3 pattern armor, the armor is primarily designed to withstand ballistic, explosive, and internal damage, with the drawback of increased bulk and thus reduced movement speed, alongside little additional protection from standard blunt force impacts and biological threats."
desc_lore = "This configuration of the iconic armor was developed during the Canton War in 2160 between the UPP and USCM - Designed in response to a need for higher protection for ComTechs assigned as EODs during the conflict, this is the pinnacle of protection for your average marine. The shoulders and kneepads have both been expanded upon heavily, covering up the arteries on each limb. A special spall liner was developed for this suit, with the same technology being used in the M70 Flak Jacket being developed at the same time."
specialty = "\improper M3-EOD pattern"
icon_state = "H1"
armor_variation = 6
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_bomb = CLOTHING_ARMOR_HIGHPLUS
armor_bio = CLOTHING_ARMOR_MEDIUM
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
armor_rad = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
storage_slots = 2
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/damage_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,15 @@
splash_chance -= victim.species.acid_blood_dodge_chance

if(splash_chance > 0 && prob(splash_chance)) //Success!
var/dmg = list("damage" = acid_blood_damage)
if(SEND_SIGNAL(src, COMSIG_XENO_DEAL_ACID_DAMAGE, victim, dmg) & COMPONENT_BLOCK_DAMAGE)
var/acid_damage = max(0, acid_blood_damage + (tier * 5))
if(SEND_SIGNAL(src, COMSIG_XENO_DEAL_ACID_DAMAGE, victim, acid_damage) & COMPONENT_BLOCK_DAMAGE)
continue
i++
victim.visible_message(SPAN_DANGER("\The [victim] is scalded with hissing green blood!"), \
SPAN_DANGER("You are splattered with sizzling blood! IT BURNS!"))
if(prob(60) && !victim.stat && victim.pain.feels_pain)
INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") //Topkek
victim.take_limb_damage(0, dmg["damage"]) //Sizzledam! This automagically burns a random existing body part.
victim.apply_armoured_damage(acid_damage, ARMOR_BIO, BURN) //Sizzledam! This automagically burns a random existing body part.
victim.add_blood(get_blood_color(), BLOOD_BODY)
acid_splash_last = world.time
handle_blood_splatter(get_dir(src, victim), 1 SECONDS)
Expand Down