Merge remote-tracking branch 'Hooded_Silence/release'

locations/bedr.qsrc

@@ -1,21 +1,15 @@
 # bedr
-
-CLOSE ALL
 *clr & cla
-$loc = 'bedr'
-$loc_arg = ''
-$locM = 'bedr'
-$locM_arg = ''
-$menu_loc = 'bedr'
-$menu_arg = ''
 menu_off = 0
+minut += 1
+elektro += 1
+gs 'shortgs', 'setloc', 'bedr', $ARGS[0]
 $locclass = 'bedr'
 $location_type = 'private'
+gs 'themes', 'indoors'
 
-minut += 1
-elektro += 1
 gs 'stat'
-gs 'themes', 'indoors'
+
 
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 
@@ -226,7 +220,7 @@ end
 gs 'subkid'
 
 act 'Relax on your bed': gt 'bed', 'start'
-
+act 'Open wardrobe': gt 'wardrobe', 'start'
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
 gs 'music_actions', 'music_icon'
 --- bedr ---------------------------------

locations/bedrPar.qsrc

@@ -1,20 +1,16 @@
 # bedrPar
 
-CLOSE ALL
 *clr & cla
 fromoutside = iif($loc = 'bedrPar',0,1)
-$loc = 'bedrPar'
-$loc_arg = ''
-$location_type = 'private'
-$locclass = 'bedr'
-$menu_loc = 'bedrPar'
-$menu_arg = ''
 menu_off = 0
 minut += 1
 !!day check so mom doesn''t think you have been out all night if you get up very early 
 motherworry[1] = daystart
-gs 'stat'
+gs 'shortgs', 'setloc', 'bedrPar', $ARGS[0]
+$location_type = 'private'
+$locclass = 'bedr'
 gs 'themes', 'indoors'
+gs 'stat'
 gs 'family_schedule'
 
 !! This is runs only once, just to make sure that Sveta can sing from the start, does not have to wait a whole day for `cikl` to run.

locations/crossfit_north_box.qsrc

@@ -1,15 +1,9 @@
 # crossfit_north_box
-
-$loc = 'crossfit_north_box'
-$locM = 'crossfit_north_box'
+menu_off = 0
+gs 'shortgs', 'setloc', 'crossfit_north_box', $ARGS[0]
 $sexloc = 'crossfit_north_box'
 $location_type = 'public_indoors'
-$loc_arg = 'box'
-$locM_arg = 'box'
 $crossfit_north_image_dir = 'images/locations/city/citycenter/gym/crossfit/'
-$menu_loc = 'crossfit_north_box'
-$menu_arg = 'box'
-menu_off = 0
 
 if $ARGS[0] = 'box':
 	

locations/fit.qsrc

@@ -1,6 +1,5 @@
 # fit
 
-CLOSE ALL
 if $ARGS[0] = 'start':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'fit', $ARGS[0]