Commit Graph

174 Commits

Author SHA1 Message Date
ZomgPonies
fe5db3f538 Merge pull request #335 from Bone-White/master
Spec Ops Shuttle Computer Access Fix
2014-07-28 13:52:25 -04:00
Bone White
d15d6bb742 Minor surgery typo "exposing the brain help within"
Fixed a typo in organ_external
2014-07-27 21:37:33 +01:00
Walter0o
2e01af4279 fixes nullpointer caused by broken organ list
the mysterious broken list bug has struck again
2014-07-26 11:25:05 -04:00
mwerezak
e180bcc2f3 Fixes icons not being updated for necrosis 2014-07-24 18:30:15 -04:00
mwerezak
effd7545bc Adjusts the rate that infections deal toxin damage
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-24 18:30:00 -04:00
mwerezak
573cbaf63a Fixes fever temperature not being reached
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-24 18:27:58 -04:00
ZomgPonies
7cbd6b1a81 Fix fatties 2014-07-23 12:22:37 -04:00
mwerezak
0f49c165d2 Tweaks infections
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-23 08:59:23 -04:00
ZomgPonies
9148e4b4a9 Removing more deprecated virus1 shit 2014-07-18 11:41:46 -04:00
mwerezak
6a3b19a540 Infections raise temperature faster wrt germ_level 2014-07-18 06:59:37 -04:00
JimTheCactus
b96429146e 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-16 10:12:03 -04:00
mwerezak
4803dfa063 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-16 09:35:33 -04:00
Zuhayr
938dc70803 Fixes #5485
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2014-07-14 03:31:51 -04:00
Zuhayr
9d3d1c9ea1 Fixes #5508
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-14 03:26:56 -04:00
mwerezak
8ad91ea11c Fixes germ levels going below zero
Conflicts:
	code/modules/organs/organ_internal.dm
2014-07-13 08:53:53 -04:00
mwerezak
44e2f8acf2 Fixes human internal organs list
Conflicts:
	code/modules/events/organ_failure.dm
	code/modules/organs/blood.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/surgery/ribcage.dm
2014-07-13 08:51:55 -04:00
mwerezak
76e9212ac8 Fixed wrong operator 2014-07-13 08:19:59 -04:00
mwerezak
87e7c32959 Fixes advanced trauma kits claiming to disinfect but not doing so
Conflicts:
	code/game/objects/items/stacks/medical.dm
2014-07-13 08:18:16 -04:00
unknown
9a6e39fc58 Fixes missing length check before pick() 2014-07-13 08:17:03 -04:00
mwerezak
d3cdb25ef3 Increases cough rate for lung infections 2014-07-13 08:16:49 -04:00
mwerezak
ebfbf40724 Tweaks internal organ spread rate
Conflicts:
	code/modules/organs/organ_internal.dm
2014-07-13 08:16:32 -04:00
mwerezak
afaf623376 Makes minor wounds harder to infect 2014-07-13 08:13:21 -04:00
mwerezak
64ba9ab933 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.

Conflicts:
	code/modules/organs/organ_internal.dm
	code/setup.dm
2014-07-13 08:13:02 -04:00
mwerezak
044399e6f0 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-13 07:43:57 -04:00
mwerezak
54075aaceb Infected wounds show up more readily on the health scanner 2014-07-13 07:42:32 -04:00
mwerezak
0682d336ec Spaceacillin now prevents wounds from transferring germs 2014-07-13 07:42:21 -04:00
mwerezak
9cebb9708e Makes bleeding logic a little clearer 2014-07-13 07:41:56 -04:00
mwerezak
8f6bfb8b1a 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.

Conflicts:
	code/modules/organs/organ_internal.dm
	code/setup.dm
2014-07-13 07:39:26 -04:00
mwerezak
e360e5732b Adjusts the curing of infections
Conflicts:
	code/modules/organs/organ_internal.dm
2014-07-13 07:36:25 -04:00
mwerezak
0ba5e1a3dc Fixes dionaea getting infections 2014-07-13 07:35:30 -04:00
mwerezak
5a054bcdaa Makes infections cure faster 2014-07-13 07:35:17 -04:00
Zuhayr
05e4a50b92 Fixed embedding.
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-12 21:42:15 -04:00
Chinsky
d1932f7045 Moved same code into single organ helper to handle embedding.
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/organs/organ_external.dm
2014-06-24 11:46:56 -04:00
mwerezak
2dd832af53 Fixed misplaced prob(), added notes 2014-06-22 14:17:22 -04:00
mwerezak
4dd8b16cac 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 17:25:00 -04:00
Chinsky
47327042eb 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.

Conflicts:
	code/game/turfs/simulated.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/organs/blood.dm
	code/modules/reagents/Chemistry-Reagents.dm
2014-06-21 13:02:11 -04:00
mwerezak
177137a4b5 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.

Conflicts:
	code/modules/events/organ_failure.dm
	code/modules/organs/organ.dm
2014-06-21 12:55:25 -04:00
mwerezak
2f9ba5d4b6 Cleans up organ processing
Conflicts:
	code/modules/organs/organ.dm
	code/modules/organs/organ_internal.dm
2014-06-21 12:48:39 -04:00
mwerezak
6e256506e3 Body temperature fixes and updates
Body temperature regulation is now based on species, and environmental
temperature now respects the air density when affecting living/humans.
This also fixes some bugs with heat/cold protection handling and
improves the way synthetic species body temperatures are handled to be
much more logical.

IPCs always gain temperature but cool down because of their environment.
When the heat transfer to the environment is reduced because of the lack
of air, this will cause IPCs to heat up.

As well, having an infection will increase your body temperature, and
body scanners now detect infections.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
2014-06-21 12:20:22 -04:00
mwerezak
b39abf59fa Spaceacillin cures infected organs 2014-06-20 12:18:19 -04:00
mwerezak
02572867e4 Tweaks wound infection a bit
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
2014-06-20 12:17:51 -04:00
mwerezak
ba08210cd7 Re-enables organ infections, adds wound infection
Conflicts:
	code/game/atoms.dm
	code/modules/mob/living/carbon/carbon.dm
	code/setup.dm
2014-06-20 12:14:19 -04:00
mwerezak
6d44eea078 Updates l_move_time to use world.time 2014-06-20 12:12:31 -04:00
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