CatStation/Resources/Textures/Interface
Morb0 0eba25c0eb Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2024-10-15 17:04:40 +03:00
..
Actions Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-15 17:04:40 +03:00
AdminActions
AdminNotes Better notes and bans (#14228) 2023-07-21 13:38:52 +02:00
Alerts Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie 2024-06-27 13:40:52 +03:00
Ashen Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
AtmosMonitoring Atmospheric alerts computer (#25938) 2024-09-04 21:13:17 -04:00
Bwoink aHelp fixes and improvements (#28639) 2024-07-30 18:28:32 +10:00
Changelog
Clockwork Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Default Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-08-12 13:18:43 +03:00
Emotes Fix-Resprite emote icons (#31447) 2024-08-26 12:20:58 +10:00
Inventory
ItemStatus/Bullets
Minimalist Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-11 01:41:28 +03:00
Misc Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-04 19:47:54 +03:00
Nano Adds Support for Guidebook Buttons in UIs (#27891) 2024-05-10 22:21:18 -04:00
NavMap Set nav map icon textures to use bilinear filtering (#25411) 2024-02-20 22:31:32 +11:00
noise.rsi Station AI (#30944) 2024-08-28 10:57:12 +10:00
Paper Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-04 19:47:54 +03:00
Plasmafire Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
PowerMonitoring Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00
Radial Improved RCDs (#22799) 2024-03-30 23:29:47 -05:00
Retro Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Slimecore Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
VerbIcons Add new icon for Remove Evidence verb (#28898) 2024-06-12 18:05:56 -04:00
WireHacking
character.svg
character.svg.192dpi.png
character.svg.192dpi.png.yml
eject.png
emotes.svg Emotes Menu (#26702) 2024-04-28 21:38:23 -07:00
emotes.svg.192dpi.png Emotes Menu (#26702) 2024-04-28 21:38:23 -07:00
emotes.svg.192dpi.png.yml Emotes Menu (#26702) 2024-04-28 21:38:23 -07:00
eraser.svg Add mapping editor (#23427) 2024-08-04 13:31:45 +10:00
eraser.svg.png Add mapping editor (#23427) 2024-08-04 13:31:45 +10:00
examine-star.png
examine-star.png.yml
eyedropper.svg Add mapping editor (#23427) 2024-08-04 13:31:45 +10:00
eyedropper.svg.png Add mapping editor (#23427) 2024-08-04 13:31:45 +10:00
fist.svg
fist.svg.192dpi.png
fist.svg.192dpi.png.yml
gavel.svg
gavel.svg.192dpi.png
gavel.svg.192dpi.png.yml
hamburger.svg
hamburger.svg.192dpi.png
hamburger.svg.192dpi.png.yml
hammer.svg
hammer.svg.192dpi.png
hammer.svg.192dpi.png.yml
hammer_sca;ed.svg.192dpi.png.yml
hammer_scaled.svg
hammer_scaled.svg.192dpi.png
handsbox.png
handsbox.png.yml
home.png Fix PDA home icon (#25721) 2024-02-29 20:22:12 +01:00
home.svg
info.svg
info.svg.192dpi.png
info.svg.192dpi.png.yml
inventory.svg
inventory.svg.192dpi.png
inventory.svg.192dpi.png.yml
light.png
pai.png Adding PAI Slot to PDA (#21086) 2024-01-04 05:56:14 -07:00
pencil.png
pencil.svg
pray.svg
pray.svg.png
pray.svg.png.yml
sandbox.svg
sandbox.svg.192dpi.png
sandbox.svg.192dpi.png.yml
students-cap.svg
students-cap.svg.192dpi.png
students-cap.svg.192dpi.png.yml
target-doll-high.svg
target-doll-high.svg.96dpi.png
target-doll-high.svg.96dpi.png.yml
target-doll-high.svg.192dpi.png
target-doll-high.svg.192dpi.png.yml
target-doll-low.svg
target-doll-low.svg.96dpi.png
target-doll-low.svg.96dpi.png.yml
target-doll-low.svg.192dpi.png
target-doll-low.svg.192dpi.png.yml
target-doll-middle.svg
target-doll-middle.svg.96dpi.png
target-doll-middle.svg.96dpi.png.yml
target-doll-middle.svg.192dpi.png
target-doll-middle.svg.192dpi.png.yml
target-doll.svg
target-doll.svg.192dpi.png
target-doll.svg.192dpi.png.yml