[fixed] missing drugs calls

locations/LakeBoyZ.qsrc

@@ -4,8 +4,8 @@ $gL_boy_z = {
 		cls
 		gs 'stat'
 		'He seems nice enough so you decide to give him your name.'
-		randvnesh = RAND(40,120)
-		if RAND(0,10) = 0 and pcs_apprnc >= randvnesh:
+		randvnesh = rand(40,120)
+		if rand(0,10) = 0 and pcs_apprnc >= randvnesh:
 			'<<$boydesc>> smiles as he says, "You''re a pretty cool girl. Maybe we can hang out again?"'
 			act 'Smile and leave':gt'glake'
 			act 'Give him your phone number':
@@ -26,8 +26,7 @@ $gL_boy_z = {
 			act 'Drink beer':
 				cls
 				minut+=15
-				alko+=3
-				pcs_mood += 30
+				gs 'drugs', 'alcohol', 'beer', 1
 				gs'stat'
 				'You drink beer with the guy, and the two of you chat for a while.'
 				'Suddenly, he puts his hand on your thigh.'
@@ -35,8 +34,7 @@ $gL_boy_z = {
 				act 'Thank him for the beer and leave':gt'glake'
 				act 'Drink some more beer':
 					cls
-					alko+=3
-					pcs_mood += 30
+					gs 'drugs', 'alcohol', 'beer', 1
 					gs 'arousal', 'foreplay', 15
 					gs 'stat'
 					'You drink more beer with <<$boydesc>>. He begins stroking your leg and puts his hand on your chest as he leans into you.'

locations/Snpc.qsrc

@@ -77,15 +77,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					*clr & cla
 					minut += 5
 					npc_rel['A<<numnpc>>'] += 5
-					alko += rand(1,2)
-					if pcs_hydra >= 100:
-						pcs_hydra += 5
-					else
-						pcs_hydra += 10
-					end
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					pcs_breath = 0
+					gs 'drugs', 'alcohol', 'beer', 1
 					gs 'stat'
 					'You happily take the beer, and drink it in <<$npc_firstname[''A<<numnpc>>'']>>''s company.'
 

locations/gopskver.qsrc

@@ -491,7 +491,7 @@ end
 if $ARGS[0] = 'BjBeerYes':
 	*clr & cla
 	minut += 10
-	Bjrand=RAND(1,2)
+	Bjrand=rand(1,2)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Bjrand>>.jpg" ></center>'
 	'You take a deep sigh... guess that''s the way it''s going to be, now. At least these guys will take care of you if you get in trouble, and they''ll give you beer... that''s not so bad, right?'
 	'You squat down without objections, and obediently open your mouth while you stare at the guys. They quickly undo their pants, and Vasily is the first to reach your mouth. You dutifully suck him off, ignoring the rather foul taste that comes from his dick. After a bit of sucking, it''s mostly gone anyway.'
@@ -530,7 +530,7 @@ end
 
 if $ARGS[0] = 'BjBeerAct':
 	*clr & cla
-	throatrand=RAND(7,8)
+	throatrand=rand(7,8)
 	minut += 15
 	pcs_throat += 1
 	swallow += 1
@@ -584,7 +584,7 @@ if $ARGS[0] = 'BjBeerPas':
 
 	act 'Open your mouth':
 		*clr & cla
-		cumrand=RAND(9,10)
+		cumrand=rand(9,10)
 		'<center><video autoplay loop src="images/locations/pavlovsk/park/sex/gop/bjbeer<<cumrand>>.mp4"></video></center>'
 		'Vasily already jerked him off to near completion while you weren''t looking, and when you open your mouth he immediately shoots several hot jets of sperm into it. You''re too scared of the guys to pull away, and just wait with your mouth open. Once he finishes, Vasily puts his hand over your mouth and pinces your nose shut, forcing you to swallow his load.'
 		'You wince at the horrible taste, but try to hide your disgust as you swallow it.'
@@ -604,7 +604,7 @@ end
 
 if $ARGS[0] = 'BjBeerDouble':
 	*clr & cla
-	DoubleRand = RAND(14,15)
+	Doublerand = rand(14,15)
 	pcs_hairbsh = 0
 	stat['bj'] += 2
 	pcs_throat = pcs_throat + 1
@@ -615,7 +615,7 @@ if $ARGS[0] = 'BjBeerDouble':
 	if pcs_makeup > 1: pcs_makeup = 0
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<DoubleRand>>.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Doublerand>>.jpg" ></center>'
 	'You spread your <<$liptalk>> and wrap them around Vitek''s cock. At that moment, Dan grunts: "Open wider, slut" and begins to unceremoniously cram his dick into your mouth as well, stretching it to the limit. You try to protest, but the guys just laugh at the comical sounds you make with two cocks in your mouth. Once Dan gets settled in, the guys slowly begin to move, fucking your mouth at the same time.' 
 
 	if pcs_throat > 15:
@@ -655,14 +655,12 @@ if $ARGS[0] = 'BjBeerFace':
 	act '"How about that beer?"':
 		*clr & cla
 		if BjBeerActiv = 1:
-			BeerRand=RAND(11,12)
+			Beerrand=rand(11,12)
 			BjBeerQW += 1 
-			Alko+=3
-			pcs_mood+=5
-	
+			gs 'drugs', 'alcohol', 'beer', 1
 			gs 'stat'
 	
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<BeerRand>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Beerrand>>.jpg"></center>'
 			'Dan grins at you and offers you his unfinished bottle, and smiles when you drink it eagerly. Your mood improves slightly.'
 			act 'Return to the park': BjBeerActiv = 0 & gt 'gskver', 'start'
 	
@@ -723,7 +721,7 @@ if $ARGS[0] = 'BjBeerPalevo':
 	*clr & cla
 	evgenQW = 4
 	if brotherknowslut < 2: brotherknowslut = 2
-	DoubleRand = RAND(14,15)
+	Doublerand = rand(14,15)
 	pcs_hairbsh = 0
 	stat['bj'] += 2
 	pcs_throat = pcs_throat + 1
@@ -734,7 +732,7 @@ if $ARGS[0] = 'BjBeerPalevo':
 	if pcs_makeup > 1: pcs_makeup = 0
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<DoubleRand>>.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Doublerand>>.jpg" ></center>'
 	'By now you know what they want, and humbly open your mouth as wide as possible. Vitek immediately guides his cock towards your mouth, and impatiently pushes it down your <<$throattipe>> throat.' 
 	'At that moment, Dan grunts: "Open wider, slut" and begins to unceremoniously cram his dick into your mouth as well, stretching it to the limit.' 
 	'You know protesting would be pointless and don''t resist, allowing the boys to use your mouth as they please. With some grunts they try to force their cocks further down your throat, and eventually they manage to get both about two thirds of the way in.' 
@@ -816,7 +814,7 @@ if $ARGS[0] = 'BjBeerVag':
 	
 		act 'Try to relax':
 			*clr & cla
-			VagRand = RAND (2,3)
+			Vagrand = rand (2,3)
 			gs 'boyStat', 'A10'
 			dick = 17
 			cumprecheck = 1
@@ -827,7 +825,7 @@ if $ARGS[0] = 'BjBeerVag':
 			minut += 10
 			gs 'stat'  
 			
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeervag<<VagRand>>.jpg" ></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeervag<<Vagrand>>.jpg" ></center>'
 			'Dan firmly grabs you by the hips, and roughly shoves his cock inside you without any concern for your feelings. His hips vigorously bash against yours, and you can only hope he''s finished soon.'   
 			
 			gs 'dinsex','vaginal_sex',10
@@ -858,12 +856,11 @@ if $ARGS[0] = 'BjBeerVag':
 				
 				act 'Recover':				
 					*clr & cla
-					BeerRand=RAND(11,12)
-					Alko+=3
-					pcs_mood+=5
+					Beerrand=rand(11,12)
+					gs 'drugs', 'alcohol', 'beer', 1
 					gs 'stat'
 	
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<BeerRand>>.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Beerrand>>.jpg"></center>'
 					'After resting for a few minutes, you slowly push yourself up and softly mutter a "Hello" to the boys.'
 					'They grin at the way your legs tremble awkwardly, and their sperm slowly runs down your legs. Your belly and buttocks are still covered in it, but you just adjust your clothes without giving it any more thought.'
 					'You have a faint smile on your face, and look expectantly at the guys as you wait for your reward.'
@@ -920,7 +917,7 @@ if $ARGS[0] = 'BjBeerAnal':
 			'You wrinkle your nose at his dirty and smelly erection... ugh!'
 
 		act'Clean him up':
-			SuckRand=RAND(1,2)
+			Suckrand=rand(1,2)
 			cla
 			cls
 			sub +=1
@@ -928,7 +925,7 @@ if $ARGS[0] = 'BjBeerAnal':
 			pcs_mood = pcs_mood - 3
 			gs 'stat'
 		
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeerdirtyanal<<SuckRand>>.jpg" ></center>'		
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeerdirtyanal<<Suckrand>>.jpg" ></center>'		
 			'You hesitate for a second, but you realize that he''s not giving you a choice. You obediently fall to your knees before him and take his cock in your mouth, looking to correct your mistake.' 
 			'The taste is horrible, and you have great difficulty suppressing your gag reflex as you carefully lick and suck his dick, humbly looking into his eyes in the hope of avoiding punishment.'
 			'You have an awful taste in your mouth, and you quietly berate yourself for not giving yourself an enema today. You don''t have much time to mull it over though, as Dan says: "That''s good enough. Now get back into position and spread your ass, slut."'	
@@ -944,7 +941,7 @@ end
 
 if $ARGS[0] = 'BjBeerAnal2':
 	*clr & cla
-	AnalRand = RAND (3,4)
+	Analrand = rand (3,4)
 	gs 'boyStat', 'A10'
 	dick = 17
 	sexpartkno = 1
@@ -955,7 +952,7 @@ if $ARGS[0] = 'BjBeerAnal2':
 	if pcs_makeup > 1: pcs_makeup = 0
 	gs 'stat'  
    
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeeranal<<AnalRand>>.jpg" ></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeeranal<<Analrand>>.jpg" ></center>'
 	'You nod and let him move you around, so he can position you the way he likes. He puts you in a similar position that Vasily had you in, and spits on your sphincter. It''s not fully closing yet after the fucking Vasily gave you, and you slowly feel his saliva run down your hole while a cold gust of air blows past.'
 
 	gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
@@ -1013,12 +1010,11 @@ if $ARGS[0] = 'BjBeerAnal2':
 				
 			act '"How about that beer?"':				
 				*clr & cla
-				BeerRand=RAND(11,12)
-				Alko+=3
-				pcs_mood+=5
+				Beerrand=rand(11,12)
+				gs 'drugs', 'alcohol', 'beer', 1
 				gs 'stat'
 	
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<BeerRand>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Beerrand>>.jpg"></center>'
 				'Dan grins and gives you his unfinished bottle of beer: "Here you go, slut. You''ve earned it."'
 				'You eagerly drink the beer with a content smile on your lips. Your mood improves slightly.'
 				act 'Return to the park': gt 'gskver', 'start'				

locations/gschool_socialchg.qsrc

@@ -663,7 +663,7 @@ if $ARGS[0] = 'gopnik party':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/drinkvodka.jpg"></center>'
 						'You take a sip from the cup and you immediately feel you throat burn. You begin coughing as the others start laughing, "Not much of a drinker, eh?"'
 						'As it quiets down everyone goes back to what they were doing and you''re free to explore the grounds as you''re now one of the trusted hanger on, kinda a member but not fully expected yet, but soon.'
-						alko += 3
+						gs 'drugs', 'alcohol', 'vodka', 1
 						gs 'stat'
 
 						act 'Start exploring': gt 'gschool_socialchg', 'explore'
@@ -680,7 +680,7 @@ if $ARGS[0] = 'gopnik party':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/drinkvodka.jpg"></center>'
 						'You take a sip from the cup and you immediately feel you throat burn. You begin coughing as the others start laughing, "Not much of a drinker, eh?"'
 						'As it quiets down everyone goes back to what they were doing and you''re free to explore the grounds as you''re now one of the trusted hanger on, kinda a member but not fully expected yet, but soon.'
-						alko += 3
+						gs 'drugs', 'alcohol', 'vodka', 1
 						gs 'stat'
 
 						act 'Start exploring': gt 'gschool_socialchg', 'explore'
@@ -1099,7 +1099,7 @@ if $ARGS[0] = 'Niko':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
 			'As you approach Niko, he quickly turns to you and says, "So the little slut decides to join the tough guys huh? You must enjoy being treated like the whore that you are, don''t you? Because you will never truly be an equal here. I will make sure of it." Niko then presses a bottle of vodka against the table then slams his hand down on it, popping the top off the bottle before drinking the vodka while he leans back. Realizing that he has nothing more to say, you cautiously walk away.'
 		elseif NikoVolkovQW >= 5 and NikoEv > 0:
-			alko += 1
+			gs 'drugs', 'alcohol', 'vodka', 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'As you approach Niko, he slowly turns to you and says, "Hey <<$pcs_nickname>> How are you enjoying the party?" You give Niko a smile as he reaches out for your hand then guides you toward the seat next to him then wraps his arm around your neck before kissing up your neck. Niko then presses a bottle of vodka against the table then slams his hand down on it, popping the top off the bottle before handing it to you.'
 			act 'Have a drink':
@@ -1113,7 +1113,7 @@ if $ARGS[0] = 'Niko':
 		elseif NikoIntro > 0:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'As you approach Niko, he slowly turns to you and says, "Hello there, <<$pcs_firstname>> Welcome to the party. Here, have a drink." Niko then presses a bottle of vodka against the table then slams his hand down on it, popping the top off the bottle before handing it to you.'
-			alko += 1
+			gs 'drugs', 'alcohol', 'vodka', 1
 			act 'Have a drink':
 				cla & *clr
 				gs 'stat'
@@ -1122,7 +1122,7 @@ if $ARGS[0] = 'Niko':
 				act 'Head back': gt 'gschool_socialchg', 'explore'
 			end
 		else
-			alko += 1
+			gs 'drugs', 'alcohol', 'vodka', 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'As you approach Niko, he slowly turns to you and says, "Hello there, <<$pcs_firstname>> is your name right? Welcome to the party. Here, have a drink." Niko then presses a bottle of vodka against the table then slams his hand down on it, popping the top off the bottle before handing it to you.'
 		end

locations/hunter_interactions.qsrc

@@ -6,34 +6,29 @@ if $ARGS[0] = 'smoke_with_hunters':
     gs 'stat'
 
     if temp_sh = 1:
-            *clr & cla
-            gs 'stat'
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker1.jpg"></center>'
-            *nl
-            'The men ask you if you want to go out for a smoke.'
-
-            act 'Agree':
-                *clr & cla
-                minut += 15
-                smoker += 1
-                smokeHour = hour
-                smokeDay = day
-                smokeminut = minut+5
-                smokeNeed = 0
-                pcs_mood += 100
-                pcs_willpwr += 100
-                if huntersKnowSlut = 0:huntersAndreiQw += 1
-                if huntersKnowSlut = 0:huntersIgorQw += 1
-                if huntersKnowSlut = 0:huntersSergeiQw += 1
-                gs 'stat'
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker1.jpg"></center>'
+		*nl
+		'The men ask you if you want to go out for a smoke.'
+			
+		act 'Refuse': gs 'swamphouse', 'meal_table'
+		act 'Agree':
+			*clr & cla
+			minut += 15
+			siga += 1
+            gs 'drugs', 'smoke'
+			if huntersKnowSlut = 0:huntersAndreiQw += 1
+			if huntersKnowSlut = 0:huntersIgorQw += 1
+			if huntersKnowSlut = 0:huntersSergeiQw += 1
+			gs 'stat'
 
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
-                *nl
-                'You follow them outside, they give you a cigarette, you light it and smoke it...'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
+			*nl
+			'You follow them outside, they give you a cigarette, you light it and smoke it...'
 
-                act 'Return to the table': gs 'swamphouse', 'meal_table'
-            end
-            act 'Refuse': gs 'swamphouse', 'meal_table'
+		act 'Return to the table': gs 'swamphouse', 'meal_table'
+		end 
     end
     if temp_sh = 2:
             *clr & cla
@@ -46,13 +41,8 @@ if $ARGS[0] = 'smoke_with_hunters':
                 act 'Agree':
                     *clr & cla
                     minut += 15
-                    smoker += 1
-                    smokeHour = hour
-                    smokeDay = day
-                    smokeminut = minut+5
-                    smokeNeed = 0
-                    pcs_mood += 100
-                    pcs_willpwr += 100
+					siga += 1
+                    gs 'drugs', 'smoke'
                     huntersAndreiQw += 1
                     gs 'stat'
 
@@ -68,13 +58,8 @@ if $ARGS[0] = 'smoke_with_hunters':
                     act 'Agree':
                         *clr & cla
                         minut += 15
-                        smoker += 1
-                        smokeHour = hour
-                        smokeDay = day
-                        smokeminut = minut+5
-                        smokeNeed = 0
-                        pcs_mood += 100
-                        pcs_willpwr += 100
+						siga += 1
+                        gs 'drugs', 'smoke'
                         huntersAndreiQw += 1
                         gs 'stat'
 
@@ -187,12 +172,8 @@ if $ARGS[0] = 'smoke_with_hunters':
             act 'Agree':
                 *clr & cla
                 minut += 15
-                smoker += 1
-                smokeHour = hour
-                smokeDay = day
-                smokeminut = minut+5
-                smokeNeed = 0
-                pcs_mood += 100
+				siga += 1
+                gs 'drugs', 'smoke'
                 pcs_willpwr += 100
                 if huntersKnowSlut = 0:huntersSergeiQw += 1
                 gs 'stat'
@@ -216,13 +197,8 @@ if $ARGS[0] = 'smoke_with_hunters':
             act 'Agree':
                 *clr & cla
                 minut += 15
-                smoker += 1
-                smokeHour = hour
-                smokeDay = day
-                smokeminut = minut+5
-                smokeNeed = 0
-                pcs_mood += 100
-                pcs_willpwr += 100
+				siga += 1
+                gs 'drugs', 'smoke'
                 if huntersKnowSlut = 0:huntersIgorQw += 1
                 gs 'stat'
 
@@ -240,13 +216,8 @@ if $ARGS[0] = 'drink_with_hunters':
     cla
     act 'Drink vodka':
 			*clr & cla
-			minut += 1
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
-			alko +=4
+			minut += 10
+			gs 'drugs', 'alcohol', 'vodka', 1
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka1.jpg"></center>'
@@ -257,10 +228,8 @@ if $ARGS[0] = 'drink_with_hunters':
 		end
 		act 'Drink beer':
 			*clr & cla
-			minut += 15
-			alko +=2
-			fat += 1
-			pcs_hydra += 10
+			minut += 10
+			gs 'drugs', 'alcohol', 'beer', 1
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/beer2.jpg"></center>'

locations/ira.qsrc

@@ -115,11 +115,8 @@ if $ARGS[0] = 'drink':
 	cls
 	menu_off = 1
 	minut += 5
-	alko +=1
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	pcs_breath = 0
 	drunk_sveta += 1
+	gs 'drugs', 'alcohol', 'beer', 1
 	gs'stat'
 	'<center><b><font color = maroon>Ira and Lena</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_iralena_2.jpg"></center>'

locations/kotovtalker.qsrc

@@ -13,10 +13,7 @@ if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel['A9'] >= 80 o
 				*clr & cla
 				minut += 5
 				npc_rel['A9'] += 5
-				alko += rand(1,2)
-				cumspclnt = 2
-				gs 'cum_cleanup'
-				pcs_breath = 0
+				gs 'drugs', 'alcohol', 'beer', 1
 				gs 'stat'
 				'Vitek poured you a beer and you began drinking with him. Vitek stared into your eyes and tells you. "You''re a cool girl, you know that."'
 
@@ -131,10 +128,7 @@ elseif $loc = 'gdkin':
 			*clr & cla
 			minut += 5
 			npc_rel[$static_num] += 5
-			alko += rand(1,2)
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
+			gs 'drugs', 'alcohol', 'beer', 1
 			gs 'stat'
 			'You drink the beer with his group of friends.'
 

locations/nyp_school.qsrc

@@ -104,15 +104,7 @@ if $ARGS[0] = 'start':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/vodkabottle.jpg"></center>'
 						'You drank the vodka, it burned your throat as you swallowed it. You even started coughing a bit but quickly recovered. The gopniks laugh and encourage you to drink more. The more you drink the more they encourage you and before long you are getting really drunk and barely able to stand. Just then someone grabs you and drags you towards the boys locker room.'
 						minut += 5
-						alko += 5
-						cumspclnt = 2
-						gs 'cum_cleanup'
-						pcs_breath = 0
-						if pcs_hydra >= 100:
-							pcs_hydra -= 5
-						else
-							pcs_hydra -= 10
-						end
+						gs 'drugs', 'alcohol', 'vodka', 1
 						gs 'stat'
 
 						act 'Get dragged into the locker room': gt 'nyp_school', 'slut'
@@ -123,7 +115,7 @@ if $ARGS[0] = 'start':
 						'You shake your head no. "No thinks guys."'
 						'One of them snorts, while Dan says. "I don''t think you understand <<$pcs_nickname>> we wasn''t asking." You feel someone grab your hair and pull your head back. While Dan grabs your chin and forces your mouth open, while someone pours vodka into your mouth. You try to spit some out, but once your mouth is full, Dan forces your mouth closed. Then covers your mouth with his hand and pinches your nose closed, forcing you to swallow or drown. After several times of this, you are so drunk you can barely stand.'
 						minut += 10
-						alko += 5
+						gs 'drugs', 'alcohol', 'vodka', 1
 						gs 'stat'
 
 						act 'Get dragged into the locker room': gt 'nyp_school', 'slut'
@@ -131,17 +123,14 @@ if $ARGS[0] = 'start':
 				end
 			else
 				act 'Drink some juice':
-					!!This act just repeats the above until the players picks something else or their Sveta passes out from drinking to much.
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/punch.jpg"></center>'
 					'You grab one of the plastic cups and spoon out some of the spiked juice, having a drink it isn''t too bad. The juice covers up most of the taste of the vodka.'
 					minut += 5
-					pcs_hydra += 10
-					alko += 5 & !!need code for adding alcohol
+					gs 'drugs', 'alcohol', 'vodka', 1
 					gs 'stat'
 					act 'Drink some more':pcs_hydra += 10 & gt 'nyp_school', 'drink more'
 					if grupTipe = 5:
-						!!If Sveta is an outcast this should be the only option and the above options should not show up, if Sveta is an outcast. If Sveta is not an outcast then the go stand against the wall alone should not show up.
 						act 'Go stand against the wall alone':gt 'nyp_school', 'outcast'
 					else
 						act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'

locations/shulgakuh.qsrc

@@ -93,15 +93,7 @@ if $ARGS[0] = 'holodil':
 		act 'Drink a beer':
 			*clr & cla
 			minut += 5
-			alko += 1
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+			gs 'drugs', 'alcohol', 'beer', 1
 			beer_day = daystart
 			beer_count -= 1
 			gs 'stat'
@@ -117,15 +109,7 @@ if $ARGS[0] = 'holodil':
 		act 'Drink some vodka':
 			*clr & cla
 			minut += 1
-			alko +=2
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+			gs 'drugs', 'alcohol', 'vodka', 1
 			vodka_day = daystart
 			vodka_count -= 1
 			gs 'stat'
@@ -138,15 +122,7 @@ if $ARGS[0] = 'holodil':
 				if vodka_count = 0: '<font color = red>There''s no vodka left, you drank it all!</font><center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka0.jpg"></center>'
 				if vodka_count > 0:
 					minut += 1
-					alko +=2
-					if pcs_hydra >= 100:
-						pcs_hydra -= 5
-					else
-						pcs_hydra -= 10
-					end
-					cumspclnt = 2
-					gs 'cum_cleanup'
-					pcs_breath = 0
+					gs 'drugs', 'alcohol', 'vodka', 1
 					vodka_day = daystart
 					vodka_count -= 1
 					gs 'stat'

locations/sny.qsrc

@@ -21,15 +21,7 @@ if $ARGS[0] = '3':
 	act 'Drink':
 		*clr & cla
 		minut += 15
-		alko += 3
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
+		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
 		'You drink down the shot of vodka.'
@@ -57,15 +49,7 @@ if $ARGS[0] = '4':
 	act 'Drink':
 		*clr & cla
 		minut += 15
-		alko += 3
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
+		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
 		'You down the glass of vodka'
@@ -93,15 +77,7 @@ if $ARGS[0] = '5':
 	act 'Drink':
 		*clr & cla
 		minut += 15
-		alko += 3
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
+		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
 		'You drink down the shoot of vodka and feel it burn all the way down.'
@@ -129,15 +105,7 @@ if $ARGS[0] = '6':
 	act 'Drink':
 		*clr & cla
 		minut += 15
-		alko += 3
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
-		end
+		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
 		'You drink down the shoot of vodka and feel it burn all the way down.'
@@ -222,15 +190,7 @@ if $ARGS[0] = '7':
 		act 'drink':
 			*clr & cla
 			minut += 15
-			alko += 3
-			cumspclnt = 2
-			gs 'cum_cleanup'
-			pcs_breath = 0
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+			gs 'drugs', 'alcohol', 'vodka', 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
 			'You down the shoot of vodka and feel its warmth in your chest.'