Commit Graph

131 Commits

Author SHA1 Message Date
ZomgPonies
63cfbd6667 Revert "Removed inaprovaline fixing Internal bleeding"
This reverts commit 82ef708223.
2014-06-18 08:26:17 -04:00
ZomgPonies
93dc02a702 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-18 08:22:49 -04:00
Boop
3ab1011a85 Fixes #5291 and another wound runtime 2014-06-18 08:22:33 -04:00
ZomgPonies
384992c9fc Merge pull request #252 from Regen1/Combat-borgs
Combat borgs + various tweaks
2014-06-18 06:01:46 -04:00
unknown
b215859357 Fixes bleeding checks not respecting merged wounds 2014-06-17 07:08:53 -04:00
unknown
37ff8e4175 Fixes large amounts of damage being carried by minor wound types 2014-06-17 07:08:41 -04:00
mwerezak
8b965d21a8 Fixes bruises not having the right damage_type set 2014-06-17 06:56:38 -04:00
mwerezak
ec2ed9f83b Fixes wound merging
Fixes wound merging completely ignoring things like bleed_timers,
bandaged and salved states, etc.
2014-06-17 06:56:27 -04:00
mwerezak
07ab53368c Fixes many small wounds protecting against...
...internal damage.

Also removed started_healing() proc because it doesn't actually report
whether the wound is healing and isn't really used for anything.

Conflicts:
	code/modules/organs/organ_external.dm
2014-06-17 06:56:07 -04:00
mwerezak
4a2993b20b Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
mwerezak
cfb05dd741 Fixes wrong wound types being used
This fixes the autoheal bug, which was being caused by wound types such
as tiny bruises from being used even for large amounts of damage.

I imagine that relying on the order of the list returned by typesof() is
always a bad idea.

Conflicts:
	code/modules/organs/organ_external.dm
2014-06-17 06:45:34 -04:00
Regen
ec9210da7e Updating PR again 2014-06-17 02:48:28 +02:00
ZomgPonies
692e7ef435 Fixing biting your own hand off 2014-06-14 23:18:12 -04:00
Regen
82ef708223 Removed inaprovaline fixing Internal bleeding
Because Inaprovaline has never had any healing effects, and seems to
only artificially give the body oxygen, as a replacement for not being
able to breathe, or so it seems, since vox takes toxin damage from it
2014-06-10 22:39:14 +02:00
Hubblenaut
31ca257cd2 Fixed an issue with IBs being almost twice as bad
Conflicts:
	code/modules/organs/organ_external.dm
2014-06-05 16:10:17 -04:00
ZomgPonies
7ccdcbce93 Preleminary work on robolimbs. Expect more soon. 2014-05-25 18:45:49 -04:00
Zuhayr
8986c20a4c Removed 'You are now sterile' line from groin loss due to spam issues when lost by an IPC as well as general pointlessness. 2014-05-03 17:38:13 -04:00
suethecake
10b7a2e8d9 Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/species.dm
	code/setup.dm
2014-04-29 13:58:56 -04:00
Rob Nelson
96d90dc28a Update with some bay optimizations for mobs.
Conflicts:
	code/defines/obj.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/organs/blood.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
	compare_report.txt
2014-04-28 21:29:14 -04:00
Mloc-Argent
fcdcef5931 human: move organ generation into a species proc
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
2014-04-28 21:09:45 -04:00
Ccomp5950
4c274837d4 Code effeciency project: Handle_Organs (human/life())
We do a bit of pre-processing to see if we want to do checks on all the organs.

First we don't even do preprocessing unless we have damage of some kind
afterwards we process what is hurt until it gets better or overall we get worse
when we go ahead and check everything else out again.

Can add a safety check in life every 30 ticks or so go ahead and check every organ again but I don't think it's needed.

Conflicts:
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/organs/organ.dm
2014-03-23 08:02:45 -04:00
Rob Nelson
b17bfa3c87 Fix a bunch of shit with matter eatin'. 2014-03-22 06:28:45 -04:00
jack-fractal
cf8348c25d * 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

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/organs/organ_external.dm
	html/changelog.html
2014-03-22 02:50:44 -04:00
Ccomp5950
45e93458f2 Rejuvination verb fix for IPC's limbs don't suddenly become organic.
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2014-03-22 02:44:01 -04:00
Chinsky
2f875dba6e Fixed blood injections not transmitting viruses properly.
Keep forgetting that list is associative.
2014-03-14 02:13:37 -04:00
Chinsky
467cbdd5ba Fixed some runtimes with specieism, and blood transfer ignoring viruses' racial preferences. 2014-03-14 02:13:08 -04:00
ZomgPonies
262514d3fe Fix dismemberment 2014-03-10 21:22:34 -04:00
Jeremy Liberman
b6905e6668 Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic
Conflicts:
	code/modules/mob/living/living.dm
2014-03-05 22:27:33 -05:00
Jeremy Liberman
55ba32d02d Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free.
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
2014-03-05 22:20:44 -05:00
Rob Nelson
f6c6eafc9d Nerf eat
Conflicts:
	code/modules/organs/organ_external.dm
2014-03-03 19:05:55 -05:00
ZomgPonies
96c45dd6a4 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-02-06 03:23:43 -05:00
Segrain
bde40bd95e Surgery tracking. 2014-02-05 22:54:51 -05:00
Fox-McCloud
73e3773ccb Blood Loss Rebalance
Makes the middle blood loss stage have slightly different flavortext.

Makes the final stage seem more cumulative of the prior's effects and
removes the silly toxin damage.
2014-02-04 08:29:02 -05:00
ZomgPonies
f6fd5b4fd9 Fix blood runtime 2014-02-04 00:54:25 -05:00
Loganbacca
1c38b32ee4 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.

Conflicts:
	code/modules/organs/blood.dm
2014-02-03 01:24:35 -05:00
ZomgPonies
883420c665 Fixed decapitated being still alive 2014-02-01 05:01:15 -05:00
ZomgPonies
c9b19f5f24 Fix skeleton flags 2014-01-31 22:26:10 -05:00
Zuhayr
5da7b52133 IPC brain surgery code.
Conflicts:
	code/modules/organs/organ_external.dm
2014-01-29 16:55:30 -05:00
Zuhayr
80c5d9b5ab Preliminary surgery work for IS_SYNTHETIC.
Conflicts:
	code/modules/organs/organ_external.dm
2014-01-28 15:34:04 -05:00
Rob Nelson
5f89171fc1 Hopefully fix all DNA corruption issues caused by assuming datum pass by-val.
Conflicts:
	code/modules/mob/transform_procs.dm
2014-01-20 01:52:08 -05:00
ZomgPonies
a99b45a3bd Able to melt decapitated heads into skulls with acid 2014-01-15 08:10:33 -05:00
ZomgPonies
33d1461293 Showing brain part deux 2014-01-12 23:14:35 -05:00
ZomgPonies
f3ee81d26c Fix 2014-01-12 21:22:39 -05:00
ZomgPonies
719c254817 Showing brain first pass 2014-01-12 08:42:03 -05:00
Zuhayr
d856157f26 More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.
Conflicts:
	code/modules/mob/living/carbon/species.dm
2014-01-07 00:04:27 -05:00
Zuhayr
07c1506551 Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags.
Conflicts:
	code/modules/organs/blood.dm
2014-01-07 00:01:27 -05:00
Zuhayr
a8c8bb7fa6 Added NO_BLOOD checks to drips, syringes.
Conflicts:
	code/modules/organs/blood.dm
2014-01-06 23:46:58 -05:00
ZomgPonies
2aaa601aac Part 2 diona update commits 2014-01-06 23:45:22 -05:00
ZomgPonies
9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
alex-gh
49aac769aa Merge remote-tracking branch 'upstream/master' into bs12_fixes 2013-12-21 19:36:43 +01:00