mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 09:08:30 +01:00
Removes useless status effect path defines. (#64490)
This commit is contained in:
@@ -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 <b>90%</b> damage reduction for <b>1</b> 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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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].
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user