diff --git a/code/modules/research/artifact_effect.dm b/code/modules/research/artifact_effect.dm index 867bf03018..19291af9b0 100644 --- a/code/modules/research/artifact_effect.dm +++ b/code/modules/research/artifact_effect.dm @@ -72,8 +72,8 @@ H.update_body() H.update_face() H.UpdateDamageIcon() - return 1 - // + return 1 + // if (istype(user, /mob/living/carbon/monkey/)) user << "\blue You feel a soothing energy invigorate you." user.adjustOxyLoss(-25) @@ -81,6 +81,7 @@ user.adjustBruteLoss(-25) user.adjustFireLoss(-25) user.adjustBrainLoss(-25) + return 1 else user << "Nothing happens." if("injure") if (istype(user, /mob/living/carbon/)) diff --git a/code/modules/research/artifacts.dm b/code/modules/research/artifacts.dm index d79222b3f2..83f85dee1c 100644 --- a/code/modules/research/artifacts.dm +++ b/code/modules/research/artifacts.dm @@ -179,7 +179,7 @@ my_effect.UpdateEffect(src.loc) //activate - if(src.charged && my_effect.DoEffect(src.loc)) + if(src.charged && my_effect.DoEffect(src)) src.charged = 0 src.chargetime = src.recharge @@ -207,7 +207,7 @@ else if (my_effect.trigger != "touch" && !src.activated) user << "Nothing happens." if (my_effect.effectmode == "contact" && src.activated && src.charged) - my_effect.DoEffect(src.loc) + my_effect.DoEffect(src) src.charged = 0 src.chargetime = src.recharge