Merge remote-tracking branch 'Hooded_Silence/master'

# Conflicts:
#	locations/npcstatic1.qsrc
#	locations/npcstatic3.qsrc
#	locations/npcstatic4.qsrc

locations/npcstatic5.qsrc

@@ -316,7 +316,7 @@ npc_sexskill['A<<npctemp>>'] = 2
 
 
 npctemp = 215
-$npc_dna['A<<npctemp>>'] = '1841305338 1934557807 2127062159 2015882090 2056884118 1132783555 1576490435'
+$npc_dna['A<<npctemp>>'] = '1841305338 1934557807 2127062159 2015882090 2056884118 1132783555 1576490435' 
 $npc_firstname['A<<npctemp>>'] = 'Alisa'
 $npc_nickname['A<<npctemp>>'] = 'Alisa'
 $npc_lastname['A<<npctemp>>'] = 'Alexandrov'
@@ -649,7 +649,7 @@ npc_spermpot['A<<npctemp>>'] = 8500
 
 
 npctemp = 232
-$npc_dna['A<<npctemp>>'] = '7845565703 9732666365 5079835231 4099096300 1653287931 7271394997 0865417545'
+$npc_dna['A<<npctemp>>'] = '7845565703 9732666365 5079835231 4099096300 1653287931 7271394997 0865417545' 
 $npc_firstname['A<<npctemp>>'] = 'Gala'
 $npc_nickname['A<<npctemp>>'] = 'Gala'
 $npc_lastname['A<<npctemp>>'] = 'Polyakov'
@@ -704,7 +704,7 @@ npc_bust['A<<npctemp>>'] = 35
 
 
 npctemp = 235
-$npc_dna['A<<npctemp>>'] = '1659877224 0446724555 3103627999 3833951928 1497696794 6407426024 1077931925'
+$npc_dna['A<<npctemp>>'] = '1659877224 0446724555 3103627999 3833951928 1497696794 6407426024 1077931925' 
 $npc_firstname['A<<npctemp>>'] = 'Juliana'
 $npc_nickname['A<<npctemp>>'] = 'Julia'
 $npc_lastname['A<<npctemp>>'] = 'Slavenka'
@@ -743,7 +743,7 @@ npc_sexskill['A<<npctemp>>'] = 2
 
 
 npctemp = 237
-$npc_dna['A<<npctemp>>'] = '0395612421 7689521188 7574391125 3952549504 1777153600 5788079489 6391170185'
+$npc_dna['A<<npctemp>>'] = '0395612421 7689521188 7574391125 3952549504 1777153600 5788079489 6391170185' 
 $npc_firstname['A<<npctemp>>'] = 'Aliana'
 $npc_nickname['A<<npctemp>>'] = 'Alli'
 $npc_lastname['A<<npctemp>>'] = 'Smirnova'
@@ -831,7 +831,7 @@ $npc_body['A<<npctemp>>'] = 's3'
 
 npctemp = 241
 !! Missing npc_dob
-$npc_dna['A<<npctemp>>'] = '3849823959 9265257275 0692991116 4439206638 9610596560 1214701298 1760538714'
+$npc_dna['A<<npctemp>>'] = '3849823959 9265257275 0692991116 4439206638 9610596560 1214701298 1760538714' 
 $npc_firstname['A<<npctemp>>'] = 'Alexandria'
 $npc_nickname['A<<npctemp>>'] = 'Alex'
 $npc_lastname['A<<npctemp>>'] = 'Line'