Merge branch 'double_impact'

Conflicts:
	graphics/text/config.py
	lumps/fraggle/freedoom.bex
This commit is contained in:
RjY 2013-12-18 12:20:45 +00:00
commit 2aaad3eea8
31 changed files with 99 additions and 64 deletions

View file

@ -78,15 +78,15 @@ HUSTR_E3M6 = E3M6
HUSTR_E3M7 = E3M7
HUSTR_E3M8 = E3M8
HUSTR_E3M9 = E3M9
HUSTR_E4M1 = E4M1
HUSTR_E4M2 = E4M2
HUSTR_E4M3 = E4M3
HUSTR_E4M4 = E4M4
HUSTR_E4M5 = E4M5
HUSTR_E4M6 = E4M6
HUSTR_E4M7 = E4M7
HUSTR_E4M8 = E4M8
HUSTR_E4M9 = E4M9
HUSTR_E4M1 = E4M1: Maintenance Area
HUSTR_E4M2 = E4M2: Research Complex
HUSTR_E4M3 = E4M3: Central Computing
HUSTR_E4M4 = E4M4: Hydroponic Facility
HUSTR_E4M5 = E4M5: Engineering Station
HUSTR_E4M6 = E4M6: Command Center
HUSTR_E4M7 = E4M7: Waste Treatment
HUSTR_E4M8 = E4M8: Launch Bay
HUSTR_E4M9 = E4M9: Operations
CC_ZOMBIE = zombie
CC_SHOTGUN = shotgun zombie
CC_HEAVY = mini-gun zombie