Commit Graph

10065 Commits

Author SHA1 Message Date
cib 4224b2401f ERT spawn button now in secrets. 2012-03-08 15:37:20 -08:00
Tastyfish f7e857d45c Merge remote-tracking branch 'upstream/master' 2012-03-08 00:47:27 -05:00
Tastyfish 6874cc03d1 cleaned up the paths of a few ported things 2012-03-08 00:46:24 -05:00
SkyMarshal df5909446e Merge pull request #634 from Miniature/master
Attack logging (finally)
2012-03-07 20:49:02 -08:00
Miniature cf53a0cc7a Attack logging (finally)
there might be some things I missed, and feel free to change the messages if you want
2012-03-08 15:16:54 +10:30
petethegoat@gmail.com b60aa0dc78 A few clipboard fixes.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3263 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-08 01:16:20 +00:00
joe.heinemeyer@gmail.com bb16e6d1b1 Speed things up yet /AGAIN/ and added an improved UI to the detective's scanner's dossier screen.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3262 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-08 00:59:10 +00:00
SkyMarshal 8e96007b35 Merge pull request #631 from Erthilo/master
Hypospray can now fit on medical belt. Fixed torso bugs. Fixed custom item derp. Small typo fixing.
2012-03-07 16:38:52 -08:00
Ren Erthilo 55d316ee9d Added female torso, so both genders don't use the same one. Repositioned torso when lying down to stop red pixels. Small changes to custom uniforms. 2012-03-08 00:31:37 +00:00
SkyMarshal 7456fb7eae Merge pull request #623 from CIB/master
Look, there's a lot of stuff in here now, just read the commits
2012-03-07 13:26:37 -08:00
SkyMarshal e48a8a17e6 Can't target ghosts anymore. 2012-03-06 21:23:52 -07:00
SkyMarshal c522b5db7b Holy shit did that speed things up. 2012-03-06 21:09:56 -07:00
cib 209162c25e Renamed the "None" skill level to "Layman". 2012-03-06 19:50:03 -08:00
cib 2d99674561 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-06 19:44:43 -08:00
SkyMarshal f0b3802b10 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-06 19:10:39 -07:00
kortgstation@gmail.com 4a6c2aa0aa Removed meat rotting and all associated code in freezers/fridges etc.
Reconnected the freezer room to station atmos, removed its miniature freezing loop thing, starts at a normal temperature, etc.

Moved meat back off the floor and into a fridge.

Reasoning for all this being the game has been laggy enough as of late, we don't need meat and closets processing, and we certainly do not need the chef putting strain on the atmos system every single time he opens the door to his freezer room, especially not for such a trivial thing as rotting meat. REMOVAL APPROVED BY MUSKETS COME AT ME BRO

Also re-added Lamaar to the RD's office.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3261 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-07 01:33:15 +00:00
Hawk-v3 17f128cb02 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-06 19:24:38 +00:00
Ren Erthilo 87502c38b7 Made emagged cyborgs laws gender neutral and use crew. Small reset module description change. 2012-03-06 10:22:34 +00:00
quartz235@gmail.com bb61251005 Moved kill air down to game admin level at least until we address the recent lag issues, authorized by urist
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3260 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-06 10:15:33 +00:00
cib 37f6e216c1 Fixes to available skills. 2012-03-05 23:50:59 -08:00
SkyMarshal d19c9012a7 Detective UI update. 2012-03-05 20:08:38 -07:00
SkyMarshal aa0c6b9aa8 Adjusted the Examine for humans some. Why the hell is this crashing clients? 2012-03-05 19:46:37 -07:00
SkyMarshal 3cb0a51b7f Fixed a smidgen of derpiness with that last code. 2012-03-05 17:22:52 -07:00
joe.heinemeyer@gmail.com cb5a57549d Fixes for detective work. Should fix some of the massive lag, probably caused by all those list()s that were being made for every atom. And this is why I should not code at 2AM. (A UI overhaul-ish thing will come soon for the detective computer.)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3257 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-06 00:01:53 +00:00
SkyMarshal 43f7487429 Some optimizations for fingerprints. General debugging. 2012-03-05 16:33:47 -07:00
SkyMarshal 8ae86d253f Fixed some stupid. 2012-03-05 12:52:01 -07:00
SkyMarshal 7534154fa2 Cleaned up some code, fixed a bug with dead/sleeping people seeing you talk into headsets, reworked guncode some, readded point-blank shooting, removed disposal space cannon, hacktool works on windoors and secure closets, now. 2012-03-05 12:27:55 -07:00
cib 93c91b6018 You can no longer extract chemicals directly from blood.
Derp me, I didn't know extracted blood had a trace chemicals variable.
2012-03-05 10:45:26 -08:00
Ren Erthilo b92ecb932b Added custom items. Small fix for labcoat buttons and descriptions. 2012-03-05 17:52:28 +00:00
cib cd30ab13b3 Fixed machinery operating skill description. 2012-03-05 09:46:19 -08:00
cib b6da27699e Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-05 09:45:16 -08:00
SkyMarshal 3c9fe5a27f Merge pull request #624 from Miniature/master
custom item for Tzefa
2012-03-05 08:03:50 -08:00
elly1989@rocketmail.com f89dbfd276 Fixed the new player-panel. A variable was missed out in the expand function when karma was removed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3256 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-05 15:17:46 +00:00
Miniature 56c2305c3f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-05 18:42:09 +10:30
Miniature 1e75d4cec8 custom item for Tzefa 2012-03-05 18:40:54 +10:30
vageyenaman@gmail.com 8bff40c740 Fix for disposals lag.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3255 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-05 06:05:26 +00:00
vageyenaman@gmail.com 200cfe4809 Fix for dna runtime spam in check_integrity()
Fix for eguns disappearing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3254 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-05 02:18:47 +00:00
cib 4c93cda368 Slowed down the rate at which most chemicals are absorbed. This may still need balancing in some areas. 2012-03-04 17:15:43 -08:00
cib 88c8893cdb Fuel tanks can now be ignited by fire. 2012-03-04 16:28:41 -08:00
petethegoat@gmail.com 0a0f97ef0c Large bureaucracy overhaul.
This affects clipboards, hand labelers, paper, paper bins, pens, photocopiers, and stamps.
Everything (that I've changed significantly) should be BETTER.

NO paths have been changed.
All of the above have been added to the paperwork module (pending rename to bureaucracy, which is COOLER).
SPRITES for most of the above (except photocopiers) are now in bureaucracy.dmi.

Clipboards in particular are MASSIVELY IMPROVED.
Hand labelers can now be turned ON AND OFF, to make it simpler to avoid labelling tables.
This includes work in progress FOLDERS, which currently do NOTHING.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3253 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-05 00:23:05 +00:00
vageyenaman@gmail.com d5bff25b5b Modified TK to be more effective and polished. You can use the TK grab to interact with machines and stuff from far away (but you cannot pick them up!). This means you can also bonk people with items you are holding with your TK grab.
Changed the energy gun sprites to a better-looking version, made by Khodoque!

More work on NTSL. Including the ability to create comments by using // and /* insert comment here */.

Removed the traffic control machine from telecomms, as requested by Urist. NTSL is still a work in progress, and needs to be completely fool-proof before players can get anywhere near it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3252 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-04 21:41:51 +00:00
Albert Iordache 4bd3920b66 Merge pull request #622 from SkyMarshal/master
Fixed headsets, made the AI so you can unbolt it and have an awesome pal.
2012-03-04 10:44:11 -08:00
SkyMarshal f42355282d Fixed headsets, made the AI so you can unbolt it and have an awesome pal. 2012-03-04 11:39:43 -07:00
Ren Erthilo ba38c4b11f Tweaked overdose values so sleepers don't leave any toxin damage. 2012-03-04 16:05:00 +00:00
Ren Erthilo 65bb420d62 Fix for AI command network camera bug. 2012-03-04 13:42:54 +00:00
Albert Iordache 3fcf067310 Merge pull request #613 from SkyMarshal/master
Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event, fixed Tajspeak, fixed the blob, fixed overdoses
2012-03-03 23:55:37 -08:00
SkyMarshal 884fd25f78 Fixed the rest of Tajspeak, radios now give a cue when someone talks into it, fixed throwing and tables, fixed bloodiness, fixed autofiring vars.
You can throw over tables again.
Fixed some bloodiness not being added.
Fixed some vars not being reset.
2012-03-03 23:45:20 -07:00
Albert Iordache 1575df93ce Merge pull request #614 from comma/master
Some derpfixes
2012-03-03 22:26:54 -08:00
comma 5ad05105f4 Small bugfix to ashtrays and cig butts
Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore.
Also glass ashtray now shatters with sound
2012-03-04 06:45:14 +02:00
SkyMarshal 6ab370768b Nerfed overdose damages. 2012-03-03 21:20:42 -07:00