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
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
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
mwerezak
6dbd565079
Merge remote-tracking branch 'upstream/dev' into robolimbs2
2015-05-30 08:32:31 -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
Zuhayr
15070d729d
Dev-freeze into dev merge.
2015-05-30 00:31:12 +09:30
mwerezak
34ceac7cc6
Fixes IPCs getting fleshy stumps, makes robot limbs become unusable above max_damage
2015-05-28 22:10:28 -04:00
mwerezak
6e63985a51
Adjusts IPC head health
2015-05-27 02:31:00 -04:00
mwerezak
af8a173e30
Changes IPC eyes to optics, generalizes vision organs
...
Now any organ can cause vision loss if damaged, not just ones that
inherit from organ/internal/eye.
2015-05-27 02:18:11 -04:00
mwerezak
b4adb1a432
Updates species checks
2015-05-27 01:34:50 -04:00
mwerezak
7423f2ecfd
IPC mmi_holder is now carried in the chest
...
Adds an optical sensor organ (eyes) for IPCs so that losing their head
still does something to them.
2015-05-27 01:24:34 -04:00
mwerezak
2098c80849
Damage on robot limbs no longer counts towards shock and crit
...
Damage on robot limbs no longer counts towards traumatic_shock and crit.
Raises the damage mod in exchange.
2015-05-27 01:24:00 -04:00
mwerezak
8b300df936
Generalizes limb damage mods
2015-05-27 01:23:22 -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
Zuhayr
f32a8493c8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into posibrains
2015-05-25 16:50:04 +09:30
Zuhayr
88b3019e6c
Adds ghost click to posibrains.
...
Added ghost trap system used by plants and posibrains to get players. Added attack_ghost() to hydro trays and posibrains for the aforementioned.
Changelog.
Minor typo.
Topic fixes.
Minor fix.
2015-05-25 16:49:22 +09:30
Zuhayr
74dfd82072
Organ cleanup, stat to DEAD, world removal
2015-05-25 14:50:02 +09:30
Zuhayr
f0006ec6bf
Removes redundant surgery for brain and eye repair, now covered by organ repair in general.
...
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
2015-05-25 14:49:57 +09:30
Zuhayr
958494ae75
Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.
...
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
2015-05-25 14:49:07 +09:30
