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
Albert Iordache
59806cb3a7
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-08 20:41:04 +02: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
SkyMarshal
9e94f1274a
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-07 18:16:32 -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
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
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
cdbb00d264
Fixes a problem with aliums and police tape.
2012-01-06 16:55:56 -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
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
SkyMarshal
93dcd0ddfb
Added protect objective to traitor possibilities.
2012-01-06 11:59:57 -07: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
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
5cc7bd3081
Forgot another file.
2012-01-06 05:46:14 -08: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
SkyMarshal
5321041af6
Update code/game/gamemodes/blob/theblob.dm
2012-01-05 17:19:57 -07:00
SkyMarshal
b832e1b106
Numerous bugfixes:
...
Blob can be fire killed (I hope.)
Cloning machines should back up to all cloning machines.
Sacrifice can sacrifice cultists. (If you converted a sacrifice target.)
Fixed a missing tag on a sorter.
2012-01-05 17:18:23 -07: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
SkyMarshal
3be149b2b3
Fixes discussed on IRC. Fixed a broken sort junction I miseed. (Thanks tasty!)
2012-01-05 15:44:28 -07: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
Albert Iordache
53d989dda2
Merge pull request #224 from CIB/master
...
Medical stuff
2012-01-05 12:22:19 -08: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
fbd4004781
Merge pull request #223 from SkyMarshal/master
...
Bugfix/tweak
2012-01-05 09:33:42 -08:00
SkyMarshal
86b42f815f
Tweaked garble-ness on radios in other Z-levels
2012-01-05 10:31:42 -07:00
Albert Iordache
565f8165a2
Merge pull request #222 from SkyMarshal/master
...
Reworked the mail system so it is almost flawless
2012-01-05 09:24:02 -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
cib
72fd16a41c
Fixed an issue with the cure research machine and a few other virus related glitches.
2012-01-05 17:39:33 -08:00
cib
1f9797934e
Made the explosionfar sound occur more often.
2012-01-05 17:39:13 -08:00
