Stasvozgalov
518a0d7cc6
Tagilla-hammer ( #301 )
...
* Tagilla-hammer
* Update tagilla_hammer.yml
2024-05-12 00:35:06 +03:00
Stasvozgalov
6c96db1945
Revert "Tagilla-hammer" ( #300 )
2024-05-11 23:52:06 +03:00
Stasvozgalov
21af31fc93
Tagilla-hammer ( #299 )
2024-05-11 23:22:52 +03:00
Stasvozgalov
a449824dff
Tagilla-hammer
...
Молот Тагиллы для ХОС-а. Ура забивать феленидов в пол!
2024-05-11 23:17:49 +03:00
Stasvozgalov
33ea14ebb9
Игральные карты
2024-05-06 20:02:33 +03:00
Stasvozgalov
3d4c60cbc2
add:новые спрайты окон и ресурсов ( #290 )
2024-04-21 23:44:09 +03:00
Remuchi
e2b6002076
Merge remote-tracking branch 'origin/master' into upstream
...
# Conflicts:
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Changeling/ChangelingRuleSystem.cs
# Content.Server/Changeling/ChangelingSystem.Abilities.cs
# Content.Server/Doors/Systems/DoorSystem.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
# Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
# Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
# Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
# Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
# Content.Server/_White/Keyhole/KeyholeSystem.cs
# Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
# Resources/Locale/ru-RU/White/stuff.ftl/runes-entities.ftl
# Resources/Locale/ru-RU/_white/cult/blood-spear.ftl
# Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
# Resources/Locale/ru-RU/_white/cult/cult.ftl
# Resources/Locale/ru-RU/_white/cult/gui.ftl
# Resources/Locale/ru-RU/cult/cult-structure.ftl
# Resources/Locale/ru-RU/cult/pylon.ftl
# Resources/Maps/White/Scoupidia.yml
# Resources/Maps/White/Void.yml
# Resources/Maps/White/WonderBox.yml
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
# Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
# Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/Entities/Structures/stairs.yml
# Resources/Prototypes/_White/Entities/Objects/Misc/books.yml
2024-04-13 13:59:00 +07:00
Remuchi
f21ef6953c
всякое прикольное
2024-04-13 11:58:34 +07:00
Remuchi
d2d501dbc0
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Client/Access/AccessOverlay.cs
# Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
# Content.Client/Access/UI/IdCardConsoleWindow.xaml
# Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
# Content.Client/Chemistry/UI/InjectorStatusControl.cs
# Content.Client/StatusIcon/StatusIconOverlay.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
# Content.Server/Access/Systems/IdCardConsoleSystem.cs
# Content.Server/Administration/Commands/AGhost.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Content.Server/Resist/EscapeInventorySystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Shared/Access/Components/IdCardConsoleComponent.cs
# Content.Shared/Anomaly/SharedAnomalySystem.cs
# Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/RCD/Systems/RCDSystem.cs
# Content.Shared/Roles/JobPrototype.cs
# Content.Shared/StatusIcon/StatusIconPrototype.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/rcd/components/rcd-component.ftl
# Resources/Maps/reach.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
# Resources/Prototypes/DeviceLinking/sink_ports.yml
# Resources/Prototypes/Entities/Clothing/Back/duffel.yml
# Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
# Resources/Prototypes/Entities/Clothing/Neck/misc.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
# Resources/Prototypes/Entities/Objects/Magic/books.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Misc/tiles.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
# Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Decals/bricktile.rsi/white_box.png
# Resources/Textures/Objects/Misc/books.rsi/meta.json
# Resources/migration.yml
2024-04-13 11:29:33 +07:00
Hanz
263469dffa
Spears equippable to suit storage ( #26724 )
...
* meat and potatoes
hahaha
* DAMAGE
yes
* come on
* Check again
* Guhhhhh
guh
2024-04-08 11:34:35 -04:00
BriBrooo
356c2799cf
fixed cigarette sprites ( #26801 )
2024-04-07 23:08:33 -04:00
PursuitInAshes
8adfa19181
Add sake bottle ( #26776 )
2024-04-06 13:16:47 -07:00
Verm
d802928610
Make baseball bat crafting require a slicing tool ( #26742 )
...
Make baseball bat crafting harder
2024-04-05 11:41:35 -04:00
Aviu00
4ad5531d62
Нерф священника ( #264 )
...
* - remove: Nuke HolyComponent.
* - tweak: SuitStorage for weapons.
* - tweak: More slots for weapons.
* - tweak: Cult magic tweaks.
* - fix: Fix desc.
2024-04-03 20:04:08 +03:00
Ed
7464d8284c
Infinity books ( #25840 )
...
* setup text data
* roundstart reshuffling keywords with gibberish words
* saved data categorized
* add book with hints
* start redrawing books
* +4 book design
* +books +random visual upgrade
* finish first file
* finish lore file
* finish with books.rsi now authorbooks.rsi...
* aurora! and some fix
* nuke author books
* speelbuke update
* finish respriting work
* fix scientist guide visual
* setup datasets
* setup stupid funny random story
* restore author books, upgrade hint generation
* add variety to story generator
* add learning system
* minor textgen edit
* file restruct, hint count variation
* more restruct
* more renaming
add basis learning system logic. Spears locked for special book for test.
* nuke all systems, for splitting PR gods
* typo fix
* update migration with deleted books
* add random story books to maint
* Update construction-system.ftl
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
* typo fix
* interchangeably
* final
* Update Resources/Prototypes/Datasets/Names/books.yml
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com >
* "."
* Update Content.Server/Paper/PaperRandomStorySystem.cs
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com >
* Ubazer fix
* inadequate
* localized
* Update meta.json
* fuck merge conflicts
* fix jani book
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com >
2024-04-01 14:00:10 -07:00
Firewatch
ea3e98e120
Bartender "Essentials" ( #25367 )
...
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
2024-04-01 17:41:14 +11:00
SlamBamActionman
bed9e9ac6a
Coordinates Disks & Shuttle FTL Travel ( #23240 )
...
* Adds the CentComm Disk and configures it to work with direct-use shuttles
* Added functionality for drone shuttles (i.e. cargo shuttle)
* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.
* Added the disk to HoP's locker
* Removed leftover logs & comments
* Fix for integration test
* Apply suggestions from code review (formatting & proper DataField)
Co-authored-by: 0x6273 <0x40@keemail.me >
* Fix integration test & changes based on code review
* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks
* Check pods & non-evac shuttles for CentCom travel, even in FTL
* Import
* Remove CentCom travel restrictions & pod disk consoles
* Major changes that changes the coordinates disk system to work with salvage expeditions
* Missed CC diskcase removal
* Fix build
* Review suggestions and changes
* Major additional changes after merge
* Minor tag miss
* Integration test fix
* review
---------
Co-authored-by: 0x6273 <0x40@keemail.me >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-04-01 15:50:00 +11:00
lzk
d5052697aa
Remake hairflowers ( #25475 )
...
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-03-31 16:33:23 +11:00
metalgearsloth
c91ed96853
Revert Paint ( #26593 )
...
* Revert "Fix build (#26258 )"
This reverts commit 6de5fbfafb#23003 )"
This reverts commit e4d5e7f1ae
2024-03-31 16:12:52 +11:00
Aviu00
034a18b1d0
- add: Time beacon. ( #254 )
2024-03-30 15:02:02 +03:00
Remuchi
0b2238b57a
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/Administration/Commands/AdminWhoCommand.cs
# Content.Server/Bed/Sleep/SleepingSystem.cs
# Content.Server/Body/Components/BloodstreamComponent.cs
# Content.Server/Body/Components/RespiratorComponent.cs
# Content.Server/Body/Systems/InternalsSystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Chat/Managers/IChatManager.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
# Content.Server/Electrocution/ElectrocutionSystem.cs
# Content.Server/Holosign/HolosignProjectorComponent.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs
# Content.Shared/Cuffs/SharedCuffableSystem.cs
# Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
# Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/box.yml
# Resources/Maps/centcomm.yml
# Resources/Maps/cluster.yml
# Resources/Maps/europa.yml
# Resources/Maps/marathon.yml
# Resources/Maps/meta.yml
# Resources/Maps/omega.yml
# Resources/Maps/origin.yml
# Resources/Maps/packed.yml
# Resources/Maps/reach.yml
# Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
# Resources/Prototypes/Entities/Clothing/Hands/colored.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
# Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
# Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
# Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
# Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
2024-03-30 10:36:17 +07:00
Remuchi
dd7de0e833
Revert "Remove gondola donkpocket & change berry box description ( #24655 )"
...
This reverts commit e36844de47
2024-03-27 21:30:32 +07:00
Remuchi
5e74f6ae53
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
...
# Conflicts:
# Content.Client/Administration/Managers/ClientAdminManager.cs
# Content.Client/Administration/Systems/BwoinkSystem.cs
# Content.Client/Alerts/ClientAlertsSystem.cs
# Content.Client/Audio/BackgroundAudioSystem.cs
# Content.Client/CardboardBox/CardboardBoxSystem.cs
# Content.Client/Chemistry/UI/InjectorStatusControl.cs
# Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
# Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs
# Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
# Content.Client/Decals/Overlays/DecalOverlay.cs
# Content.Client/DoAfter/DoAfterOverlay.cs
# Content.Client/Doors/AirlockSystem.cs
# Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
# Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/MainMenu/UI/MainMenuControl.xaml
# Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml
# Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs
# Content.Client/MassMedia/Ui/NewsWriteMenu.xaml
# Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs
# Content.Client/Options/UI/Tabs/MiscTab.xaml
# Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
# Content.Client/Outline/InteractionOutlineSystem.cs
# Content.Client/Overlays/ShowSecurityIconsSystem.cs
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
# Content.Client/Popups/PopupOverlay.cs
# Content.Client/Popups/PopupSystem.cs
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/StatusIcon/StatusIconOverlay.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
# Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
# Content.Server/Access/Systems/IdCardConsoleSystem.cs
# Content.Server/Administration/Commands/BanCommand.cs
# Content.Server/Administration/Notes/AdminMessageEui.cs
# Content.Server/Administration/Notes/AdminNotesSystem.cs
# Content.Server/Administration/Notes/IAdminNotesManager.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Administration/UI/PermissionsEui.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
# Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
# Content.Server/Database/DatabaseRecords.cs
# Content.Server/Database/ServerDbBase.cs
# Content.Server/Database/ServerDbManager.cs
# Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
# Content.Server/Doors/Systems/DoorSystem.cs
# Content.Server/Execution/ExecutionSystem.cs
# Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
# Content.Server/Fax/FaxSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
# Content.Server/GameTicking/GameTicker.Replays.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
# Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
# Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
# Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
# Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
# Content.Server/Hands/Systems/HandsSystem.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Content.Server/Info/InfoSystem.cs
# Content.Server/Kitchen/EntitySystems/SharpSystem.cs
# Content.Server/Magic/MagicSystem.cs
# Content.Server/MagicMirror/MagicMirrorSystem.cs
# Content.Server/Mapping/MappingSystem.cs
# Content.Server/MassMedia/Systems/NewsSystem.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
# Content.Server/Medical/CryoPodSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/Resist/EscapeInventorySystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
# Content.Server/Species/Systems/NymphSystem.cs
# Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
# Content.Server/StationEvents/EventManagerSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Server/Strip/StrippableSystem.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Administration/AdminFlags.cs
# Content.Shared/Administration/SharedBwoinkSystem.cs
# Content.Shared/Anomaly/SharedAnomalySystem.cs
# Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
# Content.Shared/Buckle/SharedBuckleSystem.Strap.cs
# Content.Shared/Chat/ChatChannel.cs
# Content.Shared/Chemistry/Components/InjectorComponent.cs
# Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
# Content.Shared/Chemistry/SharedReagentDispenser.cs
# Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
# Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs
# Content.Shared/Cuffs/SharedCuffableSystem.cs
# Content.Shared/Doors/Systems/SharedDoorSystem.cs
# Content.Shared/Friction/TileFrictionController.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Implants/SharedImplanterSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
# Content.Shared/Nutrition/Components/OpenableComponent.cs
# Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
# Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/ICharacterProfile.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
# Content.Shared/Security/SecurityStatus.cs
# Content.Shared/Security/Systems/DeployableBarrierSystem.cs
# Content.Shared/Slippery/SlipperySystem.cs
# Content.Shared/Species/Systems/ReformSystem.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/StatusIcon/StatusIconPrototype.cs
# Content.Shared/Store/ListingPrototype.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# README.md
# Resources/Audio/Ambience/Antag/pirate_start.ogg
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/criminal-records/criminal-records.ftl
# Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
# Resources/Locale/en-US/medical/components/health-analyzer-component.ftl
# Resources/Locale/en-US/reagents/meta/biological.ftl
# Resources/Locale/en-US/reagents/meta/fun.ftl
# Resources/Locale/en-US/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/seeds/seeds.ftl
# Resources/Locale/en-US/wires/wire-names.ftl
# Resources/Maps/Shuttles/cargo_fland.yml
# Resources/Maps/core.yml
# Resources/Maps/europa.yml
# Resources/Maps/fland.yml
# Resources/Maps/origin.yml
# Resources/Maps/saltern.yml
# Resources/Maps/train.yml
# Resources/Prototypes/Actions/diona.yml
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
# Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
# Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
# Resources/Prototypes/Catalog/Cargo/cargo_security.yml
# Resources/Prototypes/Catalog/Cargo/cargo_service.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Crates/engines.yml
# Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
# Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Hands/colored.yml
# Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
# Resources/Prototypes/Entities/Clothing/Head/hats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/slime.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
# Resources/Prototypes/Entities/Objects/Devices/nuke.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Fun/toys.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
# Resources/Prototypes/Entities/Objects/Materials/parts.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Misc/implanters.yml
# Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
# Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
# Resources/Prototypes/Entities/Objects/Shields/shields.yml
# Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
# Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
# Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
# Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
# Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/Entities/Structures/Windows/window.yml
# Resources/Prototypes/Entities/Structures/stairs.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Hydroponics/seeds.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/Reagents/biological.yml
# Resources/Prototypes/Reagents/fun.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
# Resources/Prototypes/Recipes/Construction/weapons.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/Recipes/Reactions/fun.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Stacks/Materials/materials.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/Tiles/plating.yml
# Resources/Prototypes/Voice/speech_emote_sounds.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/explosion.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/Textures/Clothing/Belt/emt.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/slayer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Interface/emotions.svg.192dpi.png.yml
# Resources/Textures/LobbyScreens/dead-in-space.png.yml
# Resources/Textures/LobbyScreens/doomed.webp.yml
# Resources/Textures/LobbyScreens/pharmacy.png.yml
# Resources/Textures/LobbyScreens/pharmacy.webp.yml
# Resources/Textures/LobbyScreens/robotics.webp.yml
# Resources/Textures/LobbyScreens/supermatter.png.yml
# Resources/Textures/LobbyScreens/susstation.png.yml
# Resources/Textures/LobbyScreens/warden.png.yml
# Resources/Textures/LobbyScreens/warden.webp.yml
# Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
# Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png
# Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png
# Resources/Textures/Objects/Devices/nuke.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
# Resources/Textures/Objects/Misc/books.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
# Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png
# Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png
# Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png
# Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/locked.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/shuttleblue.png
# Resources/Textures/Tiles/shuttleorange.png
# Resources/Textures/Tiles/shuttlepurple.png
# Resources/Textures/Tiles/shuttlered.png
# Resources/Textures/Tiles/shuttlewhite.png
# Resources/Textures/White/Fluff/DOOMMAX/cap_cap.rsi/meta.json
# Resources/Textures/White/Fluff/HSKveez/hardsuit.rsi/meta.json
# Resources/Textures/White/Fluff/Vtergot/strictgloves.rsi/meta.json
# Resources/clientCommandPerms.yml
# Resources/migration.yml
2024-03-26 15:52:23 +07:00
DenisShvalov
55ad9c7e43
Cleaner Grenade ( #25444 )
...
* Cleaner Grenade
Added Cleaner Grenade
* Sprite update
Draw issue moment
* Removed from jani closet | added box of cleanades
2024-03-25 17:46:21 +11: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
Ubaser
393bcbfc13
Throwing Knives: Syndicate Kit ( #26026 )
...
* add
* rename
* change damage type and lower price
* 6 tc
* fix?
* missed listing
* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json
* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json
* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-03-23 15:13:06 +11:00
Mr. 27
6e8a07844a
Make air tanks appear on the back in suitstorage ( #26353 )
...
* g
* a
* jetpak
2024-03-23 14:46:40 +11:00
RinKeeper
3a55a8afbe
add: medical patches ( #194 )
...
* add: medical patches
* removing some comments
* some fixes
* oops
2024-03-20 22:51:28 +03:00
brainfood1183
e4d5e7f1ae
Spray Paint (Review Ready) ( #23003 )
...
* Spray Paint (Draft)
* paint colors, paints in maints loot, cargo crate of paints.
* fix
* remove paint (sort of)
* moved paintcleaner into own system
* Moved paint to server (had to unfortunately)
* doafter now breaks when moving away.
* cant paint mobstatecomp
* loads of fixes
* fixes
* fixes
* nopaintshadercomp
* fixes
* fix
* use locale for paint remove string
* remove nopaintshadercomponent and use blacklist
* remove enabled.true from visualizer
* paint doafter event.
* add verbs for paint and remove paint and icon for paint verb.
* fixes
* no longer replaces shader when shader exists.
* replace forloop with foreach, check shader before adding and removing.
* paint doafter now separate so no copy paste code
* Entities in sprayed targets item slots are also now correctly sprayed.
* fix
* fix
* fix airlock psray painter now removes painted before painting door.
* spray paints now use openablecomponent.
* fix
* fix damn accesstypes.
* fix
* fix
2024-03-18 15:29:48 -06:00
vanx
6c239890c5
Suit slot weapon consistency + visuals ( #26152 )
...
suit slot my beloved
Co-authored-by: vanx <#vanxxxx>
2024-03-18 00:16:09 -06:00
Awlod
0ea4c5ca7c
Recolor paper-stamp detective ( #26194 )
...
the old seal of the detective on paper has been changed to a new one
2024-03-17 03:06:51 +03:00
CaypenNow
e1f294c399
Zip Locks and fixes ( #212 )
...
* fix: typing...
* fix: переводы
* add: zip locks
* fix: ziplock fix
* fix
* fix: proto & textures to white
* fix: security proto
2024-03-16 18:55:14 +03:00
ThereDrD0
8ccf29a2fc
Световые приколы ( #200 )
...
* add: new visuals to health analyzer and new graphic funny light
* fix: fix pointlight and analyzer visuals
2024-03-16 18:30:57 +03:00
deltanedas
f8305a26a9
add more carp plushies ( #26081 )
...
* carp plushie textures
* add the plushies
* add plushies to spawners
* rainbow carp and make special plushies rarer
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-15 13:58:17 +11:00
Puro
ae5125144f
[Sprite] AME + Solar panels ( #189 )
2024-03-14 20:19:34 +03:00
Mr. 27
3cb1c585c5
Pipebombs and IED rework ( #25705 )
...
* inital
* 2-9
* add crafting function, rename ied to fire bomb
* add firebomb ignition
* fikss
* change damage values
* add note
* fix tests i think
* ok
* good
* Review
* warning
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-03-14 15:27:08 +11:00
Alzore
e5f05b735d
Remove the blue tint from the health analyzer ( #26101 )
...
nomoreblue
2024-03-13 22:04:29 -04:00
Mangohydra
61b3eb4de0
The lawyer finally gets a stamp ( #26012 )
...
lawyer stamp
2024-03-13 18:05:39 +03:00
LankLTE
88d424e877
Return Detective to Security ( #25986 )
...
* Revert "detective patch (#24739 )"
This reverts commit 8ef69ff2e1#23114 )"
This reverts commit 807f5facbb
2024-03-11 14:33:08 +11:00
Ed
d3d9898d2a
Recolor detective stamp ( #25945 )
...
* Add files via upload
* Update rubber_stamp.yml
2024-03-11 12:57:20 +11:00
rhailrake
c08cdeb84d
Залью спеллы потестить, мне похуй ПР НОМЕР 156
...
* refactor CheZaHuetaMagicSystem
* эщкере
* alt-spells system. lmb, rmb, alt-click
* fix
* ChargeSpellsIndicator + Visual(CheZaHueta)
* Custom charge effect for spell
* Custom MaxChargeLevel
* Finally. Alt spells seems to work!! Need to start do spells and gamerule
* fuckkk
* fix crash, actually burn scroll..
* some fixes blyat
* ArcSpell
* очередная CheZaHuetaSystem, ForceSpell
* ONI'SOMA!
* mraow
* prepare this LMAO
* Yebanyy rot etogo kazino blyat! - CardsSpell
* forcewall
* nig
* blink
* Ethereal Jaunt
* игра говно
* Блядина
* ну на еще спеллов
* blyadina
* да иди ты нахуй БЛЯДЬ
* кто прочитал, тот сдохнет. сделай 5 репостов чтобы выжить....
* icons
* та ваще поебать
* одежда
2024-03-07 16:01:54 +00:00
Decortex
cef8a17726
ATV resprite ( #25885 )
...
* Delete Resources/Textures/Objects/Vehicles/atv.rsi/vehicle.png
* Add files via upload
* Delete Resources/Textures/Objects/Vehicles/atv.rsi/Vehicle.png.png
* Add files via upload
* Update meta.json
* Update meta.json
* .
2024-03-07 08:36:00 +03:00
MACMAN2003
f0e8695a91
Clockwork structures and furniture ( #24673 )
...
* sprites
something something strength and certainty of steel (except this is brass)
* test1
* commas it was commas
* commas and brackets
* LET THERE BE BRASS
* brass-glass-etc-windows-thindows-floors-lattice
* ALL THE STRUCTURES!!
"Which structures did you add?"
"all."
* buyable brass
and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe
* Update windoor.yml
i forgor 💀
* Update tiles.ftl
* i hate random capital letters
* linter fix 1
whew, thank god for linters
* fix 2
* maybe this
shot in the dark, idk what the hell i'm doing hopefully this fixes it?
* fix attempt 1
weather to true, maybe the thingy got confused?
* remove clockwork lattice
it's fixed the test fail... but at what cost?
* changes 1
* fix clockwork windoor
* FLOORS
HAHAHA LET THERE BE FLOORS
* try linter fix 1
i love linters they find things i'd never catch myself
* tweaks fixes 1
fixes merge conflict and does more stuff part two later because i'm tired
* tweaks fixes 2
i should probably do this stuff during the day when i have more energy but eh
* Update assembly.yml
* Update chairs.yml
* fix door sprites
somehow the deny_unlit was broken for all the clockwork doors
* fix glass.yml
2024-03-06 03:25:59 +03:00
IlyaElDunaev
81b016433f
Detective's rubber stamp ( #25676 )
...
Stamp Detective
2024-03-01 17:50:17 -05:00
potato1234_x
e2741498b8
Add fill levels to bowls ( #25639 )
...
* fills
* contrast
2024-02-29 16:41:14 -05:00
lzk
ec28e777c1
Remake cargo orders to contains flatpacks ( #25647 )
...
* Remake cargo orders to contains flatpacks
* whoop
* grounging plamsa
2024-02-28 17:02:02 -05:00
Firewatch
93d820f315
Syndicate Decoy Bundle + Snap Pops ( #25333 )
...
* it works
halilujeah
* toggleable lights
removes a redundant flashlight since you can turn on the balloons to cast light
* final touches
syndicate decoys :trollface:
* touches
it works now
* minor spelling mistake
⭐
* minor spelling mistake 2
darn
* adds whistle
commanders now spawn with a whistle around their neck
* yaml linter
luv you linter baby
* smallify the whistle
it was way too big, this has been addressed
* sprite fix
am dummy 👍
* netsync errors
wouldn't compile properly
* forgor
* i suck at yaml
smh
* decoys for all
now both syndicate and traitors can use the decoys, yippee!
* Update meta.json
credit my discord username
* Update uplink-catalog.ftl
* Update decoys.yml
base decoy no longer shows in the entity browser
* immortal gone
balloons have gained mortality
2024-02-28 16:53:46 -05:00
rosieposie
e94d190ade
Stalagmite Changes ( #25646 )
...
* initial commit
* remove unnecessary thing
* Revert "remove unnecessary thing"
This reverts commit c4e3aecbcb9088c4dee5bf41dc5cc88eaa81f505.
* fix (real)
2024-02-27 22:24:17 +03:00
Zadeon
133bd0353a
Adds minable salt "ore" ( #25324 )
...
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.
* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json
* Added chlorine to the list of solutions salt gives when used in the grinder.
* Gave salt ore and salt rock overlay unique sprites.
* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition
* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
2024-02-26 16:34:15 -07:00
Ed
7a5f81ddb4
Handheld Mass Scanner ( #25526 )
...
* handheld
* Update meta.json
* Update meta.json
* Update cargo.yml
* research
* add to borg
* bruh
* borg to T2
* fix
2024-02-26 16:19:51 -07:00
