cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes useless status effect path defines. (#64490)

Browse Source
This commit is contained in:
Ghom
2022-01-30 01:26:04 -08:00
committed by GitHub
parent d613457944
commit b84ad2dde8
58 changed files with 173 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/powerup.dm
+2 -2
View File
@@ -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)
code/game/objects/items/defib.dm
+1 -1
View File
@@ -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")
code/game/objects/items/food/misc.dm
+1 -1
View File
@@ -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]."),
code/game/objects/items/hand_items.dm
+3 -3
View File
@@ -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)
code/game/objects/items/handcuffs.dm
+2 -2
View File
@@ -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)
. = ..()
code/game/objects/items/his_grace.dm
+2 -2
View File
@@ -106,13 +106,13 @@
master.visible_message(span_boldwarning("[src] turns on [master]!"), "<span class='his_grace big bold'>[src] turns on you!</span>")
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)
code/game/objects/items/tools/crowbar.dm
+2 -2
View File
@@ -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
code/game/objects/items/tools/wirecutters.dm
+2 -2
View File
@@ -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
code/game/objects/structures/gym.dm
+2 -2
View File
@@ -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'