From 59f59178f4430cf466288979ef0c432e5d032cbe Mon Sep 17 00:00:00 2001 From: raspy-on-osu Date: Sun, 24 Jan 2021 19:24:50 -0500 Subject: [PATCH] does this work --- code/__DEFINES/dcs/signals.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 849a188e06..a1bb4122a8 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -541,12 +541,9 @@ #define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt" //from turf AltClickOn(): (/mob) #define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl" //from monkey CtrlClickOn(): (/mob) -<<<<<<< HEAD // /datum/element/ventcrawling signals #define COMSIG_HANDLE_VENTCRAWL "handle_ventcrawl" //when atom with ventcrawling element attempts to ventcrawl #define COMSIG_CHECK_VENTCRAWL "check_ventcrawl" //to check an atom's ventcrawling element tier (if applicable) -======= // twitch plays /// Returns direction: (wipe_votes) #define COMSIG_TWITCH_PLAYS_MOVEMENT_DATA "twitch_plays_movement_data" ->>>>>>> 5e31c105709567655d6bcc98c38a7641db12793a