Skip to content

Commit

Permalink
Rebalances Faelantern E.G.O. (#1755)
Browse files Browse the repository at this point in the history
  • Loading branch information
Coxswain-Navigator authored Dec 24, 2023
1 parent a643d62 commit 446d478
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 18 deletions.
4 changes: 0 additions & 4 deletions code/datums/abnormality/_ego_datum/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,6 @@
cost = 35

//Faelantern - Midwinter Nightmare
/datum/ego_datum/armor/faelantern
item_path = /obj/item/clothing/suit/armor/ego_gear/he/faelantern
cost = 35

/datum/ego_datum/weapon/faelantern
item_path = /obj/item/ego_weapon/faelantern
cost = 35
Expand Down
4 changes: 4 additions & 0 deletions code/datums/abnormality/_ego_datum/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,7 @@
item_path = /obj/item/ego_weapon/sanitizer
cost = 20

//Faelantern - Midwinter Nightmare
/datum/ego_datum/armor/faelantern
item_path = /obj/item/clothing/suit/armor/ego_gear/teth/faelantern
cost = 20
2 changes: 1 addition & 1 deletion code/game/objects/items/ego_weapons/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1498,7 +1498,7 @@
attack_verb_simple = list("poke", "slash")
hitsound = 'sound/weapons/fixer/generic/sword1.ogg'
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 40
PRUDENCE_ATTRIBUTE = 40
)
var/firing_cooldown = 0
var/hit_cooldown_time = 10 SECONDS
Expand Down
2 changes: 0 additions & 2 deletions code/game/objects/items/ego_weapons/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,6 @@
damage = 20
damage_type = BLACK_DAMAGE



/obj/item/ego_weapon/sanitizer
name = "sanitizer"
desc = "It's very shocking."
Expand Down
10 changes: 0 additions & 10 deletions code/modules/clothing/suits/ego_gear/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -410,16 +410,6 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
TEMPERANCE_ATTRIBUTE = 40
)

/obj/item/clothing/suit/armor/ego_gear/he/faelantern
name = "midwinter nightmare"
desc = "Some things are too good to be true."
icon_state = "faelantern"
armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 20, BLACK_DAMAGE = -20, PALE_DAMAGE = -20) // 40
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 40
)


/obj/item/clothing/suit/armor/ego_gear/he/coiling
name = "coiling"
desc = "It's beautiful snake leather."
Expand Down
8 changes: 7 additions & 1 deletion code/modules/clothing/suits/ego_gear/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
She threatens to kill the princess if she doesn't swear never to say a word about this reversal of roles to any living being. Sadly, the princess takes the oath."
icon_state = "zauberhorn"
armor = list(RED_DAMAGE = -30, WHITE_DAMAGE = 20, BLACK_DAMAGE = 30, PALE_DAMAGE = 0) // 20

/obj/item/clothing/suit/armor/ego_gear/teth/visions
name = "visions of future past"
desc = "It's looking right at you."
Expand All @@ -238,3 +238,9 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/
desc = "It's very clean, freshly washed."
icon_state = "sanitizer" //Just like a bobot
armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 0, BLACK_DAMAGE = -40, PALE_DAMAGE = 0) // 0

/obj/item/clothing/suit/armor/ego_gear/teth/faelantern
name = "midwinter nightmare"
desc = "Some things are too good to be true."
icon_state = "faelantern"
armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 30, BLACK_DAMAGE = -30, PALE_DAMAGE = 0) // 20
Binary file modified icons/mob/clothing/ego_gear/abnormality/he.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/ego_gear/abnormality/teth.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/ego_gear/abnormality/he.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/ego_gear/abnormality/teth.dmi
Binary file not shown.

0 comments on commit 446d478

Please sign in to comment.