Delete gang.dm.rej

2017-05-07 22:35:48 -07:00
parent 0972689cfc
commit 6bf46e1a6d
1 changed files with 0 additions and 10 deletions
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm	(rejected hunks)
-@@ -249,7 +249,7 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
- 	return gang_bosses
- 
- /proc/determine_domination_time(var/datum/gang/G)
-	return max(180,600 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9))
-+	return max(180,480 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9))
- 
- 
- //////////////////////////////////////////////////////////////////////