mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-10-04 05:17:28 +00:00
daf03f45ede2b281c5bef207e3d5e4c4cc81cfcd
6
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 Vanessa
|
ac9894f07a |
Fix Client Crash because Tile is using an .rsi path (#6147)
pool fix |
||
  
|
f18d6803b9 |
PORT: DV's Pool Episode - Longue Chairs + Swim Rings + Pool Tiles & Water (#6113)
* Pool-Themed Decorations: Lounge Chairs, Umbrellas, Tiles, Swim Rings, and Pool Water (#2071) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> <!-- What did you change? --> This PR adds a bunch of, well, mapper toys basically, but normal players can obtain them too. They are: - Pool tile and dark pool tile; obtainable via the cutter machine. - Pool water; unobtainable without mapping/admin tools, but it's 1% chlorine. - Lounge chairs, constructed with steel and cloth. Deconstructible with a screwdriver. - Beach umbrellas, constructed with rods and cloth. Deconstructible with a screwdriver. - Swim rings, which can be ordered from Logistics. They're sort of like the emergency comfort units (pillows), but they're inflatable rings and you can pick them up. <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> These assets are needed for an upcoming map I'm making and I'm giving them to the community early out of the kindness of my heart <!-- Summary of code changes for easier review. --> All YML and sprites babyyy - Entity prototypes for chairs, umbrellas, pool water, swim rings, and the pool tile stack items - Some construction graphs - A cargo product - A floor definition - Recipes for the tile cutter Pool water IS drinkable because it's extremely funny. Keep in mind that 50u of pool water will only give you like 2 poison damage <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> Preview of the stuff: <img width="713" height="541" alt="image" src="https://github.com/user-attachments/assets/42f1acc8-cc83-4356-a8e0-3c715245d120" /> <img width="697" height="666" alt="image" src="https://github.com/user-attachments/assets/8597017a-9d03-4419-80c5-cf475f3206d1" /> sorry i forgot the pink ring <img width="253" height="179" alt="image" src="https://github.com/user-attachments/assets/7f738f8e-42b4-4ee4-aa75-9f08b67ded0c" /> sorry i forgot the white chair <img width="206" height="140" alt="image" src="https://github.com/user-attachments/assets/6fabe541-4821-4e88-8d64-a99f463c5253" /> Cargo: <img width="633" height="461" alt="image" src="https://github.com/user-attachments/assets/b8ae9b89-4d2f-4326-9814-d000d5e88809" /> Crafting menu: <img width="266" height="454" alt="image" src="https://github.com/user-attachments/assets/cc480ee6-0e0d-4055-93c3-e5a1c4e0687c" /> <img width="409" height="211" alt="image" src="https://github.com/user-attachments/assets/41970a43-1ba8-4898-a96c-deb87a05a409" /> <img width="409" height="211" alt="image" src="https://github.com/user-attachments/assets/ffc00874-e330-49eb-8aba-972c6d223a3a" /> Pool water: <img width="680" height="463" alt="image" src="https://github.com/user-attachments/assets/9abc48b0-8358-46de-89ef-41fc64989787" /> <!-- Confirm the following by placing an X in the brackets [X]: --> - [x] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [x] I have added media to this PR or it does not require an ingame showcase. - [x] I have tested any changes or additions. - [x] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> Nope **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - add: 13 colors of lounge chairs can be constructed out of steel and cloth. - add: 8 colors of beach umbrellas can be constructed out of rods and cloth. - add: Pool tile (and dark pool tile) can be produced at the cutter machine. - add: Logistics can now order a crate of bulk swim rings, in 11 possible colors! - add: For mappers (and admins): there is a new "pool water" entity that is a nice green-cyan color and contains about 1% chlorine. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> * Remove Umbrella + Fixes from Port * Pool Ring Additions * Buff Fishing Vendor * grr * its no longer 2am --------- Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> |
||
+1         
|
ed9560c92f |
OVINIA INVASION !! (#4715)
* Ovinia Species (Straight Sheepin It) DRAFT (#490) <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Yeah yeah yeah im sheeping my shit im straight sheeping it yeah yeah yeah. I'm literally making the Ovinia species, sheeps in space. oh god oh fuck i hope i get this done. Ovinia are basically sheep but in space! Pretty freaking cool! Traits: Pros: wont trigger shards/mousetraps on step, cold/heat threshhold resist (wool), get hungry/thirsty 25% slower, flammibility 75% (wool), Take 20% less cold, shock, and heat damage (wool), Cons: theobromine weakness, sleep 50% longer, (to be coded) eat 20% slower, take 15% more pierce/slash --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Get Base Sprites in for body/tail/ears - [x] Make Species Prototype - [x] Make Markings Prototype - [x] Make Body Parts Prototype - [x] Make Entity Body Prototype - [x] Make sure Entity Body Prototype is done right - [x] Make Organ Prototype - [x] Make Entity Species Prototype - [x] Make sure Entity Species Prototype is done right - [x] Add markings/finish Prototype - [x] Make Sounds Prototype - [x] Add Sounds - [x] Make sure Baas is an emote and works - [x] Make Mobs Player - [x] Make sure Mobs Player Prototype is done right - [x] Make Language Prototype - [x] Add Displacement maps for clothing - [x] Add swag - [x] Add traits - [ ] Add ovinia outerwear variants (can do later) --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>       </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 - add: Added Ovinia as a playable species! - tweak: Moved some localization to Den specific areas - remove: Removed all of the snacks out of gregg's cupboard --------- Co-authored-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Co-authored-by: Rosycup <178287475+Rosycup@users.noreply.github.com> * Sum Horns (#911) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!-- What did you change? --> This adds four new horns for Ovinia. And a snout, too. 🫡 It's MIT because I want it to be, and in case anyone needs horns for species that are like. That high up in orientation. <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> Ovinia don't have enough horns. Ovinia also doesn't have a marking that puts a line through the top of your face. So I fixed that in this PR. <!-- Summary of code changes for easier review. --> A meta JSON, an FTL file, and a bunch of images. <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> Just look in files changed. <!-- Confirm the following by placing an X in the brackets [X]: --> - [X] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X] I have added media to this PR or it does not require an ingame showcase. - [X] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - add: Gave ovinia a little bit more horn, and a secret snout. <!-- 🆑 - add: Added fun! - remove: Removed fun! - tweak: Changed fun! - fix: Fixed fun! --> --------- Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com> * Ovinia Trait Fix and Emote Adjustments (#1124) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> Fixed the localisation of the Baa emote. Changed Baa and Moo from the caw icon to relevant animal icons both taken from [[TGstation](https://github.com/tgstation/tgstation)] and modified slightly. Fixes the ovinia trait not conferring the relevant emotes when chosen. Fixes #775. Fixed missing location for Baa emote. Added relevant _Den namespace folders and attribution file for emotes. Added two new icons to said folders. Removed ´available: false´ from ovinia speech_emotes.yml making the trait work as intended. <img width="153" height="114" alt="imagen" src="https://github.com/user-attachments/assets/2530e067-dccc-41e7-b36b-9be5594761c9" /> - [X] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X] I have added media to this PR or it does not require an ingame showcase. - [X] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. **Changelog** 🆑 Wheels - add: New icons for Baa and Moo emotes - fix: Ovinia sounds trait will now allow holders to Baa as intended - fix: Baa emote name will name display properly when hovered over --------- Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com> * Ovinia Typing Sprite Fix (#1348) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> <!-- What did you change? --> routed ovinia's non typing state to work <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> fixes massive error when thinkibng waht to type <!-- Summary of code changes for easier review. --> ough <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> <img width="139" height="137" alt="image" src="https://github.com/user-attachments/assets/25990a20-0782-46a2-b0c5-fb6f3374d7c4" /> <!-- Confirm the following by placing an X in the brackets [X]: --> - [x] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [x] I have added media to this PR or it does not require an ingame showcase. - [x] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - fix: Fixed Ovinia's idle typing sprite to not be a massive error * continuing to go bald * Fixing Fails with the language FTL * Changes again to languages.ftl * Removed Resomi Stuff from the FTL * Fixed the language thingy once more * Grammar and fixes * Ovinia DeltaV adjustments * Added AnimalFriend faction * Switched Ovinia naming scheme to default * Fixed YAMLLinter issues with Ovinia * Fixed the heat damage thingy * YAML Linter Hates me * Testing Changes * Update ovinia.yml * Update ovinia.yml * FINALLY * Updates to Factions for the AnimalFriend Trait * Fucking Case Sensitive * Reviewed proposed changes to Ovinia.yml Co-authored-by: Tobias Berger <toby@tobot.dev> Signed-off-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com> * Updates Fixed all requests besides the displacement maps. Still workin on that * Fixes Coscult and Displacements * misc * Tag fixes. YAML Linter, my beloathed * random grumbles case sensitivity is set to high. please fix this maintainers, thanks * BREAKTHROUGH * Req changes * Attributions, and New soundies * Updaties --------- Signed-off-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com> Co-authored-by: juniwoofs <jakbroeder@gmail.com> Co-authored-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Co-authored-by: Rosycup <178287475+Rosycup@users.noreply.github.com> Co-authored-by: Mono <182929384+Monotheonist@users.noreply.github.com> Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com> Co-authored-by: wheelwrightt <174839295+wheelwrightt@users.noreply.github.com> Co-authored-by: sheepie <180479595+juniwoofs@users.noreply.github.com> Co-authored-by: Vanessa Louwagie <vanessalouwagie@outlook.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: Tobias Berger <toby@tobot.dev> |
||
 
|
f5cb7c64c1 |
Added Jaegermister and additional Drinks from it (#4653)
* Add JAEGERMISTER!! Co-Authored-By: eightballll <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> * More Tweaks Co-Authored-By: eightballll <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> * Update Resources/Prototypes/_DEN/Entities/Objects/Consumable/Drinks/drinks_bottles.yml Co-authored-by: Tobias Berger <toby@tobot.dev> Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> * Unfuck the meta.json * Merge branch 'port-Jaegerminster' of https://github.com/SirWarock/DeltaV-Warock into port-Jaegerminster |
||
  leoandDvir
|
ebe8b41e36 |
Port René Magritte Paintings From The Den (#3732)
* port les paintinges * adds paintings to spawner * Update Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> * Update Resources/Textures/_DEN/Structures/Wallmounts/paintings.rsi/meta.json Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> * relocates to _den (i forgor) i forgor to not put it upstrem, plx forgib me :pleading: * untouched * Update paintings.yml --------- Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> |
||
 Spielern
|
4866d2fa70 |
93 New Hairstyles from DopplerStation 13 (#4515)
new hairstyles |