cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 05:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,563 Commits 74 Branches 23 Tags
6e07981e67a3828f5ba2a84fdf70e0d9bd77ca8c
Commit Graph

14563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chinsky
e76f4706ff Merge pull request #3743 from Mloc/zas-updateairpropfix 
Much better solution to the zone geometry bug
 2013-10-10 02:38:22 -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
Chinsky
8492464730 Merge pull request #3739 from Mloc/zas-updateairpropfix 
Fix for ChangeTurf and update_air_properties not handling geometry changes correctly.
 2013-10-09 11:52:36 -07: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
Chinsky
9eac5e295c Merge pull request #3737 from Mloc/maptext-status 
Ported code from /tg/station to make brig timer panels and status displays use maptext instead of expensive icon procs.
 2013-10-08 02:29:13 -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
Chinsky
06df06a0a3 Merge pull request #3730 from Mloc/gc- 
Garbage collection for fire and explosive particles.
 2013-10-05 15:23:51 -07: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
818bcf7668 Merge pull request #3726 from SkyMarshal/firefixes 
Reverted both LordBraindead and my own work on firecode back to when it was stable.
 2013-10-05 12:46:30 -07: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
Mloc
cbcbe48ae4 Merge pull request #3720 from comma/master 
Couple o fixes
 2013-09-30 15:56:39 -07:00
Chinsky
82bd221aa3 Fix for #3667 2013-10-01 01:15:02 +04:00
Chinsky
62ecc88a1f Fix for #3628 
Stops dead people from sending PDA messages.
 2013-10-01 00:30:12 +04:00
Chinsky
86715a423b Partial fix for #3697 
Would not carry over gutter and such, only species-specific languages.
Full fix would require moving languages out of mob into mind, and I am really lazy, this will cover 98% cases.
 2013-10-01 00:16:29 +04:00
Chinsky
8eb2f7db67 Fix for #3686 
Thign now drops all stuff before turning into a tree.
 2013-09-30 23:12:50 +04:00
Chinsky
2ad7bc8108 Fix for #3677 
Flags were set backwards AND on wrong var
 2013-09-30 22:13:26 +04:00
Chinsky
b87669f592 Fix foe #3713 
Megaphones will have to be fixed separately, since they are on dev branch.
 2013-09-30 20:49:44 +04:00
Chinsky
92348d2a3e Merge pull request #3715 from DJSnapshot/bugfix 
Bugfix for gamemode vote delay
 2013-09-29 16:57:44 -07:00
DJSnapshot
dda4080434 Bugfix for gamemode vote delay 2013-09-29 11:57:28 -07:00
Mloc
aa9eef7812 Merge pull request #3711 from DJSnapshot/bugfix 
Bugfix for custom AI sprites
 2013-09-27 07:01:08 -07:00
DJSnapshot
6d3caf78a6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bugfix 2013-09-26 22:34:51 -07:00
DJSnapshot
8a83008e62 bugfix for custom AI sprites. 2013-09-26 22:32:23 -07:00
Chinsky
21d920ba19 Merge pull request #3707 from DJSnapshot/glovesfix 
Vote changes
 2013-09-25 12:32:32 -07:00
DJSnapshot
a9861dd086 Added to the example/config.txt 2013-09-25 12:28:31 -07:00
DJSnapshot
c37a1a3b80 Updated Changelog 2013-09-24 23:45:32 -07:00
DJSnapshot
caa6cd6c8a votes now show number of votes, no longer mute OOC, and show results. It is no longer possible to call a crew transfer during red/delta alert, and a new proc called autotransfer() has been added, but has yet to have anything to trigger it. 2013-09-24 23:41:21 -07:00
Mloc
3b0aac9503 Merge pull request #3704 from DJSnapshot/glovesfix 
Hotfix for infinite mangling of gloves.
 2013-09-22 13:14:55 -07:00
DJSnapshot
a11f1d4bdb Hotfix for infinite mangling of gloves. 2013-09-22 13:10:14 -07:00
Mloc
f751b1dfb5 Merge pull request #3699 from Segrain/dev-freeze 
Dev-freeze map.
 2013-09-22 04:48:43 -07:00
Chinsky
a6b2fc2abe Merge pull request #3700 from Mloc/byond500 
Refactors code to work with BYOND 500.
 2013-09-22 04:41:46 -07:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Segrain
2de9762966 EVA update. 2013-09-22 13:50:16 +03:00
Mloc
2493a0a671 Merge pull request #3691 from meyar/master 
EVA fix
 2013-09-19 15:18:13 -07:00
meyar
7a800d749a Fix 2013-09-19 18:15:47 -04:00
meyar
119de49f60 Adds a missing suit modifier to EVA 2013-09-19 18:13:23 -04:00
Chinsky
dc66bff425 Merge pull request #3690 from Baystation12/dev 
Dev-freeze
 2013-09-19 01:57:58 -07:00
Chinsky
d410babd2f Merge pull request #3688 from Kilakk/dev 
Tweaked the fax machine a bit, and added in an awesome animated sprite by Cajoes
 2013-09-18 23:15:07 -07:00
Chinsky
a3f56601e5 Merge pull request #3689 from Segrain/master 
Smallfixes.
 2013-09-18 23:13:54 -07:00
Segrain
a24fd41829 Fixes for typos. 2013-09-19 08:37:29 +03:00
Segrain
0b661bc854 Fixes for stacks. 2013-09-19 08:34:38 +03:00
Segrain
9eee328d34 Verb categories. 2013-09-19 08:30:05 +03:00