b7059519c2
Merge remote-tracking branch 'upstream/master' into dev
2014-02-03 04:36:03 +03:00
810de4ddaa
Merge pull request #4337 from Baystation12/dev-freeze
...
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
4df59faf76
Surgery tracking.
2014-01-31 16:28:24 +03:00
4a0fb22530
IPC brain surgery code.
2014-01-29 16:01:25 +10:30
69d260a11d
Preliminary surgery work for IS_SYNTHETIC.
2014-01-28 16:00:36 +10:30
d783fd5043
Manual binary merge of head icons.
2013-12-22 23:23:25 +10:30
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
a48100da74
Reattaching a mindless head no longer results in a runtime error
2013-12-21 22:50:13 +01:00
822b572962
Plopped the borer out of the skull when the brain is removed.
2013-12-18 13:50:11 +10:30
503302dae5
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/implants/implant.dm
code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
5cce782c34
Tool definition fix.
...
Properly accounted for bruisepacks vs poultices under Chinsky's PR.
2013-11-15 19:26:28 -05:00
cad2c524a8
Tree fixery.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-11-15 23:11:11 +00:00
7ce2314c11
Merge Fixes
...
Fixes issues post merge and and with minor sanity checks and neatness.
2013-11-14 13:08:40 -05:00
ae31f9cdcf
Surgery Update
...
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.
2013-11-14 13:08:31 -05:00
a104453156
Added and Adjusted Chemicals
...
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.
New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.
Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.
2013-11-14 13:08:30 -05:00
cba1a9585d
Medical Hoopery
...
Added eyes as an internal organ, removed the eye-stat var on mobs and changed it to properly direct it to eye damage. Altered all reference.
Updated the sleeper to allow for ejection of the beakers and occupants in panel.
Updated the body scanner to check for prosthetics/mechanized organs, and inform the individual of the blind disability.
Laid the groundwork for mechanical and assisted internal organs.
Groundwork for chemical: Peridaxon, a chemical that allows for the slow regeneration from organ damage.
2013-11-14 12:40:30 -05:00
25c55ed354
Germ Fix
...
Fix for missing and robotic limbs getting infected with germs and being incurable.
2013-11-14 12:39:51 -05:00
e6b44d0f35
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2013-11-14 12:03:59 +00:00
b5671e8bd8
Surgery grammar fixes
2013-11-10 13:08:44 -06:00
7b5d08e48f
Small fix for head reattachment surgery.
2013-10-30 17:20:18 -04:00
504e49ffb2
Added a new surgery- Head reattachment, for the decapitationally challenged. Performed via retractor, fix-o-vein, hemostat, cautery, head. Fixed logs and messages for decapitated brain removal - No longer shows as the head cutting the head open, and no longer shows the debrainee as the debrainer to admins.
2013-10-28 07:57:24 -04:00
8be67352ea
Typo fix.
2013-10-11 10:16:00 +03:00
a24fd41829
Fixes for typos.
2013-09-19 08:37:29 +03:00
3fbdc99079
Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.
2013-08-28 03:33:04 +01:00
b23c685221
Borer surgery fix.
2013-08-12 13:44:51 -07:00
7aa8d00e70
Borer removal, control, release of control, host death.
2013-08-09 18:10:55 -07:00
cf4f9ba054
Typo fix, retractor step bugfix.
2013-07-25 03:06:06 +03:00
a16c8e0595
Fixes #3081
2013-06-21 18:00:25 -07:00
b9be0158c7
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-12 20:31:52 -07:00
81852bea51
Fix-O-Vein steps bugfix.
2013-06-12 14:00:48 +03:00
b859a494e6
Minor surgery fix.
2013-06-12 01:57:01 -07:00
0a220db976
Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs.
2013-06-12 00:28:12 -07:00
06f04e6374
Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.
2013-06-05 17:35:38 +09:30
9ab9631ae6
Since organ processing interval is so big, sets bleeding manually so hemostat step would work.
2013-05-28 18:27:40 +04:00
c84ce517e3
Changed way substitute tools are handled.
...
Now all tools have chance of success. Proper ones have 100.
If tool has less than 100 chance of success, it can fail the step.
2013-05-28 18:16:11 +04:00
bf68f83546
Fixed brain surgery datum having duplicate class name.
...
Made brain surgery into two steps, hemostat-fixovein.
2013-03-15 00:32:27 +04:00
f13cca99e6
Added brain fixing surgery.
2013-03-12 02:22:46 +04:00
104cc5585d
roro to slime fix
2013-03-06 05:59:21 +04:00
b25a6cb9bb
Typofix
2013-03-05 04:25:21 +01:00
65b8eafe8e
Added internal organs.
...
They can be hurt by their parent organ getting hurt.
Ruptured lungs are now represented as damage to the lungs internal organ.
2013-03-04 12:19:12 +01:00
fd2f37428b
Made limb surgery not EXPLODE robotic limbs
2013-02-23 03:58:32 +04:00
1aafb9ade9
Derp, forgot the surgery.
2013-02-23 02:30:01 +04:00
e8f8138e04
Added priority system for surgery steps.
...
Steps with higher priority would be attempted first.
Added preparation step for item insertion surgery.
2013-02-22 23:06:37 +04:00
4a6f719f35
Added crowbar as alternative to retractor.
2013-02-20 15:57:50 +04:00
2ae3fdf122
Fixed derp in surgery step.
...
Forgot they all instanced at init, not on demand.
2013-02-19 17:51:04 +04:00
334da25223
Added surgery to put things in people.
2013-02-18 13:22:23 +04:00
8b8556a1b1
Removed requirements for face surgery to cut open head too, real counterintuitive and looks like copypaste error >.>
2013-02-15 02:06:35 +04:00
2b7da59f1f
Readded limb cutoff surgery.
2013-02-09 22:43:39 +04:00
5185dd988e
Surgery runtime checks.
2013-01-28 01:51:42 +04:00
7a66e7e524
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
code/setup.dm
2013-01-22 23:46:42 +04:00
Segrain