From 8bbfa8bd04d81bf3816eba8b4081e61c8afb6a2c Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Fri, 17 Nov 2023 12:18:30 -0600 Subject: [PATCH] yea i dont think this needs a comp --- code/datums/components/outline.dm | 34 ------------------- .../chemistry/reagents/trickwine_reagents.dm | 3 +- shiptest.dme | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/code/datums/components/outline.dm b/code/datums/components/outline.dm index 01e9dd5829c7..2a4a9daa4ba4 100644 --- a/code/datums/components/outline.dm +++ b/code/datums/components/outline.dm @@ -51,37 +51,3 @@ A.visible_message("The outline around [A] is washed away!") qdel(src) -/datum/component/prism_outline - dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS - - var/permanent - -/datum/component/prism_outline/Initialize(perm = FALSE) - if(!isatom(parent)) - return COMPONENT_INCOMPATIBLE - src.permanent = perm - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy)) - - var/atom/movable/A = parent - A.add_filter("prism-wine", 2, list("type"="outline", "color"="#8FD7DF", "size"=1)) - -/datum/component/prism_outline/Destroy() - var/atom/movable/A = parent - A.remove_filter("prism-wine") - return ..() - -/datum/component/prism_outline/InheritComponent(datum/component/C, i_am_original, perm) - if(!i_am_original) - return - if(C) - var/datum/component/prism_outline/other = C - permanent = other.permanent - else - permanent = perm - -/datum/component/prism_outline/proc/OnExamine(datum/source, mob/user, atom/thing) - to_chat(user, "They light seems to bounce off them!") - -/datum/component/prism_outline/proc/OnAttackBy(datum/source, obj/item/I, mob/user, params) - return diff --git a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm index 1093710ef09b..df76f85b1f64 100644 --- a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @@ -182,13 +182,14 @@ ADD_TRAIT(M, TRAIT_REFLECTIVE, "trickwine") if(M.physiology.burn_mod <= initial(M.physiology.burn_mod)) M.physiology.burn_mod *= 0.5 - M.AddComponent(/datum/component/prism_outline) + M.add_filter("prism-wine", 2, list("type"="outline", "color"="#8FD7DF", "size"=1)) M.visible_message("[M] seems to shimmer with power!") /datum/reagent/consumable/ethanol/trickwine/prism_wine/on_mob_end_metabolize(mob/living/carbon/human/M) REMOVE_TRAIT(M, TRAIT_REFLECTIVE, "trickwine") if(M.physiology.burn_mod > initial(M.physiology.burn_mod)) M.physiology.burn_mod *= 2 + M.remove_filter("prism-wine") M.visible_message("[M] has returned to normal!") ..() diff --git a/shiptest.dme b/shiptest.dme index 872f257480d5..e1b52aaaac6b 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1954,8 +1954,8 @@ #include "code\modules\clothing\outfits\gezena.dm" #include "code\modules\clothing\outfits\plasmaman.dm" #include "code\modules\clothing\outfits\solgov.dm" -#include "code\modules\clothing\outfits\syndicate.dm" #include "code\modules\clothing\outfits\standard.dm" +#include "code\modules\clothing\outfits\syndicate.dm" #include "code\modules\clothing\outfits\vv_outfit.dm" #include "code\modules\clothing\shoes\_shoes.dm" #include "code\modules\clothing\shoes\bananashoes.dm"