Commit Graph

3061 Commits

Author SHA1 Message Date
Princess Cheeseballs
871e7a1eae Vulp Plushie (#40303)
* Textures

* Plushie

* Fix sprites and add entity tables

* Copyright info

* Fix food sequence

* I'm dum

* head sprite update

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-27 00:21:29 -07:00
IProduceWidgets
80947b128a Add explosive cord. (#25875) 2025-09-25 23:33:28 +02:00
Mora
5e55974c0e fix out of bounds pixels on vox neck displacement map (#40495)
fix out of bounds pixels on vox displacement map
2025-09-25 17:32:18 -04:00
Keer-Sar
705e4d3aa1 Add "Lizard Visage" Snout Markings to lizards (#35294)
* initial commit

* Update attribution in meta.json

* Fix yaml formating in meta.json
2025-09-24 18:13:14 -05:00
RedBookcase
f6cd8673d3 Recharger tweaks. (#38138)
* Recharger tweaks.

* Remove note.

* Fix Potato blacklist.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-09-24 15:33:45 -05:00
chromiumboy
2824334a1e Health increase for station AI cores (#40487)
* Initial commit

* Increased health further
2025-09-22 03:39:16 +02:00
Tiniest Shark
4796c92609 Inhand Sprites for Clear Glass (#40427) 2025-09-20 11:25:01 -07:00
IProduceWidgets
2b411b244e The Experimental Lecter 8 (#40372)
* XL8 files

* slap dat on the ERT lead

* oop mag indicator offset

* fix newline
2025-09-19 21:30:07 +02:00
PicklOH
1a92ada5bd Adds Nukie IDs and PDAs, makes Nukie IDs able to copy accesses. (#37304)
* Adds Nukie IDs and PDAs, makes IDs able to copy access.

* Fixed PDA and ID parenting

* Meta.json spacing

* PDA parenting

* retest

* Forgot a comma OOPS

* Spacing

* Minor meff fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-17 17:15:18 -07:00
SurrealShibe
857ae2a088 Turn the Satanic Bible's pentagram around, fix left inhand (#40234)
change sprites, update meta
2025-09-17 19:34:25 -04:00
chromiumboy
7444c8ea4a The station AI can be destroyed (#39588)
* Initial commit

* Fixing merge conflict

* Merge conflict fixed

* Anchorable entities can now be marked as 'unanchorable'

* Revert "Anchorable entities can now be marked as 'unanchorable'"

This reverts commit 6a502e62a703cf06bd36ed3bdefe655fc074cfc5

This functionality will be made into a separate PR

* Error sprite

* Update AI core appearance with sustained damage, spawn scrap on destroyed

* Added intellicard sprite

* AI damage overlays

* Added fixtures

* AI core accent changes when damaged or low on power

* Bug fix and pop up messages for inserting AIs into inoperable cores

* Updated 'dead' sprite

* Destroying the AI core reduces the number of AI job slots available

* AI battery duration set to 10 minutes

* Initial commit

* Allow MMIs used in the construction of AI cores to take them over

* Initial resources commit

* Initial code commit

* Sprite update

* Bug fixes and updates

* Basic console UI

* Code refactor

* Added lock screen

* Added all outstanding UI features

* Added purge sprites

* Better appearance handling

* Fixed issue with purge sprite

* Finalized UI design

* Major components finalized

* Bit of clean up

* Removed some code that was used for testing

* Tweaked some text

* Removed extra space

* Added the circuitboard to the RD's locker

* Addressed reviewer comments plus tweaks

* Addressed reviewer comments plus tweaks

* Removed instances of granular damage

* Various improvements

* Removed testing code

* Fixed issue with disabled buttons

* Finalized code

* Addressed review comments

* Added a spare Station AI core electronics to the research director's locker

* Fixing build failure

* Addressed review comments

* Addressed review comments

* Added reverse path for construction graph

* Removed unneeded reference

* Parts can be purchased through cargo

* Fixing merge conflict

* Merge conflict resolved

* Fixing merge conflict

* Code update

* Code updates

* Increased AI core health and gave it a sell price to fix test fail

* Added screen static sprite

* Added better support for ghosted AI players plus code tweaks

* Various improvements and clean up

* Increased purge duration to 60 seconds

* Fixed needless complication

* Addressed reviewer comments part 1

* Addressed reviewer comments part 2

* Further fixes

* Trying lower battery values to see if it fixes the test fail

* Adjusted power values again

* Addressed review comments

* Addressed review comments

* Fixed test fail

* Fixed bug with endless rebooting. Using rejuvenation on an AI core revives the AI inside.

* Added pop up text

* Bug fix

* Tweaks and fixes

* Fixed restoration console not updating when the AI finishes rebooting

* Update SharedStationAiSystem.Held.cs

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-15 16:18:32 +02:00
SharkSnake98
fd20cc2a00 Dark/Light Grass & Desert Astrotiles (#37867)
* Added Waterjug, a low-mid pop map with a tropical theme and custom evac shuttle

* Fixed postmapinittest issues (Hopefully)

* Actually fixed the afformentioned issue.

* Added Warden Spawnpoint which I forgot

* Named APCs, Substations, & Cameras, added some more decals

* Decorated some more, notably the bar.

* Minor adjustments, added cans, slightly reworked salv and maints bar

* Fixed some small issues, notably weird closed doors, added a few small things (shutters mostly)

* Added 2 new astrotiles, dark grass and desert sand.

* Removed map. Fixing issue. Please hold.

* Forgot to remove a comma, please god forgive me maptainers. I blame Rider IDE for it's autoaddition of all changes made even on seperate branches.

* Added localization for stacks.

* Actually fixed the loc. issue. Maybe. Please.

* Hopefully fixed the last localization issue.

* Added Light Astro-tiles, and edited the names of the inhand png's for the dark grass astrotiles to be more internally consistant

* Fixed some issues caused by another PR I made, added more maints stuff

* Made some small decorative and practical changes

* Fixed, changed, and added a ton of stuff. I don't think I can list it all, honestly.

* Removed shields to try to fix an issue with the test

* Hopefully fixed issues relating to a failed test.

* Replaced grass/flora decals with randomized ones, readded shields to armory

* Fixed some YML issues, whitelisted files for flora decal spawners

* Added a bridge-beach, added some misc. items and objects.

* Small changes to buttons, fixed wires and flooring

* Fixed AME-Holopad issue.

* Added a Custom Waterjug Parallax, made it so the parallaxes actually work, and made some minor adjustments to the map

* Fixed an accidental adjustment to CoreStation's parallax prototype YML

* Changed some Salvage and Cargo stuff

* Fixed some merge issues, updated Adriatic with a locker and added some little details to Waterjug

* Fixed some stuff, added docking arm near evac

* meta json fix tiles

* fixed again

* fixed once more

* Removed all the waterjug stuff.

* fix spacing

* fix unnecessary formatting

---------

Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-09-14 18:30:12 -07:00
Princess Cheeseballs
11d434818e Merge staging into master (#40356) 2025-09-14 13:57:50 -07:00
slarticodefast
a38c6c1aca Revert "Add heat distortion shader for hot gases" (#40352) 2025-09-14 20:48:24 +02:00
Huaqas
7616b9aa1c Fix Heterochromia for Vulpkanin (#40320)
* Add More Holy Books

* Revert "Add More Holy Books"

This reverts commit 665eb0de10fe0784d634f9eaf672e60f18a62995.

* Fix eyes

* Add the undergarments and ftl designations.

* Missed something.

* second edited line didnt save for some reason

* Im tired dont judge me

* Fix eyes

* Reverting stuff

* fix markings

* Its joever

* Update meta.json

* small tweak

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-14 11:18:48 -04:00
Huaqas
f1ae8ecdfe Add Undergarments to Vulpkanin (#40321)
Putting underwear on dogs.
2025-09-13 13:36:28 -04:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
IProduceWidgets
276e4df749 No take; Only throw. (#40143)
* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-11 12:57:30 +02:00
GeneralGaws
a7eb5dd22b Fix darts inhand sprites (#40207)
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
2025-09-10 23:50:57 -04:00
Mr. 27
4eab05b55e Add some alternate jumpsuit designs which can be toggled (#31213)
* inital

* testfa

* New Sec sprite

* Update atmos

* Update meta.json

* Update meta.json

* 0

* Update meta.json
2025-09-06 13:55:02 -04:00
iaada
29dda7949f Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
2025-09-05 17:07:09 -05: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
Quantum-cross
52c903cab8 Dynamic anomaly scanner texture (#37585) 2025-09-04 22:11:03 +03:00
Quantum-cross
70ffc1eb5d Add heat distortion shader for hot gases (#39107) 2025-09-03 20:17:39 -07:00
VoidMeticulous
f63eb2e97a Remove unused combat-equipped-helmet (#40095)
Remove unused combat-equipped-helmet and combat-equipped-helmet-dog
2025-09-03 15:52:40 -07:00
SlamBamActionman
1a452494e6 Add senior courier PDA for cargo techs (#37661) 2025-09-03 22:22:28 +02:00
Tiniest Shark
7916819203 Burger Inhands (#39894)
burger is in your hands
2025-09-03 15:42:50 -04:00
Tiniest Shark
3aeecd0139 Add inhand sprites to Cartons and Cups, give new inhands to Cans. (#39814)
* Added inhand sprites to cans, cartons and cups.

* small tweak
2025-09-03 15:21:00 -04: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
e0ead5a83a Reptilian tail sprites for hard/softsuits (#35842)
* Reptilian helmets and tail sprites for hard/softsuits (and a few others)!

* Removed the new fins from helmets.

* don't know how the caustic resistances got doubled? oops

* Update pirate helm sprites for lizards

* fixin errors

* ugh

* softsuit updates

* okay maybe this works now

* Corgi fixes. Boy it sure would be nice to not have to do this again.

* please work

* Helmets removed, will be done in another PR.

* missed a few.

* evil punctuation killed

* scream

* Re-parented clothingvisuals.

* Suits modified with tails

* oops chaplain tail was misnamed

* a

* one more time

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

* oops chaplain lost their suit

* Small fix

* roll back unrelated fix

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2025-09-03 18:45:49 +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
IProduceWidgets
8a041fa5cb Update 4 visitor shuttles & nanomed inventories (#39718) 2025-09-01 16:39:18 -07:00
Hannah Giovanna Dawson
8f55a4fcfc Scurrets - can wear pet bags, mail bags and spears (#38774)
* Scurrets - can wear pet bags, mail bags and spears

* a

* Resolve PR comments
2025-08-30 16:42:43 +02:00
Vortebo
679c641611 Major Relic Update (#39215)
* goodbye cargo. you dont exist at all. no more cargo.

* Med, atmos

* relic is going to prison

* i changed some stuff

* i changed some more stuff

* substantial completion for engineering

* substantial completion for medical

* substantial completion, atmos

* substantial completion, shuttles

* hallway lighting improvements

* substantial completion, prison station

* honestly i think this looks better

* prison station electrical, spawn adjustments

* prison shuttle now flyable

* substantial completion, science

* substantial completion, oldstation

* minor accuracy adjustments

* minor corrections, finishing touches

* minor adjustments and fixes

* electrical fix, canon camera names

* signage adjustments

* network fixes

* more inaccuracies fixed

* fixed atmos and medkit issues

* arrivals shuttle flies forward

* adjustments

* adjustments

* adjustments

* deltaP adjustments

* invalid configurators removed
2025-08-28 11:40:36 -06:00
Fildrance
60ea135fd3 Revert "Added button and manager for in game bug reports (Part 1)" (#39872)
Revert "Added button and manager for in game bug reports (Part 1) (#35350)"

This reverts commit a8d6dbc324.
2025-08-28 01:46:24 -07:00
Hitlinemoss
60ea2b37fb Clipboards added to autolathe (and other folder changes) (#37705)
* Added plastic clipboards; added plastic clipboards to the PTech machine; added clipboards & plastic clipboards to the autolathe

* Fixed plastic clipboard inhand sprites; added and implemented 'empty' clipboard prototypes

* Cleaned up code for empty clipboards; removed BoxFolderBaseEmpty since now it's redundant

* Extensive folder cleanup

* Bugfixed random folder spawns

* Reduced amount of paper in CrateServiceBureaucracy

* Medical folder sprite rename

* BaseTraitorSocialObjective sprite fix

* Added office paper to bureaucracy crate

* First pass at addressing recent review

* Second pass at addressing recent review

* Fix of weird migration.yml error

* whoops, forgot to undo the rename to folder-white.png in the last few commits

* whoops, didn't commit that last commit properly

* whoops, forgot to undo this reordering
2025-08-27 09:07:32 +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
FungiFellow
ed7bea8e01 Inflatable Module (#35100)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-08-23 15:15:28 -07:00
Kyle Tyo
7429f56bd1 Fix "multiple keys" issue in Textures/Objects/Specific/Medical.rsi (#39861)
Update meta.json
2025-08-24 00:02:41 +02: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
Alkheemist
49e0157325 Adds stencil lettering to the spraypainter (#39701)
* adds stencil lettering to the spraypainter

* update decal IDs to match convention
2025-08-22 12:11:07 +02:00
āda
027ec912f2 Recolor Mime and Musician job icons (#39775)
cherry pick from DinnerCalzone/icons

Resprite Service job icons to match each other

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-08-21 23:56:46 -04:00
lzk
3f14ceec0f fix performer's suit sprites (#39722) 2025-08-19 18:40:52 -04:00
M4rchy-S
2659e421c0 Fixing foam dart sprite in hands (#39758) 2025-08-19 18:39:25 -04:00
Samuka-C
de240e1739 Xenoborgs part 5 (#37068)
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: WarPigeon <DaedalusTheGamer@gmail.com>
2025-08-19 18:23:47 +02:00
John
9d32e7db4e Atmos Firesuit Vox sprites (#39705) 2025-08-17 15:59:22 -07:00
Velcroboy
02f37a8eec Allow hamster cages to sit on tables (#37953)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2025-08-17 12:30:40 -07:00
K-Dynamic
5630bf6bde Removes duplicate CE and paramedic jumpsuits (#39520) 2025-08-17 12:15:38 -07: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