diff --git a/code/datums/components/art.dm b/code/datums/components/art.dm index 3ed27f8297f9..bac83ba64657 100644 --- a/code/datums/components/art.dm +++ b/code/datums/components/art.dm @@ -51,3 +51,20 @@ if(!do_after(M, 20, target = parent)) return on_obj_examine(source, M) + +/datum/component/art/rilena + +/datum/component/art/rilena/apply_moodlet(atom/source, mob/living/user, impress) + SIGNAL_HANDLER + + var/msg + if(HAS_TRAIT(user, TRAIT_RILENA_FAN)) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat) + msg = "You love this franchise!" + else + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "artok", /datum/mood_event/artok) + msg = "You don't get it. At least it's not ugly." + M.visible_message( + "[M] stops and looks intently at [parent].", + "You stop to take in [parent]. [msg]" + ) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 9351adc1d2d7..52ee20e23c27 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -87,8 +87,8 @@ desc = "You are a major fan of the popular webseries RILENA: LMR. You get a mood boost from plushies of your favorite characters, and wearing your Xader pin." value = 1 mob_traits = list(TRAIT_FAN_RILENA) - gain_text = "You are a huge fan of RILENA: LMR." - gain_text = "Suddenly, RILENA doesn't seem all that interesting anymore..." + gain_text = "You are a huge fan of a certain combination webcomic and bullet hell game." + gain_text = "Suddenly, bullet hell games and webcomics don't seem all that interesting anymore..." medical_record_text = "Patient reports being a huge fan of RILENA." /datum/quirk/fan_rilena/on_spawn() diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 14d8709ad43c..833b96d71cdd 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -1022,11 +1022,15 @@ //RILENA poster pool. There are only five of these, so try not to go overboard with the random posters, okay? Expect not to see these mapped onto ships except in rolled up form, since they're supposed to be bought in the RILENA merch crate. -/obj/structure/sign/poster/rilena/ +/obj/structure/sign/poster/rilena poster_item_name = "rilena poster" poster_item_desc = "A poster with a vibrant purple backing, indicating it is for the popular webseries RILENA: LMR. It comes with adhesive backing, for easy pinning to any vertical surface." poster_item_icon_state = "rolled_rilena" +/obj/structure/sign/poster/rilena/Initialize(mapload) + . = ..() + AddElement(/datum/component/art/rilena, GOOD_ART) + /obj/structure/sign/poster/rilena/random name = "random rilena poster" icon_state = "random_rilena" diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index 70734d9b1710..7af2ae2018f0 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/code/modules/clothing/suits/hoodies.dm @@ -84,7 +84,7 @@ /obj/item/clothing/head/hooded/hood/fbp name = "\improper FBP kepori hood" - desc = "A hood for your fbp hoodie." + desc = "A hood for your FBP hoodie." icon_state = "hoodie_fbp" item_state = "hoodie_fbp" diff --git a/shiptest.dme b/shiptest.dme index ee73ad6e786b..ea4b5af13172 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -2777,7 +2777,6 @@ #include "code\modules\modular_computers\file_system\programs\ntnrc_client.dm" #include "code\modules\modular_computers\file_system\programs\powermonitor.dm" #include "code\modules\modular_computers\file_system\programs\radar.dm" -#include "code\modules\modular_computers\file_system\programs\rilena.dm" #include "code\modules\modular_computers\file_system\programs\robocontrol.dm" #include "code\modules\modular_computers\file_system\programs\robotact.dm" #include "code\modules\modular_computers\file_system\programs\secureye.dm"