* doubled magnum box capacity, whitelist for bandoliers holdin magnum cartridges, and fixed 2 misspellings (cause i mighta caused one of em oops)
* dumbass dog is stupid who woulda thunk it....
* make pigs drop spesos
* no testing thats maints problem
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update animals.yml
* null + coins
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
* Allulalo: finally finishing the ancient raptor species project (#3504)
* well, it loads
* sprite's
* names + starting on displacements
* more displacements
* displacements
* left hand only
* displacements
* yup
* ooa
* inhand displacements
* blood
* accent
* iv bags
* placeholder clarification
* Revert "iv bags"
This reverts commit c2aa504eab8d0673604b33e0ccaf79b406979da6.
* whitespace
* adds tooshortforUI and removes the damage modifier set
* speechsounds
* typing indicator
* basic customisation
* guidebook 1
* fixed full
* markings, displacements, speech verb
* displacement fixes
* trailing newlines
* spelling moment
* brute damage sprites and blood fix
* guidebook iteration
* injection melee + ethanotoxin + guidebook rewrite
* guidebook
* guidebook
* nitpicks + roundstart
---------
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mqole <anactualpanacea@gmail.com>
* Allulalo tooshotforui bugfix (#3598)
* yay
* p[leebnmar
* oops
* Allulalo Markings (#3602)
* eye markings and two tails
* more
* almost got ya
* yup
* wings yay
* thank you landshark for my life btw
* still needs loc files
* Update allulalo.ftl
* I lost so much progress to git bullshit
* and who can forget dear rat boy
* touch up speech indicator at yesters request
---------
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
* Allulalo Roundstart (#3621)
* yup
* shock blanket + pleebnar fixes
* yuuup (#3655)
* Allulalo fix pass 1 (#3661)
* what if I did it all in one commit like a total moron
* yup
* untuch
* i love you spriting tool
* my birdsty
* Update allulalo.yml
* Update Species.xml
* let allulalo use holopads. (#3669)
* adds a white list for the too small component to add specific allowed entities. e.g holopads
* imp comment
* i love forgetting white space!!!!
---------
Co-authored-by: sev7ves <soapedzone@gmail.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
* fix (#3693)
* I need to learn to not do everything in one commit (#3750)
* mime on again (#4243)
* Small fix
* Add them to our accentless trait
* Add unable to wield system
* Fix too short for UI using old blacklist methods
* Fix duplicated localization line
* Add heavyweight drunk comp (might merge this with lightweight later)
* Why was this even added
* Revert "Add unable to wield system"
This reverts commit cbe3a10fc7.
* Revert "Fix too short for UI using old blacklist methods"
This reverts commit 833743f029.
* add TooShortForUIComponent (#3495)
* add TooShortForUIComponent
* correct documentation
* incomplete documentation
* add UnableToWieldComponent (#3496)
* Fixing this again I am dumb I cherrypicked things in the wrong order
* WHY WAS THIS EVEN ADDED THERE'S NO SPRITE EVEN ON IMPSTATION???
* Port Allulalos to Nubody
* Fix for Allulalo chems doing nothing
* Add allulalo to the guidebook species list
* Restore some accidentally deleted effects and comments
* Fix typo that made allu blood 10x more alcoholic than normal
* Delete random misplaced sprites from cherrypicking
* More of the random sprites removal (this time from the meta)
* Add missing allulalo flavor
* Removed some nonexistant fields from the species
* Add unisex cough/sneeze, comment out Wuhey and Ungh emotes
* Fix guidebook not using loc string
* I THINK this fixes that test error and it doesn't seem to break anything either so let's try
* Remove unsupported unshaded shader from eyes
* Ok last one didn't work (sorry for trial and error)
* Removed mention of HARMPACKs and Tether Guns from the guidebook.
* Blacklist allulalos from random humanoid spawns
* Add missing allulalo gulp sound
* Carriable in 1 hand allulalos, fix carrying system blocking both hands always
* Remove DV comments
---------
Co-authored-by: Kip <32859367+kipdotnet@users.noreply.github.com>
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mqole <anactualpanacea@gmail.com>
Co-authored-by: sev7ves <58966116+sev7ves@users.noreply.github.com>
Co-authored-by: sev7ves <soapedzone@gmail.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
Co-authored-by: Yesteryear <208338078+yesteryuri@users.noreply.github.com>
* switched FixedPoint2 * FixedPoint2 to use long
* Revert "switched FixedPoint2 * FixedPoint2 to use long"
This reverts commit b8744f6ac3.
* Reduced blood amount to 400
---------
Signed-off-by: Carol <292806487+CarolCuchara@users.noreply.github.com>
* pickable borg subtypes but better (#706)
* borg subtype fixes I Forgot To Push (#790)
* update borg subtypes to an entity prototype based approach from SL (#884)
https: //github.com/cosmatic-drift-14/cosmatic-drift/pull/884
Co-Authored-By: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
* Minor Build Error Tweak
Should be ready to add more chassis now!
* Yippee Yahoo
Handpicked some chassis sprites from AL/SL PR which are from Paradise :D
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Clean up + Comments
* CR made me sprite at gunpoint
Also switched standard and generic files for consistency and such
* the spaces were bothering me + comments
---------
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Allow the smaller variants from drink cartons to be put in the soda and booze dispensers
* Bug: Remove double fail message when trying to put something in a dispenser that doesn't belong there
* Remove uneccesary line
* 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>
freezer dog
Theo
Stxcking
Vanessa
EmberAstra
Vanessa
pathetic meowmeow
Carol
Cepelinas1
Manoob
TNE
Tobias Berger
MD360
Coryler
ādaandiaada
Gentleman-Bird
SnappingOpossum