Commit Graph

4502 Commits

Author SHA1 Message Date
Chinsky
f6bcb421d4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 21:35:13 +04:00
Chinsky
5f7c9d5518 Readded welder fuel.
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
2012-10-18 21:25:24 +04:00
Mloc
af8ab15ebf Merge pull request #1795 from CIB/master
Various fixes
2012-10-18 10:18:03 -07:00
Chinsky
7f9132e23a Fixes a runtime. 2012-10-18 20:58:35 +04:00
cib
b0aee942a7 You can now exame an IV drip to get the loaded chemicals and attached person. 2012-10-18 16:08:43 +02:00
Chinsky
274ac1d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 15:42:11 +04:00
Chinsky
16e6f178a4 Buffed fuel tank explosions. 2012-10-18 15:40:55 +04:00
cib
d90944ad50 Several medical related changes.
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
2012-10-18 12:39:04 +02:00
Chinsky
886119787d Arrivals computer fixed forever. 2012-10-18 10:09:39 +04:00
Chinsky
92276c9887 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/new_player/new_player.dm
	html/changelog.html
2012-10-18 09:13:24 +04:00
Asanadas
0ba466e881 Removing Soghun stutters, fix for infinite BoH in BoH. 2012-10-17 19:18:17 -04:00
cib
a1aa3ddecf Ported limb selection. 2012-10-17 20:08:34 +02:00
Chinsky
45e40c09c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 14:12:41 +04:00
Pobiega
49fbe5f312 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 07:42:30 +02:00
Pobiega
917e31cfff Fixed cleanbots stating panel panel instead of panel. 2012-10-17 07:41:17 +02:00
Asanadas
e2abd0a9b8 Commented out BoH on BoH Singulos. 2012-10-16 20:52:28 -04:00
Chinsky
da147b083c Added Forensics Technician jackets to Detective wardrobe. 2012-10-17 03:28:59 +04:00
Chinsky
a4142fa098 Throwing metal (with non-zero m_amt) items will make electrified doors and grilles spark. 2012-10-17 00:09:49 +04:00
cib
848355292a Fixed bug with RP rev where anyone could become head rev, even non-revs. 2012-10-16 19:36:39 +02:00
cib
14805c3bf2 Added RP revolution. 2012-10-16 19:28:54 +02:00
cib
7fccadfc89 Ported AutoTraitor. 2012-10-16 18:44:53 +02:00
Pobiega
8991f73efc Fixes issue #1772, bandaging already bandaged wounds. 2012-10-16 10:35:13 +02:00
cib
874d2c1519 Health analyzer now shows if an organ is bleeding. 2012-10-15 19:54:17 +02:00
cib
8f2055080d Increased blood pack volume and IV injection rate. 2012-10-15 19:48:20 +02:00
cib
21d0619cf5 Blood packs now are faster on the IV than other chemicals. 2012-10-15 19:23:57 +02:00
cib
150d7e51b5 Added some medical stuff to the map.
Also added blood packs.
2012-10-15 19:17:38 +02:00
cib
a577c0bfac Fixed a few bugs with IV drips. 2012-10-15 18:01:31 +02:00
cib
82dca5a4a0 Added an IV drip machinery. 2012-10-15 17:19:43 +02:00
headswe
b24b176a44 Merge pull request #1767 from comma/master
Dammit.
2012-10-15 05:50:36 -07:00
Chinsky
ad34ad9da4 God dammit, fix. 2012-10-15 16:48:13 +04:00
headswe
6b4593a80c Merge pull request #1765 from comma/master
Surgery.
2012-10-15 04:49:42 -07:00
headswe
28e38cd590 Merge pull request #1766 from headswe/master
Runtime
2012-10-15 04:47:23 -07:00
headswe
3e0ac92456 Merge pull request #1763 from Ravensdale/master
Cargo atmos systems adjust
2012-10-15 04:46:35 -07:00
Head
ad0be72f88 Fixed runtime.
Signed-off-by: Head <sebbebroberg@hotmail.com>
2012-10-15 13:32:58 +02:00
Chinsky
1bcfdfbd98 Now lighters only burn hand user is holding them. Bye bye, 80% of crew groin burns. 2012-10-15 15:30:42 +04:00
Chinsky
385dbe9fe9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-15 15:13:57 +04:00
DarkTechnomancer
b99dae5c89 Fixed health analyzers 2012-10-15 02:57:48 -04:00
DarkTechnomancer
a6aa56707a Fixed machine building prompts 2012-10-14 23:05:58 -04:00
Ravensdale
f844b7baca Raises cell timer cap from 10min to 60min 2012-10-14 17:52:06 -07:00
Chinsky
988928b086 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-15 01:52:02 +04:00
Asanadas
1fcaf5b376 Nerf cheap lighters.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-10-14 14:42:08 -04:00
Chinsky
8427947bd7 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm
2012-10-14 20:39:26 +04:00
Chinsky
9befbd6aa9 Surgery done. 2012-10-14 20:31:07 +04:00
Chinsky
c3b53af100 Commiting for the night, in case KGB steals my laptop.
Pretty much finished surgery system.
-working appendectomy, bone surgery, eye surgery, face surgery, brain surgery (humans only) and metroid core surgery.

-moved operation stages tracking vars to one op_stage datum. Left brain opstage var alone because way too many things reference it.

-added bone gel and bone setter.

-added check for surgery tools, so new doctors won't beat shit out of patients on optable too often.

-pretty much emptied surgery_tols.dm, it was unneeded by this point.

Still need to test it more, slap sanity checks everyfuckingwhere.
Also more literate messages written with help of trained monkey (faux).
2012-10-14 02:15:23 +04:00
cib
d5ffce8e25 Fixed a bug with blood drips being limited to 1 per turf rather than 3. 2012-10-13 10:31:37 -07:00
headswe
2326abe31b Merge pull request #1754 from Whitellama/master
Ports/Fixes for the merge!
2012-10-13 07:00:40 -07:00
cib
9c55f8c8ac Ported BS12 medbots. 2012-10-13 06:33:05 -07:00
cib
5a1df1362a Medical stacks(bandages etc.) now are non-instant again. 2012-10-13 05:45:15 -07:00
Chinsky
b2d3d880e1 More work on surgery system.
Appendectomy fully working
Bone surgery working

Added bone gel and bone setter items

Made bandaging stop bleeding instantly, instead of waiting for next wound update.

Added variabe to groin organ to track appendectomy stage.
2012-10-13 16:28:10 +04:00
Travis Whitehead
5184ca58f5 Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more 2012-10-13 03:44:19 -07:00