Vigers Ray 0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/workflows/build-test-debug.yml # Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Nutrition/EntitySystems/HungerSystem.cs # Resources/Locale/en-US/_strings/atmos/gases.ftl # Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl # Resources/Locale/en-US/_strings/tools/components/tool-component.ftl # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/ai_factions.yml # Resources/toolshedEngineCommandPerms.yml		2024-12-21 18:51:37 +03:00
..
air_monitors.rsi	opps	2024-11-19 18:58:44 +03:00
barsign.rsi	Fix stray pixel in officer beersky barsign (#31517)	2024-08-27 23:46:53 +10:00
bell.rsi	Респрайты стен, шлюзов, окон и плиток. (#33)	2024-06-07 11:06:08 +03:00
camera.rsi	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
defib_cabinet.rsi	Респрайты стен, шлюзов, окон и плиток. (#33)	2024-06-07 11:06:08 +03:00
extinguisher_cabinet.rsi	Adds fire extinguisher sprite rotation (#2343)	2024-06-26 19:00:30 +03:00
fireaxe_cabinet.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
flags.rsi	Decorative Flags (also handheld flags) (#19670)	2023-12-04 17:27:02 +11:00
flatscreentv.rsi	Telescreens and big flat screen TV (#8842)	2022-07-04 17:10:29 +10:00
intercom.rsi	Intercom buffs and fixes (#29580)	2024-07-08 00:19:10 +10:00
Lighting	Partially revert light tube sprites (#29091)	2024-08-10 11:00:21 -04:00
locked_switch.rsi	Lockable Buttons & Button Frames (#25631)	2024-02-27 00:57:17 -07:00
metamap.rsi	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
mirror.rsi	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
noticeboard.rsi	Notice board (#21410)	2023-11-05 19:18:39 -07:00
paintings.rsi	some silly paintings and posters (#17872)	2023-07-07 00:23:02 -06:00
posters.rsi	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-29 00:28:18 +03:00
screen.rsi	Shuttle timers (#19471)	2023-12-20 09:30:29 +11:00
service_light.rsi	Glowy lights - light fixtures now actually glow (#23428)	2024-01-03 19:46:11 +11:00
shotgun_cabinet.rsi	Ports the /tg/ shotgun sprites (#22539)	2023-12-15 23:23:57 -05:00
signalscreen.rsi	Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786)	2024-10-30 14:12:49 +11:00
signs.rsi	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
switch.rsi	Signal Button Resprite (#18712)	2023-09-02 23:58:40 +10:00
switch_frame.rsi	Lockable Buttons & Button Frames (#25631)	2024-02-27 00:57:17 -07:00
sylphs.rsi	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00