Merge remote-tracking branch 'upstream/dev' into PAP

Fixes #6844.

code/modules/research/xenoarchaeology/areas.dm

@@ -5,7 +5,7 @@
 
 /area/research_outpost/hallway
 	name = "Research Outpost Hallway"
-	icon_state = "hallC"
+	icon_state = "anohallway"
 
 /area/research_outpost/gearstore
 	name = "Expedition Preparation"
@@ -69,7 +69,7 @@
 
 /area/research_outpost/entry
 	name = "Research Outpost Shuttle Dock"
-	icon_state = "entry"
+	icon_state = "anoentry"
 
 /area/research_outpost/longtermstorage
 	name = "Long-Term Storage"

code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm

@@ -12,7 +12,7 @@
 	speed = 2
 	melee_damage_lower = 5
 	melee_damage_upper = 15
-	attacktext = "mauls"
+	attacktext = "mauled"
 	cold_damage_per_tick = 0
 	speak_chance = 5
 	speak = list("Hruuugh!","Hrunnph")
@@ -33,7 +33,7 @@
 	speed = 1
 	melee_damage_lower = 1
 	melee_damage_upper = 8
-	attacktext = "gouges"
+	attacktext = "gouged"
 	cold_damage_per_tick = 0
 	speak_chance = 5
 	speak = list("Awrr?","Aowrl!","Worrl")
@@ -54,7 +54,7 @@
 	speed = 1
 	melee_damage_lower = 3
 	melee_damage_upper = 12
-	attacktext = "gouges"
+	attacktext = "gouged"
 	cold_damage_per_tick = 0
 	speak_chance = 5
 	speak = list("Shuhn","Shrunnph?","Shunpf")