Commit Graph

48 Commits

Author SHA1 Message Date
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
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
Flareguy
d55a2b830a Vox customization additions (+eyeshadows) (#38906)
vox customization stuff
2025-07-13 22:49:25 -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
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
Ed
07a8a02522 vox inhands displacements (#35947)
vox inhands
2025-03-20 18:01:39 +01:00
mubururu_
6654e00411 organ sprite touch-ups (#32762)
* does work?

* fix

* shrunk organs to normal size of small

* made brains and liver look better

* made stomach slightly less bright

* unique sprite for diona lungs + inhands

* unique sprite for vox lungs + inhands
2024-10-14 13:32:32 +02: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
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
Errant
b418338af7 Phoronman 1984 (#29747)
No more.
2024-07-06 14:17:32 +10: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
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
lzk
4d42d00194 Fix awful slimepeople parts sprites (#22969)
fix awful slime parts
2023-12-27 08:22:33 +11: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
Flareguy
8902591fb1 Fixes reptilian "full" sprite + adds reptilian template to the raw sprites folder (#22112)
* lizard "full" sprite + adds lizard template to raw sprites folder

* remove the dammned tail

* fix tests
2023-12-08 17:29:54 -05:00
PixelTK
52af546267 Arachnid 2: Episode 2 (#19984)
* Shield

* minor sprite changes and buffs

* structure buff

* Crafting stuff

* tweaks

* 88-88

* Better web pocket sprites.

* yeah it's fine now.
2023-11-08 12:18:52 -08:00
Nim
9c42fa6798 Slime mobs breathe nitrogen and resprite their organs (#20577)
* Slimes breathe nitrogen and resprite their organs

* ups

* mmm
2023-10-01 10:34:29 -04:00
PixelTK
74bd86af2f Arachnid RE-REWORK (#19138)
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
2023-09-04 13:02:54 -07:00
Nemanja
848b713982 diona customization (#19304) 2023-08-20 19:02:12 -06:00
MilenVolf
c20f86733b Moths textures & Layer ordering fix + creampied sprite (#18653)
* Moths textures & Layer ordering fix + creampied sprite

* Forgot to add

* weh

* oops
2023-08-04 12:31:39 -06: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
941a3cd113 Arachnid sprite changes (#17412)
* Changed arachnid sprites to be less human-like and more "fluffy"

* few fixes + tweaks

* torso quick change
2023-06-17 14:47:31 -05:00
PixelTK
3a7416a40c [Addition & Tweak] Arachnid sprite update and 3 new markings (#16470) 2023-05-16 11:26:28 -04:00
PixelTK
8269a500b3 Arachnid species (#13945) 2023-04-30 02:19:06 +10:00
Nemanja
fd9bedae9a New Species: Diona (#11497)
* new species: Diona

* more diona stuff

* dey breathing now

* test fixe

* fix a merge

* now actually fix the merge

* foobar

* oversight

* ok now the rest of em
2022-11-08 14:26:59 -06:00
EmoGarbage404
bf009ee60a Skeleton Sprite Fix (#8126) 2022-05-13 12:20:43 +10:00
EmoGarbage404
075eb0d982 The Newest Furry Race [Skeletons] (#7825)
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-13 09:35:55 +10:00
wrexbe
e4312e08f1 Censor Slimes (#8101) 2022-05-12 17:40:11 +10:00
metalgearsloth
92ff81b6c9 Initial mockup of the Reptilian species (#6973)
Co-authored-by: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com>
2022-03-10 15:05:07 +11:00
Swept
9d22869e58 Adds a ton more inhands (#4488)
* Removed useless loc and added inhands for some lamps

* Adds a ton of inhands to the game

* Actually adds the pill inhand

* Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-08-20 05:36:32 +00:00
Swept
685f7008a6 Makes organs consumable (#3754)
* Slightly reorganizes Body yaml

* Slightly reorganizes Body yaml

* You can now monch all organs

* Rewrites Mobs/Species/.rsi meta.jsons and replaces some human organ sprites

* ReIDs organs and does some more cleanup
2021-04-02 15:44:02 +02:00
Pieter-Jan Briers
0ac4c0e85c SKREEEEEE (#3706)
* Import bird sprites and define basic mob.

* SKREEEEEEEEE

* Move hair styles to new sprite accessory prototypes.

Basic stuff, no multi-species stuff yet.

* Vox hair styles and clothes

* Make HumanoidCharacterProfile.Default() a static default to fix tests.

Usages that wanted the previous random behavior now call Random().

* Remove names from hair style prototypes.

(They're in localization files)

* Update Content.Shared/Actions/ActionType.cs

(sk)reeee github

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-03-28 17:26:32 +11:00
Vera Aguilera Puerto
338d6fe704 Adds slime people (#3320) 2021-03-04 13:58:43 +01: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
DrSmugleaf
b051261485 Bodysystem and damagesystem rework (#1544)
* Things and stuff with grids, unfinished w/ code debug changes.

* Updated submodule and also lost some progress cause I fucked it up xd

* First unfinished draft of the BodySystem. Doesn't compile.

* More changes to make it compile, but still just a framework. Doesn't do anything at the moment.

* Many cleanup changes.

* Revert "Merge branch 'master' of https://github.com/GlassEclipse/space-station-14 into body_system"

This reverts commit ddd4aebbc76cf2a0b7b102f72b93d55a0816c88c, reversing
changes made to 12d0dd752706bdda8879393bd8191a1199a0c978.

* Commit human.yml

* Updated a lot of things to be more classy, more progress overall, etc. etc.

* Latest update with many changes

* Minor changes

* Fixed Travis build bug

* Adds first draft of Body Scanner console, apparently I also forgot to tie Mechanisms into body parts so now a heart just sits in the Torso like a good boy :)

* Commit rest of stuff

* Latest changes

* Latest changes again

* 14 naked cowboys

* Yay!

* Latest changes (probably doesnt compile)

* Surgery!!!!!!!!!~1116y

* Cleaned some stuff up

* More cleanup

* Refactoring of code. Basic surgery path now done.

* Removed readme, has been added to HackMD

* Fixes typo (and thus test errors)

* WIP changes, committing so I can pull latest master changes

* Still working on that god awful merge

* Latest changes

* Latest changes!!

* Beginning of refactor to BoundUserInterface

* Surgery!

* Latest changes - fixes pr change requests and random fixes

* oops

* Fixes bodypart recursion

* Beginning of work on revamping the damage system.

* More latest changes

* Latest changes

* Finished merge

* Commit before removing old healthcode

* Almost done with removing speciescomponent...

* It compiles!!!

* yahoo more work

* Fixes to make it work

* Merge conflict fixes

* Deleting species visualizer was a mistake

* IDE warnings are VERBOTEN

* makes the server not kill itself on startup, some cleanup (#1)

* Namespaces, comments and exception fixes

* Fix conveyor and conveyor switch serialization

SS14 in reactive when

* Move damage, acts and body to shared

Damage cleanup
Comment cleanup

* Rename SpeciesComponent to RotationComponent and cleanup

Damage cleanup
Comment cleanup

* Fix nullable warnings

* Address old reviews

Fix off welder suicide damage type, deathmatch and suspicion

* Fix new test fail with units being able to accept items when unpowered

* Remove RotationComponent, change references to IBodyManagerComponent

* Add a bloodstream to humans

* More cleanups

* Add body conduits, connections, connectors substances and valves

* Revert "Add body conduits, connections, connectors substances and valves"

This reverts commit 9ab0b50e6b15fe98852d7b0836c0cdbf4bd76d20.

* Implement the heart mechanism behavior with the circulatory network

* Added network property to mechanism behaviors

* Changed human organ sprites and added missing ones

* Fix tests

* Add individual body part sprite rendering

* Fix error where dropped mechanisms are not initialized

* Implement client/server body damage

* Make DamageContainer take care of raising events

* Reimplement medical scanner with the new body system

* Improve the medical scanner ui

* Merge conflict fixes

* Fix crash when colliding with something

* Fix microwave suicides and eyes sprite rendering

* Fix nullable reference error

* Fix up surgery client side

* Fix missing using from merge conflict

* Add breathing

*inhale

* Merge conflict fixes

* Fix accumulatedframetime being reset to 0 instead of decreased by the threshold

https://github.com/space-wizards/space-station-14/pull/1617

* Use and add to the new AtmosHelpers

* Fix feet

* Add proper coloring to dropped body parts

* Fix Urist's lungs being too strong

* Merge conflict fixes

* Merge conflict fixes

* Merge conflict fixes

Co-authored-by: GlassEclipse <tsymall5@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
2020-08-16 16:42:42 -07: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
metalgearsloth
b7eef464f1 Crit state for xeno (#1521)
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-07-28 15:56:08 +02:00
metalgearsloth
56737b635f Damage visualizer for simple mobs (#1332)
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-23 02:04:03 +02:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234)
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
2020-07-07 19:19:00 +02:00