Commit Graph

5 Commits

Author SHA1 Message Date
skull132 e016a9fc76 Exodus -> Aurora
Fixing references to a station that is not applicable here.
2014-12-20 20:34:09 +02:00
SoundScopes 4090f46636 Merge branch 'master' into development
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/supermatter/supermatter.dm
2014-11-06 01:25:13 +00:00
skull132 3c04d7199d Bay Merge 05NOV2014
Known errors:

* A set of errors tied to updating the fire overlays.
* A single error related to a dischephency between new and old slime
code
* A set of errors related to the recharging of stun batons
* A single error due to old machinery code coming from your grav
generator file
* A single error error from your space cooler code, due to old
atmopsherics code
* A playerpanel warning
* An error tied to extinguishing and old atmos code.
2014-11-05 23:58:05 +02:00
SoundScopes c1be7b03c4 Comb your hair with style
Now for gal's
2014-10-28 13:53:07 +00:00
skull132 191fd4881b Baystation Fluff Items
By popular demand, these things are now back.
2014-05-04 01:26:08 +03:00