Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RILENA MERCH #2531

Merged
merged 21 commits into from
Dec 4, 2023
Merged

RILENA MERCH #2531

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0d1dbf7
RILENA MERCH
MoonTheBird Nov 27, 2023
64b089d
trailing newlines because I forgot those oopsie daisy
MoonTheBird Nov 27, 2023
466eadc
MINOR SPELLING MISTAKE
MoonTheBird Nov 27, 2023
a87eff3
the ONE RECIPE that also uses gold and it conflicts
MoonTheBird Nov 27, 2023
1b6f64f
Merge branch 'RILENA' of https://github.com/MoonTheBird/Shiptest into…
MoonTheBird Nov 27, 2023
324d33b
recenter the rilena dress
MoonTheBird Nov 27, 2023
fc0b859
minor fixes
MoonTheBird Nov 27, 2023
7075280
made the t shirt an underwear instead of an actual shirt
MoonTheBird Nov 27, 2023
65513d2
added a merch crate :+1:
MoonTheBird Nov 27, 2023
1f688f2
1000 maybe
MoonTheBird Nov 27, 2023
224fa81
I am not smart and forgot to remove this line of code
MoonTheBird Nov 27, 2023
4826959
forgot a trailing newline IAJSKAJSTLJSAT
MoonTheBird Nov 27, 2023
8620c9c
Merge remote-tracking branch 'upstream/master' into RILENA
MoonTheBird Nov 28, 2023
e43d186
added the stuff mark wants me to add
MoonTheBird Nov 28, 2023
17cee1f
oops wrong way around
MoonTheBird Nov 28, 2023
a0fa3bc
I may be stupid
MoonTheBird Nov 29, 2023
94b0ac0
should fix the linter
MoonTheBird Nov 29, 2023
30aa238
should fix the two immediately obvious issues
MoonTheBird Nov 29, 2023
dd2218e
slightly nerf rilena hoodie moodlet
MoonTheBird Nov 30, 2023
b8b086c
Merge remote-tracking branch 'upstream/master' into RILENA
MoonTheBird Dec 3, 2023
d95c28b
remove RILENA: LMR from the names of the plushies, action figure, and…
MoonTheBird Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions code/modules/cargo/packs/costumes_toys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,21 @@
for(var/i in 1 to 3)
var/item = pick_n_take(L)
new item(C)

/datum/supply_pack/costumes_toys/rilena_merch
name = "RILENA Merchandise Crate"
desc = "A crate full of all the RILENA merch you could ever want. Except the offbrand stuff. That's not in here."
cost = 2000 //lots of loot
MoonTheBird marked this conversation as resolved.
Show resolved Hide resolved
contains = list(/obj/item/toy/figure/tali,
/obj/item/toy/plush/rilena,
/obj/item/toy/plush/tali,
/obj/item/toy/plush/sharai,
/obj/item/toy/plush/xader,
/obj/item/toy/plush/mora,
/obj/item/poster/random_rilena,
/obj/item/poster/random_rilena,
/obj/item/poster/random_rilena,
/obj/item/clothing/suit/hooded/hoodie/rilena,
/obj/item/clothing/under/dress/rilena,
/obj/item/gun/energy/buster)
crate_name = "collectable merchandise crate"
Loading