Commit Graph

7804 Commits

Author SHA1 Message Date
Cael_Aislinn
addb95137c made autoinjectors visible again, fixed medibot construction, fixed tajaran ears while lying down
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-15 21:02:04 +10:00
Mloc
9ca5caa419 Fixed the fix of the movement fix thing. Or something.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-11-14 21:39:49 +00:00
Mloc
7cd054e09a Merge pull request #1941 from CIB/master
Ported autopsy
2012-11-14 13:29:20 -08:00
cib
0d03f87958 Made autopsy age estimates use station time. 2012-11-14 21:40:46 +01:00
cib
19d2e9d390 Made the autopsy report for projectiles a bit clearer. 2012-11-14 21:33:09 +01:00
cib
2b5d3cac39 Fixed a few organ getter bugs. 2012-11-14 20:59:38 +01:00
cib
7ae7099098 Ported autopsy. 2012-11-14 20:31:31 +01:00
Hawk-v3
317e40795a Merge pull request #1939 from CIB/master
Misc stuff
2012-11-14 10:29:57 -08:00
Hawk-v3
31a40885b5 Merge pull request #1938 from SkyMarshal/bugfixes
Fixed a compile warning, Possible fix for adminhelp-IRC relay, readded unbolting AI and associated traitor checks, reverted my grenade changes.
2012-11-14 10:29:21 -08:00
cib
a63e26651f Merge git://github.com/comma/Baystation12 2012-11-14 18:16:41 +01:00
cib
0491390edc Corrected the blood warning levels in medical scanner. 2012-11-14 18:13:04 +01:00
cib
c96d245f2d Fixed a bug where all organs would heal always. 2012-11-14 18:01:55 +01:00
cib
397f010de5 Buff bandage healing speed. A LOT. 2012-11-14 16:51:58 +01:00
cib
09cbf1f684 Fixed a compile error. 2012-11-14 16:45:22 +01:00
cib
450248864b Added lung rupturing and lung surgery. 2012-11-14 16:20:47 +01:00
cib
e5b62c98c6 Restructured alien removal surgery.
This way it later can be used for lung surgery.
2012-11-14 13:54:18 +01:00
cib
b4d335e077 Merge github.com:Baystation12/Baystation12 2012-11-14 13:33:01 +01:00
Chinsky
3caa7a14d3 Added science alt_titles 2012-11-14 15:21:56 +04:00
Chinsky
eaeb8a1bd6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-14 14:59:07 +04:00
Chinsky
29c295fee9 Made Virologist an alt_title of MD. 2012-11-14 14:58:41 +04:00
CIB
274d422cd4 Nerfed suffocation speed. 2012-11-14 11:26:56 +01:00
SkyMarshal
2fece529af Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps. 2012-11-13 22:46:43 -07:00
SkyMarshal
508f94a072 Possible fix for why IRC is not getting adminhelps. 2012-11-13 22:14:10 -07:00
MrYeti
2b56956d67 Added Smash Recipe Custom Item 2012-11-13 19:56:52 -05:00
Ater Ignis
2400495619 seems i broke some >_< 2012-11-14 00:45:21 +04:00
cib
422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 19:01:03 +01:00
cib
c1fb2766b7 Increased the progression time for appendicitis and alien embryo. 2012-11-13 18:54:54 +01:00
cib
48f84e711a Added pain messages to alien surgery. 2012-11-13 18:28:27 +01:00
cib
78ed2e54eb Added alien surgery. 2012-11-13 18:22:48 +01:00
cib
ee785a17fc Radiation announcement now happens before radiation. 2012-11-13 17:55:59 +01:00
cib
9a9e33b4ea Disable silly radiation event mutations. 2012-11-13 17:52:03 +01:00
cib
c7b8bda2af Merge branch 'master' of github.com:CIB/Baystation12 2012-11-13 17:14:58 +01:00
cib
2eb4022fe4 Surgery now triggers specialized pain messages if not done with anesthetic. 2012-11-13 17:06:06 +01:00
cib
ef4ee093a5 Balance fixes to internal wounds.
- Their damage now increases more slowly.
- They now cause faster bleeding.
- They can't be cured anymore with bicaridine etc.
2012-11-13 16:01:43 +01:00
cib
3dc4a56554 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-13 15:39:38 +01:00
Chinsky
d5e8f90a9e Made virus crate spawn with virus2 samples instead of old ones. 2012-11-13 17:45:22 +04:00
CIB
d693836fb2 Fixed a small issue with germs 2012-11-13 14:12:40 +01:00
CIB
74c5235c9d Added back the "unknown substance" message 2012-11-13 14:11:03 +01:00
Chinsky
e5706a55d3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-13 10:12:45 +04:00
Ispil
8814647be5 Fix to AIs and Cyborgs being able to "fall asleep" when they log off, but not being able to wake up when they return. They should no longer fall asleep. 2012-11-12 21:15:26 -07:00
Ispil
0a4d79e54f Fix to Tajaran/Skrell/Soghun not mrowling/warbling/hissing, respectively. 2012-11-12 20:39:42 -07:00
Chinsky
8e60315b11 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 04:02:26 +04:00
Chinsky
94b54d1cef Fix for laughing gas leaks in surgery.
Humans breath out same gas mix datum they breathed in.
Works fine because in processing oxygen and CO2 levels in mix are adjusted.
But trace gases remained untouched.
So sedated patient just breathed out N20 at surgeon.
2012-11-13 03:42:40 +04:00
Chinsky
0caf4673ce Fix for sleep runtime.
Fix for internals setting message.
2012-11-13 02:05:13 +04:00
Chinsky
bd20233c35 Added color coding to health analyzers, much like crew monitors.
Numbers for each damage will be written in corresponding color, bolded if above 50.
2012-11-13 01:56:31 +04:00
Mloc
daac550822 Revert movement speed changer glide thing I DONT KNOW THE NAME AAAH.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-11-12 21:54:16 +00:00
Chinsky
058aa7a795 Fix for training gun runtime. 2012-11-13 01:42:11 +04:00
Mloc
30243c3eb4 Merge pull request #1928 from Ispil/2a7aab1042cc99f941cb94e7338f80be64aed067
Fix to Issue #1887
2012-11-12 12:34:10 -08:00
Mloc
d659b567a4 Fix for practice lasers.
Addresses #1924
2012-11-12 20:21:30 +00:00
Ispil
2a7aab1042 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-12 13:21:07 -07:00