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
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
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
40a0a5499e
Bugfix for some table stuff I forgot.
...
Fixed a small message for writing on paper.
2012-01-07 10:51:32 -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
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
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
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
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
cib
1f9797934e
Made the explosionfar sound occur more often.
2012-01-05 17:39:13 -08:00
Albert Iordache
778c6d03e3
Merge pull request #218 from SkyMarshal/master
...
Big edit!
2012-01-05 07:56:30 -08: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
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
SkyMarshal
b2e25d39b8
This should work, not sure.
...
Signed-off-by: SkyMarshal
2012-01-04 11:08:47 -07: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
Albert Iordache
33833b9acb
Merge pull request #202 from SkyMarshal/master
...
OHMYGOD I coded a ton.
2012-01-03 11:14:20 -08:00
SkyMarshal
f78e044226
Tweaked electrical storms
2012-01-03 12:09:02 -07:00
SkyMarshal
1750d044cf
Added blowout, easier management of disallowed events.
2012-01-03 12:03:14 -07:00
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
8aba29cc9c
Fixing some null runtimes
2012-01-04 03:15:20 +10:30
Miniature
9a81f4496b
Finished emlocker stuff
...
if someone wants to move where the spawning is done feel free
2012-01-04 02:15:38 +10:30
SkyMarshal
9a651a5a84
Added psyche jumpsuit for Asanadas
...
Expanded scrambled radio stuff.
2012-01-03 00:06:25 -07:00
SkyMarshal
120607828e
Fixed random AI laws.
2012-01-02 22:39:42 -07:00
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
SkyMarshal
78660a2dff
Merge pull request #197 from SkyMarshal/master
...
Bugfix.
2012-01-02 09:09:12 -08:00
SkyMarshal
fbf59a3411
Fix compile error.
2012-01-02 10:08:30 -07:00
Albert Iordache
bdd5205bfe
Merge pull request #196 from SkyMarshal/master
...
PDAs can now fit in all belts
2012-01-02 09:04:45 -08:00
SkyMarshal
2f0a745815
PDAs can now fit into all belts.
2012-01-02 10:01:57 -07:00
