SkyMarshal
98fc5872d3
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-05 09:45:20 -07:00
SkyMarshal
421b49c3f0
Reworked some stuff to actually... work
2012-01-05 09:39:44 -07:00
Albert Iordache
778c6d03e3
Merge pull request #218 from SkyMarshal/master
...
Big edit!
2012-01-05 07:56:30 -08:00
SkyMarshal
dd5c6b9250
Final fix, I think.
2012-01-05 01:02:44 -07:00
SkyMarshal
0f92684f8a
Hopefully final commit.
2012-01-05 00:04:42 -07:00
SkyMarshal
582fe30ca8
Getting closer....
2012-01-04 23:04:55 -07:00
SkyMarshal
20cbc642e2
Another update.
2012-01-04 23:02:57 -07:00
SkyMarshal
873857690d
Unfinished commit with a few major changes. DO NOT MERGE.
...
Signed-off-by: SkyMarshal
2012-01-04 22:33:41 -07:00
CaelAislinn
75757a29cf
fixed conveyors. was something weird happening with antiqua, shouldn't be any changes
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-05 15:30:15 +10:00
cib
e141f962c4
Confusion shouldn't make you totally unable to move in one direction.
2012-01-04 22:32:09 -08:00
CIB
8865f71cb6
Merge pull request #209 from Abi79/master
...
Fixed a case where the player panel wouldn't open
2012-01-04 09:59:25 -08:00
Albert Iordache
9c2224e6d8
Fixed a case where the player panel wouldn't open
...
This shouldn't even happen :O
2012-01-04 14:29:16 +02:00
Miniature
a898a49c3c
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-04 17:00:34 +10:30
Miniature
c9a20d7a12
another runtime
2012-01-04 16:57:40 +10:30
Albert Iordache
33833b9acb
Merge pull request #202 from SkyMarshal/master
...
OHMYGOD I coded a ton.
2012-01-03 11:14:20 -08:00
Miniature
499198b1cf
More runtime fixing
2012-01-04 04:36:21 +10:30
Albert Iordache
08ab4448b8
Merge pull request #194 from Miniature/master
...
bunch of emlocker stuffs, also a couple of runtimes
2012-01-03 09:03:18 -08:00
Miniature
719c6a3b31
Don't ask me why this didn't work already, another runtime fixed
2012-01-04 03:22:07 +10:30
SkyMarshal
72c6369368
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-02 21:49:09 -07:00
SkyMarshal
411ccc4075
Shitload of stuff.
2012-01-02 21:48:42 -07:00
Tastyfish
3c15526e3f
accidentally called the wrong unequip proc, they're all so similar!
2012-01-02 12:52:09 -05:00
Tastyfish
4de9164a5b
Merge remote-tracking branch 'upstream/master'
2012-01-02 11:47:20 -05:00
Tastyfish
bf877d0483
Merge pull request #191 from SkyMarshal/master
...
Nuclear revamp, full details in description.
2012-01-02 08:18:25 -08:00
SkyMarshal
6537219768
Explosive implants should go off more reliably.
2012-01-02 09:09:43 -07:00
Tastyfish
024120e4a3
Merge pull request #193 from Abi79/master
...
TG conveyor2 update
2012-01-02 06:37:53 -08:00
petethegoat@gmail.com and Albert Iordache
ee7cd1474e
TG update: Added corner conveyor belts.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2693 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 15:52:10 +02:00
Tastyfish
32492a51fe
fixed edit-appearence to assign hair and facial style correctly. somehow I didn't notice it wasn't changing in testing :p
2012-01-02 06:33:59 -05:00
Tastyfish
1feb16439e
can get out of straight jacket after 4 byond minutes now (better than infinity)
2012-01-02 04:54:19 -05:00
Tastyfish
00a86accfa
Merge pull request #188 from caelaislinn/master
...
Antiqua changes + first official contribution :3
2012-01-01 23:53:29 -08:00
Tastyfish
6cf377a25d
Merge remote-tracking branch 'cael/master'
2012-01-02 02:30:41 -05:00
SkyMarshal
15d2f06762
pAI's in PDA's can now hear things, hypothetically.
2012-01-02 00:23:43 -07:00
CaelAislinn
c6fda41758
tweaked cargo bay conveyors
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-02 17:04:18 +10:00
SkyMarshal
b30da1fa98
Some fixes and improvements.
2012-01-01 22:29:04 -07:00
SkyMarshal
d64e8284f6
Fixed implanter problems, added some more silly emotes.
2012-01-01 19:57:57 -07:00
SkyMarshal
755d2d711a
Nuke revamp, some tweaking.
2012-01-01 18:58:28 -07:00
Tastyfish
698a9eddbd
Merge remote-tracking branch 'upstream/master' into HEAD
2012-01-01 16:45:56 -05:00
Tastyfish
343832e431
made it so nar-sie can't be objective if < 10 players, due to it being impossible
...
also, made piano moveable
and cleaned up custom vote code slightly more
2012-01-01 16:44:57 -05:00
Albert Iordache
6b16ac377b
Merge pull request #189 from CIB/master
...
Vira updates
2012-01-01 13:05:21 -08:00
cib
40fb4bb628
Mucus and a few fixes to vira.
...
Added mucus that is added to the map sometimes when sneezing or coughing. Blood now carries the spiller's virus2. Fixed a problem with virus spreading.
2012-01-01 20:50:46 -08:00
Albert Iordache
aa4f30bbef
Minor deathgasp fix.
2012-01-01 22:48:53 +02:00
Albert Iordache
17449d0881
Re-enabled the deathgasp, because it activates traitor implants.
2012-01-01 22:46:37 +02:00
Tastyfish
c3f4808cd2
code was calling now-removed emote
2012-01-01 01:13:40 -05:00
Tastyfish
522f745e71
somehow this bug was only an issue once in a real game, fixed
2011-12-31 16:56:55 -05:00
Tastyfish
c02979c148
Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, intercoms, status displays, and light switches
2011-12-31 12:28:26 -05:00
Tastyfish
a561862ef0
and there too
2011-12-31 01:51:06 -05:00
Tastyfish
2f6fc64353
admins cna see who set custom event now.
2011-12-31 00:35:44 -05:00
Albert Iordache
39b6dd57e0
Removed and commented out the last traces of goon auth. code
2011-12-30 23:28:14 +02:00
cib
f7be1250a3
Many improvements to vira.
...
Implemented an efficient system for infection. Made sneeze and cough increase infection chance. Increased the lifespan of spaceacillin in a host. Removed the drool symptom.
2011-12-30 21:07:52 -08:00
Albert Iordache
ea92743b36
Merge pull request #173 from CIB/master
...
Fix stupid bug with trauma/cryo
2011-12-29 13:12:49 -08:00
cib
d8ec1ae26b
Fixed traumatic shock breaking cryo.
2011-12-29 22:09:36 -08:00
SkyMarshal