Commit Graph

62 Commits

Author SHA1 Message Date
SkyMarshal
0cc2d20a33 Merge branch 'master' of git://github.com/Aryn/Baystation12 into BugFixes
Conflicts:
	code/ZAS/Airflow.dm
2012-06-08 11:37:43 -07:00
Aryn
5af672c92f Fixed a runtime in airflow, made it so that stuff doesn't fly around every 3.5 seconds. 2012-06-08 10:46:38 -06:00
SkyMarshal
0a83532232 Airflow runtime/bugfix. 2012-06-08 03:53:27 -07:00
SkyMarshal
f23d3a0a1e Airflow now takes more air to stun you, and slamming into an object while being pushed by airflow will stun you. 2012-06-08 01:56:35 -07:00
SkyMarshal
2892ea733e More changes for ZAS. Firelocks work properly, and rebuilding zones occurs at the proper times. 2012-06-07 13:43:55 -07:00
SkyMarshal
d9fd228c68 Some nice fixes for ZAS. 2012-06-07 10:36:43 -07:00
SkyMarshal
1059311b5b Debugged ZAS. Removed another duplicate proc. Made sure turf changes are added to the air_master to be updated. Fixed errors on the map causing problems. Added different sized packages. Airflow readded. 2012-06-07 01:15:14 -07:00
Aryn
ac00001399 Made some more airflow changes that are irrelevant until I get airflow working. 2012-05-31 00:25:52 -06:00
Aryn
a8215ce62f Made some airflow changes. They won't be included in the processing code until they're more thoroughly tested, but the code is here anyway. 2012-05-28 16:42:40 -06:00
Aryn
6f00258376 I accidentally ALL THE THINGS! But yeah, ZAS is updated. 2012-05-26 02:01:26 -06:00
SkyMarshal
879f8c941a Portalathe fix, Magboots + airflow fix, Fix for the "MODE" job, fixed removing gravity catapult, fixed death alarms prematurely detonating. 2012-03-25 15:33:14 -07:00
unknown
a7bce8a609 WHOOPS
Signed-off-by: unknown <Colm@Blue.(none)>
2012-03-15 22:52:29 +00:00