Commit Graph

5164 Commits

Author SHA1 Message Date
cib
65fb51b7fa Added automatic crew transfer votes. 2012-07-07 18:58:58 +02:00
cib
418818bf9c Fix issue #1406 2012-07-07 18:27:09 +02:00
CIB
aac8f9ebc8 Fixed an issue where laws would not properly be added if they were too high of a number. 2012-07-07 17:57:05 +03:00
cib
289efd9fe5 Missing legs will now also slow down movement. 2012-07-07 13:33:26 +02:00
cib
674042aa35 Cauterizing amputated limbs should now stop the pain. 2012-07-07 13:00:29 +02:00
cib
bce2e2a66a Removed redundant wire object. 2012-07-07 11:17:11 +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
CIB
f6fe1f252e Fixed some issue with cyborg limb repair wires. 2012-07-07 11:58:52 +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
0d5b85720c Fixed an error related to the "Anomalist" rank and paper hats 2012-07-07 00:15:51 +03: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
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