Merge branch 'master' into release-10-kopout

Conflicts: raw/objects/body_gnorm.txt raw/objects/c_variation_gnorm.txt raw/objects/creature_aseaheru.txt raw/objects/creature_civilized_gnorm.txt raw/objects/creature_halfling.txt raw/objects/creature_kopout.txt raw/objects/creature_mega_putnam.txt raw/objects/creature_other_gnorm.txt raw/objects/creature_wild_putnam.txt raw/objects/entity_gnorm.txt raw/objects/inorganic_gnorm.txt raw/objects/interaction_gnorm.txt raw/objects/item_new_halfling.txt raw/objects/plant_gnorm.txt raw/objects/plant_kopout.txt raw/objects/reaction_gnorm.txt raw/objects/text/book_instruction_gnorm.txt raw/objects/text/secret_death_gnorm.txt
vyznev · Nov 21, 2013 · 1aa2688 · 1aa2688
2 parents 1a5e96f + 809f571
commit 1aa2688
Show file tree

Hide file tree

Showing 163 changed files with 851 additions and 295 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,14 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Auto detect text files and perform LF -> CRLF normalization
+* text=auto eol=crlf
+
+# These suffixes always denote text files
+*.txt text
+*.md text
+*.pl text
+
+# Always treat compressed data files as binary
+/data/announcement/*	binary -eol
+/data/dipscript/*	binary -eol
+/data/dipscript/text/*	binary -eol
+/data/help/*		binary -eol
+/data/index		binary -eol
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,5 @@
 # Ignore emacs-style backup / temp files
 *~
 .#*
-\#*#
+\#*#
+*.bak
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,50 @@ Change log
 _(Note: This change log is pieced together from notes posted alongside the original release archives. Some entries may be missing or incomplete.)_
 
 
+### Turn 9 (Gnorm)
+
+__Changes__
+
+* A new race - with its own buildings, weapons, armor, language, et cetera - called the "clockworkers"
+* Numerous edits and enhancements done the the daemonic cherubim
+* Now includes two subterranean civilizations: the gnomes and the little ones
+* 1 new plant type for the good regions
+* 9 new dishes to prepare in the kitchen
+* 1 new gem
+* Added the Lords of the Dead and their minions
+* 1 other new interaction
+* Unnecessary files removed
+* Adventure tiers corrected
+* Certain races now have [UNDEAD_CANDIDATE]
+* New wood template added
+* Removed hydra vigor and rock barrel reactions
+* Makeshift guns can now be formed out of plants
+* Adventurers now start with dirks
+* 4 new creatures for the evil regions
+* Talking bears added
+
+__Changes after bugfix turn__
+
+* New uncivilized creatures now have actual attacks
+* Several fixes from Github now in the official release
+* Daemonic Cherubim now have nenamed bucklers, as well as [SIEGER] and [AMBUSHER] tokens
+* Cognac grapes updated
+* Halfling mayors now have [LAW_MAKING], which should allow them to receive Treelord and Troll diplomats
+* Nosferatu now have no blood
+* More possible book titles
+* Speech file added for Cherubim
+* Wood gem interaction added for Halflings
+* Plant long guns can now be made only of tarnish stalk
+* Plant substance bug fixed
+* Formic regents fixed
+* Clockworker soldier tile bug fixed
+* Good weather fixed
+
+__Known Bugs__
+
+* Clockworkers cannot perform designations
+
+
 ### Turn 8 (Putnam)
 
 - Added a few secrets: nigh invulnerability, mastery, insect attacks and knowledge of the creation and metaphysics of the universe.

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ The DF from scratch project was created and is supervised by Halfling.  Raws hav
 * HugoLuman (HUGOL) (turn 5, turn 7bis bugfix release)
 * Zanzetkuken (ZTG) (turn 6)
 * Reemer30 (REM) (turn 7)
-* Gnorm
 * Putnam (turn 8)
+* Gnorm (turn 9)
 
 Dwarf Fortress is designed by Tarn and Zach Adams and is copyright (C) 2002–2012 by Tarn Adams.
diff --git a/data/speech/speech_angels_gnorm.txt b/data/speech/speech_angels_gnorm.txt
@@ -0,0 +1,15 @@
+Surrender your weapon, and I'll show you mercy!
+Surely you can do better than that, mortal!
+Armok commands you to submit!
+Your kind shall be eradicated!
+Hither fool! and face your death!
+Not even a miracle could save you from my attacks!
+Your blood shall rejuvenate my master!
+Your kind is weak! You have no chance of survival!
+Remember the war in Heaven! Remember the resistance!
+Those pitiful "gods" cannot help you!
+Where are those "gods" of yours?
+To Thee, Armok, I commend this blood!
+You monkeys don't even deserve to exist!
+Didn't those "gods" teach you anything?
+Have at you, scum!
diff --git a/data/speech/speeh_hound_hlg.txt → data/speech/speech_hound_hlg.txt b/data/speech/speeh_hound_hlg.txt → data/speech/speech_hound_hlg.txt
diff --git a/data_src/announcement/diplomatrebuffed → data_src/announcement/diplomatrebuffed.txt b/data_src/announcement/diplomatrebuffed → data_src/announcement/diplomatrebuffed.txt
diff --git a/data_src/announcement/end2 → data_src/announcement/end2.txt b/data_src/announcement/end2 → data_src/announcement/end2.txt
diff --git a/data_src/announcement/end3 → data_src/announcement/end3.txt b/data_src/announcement/end3 → data_src/announcement/end3.txt
diff --git a/data_src/announcement/end4 → data_src/announcement/end4.txt b/data_src/announcement/end4 → data_src/announcement/end4.txt
diff --git a/data_src/announcement/fortressintro → data_src/announcement/fortressintro.txt b/data_src/announcement/fortressintro → data_src/announcement/fortressintro.txt
diff --git a/data_src/announcement/hastyking → data_src/announcement/hastyking.txt b/data_src/announcement/hastyking → data_src/announcement/hastyking.txt
diff --git a/data_src/announcement/invasion_elves → data_src/announcement/invasion_elves.txt b/data_src/announcement/invasion_elves → data_src/announcement/invasion_elves.txt
diff --git a/data_src/announcement/invasion_goblin → data_src/announcement/invasion_goblin.txt b/data_src/announcement/invasion_goblin → data_src/announcement/invasion_goblin.txt
diff --git a/data_src/announcement/invasion_human → data_src/announcement/invasion_human.txt b/data_src/announcement/invasion_human → data_src/announcement/invasion_human.txt
diff --git a/data_src/announcement/kingarrival → data_src/announcement/kingarrival.txt b/data_src/announcement/kingarrival → data_src/announcement/kingarrival.txt
diff --git a/data_src/announcement/merchantexit → data_src/announcement/merchantexit.txt b/data_src/announcement/merchantexit → data_src/announcement/merchantexit.txt
diff --git a/data_src/announcement/merchantintro → data_src/announcement/merchantintro.txt b/data_src/announcement/merchantintro → data_src/announcement/merchantintro.txt
diff --git a/data_src/announcement/semiend → data_src/announcement/semiend.txt b/data_src/announcement/semiend → data_src/announcement/semiend.txt
diff --git a/data_src/dipscript/dwarf_liaison → data_src/dipscript/dwarf_liaison.txt b/data_src/dipscript/dwarf_liaison → data_src/dipscript/dwarf_liaison.txt
diff --git a/data_src/dipscript/elves_firstcontact → data_src/dipscript/elves_firstcontact.txt b/data_src/dipscript/elves_firstcontact → data_src/dipscript/elves_firstcontact.txt
diff --git a/data_src/dipscript/elves_standard → data_src/dipscript/elves_standard.txt b/data_src/dipscript/elves_standard → data_src/dipscript/elves_standard.txt
diff --git a/data_src/dipscript/human_standard → data_src/dipscript/human_standard.txt b/data_src/dipscript/human_standard → data_src/dipscript/human_standard.txt
diff --git a/data_src/dipscript/human_trade → data_src/dipscript/human_trade.txt b/data_src/dipscript/human_trade → data_src/dipscript/human_trade.txt
diff --git a/data_src/dipscript/text/dwarf_liaison1 → data_src/dipscript/text/dwarf_liaison1.txt b/data_src/dipscript/text/dwarf_liaison1 → data_src/dipscript/text/dwarf_liaison1.txt
diff --git a/data_src/dipscript/text/dwarf_liaison_bye → ..._src/dipscript/text/dwarf_liaison_bye.txt b/data_src/dipscript/text/dwarf_liaison_bye → ..._src/dipscript/text/dwarf_liaison_bye.txt
diff --git a/data_src/dipscript/text/elves_firstcontact1 → ...rc/dipscript/text/elves_firstcontact1.txt b/data_src/dipscript/text/elves_firstcontact1 → ...rc/dipscript/text/elves_firstcontact1.txt
diff --git a/data_src/dipscript/text/elves_firstcontact2 → ...rc/dipscript/text/elves_firstcontact2.txt b/data_src/dipscript/text/elves_firstcontact2 → ...rc/dipscript/text/elves_firstcontact2.txt
diff --git a/data_src/dipscript/text/elves_standard1 → data_src/dipscript/text/elves_standard1.txt b/data_src/dipscript/text/elves_standard1 → data_src/dipscript/text/elves_standard1.txt
diff --git a/data_src/dipscript/text/elves_standard_bye → ...src/dipscript/text/elves_standard_bye.txt b/data_src/dipscript/text/elves_standard_bye → ...src/dipscript/text/elves_standard_bye.txt
diff --git a/data_src/dipscript/text/human_standard1 → data_src/dipscript/text/human_standard1.txt b/data_src/dipscript/text/human_standard1 → data_src/dipscript/text/human_standard1.txt
diff --git a/data_src/dipscript/text/human_standard_bye → ...src/dipscript/text/human_standard_bye.txt b/data_src/dipscript/text/human_standard_bye → ...src/dipscript/text/human_standard_bye.txt
diff --git a/data_src/dipscript/text/human_trade1 → data_src/dipscript/text/human_trade1.txt b/data_src/dipscript/text/human_trade1 → data_src/dipscript/text/human_trade1.txt
diff --git a/data_src/dipscript/text/human_trade_bye → data_src/dipscript/text/human_trade_bye.txt b/data_src/dipscript/text/human_trade_bye → data_src/dipscript/text/human_trade_bye.txt
diff --git a/data_src/help/a_first → data_src/help/a_first.txt b/data_src/help/a_first → data_src/help/a_first.txt
diff --git a/data_src/help/a_icons → data_src/help/a_icons.txt b/data_src/help/a_icons → data_src/help/a_icons.txt
diff --git a/data_src/help/a_intro → data_src/help/a_intro.txt b/data_src/help/a_intro → data_src/help/a_intro.txt
diff --git a/data_src/help/a_keys → data_src/help/a_keys.txt b/data_src/help/a_keys → data_src/help/a_keys.txt
diff --git a/data_src/help/a_main → data_src/help/a_main.txt b/data_src/help/a_main → data_src/help/a_main.txt
diff --git a/data_src/help/accounts → data_src/help/accounts.txt b/data_src/help/accounts → data_src/help/accounts.txt
diff --git a/data_src/help/building_clutter → data_src/help/building_clutter.txt b/data_src/help/building_clutter → data_src/help/building_clutter.txt
diff --git a/data_src/help/crafts → data_src/help/crafts.txt b/data_src/help/crafts → data_src/help/crafts.txt
diff --git a/data_src/help/defense → data_src/help/defense.txt b/data_src/help/defense → data_src/help/defense.txt
diff --git a/data_src/help/food → data_src/help/food.txt b/data_src/help/food → data_src/help/food.txt
diff --git a/data_src/help/icons → data_src/help/icons.txt b/data_src/help/icons → data_src/help/icons.txt
diff --git a/data_src/help/icons_creature → data_src/help/icons_creature.txt b/data_src/help/icons_creature → data_src/help/icons_creature.txt
diff --git a/data_src/help/icons_dwarf → data_src/help/icons_dwarf.txt b/data_src/help/icons_dwarf → data_src/help/icons_dwarf.txt
diff --git a/data_src/help/icons_items → data_src/help/icons_items.txt b/data_src/help/icons_items → data_src/help/icons_items.txt
diff --git a/data_src/help/icons_terrain → data_src/help/icons_terrain.txt b/data_src/help/icons_terrain → data_src/help/icons_terrain.txt
diff --git a/data_src/help/intro → data_src/help/intro.txt b/data_src/help/intro → data_src/help/intro.txt
diff --git a/data_src/help/living_quarters → data_src/help/living_quarters.txt b/data_src/help/living_quarters → data_src/help/living_quarters.txt
diff --git a/data_src/help/machines → data_src/help/machines.txt b/data_src/help/machines → data_src/help/machines.txt
diff --git a/data_src/help/main → data_src/help/main.txt b/data_src/help/main → data_src/help/main.txt
diff --git a/data_src/help/menu_activity_zones → data_src/help/menu_activity_zones.txt b/data_src/help/menu_activity_zones → data_src/help/menu_activity_zones.txt
diff --git a/data_src/help/menu_builditem → data_src/help/menu_builditem.txt b/data_src/help/menu_builditem → data_src/help/menu_builditem.txt
diff --git a/data_src/help/menu_buildjob → data_src/help/menu_buildjob.txt b/data_src/help/menu_buildjob → data_src/help/menu_buildjob.txt
diff --git a/data_src/help/menu_buildjob_animaltrap → data_src/help/menu_buildjob_animaltrap.txt b/data_src/help/menu_buildjob_animaltrap → data_src/help/menu_buildjob_animaltrap.txt
diff --git a/data_src/help/menu_buildjob_depot → data_src/help/menu_buildjob_depot.txt b/data_src/help/menu_buildjob_depot → data_src/help/menu_buildjob_depot.txt
diff --git a/data_src/help/menu_buildjob_door → data_src/help/menu_buildjob_door.txt b/data_src/help/menu_buildjob_door → data_src/help/menu_buildjob_door.txt
diff --git a/data_src/help/menu_buildjob_farmplot → data_src/help/menu_buildjob_farmplot.txt b/data_src/help/menu_buildjob_farmplot → data_src/help/menu_buildjob_farmplot.txt
diff --git a/data_src/help/menu_buildjob_lever → data_src/help/menu_buildjob_lever.txt b/data_src/help/menu_buildjob_lever → data_src/help/menu_buildjob_lever.txt
diff --git a/data_src/help/menu_buildjob_shop → data_src/help/menu_buildjob_shop.txt b/data_src/help/menu_buildjob_shop → data_src/help/menu_buildjob_shop.txt
diff --git a/data_src/help/menu_buildjob_siege → data_src/help/menu_buildjob_siege.txt b/data_src/help/menu_buildjob_siege → data_src/help/menu_buildjob_siege.txt
diff --git a/data_src/help/menu_buildjob_stockpile → data_src/help/menu_buildjob_stockpile.txt b/data_src/help/menu_buildjob_stockpile → data_src/help/menu_buildjob_stockpile.txt
diff --git a/data_src/help/menu_civlist → data_src/help/menu_civlist.txt b/data_src/help/menu_civlist → data_src/help/menu_civlist.txt
diff --git a/data_src/help/menu_designations → data_src/help/menu_designations.txt b/data_src/help/menu_designations → data_src/help/menu_designations.txt
diff --git a/data_src/help/menu_jobunitlist → data_src/help/menu_jobunitlist.txt b/data_src/help/menu_jobunitlist → data_src/help/menu_jobunitlist.txt
diff --git a/data_src/help/menu_look → data_src/help/menu_look.txt b/data_src/help/menu_look → data_src/help/menu_look.txt
diff --git a/data_src/help/menu_make_buildings → data_src/help/menu_make_buildings.txt b/data_src/help/menu_make_buildings → data_src/help/menu_make_buildings.txt
diff --git a/data_src/help/menu_manager → data_src/help/menu_manager.txt b/data_src/help/menu_manager → data_src/help/menu_manager.txt
diff --git a/data_src/help/menu_military → data_src/help/menu_military.txt b/data_src/help/menu_military → data_src/help/menu_military.txt
diff --git a/data_src/help/menu_nobles → data_src/help/menu_nobles.txt b/data_src/help/menu_nobles → data_src/help/menu_nobles.txt
diff --git a/data_src/help/menu_orders → data_src/help/menu_orders.txt b/data_src/help/menu_orders → data_src/help/menu_orders.txt
diff --git a/data_src/help/menu_professions → data_src/help/menu_professions.txt b/data_src/help/menu_professions → data_src/help/menu_professions.txt
diff --git a/data_src/help/menu_roomlist → data_src/help/menu_roomlist.txt b/data_src/help/menu_roomlist → data_src/help/menu_roomlist.txt
diff --git a/data_src/help/menu_rooms → data_src/help/menu_rooms.txt b/data_src/help/menu_rooms → data_src/help/menu_rooms.txt
diff --git a/data_src/help/menu_squads → data_src/help/menu_squads.txt b/data_src/help/menu_squads → data_src/help/menu_squads.txt
diff --git a/data_src/help/menu_status → data_src/help/menu_status.txt b/data_src/help/menu_status → data_src/help/menu_status.txt
diff --git a/data_src/help/menu_status_animals → data_src/help/menu_status_animals.txt b/data_src/help/menu_status_animals → data_src/help/menu_status_animals.txt
diff --git a/data_src/help/menu_status_currency → data_src/help/menu_status_currency.txt b/data_src/help/menu_status_currency → data_src/help/menu_status_currency.txt
diff --git a/data_src/help/menu_status_justice → data_src/help/menu_status_justice.txt b/data_src/help/menu_status_justice → data_src/help/menu_status_justice.txt
diff --git a/data_src/help/menu_status_kitchen → data_src/help/menu_status_kitchen.txt b/data_src/help/menu_status_kitchen → data_src/help/menu_status_kitchen.txt
diff --git a/data_src/help/menu_status_prices → data_src/help/menu_status_prices.txt b/data_src/help/menu_status_prices → data_src/help/menu_status_prices.txt
diff --git a/data_src/help/menu_status_stocks → data_src/help/menu_status_stocks.txt b/data_src/help/menu_status_stocks → data_src/help/menu_status_stocks.txt
diff --git a/data_src/help/menu_status_stone → data_src/help/menu_status_stone.txt b/data_src/help/menu_status_stone → data_src/help/menu_status_stone.txt
diff --git a/data_src/help/menu_stockpiles → data_src/help/menu_stockpiles.txt b/data_src/help/menu_stockpiles → data_src/help/menu_stockpiles.txt
diff --git a/data_src/help/menu_viewunit → data_src/help/menu_viewunit.txt b/data_src/help/menu_viewunit → data_src/help/menu_viewunit.txt
diff --git a/data_src/help/menu_wages → data_src/help/menu_wages.txt b/data_src/help/menu_wages → data_src/help/menu_wages.txt
diff --git a/data_src/help/menus → data_src/help/menus.txt b/data_src/help/menus → data_src/help/menus.txt
diff --git a/data_src/help/mining → data_src/help/mining.txt b/data_src/help/mining → data_src/help/mining.txt
diff --git a/data_src/help/new_region → data_src/help/new_region.txt b/data_src/help/new_region → data_src/help/new_region.txt
diff --git a/data_src/help/outpost → data_src/help/outpost.txt b/data_src/help/outpost → data_src/help/outpost.txt
diff --git a/data_src/help/practice → data_src/help/practice.txt b/data_src/help/practice → data_src/help/practice.txt
diff --git a/data_src/help/r_intro → data_src/help/r_intro.txt b/data_src/help/r_intro → data_src/help/r_intro.txt
diff --git a/data_src/help/r_main → data_src/help/r_main.txt b/data_src/help/r_main → data_src/help/r_main.txt
diff --git a/data_src/help/setup_game → data_src/help/setup_game.txt b/data_src/help/setup_game → data_src/help/setup_game.txt
diff --git a/data_src/help/storage → data_src/help/storage.txt b/data_src/help/storage → data_src/help/storage.txt
diff --git a/data_src/help/table_item_designations → data_src/help/table_item_designations.txt b/data_src/help/table_item_designations → data_src/help/table_item_designations.txt
diff --git a/data_src/help/tables → data_src/help/tables.txt b/data_src/help/tables → data_src/help/tables.txt
diff --git a/data_src/help/technical → data_src/help/technical.txt b/data_src/help/technical → data_src/help/technical.txt
diff --git a/data_src/help/text_viewer → data_src/help/text_viewer.txt b/data_src/help/text_viewer → data_src/help/text_viewer.txt
diff --git a/data_src/help/text_viewer2 → data_src/help/text_viewer2.txt b/data_src/help/text_viewer2 → data_src/help/text_viewer2.txt
diff --git a/data_src/help/text_viewer3 → data_src/help/text_viewer3.txt b/data_src/help/text_viewer3 → data_src/help/text_viewer3.txt
diff --git a/data_src/help/trading → data_src/help/trading.txt b/data_src/help/trading → data_src/help/trading.txt
diff --git a/data_src/help/unit_profile → data_src/help/unit_profile.txt b/data_src/help/unit_profile → data_src/help/unit_profile.txt
diff --git a/data_src/help/water → data_src/help/water.txt b/data_src/help/water → data_src/help/water.txt
diff --git a/data_src/help/wood → data_src/help/wood.txt b/data_src/help/wood → data_src/help/wood.txt
diff --git a/raw/objects/body_gnorm.txt b/raw/objects/body_gnorm.txt
@@ -90,7 +90,7 @@ body_gnorm
 		[DEFAULT_RELSIZE:150]
 	[BP:RS:right stump:STP][CON:RL][RIGHT][STANCE][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:75]
-	[BP:LS:leftt stump:STP][CON:LL][LEFT][STANCE][CATEGORY:LEG]
+	[BP:LS:left stump:STP][CON:LL][LEFT][STANCE][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:75]
 	[BP:FM:first mouth:STP][CON:HD][MOUTH][SMALL][APERTURE][CATEGORY:MOUTH]
 		[DEFAULT_RELSIZE:50]
@@ -122,7 +122,7 @@ body_gnorm
 [BODY:EYES]
 	[BP:REYE:right eye:STP][CON:FE][RIGHT][SIGHT][CATEGORY:EYE]
 		[DEFAULT_RELSIZE:30]
-	[BP:LEYE:leftt eye:STP][CON:FE][LEFT][SIGHT][CATEGORY:EYE]
+	[BP:LEYE:left eye:STP][CON:FE][LEFT][SIGHT][CATEGORY:EYE]
 		[DEFAULT_RELSIZE:30]
 
 [BODY:EXTERNAL_GEARS]

diff --git a/raw/objects/body_insects_STL.txt b/raw/objects/body_insects_STL.txt
@@ -11,27 +11,27 @@ body_insects_STL
 		[DEFAULT_RELSIZE:300]
 	[BP:RA1:right foreleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:RF1:right front tarsus:right tarsuses][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF1:right front tarsus:right front tarsi][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:RA2:right midleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:RF2:right middle tarsus:right tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF2:right middle tarsus:right middle tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:RA3:right hindleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:RF3:right hind tarsus:right tarsuses][CON:RA3][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF3:right hind tarsus:right hind tarsi][CON:RA3][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:LA1:left foreleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:LF1:left front tarsus:left tarsuses][CON:LA1][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF1:left front tarsus:left front tarsi][CON:LA1][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:LA2:left midleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:LF2:left middle tarsus:left tarsuses][CON:LA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF2:left middle tarsus:left middle tarsi][CON:LA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:LA3:left hindleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:LF3:left hind tarsus:left tarsuses][CON:LA3][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF3:left hind tarsus:left hind tarsi][CON:LA3][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 
 [BODY:WORMY_BODY_STL]
@@ -119,33 +119,33 @@ body_insects_STL
 		[DEFAULT_RELSIZE:350]
 	[BP:RA1:right foreleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:RF1:right front tarsus:right tarsuses][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF1:right front tarsus:right front tarsi][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:RA2:right midleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:RF2:right middle tarsus:right tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF2:right middle tarsus:right middle tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:RA3:right hindleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:RF3:right hind tarsus:right tarsuses][CON:RA3][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF3:right hind tarsus:right hind tarsi][CON:RA3][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:LA1:left foreleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:LF1:left front tarsus:left tarsuses][CON:LA1][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF1:left front tarsus:left front tarsi][CON:LA1][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:LA2:left midleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:LF2:left middle tarsus:left tarsuses][CON:LA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF2:left middle tarsus:left middle tarsi][CON:LA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 	[BP:LA3:left hindleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:150]
-	[BP:LF3:left hind tarsus:left tarsuses][CON:LA3][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF3:left hind tarsus:left hind tarsi][CON:LA3][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:100]
 
 [BODY:SEA_SCORPION_BASE_STL]
-	[BP:UB:opisthosoma:STP][UPPERBODY][LOWERBODY][CATEGORY:BODY_UPPER]
+	[BP:UB:opisthosoma:opisthosomata][UPPERBODY][LOWERBODY][CATEGORY:BODY_UPPER]
 		[DEFAULT_RELSIZE:300]
-	[BP:HD:prosoma:STP][HEAD][CATEGORY:HEAD]
+	[BP:HD:prosoma:prosomata][HEAD][CATEGORY:HEAD]
 		[DEFAULT_RELSIZE:200]
 	[BP:TAIL:tail:STP][CON:UB][CATEGORY:TAIL]
 		[DEFAULT_RELSIZE:250]
@@ -190,19 +190,19 @@ body_insects_STL
 		[DEFAULT_RELSIZE:400]
 	[BP:RA1:right foreleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF1:right front tarsus:right tarsuses][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF1:right front tarsus:right front tarsi][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:RA2:right midleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF2:right middle tarsus:right tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF2:right middle tarsus:right middle tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA1:left foreleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF1:left front tarsus:left tarsuses][CON:RA1][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF1:left front tarsus:left front tarsi][CON:RA1][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA2:left midleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF2:left middle tarsus:left tarsuses][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF2:left middle tarsus:left middle tarsi][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 
 [BODY:BASIC_ARACHNID_STL]
@@ -212,35 +212,35 @@ body_insects_STL
 		[DEFAULT_RELSIZE:400]
 	[BP:RA1:right foreleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF1:right front tarsus:right tarsuses][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF1:right front tarsus:right front tarsi][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:RA2:right midleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF2:right middle tarsus:right tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF2:right middle tarsus:right middle tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:RA3:right second midleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF3:right posterior tarsus:left tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF3:right posterior tarsus:right posterior tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:RA4:right hindleg:STP][CON:UB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF4:right hind tarsus:left tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF4:right hind tarsus:right hind tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA1:left foreleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF1:left front tarsus:left tarsuses][CON:RA1][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF1:left front tarsus:left front tarsi][CON:RA1][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA2:left first midleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF2:left anterior tarsus:left tarsuses][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF2:left anterior tarsus:left anterior tarsi][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA3:left second midleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF3:left posterior tarsus:left tarsuses][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF3:left posterior tarsus:left posterior tarsi][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA4:left hindleg:STP][CON:UB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF4:left hind tarsus:left tarsuses][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF4:left hind tarsus:left hind tarsi][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 
 [BODY:SPIDER_CENTAUR_STL]
@@ -278,35 +278,35 @@ body_insects_STL
 		[DEFAULT_RELSIZE:400]
 	[BP:RA1:right foreleg:STP][CON:LB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF1:right front tarsus:right tarsuses][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF1:right front tarsus:right front tarsi][CON:RA1][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:RA2:right midleg:STP][CON:LB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF2:right middle tarsus:right tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF2:right middle tarsus:right middle tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:RA3:right second midleg:STP][CON:LB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF3:right posterior tarsus:left tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF3:right posterior tarsus:right posterior tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:RA4:right hindleg:STP][CON:LB][LIMB][RIGHT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:RF4:right hind tarsus:left tarsuses][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
+	[BP:RF4:right hind tarsus:right hind tarsi][CON:RA2][STANCE][RIGHT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA1:left foreleg:STP][CON:LB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF1:left front tarsus:left tarsuses][CON:RA1][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF1:left front tarsus:left front tarsi][CON:RA1][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA2:left first midleg:STP][CON:LB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF2:left anterior tarsus:left tarsuses][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF2:left anterior tarsus:left anterior tarsi][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA3:left second midleg:STP][CON:LB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF3:left posterior tarsus:left tarsuses][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF3:left posterior tarsus:left posterior tarsi][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 	[BP:LA4:left hindleg:STP][CON:LB][LIMB][LEFT][CATEGORY:LEG]
 		[DEFAULT_RELSIZE:200]
-	[BP:LF4:left hind tarsus:left tarsuses][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
+	[BP:LF4:left hind tarsus:left hind tarsi][CON:RA2][STANCE][LEFT][CATEGORY:FOOT]
 		[DEFAULT_RELSIZE:150]
 
 [BODY:MANDIBLES_STL] Om nom nom
@@ -318,23 +318,23 @@ body_insects_STL
 		[DEFAULT_RELSIZE:100]
 
 [BODY:PROBOSCIS_STL] SLURPETY SLURP BITCHES
-	[BP:PROBOSCIS:proboscis:STP][CONTYPE:HEAD][CATEGORY:PROBOSCIS][MOUTH]
+	[BP:PROBOSCIS:proboscis:proboscides][CONTYPE:HEAD][CATEGORY:PROBOSCIS][MOUTH]
 		[DEFAULT_RELSIZE:100]
 
 [BODY:ANTENNAE_STL] Can't feel someone up without feelers
-	[BP:R_ANTENNAE:right antenna:STP][CONTYPE:HEAD][RIGHT][SMELL][CATEGORY:ANTENNA]
+	[BP:R_ANTENNAE:right antenna:right antennae][CONTYPE:HEAD][RIGHT][SMELL][CATEGORY:ANTENNA]
 		[DEFAULT_RELSIZE:150]
-	[BP:L_ANTENNAE:left antenna:STP][CONTYPE:HEAD][LEFT][SMELL][CATEGORY:ANTENNA]
+	[BP:L_ANTENNAE:left antenna:left antennae][CONTYPE:HEAD][LEFT][SMELL][CATEGORY:ANTENNA]
 		[DEFAULT_RELSIZE:150]
 
 [BODY:ANT_TENNAE_STL] jointed ant antennae
-	[BP:LR_ANTENNAE:right lower antenna:STP][CONTYPE:HEAD][RIGHT][CATEGORY:LOWER_ANTENNA]
+	[BP:LR_ANTENNAE:right lower antenna:right lower antennae][CONTYPE:HEAD][RIGHT][CATEGORY:LOWER_ANTENNA]
 		[DEFAULT_RELSIZE:50]
-	[BP:LL_ANTENNAE:left lower antenna:STP][CONTYPE:HEAD][LEFT][CATEGORY:LOWER_ANTENNA]
+	[BP:LL_ANTENNAE:left lower antenna:left lower antennae][CONTYPE:HEAD][LEFT][CATEGORY:LOWER_ANTENNA]
 		[DEFAULT_RELSIZE:50]
-	[BP:UR_ANTENNAE:right upper antenna:STP][CON:LR_ANTENNAE][RIGHT][SMELL][CATEGORY:UPPER_ANTENNA]
+	[BP:UR_ANTENNAE:right upper antenna:right upper antennae][CON:LR_ANTENNAE][RIGHT][SMELL][CATEGORY:UPPER_ANTENNA]
 		[DEFAULT_RELSIZE:100]
-	[BP:UL_ANTENNAE:left upper antenna:STP][CON:LL_ANTENNAE][LEFT][SMELL][CATEGORY:UPPER_ANTENNA]
+	[BP:UL_ANTENNAE:left upper antenna:left upper antennae][CON:LL_ANTENNAE][LEFT][SMELL][CATEGORY:UPPER_ANTENNA]
 		[DEFAULT_RELSIZE:100]
 
 [BODY:WINGS_STL] BZZ BZZ
@@ -354,9 +354,9 @@ body_insects_STL
 		[DEFAULT_RELSIZE:250]
 
 [BODY:BEETLE_WINGS_STL] BZZ BZZ BEETLE
-	[BP:RIGHT_ELYTRA:right elytra:STP][CONTYPE:UPPERBODY][FLIER][RIGHT][CATEGORY:ELYTRA]
+	[BP:RIGHT_ELYTRA:right elytron:right elytra][CONTYPE:UPPERBODY][FLIER][RIGHT][CATEGORY:ELYTRA]
 		[DEFAULT_RELSIZE:170]
-	[BP:LEFT_ELYTRA:left elytra:STP][CONTYPE:UPPERBODY][FLIER][LEFT][CATEGORY:ELYTRA]
+	[BP:LEFT_ELYTRA:left elytron:left elytra][CONTYPE:UPPERBODY][FLIER][LEFT][CATEGORY:ELYTRA]
 		[DEFAULT_RELSIZE:170]
 	[BP:RIGHT_WING:right wing:STP][CONTYPE:UPPERBODY][FLIER][RIGHT][CATEGORY:WINGS]
 		[DEFAULT_RELSIZE:150]
@@ -411,4 +411,4 @@ body_insects_STL
 
 ##Bodyglosses, to make bugs shinier##
 
-[BODYGLOSS:CHELICERAE_STL:mandibles:chelicerae:mandibles:chelicerae]
+[BODYGLOSS:CHELICERAE_STL:mandibles:chelicerae:mandibles:chelicerae]
diff --git a/raw/objects/body_simple_halfling.txt b/raw/objects/body_simple_halfling.txt
@@ -121,7 +121,7 @@ body_simple_halfling
 
 	[BP:LARM:left arm:STP][CON:TORSO][LIMB][LEFT][CATEGORY:ARM]
 		[DEFAULT_RELSIZE:200]
-	[BP:LELBOW:right elbow:STP][CON:LARM][JOINT][LEFT][SMALL][CATEGORY:ELBOW]
+	[BP:LELBOW:left elbow:STP][CON:LARM][JOINT][LEFT][SMALL][CATEGORY:ELBOW]
 		[DEFAULT_RELSIZE:100]
 	[BP:LFARM:left forearm:STP][CON:LELBOW][LIMB][LEFT][CATEGORY:FOREARM]
 		[DEFAULT_RELSIZE:200]

diff --git a/raw/objects/c_variation_SKH.txt b/raw/objects/c_variation_SKH.txt
@@ -6,7 +6,7 @@ c_variation_SKH
 [CREATURE_VARIATION:OLI_SKH]
 [CV_NEW_TAG:ATTACK:STOMP:BODYPART:BY_TYPE:STANCE]
 		[CV_NEW_TAG:ATTACK_SKILL:STANCE_STRIKE]
-		[CV_NEW_TAG:ATTACK_VERB:strike:stikes]
+		[CV_NEW_TAG:ATTACK_VERB:strike:strikes]
 		[CV_NEW_TAG:ATTACK_CONTACT_PERC:100]
 		[CV_NEW_TAG:ATTACK_PRIORITY:SECOND]
 		[CV_NEW_TAG:ATTACK_FLAG_WITH]

diff --git a/raw/objects/c_variation_gnorm.txt b/raw/objects/c_variation_gnorm.txt
@@ -6,4 +6,16 @@ c_variation_gnorm
 	[CV_NEW_TAG:SET_TL_GROUP:BY_CATEGORY:HEAD:HAIR]	
 	[CV_NEW_TAG:TISSUE_LAYER_APPEARANCE_MODIFIER:LENGTH:60:65:70:75:80:85:90]
 		[CV_NEW_TAG:APP_MOD_NOUN:beard:SINGULAR]
-		[CV_NEW_TAG:APP_MOD_IMPORTANCE:2000]
+		[CV_NEW_TAG:APP_MOD_IMPORTANCE:2000]
+
+[CREATURE_VARIATION:ANGEL_MOCK_GNORM]
+	[CV_NEW_TAG:CAN_DO_INTERACTION:VOCALIZATION_HLG]
+		[CV_NEW_TAG:CDI:USAGE_HINT:ATTACK]
+		[CV_NEW_TAG:CDI:ADV_NAME:mock thy enemy!]
+		[CV_NEW_TAG:CDI:FREE_ACTION]
+		[CV_NEW_TAG:CDI:BP_REQUIRED:BY_CATEGORY:MOUTH]
+		[CV_NEW_TAG:CDI:TARGET:A:LINE_OF_SIGHT]
+		[CV_NEW_TAG:CDI:TARGET_RANGE:A:15]
+		[CV_NEW_TAG:CDI:MAX_TARGET_NUMBER:A:1]
+		[CV_NEW_TAG:CDI:WAIT_PERIOD:600]
+		[CV_NEW_TAG:CDI:VERBAL_SPEECH:speech_angels_gnorm.txt]