Commit Graph

8 Commits

Author SHA1 Message Date
Vape 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>

![image](https://github.com/user-attachments/assets/b000389d-55f3-4de7-84d8-058f7fa1832b)

![image](https://github.com/user-attachments/assets/ea7ca855-edc8-42a0-9a36-941ccac403a7)

![image](https://github.com/user-attachments/assets/ca0c919d-214c-4ca7-bb30-a62c009588bb)

![image](https://github.com/user-attachments/assets/7e19d12d-3e1d-41a0-992b-1785f5ea2215)

![image](https://github.com/user-attachments/assets/f08210b1-5f02-4e6f-8d46-5018fc8a918b)

![image](https://github.com/user-attachments/assets/88848e52-eb54-44dc-ad0e-bcdc7d756078)

</p>
</details>

---

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 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>
2025-11-28 08:17:45 +01:00
ScarKy0 1a7a383a24 Add SnoutCover appearance layer (#39949)
* init

* cover
2025-11-23 15:22:32 -06:00
HTML/Crystal ec4cabec41
Port Harpy wing/arm layering fix, remove base female displacement map (#2917) (#3933)
* Harpy wing/arm layering fix, remove base female displacement map (#2917)

* Harpy wing fix, new janky humanoid layers

* MarkingCategories.cs: no Overlay comma.

* _DV/.../Species/harpy.yml: comment RArm

* _DV/Species/harpy.yml: comment RArmExtension base sprites

* spationaut suit fix

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
2025-06-29 09:01:04 +01:00
SlamBamActionman 48b7cd8d39 Add undergarments & "Censor Nudity" toggle to options (#33185)
* Initial commit

* Attribution

* Review changes

* Added comment for upstream
2025-03-09 22:34:51 +00:00
Michelle Szinger 97492b38f5
Port undergarments from ImpStation (#2719)
All races available in the character creator may wear undergarments.
Also lets slimefolk wear chest tattoos.
2025-01-14 02:56:24 -03:00
Rouge2t7 f02119b0d1 Long human ears (#30490)
Long human ears colour fix. Shortcut removed.
2024-08-27 00:32:30 +01:00
csqrb 8b3d7728d7
Marking default coloring (#13039)
* Marking coloring WIP

* EnsureDefault now supports coloring!

* Now markings have coloring when they get added

* Many things

* yml files

* cleanup

* Some requested changes

* Nullable type and WIP caching

* Time to resolve that thing with deprecated hair fields

* Latest reviews + im still trying to use these hair markings

* FirstOrDefault thing and Tattoo docs

* IDK

* It's now works a bit more properly in preferences GUI

* THEY SYNCING! However preferences GUI still broken and doesn't work properly

* Markings now updating when changing in GUI. However they still don't work properly with bald humanoids

* Forgor...

* Default hair-colored markings will not color to hair if there is no hair

* Fixed default colors for customizable markings

* Fixed bug in prefs GUI that set current hair to null

* Now markings that must match skin color because of limb (e.x. Slimes) - will match skin color

* final tweaks: if hair uses skin color then markings will use skin color as hair color (slimes)

* fix

* fixed dirty. no more funni invis bug

* Mirrors and client profile loading

* default colors soon TM

* review + better coloring

* Hardcode is gone

* diona markings

* oh my god

* fixed CategoryColoring

* cool fallback, clean up and some other tweaks

* code style

* more style

* a
2023-03-04 18:59:07 -08:00
Flipp Syder 5a0a04bde7
Humanoid appearance refactor (#10882)
* initial commit
- species prototype modifications
- markings points as its own file
- shared humanoid component

* adds a tool to convert sprite accessories to markings (in go)

* removes a fmt call

* converts sprite accessory to markings

* adds hair and facial hair to marking categories

* multiple changes
- humanoid visualizer system
- markings modifications for visualizer
- modifications to shared humanoid component
- lays out a base for humanoid system

* hidden layers, ports some properties from appearance component, shrinks DefaultMarkings a little

* squishes the initialize event calls into one function

adds stuff to set species/skin color externally from a server message - currently laid out as if it a dirty call to a networked component, may be subject to change (server-side has not been implemented yet)

* makes the sprite pipeline more obvious

* apply all markings, hidden layer set replacement

* ensures that markings are cleared when the new set is applied

* starts refactoring markingsset (unfinished)

* more additions to the markingset api

* adds constructor logic to markingset

* adds a method to filter out markings in a set based on a given species

* fixes enumerators in markingset

* adds validator into MarkingSet, fixes ForwardMarkingEnumerator

* modifications to the humanoid visual system

* ensuredefault in markingset

* oop

* fixes up data keys, populates OnAppearanceChange in visualizer

* changes to humanoid component, markings

marking equality is now more strict, humanoidcomponent is now implemented for client as a child of sharedhumanoidcomponent

* markings are now applied the visualizer by diffing them

* base sprites are now applied to humanoids from humanoidvisualizer

* passes along base sprite settings to the marking application so that markings know to follow skin color/alpha or not (see: slimes)

* custom base layers on humanoids

* merges all data keys into one data class for humanoid visualizers

* setappearance in sharedhumanoidsystem, removes custombaselayercolors

* humanoidcomponent, system (empty) in server

* adds some basic public API functions to HumanoidSystem

* add marking, remove marking

* changes appearance MarkingsSet to a List<Marking>, adds listener for PlayerSpawnCompleteEvent in HumanoidSystem

* ensuredefaultmarkings, oninit for humanoids

* markingmanager API changes

* removes MarkingsSet

* LoadProfile, adjusts randomization in humanoid appearance to account for species

* base layer settings in humanoidsystem, eye color from profile

* rearranges files to centralize under Humanoid namespace

* more reorganization, deletes some stuff

gotta break stuff to make other things work, right?

goodbye SpriteAccessory...

* fixes a good chunk of server-side issues

still does not compile, yet

* singlemarkingpicker xaml layout

* singlemarkingpicker logic

* magic mirror window (varying pieces of it, mostly client-oriented)

* removes some imports, gives MagicMirror a BUI class (not filled in yet)

* populates magic mirror BUI functionality / window callbacks

* fixes up some errors in humanoidprofileeditor

* changes to SingleMarkingPicker

SingleMarkingPicker now accepts a List<Marking>, species, and total possible markings available in that marking category

* fixes up hair pickers on humanoid profile editor

* fixes the errors in markingpicker

* markingsystem is now gone

* fixes a bunch of build errors

* so that's why i did it like that

* namespace issues, adds robustxamlloader to singlemarkingpicker

* another robustxamlloader

* human, lizard sprites/points

* prototype fixes, deletion of old spriteaccessory

* component registration, fixes dwarf skin toning

no, 'ReptilianToned' does not exist

* removes component registration from abstract humanoid component

* visualizer data now cloneable

* serialize for visualizer key

* zero-count edge case

* missing semi-colon moment

* setspecies in humanoidsystem

* ensures that default markings, if empty, will cause ensuredefault to skip over that given category

* tryadd instead of add

* whoops

* diff and apply should properly apply markings now

* always ensure default, fixes double load for player spawning

* apply skin color now sets the skin color property in humanoidcomponent

* removes sprite from a few species prototypes

* sprite changes for specific base layers based on humanoid sex

* layer ordering fix, and a missing base layer should now disallow markings on that layer

* anymarking base layer, adds the right leg/foot for humans

* loading a profile will now clear all markings on that humanoid

* adds missing layers for humans

* separates species.yml into respective species prototype files

* ensures that if layer visibility was changed, all markings have to be reapplied

* server-side enforcement of hiding hair (and other head-related markings) when equipping things that hide hair

* slime fix, clothingsystem now dictates layer visibility server side

* sussy

* layer settings should now ensure a marking should match the skin tone

* whoops

* skincolor static class and functions in UI

* skin color validation in humanoidcharacterappearance

* markingpicker now shows only the markings for the selected category in used

* getter for slot in singlemarkingpicker now ensures slot is 0 if markings exists

* FilterSpecies no longer attempts to do removal while iterating

* expands for SingleMarkingPicker

* humanoid base dummy has blank layers now (and snout/tail/headside/headtop)

* fixes an issue with visualizer system if the marking count was different but the markings themselves were (somewhat) the same

* whoops

* adds edge case handlers for count differences in humanoid markings

* preview now loads profile instead of directly setting appearance

* moves marking set loading to update controls

* clones a marking set in markingpicker by using the deep clone constructor

* whoops (deep cloning a marking now copies the marking id)

* adds replace function for markingset

* points should now update after the markings are remove/added

* merging base layer sprites into a humanoid should now clear them before merging

* sets dirty range start to count only if the dirty range start was never set above 0

* fixes up some issues with singlemarkingpicker

* color selector sliders in single marking picker should now expand

* hair from hair pickers should now apply in profile loading (client-side)

* category in singlemarkingpicker now sets the private category variable

* slot selector should now populate

* single marking picker buttons now have text, also shows the category name over all user-clickable elements

* removes a comment

* removing hair slots now sets it to bald, defaults to zero used slots if current hair is bald on hair/facial hair

* random skin color, eye color

* populate colors now checks if the marking count is greater than zero in singlemarkingpicker

* hair/facial hair pickers now just get the first possible hair from the respective species list

* different approach to random skin color

* oh, that's why it wasn't working

* randomize everything now just updates every single control

* selecting a new marking in SingleMarkingPicker should attempt to copy over old colors, populate list now uses cache,

* markingmanager now uses OnlyWhitelisted to populate by category and species

* filterspecies now uses onlyWhitelist to filter markings based on whitelist or not

* oops

* ui fix for singlemarkingpicker, ensures that cache is not null if it is null when populatelist is called

* order of operations for the horizontal expand for add/remove

* hair pickers should now update when you add/remove the hair slot

* fixes variable naming error in character appearance

* loc string fix in singlemarkingpicker

* lizards, vox now have onlyWhitelist, vox restriction for hair/facialhairs

* having zero possible hairs should no longer cause an exception in randomization

* setting species should now update hair pickers

* ignore categories for marking picker

* and a clear as well for the category button

* places that functionality in its own function instead

* adds eye base sprite, vox now also have their own custom eye sprites

* loading a profile client-side should do FilterSpecies for markings now

* client-side load profile does filter species after adding in the hairs now

* magic mirror

* callbacks now call the callback instead of adding it on construct

* whoops

* in removemarking too

* adds missing synchronize calls

* comments out an updateinterface call in magic mirror

* magic mirror window title, minimum sizing

* fixes minsize, adds warning for players who try to set their hair for species that have no hair

* removes spaces in xaml

* namespace changes/organization

* whoopsie (merge conflicts)

* re-enables identity from humanoid component

* damagevisuals now uses the enum given to it instead of the layerstate given on that layer tied to the enum

* removes commas from json

* changes to visuals system so the change is consistent

* chest

* reptilian

* visualizer system now handles body sprite setting/coloration, similar to how characterappearance did it

not a big fan of this

* adds a check in applybasesprites

* adding/removing parts should now make them invisible on a humanoid

* body part removal/adding now enumerates over sublayers instead

* synchro now runs in bodycomponent startup

* parts instead of slots

* humanoidcompnent check

* switches from rsi to actualrsi

* removes all the body stuff (too slow)

* cleans up resolves from humanoid visualizer system

* merging sprites now checks if the base sprites have been modified or not (through things like species changes, or custom base sprite changes)

* not forgetting that one again

* merging now returns an actual dirty value

* replaces the sequenceequal with a more accurate solution

* permanent layers, layer visibility on add/remove part in body

* should send all hidden layers over now

* isdirty in visualizer system for base layers

* isdirty checks count as well

* ok, IsDirty should now set the base layers if the merged sprites are different

* equals override in HumanoidSpritePrototypes.cs

temporary until record prototypes :heck:

* makes fields readonly, equates IDs instead

* adds forced markings through marking picker

* forced in humanoidsystem api, ignorespecies in markingpicker

* marking bui

* makes that serializable as well

* ignore species/forced toggles now work

* adds icon to modifier verb, interface and keys to humanoid bases

* needs the actual enum value to open, no?

* makes the key the actual key

* actions now propagate upwards

* ignore species when set now repopulates markingpicker

* modifiable base layers in the markings window

* oops!

* layout changes

* info box should now appear

* adds ignorespecies for marking picker, collapsible for base layer section of appearance modification window

* collapsible layout moment

* if base layers have changed, all markings are now dirty (and if a base layer is missing, the marking is still 'applied' but it's now just invisible

* small change to marking visibility

* small changes to modifier UI

* markings now match skin on zombification

* zombie stuff

* makes the line edit in marking modifier window more obvious

* disables vox on round start

* horizontal expand on the single label in base layer modifiers

* humanoid profiles in prototypes

* randomhumanoidappearance won't work if the humanoid has a profile already stored

* removes unused code

* documentation in humanoidsystem server-side

* documentation in shared/client

* whoops

* converts accessory into marking in locale files (also adds marking loc string into single marking picker)

* be gone, shared humanoid appearance system from the last upstream merge

* species ignore on randomization (defaults to no ignored species)

* more upstream merge parts that bypassed any errors before merge

* addresses review (also just adds typeserializers in some places)

* submodule moment

* upstream merge issues
2022-09-22 17:19:00 -05:00