Skip to content

Commit

Permalink
Snow queen and crumbling armor final observation adjustments (#2398)
Browse files Browse the repository at this point in the history
  • Loading branch information
Coxswain-Navigator authored Aug 24, 2024
1 parent b8962a7 commit 519bc38
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/ego_gifts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,8 @@
/datum/ego_gifts/frostcrown
name = "The Winters Kiss"
icon_state = "frostcrown"
fortitude_bonus = 6
prudence_bonus = 6
fortitude_bonus = 2
prudence_bonus = 2
slot = HAT

/datum/ego_gifts/fury
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@
/datum/ego_datum/armor/frostsplinter,
)
gift_type = /datum/ego_gifts/frostcrown
//Gift is rewarded at the end of a duel with Snow Queen.
gift_chance = 100
abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY
var/can_act = TRUE
//The purpose of this variable is to prevent people from ghosting in the arena and making snow queen unworkable.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,23 @@
var/numbermarked
var/meltdown_cooldown //no spamming the meltdown effect
var/meltdown_cooldown_time = 30 SECONDS
var/armor_dispensed

// Hacky code to make the final observation check for a gift type without actually having it as a gift type
/mob/living/simple_animal/hostile/abnormality/crumbling_armor/FinalObservation(mob/living/carbon/human/user)
gift_type = /datum/ego_gifts/recklessCourage
..()
gift_type = null

/mob/living/simple_animal/hostile/abnormality/crumbling_armor/ObservationResult(mob/living/carbon/human/user, condition)
. = ..()
if(condition)
new /obj/item/clothing/suit/armor/ego_gear/he/crumbling_armor(get_turf(user))
var/datum/ego_gifts/recklessCourage/R = new
user.Apply_Gift(R)
if(!armor_dispensed) // You only get one of these. Ever.
new /obj/item/clothing/suit/armor/ego_gear/he/crumbling_armor(get_turf(user))
armor_dispensed = TRUE
datum_reference.observation_ready = FALSE

/mob/living/simple_animal/hostile/abnormality/crumbling_armor/SuccessEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
Expand Down

0 comments on commit 519bc38

Please sign in to comment.