Ed 9520f63aa1 Merge remote-tracking branch 'space-station-14/master' into 29-04-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

2024-04-29 16:28:04 +03:00

..

Marker

Code cleanup: Dirty(Comp) (#26238)

2024-03-19 23:27:02 -04:00

Melee

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

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

Misc

Code cleanup: Purge obsoleted SharedPhysicsSystem methods (#26287)

2024-03-25 17:37:25 +11:00

Ranged

Upstrearm sync (#94)

2024-04-14 20:34:16 +03:00

Reflect

Hardsuits, EVA suits, Firesuits, and others now protect your feet from Glass Shards (#26764)

2024-04-28 17:11:46 +10:00