Commit Graph

1259 Commits

Author SHA1 Message Date
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
Chinsky a7d6cf3545 tyops fiexs 2015-05-20 09:49:10 +03:00
Chinsky de1de98f7a Fixed changelog
Added some info about not quite attached limbs to examination/scanner.
Added rejection info to advanced scanner
Span classes (gotta start somewhere I guess)
Also zombie goast file pls go
2015-05-20 09:37:54 +03:00
Chinsky f42f4582c4 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into frankenstein 2015-05-20 08:52:46 +03:00
Chinsky 1089da7fb1 Frankenstein edition:
Limbs now store their own dna/species info. This allows transplanted limbs show up as they are, instead of conforming to mob. Vox-cat-monkey hybrids, rainbow skrells, go wild.
Also changed rejection to cause infection instead of straight up organ damage - wouldn't want your newly acquired catpaws fracture out of blue.
As a bonus, attacks are tracked per limb, so for example having kitty claws will give you the corresponding attack
2015-05-20 03:20:09 +03:00
Chinsky 05975d78b1 Adds a portable organs/lunch freezer 2015-05-19 09:33:26 +03:00
Chinsky 77519d160f Generalized head reattachment to work with all limbs.
Now you can attach your useless chunks of meat back!
Needs second step to make meat limb usable, use hemostat/cable/mousetrap.

Changes how organs 'die'. Instead of damage they now acquire germs, 2-6 points per tick, twice faster after hitting acute infection stage. Once they reach necrosis stage, they die. All in all it takes ~7 minutes for organ to go bad without a freezer.
As a bonus, you can now attach robogroins and roboheads (no brain included)
Fixes stumps being un-cuttable, which prevented all kinds of fun stuff with replacements.
Removed ORGAN_DESTROYED check from processing, take_damage should be taking care of that now.
2015-05-19 07:09:00 +03: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
Zuhayr be270bb0d3 Runtime fixes. 2015-04-03 20:56:37 -07:00
Zuhayr 05e85fc134 Should fix the limb spam issue. 2015-04-03 19:11:35 -07:00
Zuhayr 78925ebd79 Minor loc oversight. 2015-04-03 18:48:49 -07:00