From 62a753703056181fd492b887fe280f2365363d94 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 24 May 2017 16:29:31 -0500 Subject: [PATCH 1/2] Dot Nonsense: find the current running proc's type! --- code/__DEFINES/misc.dm | 13 +++++++++++++ code/__DEFINES/misc.dm.rej | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 code/__DEFINES/misc.dm.rej diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 8b02a61fba..d29b22225e 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -4,6 +4,19 @@ // #define EAST 4 // #define WEST 8 +//These get to go at the top, because they're special +//You can use these defines to get the typepath of the currently running proc/verb (yes procs + verbs are objects) +/* eg: +/mob/living/carbon/human/death() + world << THIS_PROC_TYPE_STR //You can only output the string versions +Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a string with () (eg: the _WITH_ARGS defines) to make it look nicer) +*/ +#define THIS_PROC_TYPE ..... +#define THIS_PROC_TYPE_STR "[THIS_PROC_TYPE]" //Because you can only obtain a string of THIS_PROC_TYPE using "[]", and it's nice to just +/+= strings +#define THIS_PROC_TYPE_STR_WITH_ARGS "[THIS_PROC_TYPE]([args.Join(",")])" +#define THIS_PROC_TYPE_WEIRD ...... //This one is WEIRD, in some cases (When used in certain defines? (eg: ASSERT)) THIS_PROC_TYPE will fail to work, but THIS_PROC_TYPE_WEIRD will work instead +#define THIS_PROC_TYPE_WEIRD_STR "[THIS_PROC_TYPE_WEIRD]" //Included for completeness +#define THIS_PROC_TYPE_WEIRD_STR_WITH_ARGS "[THIS_PROC_TYPE_WEIRD]([args.Join(",")])" //Ditto #define MIDNIGHT_ROLLOVER 864000 //number of deciseconds in a day diff --git a/code/__DEFINES/misc.dm.rej b/code/__DEFINES/misc.dm.rej new file mode 100644 index 0000000000..1697c2fdce --- /dev/null +++ b/code/__DEFINES/misc.dm.rej @@ -0,0 +1,8 @@ +diff a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm (rejected hunks) +@@ -411,4 +424,4 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE + #define GIBTONITE_UNSTRUCK 0 + #define GIBTONITE_ACTIVE 1 + #define GIBTONITE_STABLE 2 +-#define GIBTONITE_DETONATE 3 +\ No newline at end of file ++#define GIBTONITE_DETONATE 3 From 0093c4a03ddf3e5f01092924f8b4f83e0c45df33 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 27 May 2017 13:41:18 -0700 Subject: [PATCH 2/2] Delete misc.dm.rej --- code/__DEFINES/misc.dm.rej | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 code/__DEFINES/misc.dm.rej diff --git a/code/__DEFINES/misc.dm.rej b/code/__DEFINES/misc.dm.rej deleted file mode 100644 index 1697c2fdce..0000000000 --- a/code/__DEFINES/misc.dm.rej +++ /dev/null @@ -1,8 +0,0 @@ -diff a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm (rejected hunks) -@@ -411,4 +424,4 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE - #define GIBTONITE_UNSTRUCK 0 - #define GIBTONITE_ACTIVE 1 - #define GIBTONITE_STABLE 2 --#define GIBTONITE_DETONATE 3 -\ No newline at end of file -+#define GIBTONITE_DETONATE 3