Commit Graph

71 Commits

Author SHA1 Message Date
Erthilo
3510a8adf0 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/defines/obj/hydro.dm
	code/game/mecha/mecha.dm
	code/game/objects/devices/PDA/PDA.dm
	code/game/objects/devices/flashlight.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/radio/radio.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/mob.dm
2012-08-23 13:56:12 +01:00
SkyMarshal
ffa80e2e94 Ultralight update, less laggy and less buggy. Might still need to be removed, time will tell. Also: Added an Ion Storm law, and reverted the radio mode change back to the new subspace radios. Also added myself to the admins.txt since I am a dev again and the main server already is updated like that. 2012-08-21 17:25:57 -07:00
Cael_Aislinn
157d4b70c9 compile fix, minor dme change
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-22 05:47:47 +10:00
SkyMarshal
d41ffc18fd Fixes for ZAS, including fire, geometry, rebuilding consideration, and atmospheric lockdowns. In addition, improved supermatter, and humans now absorb all the oxygen they inhale, due to the ludicrous volumes of air normally encountered (Does not reduce effectiveness of air tanks) 2012-08-21 01:18:01 -07:00
SkyMarshal
54ce48fb9d Connections no longer are deleted when a door closes, instead persisting until merged or a wall is built there or something. Better runtime detection, and no more searching through world for fires to process. 2012-07-26 15:33:21 -07:00
SkyMarshal
4fe2b585a7 Adds further checking and variable presets to ZAS, and made the contamination overlay actually work. 2012-07-24 22:12:25 -07:00
SkyMarshal
abe222afde Fixed botpathing. Some fixes/changes to glows. Made lights less piss yellow. 2012-06-19 20:52:01 -07:00
SkyMarshal
8f0a815eb9 Fixed some stuff. 2012-06-18 23:59:07 -07:00
SkyMarshal
dffed10290 Fixed a long-lasting error with vending machine in toxins, fixed/added atmos setting editor in game. 2012-06-18 23:39:12 -07:00
SkyMarshal
692fdc724e Second part of UltraLight. Some fixed up fire stuff. 2012-06-18 17:52:40 -07:00
SkyMarshal
aeb850fef0 Working UL 2012-06-18 15:02:34 -07:00
SkyMarshal
92e2cd32de ZAS fixes. 2012-06-09 00:55:00 -07:00
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
6730a1bf22 Modified fire algorithms, made bombs possible. 2012-06-08 10:45:47 -06: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
Aryn
37125a42f9 Fixed bugs and optimized ZAS. 2012-05-30 01:33:58 -06:00
Aryn
c9478c6a46 Made SkyMarshal's recommended changes. 2012-05-28 16:41:18 -06:00
Aryn
f0f6f14355 Fixed up the errors related to ALL_ITEM_CONTAMINATION and hotspots, made extinguishers work again. 2012-05-27 12:49:26 -06:00
Aryn
56a2c1d77a Added comments and updated the changelog. 2012-05-26 22:01:28 -06:00
Aryn
6f00258376 I accidentally ALL THE THINGS! But yeah, ZAS is updated. 2012-05-26 02:01:26 -06:00
unknown
a7bce8a609 WHOOPS
Signed-off-by: unknown <Colm@Blue.(none)>
2012-03-15 22:52:29 +00:00