3c477dfa5e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
bb82f80885
Added get_bodytype() species proc as groundwork for subspecies.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
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
78784a3d9a
Fixes #9933
...
Also potential same issue with other scalpel subtypes.
2015-06-25 23:59:12 +03:00
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
c2c8911aed
Additional IPC tweaks.
2015-05-31 02:30:57 +09:30
ff5c815d01
Fixes #9487
2015-05-31 01:38:04 +09:30
7dd86c9147
Readded preview icon for IPC, added language and blurb.
...
Added welder/fuel checks to relevant surgery.
2015-05-25 14:50:00 +09:30
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
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
3cae318716
Merge pull request #9370 from comma/frankenstein
...
Frankenstein
2015-05-25 13:56:40 +09:30
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
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
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
f016d51f38
Fixes cavity surgery using old organ names
2015-05-18 06:15:09 +03:00
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
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
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
fa8ee58183
Fixes a monkey runtime and updates head reattachment surgery.
2015-04-04 20:03:54 -07:00
2ae7c93582
God dammit copypaste before commit.
2015-04-03 18:47:59 -07:00
29cd70cbdd
Fixes robot limbs not spawning subparts.
2015-04-03 06:44:52 -07:00
eeee0dfb9f
Numerous runtime/oversight fixes.
2015-04-03 06:12:36 -07:00
8def76f849
Removing some debugs.
2015-04-01 18:06:46 -07:00
84b903cf69
Fixes #8702 properly.
2015-04-01 17:57:28 -07:00
294a1ff1f1
Should fix #8710
2015-04-01 17:27:06 -07:00
c3eb6102b4
Added a few null checks.
2015-04-01 17:15:59 -07:00
01ce8d4a1f
Fixes #8696
...
Fixes #8696 , and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04:00
41ff9819bd
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/organs/organ_internal.dm
code/modules/organs/organ_objects.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-03-31 17:44:42 +03:00
2e728cfd4b
Added macros for droplimb flags.
2015-03-31 11:42:45 +10:30
601e6fb7ef
Merged with dev.
2015-03-31 11:17:13 +10:30
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
f017764e64
More work on adjusting/tweaking/fixing the limb port to make it functional.
2015-03-25 00:59:17 +10:30
a63b9b4e73
Beginning to port over new icon update from limbs branch. WIP
2015-03-24 23:48:54 +10:30
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
173f0527eb
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/nano/nanomanager.dm
code/modules/surgery/surgery.dm
2015-03-05 08:05:44 +01:00
b0be5a90ff
Fixed exploit that allowed you to apply surgery step to any zone regardless of where you state it. For example it allows you to cut off heads, groins and even torsos by starting to cut off limb and then switching to other zone. Also now surgery lock is area-based, so more than one surgeon can work on different organs at same time.
2015-03-03 13:37:26 +03:00
acfd99e33c
Surgery now shows up on mob, in all gory glory.
2015-02-21 16:31:44 +03:00
f8b94456ba
Merge pull request #7844 from Kelenius/ofDryingAndRacks
...
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
0a3f523066
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
...
Conflicts:
code/__HELPERS/maths.dm
code/__HELPERS/type2type.dm
code/modules/clothing/head/hardhat.dm
code/modules/clothing/spacesuits/captain.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/spacesuits/rig/rig_pieces.dm
code/modules/clothing/spacesuits/rig/suits/light.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/utility.dm
code/modules/events/event_manager.dm
code/modules/mob/living/living.dm
code/setup.dm
2015-02-04 04:44:09 +06:00
0e7ed6aef4
Merge branch 'dev' into ofDryingAndRacks
2015-02-03 20:51:27 +03:00
aa5013fa08
Merge pull request #7885 from Baystation12/master
...
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
490027405a
Merge remote-tracking branch 'origin/dev' into dev
...
Conflicts:
code/modules/virus2/helpers.dm
2015-01-19 02:15:38 +06:00
Zuhayr