Commit Graph

31 Commits

Author SHA1 Message Date
GR1231
a566b4cc84 Fix Smile's hat displacement map (#39824)
Fix Smile's head displacement map
2025-08-25 20:48:31 -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
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
zHonys
5d0d37161d Added support so that smile can use hats (#33924)
* Added support so that smile can use hats

Changed Prototypes/Entities/Mobs/NPCs/pets.yml
Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates
Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi
Added smile_displacement.rsi/meta.json
Added smile_displacement.rsi/head.png

* Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi
Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1

Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/
Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi

* Minor fixes: removing comments and change naming

Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi

* Removed smile_inventory_template.yml and used head_inventory_template.yml instead
2024-12-29 02:49:05 +01:00
Ed
00650f16ec Dev mouse acorgillation (#32040)
* Update dev_map.yml

* real mouse returned
2024-09-15 02:21:33 +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
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
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
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
themias
0c944ed81e More sprite movement states (#24237)
* More sprite movement states

* what
2024-01-18 18:48:27 -05:00
Ed
d22fe3f921 SyndiCat (#22554)
* add content

* 4 tk to 8 tk

* replace to autoinject, now cat can explode in any moment. increase cost to 10tk

* Update animals.yml
2024-01-06 17:52:41 -08:00
Ed
088d39f7ac Bread dog (#22548)
* add content

* add new bark accent
2023-12-16 01:30:20 -07:00
Nyranu
f173b6a710 Cat cake. A small update. (#21805)
* Cat cake. A small update.

* up1

* up2
2023-11-22 17:41:48 -07:00
Vasilis
53dda10775 Fix corgi pup fixture (#21671)
* woop

* weh

* aaaaaaaaaaaaaaaaaaaa
2023-11-15 13:56:28 -07:00
Ed
63ba40d396 Cak (#21639)
* added fun

* change recipe, add OwO

* fix?
2023-11-13 16:23:03 -07:00
ravage
c2de7ec5b3 Adding a kitten (#20726)
* Update animals.yml

* Update

* ANOTHER UPDATE

change mobcat meleeweapon from brute to piercing, deleting extra lines

* oops

* Update npc.yml

* Update npc.yml

* Update animals.yml
2023-11-09 05:24:00 -07:00
brainfood1183
a0a373832c Hamlet error on revival fix. (#17797) 2023-07-03 17:59:29 +10:00
brainfood1183
f2d3ea9117 Hamster resprite by RamZ and hamster can wear some clothing, monkey eva resprite. (#17439) 2023-06-29 18:36:19 -04:00
Nim
b9e71237c4 Predatory pet for HoS (#15237) 2023-04-09 21:33:22 -07:00
Alekshhh
230e058593 Cerberus Resprite (#14653) 2023-03-24 16:28:29 -04:00
Nemanja
52ef1dd7f0 Revert "Paperwork Resprite (#14568)" (#14698)
This reverts commit 6c2edad3bd.
2023-03-23 12:53:27 -04:00
Alekshhh
6c2edad3bd Paperwork Resprite (#14568) 2023-03-11 01:34:46 +11:00
Justin Trotter
8c0b113fcf Pet internals (#12376)
* toggle other crew and pet internals

* oops
2022-11-08 15:04:06 -06:00
Emisse
16a211ad8b More animals (#7124)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-03-23 23:56:23 +11:00
Willhelm53
b4b2f02264 Possums and Raccoons and Ferrets, Oh My! (#6808)
* * Fixed Reagent Tanks so they now dispense an amount according to the transfer amount of the bucket you use.

* Revert "* Fixed Reagent Tanks so they now dispense an amount according to the transfer amount of the bucket you use."

This reverts commit 3b565c0509e0a802b5aec63fc62007205ec330f1.

* Adds possums along with their sound effects and petting popup messages.

* Adds Morty my beloved

* Fixed a small error in InteractionPopupSystem that was causing an error: "[ERRO] root: Server tried to play audio file  which does not exist."

* Added raccoons

* Adds Morticia the raccoon. Morticia my beloved! (Original character do not steal :P)

* Adds ferrets and their SFX

* Well excuuu-uuuuse ME, Princess!

* "It can't be THAT easy..." --Spider-man Noir

* It's that easy.
2022-02-23 12:40:31 -06:00
FoLoKe
5f3ae602ed Add some animals basic mechanics (#5132)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-11-13 12:48:05 +11:00
Swept
9a604e38d6 Updates chemistry layout on Saltern (#3658)
* Adds content

* Maps

* Fixed
2021-03-14 16:24:22 +11:00
Vera Aguilera Puerto
ab4b275247 Revert "Changes chemistry to be more secure for now (#3649)" (#3651)
This reverts commit fc9a62581b.
2021-03-13 13:54:48 +01:00
Swept
fc9a62581b Changes chemistry to be more secure for now (#3649)
* Adds content

* Maps
2021-03-13 20:27:53 +11:00
Swept
a57db85208 Swept commits JSON genocide. (#2991)
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
Swept
0f7e62d414 More Mobs | Space Carp, Monkey, Gorilla etc. (#1502)
* Space Carp (Can't move in Space)

* Carps!

* Monky and Gorilla

* Fixes

* Chickens I guess

* rsis updated

* Buncha Sprites m8

* Hopefully that pr'll get merged

* Fixed

* Added a shitton of stuff

* Refined hitboxes and added new corgi

* Broken for now

* Fixes conflicts

* Moves Xeno back

* ok NOW it fixes it

Co-authored-by: Víctor Aguilera Puerto <zddm@outlook.es>
2020-08-16 16:20:36 -07:00