SkyMarshal
86b42f815f
Tweaked garble-ness on radios in other Z-levels
2012-01-05 10:31:42 -07: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
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
Tastyfish
4de9164a5b
Merge remote-tracking branch 'upstream/master'
2012-01-02 11:47:20 -05:00
Tastyfish
87a14c0674
machine ingredient adding more intuitive
2012-01-02 11:46:19 -05:00
Tastyfish
bf877d0483
Merge pull request #191 from SkyMarshal/master
...
Nuclear revamp, full details in description.
2012-01-02 08:18:25 -08:00
Miniature
806a8d1c1a
First bunch of emlocker stuffs, going to fix when its not 1am and 24C
2012-01-03 01:38:01 +10:30
Albert Iordache
d9683ef4e3
Merge pull request #192 from caelaislinn/master
...
Autolathe changes, new supply crates, slight cargo bay tweaks
2012-01-02 06:36:03 -08:00
Albert Iordache
72941bb8c9
Merge pull request #190 from Tastyfish/master
...
fixed cult low-player problem, piano movable, straight jackets
2012-01-02 06:17:58 -08:00
Tastyfish
2d91693a3b
Merge remote-tracking branch 'cael/master'
2012-01-02 08:49:52 -05:00
CaelAislinn
fe228850c8
Added old BS12 walllockers and emergency lockers, added emergency lockers to tgstation208.dmm, removed stamp eraser from supply crate, minor antiqua tweaks
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-02 23:47:28 +10:00
Tastyfish
8000b5be66
why did I make an afterthought commit changing it to the wrong thing..
2012-01-02 08:40:56 -05:00
Tastyfish
e2a6f68e00
Merge remote-tracking branch 'cael/master'
2012-01-02 07:43:23 -05:00
CaelAislinn
2bc92e68eb
Fixed so autolathe quantity can't be set to negative, ported over emergency walllockers from old bs12
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-02 22:42:04 +10:00
Tastyfish
f85b922184
Merge remote-tracking branch 'cael/master'
2012-01-02 07:22:53 -05:00
Tastyfish
e16b1dec3f
Merge remote-tracking branch 'upstream/master'
2012-01-02 07:22:29 -05:00
CaelAislinn
9fa489a0d1
finished autolathe changes. added stationary, box and empty supply crates to supply shuttle.
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-02 21:38:27 +10:00
Albert Iordache
15aeca6213
Fixed a case where "none" was set as a gamemode by a vote
2012-01-02 12:28:35 +02:00
CaelAislinn
083de044f3
Added production quantities and the ability to load + fill containers to the autolathe.
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-02 20:19:15 +10:00
Tastyfish
00a86accfa
Merge pull request #188 from caelaislinn/master
...
Antiqua changes + first official contribution :3
2012-01-01 23:53:29 -08:00
Tastyfish
6cf377a25d
Merge remote-tracking branch 'cael/master'
2012-01-02 02:30:41 -05:00
CaelAislinn
e0ae00b254
reduced electrical storm epicentre radius to 10, from 25
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-02 16:05:08 +10:00
SkyMarshal
78762e3c25
Fixed a good bit of stupid I made, forgot to remove some debugging stuff.
2012-01-01 22:30:48 -07:00
SkyMarshal
b30da1fa98
Some fixes and improvements.
2012-01-01 22:29:04 -07:00
SkyMarshal
d64e8284f6
Fixed implanter problems, added some more silly emotes.
2012-01-01 19:57:57 -07:00
SkyMarshal
d2bae46c39
Changed functionality of implanter.
2012-01-01 19:25:02 -07:00
SkyMarshal
755d2d711a
Nuke revamp, some tweaking.
2012-01-01 18:58:28 -07:00
Tastyfish
381647971c
it doesn't get stuck in things that don't have hands, like silicons now
2012-01-01 19:57:01 -05:00
Tastyfish
698a9eddbd
Merge remote-tracking branch 'upstream/master' into HEAD
2012-01-01 16:45:56 -05:00
Tastyfish
343832e431
made it so nar-sie can't be objective if < 10 players, due to it being impossible
...
also, made piano moveable
and cleaned up custom vote code slightly more
2012-01-01 16:44:57 -05:00
cib
40fb4bb628
Mucus and a few fixes to vira.
...
Added mucus that is added to the map sometimes when sneezing or coughing. Blood now carries the spiller's virus2. Fixed a problem with virus spreading.
2012-01-01 20:50:46 -08:00
Miniature
10401563e2
Atmos control computer
...
Lets you use atmos alarms from atmospherics, if people press a button on the alarm
Not added to map
2012-01-02 00:21:24 +10:30
