Ed 8ff09f552b Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2 ...

# Conflicts:
#	Content.Client/Guidebook/GuidebookSystem.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Guidebook/GuideEntry.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/arenas.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/debug.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/reach.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/lobbyscreens.yml

2024-06-13 12:35:00 +03:00

..

Actions

Fix PDA home icon (#25721)

2024-02-29 20:22:12 +01:00

AdminActions

Adds the super speed smite (#10707)

2022-08-23 09:04:17 -05:00

AdminNotes

Better notes and bans (#14228)

2023-07-21 13:38:52 +02:00

Alerts

Weapon Reflection Movement Mechanic (#27219)

2024-05-07 20:14:58 +02:00

Ashen

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10:00

Changelog

Make + and - in changelog look less blurry.

2021-10-31 15:04:19 +01:00

Clockwork

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10:00

CrystallPunk

try2

2024-04-11 00:18:33 +03:00

Default

Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up

2024-04-21 20:54:50 +03:00

Emotes

Added new icons for the emote wheel (#27541)

2024-05-05 20:12:30 -05:00

Inventory

Move slot UI files around (#11282)

2022-09-14 17:13:28 -07:00

ItemStatus/Bullets

…

Minimalist

Change minimalist theme empty slot outline (#27860)

2024-05-09 17:17:33 -04:00

Misc

Admin access configurator (#28107)

2024-05-19 17:04:16 -06:00

Nano

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

NavMap

Set nav map icon textures to use bilinear filtering (#25411)

2024-02-20 22:31:32 +11:00

Paper

Improve paper stamping experience (#17135)

2023-08-13 14:28:10 -04:00

Plasmafire

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10:00

PowerMonitoring

Power monitoring console overhaul (#20927)

2023-12-24 17:07:41 +11:00

Radial

Upstream, Yay (#27)

2024-04-03 10:33:34 +03:00

Retro

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10:00

Slimecore

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10: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

PDA UI refactor and cartridges (#11335)

2022-11-08 14:00:20 -06:00

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

examine-star.png

Examine Groups (#12400)

2022-12-19 20:53:36 -06:00

examine-star.png.yml

Examine Groups (#12400)

2022-12-19 20:53:36 -06: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_sca;ed.svg.192dpi.png.yml

…

hammer_scaled.svg

…

hammer_scaled.svg.192dpi.png

…

hammer.svg

…

hammer.svg.192dpi.png

…

hammer.svg.192dpi.png.yml

…

handsbox.png

…

handsbox.png.yml

…

home.png

Fix PDA home icon (#25721)

2024-02-29 20:22:12 +01:00

home.svg

PDA UI refactor and cartridges (#11335)

2022-11-08 14:00:20 -06:00

info.svg

…

info.svg.192dpi.png

…

info.svg.192dpi.png.yml

…

inventory.svg

…

inventory.svg.192dpi.png

…

inventory.svg.192dpi.png.yml

…

light.png

PDA UI refactor and cartridges (#11335)

2022-11-08 14:00:20 -06:00

pai.png

Adding PAI Slot to PDA (#21086)

2024-01-04 05:56:14 -07:00

pencil.png

PDA UI refactor and cartridges (#11335)

2022-11-08 14:00:20 -06:00

pencil.svg

PDA UI refactor and cartridges (#11335)

2022-11-08 14:00:20 -06:00

pray.svg

Prayers Again (#10960)

2022-11-08 15:02:14 -06:00

pray.svg.png

Prayers Again (#10960)

2022-11-08 15:02:14 -06:00

pray.svg.png.yml

Prayers Again (#10960)

2022-11-08 15:02:14 -06:00

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

…