Commit Graph

2175 Commits

Author SHA1 Message Date
Tastyfish
cee9634606 stick id's in computer by using id on it, better ear examine text 2011-12-22 01:47:40 -05:00
Tastyfish
db806b85d0 improved ear examine phrasing 2011-12-22 01:29:47 -05:00
Tastyfish
619ebeba66 updated NT law wording,NT law module in upload,lizards scratch instead of punch via space's rq,fixed downloading books 2011-12-21 03:55:16 -05:00
Tastyfish
376d207435 borgs can mend airlocks, status examine, sinks, manuals 2011-12-20 22:03:48 -05:00
Mister Fox
9f52aef132 Added toggle-godmode, invisibility for Game Admins, BS12 versions of proccall for Game Masters
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
2011-12-20 08:01:54 -05:00
Mister Fox
2dffc6d00d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-20 06:43:08 -05:00
MlocMcMloc
9024737097 Merge pull request #126 from MlocMcMloc/master
Removing EI NATH and gib-dropping.
2011-12-20 02:57:06 -08:00
Mloc
d906d1358f Removed wizard gib spell, make gibbing and dust-ing drop everything on the person.
Signed-off-by: Mloc <mloc@mloc.netii.net>
2011-12-20 10:12:51 +00:00
SkyMarshal
dafd9d68f9 Final revision of Security Console (Hopefully.) 2011-12-19 23:24:00 -07:00
SkyMarshal
14ac797deb Should finialize the improved Security Console 2011-12-19 22:12:04 -07:00
SkyMarshal
618fd87f35 Not done yet. 2011-12-19 11:01:24 -07:00
unknown
3fac91df13 Merge remote-tracking branch 'upstream/master' 2011-12-19 09:20:09 -07:00
MlocMcMloc
7f540f6811 Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738
Yet again, check the description.
2011-12-19 08:09:25 -08:00
MlocMcMloc
eebad1184b Merge pull request #119 from Tastyfish/master
added 2 ears! (DNA scan this time!)
2011-12-19 08:08:53 -08:00
Mister Fox
35b68d10e1 Automatic guest kicking
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
2011-12-19 08:30:15 -05:00
Miniature
9d16875f56 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-19 21:04:21 +10:30
Miniature
6a9ed446be Fixed camera chunks still being shown when an AI dies in freelook mode 2011-12-19 21:03:47 +10:30
SkyMarshal
a9b246b4ab Second rework of security console. Not done. 2011-12-19 00:13:05 -07:00
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
CompactNinja
f401c2e9ed Yes CN, ckey IS all in lower case. Lil' insignificant bugfix on my behalf.
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
2011-12-19 01:37:53 +10:30
Tastyfish
e85b253eb3 Merge remote-tracking branch 'upstream/master' 2011-12-18 06:12:21 -05:00
Tastyfish
7d48e87e2a made 2-eared setup prettier 2011-12-18 06:12:00 -05:00
Albert Iordache
bca2746d7c Fixed a spelling mistake. 2011-12-18 13:05:18 +02:00
Albert Iordache
f4a24a9804 Merge pull request #118 from SkyMarshal/master
Removed a lot of goonish flavor text, resprited emag and centcom id.
2011-12-18 03:03:04 -08:00
Tastyfish
e3219fd09d 2 ears! 2011-12-18 06:02:15 -05:00
SkyMarshal
fda118e9ac Reworked emag again, new centcom id sprite, removed derpy flavor text. 2011-12-18 03:20:54 -07:00
Albert Iordache
1816be90a0 Merge pull request #117 from SkyMarshal/master
Again, check description.
2011-12-18 00:28:53 -08:00
SkyMarshal
3d51c2487b Fixed a bunch of descriptions. 2011-12-18 01:06:05 -07:00
SkyMarshal
9c1b83bd88 Fixed some derp. 2011-12-18 00:26:53 -07:00
SkyMarshal
fc3914364f Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. 2011-12-18 00:23:02 -07:00
Tastyfish
64cad184a1 dna scan 2011-12-17 23:06:58 -05:00
Tastyfish
75ddaeb9f9 Merge remote-tracking branch 'upstream/master' 2011-12-17 21:52:05 -05:00
Tastyfish
a741413992 carve books, remove immovable rod/gr3y t1de 2011-12-17 20:46:42 -05:00
SkyMarshal
a0298c0477 Should improve pepper spray a bit. Reduced to 2 shot per Hawkie's request. 2011-12-17 18:37:23 -07:00
Miniature
f0aadd4c70 Merge pull request #112 from Miniature/master
Sanity checking for secret (step 1 in fixing hideous number of runtimes)
2011-12-17 05:26:02 -08:00
Miniature
803f79c165 This should lower the hideous number of runtimes we've been having lately. 2011-12-17 23:49:20 +10:30
Albert Iordache
d8d876681e Merge pull request #110 from SkyMarshal/159ce32cc7ed547c2004fcc260c16282a415afbc
Too long for the title, check the description
2011-12-17 01:27:00 -08:00
Miniature
8b15283862 Made sandbox not votable 2011-12-16 22:25:02 +10:30
SkyMarshal
159ce32cc7 Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg. 2011-12-15 23:58:17 -07:00
SkyMarshal
79ad7d1ae9 Should improve pepper spray, and remove coolness check on detective's revolver 2011-12-15 20:34:36 -07:00
Jimapples
5926961f13 Added a missing food icon 2011-12-14 21:03:23 +00:00
Tastyfish
6dbe431045 bunch of library fixes / improvements 2011-12-14 07:39:03 -05:00
Miniature
11281605e9 Merge pull request #105 from Miniature/master
Fixed getting too much sand from a single tile by clicking really fast
2011-12-13 18:34:08 -08:00
Miniature
79bb7bdf61 Fixed getting too much sand from a single tile by clicking really fast 2011-12-14 13:02:09 +10:30
CIB
e6901f2317 Merge pull request #103 from Tastyfish/master
Hahah, them so silly
2011-12-13 09:11:26 -08:00
Miniature
8695077f43 display player info -> show player info
so that typing "player{tab}{enter}" brings up player panel again
2011-12-14 00:01:13 +10:30
Tastyfish
0e8d32df49 fixed com console security screen 2011-12-13 01:32:03 -05:00
Albert Iordache
62bdb7e67a Merge pull request #102 from Miniature/master
Dogs don't wear clothes.
2011-12-12 21:35:24 -08:00
Miniature
8889972b07 Dogs don't wear clothes. 2011-12-13 13:18:46 +10:30
Albert Iordache
d1f3e867ea Merge pull request #100 from Tastyfish/master
Updated firing range, added pepperspray refill in armory
2011-12-12 10:55:50 -08:00