Commit Graph

58 Commits

Author SHA1 Message Date
hereelabs
5c034953ba Revert "PORT: Allows Markings to Set Custom Layers for Specific Sprites (#2516)"
This reverts commit 9f39c112ad.
2025-11-25 13:47:27 -05:00
hivehum
9f39c112ad PORT: Allows Markings to Set Custom Layers for Specific Sprites (#2516)
* multilayer markings

* vestigial reptilian tail sprites added

* i fix :)

---------

Co-authored-by: mq <113324899+mqole@users.noreply.github.com>
2025-11-25 13:39:03 -05:00
hereelabs
a1d96346e6 whoops. It all kinda sucked so i'm doing it the manual way 2025-11-25 13:14:41 -05:00
Dark
4f2f9eced9 Merge pull request #1204 from hivehum/markings
markings bugfixes
2025-11-25 12:39:54 -05:00
V
e0adc2fce8 Merge pull request #1181 from hivehum/markings
The Markings Update
2025-11-25 12:24:20 -05:00
hereelabs
e5693a19d7 Initial
Some checks failed
Build & Test Map Renderer / build (ubuntu-latest) (push) Has been cancelled
Build & Test Map Renderer / Build & Test Debug (push) Has been cancelled
Build & Test Debug / build (ubuntu-latest) (push) Has been cancelled
Build & Test Debug / Build & Test Debug (push) Has been cancelled
RGA schema validator / YAML RGA schema validator (push) Has been cancelled
RSI Validator / Validate RSIs (push) Has been cancelled
Map file schema validator / YAML map schema validator (push) Has been cancelled
YAML Linter / YAML Linter (push) Has been cancelled
Test Packaging / Test Packaging (push) Has been cancelled
2025-11-23 20:46:49 -05:00
Mora
31b0a52235 Changed Vox Head Marking Point Limit To 4 (#40542)
* Fix vox head marking limit

* Sets Vox head marking points 4

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-10-21 14:05:16 +00:00
Mora
5be5e280be Added Vox Beak Types, New Markings, and Sprite Layering Fixes (#40569)
* Added more Vox customizations

* Adds Vox Head Markings

* Update meta.json

* stray comma, woe be upon ye

* added tiny pixel to visage left and right

* Added eyeliner ftl

* Removed duplicate FTL

how the fuck did this happen

* Added cheek marking

* Made tip marking look a bit better

* Fix eyeliner ID

* ok whatever shut up build test. mean to me

* changed underbelly to have more flat transparency

* didnt like how it looked so i adjusted it

* Adjusted base eyeliner color

* Fixed inconsistency with nightling head tattoo

* Updated V tattoo

* Delete chest_v.png

* fix yml

ITS EVEN FUNNIER THE SECOND TIME

* minor sprite fix

* Update head.png

* Re added stray pixel, added square cere beak

* Added hooked beak

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-10-07 23:03:21 +00:00
ScarKy0
9e204c3023 Vulpkanin Color Clamping (#40348) 2025-09-14 20:55:26 +02:00
pathetic meowmeow
d9c24b3d10 De-enumify humanoid species skin colours (#39175)
* De-enumify humanoid species skin colours

* Change index to resolve

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-13 22:30:17 -07:00
Hannah Giovanna Dawson
a699639834 Allow Vulps With Human Hair To Be Shaved Without Clyde Joining The Circus (#40171)
* Revert "Disable vulpkanin human hair (#40144)"

This reverts commit d02aa1a4e2.

* You can once again shave your pet Vulp

* I can see the ass, I'm safe

* Rectified docstring as I am a good person

* I am doing this instead of playing Silksong please help

* Fix forgetting to re-add shader overriding
2025-09-07 16:36:38 +02:00
ScarKy0
d02aa1a4e2 Disable vulpkanin human hair (#40144)
init
2025-09-06 01:22:46 +02:00
ScarKy0
b2c9106839 Vulpkanin Species (#37539)
* [April Fools] Elf species  (#35353)

elf

* [April Fools] Juice that makes me go insane (#35370)

* kill me

* MAKE IT STOP

* is it finally over?

* web edit

* webedit

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* webedit

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* webedit

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* webedit

* WEBEDIT PLEASE

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* vulpkanin species

the ultimate april fools joke

Co-Authored-By: Kr8art <188977876+kr8art@users.noreply.github.com>

* cant be bothered

* make build and test debug run on the april fools branch (#35396)

welp

* Revert "[April Fools] Juice that makes me go insane (#35370)"

This reverts commit fcbdcf8452.

* Revert "[April Fools] Elf species  (#35353)"

This reverts commit 704293a051.

* nuh uh

* localized names

* fix survival box

* abilities (Mostly don't work yet, pending PRs)

* wagging loc

* slight heat tweaks

* stuff

* Update Vulpkanin.xml

* vulp screams + quieter howl

* MessyDrinker by Orks

* MessyDrinker guidebook

* animal bones

* fix wagging

* missed

* no loc

* Lower damage, remove butchering

* Revert "animal bones"

This reverts commit 3457cde13e57336678f62a20bf57fb315844c240.

* leap

* collision

* leap desc update

* leap guidebook

* fix leap

* microbalance

* comment

* microbalancing pt 2

* microbalancing pt 3

* test fail fix (i hope)

* fix organs

* no leaping on the ground

* remove SolutionScanner + ling work

* fix clone

* add stuff back

* microbalancing pt yes

* male vulp names

mainly slavic names with some similiar sounding ones mixed in

* Revert "male vulp names"

This reverts commit 1666f81821bfea241262627160a594dd1b0ce050.

* male vulps names pr 2 (slavic, dog names, few puns)

Slavic names, with mixed in typical dog names and some puns

* female names (mainly slavic, other stuff mixed in)

* oops

* Update vulpkanin.yml

* Vulps WIP Work (#1)

* Modified aesprite tools

* WIP

* wipperoni

* We are done here, wawa

* Revert "Merge branch 'aseprite-tools' into hannah/vulps-wip"

This reverts commit d258645df60a94d0217fecd85a38545f2b951cde, reversing
changes made to 0ae39e862152ef6548533eba0547709594c55e90.

* Resolve merge issue

* Fix Urist McVulp forgetting his fursuit

---------

Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>

* re-add ears and husk overlay

* revert adding ears to vox

* Crest Markings

* Fade Markings

* Sharp Markings

* microbalance + comments

* censor character nudity option compliance

* Ear Markings

* 1984 wagging animations

* Tail Markings

* tail wag icon

* annoyance

* guidebook

* slight temperature tweak

* seperate out snouts, port over 2 markings for testing

* fix

* seperate snout file

* Snout/Head Markings

* cleanup + locale for ears

* Head and Snout loc

* gray eyes

* crest and husk cleanup

* Tail and Chest loc

* Legs and Arms loc

* most important commit

* mime vulps like rations too

* missing loc

* microbalance

* not needed

* goatee

* white eyes

* harmony feedback tail fixes

* personal changes and fixes after playing

* fix fluffy tail clipping

* Sprite fixes, displacement fixes (#2)

* Tune head displacement

* Vulps Sprite Tuning

* helmets

* detail

* Urist

* wag

* comban't

* fix attributions

* remove vulp biosuits

* fix vulp beards

* fixed up ears

* comment note

* further ear tweaks

* engi helmets

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kr8art <188977876+kr8art@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>
2025-09-05 12:43:17 +02:00
Zalycon
31ce616c25 Raises max chest markings for all species (except Reptilian) to 2 (#37065)
* Update arachnid.yml

* Update diona.yml

* Update human.yml

* Update moth.yml

* Update slime.yml

* Update vox.yml
2025-05-07 14:44:53 +02:00
Nemanja
fa6c97bf50 Fix vox hair (#36816)
* Fix vox hair

* remove CL
2025-04-21 21:24:37 -04:00
Ed
f6a29e24a2 Markings overhaul (#35938)
* markings displacement setup

* ok i got it!

* fix map updating

* remove trackingLayers

* markings clean up and modernizize

* marking disabling displacements

* markings restriction

* dehihienize

* dehihiniezize 2

* aa

* nice
2025-04-20 17:01:50 -04:00
MilenVolf
7806afb284 [Part of #32893] Localize vox dataset names (#33396)
* Localize vox names

* Correct prototype id to follow naming conventions

* Upstream names
2025-03-08 20:03:24 +01:00
MilenVolf
177a323fd4 [Part of #32893] Localize humanoid species dataset names (#33395)
* Localize diona names

* Localize moth names

* Localize mushman names

* Localize reptilian names

* Localize skeleton names

* Upstream diona names

* names-moth-male/female-first-dataset -> names-moth-first-male/female-dataset

* Correct prototype ids to follow naming conventions

* NamesSkeletonFirst -> NamesSkeleton

* Combine moth_first_female.yml, moth_first_male.yml and moth_last.yml

* Forgot about skeleton prototype

* Upstream names

* Update Resources/Locale/en-US/datasets/names/diona_last.ftl

* Update Resources/Locale/en-US/datasets/names/diona_last.ftl

* keep first name for skeleton

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-03-08 20:03:07 +01:00
MilenVolf
28174a5062 [Part of #32893] Localize arachnid dataset names (#33353)
* Localize arachnid dataset names

* Correct prototype ids to follow naming conventions

* Combine arachnid_first.yml and arachnid_last.yml

* Upstream names
2025-03-08 20:02:22 +01:00
SlamBamActionman
27cfc0939c Add undergarments & "Censor Nudity" toggle to options (#33185)
* Initial commit

* Attribution

* Review changes

* Added comment for upstream
2025-03-05 10:14:01 +01:00
LaCumbiaDelCoronavirus
aa05cbb49b make slime hair less transparent (#35158)
* blabl blump or something

* +0.3

* blimpuf
2025-03-01 20:56:29 +11:00
IProduceWidgets
bf312f2306 Update Snowasis (#33364)
* Update Snowasis

* Appease test gods

* Woops had the leftward animation backwards. Fixed.

* add santa suits and envelopes to chapel

* It looks worse unscaled but whatever.

* fix ghost role

* examines
2024-11-30 23:30:01 -07:00
coolsurf6
01a211ae3f Increased Chest Marking Points for Reptilian Race (#30786)
changed reptile chest marking count to 3
2024-08-23 16:24:06 +02:00
Rouge2t7
7e60431754 Long human ears (#30490)
Long human ears colour fix. Shortcut removed.
2024-08-21 17:44:43 -06:00
metalgearsloth
2988ac3839 Make vox roundstart (#29704)
* Make vox roundstart

I believe all the issues are fixed.

* Click detection bandaid
2024-07-04 17:11:01 +10:00
metalgearsloth
332f54a3ae Lobby refactor + species loadouts support (#27576)
* Vox stuff

* Species loadouts and lobby refactor

The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.

* a

* Bulk changes

* a

* weh

* Character import / export

* finalise

* woops this stuff too

* Also datafield exporting

* comments

* Review
2024-05-12 09:18:21 +10:00
SlamBamActionman
f544c91298 Revert Exterminator pending newmed/redesign (#26978)
* Reverts Exterminator

* Includes commented out parts + sprites

* Readd stuff, comment out yaml

* Popup ads

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 15:45:54 +10:00
Errant
257b04d277 Vox sprite rework (#26985)
weh
2024-04-27 16:04:51 +10:00
SlamBamActionman
3af2928a25 Add nose customization to humans & dwarves (#25557)
Initial commit
2024-02-26 16:15:04 -07:00
Errant
5a9ab3b315 Vox names, species prototype cleanup, some cosmetic changes (#24994)
* voxnames

* New generator parameters, names are more readable

* bunch of missing vox stuff

* more names

* sad
2024-02-14 14:08:45 +11:00
lzk
4b9f1a47bb Split slime marking leg gradient (#24928)
* Split slime marking leg gradient

* up markings to 4
2024-02-13 17:03:41 -05:00
lzk
6c0467c0f6 Skeleton species locale (#23770)
* Update species.ftl

* Update skeleton.yml
2024-01-09 00:06:01 -08:00
Adrian16199
aa92dd0c58 Limits marking for certain species. (#23385)
Was told that due to the bandages bein added, the fact that reptilians not having a limit is technicly a bug and should be fix. So might aswell prevent anythin happening in the future for other species.

Could make the limiter up to 4 but thats up to discussion ¯\_(ツ)_/¯
2024-01-02 16:11:37 -05:00
Ubaser
c8f1387ba0 Lizards get more marking availability (#23219)
add
2024-01-01 18:27:14 -05:00
Flareguy
450414c8fc Adds gingerbread men to the game (#22927)
adds gingerbread men to the game
2023-12-25 01:11:37 -07:00
deltanedas
52532e4075 exterminator midround minor antag (#19946)
* terminator locale

* terminate objective

* terminator components and shared system

* terminator roles rules and system

* terminator events

* skeleton recolour

* terminator and endoskeleton

* ghost role spawn

* damage modifier sets

* :trollface:

* :trollface:

* add antag prototype

* ghost role locale

* skynet

* :trollface:

* :trollface:

* :trollface:

* add endoskeleton body prototype

* :trollface:

* :trollface:

* smite locale

* implement terminate smite

* :trollface:

* :trollface:

* implement PopupBehavior

* endoskeleton transform popup

* move stuff from shared to server since nothing actually used it

* recolour everything

* update parts

* :trollface:

* :trollface:

* ok fire was using the damage set, back to 1.0

* tweak

* :trollface:

* :trollface:

* simplemob ops

* 1 rule per pro

* :trollface:

* :trollface:

* update some sprites

* structural damage

* :trollface:

* :trollface:

* Revert "update some sprites"

This reverts commit 459196c6a8942c5412885d5fe2f1a83a48408ddc.

* offbrand, add die objective to maybe remove fear of murderbone

* add shut down objective to the list

* fix ghost role

* fix control mob

* :trollface:

* :trollface:

* please

* naming

* code changes for GenericAntag terminator

* yml changes for GenericAntag terminator

* :trollface:

* moved kill objective override to an objective component

* use kill objective override

* fix

* oh

* locale changes

* change burn to heat for skin melting gib

* change some endoskeleton stuff

* pro

* i already did this dementia ops

* objective

* fix

* pro

* swap out full sprite

* update parts

* forgor

* fix mind transfer

* type

* endoskeleton has 500 mass

* evil

* fishops

* warops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-24 20:16:56 -07:00
Repo
222c025cd3 Revert "Enable skeletons temporarily for Halloween (#21356)" (#21385)
This reverts commit 4f81a561ae.
2023-11-01 17:47:55 -04:00
Nemanja
4f81a561ae Enable skeletons temporarily for Halloween (#21356) 2023-10-30 20:40:11 -07:00
Nairod
4a520ae2cb Arachnid Markings Expansion (#19439) 2023-08-23 17:37:42 -04:00
Nemanja
3f2ea17bb7 fix species skin colors (#19417) 2023-08-21 19:05:24 -07:00
Nemanja
848b713982 diona customization (#19304) 2023-08-20 19:02:12 -06:00
MilenVolf
924a68732a New moth markings for customization (#18768) 2023-08-07 11:12:41 -06:00
Vordenburg
cc8b642444 Add linter-friendly WeightedRandom prototypes (#18729) 2023-08-06 12:31:25 +10:00
lzk
d6d5f3ddcb Update moth.yml (#18644) 2023-08-04 17:32:40 +10:00
LankLTE
70545f4873 Moths. (#18593) 2023-08-04 15:21:28 +10:00
PixelTK
2298ae92c3 Small (and maybe unnoticable) arachnid changes (#18261)
* Small arachnid sprite changes

* chest marking colour
2023-07-24 14:21:07 -06:00
PixelTK
9cc8d6902e Arachnids: New markings, new organs sprites and chelicerae (#18177)
* New markings, new organs sprites and chelicerae

* Update locale
2023-07-20 15:55:49 -06:00
PixelTK
8269a500b3 Arachnid species (#13945) 2023-04-30 02:19:06 +10:00
Emisse
83b342ab5f Re Enable Dwarves (#15079) 2023-04-02 17:06:24 -07:00
Nemanja
66ff565e16 Add support for true randomized characters (#14918) 2023-03-28 18:30:00 -07:00