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
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
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
SkyMarshal
b2e25d39b8
This should work, not sure.
...
Signed-off-by: SkyMarshal
2012-01-04 11:08:47 -07: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
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
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
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
mport2004@gmail.com
2142742aa2
Quick update to nuke endings. The crew has to escape with the disk to win.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2907 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-03 03:47:40 +00:00
baloh.matevz@gmail.com
415ba0b883
I added a new atom-level proc:
...
/atom/ShiftClick(mob)
This is called whenever someone clicks on an atom while holding shift. It is not sensitive to distance from object or anything like that. The mob parameter it contains is the mob that clicked the atom.
THIS PROC DEFAULTS TO EXAMINE, so if you shift-click something, you will examine it.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2906 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-03 02:17:18 +00:00
mport2004@gmail.com
fa782f2ffb
Bit of blob work
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2905 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-03 01:44:58 +00:00
mport2004@gmail.com
f12301d51a
Fixed some runtimes.
...
Virus2 has been effectively removed from the code as it was not actually used and was causing some runtimes.
The PA is now properly affected by meteors/blobs/bombs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2903 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 22:12:36 +00:00
mport2004@gmail.com
3dcdccbd81
Added a limit to the Entered loop.
...
Doors will only check for the presence of a mob rather than looping though all of them and will play a sound rather than message when it does find one.
Door damage lowered to 5 with Urist's permission, you have a chance to get someone to help you before you are crushed to death now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2902 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-02 20:03:01 +00: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