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 |
|
cib
|
44214290fe
|
Merge branch 'master' of github.com:Baystation12/Baystation12
|
2012-01-09 03:54:25 -08:00 |
|
cib
|
249bbd32d9
|
EXPERIMENTAL: Set the crit setting in the soft-configuration to -50, so people go into crit later. Hopefully it's not borked.
|
2012-01-09 01:34:28 -08:00 |
|
CIB
|
1b7f24acbc
|
Merge pull request #246 from Tastyfish/master
bones & dismemberment
|
2012-01-08 18:42:46 -08:00 |
|
Tastyfish
|
8402d72e2f
|
Merge pull request #247 from SkyMarshal/master
Fixed some map bugs.
|
2012-01-08 18:23:27 -08:00 |
|
SkyMarshal
|
fded99f161
|
Fixed broken mail stuff in genetics, added a tagger to medbay (oops)
|
2012-01-08 19:21:19 -07: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 |
|
CIB
|
625e57ec77
|
Merge pull request #243 from Abi79/master
Fixed a couple of bugs and made a few changes to Antiqua
|
2012-01-08 15:19:14 -08:00 |
|
Albert Iordache
|
4a3c17738e
|
Fixed a bug with the player panel
|
2012-01-08 20:42:05 +02:00 |
|
Albert Iordache
|
59806cb3a7
|
Merge branch 'master' of github.com:Baystation12/Baystation12
|
2012-01-08 20:41:04 +02:00 |
|
SkyMarshal
|
15b6df0da5
|
Merge pull request #244 from SkyMarshal/master
Bugfix.
|
2012-01-08 10:38:35 -08:00 |
|
SkyMarshal
|
6e0d8de599
|
Fixed bug involving toolboxes and the Destructive Analyzer
|
2012-01-08 11:37:57 -07:00 |
|
Albert Iordache
|
9d2e285190
|
Fixed a bug with obj/item/clothing/under/chameleon/psyche , added some small details to Antiqua and redid the arrivals arm, and removed the patient ward area. (can still be recovered via TortoiseGit, by reverting to an earlier version; I'll explain in the Antiqua topic why I removed it)
|
2012-01-08 19:19:53 +02:00 |
|
Albert Iordache
|
2bc72c1e8e
|
Merge pull request #241 from SkyMarshal/master
Fixed some stuff on flamethrowers, map fix.
|
2012-01-08 00:10:14 -08:00 |
|
SkyMarshal
|
a48dc5bbd5
|
A few map fixes.
|
2012-01-07 19:53:49 -07:00 |
|
SkyMarshal
|
9e94f1274a
|
Merge branch 'master' of git://github.com/Baystation12/Baystation12
|
2012-01-07 18:16:32 -07:00 |
|
SkyMarshal
|
10a4fcdb49
|
Merge pull request #242 from caelaislinn/master
Looks good.
|
2012-01-07 17:15:27 -08: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 |
|
CaelAislinn
|
05778ab3f1
|
removed light fixture in the middle of a table in sec
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
|
2012-01-08 10:27:49 +10:00 |
|
SkyMarshal
|
145b3d3b5f
|
Tweaked flamethrowers slightly, made the UI actually do something and fixed an icon that was not updating.
|
2012-01-07 11:19:04 -07:00 |
|
SkyMarshal
|
478551fa77
|
Merge pull request #240 from SkyMarshal/master
Bugfix
|
2012-01-07 09:52:51 -08:00 |
|
SkyMarshal
|
c6027d672f
|
Merge branch 'master' of github.com:SkyMarshal/Baystation12
|
2012-01-07 10:52:02 -07:00 |
|
SkyMarshal
|
40a0a5499e
|
Bugfix for some table stuff I forgot.
Fixed a small message for writing on paper.
|
2012-01-07 10:51:32 -07: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
|
5a2af09c18
|
Fixed some idiocy.
|
2012-01-07 00:02:51 -07:00 |
|
SkyMarshal
|
f517b95e5f
|
Table update! Yaay!
Also: Fixed a redundant proc in the specops shuttle
fixed missing wire and disposal pipe in map.
|
2012-01-06 23:24:51 -07:00 |
|
SkyMarshal
|
1231f1b519
|
Merge pull request #238 from SkyMarshal/master
Bugfix
|
2012-01-06 15:56:29 -08:00 |
|
SkyMarshal
|
cdbb00d264
|
Fixes a problem with aliums and police tape.
|
2012-01-06 16:55:56 -07:00 |
|
Albert Iordache
|
62329a87ba
|
Merge pull request #237 from SkyMarshal/master
depriness faster
|
2012-01-06 15:51:09 -08: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 |
|
Albert Iordache
|
e105ccdbff
|
Merge pull request #236 from SkyMarshal/master
Minor map changes
|
2012-01-06 13:09:57 -08:00 |
|
SkyMarshal
|
74b68e2315
|
Bugfix.
|
2012-01-06 14:01:53 -07:00 |
|
SkyMarshal
|
240153a8a5
|
Genetics is no longer a fortress, fixed some disposals silliness.
|
2012-01-06 13:17:17 -07:00 |
|
Albert Iordache
|
e3fdb0aa44
|
Merge pull request #235 from SkyMarshal/master
Added protect objective
|
2012-01-06 11:04:13 -08:00 |
|
SkyMarshal
|
93dcd0ddfb
|
Added protect objective to traitor possibilities.
|
2012-01-06 11:59:57 -07:00 |
|
SkyMarshal
|
ffdce5f201
|
Merge pull request #234 from SkyMarshal/master
bugfixes for weird behavior and runtimes.
|
2012-01-06 10:40:10 -08:00 |
|
SkyMarshal
|
68070d9061
|
Bugfixes for cloning and the mail sorting machinery.
|
2012-01-06 11:38:56 -07:00 |
|
Miniature
|
90eaff12c5
|
Merge pull request #233 from Miniature/master
Floorbots will no longer build floors over where shuttles
|
2012-01-06 09:53:29 -08:00 |
|
Miniature
|
81576835f2
|
Floorbots will no longer build floors over where shuttles are meant to arrive
Probably a few other things it does this for (like if there are any shuttles that aren't /area/shuttle)
|
2012-01-07 04:22:36 +10:30 |
|
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 |
|
Albert Iordache
|
b9665e5ac0
|
Merge pull request #231 from SkyMarshal/master
Cloning bugs are fixed, removed random mail bugs.
|
2012-01-06 01:21:33 -08:00 |
|
cib
|
5cc7bd3081
|
Forgot another file.
|
2012-01-06 05:46:14 -08:00 |
|
cib
|
a19f6d6010
|
Merge branch 'master' of github.com:Baystation12/Baystation12
|
2012-01-06 05:41:55 -08:00 |
|