Commit Graph

6 Commits

Author SHA1 Message Date
SoundScopes d58f613f69 Bay Merge 2014-11-06 12:27:05 +00: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 fb2a0c3ab1 SM affects Z-level only
Supermatter affects mobs on it's own z-Level
2014-10-24 06:10:19 +01:00
skull132 f95ab265c1 Bay Update 02 2014-06-04 18:20:49 +03:00
skull132 6d192181ea Baystation Update Merge 01
Mahoosive update. A lot of things.
2014-04-16 23:54:43 +03:00