Merge pull request #38 from Zarkonnen/laser_rifle_fix

Laser rifles are now listed as weapons, fixing issue #37.
This commit is contained in:
Michael Townsend
2013-07-15 08:40:29 -07:00
+8
View File
@@ -423,6 +423,12 @@ var Room = {
}
},
MiscItems: {
'laser rifle': {
type: 'weapon'
}
},
name: "Room",
init: function(options) {
this.options = $.extend(
@@ -733,6 +739,8 @@ var Room = {
type = Room.Craftables[k].type;
} else if(Room.TradeGoods[k]) {
type = Room.TradeGoods[k].type;
} else if (Room.MiscItems[k]) {
type = Room.MiscItems[k].type;
}
var location;