GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-05-30 01:02:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	script/engine.js
	script/localization.js
This commit is contained in:
Travis Weston
2014-07-13 12:52:29 -04:00
parent 42ed1cea1f 4f82e33f7c
commit d351e4c815
13 changed files with 6188 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/outside.js
+1 -1
View File
@@ -416,7 +416,7 @@ var Outside = {
}
}
population.text('pop ' + $SM.get('game.population') + '/' + this.getMaxPopulation());
population.text(_('pop ') + $SM.get('game.population') + '/' + this.getMaxPopulation());
var hasPeeps;
if($SM.get('game.buildings["hut"]', true) == 0) {