nevimer c633a2f8ff Merge remote-tracking branch 'skrat/master' into upstream-merge-branch ...

# Conflicts:
#	code/modules/research/machinery/_production.dm

2023-07-26 16:21:40 -04:00

..

ammunition

Merge remote-tracking branch 'skrat/master' into upstream-remake-stop-commiting-to-master

2023-07-19 02:18:09 -04:00

boxes_magazines

[MIRROR] Arcane/Blood Barrage fixes, cleans up cult spell code, autofire barrage, more responsive/sane blood collection [MDB IGNORE] (#22495)

2023-07-16 13:48:35 -04:00

guns

Merge remote-tracking branch 'skrat/master' into upstream-merge-branch

2023-07-26 16:21:40 -04:00

projectile

[MIRROR] Adds in the smoothbore disablers. [MDB IGNORE] (#22528)

2023-07-19 00:13:46 -04:00

gun.dm

[MIRROR] Expanding the Experimental MODsuit Bepis Node with three new modules. [MDB IGNORE] (#21851)

2023-07-01 14:21:47 -04:00

pins.dm

[MIRROR] Adds an extra malf AI ability: Remote emagging. Also tidies up emag code and coverts a lot of things to balloon alerts [MDB IGNORE] (#22469)

2023-07-15 16:46:17 -04:00

projectile.dm

[MIRROR] Bibles, Lighters, and Cowboy Hats can block bullets [MDB IGNORE] (#22282)

2023-07-11 23:59:06 -04:00