Commit Graph
1487 Commits
Author SHA1 Message Date
ryantennessee@yahoo.comandAlbert Iordache 7707864437 TG update: Jetpack changing to wrong sprite when turned on fixed. Syringes will autochange inject/draw when full/empty. Medborg syringes start full and set to inject even though the icon is still messed up.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 22:05:16 +02:00
Tastyfish baef1bdad7 take morgue from chef 2011-12-24 09:58:21 -05:00
Tastyfish 37fb4590da by request of spaceman, nuke agents get their real name 2011-12-24 09:17:49 -05:00
Tastyfish ea755d98a8 people going crazy over hos coat 2011-12-24 00:43:08 -05:00
Albert Iordache b067fdc726 TG update: ...
- added feedback logging for alert levels
 - alert level descriptions are now part of config.txt
 - alert levels default to the ones I had before, if the config file isn't configured.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2641 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 00:50:52 +02:00
baloh.matevz@gmail.comandAlbert Iordache aa49a82b80 TG update: detailed in the next commit. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2634 316c924e-a436-60f5-8080-3fe189b3f50e 2011-12-24 00:50:50 +02:00
Miniature d74592c99e Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-24 03:34:53 +10:30
Miniature 803bed1c18 Custom items for special people
They have to be manually coded in atm, but someone will no doubt eventually make it use a database when we get that going again (if we don't already)
2011-12-24 03:34:25 +10:30
Miniature 701ea98e6d Fixed a vote runtime, hopefully this makes it delay start (probably won't tho) 2011-12-23 19:14:58 +10:30
cib d539e4b539 Changed the pregame time from 90 seconds to 180 seconds. Delay(admin verb) can now also be used after round end has been announced, to keep the world from rebooting. Also boosted the restart delay from 25 seconds to 60 seconds. 2011-12-22 16:34:10 -08:00
Albert Iordache 08b7c6487b Merge pull request #130 from Tastyfish/master
improved sec/med id card handling, records management, also spaceman christmas
2011-12-23 01:17:13 -08:00
Miniature f311f8c7cc Merge pull request #131 from Miniature/master
Fixed a vote runtime
2011-12-23 00:47:46 -08:00
Tastyfish a302464d3b Merge remote-tracking branch 'upstream/master' 2011-12-23 02:22:39 -05:00
Tastyfish d14b67782a added being able to backup sec/med records to disks, ejecting card trys to put it in your hand before dumping it ontop 2011-12-22 05:34:05 -05:00
Albert Iordache 6891b856c4 Fixed an obj/item/seeds/proc/harvest() runtime error related to grass seeds. 2011-12-22 09:30:34 +02:00
Tastyfish cee9634606 stick id's in computer by using id on it, better ear examine text 2011-12-22 01:47:40 -05:00
Albert Iordache 09d7739b08 Fixed a runtime error related to all items now being checked for var/protective_temperature and fixed another runtime error by doing something unholy. 2011-12-22 00:12:29 +02: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
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
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
Tastyfish e85b253eb3 Merge remote-tracking branch 'upstream/master' 2011-12-18 06:12:21 -05:00
Tastyfish e3219fd09d 2 ears! 2011-12-18 06:02:15 -05:00
Albert Iordache 1816be90a0 Merge pull request #117 from SkyMarshal/master
Again, check description.
2011-12-18 00:28:53 -08: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
Tastyfish 6dbe431045 bunch of library fixes / improvements 2011-12-14 07:39:03 -05:00
Tastyfish 0e8d32df49 fixed com console security screen 2011-12-13 01:32:03 -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
Miniature da96fabe25 Fixed json thing 2011-12-12 01:33:47 +10:30
Albert Iordache b411ecf570 Merge pull request #95 from Strumpetplaya/master
Greatly increased the chance for breath mask and oxygen tank to spawn in O2 closets
2011-12-11 00:25:50 -08:00
Albert Iordache 9b42ef2db8 Merge pull request #94 from headswe/master
Made blob take damage from airbased fire hopefully.
2011-12-11 00:25:00 -08:00