Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2023-03-13 21:42:07 -05:00
3 changed files with 3 additions and 3 deletions

View File

@@ -71,3 +71,6 @@
BongaTheProto:
- bugfix: fixes datum reference, typepath, and other tgui-dependant variable editing
options
2023-03-14:
LeDrascol:
- tweak: Reverted R&D consoles locking by default

View File

@@ -1,2 +0,0 @@
/obj/machinery/computer/rdconsole
locked = TRUE

View File

@@ -4241,7 +4241,6 @@
#include "modular_sand\code\modules\reagents\reagent_containers\glass.dm"
#include "modular_sand\code\modules\reagents\reagent_containers\pill.dm"
#include "modular_sand\code\modules\reagents\reagent_containers\spray.dm"
#include "modular_sand\code\modules\research\rdconsole.dm"
#include "modular_sand\code\modules\research\stock_parts.dm"
#include "modular_sand\code\modules\research\designs\autolathe_designs.dm"
#include "modular_sand\code\modules\research\designs\biogenerator_designs.dm"