Commit Graph

4691 Commits

Author SHA1 Message Date
Chinsky
0748a0424e Tweak for medical doctors spawn.
Now MDs spawn with pants on.
Reverted my 'spawn naked' change.
2012-11-15 17:33:52 +04:00
Hawk-v3
317e40795a Merge pull request #1939 from CIB/master
Misc stuff
2012-11-14 10:29:57 -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
450248864b Added lung rupturing and lung surgery. 2012-11-14 16:20:47 +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
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
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
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
3dc4a56554 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-13 15:39:38 +01:00
CIB
74c5235c9d Added back the "unknown substance" message 2012-11-13 14:11:03 +01: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
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
Ispil
2a7aab1042 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-12 13:21:07 -07:00
Mloc
45733901a3 Merge pull request #1923 from Ispil/master
Minor AI Ion Storm Law Changes
2012-11-12 12:18:22 -08:00
Mloc
75a40c33e5 Merge pull request #1909 from AterIgnis/airlock_update
Airlock update
2012-11-12 12:17:16 -08:00
Ispil
814a670572 Fix to issue #1887. 2012-11-12 12:29:55 -07:00
cib
4b331f3676 Fixes to internal bleeding.
- Created internal wound doesn't close instantly anymore.
- Small fix to body scanner display.
2012-11-12 14:16:19 +01:00
cib
e92cecdefe Added basic germ code.
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
2012-11-12 12:51:28 +01:00
Ispil
b579300a1e Simple AI Ion Storm Laws change, in accordance with http://baystation12.net/forums/viewtopic.php?f=5&t=5889&p=115166#p115166
The only things changed were things of which Mini agreed with removing or adding, without argument (the ones with all the yeps). Removes some of the more grief-prone laws, and adds one or two to replace.
2012-11-11 23:40:26 -07:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
cib
fb295ee0cf Balancing for genetics side-effects:
- The knockdown is now much shorter, meaning a geneticist may be able to give themselves the cure in time.
- Reduced radiation created from syringes, since there are other side-effects now.
2012-11-11 18:51:02 +01:00
cib
eb49378575 Added genetic side effects. 2012-11-11 18:15:12 +01:00
cib
2522d5e7f1 Fixed up autoinjectors and added health analyzer to regular first aid. 2012-11-11 11:45:24 +01:00
Ater Ignis
efe819ec7c Updated cycling airlocks
New controller can check secondary sensor (tag 'sensor_tag_int
') for current pressure inside of station.
2012-11-11 03:26:37 +04:00
Mloc
4fd90875bc Merge pull request #1904 from RawrTaicho/master
Issue #1818 - Freeform Module Broken Again
2012-11-10 09:27:37 -08:00
Mloc
35132b3036 Merge pull request #1901 from AterIgnis/hud_intent_better
all-intents-intent-button
2012-11-10 08:58:39 -08:00
Connor Reynolds
2f5621fedb Issue #1818 - Freeform Module broken again
-Think- I fixed it. It shouldn't just stop the user after they enter the
law priority number now. Should work properly.
2012-11-10 16:53:39 +00:00
Ater Ignis
20bdba6c67 all-intents-intent-button
shows all possible intents on intent button and allows choosing needed one directly, without scrolling them all
2012-11-10 14:19:02 +04:00
Ater Ignis
8b71b7d106 updated DNA code to have more mutations 2012-11-10 14:12:25 +04:00
MrYeti
9f16527552 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:36:12 -05:00
MrYeti
ea1d27a6a2 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:26:47 -05:00
Ater Ignis
116b17e2be internal explosions
if some explosive reaction occurs - it firstly tries to explode container, next the surroundings
if container is alive - it cuts half of explosion power, if it is dead in process - cut an half again
2012-11-09 20:24:44 +04:00
Hawk-v3
3cfb201846 Merge pull request #1839 from AterIgnis/ed209
ED209 not showing on remote-control chip of security PDA
2012-11-09 07:42:09 -08:00
Hawk-v3
a114c79aca Merge pull request #1894 from comma/master
Limb surgery
2012-11-09 06:52:49 -08:00
Hawk-v3
86f3622d1c Merge pull request #1893 from SniperYeti/master
Security Belt Modifications
2012-11-09 06:50:25 -08:00
Hawk-v3
c4c065dfba Merge pull request #1885 from caelaislinn/bs12_with_tgport
remaining map updates, plus misc
2012-11-09 06:49:39 -08:00
Chinsky
18f56f4a38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 14:32:49 +04:00
Chinsky
2bf2d11730 Merge branch 'limbsurgery' 2012-11-09 14:32:22 +04:00
MrYeti
6a129ea312 Update code/game/objects/items/weapons/storage/belt.dm
Added tasers and stun baton to the security belt and now has 7 slots.
2012-11-08 22:31:32 -05:00
SkyMarshal
9b3389145e Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error. 2012-11-08 14:49:01 -07:00
Chinsky
ef6d50b5c4 Added logging of status screen text change. 2012-11-08 15:44:34 +04:00
Chinsky
47db4eded3 Can attach limbs now. No preparations needed yet. 2012-11-07 20:01:55 +04:00
Cael_Aislinn
d6b249b945 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-11-07 15:48:10 +10:00
Chinsky
9dc9198237 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-06 22:41:19 +04:00