Commit Graph

2883 Commits

Author SHA1 Message Date
SkyMarshal
a9b246b4ab Second rework of security console. Not done. 2011-12-19 00:13:05 -07:00
SkyMarshal
882fb96574 Removed backup map 2011-12-18 21:19:57 -07:00
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
CompactNinja
9afbbfb2d3 Merge pull request #120 from CompactNinja/master
Yes CN, ckey IS all in lower case. Lil' insignificant bugfix on my behalf.
2011-12-18 07:08:53 -08: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
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
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
Albert Iordache
5439999056 Merge pull request #113 from Tastyfish/master
carve out books, remove immovable rod/gr3y t1de from event RNG, dna scan
2011-12-17 23:35:11 -08:00
SkyMarshal
5030421e42 removed some more derp 2011-12-18 00:29:45 -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
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
MlocMcMloc
daaae0d298 Merge pull request #111 from Miniature/master
Made sandbox not votable
2011-12-16 10:17:35 -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
Albert Iordache
6a7223ce58 Merge pull request #108 from Tastyfish/master
some tgstation.2.0.8.dmm fixes
2011-12-15 11:06:58 -08:00
Tastyfish
be14295d2b fixed server room freezer, wall->r_wall at ce's office port side, removed leftover caution sign at firing range 2011-12-15 14:01:26 -05:00
Albert Iordache
36142c16df Merge pull request #107 from AppleMaster/master
Added a missing food icon
2011-12-14 13:20:09 -08:00
Jimapples
5926961f13 Added a missing food icon 2011-12-14 21:03:23 +00:00
Albert Iordache
46aa95b329 Merge pull request #106 from Tastyfish/master
tgstation2.0.8 update. Library bug fixes / improvements.
2011-12-14 12:09:58 -08:00
Tastyfish
6dbe431045 bunch of library fixes / improvements 2011-12-14 07:39:03 -05:00
Tastyfish
71a14dc031 Merge remote-tracking branch 'upstream/master' 2011-12-14 02:45:15 -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
Albert Iordache
6a368d7422 Fixed the tgstation.2.0.8.dmm map 2011-12-13 21:28:12 +02:00
CIB
e6901f2317 Merge pull request #103 from Tastyfish/master
Hahah, them so silly
2011-12-13 09:11:26 -08:00
CIB
63066be972 Merge pull request #104 from Miniature/master
display player info -> show player info
2011-12-13 09:10:39 -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
0d9b764d27 Merge remote-tracking branch 'upstream/master' 2011-12-13 02:00:55 -05:00
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
Albert Iordache
11576954c9 Merge pull request #101 from Miniature/master
Added shitty MSPaint recolour for sec rig suit
2011-12-12 07:23:37 -08:00
Miniature
b3edc62393 Added shitty MSPaint recolour of engineering rig for security rig UI (it was using the on-mob sprites) 2011-12-13 01:37:29 +10:30
Tastyfish
cffcb866aa in antiqua.dmm, redid kitchen, bar, medbay storage, and played with patient rooms a bit 2011-12-12 05:20:21 -05:00
Tastyfish
e9d9864720 Merge remote-tracking branch 'upstream/master'
Conflicts:
	maps/tgstation.2.0.8.dmm
2011-12-12 02:23:50 -05:00
Tastyfish
d133fbe61d sleepy pens cost 4 2011-12-12 02:09:16 -05:00
Tastyfish
c3d6d6702a actually did skymarshal's changes to the PDA uplink, he changed the nuke team uplink radio 2011-12-11 21:20:06 -05:00
Tastyfish
237a80cc88 Updated firing range, added pepperspray refill in armory 2011-12-11 20:17:54 -05:00
Albert Iordache
7165b3d18b Inducted Hawk into our ranks. 2011-12-12 00:39:42 +02:00