Commit Graph

5002 Commits

Author SHA1 Message Date
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
d931bb9ad7 Removed X button from PDAs. 2012-07-11 13:18:36 +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
c2c71481e0 Lowered the amount of time for which a RadBelt event lasts, made the crew quarters safe as well and drastically lowered the amount of damage monkeys receive. Safe areas are also revealed to the crew.
Feel free to balance afterwards, but I felt this was overall needed, because the events were so dangerous that they were annoying, and AFK people were also affected.
2012-07-10 23:04:21 +03:00
Albert Iordache
a2ef50ed29 Fixed bug where helmet lights would not turn off when placed in backpacks and updated changelog 2012-07-10 22:14:08 +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
f9f8543a49 Merge github.com:Baystation12/Baystation12 2012-07-10 07:49:09 +02:00
Albert Iordache
a545ebda03 Merge pull request #1459 from comma/master
Tape fix
2012-07-09 21:49:17 -07:00
cib
558cf4f0e5 Maintenance shafts safe from radiation belts. 2012-07-09 20:57:11 +02:00
CIB
d5f633a79a Radiation protection was unbalanced: A full rad suit would only give 15% protection 2012-07-09 21:30:35 +03:00
unknown
a491ca0883 Fixed tape quirks
Sprites having non-transparent background and tape being placed 'diagonaly' even though user gets message that it could not be
2012-07-09 20:03:29 +03:00
cib
368cf3b60d Handled reports will not cause messages upon login anymore. 2012-07-09 16:06:24 +02:00
CIB
9f7c037d3f Moved the restart vote reminder inside the vote dialog. 2012-07-09 11:59:23 +03:00
Albert Iordache
ed8d48333d Fixed a bug where non-admins would receive a message about mod reports on login 2012-07-09 09:09:31 +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
Albert Iordache
a3ea5fb087 Fixed a bug where rig helmet lights would not turn off and a bug with door assembly icons. 2012-07-08 19:25:10 +03: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
089c1db537 fixed some area issues with the research outpost
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-08 20:23:23 +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
Uristqwerty
c968343d6f Infinite loop fix for splitting on null 2012-07-07 23:16:40 -04:00
CIB
7efa3b38fe Automatic votes default to "none" now, but I added some extra info to the announcement. 2012-07-08 00:13:26 +03:00
SkyMarshal
e951f7fe6c Merge pull request #1448 from CIB/master
Vote changes and automatic crew transfer vote
2012-07-07 10:47:18 -07:00
cib
3d0dacc6ff Made it so vote-initiated transfer shuttle will come despite mode etc. 2012-07-07 19:17:44 +02:00
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