Skip to content

Commit

Permalink
added the stuff mark wants me to add
Browse files Browse the repository at this point in the history
  • Loading branch information
MoonTheBird committed Nov 28, 2023
1 parent 8620c9c commit e43d186
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
17 changes: 17 additions & 0 deletions code/datums/components/art.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Check warning on line 58 in code/datums/components/art.dm

View workflow job for this annotation

GitHub Actions / Run Linters

Can't define procs SpacemanDMM_should_not_sleep outside their initial definition

var/msg
if(HAS_TRAIT(user, TRAIT_RILENA_FAN))

Check failure on line 61 in code/datums/components/art.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "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(

Check failure on line 67 in code/datums/components/art.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var: "M"

Check warning on line 67 in code/datums/components/art.dm

View workflow job for this annotation

GitHub Actions / Run Linters

proc call requires static type: "visible_message"
"<span class='notice'>[M] stops and looks intently at [parent].</span>",
"<span class='notice'>You stop to take in [parent]. [msg]</span>"
)
4 changes: 2 additions & 2 deletions code/datums/traits/good.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<span class='notice'>You are a huge fan of RILENA: LMR.</span>"
gain_text = "<span class='danger'>Suddenly, RILENA doesn't seem all that interesting anymore...</span>"
gain_text = "<span class='notice'>You are a huge fan of a certain combination webcomic and bullet hell game.</span>"
gain_text = "<span class='danger'>Suddenly, bullet hell games and webcomics don't seem all that interesting anymore...</span>"
medical_record_text = "Patient reports being a huge fan of RILENA."

/datum/quirk/fan_rilena/on_spawn()
Expand Down
6 changes: 5 additions & 1 deletion code/game/objects/effects/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/hoodies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit e43d186

Please sign in to comment.