Commit Graph

312 Commits

Author SHA1 Message Date
mwerezak
5bcede5801 Fixes adjustBrainLoss
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
2015-08-23 20:22:15 -04:00
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies.
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
GinjaNinja32
98c2a0c8b1 Merge pull request #10594 from mwerezak/embed-fix
Embedding and broken limb fixes
2015-08-13 04:52:20 +01:00
mwerezak
99e1d88285 Fixes #10592
Fixes the right hand being affected if the left arm was broken.
2015-08-12 22:41:30 -04:00
HarpyEagle
9609ce0b0d Fixes #10546 2015-08-12 12:06:31 -04:00
Zuhayr
20e7ee0b71 Merge pull request #10111 from mwerezak/eye-attack
Makes grab eye attacking respect species lore better
2015-08-12 02:36:50 +09:30
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
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
Zuhayr
4afa8a80f8 Readds config option to disable organ decay. 2015-07-27 15:30:38 +09:30
mwerezak
33fe2b5fc7 Makes grab eye attacking respect species lore better 2015-07-14 00:25:53 -04: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
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
Zuhayr
aa2e25928d Fixes a runtime with organ Destroy() called with nonhuman owner. 2015-06-22 22:03:24 +09:30
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
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
mwerezak
0777f9c998 Fixes #9648
Robotic limbs are no longer able to mutate.
2015-06-02 21:40:30 -04: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
Zuhayr
4a012a90ca Fixes #8929 2015-05-30 04:38:41 +09:30
Zuhayr
7b8abdab01 Fixes #9361 2015-05-30 03:55:41 +09:30
mwerezak
b4adb1a432 Updates species checks 2015-05-27 01:34:50 -04:00
mwerezak
7dcc98e1a4 Fixes robotic organs causing pain messages
Also fixes pain() not checking if the species has NO_PAIN.
2015-05-27 01:15:55 -04:00
mwerezak
7d4c3235dc Fixes #9460 2015-05-27 01:13:53 -04:00
Chinsky
26e5630e23 Ghetto diagnostics!
Grab + click with help intent to inspect the bodypart. You'll learn what injuries there are without stripping the guy. After delay, you also learn if there's a fracture here.
Also surgical incisions are now visible on examine because goddamnit.
2015-05-18 06:37:51 +03:00
Chinsky
d374cd2681 Merge pull request #9292 from mwerezak/vital-areas
Allows damage to accumulate past max_damage on vital organs
2015-05-18 00:38:16 +03:00
Zuhayr
36acf64f18 Partial fix for #8825 2015-05-16 18:33:03 +09:30
mwerezak
413276a4c5 Allows damage to accumulate past max_damage on vital organs
Fixes #9214
2015-05-16 02:05:44 -04:00
Zuhayr
8611499e87 Fixes #8842 2015-05-15 23:53:59 +09:30
Kelenius
948252d25b Removes unused files added by accident, separates reagent files 2015-04-28 11:00:56 +03:00
Kelenius
317abc6b79 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
mwerezak
c2751b0b12 Fixes #8823 2015-04-27 00:26:53 -04:00
PsiOmegaDelta
967223364d Merge pull request #8988 from mwerezak/droplimb
Adjusts threshold for limb removal due to damage
2015-04-26 19:16:34 +02:00
mwerezak
b20f604d0c Adjusts threshold for limb removal due to damage 2015-04-26 01:58:52 -04:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
mwerezak
d6498cd45f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/human_organs.dm
2015-04-13 17:12:02 -04:00
mwerezak
da5518f8b2 Updates various dependencies on organ brokenness to use the is_broken() proc. Updates external organ brokenness to ensure broken description is set. 2015-04-13 16:38:33 -04:00
Zuhayr
fe0185697e Some dislocation fixes/adjustments. 2015-04-07 19:50:26 -07:00
mwerezak
81bcad2b33 attackhand cleanup 2015-04-07 15:12:32 -04:00
Zuhayr
b197cb69fa More organ fixes. Yay. 2015-04-03 21:47:37 -07:00
Zuhayr
3493b60faf Attempting to fix icon procs for organs. 2015-04-03 21:04:05 -07:00