Dmitry
8eb0cdde41
merge remote upstream
2025-12-10 03:12:01 +07:00
K-Dynamic
64c00bc2ce
Add vox hairstyle (catfish hair) ( #40689 )
...
* add vox catfish
Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>
* change indents from 2 to 4 in meta.json
* update sprite
Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>
---------
Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>
2025-11-21 21:57:10 +00:00
Dmitry
c682eb80b4
merge remote master, upstream
2025-10-26 22:31:58 +07:00
Dmitry
9d6fa7e57d
upstream - merge remote "stable"
2025-10-13 20:59:28 +07:00
Vasilis The Pikachu
be78d23068
Revert "Merge branch 'master' into stable"
...
This reverts commit 3a7c18c394e917c8e067
2025-10-13 00:27:04 +02:00
Jopogrechkin
31f8f768a0
Brand new hair ( #39850 )
...
* Update human_hair.yml
* overeyepigtail
* Update meta.json
* Update human-hair.ftl
* Update meta.json
* Update Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
rerun test
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-10-12 05:35:12 +00:00
Mora
5be5e280be
Added Vox Beak Types, New Markings, and Sprite Layering Fixes ( #40569 )
...
* Added more Vox customizations
* Adds Vox Head Markings
* Update meta.json
* stray comma, woe be upon ye
* added tiny pixel to visage left and right
* Added eyeliner ftl
* Removed duplicate FTL
how the fuck did this happen
* Added cheek marking
* Made tip marking look a bit better
* Fix eyeliner ID
* ok whatever shut up build test. mean to me
* changed underbelly to have more flat transparency
* didnt like how it looked so i adjusted it
* Adjusted base eyeliner color
* Fixed inconsistency with nightling head tattoo
* Updated V tattoo
* Delete chest_v.png
* fix yml
ITS EVEN FUNNIER THE SECOND TIME
* minor sprite fix
* Update head.png
* Re added stray pixel, added square cere beak
* Added hooked beak
---------
Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-10-07 23:03:21 +00:00
Dmitry
58eaa4b3be
upstream remote merge
2025-10-02 04:36:42 +07: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
Dmitry
133e2e6228
remote merge upstream
2025-09-23 01:32:33 +07:00
Dmitry
f01a60f5c7
upstream 9.1
2025-09-17 06:41:33 +07: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
Dmitry
871b3b3123
upstream
2025-09-07 22:54:54 +07: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#35353 )"
This reverts commit 704293a051#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
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
Zekins
baf4811805
Resprite reptilian aquatic tail to be same pattern ( #3300 )
2025-07-23 20:35:17 -07:00
Dmitry
60c835f02c
master 21.7 syns
2025-07-21 00:27:46 +07:00
Mora
6eadc8aeee
Stray Pixels on Vox Tails ( #39082 )
...
Stray pixel fixes
2025-07-19 23:56:50 -04:00
Flareguy
d55a2b830a
Vox customization additions (+eyeshadows) ( #38906 )
...
vox customization stuff
2025-07-13 22:49:25 -04: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
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
Dmitry
76f0d2d12b
upstream syns
2025-06-19 15:45:02 +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
Dmitry
0f4b1717e0
upstream
2025-06-08 00:04:48 +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
Dmitry
a6ecbc3410
Merge remote-tracking branch 'upstream/master'
2025-05-24 22:35:13 +07:00
Dmitry
25c5e59248
Upstream ( #3172 )
...
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Stomf <5dorkydorks@gmail.com>
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com>
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com>
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: eoineoineoin <helloworld@eoinrul.es>
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com>
Co-authored-by: nikitosych <boriszyn@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com>
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: J <billsmith116@gmail.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Spanky <scott@wearejacob.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: archee1 <archee3@hotmail.co.uk>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: poklj <compgeek223@gmail.com>
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com>
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com>
2025-05-24 11:00:17 +03: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
KingFroozy
3d0485fe5b
Shoulder-length hairstyles resprite ( #37000 )
...
* sprite
* final
* final (final fr)
2025-04-28 17:00:10 -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
Zekins
7d6f564344
Merge remote-tracking branch 'upstream/master' into upstream
2025-03-18 02:40:46 +03:00
Boaz1111
3bf38a4d46
More scars! ( #35644 )
...
* :3
* whitespace, stomach scar
2025-03-05 11:26:31 +01:00
SlamBamActionman
27cfc0939c
Add undergarments & "Censor Nudity" toggle to options ( #33185 )
...
* Initial commit
* Attribution
* Review changes
* Added comment for upstream
2025-03-05 10:14:01 +01:00
lzk228
0af3e04fd8
Merge commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Doors/Systems/AirlockSystem.cs
# Content.Server/Holopad/HolopadSystem.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/convex.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/plasma.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
# Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/icon-on.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
# Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
# Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
# Resources/Textures/Objects/Storage/boxes.rsi/box.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/candle.png
# Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
# Resources/Textures/Objects/Storage/boxes.rsi/clown.png
# Resources/Textures/Objects/Storage/boxes.rsi/darts.png
# Resources/Textures/Objects/Storage/boxes.rsi/disk.png
# Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
# Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
# Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
# Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
# Resources/Textures/Objects/Storage/boxes.rsi/flare.png
# Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
# Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
# Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
# Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
# Resources/Textures/Objects/Storage/boxes.rsi/headset.png
# Resources/Textures/Objects/Storage/boxes.rsi/heart.png
# Resources/Textures/Objects/Storage/boxes.rsi/holo.png
# Resources/Textures/Objects/Storage/boxes.rsi/implant.png
# Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
# Resources/Textures/Objects/Storage/boxes.rsi/internals.png
# Resources/Textures/Objects/Storage/boxes.rsi/latex.png
# Resources/Textures/Objects/Storage/boxes.rsi/light.png
# Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
# Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
# Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
# Resources/Textures/Objects/Storage/boxes.rsi/meson.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
# Resources/Textures/Objects/Storage/boxes.rsi/pda.png
# Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
# Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
# Resources/Textures/Objects/Storage/boxes.rsi/swab.png
# Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
# Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/vials.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
# Resources/Textures/Objects/Tiles/tile.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
2025-02-19 03:00:13 +01:00
Farrellka
d0bdbc875e
Elf Ears ( #33572 )
...
* Elf Supremacy
* Delete old ears
* Review Fix
2025-02-05 08:49:04 -08:00
Morb0
6c09b978a3
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Telephone/TelephoneSystem.cs
# LICENSE.TXT
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/ServerInfo/Guidebook/Chemicals.xml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2025-01-12 19:59:31 +03:00
~DreamlyJack~
94422e299b
Add hair pulato ( #34117 )
...
* add sprite pulato
* update
* add pulato hair
* add pulato hair
* add pulato hair
* update meta "pulato"
2024-12-31 11:29:39 +01:00
Morb0
e76bb1fa57
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/borer.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# Resources/Textures/Tiles/plating_burnt.png
2024-12-05 01:22:35 +03:00
Mifia
de613e45f8
Fix gauze eyepatch flying pixel ( #33564 )
...
boo
2024-11-28 21:34:43 +11:00
Morb0
3ab6d3ef71
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
Futuristic-OK
a371de16d3
Some new hairstyles! ( #31010 )
...
* Add files via upload
png of hairs
* Update meta.json
hairs meta
* Update human_hair.yml
hairs yml
* Update human-hair.ftl
hairs named
* second try
* fix meta
* Add files via upload
* Add files via upload
fix again
* Add files via upload
again again
* Add files via upload
again again fix again
* Add files via upload
i hate yourself
* Add files via upload
fixxxxx!
* Add files via upload
aaagaaaaiiin
* dd
dddddd
* Add files via upload
fix again
* Add files via upload
ddsdssddssddsdsds
* Update human-hair.ftl
* Update human-hair.ftl
screw this im just going to update it myself
webops time
* Update human_hair.yml
* Update meta.json
* Rename capsdaughter.png to longbow.png
* Rename artist.png to shaped.png
---------
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
2024-09-28 16:07:51 +10:00
Morb0
34d3cf6293
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 10:30:01 +03:00
Арт
58ed124dc1
New gauze customization ( #30852 )
...
* Sprite&Meta
* Marking_Prototype
* Locale
* Meta_copyright_change
* Sprite_Change
* New_Sprite
* And_another_new_sprite
* Change_Locale
2024-09-15 00:55:13 +10:00
Morb0
d9bfc5cdcb
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
# Resources/Textures/Structures/Walls/solid.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
# Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
# Resources/Textures/Structures/Walls/solid.rsi/solid0.png
# Resources/Textures/Structures/Walls/solid.rsi/solid1.png
# Resources/Textures/Structures/Walls/solid.rsi/solid2.png
# Resources/Textures/Structures/Walls/solid.rsi/solid3.png
# Resources/Textures/Structures/Walls/solid.rsi/solid4.png
# Resources/Textures/Structures/Walls/solid.rsi/solid5.png
# Resources/Textures/Structures/Walls/solid.rsi/solid6.png
# Resources/Textures/Structures/Walls/solid.rsi/solid7.png
2024-09-11 10:56:49 +03:00
