Commit Graph

1395 Commits

Author SHA1 Message Date
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
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
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
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
46dcfb2d3d Fixes wounds not bleeding and makes gauze stop bleeding
Fixes issue #1408
2012-07-05 20:48:08 +03: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
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
Erthilo
f4b5961add Added notification for non-whitelisted people. Also updated whitelist with Spaceman96 2012-06-29 03:28:26 +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
Erthilo
95bae4da54 Fixes AI holopad speech not being picked up by tape recorders. 2012-06-28 22:33:07 +01:00
Erthilo
83542c9955 Fixes alien language indicators being overriden. 2012-06-28 22:32:25 +01:00
Erthilo
92b7eb534a Fixes sleeping resting message spam. 2012-06-27 22:34:55 +01:00
Erthilo
1e63e35ab4 Fixes double icons in examine, and random " on his head" " on his groin" messages. 2012-06-27 20:29:40 +01:00
Erthilo
4460bc2011 Simple animals can now use the Me verb. 2012-06-27 18:09:32 +01:00
Erthilo
c95a5a512c TG: - The adminhelp sound is now a character setup option for admins of any rank.
Revision: r3784
Author: 	 baloh.matevz
2012-06-26 01:00:06 +01:00
CIB
d8a5824cbc Merge pull request #1392 from Erthilo/master
Medical System Updates + Bug fixes
2012-06-25 02:52:05 -07:00
CIB
47aca7ca44 Merge pull request #1393 from CIB/master
Fixed a derp
2012-06-24 19:30:27 -07:00
cib
7f5db7ab68 Fixed BE_CULTIST/BE_PAI derp. 2012-06-25 04:27:19 -07:00
Erthilo
bb8f21a431 Possible fix for everyone being referred to as "It". 2012-06-25 01:19:47 +01:00
Erthilo
67c5e8e3a8 Medical System Updates...
* Dragging someone while injured (brute) will have a small chance of injuring them further that increases depending on how damaged they are. This coincides with the blood spatters that are already generated.
* Blood is now actually lost from the person being dragged.

* Added splints that can be applied to broken arms and legs, and will reduce effects of broken limbs. These can be removed the same way as handcuffs. They show up on the mob and on examine.
* Added an autoinjector that can only hold five units, but acts like a hypospray.
* Added an advanced medical kit that Medical Doctors spawn with that has Advanced Trauma Kits, Advanced Burn Kits, autoinjectors, and splints.
* Health Scanners now show unsplinted fractures ONLY in arms or legs.

* People in critical (less than -50 health) from external trauma (100+ damage from brute and/or burn) bleeding, and with unsplinted limbs, will send a message to anyone trying to drag them, to warn them it would be a bad idea trying to move them. They will suffer a lot more damage if dragged while lying down.
* The correct procedure is therefore, A) Bring a roller bed, or B) Splint all limbs, stop all bleeding with gauze, and then drag them.

* Fixed CPR being performed at weird health levels.
2012-06-25 01:18:55 +01:00
SkyMarshal
315e027b05 Merge pull request #1385 from SkyMarshal/BugFixes
Sanity for the "give" command, changelog.
2012-06-23 21:39:46 -07:00
SkyMarshal
484c01498d Sanity for the "give" command, changelog. 2012-06-23 21:38:39 -07:00
Erthilo
a4f3cada24 Compile error fixing. 2012-06-24 02:42:30 +01:00
Erthilo
ce6cd204f2 Accidentaly reverted a file. 2012-06-24 01:57:12 +01:00
Erthilo
b3285fd716 Updated use of gender proc. 2012-06-24 01:54:48 +01:00
Erthilo
0f8cf93095 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-24 01:53:10 +01:00
Erthilo
163c269cc3 Fixes disarm not working due to armour. 2012-06-24 01:52:44 +01:00
Erthilo
f88f097777 Fixes ghost with ghost ears off hearing whispers. 2012-06-24 01:23:43 +01:00
Erthilo
85f75e639c Fixes morph and appearance editing not updating sprites. 2012-06-24 01:12:16 +01:00
Erthilo
a5adf9377f Fixes changing hairstyles if you pick the same species. 2012-06-24 01:11:31 +01:00
SkyMarshal
0737f64d12 Goddammit 2012-06-23 17:07:33 -07:00
SkyMarshal
3efa1d4e6b More fixes. 2012-06-23 17:00:28 -07:00
SkyMarshal
25757511d6 Fixed a derp 2012-06-23 16:36:34 -07:00
SkyMarshal
62c3d1d11d De-retarded wound system. 2012-06-23 16:35:58 -07:00
Erthilo
00b4a234c4 Merge fixes. 2012-06-23 22:17:59 +01:00
Erthilo
a9bfaf4173 TG: - Added basic heavy-duty cables, they cannot be destroyed with wirecutters,
unfortunately they currently cannot be created either. Not present anywhere on
the map yet.
- Fixed a bug with masks, which did not follow the equipment rules of the
SLOT_MASK flag.
- Fixed a problem where monkeys could not equip a backpack.
Revision: r3774
Author: 	 baloh.matevz

TG: - Added the heavy cable sprites, sprited by Thunder11.
Revision: r3775
Author: 	 baloh.matevz
2012-06-23 16:21:44 +01:00