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

..

anomaly

[MIRROR] Ectoplasm Anomaly Name and Icon Bugfix [MDB IGNORE] (#20955)

2023-05-06 17:34:47 +01:00

designs

Merge remote-tracking branch 'skrat/master' into upstream-jul-24

2023-07-24 20:11:34 -04:00

machinery

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

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

ordnance

[MIRROR] Pulls apart the vestiges of components still hanging onto signals [MDB IGNORE] (#21738)

2023-06-18 13:18:23 +00:00

stock_parts

[MIRROR] Stock Part Resprite [MDB IGNORE] (#21014)

2023-05-09 04:10:18 +01:00

techweb

Merge remote-tracking branch 'skrat/master' into upstream-jul-24

2023-07-24 20:11:34 -04:00

xenobiology

[MIRROR] made the bee a basic insect [MDB IGNORE] (#22652)

2023-07-24 01:21:59 -04:00

bepis.dm

[MIRROR] Stock Part Resprite [MDB IGNORE] (#21014)

2023-05-09 04:10:18 +01:00

designs.dm

[MIRROR] Autolathe, protolathe, mech fab and comp printer now use defines for matter bins values. Also some production ui do. [MDB IGNORE] (#21953)

2023-06-23 15:34:52 -07:00

destructive_analyzer.dm

…

experimentor.dm

[MIRROR] made the bee a basic insect [MDB IGNORE] (#22652)

2023-07-24 01:21:59 -04:00

rdconsole.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

rdmachines.dm

[MIRROR] Fixes some stupid airlock sleeps [MDB IGNORE] (#21931)

2023-07-01 15:33:12 -04:00

research_disk.dm

[MIRROR] Minerals have been refactored so costs and minerals in items are now in terms of mineral defines. [MDB IGNORE] (#20916)

2023-05-03 22:48:10 +01:00

server_control.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

server.dm

[MANUAL MIRROR] R&D Monitoring console TGUI + Can see RD consoles (#72987) (#21131)

2023-05-15 16:45:30 +01:00

stock_parts.dm

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

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