Commit Graph

1150 Commits

Author SHA1 Message Date
Segrain
b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00
Loganbacca
70a1c768ad Broken heart fix
Code was using a switch with variables in it. This doesn't work.
Replaced it with an if..else sequence.

Thanks to the guys from Paradise for finding this.

Note: this only fixes literal heart problems, it won't do anything for relationship issues.
2014-02-03 00:28:15 +13:00
DJSnapshot
810de4ddaa Merge pull request #4337 from Baystation12/dev-freeze
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Segrain
4df59faf76 Surgery tracking. 2014-01-31 16:28:24 +03:00
Zuhayr
4a0fb22530 IPC brain surgery code. 2014-01-29 16:01:25 +10:30
Zuhayr
69d260a11d Preliminary surgery work for IS_SYNTHETIC. 2014-01-28 16:00:36 +10:30
Zuhayr
3b072b32b0 More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically. 2014-01-06 14:54:35 +10:30
Zuhayr
b70a79f853 Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags. 2014-01-05 23:59:39 +10:30
Zuhayr
b05f81df3d Added NO_BLOOD checks to drips, syringes. 2014-01-05 14:13:58 +10:30
Zuhayr
6fed0c70da Applying NO_BLOOD flag to bleeding code. 2014-01-05 14:06:51 +10:30
Chinsky
5068a54568 Adds update_icon to drips 2013-12-26 18:39:29 +04:00
Chinsky
5191cb4c6c Made drips use species blood too. 2013-12-26 14:12:28 +04:00
Ravensdale
95ac40a04a Re-balancing for IB, bleed rate is back to usual settings, minor nerf for
appendicitis initial bleed rate, harder to get IB.
2013-12-20 17:01:51 -08:00
Ravensdale
13fa1709b3 IB nerf: Makes it harder to get IB, makes the initial bleed less. 2013-12-20 14:03:24 -08:00
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	html/changelog.html
2013-12-13 19:13:43 +00:00
Zuhayr
b3c0079e18 Merge pull request #4004 from volas/master
Minor fixes
2013-12-05 02:56:06 -08:00
volas
e05b7f4341 brainmob fix: decapitated head is now really dead 2013-11-30 15:45:53 +04:00
Chinsky
ca649d95aa Fixed issue with chopped off heads not having hair icons.
Also threw in some eyecandy, limbs now turn at random angle (70 - 130) instead of straight 90.
2013-11-29 16:13:45 +04:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
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
Nanai
7ce2314c11 Merge Fixes
Fixes issues post merge and and with minor sanity checks and neatness.
2013-11-14 13:08:40 -05:00
Nanai
2416ae715c Full Eye and Robot Organ Implementation
Tested work to implement eyes ad internal organs and the charpref selectable robotic organ replacements for heart and eyes, both for assisted and fully mechanical variants!
2013-11-14 13:08:29 -05:00
Nanai
cba1a9585d Medical Hoopery
Added eyes as an internal organ, removed the eye-stat var on mobs and changed it to properly direct it to eye damage. Altered all reference.

Updated the sleeper to allow for ejection of the beakers and occupants in panel.

Updated the body scanner to check for prosthetics/mechanized organs, and inform the individual of the blind disability.

Laid the groundwork for mechanical and assisted internal organs.

Groundwork for chemical: Peridaxon, a chemical that allows for the slow regeneration from organ damage.
2013-11-14 12:40:30 -05:00
Nanai
25c55ed354 Germ Fix
Fix for missing and robotic limbs getting infected with germs and being incurable.
2013-11-14 12:39:51 -05:00
Mloc-Argent
e6b44d0f35 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2013-11-14 12:03:59 +00:00
Chinsky
d1be0cba0b Healing wounds should properly update damage overlay if needed. 2013-11-08 08:10:50 +04:00
Chinsky
3992888ea6 removed some unneeded icon update calls (haha totally unneeded yeah)
replaced complete regenerate_icons with just body_update in case of dropping limb
2013-11-08 04:34:37 +04:00
Chinsky
6d369caae7 Replaces long check with lots of get_organ calls with shorter one.
Also changed weird condition that amputated leg must not be splinted.
Removed checks for haslimbs, since movement while downed is not possible anyway.
Moved some special effects for broken limbs after check for such, so healthy ones wont bother.

Fixed a derp in populating the global list of sideffects.
2013-11-08 04:15:49 +04:00
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Chinsky
8c69e3d8b7 derp 2013-11-04 05:53:10 +04:00
Mloc
7fdcf3deee Merge pull request #3866 from comma/master
Itty bitty antilag bits.
2013-11-03 17:21:20 -08:00
Chinsky
6402581595 Itty bitty antilag bits.
-If wound disappears, do not process it.
-Moved reagents checks so they are only done when wound is internal. They have no effects on non-internal wounds anyway.
-Calling update_body only when losing limbs, other times UpdateDamageIcon(] is right proc
2013-11-04 05:16:04 +04:00
Mloc
73e6311612 Merge pull request #3859 from comma/dev
Made robolimbs into overlays instead of grayscaling limb icon.
2013-11-02 12:54:57 -07:00
Chinsky
d779253ba1 Made robolimbs into overlays instead of grayscaling limb icon. 2013-11-02 23:53:23 +04:00
Nanai
504e49ffb2 Added a new surgery- Head reattachment, for the decapitationally challenged. Performed via retractor, fix-o-vein, hemostat, cautery, head. Fixed logs and messages for decapitated brain removal - No longer shows as the head cutting the head open, and no longer shows the debrainee as the debrainer to admins. 2013-10-28 07:57:24 -04:00
Chinsky
fb0fb4da6a Merge pull request #3759 from Baystation12/dev-freeze
freeze -> dev
2013-10-11 11:41:06 -07:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
2013-10-11 12:39:54 -04:00
Chinsky
77d7cffa57 No idea why, but it caused all mobs spawn with deformed limbs. 2013-10-06 14:11:13 +04: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
Erthilo
8f3d303e45 Bicaridine slows but does not stop internal bleeding. 2013-09-02 17:53:28 +01:00
Erthilo
720d74a0b7 Internal bleeding tweaked. Cryo and Bicaridine will prevent IB from bleeding and getting worse. Bicaridine over 30 units will slowly heal IB. IB cannot be completely healed by bicaridine until 10 minutes after getting IB. Bleeding rate for IB reduced. 2013-09-01 21:31:22 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
2013-08-31 17:45:31 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Segrain
5f8c8d9cce Fix for negative damage. 2013-08-23 15:33:51 +03:00
Mloc
e20f2e1409 Small fixes to hair.
Hair styles that aren't designed to have color shifts will no longer be affected.
Balding virus symptom now only applies to humans.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-08-22 15:12:59 +01:00
Mloc
de79aa733b More dismemberment fixes
More elegant solution to gasping torsos.
Applying damage to torso will no longer gib everything connected to it.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-08-20 02:06:56 +01:00
Mloc-Argent
b2a3405f80 Two fixes for dismemberment.
Species dismemberment now creates the correctly textured gibs.
Decapitation now kills you.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-19 23:49:53 +01:00
Segrain
2ea03c0925 Fix for #3535. 2013-08-17 00:26:27 +03:00
Zuhayr
520d1b34d2 Merge resolution. 2013-08-05 08:00:03 -07:00