cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,594 Commits 10 Branches 0 Tags
8af4d1eadf95b15b74f9e0e70f70a4db77a9dbb9
Commit Graph

10873 Commits

Author SHA1 Message Date
DJSnapshot
8af4d1eadf Fixed random git bug 2013-10-15 00:14:21 -07:00
DJSnapshot
c7821741c2 Expanded mod powers to include temporary job bans, temporary global bans, muting, and subtle messaging. 2013-10-14 23:48:26 -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
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