Commit Graph

3637 Commits

Author SHA1 Message Date
Ren Erthilo
96873fbab0 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-20 17:31:19 +00:00
Ren Erthilo
e90493c41b On master: Change 01 2012-03-20 17:31:10 +00:00
Ren Erthilo
782af0aa9f Derp. 2012-03-20 17:30:24 +00:00
CIB
d09ed22439 Merge pull request #708 from SkyMarshal/Airlocks
Fixed give bug, announcement bug, old reaching method, chemicals can now react in mobs, added a light repairing portable-autolathe for janitor.
2012-03-20 06:15:11 -07:00
Albert Iordache
99ca245c50 Merge pull request #723 from CIB/master
Toolboxes and APCs
2012-03-20 06:00:48 -07:00
CIB
a014b99dbc Merge pull request #712 from Miniature/master
More custom items, first two for Fniff, last one for Asanadas. Now with added not destroying ears.
2012-03-20 05:59:46 -07:00
CIB
824c0603ca Merge pull request #713 from Erthilo/master
Exosuit fixes and alcohol port
2012-03-20 05:59:18 -07:00
cib
1c5d305bc6 Fixes to the toolbox and APC commits. 2012-03-20 04:40:54 -08:00
cib
a541d32381 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-20 03:53:46 -08:00
cib
c2bea1f315 Broken APC covers can be removed with a screwdriver. 2012-03-20 03:53:32 -08:00
cib
6d979ae17b Toolboxes have a chance to swing open. 2012-03-20 03:53:12 -08:00
Miniature
7154e60fae Merge pull request #718 from XxoriginxX/master
Functioning Ion Storm Laws
2012-03-19 14:53:40 -07:00
Ispil
de0df3c299 Fixed another missing parenthesis in the Ion Storm Laws. 2012-03-19 10:10:45 -07:00
Miniature
ddc9798af9 Made disposals not kill people's ears mk2 2012-03-19 21:43:55 +10:30
Ren Erthilo
192fb1fef8 Alcohol port, now makes your vision blurry and also makes you pass out. 2012-03-19 03:56:32 +00:00
Ren Erthilo
43ae8b905a Mech part name changes for consistency. 2012-03-19 03:12:14 +00:00
Ren Erthilo
d95f8194b5 Fixes Exosuit issues. 2012-03-19 02:53:28 +00:00
Miniature
21edac46d4 Oh, THAT's how that works. 2012-03-19 11:37:42 +10:30
Miniature
b635a7d95f More custom items, first two for Fniff, last one for Asanadas. 2012-03-19 11:28:07 +10:30
SkyMarshal
371ade0832 Whoops 2012-03-18 12:07:38 -07:00
SkyMarshal
cc83e23493 Added light repairing tool for janitor. 2012-03-18 11:58:10 -07:00
SkyMarshal
0fffc1622e Fixed arrival announcement bug. 2012-03-18 11:43:12 -07:00
Ispil
6938486e60 New Ion Storm laws based on the AI Laws suggestion thread. And this time, it should work. 2012-03-18 11:40:40 -07:00
SkyMarshal
0d2b327ded Chemicals now react in mobs, old reaching restrictions, fixed a give bug, tried to fix a resting bug. 2012-03-18 11:35:52 -07:00
Albert Iordache
6e918f0848 Made lightbulbs weaker, added a subclass for bulbs which gives out a bit more light 2012-03-18 16:35:49 +02:00
Ispil
720e1956a5 Some new ion storm laws based off of the ones from the AI Laws thread. Only the good ones, of course. 2012-03-18 00:40:39 -07:00
Hawk-v3
5685532e8a Merge pull request #706 from SkyMarshal/Airlocks
Minor tweaks and bugfixes.
2012-03-17 20:56:42 -07:00
SkyMarshal
46c97cbe4e Minor tweaks and bugfixes. 2012-03-17 20:44:16 -07:00
Mloc
6a66c7bdb1 Merge pull request #704 from Iberis/master
Made light bulbs a bit brighter.
2012-03-17 11:18:27 -07:00
Iberis
141c86a079 Made lightbulbs a bit more brighter
(Light tubes are still 3 times as bright)
Removed some derp from the code.
2012-03-17 19:10:23 +01:00
Miniature
f44a005b49 Nerfed unstable mutagen back to what it was before metabolism change 2012-03-18 00:58:27 +10:30
Albert Iordache
593c1dc505 Merge pull request #697 from comma/master
Made alcohol reagents code pretty
2012-03-17 04:27:09 -07:00
Albert Iordache
c7e32b9d6b Merge pull request #696 from toemik/duration
Minor formatting adjustment to Round Duration. Credit: SkyMarshal
2012-03-17 04:15:35 -07:00
comma
4b271bcac0 Cleaned up alcohol code
Removed a lot of duplicate code by making a base 'alcohol' class.
2012-03-17 12:58:51 +02:00
toemik
4bbfe821e4 Minor formatting adjustment to Round Duration. Credit: SkyMarshal 2012-03-17 02:15:21 -04:00
SkyMarshal
42f0fb6af1 Merge pull request #692 from MisterFox/master
Tajara stuff
2012-03-16 22:58:01 -07:00
Mloc
ba5ddaf811 Merge pull request #694 from Iberis/master
Antiqua
2012-03-16 11:58:08 -07:00
Iberis
7cec890a91 Antiqua.dmm Added lots of areas. Overall major tweaking.
Added some minor areas.
2012-03-16 19:53:23 +01:00
misterfox
64f50d0d04 Tajara stuff 2012-03-16 12:20:42 -04:00
Miniature
16cc40ade3 Added temp thing to make atmos not freeze everything after the first breach, also removed a doubled up pipe in medbay 2012-03-16 22:47:40 +10:30
Mloc
39365ec622 Merge pull request #690 from Mloc/zas
ZAS bugfixes.
2012-03-16 02:08:31 -07:00
unknown
fd09ea6ce8 ZAS bugfixes.
Signed-off-by: unknown <Colm@Blue.(none)>
2012-03-16 09:06:55 +00:00
Mloc
d47c5c98df Merge pull request #688 from toemik/round
Added Round Duration to Game tab. Also fixed extra "0" in Round Duration...
2012-03-16 01:39:01 -07:00
toemik
98aa58dd60 Added Round Duration to Game tab. Also fixed extra "0" in Round Duration in Admin > Secrets panel when minutes are in the double-digits 2012-03-16 02:53:10 -04:00
Miniature
9c270c2571 Fixed removing the first beaker from chem grenades, fixed premade grenades not working 2012-03-16 16:42:27 +10:30
Tastyfish
1224d1da77 fixed ntscript smartfind's bounds check 2012-03-15 20:23:49 -04:00
Mloc
0ca437690f Merge pull request #683 from Mloc/zas
WHOOPS
2012-03-15 15:54:36 -07:00
unknown
a7bce8a609 WHOOPS
Signed-off-by: unknown <Colm@Blue.(none)>
2012-03-15 22:52:29 +00:00
Hawk-v3
86cc95cf33 Merge pull request #681 from Mloc/zas
Zoned Atmos System, merged properly from aryn's repo.
2012-03-15 15:48:28 -07:00
Mloc
f1f60ee20f Merge pull request #682 from Erthilo/master
Adds Health Analyzers to Medical Wadrobes
2012-03-15 15:47:34 -07:00