Artur f0154f3f1c conflicts!!!

2020-07-03 15:45:11 +03:00

..

designs

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

2020-06-30 00:49:06 +02:00

machinery

Porting further material datum features and improvements.

2020-06-24 20:45:17 +02:00

nanites

Coonflict fiiixeeess

2020-05-13 12:56:17 +03:00

techweb

node

2020-06-27 18:20:13 -04:00

xenobiology

Porting the twohanded component.

2020-05-17 18:16:53 +02:00

bepis.dm

Cooonflicts

2020-06-16 01:23:42 +03:00

designs.dm

Clarifies a comment.

2020-04-24 01:12:33 +02:00

destructive_analyzer.dm

Identification components + chameleon clothing from uplink is now obfuscated (#12045)

2020-05-01 18:39:45 +02:00

experimentor.dm

…

rdconsole.dm

Fix the missing Technode icon

2020-07-02 22:33:35 +08:00

rdmachines.dm

…

research_disk.dm

Porting the BEPIS research machinery. (#12277)

2020-05-24 13:05:15 -07:00

server.dm

…

stock_parts.dm

…