Raeschen d4992917ce Fix merge conflicts

2023-06-17 13:07:51 +02:00

..

autoresleever.dm

Fix merge conflicts

2023-06-17 13:07:51 +02:00

circuitboards.dm

…

computers.dm

Use material defines more

2021-07-07 19:02:05 +00:00

designer.dm

Merge pull request #14356 from Seris02/promethean_fix

2023-01-20 09:41:34 +00:00

documents.dm

…

implant_ch.dm

…

implant.dm

Use material defines more

2021-07-07 19:02:05 +00:00

infocore_records.dm

Adds preference for automatic transcore notifications

2022-07-25 19:39:46 -05:00

machine_subtypes.dm

Fixes certain aspects of NIFSofts not applying properly on resleeve

2021-12-03 07:13:16 +00:00

machines.dm

Merge pull request #12953 from FartMaster69420/sleevecard-pai

2022-05-22 18:17:28 +00:00

resleeving_sickness.dm

…

sleevecard.dm

Merge pull request #13160 from Very-Soft/accountforsleevecards

2022-06-25 02:31:55 +00:00