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

Jump to bottom

New Dionae Loadout Items - Wave1 #20209

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

New Dionae Loadout Items - Wave1 #20209

wants to merge 49 commits into from
+288 −134,266

Conversation

Yonnimer
Copy link
Contributor

Adds several new items to the Dionae loadout:

  • Three sets of clothes and two hoods for voidtamers
  • A jacket, cloak, two hats, and an undersuit for the ekane
  • A narrows hardhat and jacket, as well as a slightly reworked jumpsuit (made chonk)
  • New Eternal Robes, the old ones are remaining for now but may be reworked in the second wave of items
  • Also removed some redundant rokz and serz items and the ships themselves, these may be reworkedin the future, but for now aren't in current lore.

More loadout items will ideally be coming soon for each factions in the coming weeks/months.

@Yonnimer
Updates Dionae Sprites
28924ee 
Adds new sprites, removes some older ones.

Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
testing with this because big dumb
a094190 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
take 2 of adding adding new dionae loadout sprites
5805139 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
Adds the Ekane dress
85c9ded 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
Removes some old unused clothing, adds the narrows jacket + eternal r…
b4b2991 
…obes

Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
gives some items accents
55bf573 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
Adds the ekane jacket
e45d8d1 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
Adds the voidtamer and ekane cloaks
397769f 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
Adds new dionae hats, removes the old unused one
0d1f62b 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
fixes
dbbb04b 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
adds accents to the decorated ekane hat
8c49379 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
Adds the narrows hardhat
cc35f59 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
renames
ca41f05 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
Adds the items to the loadout
55aad48 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
fixes some names
7db26e4 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
removes an extra "
91445a2 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
deletes the rokz ships
81c0cac 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
removes the serz ships
020d0cb 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
fully removes the old voidtamer ships, rip until I rework them
d9cefbd 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
why is there desc and description aaaaaaa
7ab647f 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
Fixes the issues with the hat not fully building
37e59b7 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
fixes an issue with some of the ekane clothes not fully building
eab458b 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
fixes ekane dress not having accessories
8ca38b7 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
forgor voidtamer hood names
54dc870 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
icon_override fixes
4362401 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
changelog
c85638d 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
gibs the ekane undersuit the accent tag
9da9b0d 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
makes some ekane stuff culture restricted
ef3a319 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
name fix
1bb0edf 
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer
path changes for the ekane hats
7c1e69e 
Signed-off-by: Yonnimer <[email protected]>
@BotBOREALIS BotBOREALIS added the Sprites Adds new or changes existing sprites. label Nov 29, 2024
@github-actions github-actions bot added the 🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. label Nov 29, 2024
@Yonnimer
Copy link
Contributor Author

!review

hazelrat
hazelrat requested changes Nov 30, 2024
View reviewed changes
Copy link
Contributor

@hazelrat hazelrat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some imperfect grammar, LGTM otherwise.

code/modules/client/preference_setup/loadout/items/xeno/diona.dm Outdated Show resolved Hide resolved
code/modules/client/preference_setup/loadout/items/xeno/diona.dm Outdated Show resolved Hide resolved
code/modules/client/preference_setup/loadout/items/xeno/diona.dm Outdated Show resolved Hide resolved
code/modules/client/preference_setup/loadout/items/xeno/diona.dm Outdated Show resolved Hide resolved
code/modules/client/preference_setup/loadout/items/xeno/diona.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/xenos/diona.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/xenos/diona.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/xenos/diona.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/xenos/diona.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/xenos/diona.dm Outdated Show resolved Hide resolved
@hazelrat hazelrat added the Changes Required The PR requires changes before it can be approved and/or merged. label Nov 30, 2024
Yonnimer and others added 10 commits December 1, 2024 05:46
@Yonnimer @hazelrat
grammar
1d78f95 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
grammar
aa19594 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
grammar
7b5656f 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
grammar
5cac1fb 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
grammar
913a9ac 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
grammar
b97134a 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
grammar
ca20db7 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
grammar
bde891d 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
grammar
430261a 
Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@Yonnimer @hazelrat
god i should've just done these manually not to have 100 messages, al…
0870ec5 
…so ty for pointing it out, this is why i should not rush descs like this aaa

Co-authored-by: hazelrat <[email protected]>
Signed-off-by: Yonnimer <[email protected]>
@hazelrat hazelrat removed the Changes Required The PR requires changes before it can be approved and/or merged. label Dec 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hazelrat hazelrat hazelrat approved these changes

@Arrow768 Arrow768 Awaiting requested review from Arrow768 Arrow768 is a code owner

@alsoandanswer alsoandanswer Awaiting requested review from alsoandanswer alsoandanswer is a code owner

@NonQueueingMatt NonQueueingMatt Awaiting requested review from NonQueueingMatt NonQueueingMatt is a code owner

@DreamySkrell DreamySkrell Awaiting requested review from DreamySkrell DreamySkrell is a code owner

Assignees
No one assigned
Labels
🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. Review Required Sprites Adds new or changes existing sprites.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Yonnimer @hazelrat @BotBOREALIS