cib
f827d9f56e
Small addition so that traumatic shock will increase when a limb is missing or broken.
2012-01-09 04:09:57 -08:00
Tastyfish
1d010aca75
Merge remote-tracking branch 'upstream/master'
2012-01-08 20:06:03 -05:00
Tastyfish
ce9042ae20
bones and dismemberment
2012-01-08 20:05:54 -05:00
Albert Iordache
4a3c17738e
Fixed a bug with the player panel
2012-01-08 20:42:05 +02:00
SkyMarshal
6e0d8de599
Fixed bug involving toolboxes and the Destructive Analyzer
2012-01-08 11:37:57 -07:00
cib
66330222d3
Buffed the speed at which the chemistry charger generates chemicals, and also the power consumption.
2012-01-07 20:39:35 -08:00
Albert Iordache
970ee20614
Merge pull request #239 from SkyMarshal/master
...
Table update! Yaay!
2012-01-07 00:39:00 -08:00
cib
b8f799e6d3
Emergency teams took a bit too long to be sent.
2012-01-07 02:03:13 -08:00
SkyMarshal
1c0cff4dac
Derp
2012-01-07 01:04:15 -07:00
SkyMarshal
5fd641599e
Fixed stupid unescapable edit apperance
...
Fixed some stupid with grenades.
2012-01-07 00:49:48 -07:00
SkyMarshal
3c128170a3
Shit to update
2012-01-06 16:50:19 -07:00
Tastyfish
ffe6ac7935
Merge remote-tracking branch 'upstream/master'
2012-01-06 16:41:52 -05:00
Tastyfish
c4f5429857
furthur work on bones
2012-01-06 16:41:47 -05:00
SkyMarshal
240153a8a5
Genetics is no longer a fortress, fixed some disposals silliness.
2012-01-06 13:17:17 -07:00
SkyMarshal
68070d9061
Bugfixes for cloning and the mail sorting machinery.
2012-01-06 11:38:56 -07:00
Albert Iordache
8279f080dd
Merge pull request #232 from Miniature/master
...
made blindness overlay transparent to mouse
2012-01-06 09:48:36 -08:00
Miniature
090a5c75d1
made blindness overlay transparent to mouse
2012-01-07 02:53:50 +10:30
SkyMarshal
7872eeafc1
Cloning now works right from any and all consoles.
...
Make the mail management less buggy and more robust.
2012-01-05 21:50:20 -07:00
cib
a7a42410ec
Added an emergency response team mechanism that will be triggered on code red after a while. Dubbed the station the NSS Exodus.
2012-01-06 04:13:10 -08:00
CIB
f3ebb75637
Merge pull request #221 from Miniature/master
...
Now you don't need to call a proc when you use proccall(bs12)
2012-01-05 14:59:13 -08:00
Tastyfish
abd22255f3
Merge remote-tracking branch 'upstream/master'
2012-01-05 17:15:33 -05:00
Tastyfish
a7b85707dd
porting in bones and dismemberment
2012-01-05 17:15:29 -05:00
SkyMarshal
5bd517bf72
Numerous fixes.
2012-01-05 14:33:29 -07:00
cib
bf62258c0a
Fixes to AI malfunction and electrical storms.
...
- AI malfunction will now be announced, even before it starts the takeover. After 5 minutes by default, after 25 minutes if it buys the interhack module.
- Reduced blackout uses to 1.
2012-01-05 21:05:36 -08:00
cib
9e035424da
Nerfed the medbot and bruise packs.
2012-01-05 19:36:26 -08:00
SkyMarshal
89df766f75
Finial stuff for the mail sorting shit.
2012-01-05 10:22:17 -07:00
Miniature
26d679c469
Merge branch 'master' of github.com:Miniature/Baystation12
2012-01-06 03:24:01 +10:30
Miniature
ac29d2c6dd
Now you don't need to call a proc when you use proccall(bs12)
2012-01-06 03:23:22 +10:30
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
Miniature
0d65e4657b
Now you don't need to call a proc when you use proccall(bs12)
...
(leave it blank, i can't remember the way to add a cancel button)
2012-01-06 02:52:15 +10:30
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
Tastyfish
a2ff049861
merge
2012-01-04 23:01:22 -05: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
