Commit Graph

186 Commits

Author SHA1 Message Date
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
mwerezak
5b341bd810 IB initial damage now depends on damage taken
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
mwerezak
add9ec3b65 Makes IB bleed with same rate as external bleeding
Also updates drip() to remove the amount of blood actually passed into
it as argument.
2014-08-16 21:45:21 -04:00
Chinsky
bcf0a57aa0 Merge pull request #5962 from mwerezak/wound-fixes
Wound and infection fever fix
2014-08-14 07:55:17 +04:00
Hubblenaut
330ce5d088 Fixes rejuvenation ignoring infections 2014-08-14 01:55:30 +02:00
mwerezak
0b0380ae14 Fixes burn description saying it is salved when not 2014-08-13 17:11:25 -04:00
mwerezak
ca9fc4169d Fixes infection fever causing burn damage 2014-08-13 17:11:03 -04:00
Chinsky
573f49624e Added suggested new type of wounds for stumps 2014-08-12 19:48:17 +04:00
mwerezak
44cc7159c4 Fixes a few issues with get_wound_type()
Fixes damage causing "healing" wound types that can't bleed.
Fixes flesh wounds not bleeding the instant they heal any damage.
2014-08-11 21:37:34 -04:00
Chinsky
dddaab172c Made missing limbs not process.
Moved code in processing so that ORGAN_DESTROYED limbs won't process wounds and chemicals. They still need to process once to actually fall off (too lazy to change that)
Made dropping limbs remove all wounds and germs. Instead, one big wound is spawned on parent organ. Damage depends on the organ.
Removed missing  limbs bleeding on their own, since that's what that wound is for now.
They still would ache until surgically mended anyway.
Fixed possible issue with amputation not fixing the rotten limb.
2014-08-11 04:35:45 +04:00
Walter0o
23811e7e5c fixes nullpointer caused by broken organ list
the mysterious broken list bug has struck again
2014-07-26 11:54:32 +02:00
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
mwerezak
78e4e259db Fixes icons not being updated for necrosis 2014-07-23 22:41:52 -04:00
mwerezak
d9f70c2fd2 Adjusts the rate that infections deal toxin damage 2014-07-23 22:35:04 -04:00
mwerezak
60c6a2ea92 Fixes fever temperature not being reached 2014-07-23 22:34:04 -04:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 13:08:12 +00:00
Chinsky
248affdebe Merge pull request #5656 from mwerezak/wound-infections
Infection system tweaks
2014-07-17 15:39:16 +04:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
mwerezak
13b757938d Infections raise temperature faster wrt germ_level 2014-07-16 15:52:42 -04:00
Chinsky
bd080c237f Merge pull request #5641 from JimTheCactus/limb_sparks_fix
Fixes #5640 Make sparks effect target mob, not organ
2014-07-16 13:03:14 +04:00
JimTheCactus
ff382bb231 Fixes #5640 Make sparks effect target mob, not organ
The malfunction sparks were calling to a var src, which in most other places is the main object itself, here that's the organ and it doesn't have a loc. Changed it to call the organ's owner.
2014-07-15 20:34:08 -06:00
mwerezak
f49e709394 Fixes organs not being removed due to damage
Because the dismemberment check was being done before brute_dam was
updated, the attack that actually brought brute_dam above the threshold
would not be able to pass the check, regardless of how much damage was
actually done.
2014-07-15 01:36:48 -04:00
Zuhayr
d8ff5d8ac6 Fixes #5508 2014-07-14 12:16:02 +09:30
mwerezak
1502799afd Fixes germ levels going below zero 2014-07-12 16:18:29 -04:00
mwerezak
c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
mwerezak
ffcb068b96 Fixed wrong operator 2014-07-09 00:11:20 -04:00
mwerezak
910ce676b0 Fixes advanced trauma kits claiming to disinfect but not doing so 2014-07-08 18:49:51 -04:00
unknown
dcfbeb0924 Fixes missing length check before pick() 2014-07-08 16:12:55 -04:00
mwerezak
b8a102beb4 Increases cough rate for lung infections 2014-07-07 17:30:19 -04:00
mwerezak
008c5447b7 Tweaks internal organ spread rate 2014-07-07 17:27:01 -04:00
mwerezak
5764d95808 Makes minor wounds harder to infect 2014-07-07 17:19:13 -04:00
mwerezak
a4c9f31b49 Fixes #5532 and increases the time required for organs to become infected from wounds
Also removes the now unnecessary get_cure_threshold() proc, caps the
rate at which an organ can receive germs from wounds, and makes germs
spread from external to internal organs happen one organ at a time
instead of all at once.
2014-07-07 17:01:15 -04:00
mwerezak
88f3618e9f Required spaceacillin levels no longer scale
The amount of spaceacillin required to stop infections is now a flat 5
units, instead of scaling with germ_level.
2014-07-06 15:53:41 -04:00
mwerezak
cdd27aec4a Infected wounds show up more readily on the health scanner 2014-07-06 15:44:59 -04:00
mwerezak
f3951c702c Spaceacillin now prevents wounds from transferring germs 2014-07-06 15:40:24 -04:00
mwerezak
30dc2519e9 Makes bleeding logic a little clearer 2014-07-06 13:22:52 -04:00
mwerezak
5948ed591e Reduces amount of toxin damage dealt by infections
Reduces the toxin damage dealt by non-necrotic infections by a factor of
1.5. Also increases the germ_level required to reach necrosis.
2014-07-06 11:19:19 -04:00
mwerezak
267fe55430 Adjusts the curing of infections 2014-07-06 11:04:12 -04:00
mwerezak
f1f9641bb5 Fixes dionaea getting infections 2014-07-06 02:34:49 -04:00
mwerezak
b376f117b8 Makes infections cure faster 2014-07-06 02:33:10 -04:00
Zuhayr
7889ac25ab Fixed embedding. 2014-07-01 10:12:58 +09:30
Chinsky
4cd4217488 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
Conflicts:
	code/modules/organs/organ_external.dm
2014-06-24 04:22:28 +04:00
Chinsky
ece48ae0c4 Moved same code into single organ helper to handle embedding. 2014-06-24 04:09:35 +04:00
Chinsky
7e56df8689 Merge pull request #5308 from mwerezak/wound-infections
Re-enables infections, implements a wound infection system, improves body temperatures
2014-06-22 22:04:25 +04:00
mwerezak
5305de5ecb Fixed misplaced prob(), added notes 2014-06-22 09:51:38 -04:00
Mloc
af60005aad Merge pull request #5317 from comma/master
Couple o fixes
2014-06-22 11:13:29 +01:00
mwerezak
1a57ed7355 Having an infection raises your body temperature
Also the toxin damage taken during INFECTION_LEVEL_ONE is greatly
reduced.
Fixes robotic internal organs getting infections.
Fixes the organ_failure random event. Forgot to set the affected organ
as needing processing.
2014-06-21 16:55:07 -04:00
Chinsky
15536d27a4 Fixes #5264
Viruses are properly transferred to spilled blood now.
Antigens prevent from infection properly.
Lowered frequency of blood puddle virus check to cut down on processing.
2014-06-21 17:52:59 +04:00
mwerezak
244b43c657 Infections now spread between organs
Infections can now spread between internal and external organs.
Also changes the organ_failure random event to cause an infection
instead.
2014-06-20 23:22:03 -04:00
mwerezak
1b86e3548f Cleans up organ processing 2014-06-20 21:02:24 -04:00