Commit Graph

10886 Commits

Author SHA1 Message Date
Chinsky
0dc3b3c31e Merge pull request #3808 from Mloc/sleepyzas
Moves around some ZAS stuff and fixes some things in FEA gas mixtures.
2013-10-23 22:04:22 -07:00
Chinsky
74f898a1a2 Merge pull request #3809 from DJSnapshot/antag
Fix for sunglasses and Night Vision Goggles
2013-10-23 21:58:44 -07:00
DJSnapshot
5f7ee54430 Fix for sunglasses and night vision goggles 2013-10-23 19:51:01 -07:00
Mloc
5234b1394b Moves around some ZAS stuff and fixes some things in FEA gas mixtures.
ShareSpace now can take a gas mixture as an argument, alongside the usual list of tiles.
Three new procs on gas mixtures, add() multiply() and divide().  Self explanatory.
Zones with unsimulated tiles that sleep will now reset themselves to the average air.
assume_air will only add air to sleeping zones with unsimulated tiles if it can wake the zone up.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-10-23 22:04:31 +01:00
Segrain
ace205b323 Code cleanup. 2013-10-18 08:40:45 +03:00
Segrain
183c44c4c8 Smallfix. 2013-10-18 08:38:14 +03:00
Segrain
cad425f2ca Roundend declaration. 2013-10-17 04:07:29 +03:00
Segrain
6184ad729f Cardfix. 2013-10-17 04:01:46 +03:00
Segrain
da96d45bc0 Smallfix. 2013-10-17 04:00:33 +03:00
Segrain
6ece0850af Volume fix. 2013-10-17 03:53:03 +03:00
Segrain
1d1d611087 Quillsfix. 2013-10-17 03:51:56 +03:00
Mloc
90378111e1 Fixes #3777
Signed-off-by: Mloc <colmohici@gmail.com>
2013-10-16 11:21:51 +01:00
Chinsky
a7be4d9353 Fixes #3781
Magical thingies now go zzap instead of click click when empty.
2013-10-16 11:06:43 +04:00
Chinsky
ac7aae7358 Fixed #3776
Missed update_body calls
2013-10-16 10:57:19 +04:00
DJSnapshot
4b8621bcef Temporary patch so aliums can use magboots until the hardsuit rework gets merged. 2013-10-15 23:06:02 -07:00
Chinsky
6a2c91196a Merge pull request #3771 from Mloc/newzasfix
Small work on making zones wake up on geometry changes.
2013-10-14 02:12:12 -07:00
Mloc
87037847ce Merge pull request #3773 from Aranclanos/EmitterBeams
Duplicates the speed of the gameticker!
2013-10-13 14:06:03 -07:00
Aranclanos
9af5c85c58 Duplicates the speed of the gameticker!
The emtiter beams were holding back the gameticker, 0.3 seconds per beam, now the sleep() is replaced with a spawn() instead.

This will add lag due to everything being faster.
2013-10-13 17:11:39 -03:00
Mloc-Argent
24994ec752 Small work on making zones wake up on geometry changes.
Also added sleeping for zones with unsimulated tiles; unfortunately it probably won't happen for ages due to a dichotomy paradox.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-13 19:44:12 +01:00
Michael Johnson
e285ffd698 Fixed respawn timer issues 2013-10-13 10:35:15 -04:00
Segrain
f2bbc60d51 Order fix. 2013-10-12 21:19:54 +03:00
Segrain
b39dfc5229 Smallfix. 2013-10-12 19:49:29 +03:00
Segrain
77748f1116 Mecha weapons. 2013-10-12 14:41:24 +03:00
Segrain
34a6735ef8 ERT mecha beacons. 2013-10-12 14:31:12 +03:00
jack-fractal
6ecab0bc36 - implementing Mloc's suggestions.
- fixing the changelog
2013-10-11 13:29:33 -04:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
2013-10-11 12:39:54 -04:00
Segrain
367c1cf4f4 Better check. 2013-10-11 11:10:27 +03:00
Segrain
3d6791df81 Fix for pockets. 2013-10-11 10:22:58 +03:00
Segrain
775d723f68 Typecheck. 2013-10-11 10:21:14 +03:00
Segrain
7ea98f6d79 Examining fix. 2013-10-11 10:19:58 +03:00
Segrain
464fc22fa5 Missing verb. 2013-10-11 10:18:43 +03:00
Segrain
17f38e109d Missing language. 2013-10-11 10:16:46 +03:00
Segrain
8be67352ea Typo fix. 2013-10-11 10:16:00 +03:00
Segrain
a4793fd208 Typo fix. 2013-10-11 10:08:04 +03:00
Chinsky
032d69742f Derp 2013-10-10 14:46:22 +04:00
Chinsky
6e07981e67 Applied Arancalos fix for firedoors, no more process for them 2013-10-10 14:14:48 +04:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze
BYOND AKBAR
2013-10-10 02:45:45 -07:00
Mloc
c35261f0fd Much better solution to the zone geometry bug.
Adds a unsim_check_directions var to simulated turfs, which is similar in use to air_check_directions but points to unsimulated or space tiles instead of open air tiles.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-10-10 10:25:20 +01:00
Mloc
6466d17736 Fix for ChangeTurf and update_air_properties not handling geometry changes correctly.
Signed-off-by: Mloc <colmohici@gmail.com>
2013-10-09 12:49:50 +01:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 22:01:16 +01:00
Chinsky
3c678d7990 Merge pull request #3735 from Mloc/fixeroos
Fixes.
2013-10-08 02:35:03 -07:00
Mloc-Argent
3d2f92f92c Made energy weapons not get a bloody overlay.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-07 20:35:35 +01:00
Mloc-Argent
ebf2ba2d4a Fixes.
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-07 20:35:26 +01:00
Mloc-Argent
be8bffbc5b Ported code from /tg/station to make brig timer panels and status displays use maptext instead of expensive icon procs.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-07 20:13:39 +01:00
Mloc-Argent
4fa6316d39 Garbage collection for fire and explosive particles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-05 23:25:41 +01:00
Mloc
87538d55a5 Merge pull request #3729 from SkyMarshal/airfixes
More work on sleeping zones, fire fixes from master branch.
2013-10-05 12:46:20 -07:00
SkyMarshal
8111178b6e Updates the zone-sleeping code to account for turf changes. 2013-10-05 12:38:33 -07:00
SkyMarshal
cffa100caa Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:32:02 -07:00
SkyMarshal
eeb25f7b89 Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:29:25 -07:00
Chinsky
82bd221aa3 Fix for #3667 2013-10-01 01:15:02 +04:00