dannno
2474e84299
REALLY FIXED THIS TIME LOL
2015-02-27 15:59:50 -05:00
dannno
027eccedbc
conflicts fixed
2015-02-27 14:01:42 -05:00
Mandurrrh
d2f44872aa
Adds emp, emag, and repairs for barsign.
2015-02-27 12:01:09 -05:00
dannno
9b1fa2479b
conflict fixing + changelog
2015-02-26 16:48:11 -05:00
dannno
23ecfeebf8
THE OWL RETURNS: PART 4: PRODUCT PLACEMENT
...
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
2015-02-26 16:36:44 -05:00
MrStonedOne
33d0507c8d
Suggested changes to graytide sign's desc wording
2015-02-25 08:10:42 -08:00
MrStonedOne
48ce33f3cb
Revert "Removes grey tide barsign"
2015-02-24 23:04:16 -08:00
paprka
830b57afd5
removes grey tide barsign
2015-02-24 15:32:58 -08:00
Mandurrrh
df57ea312b
add singulo description
2015-02-20 12:56:11 -05:00
Mandurrrh
1301fdd9ab
Fixes maps, adds emp barsign, fixes merge conflicts.
2015-02-20 12:08:04 -05:00