Melvin Melonstorm
754a244073
Added a medbay (with rolling beds) and a holding cell to the destination of the escape shuttle.
...
Some minor typo fixes.
2012-06-25 20:58:01 +02:00
CIB
d8a5824cbc
Merge pull request #1392 from Erthilo/master
...
Medical System Updates + Bug fixes
2012-06-25 02:52:05 -07:00
caelaislinn
c46d2920a6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-06-25 18:07:47 +10: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
390782f544
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-06-25 01:20:08 +01: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
caelaislinn
7bd5beeb17
anomlies now have an activated and non-activated sprite
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-25 09:26:50 +10:00
caelaislinn
00493873c0
artifacts have a disable message
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-25 09:03:39 +10:00
caelaislinn
f131543fb7
fix for never closing bug
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-25 08:55:28 +10:00
caelaislinn
beb863020b
more tweaks and fixes
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-25 08:50:03 +10:00
caelaislinn
ddda9f2ce3
fixes and tweaks for the harvester
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-25 08:35:19 +10:00
caelaislinn
137e15ef62
this should fix the power harvester bug
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-25 07:59:08 +10:00
Albert Iordache
156f1349c2
Fixed compilation error and moved acid_act()
2012-06-24 19:13:51 +03:00
caelaislinn
a240dc71ba
added acid_act() proc, works similarly to proc on luna code, fixed some anomaly bugs
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-25 01:48:55 +10:00
caelaislinn
2237e3f658
talking crystal can be heard with ghost ears
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-24 19:58:21 +10:00
caelaislinn
021ddbde38
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-06-24 16:36:47 +10:00
SkyMarshal
e6aae0103c
Merge pull request #1383 from Drieden/master
...
Prevented genetics from scanning headless people
2012-06-23 21:53:25 -07: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
CompactNinja
9e2629a8c6
Merge pull request #1384 from SkyMarshal/BugFixes
...
Final parts of ZAS. Works like a charm now.
2012-06-23 21:23:19 -07:00
SkyMarshal
e0edc29acf
Final parts of ZAS. Works like a charm now.
2012-06-23 21:20:39 -07:00
Drieden
778f40e469
Prevented genetics from scanning headless people and permanently breaking the cloner.
2012-06-23 23:42:24 -04:00
CIB
5ce9c23312
Merge pull request #1380 from SkyMarshal/BugFixes
...
ZAS updates and possible fixes. Zones will no longer connect to a space tile under a door.
2012-06-23 19:21:36 -07:00
caelaislinn
37e76d7436
artifact machinery now uses power
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-24 11:57:32 +10:00
caelaislinn
639c00fb66
fix for "the floor emits a pulse of energy"
...
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au >
2012-06-24 11:45:51 +10:00
CIB
c10e9a9242
Merge pull request #1382 from Erthilo/master
...
Compile fixing.
2012-06-23 18:45:03 -07:00
Erthilo
a4f3cada24
Compile error fixing.
2012-06-24 02:42:30 +01:00
CIB
2ef4379765
Merge pull request #1381 from CIB/master
...
Bugfix
2012-06-23 18:24:10 -07:00
cib
b3b35ebfef
Fixed bug with calling the air master.
2012-06-23 18:22:07 -07:00
SkyMarshal
ba75994b29
ZAS updates and possible fixes. Zones will no longer connect to a space tile under a door. Added a secondary airflow value for what can move large objects, like closets.
2012-06-23 17:58:54 -07: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
527110e8b0
Fixes being able to use PDA's that are on other people.
2012-06-24 01:23:29 +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
Erthilo
f137b4a880
Should fix some weird issues with electropacks and screwdrivers.
2012-06-24 01:10:32 +01:00
SkyMarshal
0737f64d12
Goddammit
2012-06-23 17:07:33 -07:00
Erthilo
3882ac24e7
Fixes Syndicate's not spawning with explosive implants properly.
2012-06-24 01:06:11 +01:00
Erthilo
5e7f9edc81
Fixes pAI's not hearing silicon speak (since they can use it anyway).
2012-06-24 01:05:16 +01:00
SkyMarshal
ea5913fde8
*sigh* Missed some stuff, compile fix.
2012-06-23 17:02:30 -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
SkyMarshal
ce7db3f15e
Merge pull request #1374 from Erthilo/TGUpdates
...
TG Updates r3778 to r3752
2012-06-23 15:24:12 -07:00
Erthilo
00b4a234c4
Merge fixes.
2012-06-23 22:17:59 +01:00
