mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-10 02:41:18 +03:00
3ab6d3ef71
# 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 |
||
|---|---|---|
| .. | ||
| 6pack.rsi | ||
| arabianlamp.rsi | ||
| bedsheets.rsi | ||
| books.rsi | ||
| brbsign.rsi | ||
| buffering.rsi | ||
| bureaucracy.rsi | ||
| cablecuffs.rsi | ||
| candles.rsi | ||
| candy_bowl.rsi | ||
| cc-clipboard.rsi | ||
| cd.rsi | ||
| chopstick.rsi | ||
| clipboard.rsi | ||
| coins.rsi | ||
| desk_bell.rsi | ||
| diskcases.rsi | ||
| eggspider.rsi | ||
| ensnare.rsi | ||
| fire_extinguisher.rsi | ||
| fire_extinguisher_mini.rsi | ||
| flare.rsi | ||
| fleshkudzu.rsi | ||
| flies.rsi | ||
| glowstick.rsi | ||
| guardian_info.rsi | ||
| handcuffs.rsi | ||
| Handy_Flags | ||
| ice_crust.rsi | ||
| id_cards.rsi | ||
| inflatable_door.rsi | ||
| inflatable_wall.rsi | ||
| killsign.rsi | ||
| kudzu.rsi | ||
| kudzuflower.rsi | ||
| landmine.rsi | ||
| Lights | ||
| meteor.rsi | ||
| modular_receiver.rsi | ||
| module.rsi | ||
| monkeycube.rsi | ||
| nukedisk.rsi | ||
| pens.rsi | ||
| potatoai_chip.rsi | ||
| proximity_sensor.rsi | ||
| qm_clipboard.rsi | ||
| reagent_fillings.rsi | ||
| rifle_stock.rsi | ||
| sample_tubes.rsi | ||
| skub.rsi | ||
| spaceshroom.rsi | ||
| spiderweb.rsi | ||
| stamps.rsi | ||
| stock_parts.rsi | ||
| torch.rsi | ||
| utensils.rsi | ||
| zipties.rsi | ||