Commit Graph

14 Commits

Author SHA1 Message Date
Kelenius
41ff9819bd Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-03-31 17:44:42 +03:00
Zuhayr
c5d42f3a4b More work on severing, improvements to yank-out-object. 2015-03-27 17:51:10 +10:30
Kelenius
b4b635f32d Chemistry commit
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
mwerezak
c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
Zuhayr
b70a79f853 Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags. 2014-01-05 23:59:39 +10:30
Zuhayr
6fed0c70da Applying NO_BLOOD flag to bleeding code. 2014-01-05 14:06:51 +10:30
Nanai
7786e7a96c Sleeper Addition, Chemical Rebalance 2
Tweaked soporific and new chems a bit more. Added Paracetamol, a lesser drug to tramadol, known to all as tylenol, and implemented it into sleepers! Gave inaprovaline the IB slowing property to keep sleepers in the game and allow EMTs better usage. Oxycodone made easier to craft by making the plasma a catalyst, but decreased it's overdose limit. Applied oxycodone and paracetamol to be able to handle things painkillers should.
2013-11-14 19:11:31 -05:00
Chinsky
4d42a3a36d Changes to Shutdown Syndrome.
Now it only affects limbs.
Icon is changed to deformed to reflect it.
Dead limbs do not cause pain messages.
2013-10-06 09:04:41 +04:00
Zuhayr
98798ea5fc Compile fixes for organ/reagent code. 2013-08-04 11:25:40 -07:00
comma
fb1f32a427 Painkillers stop regular pain messages too, not only custom ones. 2013-08-03 23:05:04 +04:00
cib
57955dbf6a Fixed toxloss messages.
Also added anti-spam checks to custom_pain
2013-03-16 15:48:50 +01:00
Chinsky
13b6b2f61b Moved organ and blood code to module folder.
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
2013-03-14 11:52:53 +04:00