Conflict fix

2020-02-13 17:52:28 +02:00
parent 63482e397a 821496e67c
commit c01f78b8e8
157 changed files with 1830 additions and 882 deletions
@@ -581,6 +581,9 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 	if(cultslurring)
 		cultslurring = max(cultslurring-1, 0)

+	if(clockcultslurring)
+		clockcultslurring = max(clockcultslurring-1, 0)
+
 	if(silent)
 		silent = max(silent-1, 0)