Commit Graph

303 Commits

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

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

This reverts commit 704293a051033026bfca0c9e161d97796bc0cb81.

* 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
Mora
d1deb5b059 Some more vox customization (#39083)
* Added docked and spiked tails, added talisman for vox

* Tail Talisman ftl

* adjusts talisman to be its own tail to avoid having to deal with other tails at all

* vox tail stuff

* Added amputated tail (courtesy of flareguy) and split tail

* adds TODO regarding marking conditionals

* rsi run check pls stop screaming at me

* Shelving the talisman for later, keeping the sprites around

* Add RSI credits

* Remove unnecessary files

* renamed amputated to vestigial
2025-09-03 20:05:48 +02:00
Tiniest Shark
3775da3345 Helm + Mask Displacements for Reptilians (and some unique helmets) (#39351)
* Liz displacements + unique helms

* small fix

* Couple of small fixes
2025-09-03 18:45:18 +02:00
GR1231
a566b4cc84 Fix Smile's hat displacement map (#39824)
Fix Smile's head displacement map
2025-08-25 20:48:31 -04:00
RedBookcase
5c206ede67 Added more Derelict Cyborgs. (#38159)
* Added more Derelict Borgs.

* minor fix & salvage borg instead of mining borg name.

* I LOVE CAPITALIZATION!

* Fixed Derelict Engineer Cyborg name and added unshaded crystal layer.

* Ordering fixes & other cleanup.

* Updated Derelict Salvage Cyborg Sprites.

* New Salvage borg sprites.

* Updated module comments.

* Update events.yml

Extended the Derelict Syndicate Assault Borg's spawn timer to 25 minutes from 15.

* Fix for new borg hands

* Update events.yml

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-08-23 16:32:15 -04:00
CoolioDudio
d4f8568e50 Added baby and cube hair (awesome) (#39680)
* Added baby and cube hair (awesome)

* added yml and ftl (oops)

* Update cube.png

Made cube smaller
2025-08-15 18:50:13 -07:00
Nemanja
3ffa3ea9d4 Moth displacement map fixes (#39174) 2025-08-09 17:52:06 -04:00
slarticodefast
a80b31e1cd Fix vox inhand displacements (#38507)
fix
2025-08-04 19:34:41 -04:00
Samuka-C
53e64c3a24 Xenoborgs part 4 (#36935)
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: WarPigeon <DaedalusTheGamer@gmail.com>
Co-authored-by: Kowlin <git@wyvern.blue>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-08-04 15:18:55 +02:00
Mora
4a7576a7a6 Several Vox Sprite Displacement and Layering Fixes (#39219)
* Vox displacement map fixes

* Adds neck displacement map and changes sprite layering to prevent the tank from rendering on top of a Vox's facial hair strangely
2025-07-28 17:28:15 -04:00
Flareguy
649b23a061 moth displacement map fixes 2025-07-23 21:22:02 -05:00
Myra
8e5d70716d Stable to master (#39095) 2025-07-20 17:30:46 +02:00
Vasilis The Pikachu
752f44945b Revert "Kobold/monkey AI holograms (#38888)"
This reverts commit 97fcebb92b.

Please check the maintainer meeting and the recording at time 41:58 for further information

https://docs.spacestation14.com/en/maintainer-meetings/maintainer-meeting-2025-07-19.html
2025-07-20 17:13:59 +02:00
Mora
6eadc8aeee Stray Pixels on Vox Tails (#39082)
Stray pixel fixes
2025-07-19 23:56:50 -04:00
Velken
b18a7ccdd3 Moproaches (#38700)
* MOPROACHES

* rerun test - random test fail of doom

* added to random pest event, with same prob as cancer mouse

* rerun test - random test fail of doom 2 electric boogaloo

* changed moproach obtain methods

* no crafting of moproaches allowed :(

* Reverted content of file.

* requested changes

* requested changes

* requested changes

* Increase moproach health by 5 - requested by Emo on discord

* spaaaaaaaaaaaaaaaaaaaaaaaaace

* microwave recipe added

* no surgery this week

* spaaaaaaaaaaaaaaaaaaace 2 more space for your space

* space

* new mopshoes sprite

* in-hands

* inhands v2

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-07-14 22:47:47 -04:00
Flareguy
d55a2b830a Vox customization additions (+eyeshadows) (#38906)
vox customization stuff
2025-07-13 22:49:25 -04:00
Velken
3d9dab1d52 Hats (and glasses) for pets - Part 1 - Ian and McGriff (#38634)
* new branch new me

* cursed displacement

* 2 pixels of death

* forgot a line

* fixed some edge cases on corgis with the displacement

* fix conflict

* fix indentations

* a bit more displacement fixes
2025-07-13 12:11:00 -04:00
Mono
adcdcb39dc Fixing a singular pixel on the frame of the AI (#38936)
* Singular pixel ops

* Third commit - upholding CC-BY-SA by indicating changes made
2025-07-11 23:33:12 -04:00
Princess Cheeseballs
ac895a0db4 Stun and Stamina Visuals (#37196)
* Stun animation

* Commit 2

* Almost working commit

* Best commit

* Minor cleanup and value adjustments

* Fix animation data getting wasted and cleaned up some stuff

* Don't animate if dead

* AppearanceSystem is for chumps

* Cleanup

* More cleanup

* More cleanup

* Half working commit

* Documentation

* Works

* ComponentHandleState my beloved

* AppearanceComp compatibility

* Address review

* Borgar

* AND NOW THE END IS NEAR

* AppearanceSystem compliance (Real)

* Don't need to log missing there

* I actually hate mob prototypes so much you don't even know

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-07-11 14:13:11 +02:00
Hitlinemoss
97fcebb92b Kobold/monkey AI holograms (#38888)
* Added kobold/monkey AI holograms

* Updated meta.json
2025-07-10 13:11:23 -04:00
Crude Oil
9ebf6a24c4 Parroting Parrots part 1: Help maints! SQUAWK! Maints! (#38243)
* parrots have ears. add poly

* high tech parrot functionality

* adjust times

* add accent to radio message

* don't spam everything all at once probably

* learn about the existence of prob(float)

* actually use Prob(float) correctly

* newline

* add pet spawner for poly

* move chance to talk on radio to component

* missing comment

* minor edits and doc additions

* the reviewerrrrrrr

* parrot can't learn when crit or dead

* increase default memory

* rename poly to polly

* crude way to ignore whispers. chatcode please

* This is Polly. It is set to broadcast over the engineering frequency

* add missing initialize

* add displacement map for parrot ears

* review comments - Errant

* minor things

* large rework

* fix attempting to talk when entity has no channels

* use list of active radios again to track channels

* fix bad return, some comments

* fix long learn cooldown

* minor adjustments

* use FromMinutes

* the voices told me to make these changes

* remove default reassignment

* Review changes

* remove polly's accent

* decouple radio stuff from parrotsystem

* minor stuff

* split vocalization and parroting

* minor review work

* re-add missing check

* add admin verb for clearing parrot messages

* minor action icon update

* oops

* increase icon number text size

* Admin erase parrot messages associated with players

* part 1 beck review

* add whitelist and blacklist for parrots

* Downgrade missing component error to warning

* Add comment

* add some missing comments

* Remove active radio entity tracking, use all inventory slots

* Minor changes

* small review stuff

* review radio stuff

* swap ears displacement to invisible death displacement

* remove syncsprite

* vscode why do yo have to hurt my feelings

* review changes

* use checkboth
2025-07-09 12:04:57 -07:00
Mora
d15b74d56b Added Vox Heterochromia (#38595)
* Added Vox Heterochromia

* Forgot to change moth to vox

* minor formatting fix

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-07-08 19:22:13 -04:00
slarticodefast
b1fb01fed5 Stable merge (#38822) 2025-07-07 14:39:12 +02:00
Hannah Giovanna Dawson
5f7db3b151 Scurret displacement map fixes (#38775) 2025-07-07 00:42:13 +02:00
Mora
edbde7b7b9 Vox scars (#38592)
* Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl

* Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl"

This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15.

* locale key fix

* Changed top surgery scar names to be more generalized

* Adjusted face scars

* Formatting fixes

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-07-04 19:06:55 -04:00
Tiniest Shark
a1cf490360 Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
Hannah Giovanna Dawson
48d897d31e Scurrets (#38218)
* Scurrets.

* Add missing equipment YAML

* Fix count of NamesFirstScurret

* Resolve PR comments, wa.

Also add like a bunch more wa replacements

* ed

* Update Resources/Textures/Mobs/Animals/scurret/displacement.rsi/meta.json

* :rivflabbergasted:

* Fixed spacings in scurret_last.ftl

* Fix mangled endings of some last names

* wawa

* the scug has a spear for self defence
2025-06-20 16:39:08 -07:00
Boaz1111
55540c374a scar availability for more species (#35645)
* :D

* updated for new scars

* small eye scar
2025-06-11 23:56:57 +02:00
brainfood1183
1118ea50e0 New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock anomaly. (#37787)
* new sprites for coal and gold ore crabs, new bananioum ore crab and rock anomaly.

* add whitespace to end of line in ore.yml

* fix white space end of file.

* fix for linter fail.
2025-05-29 18:16:20 -07:00
Tiniest Shark
b2469b67a7 art update on the spine 2025-05-28 00:44:05 -04:00
Tiniest Shark
95e7d16a92 minor color fix 2025-05-25 12:06:44 -04:00
Tiniest Shark
9391b32e76 big tail can wag now 2025-05-25 01:55:59 -04:00
mubururu_
588bc52f26 inhands for Syndicate Things (and thief beacon) (#37682)
* initial

* splitting this b

* thief bacon 1 handed

* why is test fail

* dont fail please

* "requires"

* evil tests
2025-05-21 11:39:29 -04:00
Samuka-C
722620c1cf Xenoborgs part 3 (#36867)
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-05-16 20:59:48 -07:00
Flareguy
338665a3ca Add hivebots (#37275)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-05-14 18:09:23 -07:00
Sparlight
26c5d77f07 Add smart corgi prototype (#36664)
* Add smart corgi prototype

* 1984 - exploded dog names

* Tag fixes

* exploded anomalyhost tag

* Demolish the mysterious corgi flesh-pocket

* Review changes:  yml convention tweaks and reparenting of Corgi and Smart Corgi to new abstract base

* new week, new review, new me
2025-05-13 18:10:10 +02:00
chromiumboy
7ac67ebf8c Station AI customizations (#34501)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-05-13 01:50:43 -07:00
Nemanja
ec66c70295 New Salvage Mob: Basilisk (#37135)
* Basilisk

* Less health

* Unique projectile

* Selfmerge incoming

* Update Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-12 19:42:51 -04:00
Futuristic-OK
48d134cc7d New hairs2 (#36613)
* Update human-hair.ftl

1

* Update human_hair.yml

* longwithbangs.png

* Update meta.json

* fix png

* Update meta.json

* Update Resources/Locale/en-US/accessories/human-hair.ftl

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-10 20:09:27 -04:00
Flareguy
cdcc57e467 Moth displacement maps (#37231)
moth displacement maps
2025-05-07 13:06:42 +03:00
Krunklehorn
522c6975f1 Darken reptilian eye sockets to reduce the effect of mixels (#37082)
Initial commit
2025-05-06 14:30:25 -04:00
KingFroozy
3d0485fe5b Shoulder-length hairstyles resprite (#37000)
* sprite

* final

* final (final fr)
2025-04-28 17:00:10 -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
Pgriha
097aff5e58 Heterochromia for Moth (#36061)
* 1

* Fix local

* formatting

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-20 14:03:37 +02:00
Alzore
d7c244293c Aquatic tail and back fin markings for lizards (#33219)
* shark tail and back fin for lizards

* credit me
2025-04-20 15:57:01 +10:00
Minemoder5000
dd35318a87 Fix slime hand gradient not showing on the opposite side of the body (#36543)
fix gradient color not showing on other side of body
2025-04-18 17:41:30 -04:00
mubururu_
2b845c70c7 space adder sprite cleanup (#36584) 2025-04-16 15:14:48 -07:00
Ed
07a8a02522 vox inhands displacements (#35947)
vox inhands
2025-03-20 18:01:39 +01:00
mubururu_
eb5610b745 inhand sprites for Produce (#35151)
* awakening

* fix test fail

* attribution fix

* tomater killer inhandered

* extrorange inhand spin rate nerfed

* fuck webedit
2025-03-19 20:53:48 -04:00
slarticodefast
bce9b4b05b Paradox Clone (#35794)
* polymorph fixes

* paradox clone

* forensics cleanup

* bump doors

* 4

* attribution

* polymorphn't

* clean up objectives

* Update Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml

* review

* add virtual items to blacklist

* allow them to roll sleeper agent
2025-03-13 10:09:07 -07:00