From b84ad2dde831a4aeca175f22aeb6c54c34ce363c Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 30 Jan 2022 10:26:04 +0100 Subject: [PATCH] Removes useless status effect path defines. (#64490) --- code/__DEFINES/status_effects.dm | 172 ++---------------- code/__HELPERS/mobs.dm | 8 +- code/datums/brain_damage/mild.dm | 4 +- code/datums/components/gunpoint.dm | 12 +- code/datums/components/omen.dm | 2 +- code/datums/dna.dm | 4 +- code/datums/mutations/body.dm | 4 +- code/datums/status_effects/buffs.dm | 2 +- code/datums/status_effects/debuffs.dm | 12 +- code/datums/status_effects/neutral.dm | 6 +- code/datums/status_effects/wound_effects.dm | 2 +- code/datums/wounds/bones.dm | 2 +- code/game/area/areas/shuttles.dm | 2 +- code/game/machinery/stasis.dm | 4 +- code/game/objects/effects/powerup.dm | 4 +- code/game/objects/items/defib.dm | 2 +- code/game/objects/items/food/misc.dm | 2 +- code/game/objects/items/hand_items.dm | 6 +- code/game/objects/items/handcuffs.dm | 4 +- code/game/objects/items/his_grace.dm | 4 +- code/game/objects/items/tools/crowbar.dm | 4 +- code/game/objects/items/tools/wirecutters.dm | 4 +- code/game/objects/structures/gym.dm | 4 +- .../changeling/powers/fleshmend.dm | 4 +- code/modules/antagonists/cult/runes.dm | 4 +- .../eldritch_cult/eldritch_magic.dm | 8 +- code/modules/antagonists/gang/gang.dm | 4 +- .../antagonists/valentines/valentine.dm | 4 +- code/modules/assembly/flash.dm | 4 +- .../awaymissions/mission_code/wildwest.dm | 4 +- code/modules/events/fake_virus.dm | 2 +- code/modules/events/heart_attack.dm | 2 +- code/modules/instruments/songs/play_legacy.dm | 2 +- .../instruments/songs/play_synthesized.dm | 2 +- .../mining/equipment/kinetic_crusher.dm | 18 +- .../mining/equipment/regenerative_core.dm | 2 +- .../modules/mining/lavaland/megafauna_loot.dm | 6 +- code/modules/mining/lavaland/tendril_loot.dm | 6 +- .../mob/living/carbon/human/human_defense.dm | 4 +- .../carbon/human/species_types/golems.dm | 2 +- code/modules/mob/living/carbon/inventory.dm | 4 +- code/modules/mob/living/emote.dm | 2 +- .../hostile/megafauna/_megafauna.dm | 4 +- .../hostile/mining_mobs/mining_mobs.dm | 2 +- code/modules/mob/living/status_procs.dm | 72 ++++---- .../guns/energy/kinetic_accelerator.dm | 4 +- code/modules/projectiles/projectile/magic.dm | 4 +- .../reagents/cat2_medicine_reagents.dm | 2 +- .../chemistry/reagents/drug_reagents.dm | 2 +- .../chemistry/reagents/impure_reagents.dm | 4 +- .../chemistry/reagents/other_reagents.dm | 6 +- .../chemistry/reagents/unique/eigenstasium.dm | 2 +- .../reagents/withdrawal/generic_addictions.dm | 10 +- .../xenobiology/crossbreeding/_potions.dm | 4 +- .../xenobiology/crossbreeding/regenerative.dm | 4 +- code/modules/surgery/surgery_step.dm | 2 +- code/modules/unit_tests/combat.dm | 4 +- code/modules/unit_tests/surgeries.dm | 2 +- 58 files changed, 173 insertions(+), 309 deletions(-) diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index e98d918845f..77a2532ba98 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -1,13 +1,11 @@ - -//These are all the different status effects. Use the paths for each effect in the defines. - -#define STATUS_EFFECT_MULTIPLE 0 //if it allows multiple instances of the effect - -#define STATUS_EFFECT_UNIQUE 1 //if it allows only one, preventing new instances - -#define STATUS_EFFECT_REPLACE 2 //if it allows only one, but new instances replace - -#define STATUS_EFFECT_REFRESH 3 // if it only allows one, and new instances just instead refresh the timer +///if it allows multiple instances of the effect +#define STATUS_EFFECT_MULTIPLE 0 +///if it allows only one, preventing new instances +#define STATUS_EFFECT_UNIQUE 1 +///if it allows only one, but new instances replace +#define STATUS_EFFECT_REPLACE 2 +/// if it only allows one, and new instances just instead refresh the timer +#define STATUS_EFFECT_REFRESH 3 ///Processing flags - used to define the speed at which the status will work ///This is fast - 0.2s between ticks (I believe!) @@ -15,147 +13,15 @@ ///This is slower and better for more intensive status effects - 1s between ticks #define STATUS_EFFECT_NORMAL_PROCESS 1 -/////////// -// BUFFS // -/////////// - -#define STATUS_EFFECT_HISGRACE /datum/status_effect/his_grace //His Grace. - -#define STATUS_EFFECT_WISH_GRANTERS_GIFT /datum/status_effect/wish_granters_gift //If you're currently resurrecting with the Wish Granter - -#define STATUS_EFFECT_BLOODDRUNK /datum/status_effect/blooddrunk //Stun immunity and greatly reduced damage taken - -#define STATUS_EFFECT_FLESHMEND /datum/status_effect/fleshmend //Very fast healing; suppressed by fire, and heals less fire damage - -#define STATUS_EFFECT_EXERCISED /datum/status_effect/exercised //Prevents heart disease - -#define STATUS_EFFECT_HIPPOCRATIC_OATH /datum/status_effect/hippocratic_oath //Gives you an aura of healing as well as regrowing the Rod of Asclepius if lost - -#define STATUS_EFFECT_GOOD_MUSIC /datum/status_effect/good_music - -#define STATUS_EFFECT_REGENERATIVE_CORE /datum/status_effect/regenerative_core - -#define STATUS_EFFECT_ANTIMAGIC /datum/status_effect/antimagic //grants antimagic (and reapplies if lost) for the duration - -#define STATUS_EFFECT_DETERMINED /datum/status_effect/determined //currently in a combat high from being seriously wounded - -#define STATUS_EFFECT_LIGHTNINGORB /datum/status_effect/lightningorb //Speed from a lightning orb! - -#define STATUS_EFFECT_MAYHEM /datum/status_effect/mayhem //Total bloodbath. Activated by orb of mayhem pickup/bottle of mayhem item. -///Has had their health buffed 10% to 30% depending if the effect has been reapplied. -#define STATUS_EFFECT_HEALTH_BUFFED /datum/status_effect/limited_buff/health_buff - -///////////// -// DEBUFFS // -///////////// - -#define STATUS_EFFECT_STUN /datum/status_effect/incapacitating/stun //the affected is unable to move or use items - -#define STATUS_EFFECT_KNOCKDOWN /datum/status_effect/incapacitating/knockdown //the affected is unable to stand up - -#define STATUS_EFFECT_IMMOBILIZED /datum/status_effect/incapacitating/immobilized //the affected is unable to move - -#define STATUS_EFFECT_PARALYZED /datum/status_effect/incapacitating/paralyzed //the affected is unable to move, use items, or stand up. - -#define STATUS_EFFECT_INCAPACITATED /datum/status_effect/incapacitating/incapacitated //the incapacitated is unable to perform some basic actions and gets their do_afters canceled - -#define STATUS_EFFECT_UNCONSCIOUS /datum/status_effect/incapacitating/unconscious //the affected is unconscious - -#define STATUS_EFFECT_SLEEPING /datum/status_effect/incapacitating/sleeping //the affected is asleep - -#define STATUS_EFFECT_PACIFY /datum/status_effect/pacify //the affected is pacified, preventing direct hostile actions - -#define STATUS_EFFECT_CHOKINGSTRAND /datum/status_effect/strandling //Choking Strand - -#define STATUS_EFFECT_HISWRATH /datum/status_effect/his_wrath //His Wrath. - -#define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes - -#define STATUS_EFFECT_CRUSHERMARK /datum/status_effect/crusher_mark //if struck with a proto-kinetic crusher, takes a ton of damage - -#define STATUS_EFFECT_SAWBLEED /datum/status_effect/stacking/saw_bleed //if the bleed builds up enough, takes a ton of damage - -#define STATUS_EFFECT_NECKSLICE /datum/status_effect/neck_slice //Creates the flavor messages for the neck-slice - -#define STATUS_EFFECT_CONVULSING /datum/status_effect/convulsing - -#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse -#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured -#define CURSE_SPAWNING 2 //spawns creatures that attack the target only -#define CURSE_WASTING 4 //causes gradual damage -#define CURSE_GRASPING 8 //hands reach out from the sides of the screen, doing damage and stunning if they hit the target - -#define STATUS_EFFECT_GONBOLAPACIFY /datum/status_effect/gonbola_pacify //Gives the user gondola traits while the gonbola is attached to them. - -#define STATUS_EFFECT_SPASMS /datum/status_effect/spasms //causes random muscle spasms - -#define STATUS_EFFECT_DNA_MELT /datum/status_effect/dna_melt //usually does something horrible to you when you hit 100 genetic instability - -#define STATUS_EFFECT_GO_AWAY /datum/status_effect/go_away //makes you launch through walls in a single direction for a while - -#define STATUS_EFFECT_STASIS /datum/status_effect/grouped/stasis //Halts biological functions like bleeding, chemical processing, blood regeneration, walking, etc - -#define STATUS_EFFECT_FAKE_VIRUS /datum/status_effect/fake_virus //gives you fluff messages for cough, sneeze, headache, etc but without an actual virus - -#define STATUS_EFFECT_LIMP /datum/status_effect/limp //For when you have a busted leg (or two!) and want additional slowdown when walking on that leg - -#define STATUS_EFFECT_AMOK /datum/status_effect/amok //Makes the target automatically strike out at adjecent non-heretics. - -#define STATUS_EFFECT_CLOUDSTRUCK /datum/status_effect/cloudstruck //blinds and applies an overlay. - -///Raises click cooldowns for everything you do. -#define STATUS_EFFECT_WOOZY /datum/status_effect/woozy - -///Makes you bleed harder -#define STATUS_EFFECT_HIGHBLOODPRESSURE /datum/status_effect/high_blood_pressure - - -/// makes you seize up. reminds me of this video https://www.youtube.com/watch?v=wvkHIZg_954 -#define STATUS_EFFECT_SEIZURE /datum/status_effect/seizure - - -/// Makes the mob move randomly. -/// Read the documentation for /datum/status_effect/confusion for more information. -#define STATUS_EFFECT_CONFUSION /datum/status_effect/confusion - -//Deals with covering the target in ants. -#define STATUS_EFFECT_ANTS /datum/status_effect/ants - -/// Doubles attack cooldowns on simplemobs and recovery time on megafauna. -#define STATUS_EFFECT_STAGGER /datum/status_effect/stagger - -///////////// -// NEUTRAL // -///////////// - -#define STATUS_EFFECT_CRUSHERDAMAGETRACKING /datum/status_effect/crusher_damage //tracks total kinetic crusher damage on a target - -#define STATUS_EFFECT_SYPHONMARK /datum/status_effect/syphon_mark //tracks kills for the KA death syphon module - -#define STATUS_EFFECT_INLOVE /datum/status_effect/in_love //Displays you as being in love with someone else, and makes hearts appear around them. - -#define STATUS_EFFECT_BOUNTY /datum/status_effect/bounty //rewards the person who added this to the target with refreshed spells and a fair heal - -#define STATUS_EFFECT_HELDUP /datum/status_effect/grouped/heldup // someone is currently pointing a gun at you - -#define STATUS_EFFECT_HOLDUP /datum/status_effect/holdup // you are currently pointing a gun at someone - -#define STATUS_EFFECT_OFFERING /datum/status_effect/offering // you are offering up an item to people - -#define STATUS_EFFECT_HANDSHAKE /datum/status_effect/offering/secret_handshake // you are attempting to perform a secret Family handshake - -#define STATUS_EFFECT_SURRENDER /datum/status_effect/grouped/surrender // gives an alert to quickly surrender - -#define STATUS_EFFECT_EIGEN /datum/status_effect/eigenstasium - -#define STATUS_EFFECT_STONED /datum/status_effect/stoned - -///////////// -// SLIME // -///////////// - -#define STATUS_EFFECT_RAINBOWPROTECTION /datum/status_effect/rainbow_protection //Invulnerable and pacifistic -#define STATUS_EFFECT_SLIMESKIN /datum/status_effect/slimeskin //Increased armor +//several flags for the Necropolis curse status effect +///makes the edges of the target's screen obscured +#define CURSE_BLINDING (1<<0) +///spawns creatures that attack the target only +#define CURSE_SPAWNING (1<<1) +///causes gradual damage +#define CURSE_WASTING (1<<2) +///hands reach out from the sides of the screen, doing damage and stunning if they hit the target +#define CURSE_GRASPING (1<<3) // Grouped effect sources, see also code/__DEFINES/traits.dm @@ -164,7 +30,3 @@ #define STASIS_CHEMICAL_EFFECT "stasis_chemical" #define STASIS_ASCENSION_EFFECT "heretic_ascension" - -// Stasis helpers - -#define IS_IN_STASIS(mob) (mob.has_status_effect(STATUS_EFFECT_STASIS)) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 799b9263a29..a3bc68c6220 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -1,9 +1,9 @@ //check_target_facings() return defines /// Two mobs are facing the same direction #define FACING_SAME_DIR 1 -/// Two mobs are facing each others +/// Two mobs are facing each others #define FACING_EACHOTHER 2 -/// Two mobs one is facing a person, but the other is perpendicular +/// Two mobs one is facing a person, but the other is perpendicular #define FACING_INIT_FACING_TARGET_TARGET_FACING_PERPENDICULAR 3 //Do I win the most informative but also most stupid define award? /proc/random_blood_type() @@ -448,7 +448,7 @@ GLOBAL_LIST_EMPTY(species_list) /proc/ishumanbasic(target) if (!ishuman(target)) return FALSE - + var/mob/living/carbon/human/human_target = target return human_target.dna?.species?.type == /datum/species/human @@ -693,6 +693,8 @@ GLOBAL_LIST_EMPTY(species_list) #define ISADVANCEDTOOLUSER(mob) (HAS_TRAIT(mob, TRAIT_ADVANCEDTOOLUSER) && !HAS_TRAIT(mob, TRAIT_DISCOORDINATED_TOOL_USER)) +#define IS_IN_STASIS(mob) (mob.has_status_effect(/datum/status_effect/grouped/stasis)) + /// Gets the client of the mob, allowing for mocking of the client. /// You only need to use this if you know you're going to be mocking clients somewhere else. #define GET_CLIENT(mob) (##mob.client || ##mob.mock_client) diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 1f7e553f89f..56cb9f5ca6f 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -158,11 +158,11 @@ lose_text = "You feel in control of your muscles again." /datum/brain_trauma/mild/muscle_spasms/on_gain() - owner.apply_status_effect(STATUS_EFFECT_SPASMS) + owner.apply_status_effect(/datum/status_effect/spasms) ..() /datum/brain_trauma/mild/muscle_spasms/on_lose() - owner.remove_status_effect(STATUS_EFFECT_SPASMS) + owner.remove_status_effect(/datum/status_effect/spasms) ..() /datum/brain_trauma/mild/nervous_cough diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 1e64257a6b2..6b49174636a 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -42,8 +42,8 @@ to_chat(target, span_userdanger("[shooter] aims [weapon] point blank at you!")) add_memory_in_range(target, 7, MEMORY_GUNPOINT, list(DETAIL_PROTAGONIST = target, DETAIL_DEUTERAGONIST = shooter, DETAIL_WHAT_BY = weapon), story_value = STORY_VALUE_OKAY, memory_flags = MEMORY_CHECK_BLINDNESS) - shooter.apply_status_effect(STATUS_EFFECT_HOLDUP, shooter) - target.apply_status_effect(STATUS_EFFECT_HELDUP, shooter) + shooter.apply_status_effect(/datum/status_effect/holdup, shooter) + target.apply_status_effect(/datum/status_effect/grouped/heldup, shooter) if(istype(weapon, /obj/item/gun/ballistic/rocketlauncher) && weapon.chambered) if(target.stat == CONSCIOUS && IS_NUKE_OP(shooter) && !IS_NUKE_OP(target) && (locate(/obj/item/disk/nuclear) in target.get_contents()) && shooter.client) @@ -57,8 +57,8 @@ /datum/component/gunpoint/Destroy(force, silent) var/mob/living/shooter = parent - shooter.remove_status_effect(STATUS_EFFECT_HOLDUP) - target.remove_status_effect(STATUS_EFFECT_HELDUP, shooter) + shooter.remove_status_effect(/datum/status_effect/holdup) + target.remove_status_effect(/datum/status_effect/grouped/heldup, shooter) SEND_SIGNAL(target, COMSIG_CLEAR_MOOD_EVENT, "gunpoint") return ..() @@ -124,8 +124,8 @@ /datum/component/gunpoint/proc/async_trigger_reaction() var/mob/living/shooter = parent - shooter.remove_status_effect(STATUS_EFFECT_HOLDUP) // try doing these before the trigger gets pulled since the target (or shooter even) may not exist after pulling the trigger, dig? - target.remove_status_effect(STATUS_EFFECT_HELDUP, shooter) + shooter.remove_status_effect(/datum/status_effect/holdup) // try doing these before the trigger gets pulled since the target (or shooter even) may not exist after pulling the trigger, dig? + target.remove_status_effect(/datum/status_effect/grouped/heldup, shooter) SEND_SIGNAL(target, COMSIG_CLEAR_MOOD_EVENT, "gunpoint") if(point_of_no_return) diff --git a/code/datums/components/omen.dm b/code/datums/components/omen.dm index da6437d1b1e..ce2740d81b0 100644 --- a/code/datums/components/omen.dm +++ b/code/datums/components/omen.dm @@ -65,7 +65,7 @@ if(istype(turf_content, /obj/machinery/door/airlock)) to_chat(living_guy, span_warning("A malevolent force launches your body to the floor...")) var/obj/machinery/door/airlock/darth_airlock = turf_content - living_guy.apply_status_effect(STATUS_EFFECT_PARALYZED, 10) + living_guy.apply_status_effect(/datum/status_effect/incapacitating/paralyzed, 10) INVOKE_ASYNC(darth_airlock, /obj/machinery/door/airlock.proc/close, TRUE) if(!permanent) qdel(src) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 65690843ded..14cd480266e 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -399,7 +399,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(-INFINITY to 0) message = span_boldwarning("You can feel your DNA exploding, we need to do something fast!") if(stability <= 0) - holder.apply_status_effect(STATUS_EFFECT_DNA_MELT) + holder.apply_status_effect(/datum/status_effect/dna_melt) if(message) to_chat(holder, message) @@ -804,7 +804,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) to_chat(src, span_notice("Oh, I actually feel quite alright!")) reagents.add_reagent(/datum/reagent/aslimetoxin, 10) if(6) - apply_status_effect(STATUS_EFFECT_GO_AWAY) + apply_status_effect(/datum/status_effect/go_away) if(7) to_chat(src, span_notice("Oh, I actually feel quite alright!")) ForceContractDisease(new/datum/disease/decloning()) //slow acting, non-viral clone damage based GBS diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index e1ca6d608a4..dd6753166ef 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -389,12 +389,12 @@ /datum/mutation/human/spastic/on_acquiring() if(..()) return - owner.apply_status_effect(STATUS_EFFECT_SPASMS) + owner.apply_status_effect(/datum/status_effect/spasms) /datum/mutation/human/spastic/on_losing() if(..()) return - owner.remove_status_effect(STATUS_EFFECT_SPASMS) + owner.remove_status_effect(/datum/status_effect/spasms) /datum/mutation/human/extrastun name = "Two Left Feet" diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index ca0eef0babc..f3986ef0139 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -35,7 +35,7 @@ if(HG.awakened) graces++ if(!graces) - owner.apply_status_effect(STATUS_EFFECT_HISWRATH) + owner.apply_status_effect(/datum/status_effect/his_wrath) qdel(src) return var/grace_heal = bloodlust * 0.05 diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 90439f347fc..f2f3a2e20f1 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -293,7 +293,7 @@ if(isliving(owner)) var/mob/living/living_owner = owner to_chat(living_owner, span_notice("You succesfuly remove the durathread strand.")) - living_owner.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) + living_owner.remove_status_effect(/datum/status_effect/strandling) //OTHER DEBUFFS /datum/status_effect/pacify @@ -496,7 +496,7 @@ /datum/status_effect/confusion/tick() strength -= 1 if (strength <= 0) - owner.remove_status_effect(STATUS_EFFECT_CONFUSION) + owner.remove_status_effect(/datum/status_effect/confusion) return /datum/status_effect/confusion/proc/set_strength(new_strength) @@ -556,11 +556,11 @@ H.emote(pick("gasp", "gag", "choke")) /mob/living/proc/apply_necropolis_curse(set_curse) - var/datum/status_effect/necropolis_curse/C = has_status_effect(STATUS_EFFECT_NECROPOLIS_CURSE) + var/datum/status_effect/necropolis_curse/C = has_status_effect(/datum/status_effect/necropolis_curse) if(!set_curse) set_curse = pick(CURSE_BLINDING, CURSE_SPAWNING, CURSE_WASTING, CURSE_GRASPING) if(QDELETED(C)) - apply_status_effect(STATUS_EFFECT_NECROPOLIS_CURSE, set_curse) + apply_status_effect(/datum/status_effect/necropolis_curse, set_curse) else C.apply_curse(set_curse) C.duration += 3000 //time added by additional curses @@ -1029,7 +1029,7 @@ /datum/status_effect/ants/proc/ants_washed() SIGNAL_HANDLER - owner.remove_status_effect(STATUS_EFFECT_ANTS) + owner.remove_status_effect(/datum/status_effect/ants) return COMPONENT_CLEANED /datum/status_effect/ants/tick() @@ -1062,7 +1062,7 @@ ants_remaining -= 5 // To balance out the blindness, it'll be a little shorter. ants_remaining-- if(ants_remaining <= 0 || victim.stat >= HARD_CRIT) - victim.remove_status_effect(STATUS_EFFECT_ANTS) //If this person has no more ants on them or are dead, they are no longer affected. + victim.remove_status_effect(/datum/status_effect/ants) //If this person has no more ants on them or are dead, they are no longer affected. /atom/movable/screen/alert/status_effect/ants name = "Ants!" diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index cff2780c39b..01feb573a13 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -130,11 +130,11 @@ icon_state = "aimed" /datum/status_effect/grouped/heldup/on_apply() - owner.apply_status_effect(STATUS_EFFECT_SURRENDER, src) + owner.apply_status_effect(/datum/status_effect/grouped/surrender, src) return ..() /datum/status_effect/grouped/heldup/on_remove() - owner.remove_status_effect(STATUS_EFFECT_SURRENDER, src) + owner.remove_status_effect(/datum/status_effect/grouped/surrender, src) return ..() // holdup is for the person aiming @@ -459,7 +459,7 @@ human_species.randomize_main_appearance_element(human_mob) human_species.randomize_active_underwear(human_mob) - owner.remove_status_effect(STATUS_EFFECT_EIGEN) + owner.remove_status_effect(/datum/status_effect/eigenstasium) //Finally increment cycle current_cycle++ diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm index 01cd7a3da62..216bfe6643d 100644 --- a/code/datums/status_effects/wound_effects.dm +++ b/code/datums/status_effects/wound_effects.dm @@ -70,7 +70,7 @@ return // less limping while we have determination still - var/determined_mod = owner.has_status_effect(STATUS_EFFECT_DETERMINED) ? 0.5 : 1 + var/determined_mod = owner.has_status_effect(/datum/status_effect/determined) ? 0.5 : 1 if(next_leg == left) if(prob(limp_chance_left * determined_mod)) diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index a9064333f6c..5558d9b68b2 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -187,7 +187,7 @@ else limp_slowdown = initial(limp_slowdown) limp_chance = initial(limp_chance) - victim.apply_status_effect(STATUS_EFFECT_LIMP) + victim.apply_status_effect(/datum/status_effect/limp) else if(limb.body_zone in list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) if(limb.current_gauze?.splint_factor) interaction_efficiency_penalty = 1 + ((interaction_efficiency_penalty - 1) * limb.current_gauze.splint_factor) diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index ddd529c6a3f..963a66ccaf3 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -285,4 +285,4 @@ var/mob/living/M = AM M.forceMove(get_turf(LA)) to_chat(M, "You're trapped in a deadly arena! To escape, you'll need to drag a severed head to the escape portals.", confidential = TRUE) - M.apply_status_effect(STATUS_EFFECT_MAYHEM) + M.apply_status_effect(/datum/status_effect/mayhem) diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index 993b914435f..c3c35b18b4b 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -105,13 +105,13 @@ return var/freq = rand(24750, 26550) playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 2, frequency = freq) - target.apply_status_effect(STATUS_EFFECT_STASIS, STASIS_MACHINE_EFFECT) + target.apply_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT) ADD_TRAIT(target, TRAIT_TUMOR_SUPPRESSED, TRAIT_GENERIC) target.extinguish_mob() update_use_power(ACTIVE_POWER_USE) /obj/machinery/stasis/proc/thaw_them(mob/living/target) - target.remove_status_effect(STATUS_EFFECT_STASIS, STASIS_MACHINE_EFFECT) + target.remove_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT) REMOVE_TRAIT(target, TRAIT_TUMOR_SUPPRESSED, TRAIT_GENERIC) if(target == occupant) update_use_power(IDLE_POWER_USE) diff --git a/code/game/objects/effects/powerup.dm b/code/game/objects/effects/powerup.dm index 234989205c0..624ceee12bf 100644 --- a/code/game/objects/effects/powerup.dm +++ b/code/game/objects/effects/powerup.dm @@ -116,7 +116,7 @@ . = ..() if(!.) return - target.apply_status_effect(STATUS_EFFECT_LIGHTNINGORB) + target.apply_status_effect(/datum/status_effect/lightningorb) /obj/effect/powerup/mayhem name = "Orb of Mayhem" @@ -127,4 +127,4 @@ . = ..() if(!.) return - target.apply_status_effect(STATUS_EFFECT_MAYHEM) + target.apply_status_effect(/datum/status_effect/mayhem) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index a8a83a905d0..aece9ae9ba6 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -529,7 +529,7 @@ M.adjustStaminaLoss(60) M.Knockdown(75) M.Jitter(50) - M.apply_status_effect(STATUS_EFFECT_CONVULSING) + M.apply_status_effect(/datum/status_effect/convulsing) playsound(src, 'sound/machines/defib_zap.ogg', 50, TRUE, -1) if(HAS_TRAIT(M,MOB_ORGANIC)) M.emote("gasp") diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index f538c794381..2259b1994ce 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -768,7 +768,7 @@ ///This makes the animal eat the food, and applies the buff status effect to them. /obj/item/food/canned/envirochow/proc/apply_buff(mob/living/simple_animal/hungry_pet, mob/living/dog_mom) - hungry_pet.apply_status_effect(STATUS_EFFECT_HEALTH_BUFFED) //the status effect keeps track of the stacks + hungry_pet.apply_status_effect(/datum/status_effect/limited_buff/health_buff) //the status effect keeps track of the stacks hungry_pet.visible_message( span_notice("[hungry_pet] chows down on [src]."), span_nicegreen("You chow down on [src]."), diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index ceffbd599cc..81132946e2a 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -220,7 +220,7 @@ user.do_attack_animation(slapped) var/slap_volume = 50 - var/datum/status_effect/offering/kiss_check = slapped.has_status_effect(STATUS_EFFECT_OFFERING) + var/datum/status_effect/offering/kiss_check = slapped.has_status_effect(/datum/status_effect/offering) if(kiss_check && istype(kiss_check.offered_item, /obj/item/kisser) && (user in kiss_check.possible_takers)) user.visible_message( span_danger("[user] scoffs at [slapped]'s advance, winds up, and smacks [slapped.p_them()] hard to the ground!"), @@ -306,7 +306,7 @@ offerer.visible_message(span_notice("[offerer] raises [offerer.p_their()] arm, looking for a high-five!"), \ span_notice("You post up, looking for a high-five!"), null, 2) - offerer.apply_status_effect(STATUS_EFFECT_OFFERING, src, /atom/movable/screen/alert/give/highfive) + offerer.apply_status_effect(/datum/status_effect/offering, src, /atom/movable/screen/alert/give/highfive) /// Yeah broh! This is where we do the high-fiving (or high-tenning :o) /obj/item/slapper/on_offer_taken(mob/living/carbon/offerer, mob/living/carbon/taker) @@ -453,7 +453,7 @@ cheek_kiss = (offerer.zone_selected != BODY_ZONE_PRECISE_MOUTH) offerer.visible_message(span_notice("[offerer] leans in slightly, offering a kiss[cheek_kiss ? " on the cheek" : ""]!"), span_notice("You lean in slightly, indicating you'd like to offer a kiss[cheek_kiss ? " on the cheek" : ""]!"), null, 2) - offerer.apply_status_effect(STATUS_EFFECT_OFFERING, src) + offerer.apply_status_effect(/datum/status_effect/offering, src) return TRUE /obj/item/kisser/on_offer_taken(mob/living/carbon/offerer, mob/living/carbon/taker) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index bb8d686d1bb..e5170e4d595 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -488,7 +488,7 @@ /** * A pacifying variant of the bola. * - * It's much harder to remove, doesn't cause a slowdown and gives people STATUS_EFFECT_GONBOLAPACIFY. + * It's much harder to remove, doesn't cause a slowdown and gives people /datum/status_effect/gonbola_pacify. */ /obj/item/restraints/legcuffs/bola/gonbola name = "gonbola" @@ -503,7 +503,7 @@ . = ..() if(iscarbon(hit_atom)) var/mob/living/carbon/C = hit_atom - effectReference = C.apply_status_effect(STATUS_EFFECT_GONBOLAPACIFY) + effectReference = C.apply_status_effect(/datum/status_effect/gonbola_pacify) /obj/item/restraints/legcuffs/bola/gonbola/dropped(mob/user) . = ..() diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 9927280d7b1..e3a040cc9a1 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -106,13 +106,13 @@ master.visible_message(span_boldwarning("[src] turns on [master]!"), "[src] turns on you!") do_attack_animation(master, null, src) master.emote("scream") - master.remove_status_effect(STATUS_EFFECT_HISGRACE) + master.remove_status_effect(/datum/status_effect/his_grace) REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) master.Paralyze(60) master.adjustBruteLoss(master.maxHealth) playsound(master, 'sound/effects/splat.ogg', 100, FALSE) else - master.apply_status_effect(STATUS_EFFECT_HISGRACE) + master.apply_status_effect(/datum/status_effect/his_grace) return forceMove(get_turf(src)) //no you can't put His Grace in a locker you just have to deal with Him if(bloodthirst < HIS_GRACE_CONSUME_OWNER) diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 81f474807e6..143eb8b3161 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -139,11 +139,11 @@ user.visible_message(span_notice("[user] cuts [attacked_carbon]'s restraints with [src]!")) qdel(attacked_carbon.handcuffed) return - else if(istype(attacked_carbon) && attacked_carbon.has_status_effect(STATUS_EFFECT_CHOKINGSTRAND) && tool_behaviour == TOOL_WIRECUTTER) + else if(istype(attacked_carbon) && attacked_carbon.has_status_effect(/datum/status_effect/strandling) && tool_behaviour == TOOL_WIRECUTTER) user.visible_message(span_notice("[user] attempts to cut the durathread strand from around [attacked_carbon]'s neck.")) if(do_after(user, 1.5 SECONDS, attacked_carbon)) user.visible_message(span_notice("[user] succesfully cuts the durathread strand from around [attacked_carbon]'s neck.")) - attacked_carbon.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) + attacked_carbon.remove_status_effect(/datum/status_effect/strandling) playsound(loc, usesound, 50, TRUE, -1) return else diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 593669d7478..0d4b13d387a 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -50,11 +50,11 @@ user.visible_message(span_notice("[user] cuts [attacked_carbon]'s restraints with [src]!")) qdel(attacked_carbon.handcuffed) return - else if(istype(attacked_carbon) && attacked_carbon.has_status_effect(STATUS_EFFECT_CHOKINGSTRAND)) + else if(istype(attacked_carbon) && attacked_carbon.has_status_effect(/datum/status_effect/strandling)) user.visible_message(span_notice("[user] attempts to cut the durathread strand from around [attacked_carbon]'s neck.")) if(do_after(user, 1.5 SECONDS, attacked_carbon)) user.visible_message(span_notice("[user] succesfully cuts the durathread strand from around [attacked_carbon]'s neck.")) - attacked_carbon.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) + attacked_carbon.remove_status_effect(/datum/status_effect/strandling) playsound(loc, usesound, 50, TRUE, -1) return else diff --git a/code/game/objects/structures/gym.dm b/code/game/objects/structures/gym.dm index 45442c024d3..0a37706da97 100644 --- a/code/game/objects/structures/gym.dm +++ b/code/game/objects/structures/gym.dm @@ -17,7 +17,7 @@ if(isliving(user)) var/mob/living/L = user SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise) - L.apply_status_effect(STATUS_EFFECT_EXERCISED) + L.apply_status_effect(/datum/status_effect/exercised) /obj/structure/weightmachine name = "weight machine" @@ -56,7 +56,7 @@ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise) icon_state = initial(icon_state) to_chat(user, finishmessage) - user.apply_status_effect(STATUS_EFFECT_EXERCISED) + user.apply_status_effect(/datum/status_effect/exercised) /obj/structure/weightmachine/stacklifter icon = 'goon/icons/obj/fitness.dmi' diff --git a/code/modules/antagonists/changeling/powers/fleshmend.dm b/code/modules/antagonists/changeling/powers/fleshmend.dm index e19fb348426..2a9c89f1235 100644 --- a/code/modules/antagonists/changeling/powers/fleshmend.dm +++ b/code/modules/antagonists/changeling/powers/fleshmend.dm @@ -10,12 +10,12 @@ //Starts healing you every second for 10 seconds. //Can be used whilst unconscious. /datum/action/changeling/fleshmend/sting_action(mob/living/user) - if(user.has_status_effect(STATUS_EFFECT_FLESHMEND)) + if(user.has_status_effect(/datum/status_effect/fleshmend)) to_chat(user, span_warning("We are already fleshmending!")) return ..() to_chat(user, span_notice("We begin to heal rapidly.")) - user.apply_status_effect(STATUS_EFFECT_FLESHMEND) + user.apply_status_effect(/datum/status_effect/fleshmend) return TRUE //Check buffs.dm for the fleshmend status effect code diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index efae533e74f..07af5ee8a3f 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -809,7 +809,7 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() log_game("Manifest rune failed - user not standing on rune") return list() - if(user.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST)) + if(user.has_status_effect(/datum/status_effect/cultghost)) to_chat(user, "Ghosts can't summon more ghosts!") fail_invoke() log_game("Manifest rune failed - user is a ghost") @@ -845,7 +845,7 @@ structure_check() searches for nearby cultist structures required for the invoca new_human.real_name = ghost_to_spawn.real_name new_human.alpha = 150 //Makes them translucent new_human.equipOutfit(/datum/outfit/ghost_cultist) //give them armor - new_human.apply_status_effect(STATUS_EFFECT_SUMMONEDGHOST) //ghosts can't summon more ghosts + new_human.apply_status_effect(/datum/status_effect/cultghost) //ghosts can't summon more ghosts new_human.see_invisible = SEE_INVISIBLE_OBSERVER ghosts++ playsound(src, 'sound/magic/exit_blood.ogg', 50, TRUE) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm index ec0d5d7252d..19bd3143161 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm @@ -699,8 +699,8 @@ . = ..() if(victim.anti_magic_check() || IS_HERETIC(victim) || IS_HERETIC_MONSTER(victim)) return - victim.apply_status_effect(STATUS_EFFECT_AMOK) - victim.apply_status_effect(STATUS_EFFECT_CLOUDSTRUCK, (level*10)) + victim.apply_status_effect(/datum/status_effect/amok) + victim.apply_status_effect(/datum/status_effect/cloudstruck, (level*10)) if(iscarbon(victim)) var/mob/living/carbon/carbon_victim = victim carbon_victim.reagents.add_reagent(/datum/reagent/eldritch, min(1, 6-level)) @@ -737,7 +737,7 @@ var/mob/living/simple_animal/hostile/eldritch/armsy/prime/outside = new(user.loc,TRUE,segment_length) target.mind.transfer_to(outside, TRUE) target.forceMove(outside) - target.apply_status_effect(STATUS_EFFECT_STASIS,STASIS_ASCENSION_EFFECT) + target.apply_status_effect(/datum/status_effect/grouped/stasis, STASIS_ASCENSION_EFFECT) for(var/mob/living/carbon/human/humie in view(9,outside)-target) if(IS_HERETIC(humie) || IS_HERETIC_MONSTER(humie)) continue @@ -750,7 +750,7 @@ if(iscarbon(mob_inside)) var/mob/living/simple_animal/hostile/eldritch/armsy/prime/armsy = target - if(mob_inside.remove_status_effect(STATUS_EFFECT_STASIS,STASIS_ASCENSION_EFFECT)) + if(mob_inside.remove_status_effect(/datum/status_effect/grouped/stasis, STASIS_ASCENSION_EFFECT)) mob_inside.forceMove(armsy.loc) armsy.mind.transfer_to(mob_inside, TRUE) segment_length = armsy.get_length() diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm index 9b0b2c6ba80..11d11b115b7 100644 --- a/code/modules/antagonists/gang/gang.dm +++ b/code/modules/antagonists/gang/gang.dm @@ -251,7 +251,7 @@ span_notice("You offer to induct people into the Family."), vision_distance = 2, ) - if(human_owner.has_status_effect(STATUS_EFFECT_HANDSHAKE)) + if(human_owner.has_status_effect(/datum/status_effect/offering/secret_handshake)) return FALSE if(!(locate(/mob/living/carbon) in orange(1, owner))) owner.visible_message( @@ -261,7 +261,7 @@ ) return FALSE - human_owner.apply_status_effect(STATUS_EFFECT_HANDSHAKE, secret_handshake_item) + human_owner.apply_status_effect(/datum/status_effect/offering/secret_handshake, secret_handshake_item) return TRUE /datum/antagonist/gang/russian_mafia diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm index 8909f8dab4c..b760b618fe3 100644 --- a/code/modules/antagonists/valentines/valentine.dm +++ b/code/modules/antagonists/valentines/valentine.dm @@ -20,13 +20,13 @@ forge_objectives() if(isliving(owner.current)) var/mob/living/L = owner.current - L.apply_status_effect(STATUS_EFFECT_INLOVE, date.current) + L.apply_status_effect(/datum/status_effect/in_love, date.current) . = ..() /datum/antagonist/valentine/on_removal() if(isliving(owner.current)) var/mob/living/L = owner.current - L.remove_status_effect(STATUS_EFFECT_INLOVE) + L.remove_status_effect(/datum/status_effect/in_love) . = ..() /datum/antagonist/valentine/greet() diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index df8191269ef..2278da60010 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -394,7 +394,7 @@ M.add_confusion(min(M.get_confusion() + 10, 20)) M.dizziness += min(M.dizziness + 10, 20) M.adjust_drowsyness(min(M.drowsyness+10, 20)) - M.apply_status_effect(STATUS_EFFECT_PACIFY, 100) + M.apply_status_effect(/datum/status_effect/pacify, 100) else M.apply_status_effect(/datum/status_effect/trance, 200, TRUE) @@ -408,7 +408,7 @@ M.add_confusion(min(M.get_confusion() + 4, 20)) M.dizziness += min(M.dizziness + 4, 20) M.adjust_drowsyness(min(M.drowsyness+4, 20)) - M.apply_status_effect(STATUS_EFFECT_PACIFY, 40) + M.apply_status_effect(/datum/status_effect/pacify, 40) #undef CONFUSION_STACK_MAX_MULTIPLIER #undef DEVIATION_NONE diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 761f809d92b..fb56096cf77 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -166,8 +166,8 @@ if(!C.stat) to_chat(C, span_notice("You're not dead yet!")) return - if(C.has_status_effect(STATUS_EFFECT_WISH_GRANTERS_GIFT)) + if(C.has_status_effect(/datum/status_effect/wish_granters_gift)) to_chat(C, span_warning("You're already resurrecting!")) return - C.apply_status_effect(STATUS_EFFECT_WISH_GRANTERS_GIFT) + C.apply_status_effect(/datum/status_effect/wish_granters_gift) return 1 diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index 4d6a8f4ea7b..a582832a0b6 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -16,7 +16,7 @@ if(defacto_min)// event will hit 1-3 people by default, but will do 1-2 or just 1 if only those many candidates are available for(var/i in 1 to rand(1,defacto_min)) var/mob/living/carbon/human/hypochondriac = pick(fake_virus_victims) - hypochondriac.apply_status_effect(STATUS_EFFECT_FAKE_VIRUS) + hypochondriac.apply_status_effect(/datum/status_effect/fake_virus) fake_virus_victims -= hypochondriac announce_to_ghosts(hypochondriac) diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 7e2568fa111..8a29e7d3ac1 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -8,7 +8,7 @@ /datum/round_event/heart_attack/start() var/list/heart_attack_contestants = list() for(var/mob/living/carbon/human/victim in shuffle(GLOB.player_list)) - if(victim.stat == DEAD || HAS_TRAIT(victim, TRAIT_CRITICAL_CONDITION) || !victim.can_heartattack() || victim.has_status_effect(STATUS_EFFECT_EXERCISED) || (/datum/disease/heart_failure in victim.diseases) || victim.undergoing_cardiac_arrest()) + if(victim.stat == DEAD || HAS_TRAIT(victim, TRAIT_CRITICAL_CONDITION) || !victim.can_heartattack() || victim.has_status_effect(/datum/status_effect/exercised) || (/datum/disease/heart_failure in victim.diseases) || victim.undergoing_cardiac_arrest()) continue if(!(victim.mind.assigned_role.job_flags & JOB_CREW_MEMBER))//only crewmembers can get one, a bit unfair for some ghost roles and it wastes the event continue diff --git a/code/modules/instruments/songs/play_legacy.dm b/code/modules/instruments/songs/play_legacy.dm index c3664aca3be..dbcdf2a7420 100644 --- a/code/modules/instruments/songs/play_legacy.dm +++ b/code/modules/instruments/songs/play_legacy.dm @@ -84,7 +84,7 @@ var/mob/M = i if(player && HAS_TRAIT(player, TRAIT_MUSICIAN) && isliving(M)) var/mob/living/L = M - L.apply_status_effect(STATUS_EFFECT_GOOD_MUSIC) + L.apply_status_effect(/datum/status_effect/good_music) if(!(M?.client?.prefs?.toggles & SOUND_INSTRUMENTS)) continue M.playsound_local(source, null, volume * using_instrument.volume_multiplier, S = music_played) diff --git a/code/modules/instruments/songs/play_synthesized.dm b/code/modules/instruments/songs/play_synthesized.dm index 12062fc5db3..5d5f43a9ba0 100644 --- a/code/modules/instruments/songs/play_synthesized.dm +++ b/code/modules/instruments/songs/play_synthesized.dm @@ -64,7 +64,7 @@ var/mob/M = i if(player && HAS_TRAIT(player, TRAIT_MUSICIAN) && isliving(M)) var/mob/living/L = M - L.apply_status_effect(STATUS_EFFECT_GOOD_MUSIC) + L.apply_status_effect(/datum/status_effect/good_music) if(!(M?.client?.prefs?.toggles & SOUND_INSTRUMENTS)) continue M.playsound_local(get_turf(parent), null, volume, FALSE, K.frequency, null, channel, null, copy) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 3220943e641..07ab3a3ce3e 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -84,9 +84,9 @@ to_chat(user, span_warning("[src] is too heavy to use with one hand! You fumble and drop everything.")) user.drop_all_held_items() return - var/datum/status_effect/crusher_damage/C = target.has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) + var/datum/status_effect/crusher_damage/C = target.has_status_effect(/datum/status_effect/crusher_damage) if(!C) - C = target.apply_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) + C = target.apply_status_effect(/datum/status_effect/crusher_damage) var/target_health = target.health ..() for(var/t in trophies) @@ -120,12 +120,12 @@ return if(proximity_flag && isliving(target)) var/mob/living/L = target - var/datum/status_effect/crusher_mark/CM = L.has_status_effect(STATUS_EFFECT_CRUSHERMARK) - if(!CM || CM.hammer_synced != src || !L.remove_status_effect(STATUS_EFFECT_CRUSHERMARK)) + var/datum/status_effect/crusher_mark/CM = L.has_status_effect(/datum/status_effect/crusher_mark) + if(!CM || CM.hammer_synced != src || !L.remove_status_effect(/datum/status_effect/crusher_mark)) return - var/datum/status_effect/crusher_damage/C = L.has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) + var/datum/status_effect/crusher_damage/C = L.has_status_effect(/datum/status_effect/crusher_damage) if(!C) - C = L.apply_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) + C = L.apply_status_effect(/datum/status_effect/crusher_damage) var/target_health = L.health for(var/t in trophies) var/obj/item/crusher_trophy/T = t @@ -188,8 +188,8 @@ /obj/projectile/destabilizer/on_hit(atom/target, blocked = FALSE) if(isliving(target)) var/mob/living/L = target - var/had_effect = (L.has_status_effect(STATUS_EFFECT_CRUSHERMARK)) //used as a boolean - var/datum/status_effect/crusher_mark/CM = L.apply_status_effect(STATUS_EFFECT_CRUSHERMARK, hammer_synced) + var/had_effect = (L.has_status_effect(/datum/status_effect/crusher_mark)) //used as a boolean + var/datum/status_effect/crusher_mark/CM = L.apply_status_effect(/datum/status_effect/crusher_mark, hammer_synced) if(hammer_synced) for(var/t in hammer_synced.trophies) var/obj/item/crusher_trophy/T = t @@ -343,7 +343,7 @@ return "mark detonation to grant stun immunity and 90% damage reduction for 1 second" /obj/item/crusher_trophy/miner_eye/on_mark_detonation(mob/living/target, mob/living/user) - user.apply_status_effect(STATUS_EFFECT_BLOODDRUNK) + user.apply_status_effect(/datum/status_effect/blooddrunk) //ash drake /obj/item/crusher_trophy/tail_spike diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index e22a9e48fad..b83ea119c4b 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -87,7 +87,7 @@ else to_chat(user, span_notice("You start to smear [src] on yourself. Disgusting tendrils hold you together and allow you to keep moving, but for how long?")) SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self")) - H.apply_status_effect(STATUS_EFFECT_REGENERATIVE_CORE) + H.apply_status_effect(/datum/status_effect/regenerative_core) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman) //Now THIS is a miner buff (fixed - nerf) qdel(src) diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index 03ef28533e2..a4845398d2b 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -253,7 +253,7 @@ /obj/item/mayhem/attack_self(mob/user) for(var/mob/living/carbon/human/target in range(7,user)) - target.apply_status_effect(STATUS_EFFECT_MAYHEM) + target.apply_status_effect(/datum/status_effect/mayhem) to_chat(user, span_notice("You shatter the bottle!")) playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, TRUE) message_admins(span_adminnotice("[ADMIN_LOOKUPFLW(user)] has activated a bottle of mayhem!")) @@ -908,11 +908,11 @@ /obj/item/melee/cleaving_saw/proc/nemesis_effects(mob/living/user, mob/living/target) if(istype(target, /mob/living/simple_animal/hostile/asteroid/elite)) return - var/datum/status_effect/stacking/saw_bleed/existing_bleed = target.has_status_effect(STATUS_EFFECT_SAWBLEED) + var/datum/status_effect/stacking/saw_bleed/existing_bleed = target.has_status_effect(/datum/status_effect/stacking/saw_bleed) if(existing_bleed) existing_bleed.add_stacks(bleed_stacks_per_hit) else - target.apply_status_effect(STATUS_EFFECT_SAWBLEED, bleed_stacks_per_hit) + target.apply_status_effect(/datum/status_effect/stacking/saw_bleed, bleed_stacks_per_hit) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 8738b7d7ac6..81171035567 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -82,7 +82,7 @@ return var/mob/living/carbon/itemUser = user usedHand = itemUser.get_held_index_of_item(src) - if(itemUser.has_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH)) + if(itemUser.has_status_effect(/datum/status_effect/hippocratic_oath)) to_chat(user, span_warning("You can't possibly handle the responsibility of more than one rod!")) return var/failText = span_warning("The snake seems unsatisfied with your incomplete oath and returns to its previous place on the rod, returning to its dormant, wooden state. You must stand still while completing your oath!") @@ -108,7 +108,7 @@ to_chat(itemUser, failText) return to_chat(itemUser, span_notice("The snake, satisfied with your oath, attaches itself and the rod to your forearm with an inseparable grip. Your thoughts seem to only revolve around the core idea of helping others, and harm is nothing more than a distant, wicked memory...")) - var/datum/status_effect/hippocratic_oath/effect = itemUser.apply_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH) + var/datum/status_effect/hippocratic_oath/effect = itemUser.apply_status_effect(/datum/status_effect/hippocratic_oath) effect.hand = usedHand activated() @@ -770,7 +770,7 @@ balloon_alert(ranged_ability_user, "invalid target!") return var/mob/living/living_target = target - living_target.apply_status_effect(STATUS_EFFECT_STAGGER) + living_target.apply_status_effect(/datum/status_effect/stagger) var/datum/status_effect/agent_pinpointer/scan_pinpointer = ranged_ability_user.apply_status_effect(/datum/status_effect/agent_pinpointer/scan) scan_pinpointer.scan_target = living_target living_target.Jitter(5 SECONDS) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 859eaacf613..de130730343 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -698,11 +698,11 @@ return if(src == M) - if(has_status_effect(STATUS_EFFECT_CHOKINGSTRAND)) + if(has_status_effect(/datum/status_effect/strandling)) to_chat(src, span_notice("You attempt to remove the durathread strand from around your neck.")) if(do_after(src, 3.5 SECONDS, src)) to_chat(src, span_notice("You succesfuly remove the durathread strand.")) - remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) + remove_status_effect(/datum/status_effect/strandling) return check_self_for_injuries() diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index ddc64fa170d..f7e2d36d5f1 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -1066,7 +1066,7 @@ /datum/species/golem/durathread/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target) . = ..() - target.apply_status_effect(STATUS_EFFECT_CHOKINGSTRAND) + target.apply_status_effect(/datum/status_effect/strandling) /datum/species/golem/bone name = "Bone Golem" diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 2f0722b2ec3..db4606660b5 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -172,7 +172,7 @@ to_chat(src, span_warning("You're unable to offer anything in your current state!")) return - if(has_status_effect(STATUS_EFFECT_OFFERING)) + if(has_status_effect(/datum/status_effect/offering)) to_chat(src, span_warning("You're already offering up something!")) return @@ -182,7 +182,7 @@ visible_message(span_notice("[src] is offering [offered_item]."), \ span_notice("You offer [offered_item]."), null, 2) - apply_status_effect(STATUS_EFFECT_OFFERING, offered_item) + apply_status_effect(/datum/status_effect/offering, offered_item) /** * Proc called when the player clicks the give alert diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index b044776ac86..29e466a3016 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -371,7 +371,7 @@ if(. && isliving(user)) var/mob/living/L = user L.Paralyze(200) - L.remove_status_effect(STATUS_EFFECT_SURRENDER) + L.remove_status_effect(/datum/status_effect/grouped/surrender) /datum/emote/living/sway key = "sway" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm index 1f348584eae..37354b56633 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm @@ -85,7 +85,7 @@ /mob/living/simple_animal/hostile/megafauna/death(gibbed, list/force_grant) if(health > 0) return - var/datum/status_effect/crusher_damage/crusher_dmg = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) + var/datum/status_effect/crusher_damage/crusher_dmg = has_status_effect(/datum/status_effect/crusher_damage) var/crusher_kill = FALSE if(crusher_dmg && crusher_loot && crusher_dmg.total_damage >= maxHealth * 0.6) spawn_crusher_loot() @@ -155,7 +155,7 @@ /// Sets/adds the next time the megafauna can use a melee or ranged attack, in deciseconds. It is a list to allow using named args. Use the ignore_staggered var if youre setting the cooldown to ranged_cooldown_time. /mob/living/simple_animal/hostile/megafauna/proc/update_cooldowns(list/cooldown_updates, ignore_staggered = FALSE) - if(!ignore_staggered && has_status_effect(STATUS_EFFECT_STAGGER)) + if(!ignore_staggered && has_status_effect(/datum/status_effect/stagger)) for(var/update in cooldown_updates) cooldown_updates[update] *= 2 if(cooldown_updates[COOLDOWN_UPDATE_SET_MELEE]) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm index 8cb3cea04ff..a2d565ad0fe 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm @@ -53,7 +53,7 @@ /mob/living/simple_animal/hostile/asteroid/death(gibbed) SSblackbox.record_feedback("tally", "mobs_killed_mining", 1, type) - var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) + var/datum/status_effect/crusher_damage/C = has_status_effect(/datum/status_effect/crusher_damage) if(C && crusher_loot && prob((C.total_damage/maxHealth) * crusher_drop_mod)) //on average, you'll need to kill 4 creatures before getting the item spawn_crusher_loot() ..(gibbed) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index a71b4712801..2e96cf1932c 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -6,7 +6,7 @@ /* STUN */ /mob/living/proc/IsStun() //If we're stunned - return has_status_effect(STATUS_EFFECT_STUN) + return has_status_effect(/datum/status_effect/incapacitating/stun) /mob/living/proc/AmountStun() //How many deciseconds remain in our stun var/datum/status_effect/incapacitating/stun/S = IsStun() @@ -25,7 +25,7 @@ if(S) S.duration = max(world.time + amount, S.duration) else if(amount > 0) - S = apply_status_effect(STATUS_EFFECT_STUN, amount) + S = apply_status_effect(/datum/status_effect/incapacitating/stun, amount) return S /mob/living/proc/SetStun(amount, ignore_canstun = FALSE) //Sets remaining duration @@ -43,7 +43,7 @@ if(S) S.duration = world.time + amount else - S = apply_status_effect(STATUS_EFFECT_STUN, amount) + S = apply_status_effect(/datum/status_effect/incapacitating/stun, amount) return S /mob/living/proc/AdjustStun(amount, ignore_canstun = FALSE) //Adds to remaining duration @@ -57,12 +57,12 @@ if(S) S.duration += amount else if(amount > 0) - S = apply_status_effect(STATUS_EFFECT_STUN, amount) + S = apply_status_effect(/datum/status_effect/incapacitating/stun, amount) return S /* KNOCKDOWN */ /mob/living/proc/IsKnockdown() //If we're knocked down - return has_status_effect(STATUS_EFFECT_KNOCKDOWN) + return has_status_effect(/datum/status_effect/incapacitating/knockdown) /mob/living/proc/AmountKnockdown() //How many deciseconds remain in our knockdown var/datum/status_effect/incapacitating/knockdown/K = IsKnockdown() @@ -71,7 +71,7 @@ return 0 /mob/living/proc/Knockdown(amount, ignore_canstun = FALSE) //Can't go below remaining duration - if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_KNOCKDOWN, amount, ignore_canstun) & COMPONENT_NO_STUN) + if(SEND_SIGNAL(src, /datum/status_effect/incapacitating/knockdown, amount, ignore_canstun) & COMPONENT_NO_STUN) return if(IS_STUN_IMMUNE(src, ignore_canstun)) return @@ -81,7 +81,7 @@ if(K) K.duration = max(world.time + amount, K.duration) else if(amount > 0) - K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount) + K = apply_status_effect(/datum/status_effect/incapacitating/knockdown, amount) return K /mob/living/proc/SetKnockdown(amount, ignore_canstun = FALSE) //Sets remaining duration @@ -99,7 +99,7 @@ if(K) K.duration = world.time + amount else - K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount) + K = apply_status_effect(/datum/status_effect/incapacitating/knockdown, amount) return K /mob/living/proc/AdjustKnockdown(amount, ignore_canstun = FALSE) //Adds to remaining duration @@ -113,12 +113,12 @@ if(K) K.duration += amount else if(amount > 0) - K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount) + K = apply_status_effect(/datum/status_effect/incapacitating/knockdown, amount) return K /* IMMOBILIZED */ /mob/living/proc/IsImmobilized() //If we're immobilized - return has_status_effect(STATUS_EFFECT_IMMOBILIZED) + return has_status_effect(/datum/status_effect/incapacitating/immobilized) /mob/living/proc/AmountImmobilized() //How many deciseconds remain in our Immobilized status effect var/datum/status_effect/incapacitating/immobilized/I = IsImmobilized() @@ -137,7 +137,7 @@ if(I) I.duration = max(world.time + amount, I.duration) else if(amount > 0) - I = apply_status_effect(STATUS_EFFECT_IMMOBILIZED, amount) + I = apply_status_effect(/datum/status_effect/incapacitating/immobilized, amount) return I /mob/living/proc/SetImmobilized(amount, ignore_canstun = FALSE) //Sets remaining duration @@ -155,7 +155,7 @@ if(I) I.duration = world.time + amount else - I = apply_status_effect(STATUS_EFFECT_IMMOBILIZED, amount) + I = apply_status_effect(/datum/status_effect/incapacitating/immobilized, amount) return I /mob/living/proc/AdjustImmobilized(amount, ignore_canstun = FALSE) //Adds to remaining duration @@ -169,12 +169,12 @@ if(I) I.duration += amount else if(amount > 0) - I = apply_status_effect(STATUS_EFFECT_IMMOBILIZED, amount) + I = apply_status_effect(/datum/status_effect/incapacitating/immobilized, amount) return I /* PARALYZED */ /mob/living/proc/IsParalyzed() //If we're paralyzed - return has_status_effect(STATUS_EFFECT_PARALYZED) + return has_status_effect(/datum/status_effect/incapacitating/paralyzed) /mob/living/proc/AmountParalyzed() //How many deciseconds remain in our Paralyzed status effect var/datum/status_effect/incapacitating/paralyzed/P = IsParalyzed(FALSE) @@ -193,7 +193,7 @@ if(P) P.duration = max(world.time + amount, P.duration) else if(amount > 0) - P = apply_status_effect(STATUS_EFFECT_PARALYZED, amount) + P = apply_status_effect(/datum/status_effect/incapacitating/paralyzed, amount) return P /mob/living/proc/SetParalyzed(amount, ignore_canstun = FALSE) //Sets remaining duration @@ -211,7 +211,7 @@ if(P) P.duration = world.time + amount else - P = apply_status_effect(STATUS_EFFECT_PARALYZED, amount) + P = apply_status_effect(/datum/status_effect/incapacitating/paralyzed, amount) return P /mob/living/proc/AdjustParalyzed(amount, ignore_canstun = FALSE) //Adds to remaining duration @@ -225,7 +225,7 @@ if(P) P.duration += amount else if(amount > 0) - P = apply_status_effect(STATUS_EFFECT_PARALYZED, amount) + P = apply_status_effect(/datum/status_effect/incapacitating/paralyzed, amount) return P /* INCAPACITATED */ @@ -233,7 +233,7 @@ /// Proc that returns the remaining duration of the status efect in deciseconds. /mob/living/proc/amount_incapacitated() - var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(STATUS_EFFECT_INCAPACITATED) + var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(/datum/status_effect/incapacitating/incapacitated) if (incapacitated_status_effect) return incapacitated_status_effect.duration - world.time else @@ -249,11 +249,11 @@ return if(absorb_stun(amount, ignore_canstun)) return - var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(STATUS_EFFECT_INCAPACITATED) + var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(/datum/status_effect/incapacitating/incapacitated) if(incapacitated_status_effect) incapacitated_status_effect.duration = max(world.time + amount, incapacitated_status_effect.duration) else if(amount > 0) - incapacitated_status_effect = apply_status_effect(STATUS_EFFECT_INCAPACITATED, amount) + incapacitated_status_effect = apply_status_effect(/datum/status_effect/incapacitating/incapacitated, amount) return incapacitated_status_effect /** Proc that set the incapacitated status effect's remaining duration to a certain time. @@ -265,7 +265,7 @@ /mob/living/proc/set_incapacitated(amount, ignore_canstun = FALSE) if(IS_STUN_IMMUNE(src, ignore_canstun)) return - var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(STATUS_EFFECT_INCAPACITATED) + var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(/datum/status_effect/incapacitating/incapacitated) if(amount <= 0) if(incapacitated_status_effect) qdel(incapacitated_status_effect) @@ -275,7 +275,7 @@ if(incapacitated_status_effect) incapacitated_status_effect.duration = world.time + amount else - incapacitated_status_effect = apply_status_effect(STATUS_EFFECT_INCAPACITATED, amount) + incapacitated_status_effect = apply_status_effect(/datum/status_effect/incapacitating/incapacitated, amount) return incapacitated_status_effect /** Proc that adds duration to an incapacitated status effect. @@ -289,11 +289,11 @@ return if(absorb_stun(amount, ignore_canstun)) return - var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(STATUS_EFFECT_INCAPACITATED) + var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(/datum/status_effect/incapacitating/incapacitated) if(incapacitated_status_effect) incapacitated_status_effect.duration += amount else if(amount > 0) - incapacitated_status_effect = apply_status_effect(STATUS_EFFECT_INCAPACITATED, amount) + incapacitated_status_effect = apply_status_effect(/datum/status_effect/incapacitating/incapacitated, amount) return incapacitated_status_effect //Blanket @@ -320,7 +320,7 @@ /* UNCONSCIOUS */ /mob/living/proc/IsUnconscious() //If we're unconscious - return has_status_effect(STATUS_EFFECT_UNCONSCIOUS) + return has_status_effect(/datum/status_effect/incapacitating/unconscious) /mob/living/proc/AmountUnconscious() //How many deciseconds remain in our unconsciousness var/datum/status_effect/incapacitating/unconscious/U = IsUnconscious() @@ -337,7 +337,7 @@ if(U) U.duration = max(world.time + amount, U.duration) else if(amount > 0) - U = apply_status_effect(STATUS_EFFECT_UNCONSCIOUS, amount) + U = apply_status_effect(/datum/status_effect/incapacitating/unconscious, amount) return U /mob/living/proc/SetUnconscious(amount, ignore_canstun = FALSE) //Sets remaining duration @@ -352,7 +352,7 @@ else if(U) U.duration = world.time + amount else - U = apply_status_effect(STATUS_EFFECT_UNCONSCIOUS, amount) + U = apply_status_effect(/datum/status_effect/incapacitating/unconscious, amount) return U /mob/living/proc/AdjustUnconscious(amount, ignore_canstun = FALSE) //Adds to remaining duration @@ -364,13 +364,13 @@ if(U) U.duration += amount else if(amount > 0) - U = apply_status_effect(STATUS_EFFECT_UNCONSCIOUS, amount) + U = apply_status_effect(/datum/status_effect/incapacitating/unconscious, amount) return U /* SLEEPING */ /mob/living/proc/IsSleeping() //If we're asleep if(!HAS_TRAIT(src, TRAIT_SLEEPIMMUNE)) - return has_status_effect(STATUS_EFFECT_SLEEPING) + return has_status_effect(/datum/status_effect/incapacitating/sleeping) /mob/living/proc/AmountSleeping() //How many deciseconds remain in our sleep var/datum/status_effect/incapacitating/sleeping/S = IsSleeping() @@ -387,7 +387,7 @@ if(S) S.duration = max(world.time + amount, S.duration) else if(amount > 0) - S = apply_status_effect(STATUS_EFFECT_SLEEPING, amount) + S = apply_status_effect(/datum/status_effect/incapacitating/sleeping, amount) return S /mob/living/proc/SetSleeping(amount) //Sets remaining duration @@ -402,7 +402,7 @@ else if(S) S.duration = world.time + amount else - S = apply_status_effect(STATUS_EFFECT_SLEEPING, amount) + S = apply_status_effect(/datum/status_effect/incapacitating/sleeping, amount) return S /mob/living/proc/AdjustSleeping(amount) //Adds to remaining duration @@ -414,7 +414,7 @@ if(S) S.duration += amount else if(amount > 0) - S = apply_status_effect(STATUS_EFFECT_SLEEPING, amount) + S = apply_status_effect(/datum/status_effect/incapacitating/sleeping, amount) return S ///Allows us to set a permanent sleep on a player (use with caution and remember to unset it with SetSleeping() after the effect is over) @@ -427,7 +427,7 @@ if(S) S.duration = -1 else - S = apply_status_effect(STATUS_EFFECT_SLEEPING, -1) + S = apply_status_effect(/datum/status_effect/incapacitating/sleeping, -1) return S ///////////////////////// CLEAR STATUS ///////////////////////// @@ -607,7 +607,7 @@ /// Gets the amount of confusion on the mob. /mob/living/proc/get_confusion() - var/datum/status_effect/confusion/confusion = has_status_effect(STATUS_EFFECT_CONFUSION) + var/datum/status_effect/confusion/confusion = has_status_effect(/datum/status_effect/confusion) return confusion ? confusion.strength : 0 /// Set the confusion of the mob. Confusion will make the mob walk randomly. @@ -615,10 +615,10 @@ new_confusion = max(new_confusion, 0) if (new_confusion) - var/datum/status_effect/confusion/confusion_status = has_status_effect(STATUS_EFFECT_CONFUSION) || apply_status_effect(STATUS_EFFECT_CONFUSION) + var/datum/status_effect/confusion/confusion_status = has_status_effect(/datum/status_effect/confusion) || apply_status_effect(/datum/status_effect/confusion) confusion_status.set_strength(new_confusion) else - remove_status_effect(STATUS_EFFECT_CONFUSION) + remove_status_effect(/datum/status_effect/confusion) /// Add confusion to the mob. Confusion will make the mob walk randomly. /// Shorthand for set_confusion(confusion + x). diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index aebed2809f3..5c3ce77b736 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -496,13 +496,13 @@ /obj/item/borg/upgrade/modkit/bounty/projectile_prehit(obj/projectile/kinetic/K, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) if(isliving(target)) var/mob/living/L = target - var/list/existing_marks = L.has_status_effect_list(STATUS_EFFECT_SYPHONMARK) + var/list/existing_marks = L.has_status_effect_list(/datum/status_effect/syphon_mark) for(var/i in existing_marks) var/datum/status_effect/syphon_mark/SM = i if(SM.reward_target == src) //we want to allow multiple people with bounty modkits to use them, but we need to replace our own marks so we don't multi-reward SM.reward_target = null qdel(SM) - L.apply_status_effect(STATUS_EFFECT_SYPHONMARK, src) + L.apply_status_effect(/datum/status_effect/syphon_mark, src) /obj/item/borg/upgrade/modkit/bounty/projectile_strike(obj/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) if(isliving(target)) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 67b076b1762..c29afbc162f 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -339,7 +339,7 @@ if(L.anti_magic_check() || !firer) L.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK - L.apply_status_effect(STATUS_EFFECT_BOUNTY, firer) + L.apply_status_effect(/datum/status_effect/bounty, firer) /obj/projectile/magic/antimagic name = "bolt of antimagic" @@ -352,7 +352,7 @@ if(L.anti_magic_check()) L.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK - L.apply_status_effect(STATUS_EFFECT_ANTIMAGIC) + L.apply_status_effect(/datum/status_effect/antimagic ) /obj/projectile/magic/fetch name = "bolt of fetching" diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 37f55e26574..4aa7f4bc50e 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -87,7 +87,7 @@ /datum/reagent/medicine/c2/helbital/on_mob_delete(mob/living/L) if(helbent) - L.remove_status_effect(STATUS_EFFECT_NECROPOLIS_CURSE) + L.remove_status_effect(/datum/status_effect/necropolis_curse) ..() /datum/reagent/medicine/c2/libital //messes with your liber diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 59983bc73e7..71686778ae6 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -677,7 +677,7 @@ return if(HAS_TRAIT(invisible_man, TRAIT_NOMETABOLISM)) return - if(invisible_man.has_status_effect(STATUS_EFFECT_STASIS)) + if(invisible_man.has_status_effect(/datum/status_effect/grouped/stasis)) return ADD_TRAIT(invisible_man, TRAIT_INVISIBLE_MAN, name) diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents.dm index 7de92d44cb0..45fb497de7e 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents.dm @@ -103,7 +103,7 @@ cube.color = COLOR_CYAN cube.set_anchored(TRUE) owner.forceMove(cube) - owner.apply_status_effect(STATUS_EFFECT_STASIS, STASIS_CHEMICAL_EFFECT) + owner.apply_status_effect(/datum/status_effect/grouped/stasis, STASIS_CHEMICAL_EFFECT) cryostylane_alert = owner.throw_alert("cryostylane_alert", /atom/movable/screen/alert/status_effect/freon/cryostylane) cryostylane_alert.attached_effect = src //so the alert can reference us, if it needs to ..() @@ -117,6 +117,6 @@ /datum/reagent/inverse/cryostylane/on_mob_delete(mob/living/carbon/owner, amount) QDEL_NULL(cube) - owner.remove_status_effect(STATUS_EFFECT_STASIS, STASIS_CHEMICAL_EFFECT) + owner.remove_status_effect(/datum/status_effect/grouped/stasis, STASIS_CHEMICAL_EFFECT) owner.clear_alert("cryostylane_alert") ..() diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index f7232352352..037d60f3094 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2668,13 +2668,13 @@ var/datum/wound/W = thing stam_crash += (W.severity + 1) * 3 // spike of 3 stam damage per wound severity (moderate = 6, severe = 9, critical = 12) when the determination wears off if it was a combat rush M.adjustStaminaLoss(stam_crash) - M.remove_status_effect(STATUS_EFFECT_DETERMINED) + M.remove_status_effect(/datum/status_effect/determined) ..() /datum/reagent/determination/on_mob_life(mob/living/carbon/M, delta_time, times_fired) if(!significant && volume >= WOUND_DETERMINATION_SEVERE) significant = TRUE - M.apply_status_effect(STATUS_EFFECT_DETERMINED) // in addition to the slight healing, limping cooldowns are divided by 4 during the combat high + M.apply_status_effect(/datum/status_effect/determined) // in addition to the slight healing, limping cooldowns are divided by 4 during the combat high volume = min(volume, WOUND_DETERMINATION_MAX) @@ -2769,7 +2769,7 @@ return if(methods & (PATCH|TOUCH|VAPOR)) amount_left = round(reac_volume,0.1) - exposed_mob.apply_status_effect(STATUS_EFFECT_ANTS, amount_left) + exposed_mob.apply_status_effect(/datum/status_effect/ants, amount_left) /datum/reagent/ants/expose_obj(obj/exposed_obj, reac_volume) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/unique/eigenstasium.dm b/code/modules/reagents/chemistry/reagents/unique/eigenstasium.dm index 5af92d00c87..f65ab66ade2 100644 --- a/code/modules/reagents/chemistry/reagents/unique/eigenstasium.dm +++ b/code/modules/reagents/chemistry/reagents/unique/eigenstasium.dm @@ -99,7 +99,7 @@ metabolization_rate += 0.5 //So you're not stuck forever teleporting. if(iscarbon(living_mob)) var/mob/living/carbon/carbon_mob = living_mob - carbon_mob.apply_status_effect(STATUS_EFFECT_EIGEN) + carbon_mob.apply_status_effect(/datum/status_effect/eigenstasium) return ..() /datum/reagent/eigenstate/overdose_process(mob/living/living_mob) //Overdose, makes you teleport randomly diff --git a/code/modules/reagents/withdrawal/generic_addictions.dm b/code/modules/reagents/withdrawal/generic_addictions.dm index 83cb16c7fc1..0ae6563e0fc 100644 --- a/code/modules/reagents/withdrawal/generic_addictions.dm +++ b/code/modules/reagents/withdrawal/generic_addictions.dm @@ -10,7 +10,7 @@ /datum/addiction/opiods/withdrawal_enters_stage_2(mob/living/carbon/affected_carbon) . = ..() - affected_carbon.apply_status_effect(STATUS_EFFECT_HIGHBLOODPRESSURE) + affected_carbon.apply_status_effect(/datum/status_effect/high_blood_pressure) /datum/addiction/opiods/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, delta_time) . = ..() @@ -20,7 +20,7 @@ /datum/addiction/opiods/end_withdrawal(mob/living/carbon/affected_carbon) . = ..() - affected_carbon.remove_status_effect(STATUS_EFFECT_HIGHBLOODPRESSURE) + affected_carbon.remove_status_effect(/datum/status_effect/high_blood_pressure) affected_carbon.set_disgust(affected_carbon.disgust * 0.5) //half their disgust to help ///Stimulants @@ -35,7 +35,7 @@ /datum/addiction/stimulants/withdrawal_enters_stage_2(mob/living/carbon/affected_carbon) . = ..() - affected_carbon.apply_status_effect(STATUS_EFFECT_WOOZY) + affected_carbon.apply_status_effect(/datum/status_effect/woozy) /datum/addiction/stimulants/withdrawal_enters_stage_3(mob/living/carbon/affected_carbon) . = ..() @@ -44,7 +44,7 @@ /datum/addiction/stimulants/end_withdrawal(mob/living/carbon/affected_carbon) . = ..() affected_carbon.remove_actionspeed_modifier(ACTIONSPEED_ID_STIMULANTS) - affected_carbon.remove_status_effect(STATUS_EFFECT_WOOZY) + affected_carbon.remove_status_effect(/datum/status_effect/woozy) affected_carbon.remove_movespeed_modifier(MOVESPEED_ID_STIMULANTS) ///Alcohol @@ -67,7 +67,7 @@ affected_carbon.hallucination = max(5 SECONDS, affected_carbon.hallucination) if(DT_PROB(4, delta_time)) if(!HAS_TRAIT(affected_carbon, TRAIT_ANTICONVULSANT)) - affected_carbon.apply_status_effect(STATUS_EFFECT_SEIZURE) + affected_carbon.apply_status_effect(/datum/status_effect/seizure) /datum/addiction/hallucinogens name = "hallucinogen" diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm index 6ece7dd3621..5a8b0b19316 100644 --- a/code/modules/research/xenobiology/crossbreeding/_potions.dm +++ b/code/modules/research/xenobiology/crossbreeding/_potions.dm @@ -83,7 +83,7 @@ Slimecrossing Potions if(user == love_target) to_chat(user, span_warning("You can't drink the love potion. What are you, a narcissist?")) return ..() - if(love_target.has_status_effect(STATUS_EFFECT_INLOVE)) + if(love_target.has_status_effect(/datum/status_effect/in_love)) to_chat(user, span_warning("[love_target] is already lovestruck!")) return ..() @@ -95,7 +95,7 @@ Slimecrossing Potions to_chat(user, span_notice("You feed [love_target] the love potion!")) to_chat(love_target, span_notice("You develop feelings for [user], and anyone [user.p_they()] like[user.p_s()].")) love_target.faction |= "[REF(user)]" - love_target.apply_status_effect(STATUS_EFFECT_INLOVE, user) + love_target.apply_status_effect(/datum/status_effect/in_love, user) qdel(src) //Pressure potion - Charged Dark Blue diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index 40525af47c6..5e36207a44b 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -270,11 +270,11 @@ Regenerative extracts: effect_desc = "Fully heals the target and boosts their armor." /obj/item/slimecross/regenerative/adamantine/core_effect(mob/living/target, mob/user) //WIP - Find out why this doesn't work. - target.apply_status_effect(STATUS_EFFECT_SLIMESKIN) + target.apply_status_effect(/datum/status_effect/slimeskin) /obj/item/slimecross/regenerative/rainbow colour = "rainbow" effect_desc = "Fully heals the target and temporarily makes them immortal, but pacifistic." /obj/item/slimecross/regenerative/rainbow/core_effect(mob/living/target, mob/user) - target.apply_status_effect(STATUS_EFFECT_RAINBOWPROTECTION) + target.apply_status_effect(/datum/status_effect/rainbow_protection) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index ef5b2d6ef92..19eb31cf417 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -94,7 +94,7 @@ var/was_sleeping = (target.stat != DEAD && target.IsSleeping()) - if(do_after(user, modded_time, target = target, interaction_key = user.has_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH) ? target : DOAFTER_SOURCE_SURGERY)) //If we have the hippocratic oath, we can perform one surgery on each target, otherwise we can only do one surgery in total. + if(do_after(user, modded_time, target = target, interaction_key = user.has_status_effect(/datum/status_effect/hippocratic_oath) ? target : DOAFTER_SOURCE_SURGERY)) //If we have the hippocratic oath, we can perform one surgery on each target, otherwise we can only do one surgery in total. var/chem_check_result = chem_check(target) if((prob(100-fail_prob) || (iscyborg(user) && !silicons_obey_prob)) && chem_check_result && !try_to_fail) diff --git a/code/modules/unit_tests/combat.dm b/code/modules/unit_tests/combat.dm index 62fce5c70b6..d273310155a 100644 --- a/code/modules/unit_tests/combat.dm +++ b/code/modules/unit_tests/combat.dm @@ -88,7 +88,7 @@ victim.attack_hand(attacker, list(RIGHT_CLICK = TRUE)) TEST_ASSERT_EQUAL(victim.loc.x, run_loc_floor_bottom_left.x + 2, "Victim wasn't moved back after being pushed") - TEST_ASSERT(!victim.has_status_effect(STATUS_EFFECT_KNOCKDOWN), "Victim was knocked down despite not being against a wall") + TEST_ASSERT(!victim.has_status_effect(/datum/status_effect/incapacitating/knockdown), "Victim was knocked down despite not being against a wall") TEST_ASSERT_EQUAL(victim.get_active_held_item(), toolbox, "Victim dropped toolbox despite not being against a wall") attacker.forceMove(get_step(attacker, EAST)) @@ -97,5 +97,5 @@ victim.attack_hand(attacker, list(RIGHT_CLICK = TRUE)) TEST_ASSERT_EQUAL(victim.loc.x, run_loc_floor_bottom_left.x + 2, "Victim was moved after being pushed against a wall") - TEST_ASSERT(victim.has_status_effect(STATUS_EFFECT_KNOCKDOWN), "Victim was not knocked down after being pushed against a wall") + TEST_ASSERT(victim.has_status_effect(/datum/status_effect/incapacitating/knockdown), "Victim was not knocked down after being pushed against a wall") TEST_ASSERT_EQUAL(victim.get_active_held_item(), null, "Victim didn't drop toolbox after being pushed against a wall") diff --git a/code/modules/unit_tests/surgeries.dm b/code/modules/unit_tests/surgeries.dm index 75614f4e8e0..f3bd4ee786b 100644 --- a/code/modules/unit_tests/surgeries.dm +++ b/code/modules/unit_tests/surgeries.dm @@ -73,7 +73,7 @@ TEST_ASSERT(!surgery_step.initiate(user, patient_one, BODY_ZONE_CHEST, scalpel, surgery_for_one), "Was allowed to start a second surgery without the rod of asclepius") TEST_ASSERT(!surgery_for_one.step_in_progress, "Surgery for patient one is somehow in progress, despite not initiating") - user.apply_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH) + user.apply_status_effect(/datum/status_effect/hippocratic_oath) INVOKE_ASYNC(surgery_step, /datum/surgery_step/proc/initiate, user, patient_one, BODY_ZONE_CHEST, scalpel, surgery_for_one) TEST_ASSERT(surgery_for_one.step_in_progress, "Surgery on patient one was not initiated, despite having rod of asclepius")