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
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
Albert Iordache
1053acea64
Merge pull request #219 from caelaislinn/master
...
new conveyors, diverters, partially fixed ultralight, new helper proc
2012-01-05 04:37:16 -08:00
CaelAislinn
a6c6c44112
ported z-levels from old bs12. ready for implementation into map/s
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-05 22:03:43 +10:00
SkyMarshal
e164b21dc4
Merge branch 'master' of github.com:SkyMarshal/Baystation12
...
Conflicts:
maps/tgstation.2.0.8.dmm
2012-01-05 01:07:31 -07:00
SkyMarshal
dd5c6b9250
Final fix, I think.
2012-01-05 01:02:44 -07:00
SkyMarshal
3f58a1bb73
Final fix, I think.
2012-01-05 00:31:23 -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
CaelAislinn
0a70d83f57
re-adding fixed ul + new helper proc (get_opposite())
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-05 15:37:02 +10: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
Tastyfish
f6706ef333
retired admins don't get sent as admins in json
2012-01-04 22:01:24 -05:00
Albert Iordache
7aac3d5e1c
Fixed a radiation belt runtime error
2012-01-05 01:10:07 +02:00
Albert Iordache
86186aa089
Fixed a few occurrences of "ship" instead of "station", in events
2012-01-05 00:44:40 +02:00
cib
e141f962c4
Confusion shouldn't make you totally unable to move in one direction.
2012-01-04 22:32:09 -08:00
cib
cb78753345
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-04 22:10:37 -08:00
cib
66f6d325a4
Increased infection chance significantly in the hopes that this will somehow help vira not spreading.
2012-01-04 22:07:26 -08:00
cib
757bdc08f2
You can now produce infected blood from a virus dish with the cure research machine.
2012-01-04 19:16:35 -08:00
Tastyfish
14e9dbd779
a couple chatbot grammer improvements
2012-01-04 17:25:33 -05:00
Albert Iordache
f7e22b104b
Merge pull request #212 from CIB/master
...
Make it possible to infect people from virus dishes
2012-01-04 10:45:36 -08:00
CIB
bd533a1a8a
Merge pull request #211 from SkyMarshal/master
...
Should help balance my last set of changes.
2012-01-04 10:24:53 -08:00
SkyMarshal
b2e25d39b8
This should work, not sure.
...
Signed-off-by: SkyMarshal
2012-01-04 11:08:47 -07: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
cib
7b56f2e534
Disable control_freak, jesus.
2012-01-04 18:20:44 -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
5a5c620692
Now atmos alarms automatically let atmos techs change them if they go off, as well as people can turn that off or make them permamently controllable by the computer
...
also made it possible for them to mess with any alarm that hasn't had the atmos control completely disabled, but not a way to turn that feature on
2012-01-04 22:52:01 +10:30
Miniature
ea70303f21
Another one
2012-01-04 17:02:35 +10:30
