Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

designs

Fixing conflicts

2020-10-05 18:10:53 -07:00

circuitprinter.dm

Exosuit Modular Internals, The Squeakening

2020-08-05 19:22:23 -04:00

designs.dm

Removes nanoUI autolathe code stuff.

2020-09-15 19:06:46 -03:00

destructive_analyzer.dm

Updates machines to use default_apply_parts()

2020-05-07 00:40:34 -04:00

mechfab_designs_ch.dm

updates scarab and phoron bore

2020-09-27 18:38:06 -04:00

mechfab_designs_vr.dm

…

mechfab_designs.dm

September 2020 Upstream Merge

2020-09-25 23:07:08 -07:00

message_server.dm

TGUI Request Console (and Fix TGUI verb)

2020-08-16 22:27:08 -07:00

prosfab_designs_vr.dm

Add a belly size upgrade for hounds:

2020-08-05 14:53:24 +02:00

prosfab_designs.dm

TGUI Research

2020-08-25 13:30:47 -07:00

protolathe.dm

Convert /material to /datum/material

2020-09-27 16:16:44 -07:00

rd-readme.dm

…

rdconsole_tgui.dm

Fix research console showing duplicates, make pages more clear

2020-08-29 12:49:45 -07:00

rdconsole.dm

TGUI Research

2020-08-25 13:30:47 -07:00

rdmachines.dm

Convert /material to /datum/material

2020-09-27 16:16:44 -07:00

research.dm

Whoops, don't make research levels global, we don't want permaautosync

2020-08-29 13:24:28 -07:00

server.dm

TGUI Research

2020-08-25 13:30:47 -07:00

teleport_vr.dm

…