nevimer 76dedeb866 Merge remote-tracking branch 'skrat/master' into upstream-june-28-2023 ...

# Conflicts:
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	tgstation.dme

2023-06-28 17:50:43 -04:00

..

ammunition

Merge branch 'master' of https://github.com/bubberstation/bubberstation into overlay_june_13_2023

2023-06-13 20:04:57 -04:00

boxes_magazines

[MIRROR] Refactors for material container, ammo box & recycler [MDB IGNORE] (#21519)

2023-06-01 16:24:54 -07:00

guns

Merge remote-tracking branch 'skrat/master' into upstream-june-28-2023

2023-06-28 17:50:43 -04:00

projectile

[MIRROR] Fix rockets embedding in people [MDB IGNORE] (#21954)

2023-06-23 16:02:28 -07:00

gun.dm

[MIRROR] fix: Gun overlays are now one with gun's icon [MDB IGNORE] (#21585)

2023-06-03 18:34:50 -07:00

pins.dm

…

projectile.dm

[MIRROR] [NO GBP] Style meter fixes [MDB IGNORE] (#20896)

2023-05-02 15:45:08 -04:00