Artur 9d04b0835b Conflicts galore

2020-05-21 21:08:12 +03:00

..

designs

corrects WT-550 ammo to state 32 rather then 20 (#12275)

2020-05-17 01:05:24 +02:00

machinery

fix (#12188)

2020-05-10 02:58:58 +02:00

nanites

Coonflict fiiixeeess

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

techweb

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

2020-05-12 20:06:59 +02:00

xenobiology

Merge pull request #12200 from Ghommie/Ghommie-cit738

2020-05-12 12:28:02 -07: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 (#12188)

2020-05-10 02:58:58 +02:00

rdmachines.dm

…

research_disk.dm

…

server.dm

…

stock_parts.dm

…