RILENA MERCH #2531
Merged
RILENA MERCH #2531
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yoppee
github-actions
bot
added
DME Edit
Sprites
Nikitaw99
reviewed
Nov 27, 2023
Signed-off-by: Moon <[email protected]>
|
put pictures of your sprites in the pr homeslice |
forgor 💀 anyway I was about to go to sleep but I'll do that |
thgvr
reviewed
Nov 27, 2023
thgvr
reviewed
Nov 27, 2023
Signed-off-by: Moon <[email protected]>
thgvr
approved these changes
Nov 27, 2023
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
MarkSuckerberg
requested changes
Nov 28, 2023
|
gimme a sec I'm fixing stuff |
|
I fixed stuff |
|
I'm stuff |
MarkSuckerberg
previously requested changes
Nov 29, 2023
code/game/objects/items/plushes.dm
Outdated
| /obj/item/toy/plush/rilena | ||
| name = "RILENA:LMR Ri plushie" | ||
| desc = "A plush of the protagonist of the popular combination video game series and webcomic RILENA."// Makes the iconic hurt sound from the game!" //sadly does not :pensive: | ||
| icon_state = "rilena_ri" |
There was a problem hiding this comment.
Suggested change
| icon_state = "rilena_ri" | |
| icon_state = "rilenaplush_ri" |
code/game/objects/items/plushes.dm
Outdated
| /obj/item/toy/plush/tali | ||
| name = "RILENA:LMR T4L1 plushie" | ||
| desc = "A surprisingly soft plushie of a recurring miniboss from the popular combination video game series and webcomic RILENA. The cannon arm does not function." | ||
| icon_state = "rilena_t4l1" |
There was a problem hiding this comment.
Suggested change
| icon_state = "rilena_t4l1" | |
| icon_state = "rilenaplush_t4l1" |
code/game/objects/items/plushes.dm
Outdated
| /obj/item/toy/plush/sharai | ||
| name = "RILENA:LMR Sharai plushie" | ||
| desc = "A plushie of the four winged kepori boss from the popular combination video game series and webcomic RILENA." | ||
| icon_state = "rilena_sharai" |
There was a problem hiding this comment.
Suggested change
| icon_state = "rilena_sharai" | |
| icon_state = "rilenaplush_sharai" |
code/game/objects/items/plushes.dm
Outdated
| /obj/item/toy/plush/xader | ||
| name = "RILENA:LMR Xader plushie" | ||
| desc = "A plushie of the recurring transdimensional transgender shopkeep from the popular webseries RILENA." | ||
| icon_state = "rilena_xader" |
There was a problem hiding this comment.
Suggested change
| icon_state = "rilena_xader" | |
| icon_state = "rilenaplush_xader" |
code/game/objects/items/plushes.dm
Outdated
| /obj/item/toy/plush/mora | ||
| name = "RILENA:LMR Mora plushie" | ||
| desc = "A plushie of Mora from the popular webseries RILENA." | ||
| icon_state = "rilena_mora" |
There was a problem hiding this comment.
Suggested change
| icon_state = "rilena_mora" | |
| icon_state = "rilenaplush_mora" |
There was a problem hiding this comment.
I may be stupid
|
hopefully this fixes my mistakes |
|
The mood buff RILENA fans get from having a hoodie on and having some merch on them stack up together which could make mood management a little too easy (that said I run hypersensitive anyway); Maybe you could tweak them so they have the same non-stacking buff or something? |
|
That seems fair. |
thgvr
reviewed
Dec 2, 2023
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
okay I think this is good now |
shiptest-server
pushed a commit
that referenced
this pull request
Dec 4, 2023
MysticalFaceLesS
added a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Dec 4, 2023
RILENA MERCH (shiptest-ss13#2531)
MarkSuckerberg
pushed a commit
to MarkSuckerberg/Shiptest
that referenced
this pull request
Dec 6, 2023
## About The Pull Request Adds merch from everyone's favorite combination webcomic and video game, RILENA: LMR. PLUSHIES  OUTFITS  POSTERS  DRINKS (and mug)  OTHER STUFF  ## Why It's Good For The Game The game needs this. I promise. ## Changelog :cl: add: Added a LOT of RILENA merch. Plushies, drinks, hoodies, shirts, cosplays... And if you're a RILENA fan (positive trait), you get a special pin, like the clown or mime fan! /:cl: --------- Signed-off-by: Moon <[email protected]>
MarkSuckerberg
pushed a commit
to MarkSuckerberg/Shiptest
that referenced
this pull request
Dec 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Adds merch from everyone's favorite combination webcomic and video game, RILENA: LMR.
PLUSHIES
OUTFITS
POSTERS
DRINKS (and mug)
OTHER STUFF
Why It's Good For The Game
The game needs this. I promise.
Changelog
🆑
add: Added a LOT of RILENA merch. Plushies, drinks, hoodies, shirts, cosplays... And if you're a RILENA fan (positive trait), you get a special pin, like the clown or mime fan!
/:cl: