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

..

ballistic

[MIRROR] Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs [MDB IGNORE] (#22680)

2023-07-25 20:24:07 -04:00

energy

[MODULAR] Fixes smoothbore getting the wrong cell type, removes skyrat edits (#22617)

2023-07-21 13:15:45 -07:00

magic

[MIRROR] Adds a wizard Right and Wrong that lets the caster give one spell (or relic) to everyone on the station [MDB IGNORE] (#22637)

2023-07-22 22:47:17 -04:00

special

[MIRROR] Icons folder cleaning wave two [MDB IGNORE] (#22454)

2023-07-16 00:41:18 -04:00

ballistic.dm

[MIRROR] Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs [MDB IGNORE] (#22680)

2023-07-25 20:24:07 -04:00

bolt_types_explained.md

…

energy.dm

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

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

magic.dm

…