Commit Graph

2575 Commits

Author SHA1 Message Date
Albert Iordache 4b350214a9 Fixed two runtimes errors (AI eye and artifacts) 2012-07-15 12:50:27 +03:00
Albert Iordache 0762b2a9eb Fixed a case where examine becomes bugged after an admin revives a player 2012-07-14 14:08:17 +03:00
Albert Iordache b94b57e04c Partially fixed the double definition of BROKEN, renamed organ definitions 2012-07-13 23:42:05 +03:00
Albert Iordache dd6c41ade1 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/modules/research/xenoarchaeology/artifact_effect.dm
2012-07-13 20:58:48 +03:00
Albert Iordache dda09390ac Merging pull request from caelaislinn-master 2012-07-13 20:54:22 +03:00
Albert Iordache b4c7e25d94 Merge pull request #1469 from Abi79/bugfix
Quick fix to avoid artifact runtime error spam
2012-07-13 02:48:21 -07:00
Albert Iordache 05851aa0e4 Quick fix to avoid artifact runtime error spam 2012-07-12 15:57:53 +03:00
Albert Iordache aab476a847 Optimized the mineral processing machine a bit 2012-07-12 15:40:13 +03:00
Albert Iordache ff91b3d499 Added a limit of ore to the ore boxes and lowered the limit of ore for satchels 2012-07-12 15:38:53 +03:00
Albert Iordache f5fff3d937 Re-added the limit of 10 items moved per tick, for conveyor belts 2012-07-12 15:37:22 +03:00
Albert Iordache 3059f37f9a As in human/life(), made metroid/Life() abort if stat == 2 2012-07-11 11:33:43 +03:00
Albert Iordache f7c41f6b42 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-10 22:06:11 +03:00
Albert Iordache d47b71b7c8 Added cancel button to teleport dialog, close button to PDA window and cancel button to telepathic mind projection 2012-07-10 16:31:19 +03:00
CIB f083c109bf Fix issue #1449 2012-07-10 13:09:15 +03:00
Albert Iordache 1e468ba4f6 Fixed the "do/does" examine bug for humans 2012-07-10 12:00:40 +03:00
CIB d2a23a6afc Fixed issue #1456 2012-07-10 10:53:02 +03:00
Albert Iordache 1faea6c508 Removed the artifact stun effect 2012-07-10 09:37:59 +03:00
CIB d5f633a79a Radiation protection was unbalanced: A full rad suit would only give 15% protection 2012-07-09 21:30:35 +03:00
SkyMarshal 376706aecd Merge pull request #1457 from CIB/master
Admins will now be notified if a reported player logs in.
2012-07-08 12:15:19 -07:00
cib 0bd54bd612 Admins will now be notified if a reported player logs in. 2012-07-08 20:16:18 +02:00
caelaislinn bfa9fed862 new chemistry reagent and recipe used with xenoarch
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-09 01:06:10 +10:00
caelaislinn 4e5a44864b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-08 23:10:29 +10:00
caelaislinn 89ff98a2d0 fix for [name] drops what they were holding, their l_hand malfunctioning!
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-08 20:40:52 +10:00
caelaislinn 4100df644d crystals shouldn't spam as much
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-08 20:23:07 +10:00
cib 65fb51b7fa Added automatic crew transfer votes. 2012-07-07 18:58:58 +02:00
cib 289efd9fe5 Missing legs will now also slow down movement. 2012-07-07 13:33:26 +02:00
cib eb8696a919 Fixed bugs in the wire limb repair message. 2012-07-07 11:13:53 +02:00
CIB 72f86d7d2d Regular cable coil can now be used for mending cyborg limbs. 2012-07-07 12:03:28 +03:00
Albert Iordache 276644f601 Merge pull request #1441 from caelaislinn/master
map fixes and other
2012-07-06 23:19:53 -07:00
cib e7b58bde43 Merge github.com:Baystation12/Baystation12
Conflicts:
	html/changelog.html
2012-07-07 07:58:32 +02:00
cib 4a4524e137 Tried to fix the amputee pain problem. 2012-07-07 07:55:05 +02:00
caelaislinn cf7dd519e5 archaeo item updates/additions, map fixes, fix for ore box icon
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-07 09:00:37 +10:00
Albert Iordache f3f15002ed Merge pull request #1440 from caelaislinn/master
shielding generator fixes
2012-07-06 11:09:10 -07:00
CIB 0481a16e3c Merge pull request #1437 from comma/master
Bugfixes
2012-07-06 11:01:04 -07:00
CIB 21661e7a75 Bugfix: False code in blood generation. 2012-07-06 19:52:24 +03:00
caelaislinn 34f17b8d90 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-06 11:52:13 +10:00
caelaislinn 613c9457ed shielding circuitboards should be buildable now
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-06 11:17:58 +10:00
unknown 46dcfb2d3d Fixes wounds not bleeding and makes gauze stop bleeding
Fixes issue #1408
2012-07-05 20:48:08 +03:00
Albert Iordache 4c447d2374 Merge pull request #1436 from caelaislinn/master
anomaly / research updates, shield generator fixes, resaerch outpost and shuttle dock added to tgstation.dm
2012-07-05 07:27:31 -07:00
caelaislinn 6d51e57702 artifact files moved to new folder to avoid clutter, mining north outpost repurposed as research outpost, shuttle dock added to research wing (both shuttle dock and outpost require standard research access), modified layout of the anomaly lab slightly 2012-07-05 23:47:35 +10:00
unknown b1a9b7b66c Found the cause of lasers not damaging humans
Please be more careful with #define names.
Fixes issue #1427
2012-07-05 15:09:17 +03:00
caelaislinn 7f21c4530a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-05 20:28:54 +10:00
cib 2e70d5549f Merge branch 'master' of git@github.com:Baystation12/Baystation12 2012-07-05 09:59:02 +04:00
cib 951e691ec4 Fixed a derp 2012-07-05 07:54:49 +02:00
cib 1c19134427 Merge branch 'master' of git@github.com:CIB/Baystation12 2012-07-05 09:43:18 +04:00
cib ede4c1cb56 Fixed a few more bugs. 2012-07-05 07:43:00 +02:00
cib 9061bb167b Now changes to the arm will also affect the hand where necessary. 2012-07-05 07:35:23 +02:00
cib 7c69c859dd Merge branch 'master' of git@github.com:CIB/Baystation12 2012-07-05 09:23:26 +04:00
cib d6e575c6b8 Fixed a few bugs. 2012-07-05 07:23:12 +02:00
cib e92669d155 Merge branch 'master' of git@github.com:CIB/Baystation12 2012-07-05 09:01:34 +04:00