Commit Graph

5150 Commits

Author SHA1 Message Date
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
unknown
050b697486 Ugh, grammar 2012-07-06 15:37:05 +03:00
caelaislinn
34f17b8d90 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-06 11:52:13 +10:00
caelaislinn
062635f3da tweaks and fixes for shielding, relating to building and useability
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-06 11:51:47 +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
3d839120a4 and some more 2012-07-05 23:06:03 +03:00
unknown
df61f5abb8 Let some debug slipping in 2012-07-05 23:03:05 +03:00
unknown
46dcfb2d3d Fixes wounds not bleeding and makes gauze stop bleeding
Fixes issue #1408
2012-07-05 20:48:08 +03:00
unknown
79c0a67ed0 Crew transfer will now go without flashing red alarms
Fixes issue #1339
2012-07-05 19:51:30 +03:00
unknown
cde6aa0e35 Fixed phantom donut bug
Fixes issues #1431 and #1183
Also fixes similar bug with SE injector and any item that gets deleted while in hand
2012-07-05 18:28:38 +03:00
unknown
507dc7cc84 Fixed surgery bleeding bug
Clampers did not clamp properly
2012-07-05 17:32:45 +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
caelaislinn
1af96105c0 shield generator circuitboard added
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-05 23:44:00 +10:00
caelaislinn
9d6f45e806 shield capacitors can now be rotated correctly
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-05 23:43:43 +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
unknown
7a8f5ec38e Makes ointment give different message from gauze when applied.
No more 'bandaging with ointment' (Issue #1430)
2012-07-05 15:08:12 +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
cib
b831a64bc2 Added limb selection to preferences. 2012-07-05 07:00:22 +02:00
cib
dd579bd5fd More work on amorphs. 2012-07-04 17:42:21 +02:00
Erthilo
8acd06ddda Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-07-04 09:00:59 +01:00
caelaislinn
14a7e0da20 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-03 20:55:13 +10:00
Albert Iordache
ca09b7774c Merge pull request #1410 from comma/master
Small things
2012-07-03 02:38:51 -07:00
caelaislinn
05955007ce Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-02 18:49:28 +10:00
CIB
124b27d2e8 Merge pull request #1424 from Drieden/master
Fixed the supply depot for good this time.
2012-07-01 20:06:43 -07:00
caelaislinn
cfb1bf3111 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-01 19:44:34 +10:00
CIB
04fe3dedd6 Bugfix: It was impossible to flag admin reports as handled. 2012-06-30 23:59:54 +03:00
Drieden
c59c35397b Some supply depot improvements and bug fixes. 2012-06-30 09:45:37 -04:00
unknown
b0cb325bb6 Fixed a derp 2012-06-30 14:16:04 +03:00
unknown
427d409113 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-06-30 13:43:08 +03:00
Erthilo
a2ed0517e4 Reverts job numbers to default. Added spawn points to map. 2012-06-29 19:13:45 +01:00
Apple_Master
6102489138 Added Jamini and Cubejackal's custom items. I hope.
Signed-off-by: Apple_Master <cheeckan@gmail.com>
2012-06-29 16:44:03 +01:00
caelaislinn
a8c727ba1a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-30 01:18:33 +10:00
Drieden
7a92faa3e9 Fixed a typo. 2012-06-29 04:56:18 -04:00
CIB
4065470e00 Merge pull request #1415 from Erthilo/master
Bugfixes 2: Electric Boogaloo
2012-06-28 22:15:39 -07:00
Erthilo
0e6c0cfac4 Fixed and improved body scanner, fixed derpy airlock cycling on the map. 2012-06-29 03:28:58 +01:00
Erthilo
f4b5961add Added notification for non-whitelisted people. Also updated whitelist with Spaceman96 2012-06-29 03:28:26 +01:00
Erthilo
991e11b30d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-29 02:56:59 +01:00
Erthilo
2f6af975de Fixes extra description damage values. 2012-06-29 02:32:32 +01:00
Erthilo
f5b221bb63 Fixes a few places where if statements wouldn't work due to syntax errors. 2012-06-29 02:31:46 +01:00