diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 16b196b4200..f4e78300ef2 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -458,3 +458,8 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE)) //Misc text define. Does 4 spaces. Used as a makeshift tabulator. #define FOURSPACES "    " + +// art quality defines, used in datums/components/art.dm, elsewhere +#define BAD_ART 12.5 +#define GOOD_ART 25 +#define GREAT_ART 50 \ No newline at end of file diff --git a/code/datums/components/art.dm b/code/datums/components/art.dm index 86a52090368..fe41b547229 100644 --- a/code/datums/components/art.dm +++ b/code/datums/components/art.dm @@ -1,7 +1,3 @@ -#define BAD_ART 12.5 -#define GOOD_ART 25 -#define GREAT_ART 50 - /datum/component/art var/impressiveness = 0 @@ -17,17 +13,18 @@ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/apply_moodlet) /datum/component/art/proc/apply_moodlet(mob/M, impress) - M.visible_message("[M] stops to admire [parent].", \ - "You take in [parent], admiring the fine craftsmanship.") + M.visible_message("[M] stops and looks intently at [parent].", \ + "You stop to take in [parent].") switch(impress) - if(GREAT_ART to INFINITY) - SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat) - if (GOOD_ART to GREAT_ART) - SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgood", /datum/mood_event/artgood) - if (BAD_ART to GOOD_ART) - SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artok", /datum/mood_event/artok) if (0 to BAD_ART) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artbad", /datum/mood_event/artbad) + if (BAD_ART to GOOD_ART) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artok", /datum/mood_event/artok) + if (GOOD_ART to GREAT_ART) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgood", /datum/mood_event/artgood) + if(GREAT_ART to INFINITY) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat) + /datum/component/art/proc/on_other_examine(datum/source, mob/M) apply_moodlet(M, impressiveness) @@ -40,8 +37,4 @@ to_chat(M, "You start examining [parent].") if(!do_after(M, 20, target = parent)) return - on_obj_examine(source, M) - -#undef BAD_ART -#undef GOOD_ART -#undef GREAT_ART + on_obj_examine(source, M) \ No newline at end of file diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 4e18d669497..ee67a9e89cd 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -181,7 +181,7 @@ /datum/quirk/tagger name = "Tagger" - desc = "You're an experienced artist. While drawing graffiti, you can get twice as many uses out of drawing supplies." + desc = "You're an experienced artist. People will actually be impressed by your graffiti, and you can get twice as many uses out of drawing supplies." value = 1 mob_trait = TRAIT_TAGGER gain_text = "You know how to tag walls efficiently." diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 15cb5e8dd07..f6c3917f559 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -374,7 +374,9 @@ return C.add_hiddenprint(user) if(istagger) - C.AddComponent(/datum/component/art, 30) + C.AddComponent(/datum/component/art, GOOD_ART) + else + C.AddComponent(/datum/component/art, BAD_ART) if(!instant) to_chat(user, "You finish drawing \the [temp].") diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index a67ec4fe66d..ce8ee7c1c7c 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -1,8 +1,3 @@ - -#define BAD_ART 12.5 -#define GOOD_ART 25 -#define GREAT_ART 50 - /obj/structure/statue name = "statue" desc = "Placeholder. Yell at Firecage if you SOMEHOW see this."