Browse Source

[changed] resolved merge conflict

julzor 4 years ago
parent
commit
1893618a32
1 changed files with 1 additions and 5 deletions
  1. 1 5
      locations/Voltrener.qsrc

+ 1 - 5
locations/Voltrener.qsrc

@@ -200,11 +200,7 @@ if $ARGS[0] = 'talk':
 							act 'Persuade him to let you join the team (<font color="red"><will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 						end
 					end
-					act 'Okay, it''s true, I am a <<$gnikname>>':
-						*clr & cla
-						gs 'stat'
-						gt'Voltrener', 'gorslut'
-					end
+					act 'Okay, it''s true, I am a <<$gnikname>>': gt'Voltrener', 'gorslut'
 				else
 					'You ask the coach about joining the team, the coach thinks for a minute. "I have a spot for a substitute, but I do not know if you have what it takes."'
 					gs 'willpower', 'misc', 'self'