Kearel
4139a51946
Initial fixes
...
Changes interaction between stumps and items.
Conflicts:
code/modules/organs/organ_stump.dm
2015-08-08 11:10:28 -04:00
PsiOmegaDelta
c28b3721b4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/modules/clothing/glasses/glasses.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-07-31 10:00:16 +02:00
HarpyEagle
c29dd9063c
More tweaks to cut wound stages.
...
Enforced "blood soaked" clots where the clot stage was also a bleeding
stage, adjusted the thresholds for gaping_big and massive wounds to be
more even.
2015-07-30 11:46:49 -04:00
HarpyEagle
171991faf8
Attempts to prevent future max_bleeding_stage confusion
...
max_bleeding_stage no longer switches itself around in New().
Instead, the value given refers directly to the index of the maximum
bleeding stage.
Should also make wound datums more friendly to initial(), if that's ever
needed.
2015-07-29 16:53:31 -04:00
HarpyEagle
3d10955ccb
Adds missing clot stages to gaping_big and massive cuts.
...
Without the clot stages the jump between the next two stages was
abnormally large, and the values given for max_bleeding_stage did not make
much sense.
2015-07-29 16:46:50 -04:00
HarpyEagle
d384150a48
Fixes wound max_bleeding_stage oddness
...
The max_bleeding_stage given to /datum/wound/cut/flesh led to
"Doctor places a bandaid on Patient's flesh wound." Also fixed the
bleeding stage for stumps, so that "bloody stump" counts as a bleeding
stage.
2015-07-29 16:40:09 -04:00
PsiOmegaDelta
ff2b3865b8
Compilation fixes.
2015-07-27 10:41:21 +02:00
PsiOmegaDelta
5cbb703609
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/jobs/access.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/update_icons.dm
code/modules/organs/organ.dm
code/modules/reagents/Chemistry-Holder.dm
code/setup.dm
2015-07-27 10:20:20 +02:00
Zuhayr
4afa8a80f8
Readds config option to disable organ decay.
2015-07-27 15:30:38 +09:30
Kearel
f4aa2376c8
Initial fixes
...
Changes interaction between stumps and items.
2015-07-26 22:13:46 -05:00
mwerezak
33fe2b5fc7
Makes grab eye attacking respect species lore better
2015-07-14 00:25:53 -04:00
PsiOmegaDelta
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
HarpyEagle
3fd71881a3
Tweak/refactor external organ droplimb mechanics
2015-07-10 00:14:35 -04:00
mwerezak
cd2604e82d
Fixes droplimb runtime
2015-07-09 22:25:18 -04:00
HarpyEagle
f23c2d5e00
Fixes droplimb wound not handling damage type
2015-07-08 15:17:50 -04:00
Zuhayr
4a2d7b661e
Merge pull request #9812 from PsiOmegaDelta/150614-MakingYourLifeEvenEasierApplyDirectlyToForehead
...
Refactors Life() - Part II
2015-06-28 20:20:49 +09:30
PsiOmega
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
Chinsky
265b1d5b51
Fixes #9913
...
Also axes hidden var in lieu of using implants like other foreign objects. Now instead of one object, amount of stuff you can put in someone's organ is restricted by stuff's combined w_class.
2015-06-25 23:51:58 +03:00
PsiOmegaDelta
9698def0e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/nano/modules/human_appearance.dm
2015-06-22 16:59:19 +02:00
Zuhayr
aa2e25928d
Fixes a runtime with organ Destroy() called with nonhuman owner.
2015-06-22 22:03:24 +09:30
Zuhayr
1e56cc0914
Fixes #9836
2015-06-20 21:43:54 +09:30
PsiOmegaDelta
341b29c34a
Merge remote-tracking branch 'upstream/dev' into 150614-MakingYourLifeEvenEasierApplyDirectlyToForehead
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-17 16:10:26 +02:00
PsiOmegaDelta
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
PsiOmega
a14406f83a
mob/living/Life() now handles blood.
2015-06-14 11:14:31 +02:00
Zuhayr
347e6df2ac
Merge pull request #9704 from atlantiscze/clean-up-your-trash
...
[Done] Implements Destroy()'s on some things
2015-06-10 23:07:38 +09:30
PsiOmegaDelta
e669c1ab7c
Merge pull request #9687 from comma/dev
...
Fixes organs self-rejecting
2015-06-10 09:39:43 +02:00
Chinsky
364c2dc01a
Fixes typo.
2015-06-08 14:23:26 +03:00
PsiOmega
fc6de24042
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
2015-06-07 10:51:41 +02:00
Atlantis
bb33905803
Fixes minor typo in organ Destroy()
2015-06-07 05:29:43 +02:00
Atlantis
69e0ebf71e
Implements Destroy() for organs
...
- This fixes annoying roundstart GC errors, and should fix other limb/organ related GC errors as well.
2015-06-06 07:21:34 +02:00
Atlantis
f66e5c9c94
Fixes #9619
2015-06-06 06:52:42 +02:00
Chinsky
02d6e7a303
Fixes #9605
...
Now organ DNA is sync'd to newly created character.
2015-06-05 12:49:48 +03:00
Chinsky
4b04ccb05d
Axed couple unused organ flags, made them look a bit nicer with bitmove
2015-06-05 11:18:07 +03:00
PsiOmegaDelta
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
mwerezak
0777f9c998
Fixes #9648
...
Robotic limbs are no longer able to mutate.
2015-06-02 21:40:30 -04:00
PsiOmega
3d49ad3927
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/jobs/job/job.dm
code/game/jobs/job/silicon.dm
code/game/objects/items/weapons/surgery_tools.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/organs/organ_external.dm
icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
PsiOmegaDelta
8d13f434f0
Merge pull request #9587 from Zuhayr/ipcfixes
...
IPC fixes
2015-05-31 15:53:11 +02:00
Zuhayr
fd2855800f
Merge pull request #9582 from mwerezak/robolimbs
...
limb fixes
2015-05-31 17:14:25 +09:30
mwerezak
d541fda7be
Sets w_class for external organs
...
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
2015-05-30 19:02:37 -04:00
mwerezak
f23a656526
Replaces assignments to health with max_damage
...
Except where they were already equal.
2015-05-30 19:02:06 -04:00
mwerezak
217e7b966f
sharp no longer causes DROPLIMB_EDGE
2015-05-30 19:01:34 -04:00
mwerezak
43cc0e6705
Fixes internal organs only being damaged with prob(5) if brute_dam >= max_damage
2015-05-30 19:01:01 -04:00
mwerezak
1c4239190d
Having a vital internal organ die now kills you
...
Internal organs now die once they hit max_health.
Also adjusts final brain damage effect.
Conflicts:
code/modules/organs/organ.dm
2015-05-30 18:53:20 -04:00
mwerezak
783b5aecc9
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robolimbs2
...
Conflicts:
code/modules/mob/living/carbon/human/human_organs.dm
2015-05-30 14:31:19 -04:00
mwerezak
cbeaabee9c
Replaces setting ORGAN_ROBOT flag with robotize() call
2015-05-30 14:25:53 -04:00
mwerezak
40d437f988
Assigns w_class to external organ types
2015-05-30 14:24:46 -04:00
mwerezak
92de9fb432
Replaces health assignments with max_damage
2015-05-30 14:20:50 -04:00
Zuhayr
c2c8911aed
Additional IPC tweaks.
2015-05-31 02:30:57 +09:30
PsiOmega
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
