From 7a2560ee769ca174ac01fd60854d8f476aa0913c Mon Sep 17 00:00:00 2001 From: Poojawa Date: Thu, 18 May 2017 08:07:48 -0500 Subject: [PATCH] Delete gang_items.dm.rej --- code/game/gamemodes/gang/gang_items.dm.rej | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 code/game/gamemodes/gang/gang_items.dm.rej diff --git a/code/game/gamemodes/gang/gang_items.dm.rej b/code/game/gamemodes/gang/gang_items.dm.rej deleted file mode 100644 index fa06ac43db..0000000000 --- a/code/game/gamemodes/gang/gang_items.dm.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm (rejected hunks) -@@ -306,6 +306,10 @@ - to_chat(user, "There's not enough room here!") - return FALSE - -+ if(dominator_excessive_walls(user)) -+ to_chat(user, "span class='warning'>The dominator will not function here! The dominator requires a sizable open space within three standard units so that walls do not interfere with the signal.") -+ return FALSE -+ - if(!(usrarea.type in gang.territory|gang.territory_new)) - to_chat(user, "The dominator can be spawned only on territory controlled by your gang!") - return FALSE