From a8fe8fd1aa0aacf7903f7f9d11d3a2a1953cf42e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 5 Jun 2017 22:49:04 -0500 Subject: [PATCH] cleanup --- code/datums/outfit.dm | 2 ++ code/datums/outfit.dm.rej | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 code/datums/outfit.dm.rej diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index d0ee284839..4c39d11691 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -23,6 +23,8 @@ var/list/backpack_contents = null // In the list(path=count,otherpath=count) format var/list/implants = null + var/can_be_admin_equipped = TRUE // Set to FALSE if your outfit requires runtime parameters + /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) //to be overriden for customization depending on client prefs,species etc return diff --git a/code/datums/outfit.dm.rej b/code/datums/outfit.dm.rej deleted file mode 100644 index 4f78bcbc69..0000000000 --- a/code/datums/outfit.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/datums/outfit.dm b/code/datums/outfit.dm (rejected hunks) -@@ -23,6 +23,8 @@ - var/list/backpack_contents = null // In the list(path=count,otherpath=count) format - var/list/implants = null - -+ var/can_be_admin_equipped = TRUE // Set to FALSE if your outfit requires runtime parameters -+ - /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - //to be overriden for customization depending on client prefs,species etc - return