From 49696b2029d83d9824209cc16bbc4f7675a36ac2 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 26 Aug 2021 12:53:16 -0400 Subject: [PATCH 1/2] Merge pull request #11494 from VOREStation/upstream-merge-8243 [MIRROR] Illegal Tech -> Transgressive Tech --- code/modules/research/research.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 81ee392a8b..4fda3725df 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -181,8 +181,8 @@ GLOBAL_LIST_INIT(design_datums, list()) id = TECH_DATA /datum/tech/syndicate - name = "Illegal Technologies Research" - desc = "The study of technologies that violate standard government regulations." + name = "Transgressive Technologies Research" + desc = "The study of technologies that sit on the very boundaries of legality and ethics." id = TECH_ILLEGAL level = 0