Merge remote-tracking branch 'julzor/master'

locations/cikl.qsrc

@@ -631,19 +631,20 @@ elseif preg = 2 and pregminut < totminut:
 		pregminut = totminut + 1440
 	end
 elseif preg = 0:
-	KILLVAR 'npc_pregtalk[''A34'']'
-	KILLVAR 'npc_pregtalk[''A33'']'
-	KILLVAR 'npc_pregtalk[''A28'']'
-	!{KILLVAR 'pregTalkFamily' -- Do not kill this (Abortion talk).}
-	KILLVAR 'npc_pregtalk[''A29'']'
-	KILLVAR 'pregTalk'
-	KILLVAR 'npc_pregtalk[''A16'']'
-	KILLVAR 'npc_pregtalk[''A14'']'
-	KILLVAR 'pcs_pregtalk'
-	KILLVAR 'npc_pregtalk[''A69'']'
-	KILLVAR 'npc_pregtalk[''A131'']'
-	killvar 'npc_pregtalk[''A23'']'
-	killvar 'npc_pregtalk[''A69'']'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A14'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A16'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A23'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A28'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A29'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A33'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A34'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A69'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A131'
+
+	!{killvar 'pregTalkFamily' -- Do not kill this (Abortion talk).}
+
+	killvar 'pcs_pregtalk'
+	killvar 'pregTalk'
 	killvar 'pregtime'
 	killvar 'knowpreg'
 	killvar 'denypreg'