From daba09582a71484d6716234c4dc00f98ff1e8956 Mon Sep 17 00:00:00 2001 From: Linzolle Date: Wed, 11 Sep 2019 10:18:10 -0500 Subject: [PATCH] move to misc.dm --- code/__DEFINES/misc.dm | 3 +++ code/__DEFINES/semilists.dm | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 code/__DEFINES/semilists.dm diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index c71780e7e9..b6115e93e9 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -472,6 +472,9 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S #define EGG_LAYING_MESSAGES list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.") +// list of all null rod weapons +#define HOLY_WEAPONS /obj/item/nullrod, /obj/item/twohanded/dualsaber/hypereutactic/chaplain, /obj/item/gun/energy/laser/redtag/hitscan/chaplain, /obj/item/multitool/chaplain, /obj/item/melee/baseball_bat/chaplain + // Used by PDA and cartridge code to reduce repetitiveness of spritesheets #define PDAIMG(what) {""} diff --git a/code/__DEFINES/semilists.dm b/code/__DEFINES/semilists.dm deleted file mode 100644 index 4221a0ccf4..0000000000 --- a/code/__DEFINES/semilists.dm +++ /dev/null @@ -1,2 +0,0 @@ -// list of all null rod weapons -#define HOLY_WEAPONS /obj/item/nullrod, /obj/item/twohanded/dualsaber/hypereutactic/chaplain, /obj/item/gun/energy/laser/redtag/hitscan/chaplain, /obj/item/multitool/chaplain, /obj/item/melee/baseball_bat/chaplain \ No newline at end of file