Commit Graph

10100 Commits

Author SHA1 Message Date
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
mport2004@gmail.com
2ea375091e Renamed the prisoner computer's file to prisoner and added a sanity check.
The singularity is now able to eat things like signs and chameleon projectors' projections.
A few other misc runtime fixes.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2916 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-05 05:26:13 +00: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
trubblebass@gmail.com
4d1d38d5f3 - Fixed Issue 293
It now correctly reads 15 Units.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2915 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-04 20:39:46 +00: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
mport2004@gmail.com
14ed4d5174 Blob ending number of blobs is now a var.
The nuke now properly checks to see if its on the station when it explodes and most of the derp var has been removed from the bomb code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2913 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-04 13:34:45 +00: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
Miniature
a898a49c3c Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-04 17:00:34 +10:30
Miniature
c9a20d7a12 another runtime 2012-01-04 16:57:40 +10:30
VivianFoxfoot@gmail.com
18bbdaf697 Adds alt-click to the changelog, adds a sanity check to alt-pull just in case.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2912 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-04 05:30:57 +00:00
VivianFoxfoot@gmail.com
74c55d916c Fixes a bug where AIs could examine people.
Adds another proc (alt-click) that functions by default to pull.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2911 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-04 04:15:54 +00:00
mport2004@gmail.com
07c2afaedb Shades now properly ghost people when they die.
Changed a nuke feedback back to what it was.
SMES code slightly cleaned up.
Removed a few of the HIGH VOLTAGE signs that were on grilles.
Added a san check to hydro to remove a runtime.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2910 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-03 22:11:09 +00:00
mport2004@gmail.com
b5944308c7 Moved most of the computer defines into the proper code file.
Moved a few of the computers into their own files.
Security records now shows rank on the browse screen.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2909 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-03 21:16:48 +00: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
vageyenaman@gmail.com
51ae1dddaa Trying to print the new telecomm machine boards shouldn't crash the R&D machines now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2908 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-03 18:20:11 +00:00
Miniature
499198b1cf More runtime fixing 2012-01-04 04:36:21 +10:30
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
719c6a3b31 Don't ask me why this didn't work already, another runtime fixed 2012-01-04 03:22:07 +10:30
Miniature
8aba29cc9c Fixing some null runtimes 2012-01-04 03:15:20 +10:30