From 7b738e4d3de8f5143a5e89d5d096d0c5514c9765 Mon Sep 17 00:00:00 2001 From: Litberries <129991883+Litberries@users.noreply.github.com> Date: Mon, 29 Apr 2024 22:26:42 -0400 Subject: [PATCH] renames Combusting Courage to Waxen Pinion (#2104) * rename * Update aleph.dm --- code/datums/abnormality/_ego_datum/aleph.dm | 10 ++++----- code/datums/status_effects/debuffs.dm | 2 +- code/game/objects/items/ego_weapons/aleph.dm | 22 +++++++++---------- code/modules/clothing/suits/ego_gear/aleph.dm | 4 ++-- .../abnormality/_tools/zayin/realizer.dm | 2 +- .../abnormality/aleph/crying_children.dm | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/code/datums/abnormality/_ego_datum/aleph.dm b/code/datums/abnormality/_ego_datum/aleph.dm index a08604cf6aad..6dcebe5b54cb 100644 --- a/code/datums/abnormality/_ego_datum/aleph.dm +++ b/code/datums/abnormality/_ego_datum/aleph.dm @@ -161,13 +161,13 @@ item_path = /obj/item/gun/ego_gun/pink cost = 100 -// The Crying Children - Combusting Courage -/datum/ego_datum/weapon/shield/combust - item_path = /obj/item/ego_weapon/shield/combust +// The Crying Children - Waxen Pinion +/datum/ego_datum/weapon/shield/waxen + item_path = /obj/item/ego_weapon/shield/waxen cost = 100 -/datum/ego_datum/armor/combust - item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/combust +/datum/ego_datum/armor/waxen + item_path = /obj/item/clothing/suit/armor/ego_gear/aleph/waxen cost = 100 //We Can Change Anything - Iron maiden diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index b2f86baa116d..16860eaef95a 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1133,7 +1133,7 @@ /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/combust/C = H.get_item_by_slot(ITEM_SLOT_OCLOTHING) + 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 diff --git a/code/game/objects/items/ego_weapons/aleph.dm b/code/game/objects/items/ego_weapons/aleph.dm index ad3eb655240a..fad42a7726ca 100644 --- a/code/game/objects/items/ego_weapons/aleph.dm +++ b/code/game/objects/items/ego_weapons/aleph.dm @@ -948,8 +948,8 @@ JUSTICE_ATTRIBUTE = 80 ) -/obj/item/ego_weapon/shield/combust - name = "Combusting Courage" +/obj/item/ego_weapon/shield/waxen + name = "Waxen Pinion" desc = "A searing blade, setting the world ablaze to eradicate evil. \ Using this E.G.O will eventually reduce you to ashes." special = "Activate again during block to perform Blazing Strike. This weapon becomes stronger the more burn stacks you have." @@ -983,12 +983,12 @@ var/burn_enemy = 2 var/burn_stack = 0 -/obj/item/ego_weapon/shield/combust/proc/Check_Ego(mob/living/user) +/obj/item/ego_weapon/shield/waxen/proc/Check_Ego(mob/living/user) var/mob/living/carbon/human/H = user - var/obj/item/clothing/suit/armor/ego_gear/aleph/combust/C = H.get_item_by_slot(ITEM_SLOT_OCLOTHING) + 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) || istype(D)) - reductions = list(30, 50, 40, 30) // 150 with combust/desperation + reductions = list(30, 50, 40, 30) // 150 with waxen/desperation projectile_block_message = "The heat from your wing melted the projectile!" block_message = "You cover yourself with your wing!" block_cooldown_message = "You streched your wing." @@ -1006,7 +1006,7 @@ burn_self = 2 burn_enemy = 2 -/obj/item/ego_weapon/shield/combust/proc/Check_Burn(mob/living/user) +/obj/item/ego_weapon/shield/waxen/proc/Check_Burn(mob/living/user) var/datum/status_effect/stacking/lc_burn/B = user.has_status_effect(/datum/status_effect/stacking/lc_burn) if(B) burn_stack = B.stacks @@ -1015,13 +1015,13 @@ force = (80 + round(burn_stack/2)) burn_enemy = burn_enemy + round(burn_stack/10) -/obj/item/ego_weapon/shield/combust/CanUseEgo(mob/living/user) +/obj/item/ego_weapon/shield/waxen/CanUseEgo(mob/living/user) . = ..() if(user.get_inactive_held_item()) to_chat(user, span_notice("You cannot use [src] with only one hand!")) return FALSE -/obj/item/ego_weapon/shield/combust/attack_self(mob/user) +/obj/item/ego_weapon/shield/waxen/attack_self(mob/user) if(!CanUseEgo(user)) return Check_Ego(user) @@ -1033,7 +1033,7 @@ ..() // Counter -/obj/item/ego_weapon/shield/combust/AnnounceBlock(mob/living/carbon/human/source, damage, damagetype, def_zone) +/obj/item/ego_weapon/shield/waxen/AnnounceBlock(mob/living/carbon/human/source, damage, damagetype, def_zone) source.apply_lc_burn(2) for(var/turf/T in view(1, source)) new /obj/effect/temp_visual/fire/fast(T) @@ -1046,7 +1046,7 @@ L.apply_lc_burn(2) ..() -/obj/item/ego_weapon/shield/combust/attack(mob/living/target, mob/living/carbon/human/user) +/obj/item/ego_weapon/shield/waxen/attack(mob/living/target, mob/living/carbon/human/user) if(!CanUseEgo(user)) return Check_Ego(user) @@ -1057,7 +1057,7 @@ target.apply_lc_burn(burn_enemy) // Blazing Strike -/obj/item/ego_weapon/shield/combust/afterattack(atom/A, mob/living/user, proximity_flag, params) +/obj/item/ego_weapon/shield/waxen/afterattack(atom/A, mob/living/user, proximity_flag, params) ..() if(!CanUseEgo(user)) return diff --git a/code/modules/clothing/suits/ego_gear/aleph.dm b/code/modules/clothing/suits/ego_gear/aleph.dm index aa99aab52d2d..5e68245bd5dd 100644 --- a/code/modules/clothing/suits/ego_gear/aleph.dm +++ b/code/modules/clothing/suits/ego_gear/aleph.dm @@ -431,8 +431,8 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/ JUSTICE_ATTRIBUTE = 80 ) -/obj/item/clothing/suit/armor/ego_gear/aleph/combust - name = "Combusting Courage" +/obj/item/clothing/suit/armor/ego_gear/aleph/waxen + name = "Waxen Pinion" desc = "However, that alone won’t purge all evil from the world." icon_state = "combust" flags_inv = null diff --git a/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/realizer.dm b/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/realizer.dm index 2d32bea1ef68..723098a9bad6 100644 --- a/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/realizer.dm +++ b/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/realizer.dm @@ -53,7 +53,7 @@ /obj/item/clothing/suit/armor/ego_gear/aleph/smile = /obj/item/clothing/suit/armor/ego_gear/realization/laughter, /obj/item/clothing/suit/armor/ego_gear/aleph/mimicry = /obj/item/clothing/suit/armor/ego_gear/realization/shell, /obj/item/clothing/suit/armor/ego_gear/aleph/space = /obj/item/clothing/suit/armor/ego_gear/realization/fallencolors, - /obj/item/clothing/suit/armor/ego_gear/aleph/combust = /obj/item/clothing/suit/armor/ego_gear/realization/desperation, + /obj/item/clothing/suit/armor/ego_gear/aleph/waxen = /obj/item/clothing/suit/armor/ego_gear/realization/desperation, // Personal /obj/item/managerbullet = /obj/item/clothing/suit/armor/ego_gear/realization/farmwatch, /obj/item/storage/box/fireworks/dangerous = /obj/item/clothing/suit/armor/ego_gear/realization/spicebush,//from smuggler's satchels diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/crying_children.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/crying_children.dm index 01b9734613c0..16b4a2bd5c1b 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/crying_children.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/crying_children.dm @@ -39,7 +39,7 @@ death_sound = 'sound/abnormalities/crying_children/death.ogg' death_message = "crumbles into pieces." del_on_death = FALSE - ego_list = list(/datum/ego_datum/weapon/shield/combust, /datum/ego_datum/armor/combust) + ego_list = list(/datum/ego_datum/weapon/shield/waxen, /datum/ego_datum/armor/waxen) gift_type = /datum/ego_gifts/inconsolable abnormality_origin = ABNORMALITY_ORIGIN_ARTBOOK // I HAVE NO IDEA LOR ORIGIN CODE var/list/children_list = list()