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

Fire damage Overhaul #2710

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fire damage Overhaul #2710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 4 additions & 22 deletions code/datums/status_effects/debuffs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,6 @@
tick_interval = 5 SECONDS
consumed_on_threshold = FALSE
var/new_stack = FALSE
var/burn_res = 0
var/safety = TRUE

/atom/movable/screen/alert/status_effect/lc_burn
Expand All @@ -1131,12 +1130,10 @@
qdel(src)
to_chat(owner, "<span class='warning'>The flame consumes you!!</span>")
owner.playsound_local(owner, 'sound/effects/burn.ogg', 50, TRUE)
Check_Resist(owner)
if(ishuman(owner))
owner.adjustFireLoss(max(0, stacks - burn_res))
owner.apply_damage(stacks, BURN, null, owner.run_armor_check(null, BURN))
else
owner.adjustBruteLoss(stacks*4) // x4 on non humans (Average burn stack is 20. 80/5 sec, extra 16 pure dps)
new /obj/effect/temp_visual/damage_effect/burn(get_turf(owner))
owner.apply_damage(stacks*4, BURN, null, owner.run_armor_check(null, BURN)) // x4 on non humans (Average burn stack is 20. 80/5 sec, extra 16 pure dps)

//Deletes itself after 2 tick if no new burn stack was given
if(safety)
Expand All @@ -1147,24 +1144,10 @@
else
qdel(src)

//Check armor
/datum/status_effect/stacking/lc_burn/proc/Check_Resist(mob/living/owner)
//I was hesistant to put a new var for this check in suit.dm, so I just check for each armor instead
var/mob/living/carbon/human/H = owner
var/obj/item/clothing/suit/armor/ego_gear/aleph/waxen/C = H.get_item_by_slot(ITEM_SLOT_OCLOTHING)
var/obj/item/clothing/suit/armor/ego_gear/realization/desperation/D = H.get_item_by_slot(ITEM_SLOT_OCLOTHING)
if(istype(C))
burn_res = 15
else if(istype(D))
burn_res = 25
else
burn_res = 0

//Update burn appearance
/datum/status_effect/stacking/lc_burn/proc/Update_Burn_Overlay(mob/living/owner)
Check_Resist(owner)
if(stacks > burn_res && !(owner.on_fire) && ishuman(owner))
if(stacks >= 50)
if(stacks && !(owner.on_fire) && ishuman(owner))
if(stacks >= 15)
owner.cut_overlay(mutable_appearance('icons/mob/OnFire.dmi', "Generic_mob_burning", -FIRE_LAYER))
owner.cut_overlay(mutable_appearance('icons/mob/OnFire.dmi', "Standing", -FIRE_LAYER))
owner.add_overlay(mutable_appearance('icons/mob/OnFire.dmi', "Standing", -FIRE_LAYER))
Expand Down Expand Up @@ -1195,7 +1178,6 @@
tick_interval = 5 SECONDS
consumed_on_threshold = FALSE
var/new_stack = FALSE
var/burn_res = 0
var/safety = TRUE
var/bleed_cooldown = 20
var/bleed_time
Expand Down
13 changes: 12 additions & 1 deletion code/modules/clothing/clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
/// A lazily initiated "food" version of the clothing for moths
var/obj/item/food/clothing/moth_snack

/// Exclusive to LC13 - Toggles whether or not fire armor shows up in tags. Hides the armor value from the player if automatically generated.
var/fire_display = TRUE

/obj/item/clothing/Initialize()
if((clothing_flags & VOICEBOX_TOGGLABLE))
actions_types += /datum/action/item_action/toggle_voice_box
Expand All @@ -72,6 +75,13 @@
LoadComponent(/datum/component/bloodysoles)
if(!icon_state)
item_flags |= ABSTRACT
var/burnvalue = armor.getRating(FIRE)
if(!burnvalue)
var/redvalue = armor.getRating(RED_DAMAGE)
if(redvalue > 0)
redvalue = (redvalue * 0.5)
armor = armor.modifyRating(FIRE = redvalue)
fire_display = FALSE

/obj/item/clothing/MouseDrop(atom/over_object)
. = ..()
Expand Down Expand Up @@ -327,7 +337,7 @@

if(LAZYLEN(durability_list))
durability_list.Cut()
if(armor.fire)
if(armor.fire && fire_display)
durability_list += list("FIRE" = armor.fire)
if(armor.acid)
durability_list += list("ACID" = armor.acid)
Expand Down Expand Up @@ -361,6 +371,7 @@
readout += "\nYou can add numbers together by putting the symbols in descending order from left to right. You’d add all of the symbols’ individual values together to get the total value. For example, VI is 5 + 1 or 6."
readout += "\nYou can also subtract numbers from each other by placing a symbol with a smaller value to the left of one with a larger value. The value of the smaller symbol is subtracted from that of the larger symbol to get the total value, so IV is 5 - 1, or 4."
readout += "\nExamples: \nIX = 10-1 = 9. \nVI = 5+1 = 6. \nVIII = 5+1+1+1 = 8."
readout += "\nAdditionally, all armors that have an armor value for red damage will have half (if positive) of that value in an armor value for fire damage if not explicitly indicated."
to_chat(usr, "[readout.Join()]")

/**
Expand Down
32 changes: 17 additions & 15 deletions code/modules/clothing/suits/ego_gear/aleph.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Think before you code!
Any attempt to code risk class armor will result in a 10 day Github ban.*/

/*Developer's note - All LC13 armor has 50% of its red_damage armor as fire armor by default. */

/obj/item/clothing/suit/armor/ego_gear/aleph
icon = 'icons/obj/clothing/ego_gear/abnormality/aleph.dmi'
worn_icon = 'icons/mob/clothing/ego_gear/abnormality/aleph.dmi'
Expand Down Expand Up @@ -266,7 +268,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
to_chat(user, span_nicegreen("[src] has gained extra resistance to PALE damage!"))

if("diamonds")
armor = armor.modifyRating(red = 10, pale = 5)
armor = armor.modifyRating(red = 10, pale = 5, fire = 5)
to_chat(user, span_nicegreen("[src] has gained extra resistance to RED damage!"))

if("clubs")
Expand All @@ -277,7 +279,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
name = "Seasons Greetings"
desc = "This is a placeholder."
icon_state = "spring"
armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 60, BLACK_DAMAGE = 60, PALE_DAMAGE = 60) // 240
armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 60, BLACK_DAMAGE = 60, PALE_DAMAGE = 60, FIRE = 60) // 240
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 80,
PRUDENCE_ATTRIBUTE = 100,
Expand Down Expand Up @@ -332,36 +334,36 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
var/warning_message
switch(stored_season) //Hopefully someday someone finds a more efficient way to change armor values
if("spring")
src.armor = new(red = 60, white = 80, black = 40, pale = 60) //240
src.armor = new(red = 60, white = 80, black = 40, pale = 60, fire = 30) //240
if(stored_season != current_season) //Our drip is out of season
src.armor = new(red = 50, white = 80, black = 40, pale = 50) //220
src.armor = new(red = 50, white = 80, black = 40, pale = 50, fire = 30) //220
weakened = TRUE
if(current_season == "fall")
src.armor = new(red = 50, white = 70, black = 30, pale = 50) //200
src.armor = new(red = 50, white = 70, black = 30, pale = 50, fire = 30) //200
warning_message = "Fall has come, the leaves on your armor wither and die."
if("summer")
src.armor = new(red = 80, white = 40, black = 60, pale = 60)
src.armor = new(red = 80, white = 40, black = 60, pale = 60, fire = 70)
if(stored_season != current_season) //Our drip is out of season
src.armor = new(red = 80, white = 40, black = 50, pale = 50)
src.armor = new(red = 80, white = 40, black = 50, pale = 50, fire = 70)
weakened = TRUE
if(current_season == "winter")
src.armor = new(red = 70, white = 30, black = 50, pale = 50)
src.armor = new(red = 70, white = 30, black = 50, pale = 50, fire = 70)
warning_message = "Winter is here. Your armor reacts, becoming stiff and brittle."
if("fall")
src.armor = new(red = 40, white = 60, black = 80, pale = 60)
src.armor = new(red = 40, white = 60, black = 80, pale = 60, fire = 70)
if(stored_season != current_season) //Our drip is out of season
src.armor = new(red = 40, white = 50, black = 80, pale = 50)
src.armor = new(red = 40, white = 50, black = 80, pale = 50, fire = 70)
weakened = TRUE
if(current_season == "spring")
src.armor = new(red = 30, white = 50, black = 70, pale = 50)
src.armor = new(red = 30, white = 50, black = 70, pale = 50, fire = 70)
warning_message = "The arrival of spring weakens your armor further."
if("winter")
src.armor = new(red = 40, white = 60, black = 60, pale = 80)
src.armor = new(red = 40, white = 60, black = 60, pale = 80, fire = 10)
if(stored_season != current_season) //Our drip is out of season
src.armor = new(red = 40, white = 50, black = 50, pale = 80)
src.armor = new(red = 40, white = 50, black = 50, pale = 80, fire = 10)
weakened = TRUE
if(current_season == "summer")
src.armor = new(red = 30, white = 50, black = 50, pale = 70)
src.armor = new(red = 30, white = 50, black = 50, pale = 70, fire = 0)
warning_message = "The summer heat is melting your armor."

if(current_holder && (weakened == TRUE))
Expand Down Expand Up @@ -399,7 +401,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
name = "distortion"
desc = "To my eyes, I’m the only one who doesn’t appear distorted. In a world full of distorted people, could the one person who remains unchanged be the \"distorted\" one?"
icon_state = "distortion"
armor = list(RED_DAMAGE = 80, WHITE_DAMAGE = 70, BLACK_DAMAGE = 80, PALE_DAMAGE = 50) // 280
armor = list(RED_DAMAGE = 80, WHITE_DAMAGE = 70, BLACK_DAMAGE = 80, PALE_DAMAGE = 50, FIRE = 70) // 280
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 100,
PRUDENCE_ATTRIBUTE = 100,
Expand Down
12 changes: 7 additions & 5 deletions code/modules/clothing/suits/ego_gear/he.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Think before you code!
Any attempt to code risk class armor will result in a 10 day Github ban.*/

/*Developer's note - All LC13 armor has 50% of its red_damage armor as fire armor by default. */

/obj/item/clothing/suit/armor/ego_gear/he
icon = 'icons/obj/clothing/ego_gear/abnormality/he.dmi'
worn_icon = 'icons/mob/clothing/ego_gear/abnormality/he.dmi'
Expand Down Expand Up @@ -91,7 +93,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
name = "christmas"
desc = "When the rusty sleigh bells are ajingle, Christmas begins."
icon_state = "christmas"
armor = list(RED_DAMAGE = -10, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 20) // 70
armor = list(RED_DAMAGE = -10, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 20, FIRE = -20) // 70
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 40
)
Expand Down Expand Up @@ -139,7 +141,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
name = "frost splinter"
desc = "Surprisingly cold to the touch."
icon_state = "frost_splinter"
armor = list(RED_DAMAGE = -10, WHITE_DAMAGE = 30, BLACK_DAMAGE = 0, PALE_DAMAGE = 50)
armor = list(RED_DAMAGE = -10, WHITE_DAMAGE = 30, BLACK_DAMAGE = 0, PALE_DAMAGE = 50, FIRE = -20)
attribute_requirements = list(
PRUDENCE_ATTRIBUTE = 40
)
Expand Down Expand Up @@ -302,7 +304,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
desc = "Even still, I witnessed man and sky and earth tear into thousands of pieces."
icon_state = "impending_day"
flags_inv = NONE
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = -20, BLACK_DAMAGE = 50, PALE_DAMAGE = 20) // 70
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = -20, BLACK_DAMAGE = 50, PALE_DAMAGE = 20, FIRE = 40) // 70
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the fire resistance of this armor double the physical resistance if by default most armor has 50% of its physical resistance as fire resistance.
Shouldn't this be FIRE = 10?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The normal half is calculated at initialize for most armors. Impending day gets a bonus because the abnormality itself will deal fire damage.

attribute_requirements = list(
TEMPERANCE_ATTRIBUTE = 40
)
Expand Down Expand Up @@ -405,7 +407,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
name = "lifetime stew"
desc = "A soup fit for a king - and all from a few stones. It seemed like magic!"
icon_state = "lifestew"
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = -20, BLACK_DAMAGE = 60, PALE_DAMAGE = -20) // 40
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = -20, BLACK_DAMAGE = 60, PALE_DAMAGE = -20, FIRE = 40) // 40
attribute_requirements = list(
TEMPERANCE_ATTRIBUTE = 40
)
Expand Down Expand Up @@ -468,7 +470,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
name = "ardor blossom star"
desc = "A dress with a bright orange jacket. Warm to the touch."
icon_state = "ardor_blossom"
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 0, BLACK_DAMAGE = 10, PALE_DAMAGE = 10) // 70
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 0, BLACK_DAMAGE = 10, PALE_DAMAGE = 10, FIRE = 40) // 70
attribute_requirements = list(
PRUDENCE_ATTRIBUTE = 40
)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/suits/ego_gear/non_abnormality/dawn.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "dawn office leader jacket"
desc = "An armored jacket worn by the leader of dawn office."
icon_state = "dawnleader"
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 50, BLACK_DAMAGE = 20, PALE_DAMAGE = 20)
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 50, BLACK_DAMAGE = 20, PALE_DAMAGE = 20, FIRE = 50)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 80,
PRUDENCE_ATTRIBUTE = 80,
Expand All @@ -14,7 +14,7 @@
name = "dawn office jacket"
desc = "An armored jacket worn by dawn office fixers. This one is extremely well worn, and has been tailored many times."
icon_state = "dawn"
armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = 40, BLACK_DAMAGE = 10, PALE_DAMAGE = 0)
armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = 40, BLACK_DAMAGE = 10, PALE_DAMAGE = 0, FIRE = 40)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 60,
PRUDENCE_ATTRIBUTE = 60,
Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/suits/ego_gear/non_abnormality/liu.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "Liu Association combat suit"
desc = "Armor worn by liu association section 1 and section 2."
icon_state = "liufire"
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 0)
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 0, FIRE = 20)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 60,
PRUDENCE_ATTRIBUTE = 60,
Expand All @@ -19,7 +19,7 @@
name = "Liu Association combat coat"
desc = "Armor worn by liu association section 1 veterans."
icon_state = "liufire_vet"
armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 50, BLACK_DAMAGE = 30, PALE_DAMAGE = 20)
armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 50, BLACK_DAMAGE = 30, PALE_DAMAGE = 20, FIRE = 30)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 60,
PRUDENCE_ATTRIBUTE = 80,
Expand Down Expand Up @@ -47,7 +47,7 @@
name = "Liu Association heavy combat coat"
desc = "Armor worn by the director of Liu Association Section 1 director."
icon_state = "liufire_director"
armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 70, BLACK_DAMAGE = 40, PALE_DAMAGE = 20)
armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 70, BLACK_DAMAGE = 40, PALE_DAMAGE = 20, FIRE = 40)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 60,
PRUDENCE_ATTRIBUTE = 100,
Expand Down
6 changes: 4 additions & 2 deletions code/modules/clothing/suits/ego_gear/teth.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Think before you code!
Any attempt to code risk class armor will result in a 10 day Github ban.*/

/*Developer's note - All LC13 armor has 50% of its red_damage armor as fire armor by default. */

/obj/item/clothing/suit/armor/ego_gear/teth
icon = 'icons/obj/clothing/ego_gear/abnormality/teth.dmi'
worn_icon = 'icons/mob/clothing/ego_gear/abnormality/teth.dmi'
Expand All @@ -25,7 +27,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
desc = "The archetype was already charred from the moment of extraction. \
Although the exterior is scorched, it has no adverse effects on the E.G.O’s performance."
icon_state = "match"
armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = -20, BLACK_DAMAGE = -20, PALE_DAMAGE = 0) // 20
armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = -20, BLACK_DAMAGE = -20, PALE_DAMAGE = 0, FIRE = 30) // 20
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If going by previous logic shouldnt the Match have higher resistance than its red? By default this would be 20 fire resistance but lifetime stew gets double its red resistance? Unless physical resistance and fire resistance are unrelated?

Shouldnt all fire resistant armor be equal in its defense against fire since its a out of context issue. I know you dont want people fighting abnormalities with teth armor but it feels weird having one fire abnormality just be weaker than another.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could be equal, but the idea is to give a little bit more to armors with worse spreads.


/obj/item/clothing/suit/armor/ego_gear/teth/fragment
name = "fragments from somewhere"
Expand Down Expand Up @@ -206,7 +208,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
name = "capote"
desc = "It suffered for such a long time... Unable to do anything about the raging thirst, the flesh endlessly burning and searing."
icon_state = "capote"
armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = -30, BLACK_DAMAGE = -10, PALE_DAMAGE = 0) // 0
armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = -30, BLACK_DAMAGE = -10, PALE_DAMAGE = 0, FIRE = 30) // 0

/obj/item/clothing/suit/armor/ego_gear/teth/fourleaf_clover
name = "four-leaf clover"
Expand Down
6 changes: 4 additions & 2 deletions code/modules/clothing/suits/ego_gear/waw.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Think before you code!
Any attempt to code risk class armor will result in a 10 day Github ban.*/

/*Developer's note - All LC13 armor has 50% of its red_damage armor as fire armor by default. */

/obj/item/clothing/suit/armor/ego_gear/waw
icon = 'icons/obj/clothing/ego_gear/abnormality/waw.dmi'
worn_icon = 'icons/mob/clothing/ego_gear/abnormality/waw.dmi'
Expand Down Expand Up @@ -257,7 +259,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
desc = "Bright as the abnormality it was extracted from, but somehow does not give off any heat. \
Maybe keep it away from the cold..."
icon_state = "featherofhonor"
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 50, BLACK_DAMAGE = 30, PALE_DAMAGE = 10) //140
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 50, BLACK_DAMAGE = 30, PALE_DAMAGE = 10, FIRE = 60) //140
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 80,
)
Expand Down Expand Up @@ -394,7 +396,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
name = "rimeshank"
desc = "Well, I can't just shiver in the cold forever, can I?"
icon_state = "rimeshank"
armor = list(RED_DAMAGE = 70, WHITE_DAMAGE = 40, BLACK_DAMAGE = 0, PALE_DAMAGE = 30) //140
armor = list(RED_DAMAGE = 70, WHITE_DAMAGE = 40, BLACK_DAMAGE = 0, PALE_DAMAGE = 30, FIRE = 20) //140
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does a Waw have a fire resistance of a zayin?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it was zayin it would have a defense of 10, but it has low fire resistance because its armor made of ice. Just a bit of flavor.

attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 80
)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/clothing/suits/ego_gear/zayin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Think before you code!
Any attempt to code risk class armor will result in a 10 day Github ban.*/

/*Developer's note - All LC13 armor has 50% of its red_damage armor as fire armor by default. */

/obj/item/clothing/suit/armor/ego_gear/zayin
icon = 'icons/obj/clothing/ego_gear/abnormality/zayin.dmi'
worn_icon = 'icons/mob/clothing/ego_gear/abnormality/zayin.dmi'
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/ego_armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
flags_inv = NONE
armor = list(RED_DAMAGE = -10, WHITE_DAMAGE = 10, BLACK_DAMAGE = -20, PALE_DAMAGE = 0) // -20
armor = list(RED_DAMAGE = -10, WHITE_DAMAGE = 10, BLACK_DAMAGE = -20, PALE_DAMAGE = 0, FIRE = 10) // -20
slowdown = -0.1

// He
Expand All @@ -27,7 +27,7 @@
icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
flags_inv = NONE
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = -30, BLACK_DAMAGE = -10, PALE_DAMAGE = 20) // 70
armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = -30, BLACK_DAMAGE = -10, PALE_DAMAGE = 20, FIRE = 50) // 70
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 40
)
Expand Down Expand Up @@ -82,12 +82,12 @@
// Aleph
/obj/item/clothing/suit/armor/ego_gear/aleph/waxen
name = "Waxen Pinion"
desc = "However, that alone won’t purge all evil from the world."
desc = "However, that alone won't purge all evil from the world."
icon_state = "combust"
icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_armor.dmi'
worn_icon = 'code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/!icons/ego_worn.dmi'
flags_inv = null
armor = list(RED_DAMAGE = 80, WHITE_DAMAGE = 40, BLACK_DAMAGE = 60, PALE_DAMAGE = 60)
armor = list(RED_DAMAGE = 80, WHITE_DAMAGE = 40, BLACK_DAMAGE = 60, PALE_DAMAGE = 60, FIRE = 70)
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 100,
PRUDENCE_ATTRIBUTE = 80,
Expand Down
Loading
Loading