From b7ad21dafa51a6ea489f5f250f0a045157ca3e90 Mon Sep 17 00:00:00 2001 From: Enric Gabriel <43283559+SandPoot@users.noreply.github.com> Date: Thu, 6 Aug 2020 01:07:33 -0300 Subject: [PATCH] X-Ray mutation comeback (#38) --- sandcode/code/datums/mutations/combined.dm | 3 +++ tgstation.dme | 1 + 2 files changed, 4 insertions(+) create mode 100644 sandcode/code/datums/mutations/combined.dm diff --git a/sandcode/code/datums/mutations/combined.dm b/sandcode/code/datums/mutations/combined.dm new file mode 100644 index 0000000000..86edfa0bc4 --- /dev/null +++ b/sandcode/code/datums/mutations/combined.dm @@ -0,0 +1,3 @@ +/datum/generecipe/xray + required = "/datum/mutation/human/thermal; /datum/mutation/human/radioactive" + result = XRAY diff --git a/tgstation.dme b/tgstation.dme index 7ef25f7424..16f391f43b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3531,6 +3531,7 @@ #include "sandcode\code\_onclick\hud\screen_objects.dm" #include "sandcode\code\datums\action.dm" #include "sandcode\code\datums\shuttles.dm" +#include "sandcode\code\datums\mutations\combined.dm" #include "sandcode\code\datums\ruins\lavaland.dm" #include "sandcode\code\datums\status_effects\buffs.dm" #include "sandcode\code\datums\status_effects\debuffs.dm"