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

..

equipment

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

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

laborcamp

[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

lavaland

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

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

abandoned_crates.dm

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

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

aux_base.dm

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

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

fulton.dm

[MANUAL MIRROR] Reworks Duffel Bags (Zippers) (#22363)

2023-07-20 23:12:57 -04:00

machine_processing.dm

[MIRROR] Material container & related stuff ui refactors & clean-up [MDB IGNORE] (#22667)

2023-07-25 02:53:43 -04:00

machine_redemption.dm

[MIRROR] Material container & related stuff ui refactors & clean-up [MDB IGNORE] (#22667)

2023-07-25 02:53:43 -04:00

machine_silo.dm

[MIRROR] Material container & related stuff ui refactors & clean-up [MDB IGNORE] (#22667)

2023-07-25 02:53:43 -04:00

machine_stacking.dm

[MIRROR] Material container & related stuff ui refactors & clean-up [MDB IGNORE] (#22667)

2023-07-25 02:53:43 -04:00

machine_unloading.dm

…

mine_items.dm

[MIRROR] [MDB IGNORE] Angled Lights & Lighting Prototyping Tool [MDB IGNORE] (#22582)

2023-07-21 00:43:21 -04:00

minebot.dm

[MIRROR] Adds p_They (and friends) for capitalized pronoun helpers [MDB IGNORE] (#22555)

2023-07-18 22:10:59 -04:00

money_bag.dm

…

ores_coins.dm

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

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

satchel_ore_boxdm.dm

…

shelters.dm

[MIRROR] Emergency Relief Capsule [MDB IGNORE] (#22199)

2023-07-03 17:34:13 -04:00

voucher_sets.dm

…