فهرست منبع

[fixid] The conflict errors from my late night submit.

bgkjdgbizgblzdgbr 2 سال پیش
والد
کامیت
48fa2058d6
1فایلهای تغییر یافته به همراه0 افزوده شده و 25 حذف شده
  1. 0 25
      locations/pav_disco_coolkids.qsrc

+ 0 - 25
locations/pav_disco_coolkids.qsrc

@@ -843,13 +843,8 @@ if $ARGS[0] = 'igor':
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 						'You keep whispering in his ear. "I want to fuck you right now." He gives you a shocked look before you open your purse and show him your strapon nestled inside, which makes him blush even more.'
 						'"What if we get caught?" He sounds scared and excited at the same time.'
-<<<<<<< HEAD
 						'You pat him on the cheek. "Trust me, I know a place and no one will ever find out." He thinks on it for a moment and then finally nods.'
 						act 'Take him somewhere private': gt 'pav_discoev1', 'igor_peg'
-=======
-						'You pat him on the cheek. "Trust me, I know a place and no one will ever find out." He thinks about it for a moment before nodding.'
-						!!act 'Take him somewhere private': gt 'pav_discoev1', 'igor_peg'
->>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 						act 'Just teasing':
 							*clr & cla
 							gs 'stat'
@@ -1304,13 +1299,8 @@ if $ARGS[0] = 'sonia_outcast':
 					gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
-<<<<<<< HEAD
-					'You smile to her. "Ok, lets go."'
-					'She literally squeals with delight, causing several people to look over your direction. "That''s my girl, lets go rock this party." She says as she practically drags you out onto the dance floor.'
-=======
 					'You smile at her. "Okay, let''s go."'
 					'She squeals with delight, causing several people to look over your direction. "That''s my girl, let''s go rock this party." she says as she practically drags you out onto the dance floor.'
->>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 					act 'Go dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
 				end
 			elseif npc_rel['A25'] <= 20 and fame['pav_slut'] < 250:
@@ -1337,13 +1327,8 @@ if $ARGS[0] = 'sonia_outcast':
 					gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
-<<<<<<< HEAD
 					'You smile to her. "Ok, lets go."'
 					'She literally squeals with delight, causing several people to look over your direction. "That''s my slut, lets go show those losers how to really have fun." She says as she practically drags you out onto the dance floor.'
-=======
-					'You smile at her. "Okay, let''s go."'
-					'She squeals with delight, causing several people to look over your direction. "That''s my slut! Let''s go show those losers how to really have fun!" she says as she practically drags you out onto the dance floor.'
->>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 					act 'Go dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
 				end
 			else 
@@ -1375,12 +1360,8 @@ if $ARGS[0] = 'sonia_outcast_dance':
 	if npc_rel['A25'] >= 50 and hotcat >= 5:
 		'She dances with you very closely. She hoots and hollers and has a great time. She teases guys almost non-stop with how she dances, only to turn back to you again, shutting them down. She seems to really be enjoying herself dancing with you. The longer you dance, the closer she dances to you.'
 	else
-<<<<<<< HEAD
 		'She dances with you, pretty closely. She hoots and woohoo''s at time, just having a great time. She teases guys almost non-stop with how she dances, only to turn back to you again, shutting them down. She seems to really be enjoying herself dancing with you.'
 	end
-=======
-		'She dances with you pretty closely. She hoots and hollers and has a great time. She teases guys almost non-stop with how she dances, only to turn back to you again, shutting them down. She seems to really be enjoying herself dancing with you.'
->>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	act 'Just keep dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
 	if hotcat >= 5:
@@ -1432,15 +1413,9 @@ if $ARGS[0] = 'sonia_outcast_dance':
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
-<<<<<<< HEAD
 							'You pull back from her to create space as you stop kissing. "Sorry not tonight..."'
 							'You don''t get time to finish your thought, she looks hurt and angry at your words. "Fine!" Then turns and walks away from you.'
 							!!can we code this so if this happens she leave the disco for the night
-=======
-							'You pull back from her and stop kissing. "Sorry, but not tonight..."'
-							'You don''t get time to finish your thought as she looks hurt and angry at your words. "Fine!" she yells before turning and walking away from you.'
-!!can we code this so if this happens she leave the disco for the night
->>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 							act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 						end
 					else