cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,563 Commits 8 Branches 0 Tags
6e07981e67a3828f5ba2a84fdf70e0d9bd77ca8c
Commit Graph

10851 Commits

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
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
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
DJSnapshot
dda4080434 Bugfix for gamemode vote delay 2013-09-29 11:57:28 -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
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
DJSnapshot
a11f1d4bdb Hotfix for infinite mangling of gloves. 2013-09-22 13:10:14 -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
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
Segrain
ed4389c676 Fix for invisible carpets. 2013-09-19 08:27:34 +03:00
Kilakk
9bd3f2997c Added in an awesome fax machine sprite by Cajoes 2013-09-18 19:41:29 -04:00
Kilakk
e1192fea75 World loop removed successfully 2013-09-16 17:12:36 -04:00
Kilakk
6c4644664e Absolute paths for faxmachine procs 2013-09-16 17:09:36 -04:00
Segrain
a80efba1fb Fix for #3683. 2013-09-15 19:39:53 +03:00
Segrain
c055f722dd Localised implant detection. 2013-09-14 23:50:31 +03:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
SkyMarshal
1f634873ea Merge pull request #20 from SkyMarshal/patch-3 
Fixes EFTPOS units failing to connect to account DB.
 2013-09-13 21:14:31 -07:00
SkyMarshal
7d81b02dbe Fixes EFTPOS units failing to connect to account DB. 2013-09-13 21:13:43 -07:00
SkyMarshal
7b1974e4b5 Prevents the accounts database from automatically being removed from machines. 2013-09-13 21:12:49 -07:00
Segrain
9eaf5cf273 Smallfix. 2013-09-13 19:46:45 +03:00
Segrain
91068e31c8 Falling fix. 2013-09-13 19:45:22 +03:00
Segrain
d5f20aa874 Colour fix. 2013-09-13 19:43:59 +03:00
Segrain
d658b256e3 Fix for announcing gamemode ties. 2013-09-13 19:42:54 +03:00
Segrain
d8ad339fd8 Fix for throwing damage. 2013-09-13 19:41:23 +03:00
Segrain
9723a98ade Iconfix. 2013-09-13 19:40:09 +03:00
Segrain
d13f9e617b Fix for #3666. 2013-09-13 19:38:21 +03:00
Segrain
3dd5b22ae7 Fix for #3662. 2013-09-13 19:24:25 +03:00
Segrain
10150208d1 Fix for #3668. 2013-09-13 19:22:31 +03:00
Chinsky
c5c65c2f25 Merge pull request #3673 from LethalGhost/patch-1 
Fix for stool picking up.
 2013-09-12 22:51:38 -07:00
Mark Aherne (Faerdan)
9378ce2402 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-12 20:58:06 +01:00