BIGZi0348
1c8f44794f
Парсек
2025-03-16 13:46:59 +03:00
Valtos
c67dcd6b5a
anime ( #653 )
2024-08-21 16:51:06 +03:00
ThereDrD
c28a330372
rename white dream to giedi prime ( #635 )
2024-08-19 03:27:31 +03:00
Puro
2535c60242
[Sprite] Sprite PR ( #84 )
...
* [Sprite] Спрайты от Glasio
по всем вопросам к качеству спрайтов - dosharus, я просто посредник. Valtos в курсе, и одобрил.
* лёгкий скаф утиля
2024-02-18 08:28:07 +00:00
Viktor
dc20eff208
Merge pull request #617 from frosty-dev/inspector
...
Inspector
2024-01-26 10:06:38 +03:00
HitPanda
10609a2506
[Feat] Airlocks lights + texture replace + some translate fixes ( #97 )
...
* Airlocks lights
* bookshelf fix
* killsign translate
* some jobs names changes
* outerclothing
* clothing all
* tiles
* decals
* bubbles
* uranium glass
* SMES fix
* generators resprite
* redundant delete
* RSI validator fix
# Conflicts:
# Content.Client/Doors/AirlockSystem.cs
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png
# Resources/Textures/Effects/creampie.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/alien0.png
# Resources/Textures/Effects/speech.rsi/alien1.png
# Resources/Textures/Effects/speech.rsi/alien2.png
# Resources/Textures/Effects/speech.rsi/alienroyal0.png
# Resources/Textures/Effects/speech.rsi/alienroyal1.png
# Resources/Textures/Effects/speech.rsi/alienroyal2.png
# Resources/Textures/Effects/speech.rsi/blob0.png
# Resources/Textures/Effects/speech.rsi/blob1.png
# Resources/Textures/Effects/speech.rsi/blob2.png
# Resources/Textures/Effects/speech.rsi/clock0.png
# Resources/Textures/Effects/speech.rsi/clock1.png
# Resources/Textures/Effects/speech.rsi/clock2.png
# Resources/Textures/Effects/speech.rsi/default0.png
# Resources/Textures/Effects/speech.rsi/default1.png
# Resources/Textures/Effects/speech.rsi/default2.png
# Resources/Textures/Effects/speech.rsi/guardian0.png
# Resources/Textures/Effects/speech.rsi/guardian1.png
# Resources/Textures/Effects/speech.rsi/guardian2.png
# Resources/Textures/Effects/speech.rsi/holo0.png
# Resources/Textures/Effects/speech.rsi/holo1.png
# Resources/Textures/Effects/speech.rsi/holo2.png
# Resources/Textures/Effects/speech.rsi/lawyer0.png
# Resources/Textures/Effects/speech.rsi/lawyer1.png
# Resources/Textures/Effects/speech.rsi/lawyer2.png
# Resources/Textures/Effects/speech.rsi/machine0.png
# Resources/Textures/Effects/speech.rsi/machine1.png
# Resources/Textures/Effects/speech.rsi/machine2.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth0.png
# Resources/Textures/Effects/speech.rsi/moth1.png
# Resources/Textures/Effects/speech.rsi/moth2.png
# Resources/Textures/Effects/speech.rsi/robot0.png
# Resources/Textures/Effects/speech.rsi/robot1.png
# Resources/Textures/Effects/speech.rsi/robot2.png
# Resources/Textures/Effects/speech.rsi/slime0.png
# Resources/Textures/Effects/speech.rsi/slime1.png
# Resources/Textures/Effects/speech.rsi/slime2.png
# Resources/Textures/Effects/speech.rsi/swarmer0.png
# Resources/Textures/Effects/speech.rsi/swarmer1.png
# Resources/Textures/Effects/speech.rsi/swarmer2.png
# Resources/Textures/Effects/speech.rsi/syndibot0.png
# Resources/Textures/Effects/speech.rsi/syndibot1.png
# Resources/Textures/Effects/speech.rsi/syndibot2.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
# Resources/Textures/Tiles/white_diagonal_mini.png
2024-01-17 18:48:28 +07:00
potato1234_x
7e5fee7906
Cargo Bags ( #18389 )
...
* sprites
* obtaining
* rename
* idiotism
2023-07-29 00:12:42 -06:00
potato1234_x
07a71aeee9
Adds Atmos Bags (credit to KingFroozy) ( #18354 )
...
* bags
* roundstart bags
2023-07-27 00:08:24 -06:00
lzk
a5769429bf
Mime satchel ( #17986 )
2023-07-17 00:51:05 -04:00
Puro
509761c260
[Brigmedic] Something like a "big update" ( #15496 )
...
* [Brigmedic] Something like a "big update"
* new locker
* hardsuit resprite
* resprite resprited hardsuit
back to the future
* custom headset
* remove key
* TrackingImplanter in locker
* pda UI fix
* brigmedic bedsheet
* added transparency
* mask
* desc
* name mask
* skirt of life
* Suits resprite
* PDA resprite | Brigmed - Brigmedic
* meta dic :)
* Beret + medical gown
* backpacks
* locker fill update
* why not?
bzzz Moth-pocalypse
* Brigmed - Brigmedic
* fix
* chance update
2023-04-26 00:48:44 -06:00
lzk228
7be21a62ec
Added clown satchel ( #15225 )
2023-04-08 19:24:44 -07:00
potato1234_x
dbf9f71ee8
vend tweaks and clothes ( #14961 )
2023-03-30 22:31:51 -06:00
potato1234_x
a7bafa58f1
Hydroponics Sprite Changes ( #14649 )
2023-03-23 11:10:18 -04:00
potato1234x
fa28b91880
Missing Virology Bags ( #13750 )
...
Adds virology duffelbag and satchel
2023-02-11 01:52:29 +00:00
deathride58
d6f71db037
Adds leather satchels from TGstation as a limited-supply item in clothesmates ( #13727 )
2023-01-26 12:14:30 -06:00
Pieter-Jan Briers
b707b788ac
Remove trailing commas from RSIs. ( #12865 )
2022-12-04 22:47:23 +01:00
Morb
db7e84b7c7
Add salvage & botany backpacks ( #11445 )
...
* Add salvage & hydroponics backpacks
* Fix path
* Add new salvage backpacks to starting gear
* Add new botany duffle to starting gear
* Add botany duffle to hydrobe vending
2022-09-22 14:02:30 -05:00
Flareguy
ae7ba491f5
Reshades Medical, Cargo & Scientist jumpsuits + labcoats ( #10758 )
2022-08-22 19:28:11 -07: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
9af508e0b5
Satchel and Duffelbag of Holding. ( #2866 )
...
* Duffel of Holding
* Satchel of Holding
* Added equipped sprites for both syn duffel variants
* Moved syndie stuff to another PR
2021-01-01 14:16:08 +01:00
Swept
f46a6a8d81
Copyright Pass/Pruning | Part 1 - Clothing ( #2539 )
...
* Backpacks/Belts
* Cleans up Headsets
* Glasses and Gloves (Remind me to make an alpha for those stupid gloves)
* This commit has taken too many of my damn tears please appreciate it
* Holy SHIT that was an ordeal
* NECK and MASKS
* Jumpsuits/skirts
* Goodbye old color.rsi
* Outerclothing
* More Outerclothing
* It builds now
* More ID organization :)
* Gloves up to scratch
* My piss burns
* GLasses
* Added some more glasses
* Mission control we are ready for review
* Hotfix
* Cleanup
* Fix not commenting out whole line in contents
* duffelbag => duffel bag
* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
* Fixed Breath Mask
* Scrubs
* New line
* Fixed Build
* Ok
* Update engivend.yml
* Fix meson glasses prototype in boxes
* Fix prototype name for sec glasses in boxes
* Fix InventoryHelpersTest janitor jumpsuit prototype
* Fix outdated stationstation prototypes
* Fix vending machines having invalid starting inventories
* Fix chapel vending machine
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2020-11-22 15:17:14 +11:00
Swept
5db94dbb07
Adds inhands and removes vir and genetics satchels. ( #2003 )
...
* Satchels now have a nice RSI
* Adds inhands for all the satchels
* Annnd we're done!
2020-09-03 23:17:32 +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
