Commit Graph

237 Commits

Author SHA1 Message Date
pigeonpeas
1dc8a86ecc fix moffra antennae (#31981)
Update moffra.png
2024-09-09 13:42:23 +10:00
Ed
230ea9be46 Metamorphosis - FoodSequence 3 (#31012)
* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
2024-09-08 02:22:27 -04:00
Boaz1111
3a3a5fbaf4 makes the maple wing marking have a primary and a secondary color (#31691)
bogos binted
2024-09-07 15:48:40 +10:00
IProduceWidgets
c8e59ebdd5 Add Snails (#30765)
* add snails

* scuffix

* migrate

* mo-grate

* oopsied the ftls

* Revert "oopsied the ftls"

This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.

* the curse of staging the wrong file, resolved.

* Snoth

* fix my dumbs

* reviews 1

* anti space technology

* salt hurty

* spelling

* Its a slotherhouse out here

* sequencing

* cooked snail

* volfix

* speed reversal
2024-09-03 12:33:44 +02:00
Арт
0c018769a6 Return Long2 and Long3 hairstyles (#30963)
* Sprites

* Prototype_&_Locale

* sorted_in_alphabetical_order
2024-09-03 18:29:24 +10:00
godisdeadLOL
a112c24b54 Added in-hand sprite for Smile the Slime (#31731)
added smile the slime in-hand texture

Co-authored-by: YourUsername <you@example.com>
2024-09-01 22:36:05 -06:00
metalgearsloth
af79603d9d Update AI holo sprite to camera (#31558)
Update AI camera to 13 default

Holo was a placeholder. This is better in the interim.
2024-08-28 15:45:15 +10:00
metalgearsloth
afd0618a60 Station AI (#30944)
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

# Conflicts:
#	Content.Client/Silicons/StationAi/StationAiOverlay.cs

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
2024-08-28 10:57:12 +10:00
Rouge2t7
7e60431754 Long human ears (#30490)
Long human ears colour fix. Shortcut removed.
2024-08-21 17:44:43 -06:00
Verm
4e3e8ad03c Mothroaches can now wear hamster-wearable clothes + pet inventory tweaks (#28956)
* moth displacement + inventory tweaks

* Fix off by 1 on the head sprites

* Move files to main mothroach folder

* Fix mask up a bit

* Fix side mask sprites

* Change format because it changed forever ago
2024-08-20 14:20:12 +10:00
Flareguy
94c746abe9 Minor vox customization update: new hairstyles & facial hair (#30815)
* new vox customization stuff

* tests fix
2024-08-18 21:32:15 -06:00
Nemanja
a540b8840e Goliath mob (#30839)
* Goliath mob

* Update asteroid.yml

* mcfuck yourself

* add cloak

* fixes

* Update materials.yml
2024-08-18 12:22:36 -04:00
Ed
e659eb992f Custom Taco & Kebabs - FoodSequence 2 (#30905)
* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

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

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

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

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

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

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-14 15:04:00 +02:00
Flareguy
37e36bfa7c Vox head displacement map (#30699)
* head displacement for vox

* fixe
2024-08-06 16:12:14 +03:00
Ed
918709cb47 Displacement maps big update (#30093)
* split logic into own system

* add support for different size displacement maps

* some clothes may not use displacement maps

* displacement maps spport hand sprites

* Update DisplacementMapSystem.cs

* rename things

* fuck stencilmask

* fix bugs

* no masks

* Update jumpsuits.yml

* fix species specific sprites

* Update ClothingSystem.cs

* shoes + ears displacement, some bugfix

* Update DisplacementMapSystem.cs
2024-07-23 12:04:09 +03:00
Flareguy
b20fd4fbd0 Vox displacement updates (#29824)
* more vox displacement maps

* A

* remove vox insuls sprites

* sci magboots

* Update vox.yml

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-07-17 10:43:11 +03:00
lzk
c9c721be16 Add supplybot moving states (#29795)
* Add supplybot moving states

* forgor
2024-07-07 23:05:09 +10:00
Errant
b418338af7 Phoronman 1984 (#29747)
No more.
2024-07-06 14:17:32 +10:00
Ubaser
69afba67b6 Fix Underwing wings (#29092)
* add

* tweak thickness of stripe
2024-06-18 22:24:28 -04:00
Ubaser
5038012b67 Add new lizard horns, Demonic (#29022)
add
2024-06-17 13:53:47 +03:00
Verm
24e7653c98 Resprite rodent inhands + add hamlet inhands (#28955)
* Resprite rodent inhands + add hamlet inhands

* Small ham adjustment
2024-06-14 09:45:01 -04:00
Flareguy
8366c743f2 Gives vox The Brows in their front facing sprite (#27922)
* gives vox The Brows in their front facing sprite

* JASON
2024-05-11 10:54:56 -04:00
Flareguy
caa822b9a0 Revert "Make the floppy lizard ears have two colors." (#27790)
Revert "Make the floppy lizard ears have two colors. (#27679)"

This reverts commit bd06aa2365.
2024-05-07 20:48:42 -07:00
pigeonpeas
bd06aa2365 Make the floppy lizard ears have two colors. (#27679)
* Make the floppy lizard ears have two colors.

* please fix whatever the hell happened

* fix the error

* suggestion from Ubaser

* another suggestion from ubaser
2024-05-07 17:22:25 -07:00
Flareguy
0e829eb380 Vox customization fixes & updating (#27663)
vox customization
2024-05-04 04:12:11 -07:00
T-Stalker
bf3e9fe3b4 Add neckfull frills for lizards (#27523)
* light

* neckfrills

* Delete Resources/Prototypes/XenoArch/Effects/normal_effects.yml

* Revert "Delete Resources/Prototypes/XenoArch/Effects/normal_effects.yml"

This reverts commit 6e6fad609a66a0615abcd545009cdb2f52c9b955.

* Revert "light"

This reverts commit d1f111d4c64da4d2a64907f7dfead104892d1462.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-30 19:18:00 +10:00
KittenColony
4b39c358c8 Fix sprite for frontal splotch snout (#27479)
frontal sprite fix
2024-04-29 17:30:38 -04:00
nao fujiwara
8a59e9e1f8 repositioned spooky long hair to its proper place in the alphabet (tweak) (#27370)
* repositioned spooky long hair to its proper place in the alphabet

* forgot the meta.json for hairstyles oopsie
2024-04-27 16:58:14 +02:00
Errant
257b04d277 Vox sprite rework (#26985)
weh
2024-04-27 16:04:51 +10:00
Pieter-Jan Briers
2f7d0dedbd Displacement map prototype (#26709)
Requires https://github.com/space-wizards/RobustToolbox/pull/5023

This uses the new engine features (above) to add a displacement map shader. This allows deforming a sprite based on another sprite.

Primary use case is automatically adapting human clothing sprites to different species, something we want to make species like Vox a reality.

A basic example of wiring this up with Vox has been added. The system is however incredibly simple and **will** need more work by a content developer to select and toggle displacement maps when appropriate. I am leaving that to somebody else. For example right now the displacement map is applied even if a species already has custom-fit sprites for a piece of clothing, such as the grey jumpsuit for Vox.

Basic Aseprite plugins to help with authoring displacement maps have also been made.
2024-04-27 16:03:58 +10:00
nao fujiwara
c6d935497c spooky dress and hairstyle (#27333)
* first draft loooong hair

* *added the old dress item *added old dress to the theatrical performances create

* updated spooky long hair name

* fixed an oopsie made when updating item names
2024-04-26 12:51:26 -06:00
KittenColony
b48d0ddefc Two-Tone lizard snouts (#27143)
snouts
2024-04-21 00:18:33 -06:00
lzk
d5e187dc50 Changes to frills axolotl (#27104) 2024-04-18 19:02:21 -04:00
Ed
f3a97fc0c5 Killer tomatoes (#26053)
* make tomatoes

* many friends! many mommies

* finish

* renaming system

* fix

* Update miscellaneous.yml

* Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* N

* deleete exception?

* merge conflict fix

* fix?

* fuck you

* sloth fixes

* fixess?

* fix

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-18 21:21:56 +10:00
KittenColony
a1fcfed7d9 Gauze Markings 3 - Revenge of the Wrap (#25481)
* Insectoid Gauze, Added racial marks to variants

* removed excess r from gauze_moth_lowerleg_r

* Update gauze.ftl

* moved all markings to Overlay Category

* fixed localization error

* a
2024-04-09 10:04:51 +02:00
BITTERLYNX
78dd193c25 Fire sprite change for mice (#26758)
* Add new fire sprite for mice that fits them better

* Add the sprite change to rats as well

* Moffroach and hamsters now also have more fitting fire sprites

* made the meta.json easier to read
2024-04-06 00:41:23 -04:00
Pieter-Jan Briers
89db4409a4 Remove CRLF, enforce with workflow (#26401)
* Check for CRLF in actions workflow

Make emisse weep

* Copy paste bottom text

* I would like to thank StackOverflow for this spite PR.

* Mention file name in message because the workflow tab doesn't display it.

* dos2unix everything
2024-03-24 22:06:17 +01:00
RenQ
6bffa31eba The return of the 'long bedhead' haircut as an alternative (#26336) 2024-03-22 13:35:40 -04:00
James Simonson
12f94b33c3 Rats eyes glow in dark + reorganize rat textures (#26300)
* Split mice from rats and made rats eye glow

+ added red eyes to regal rats (Both king and buff) + normal rats
- removed mouse-3 sprites from mice and moved it into a dedicated rat rsi
+fixed admin smite wording (you turn players into mice, not rats)

* minor formatting fix

* removed version numbers float.

* Typo fix + removed unneeded layer name
2024-03-21 14:16:18 +01:00
UnicornOnLSD
76db710a1c new haircut alternative (brought back old one) (#25935)
added crew cut 2 wew
2024-03-12 14:47:29 -04:00
Арт
2ba28cc3d2 New cloth & hair (#25772)
* Clothing sprites & meta

* Changing prototypes & sprites

Rename sprites folder, edit prototypes and meta

* Hair_sprites_&_prototype

Add hair sprites and change prototype

* Update meta.json

* Rename added hair

* Revert "Changing prototypes & sprites"

This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98.

* Revert "Clothing sprites & meta"

This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32.
2024-03-06 04:42:05 +03:00
Nairod
ba8e92ddc8 Under Toned Tail (#25685)
* Undertoned Tail

* Locale
2024-02-29 15:27:04 -07:00
SlamBamActionman
3af2928a25 Add nose customization to humans & dwarves (#25557)
Initial commit
2024-02-26 16:15:04 -07:00
MACMAN2003
2458c87b62 Add Ratvar (#24958)
* Create ratvar.yml

* restore balance to the universe

* scale issues

mfw nar-sie is smaller

* spawner + spawn anim

a shitty spawn anim is better than no spawn anim

* undenseify

no longer as dense as a dying neutron star
2024-02-23 04:42:00 +03:00
Ubaser
f72a1a0edb Clean up scars.yml and add a new chest scar (#25215)
add
2024-02-17 15:50:39 -05:00
Ubaser
22244b3055 Add "tailed" hair (#25216)
* add

* yes
2024-02-17 15:49:48 -05:00
LankLTE
407d4aed58 Diona Nymphs & Splitting (#24630)
* Porting & implementation

* Fix two stupid errors

* Human not humans

* fix audio path

* Fix test fails & update cooldown

* Work on reviews & test fail

* Rework nymph organ system.

* Make the nymph organs nospawn.

* IsDeadIC
2024-02-16 18:54:44 -08:00
Ubaser
56c8084de5 Additional damage visualisers (#24618)
* brute

* add
2024-02-13 17:18:45 -05: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
Emisse
ce46281e39 double bun long hair (#24493)
* new hair

* turn my swag on
2024-01-24 18:05:01 -07:00