Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)
Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.
The second was related to the amount you took in when drinking
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
Internal organ fixing surgery will now work correctly on robotic organs,
using nanopaste in place of trauma kits
Defibs also don't need the body to be past the point of deadness to work
Kitchen utensils should now properly work as surgery tools where given in
code
IPC thralls can now be dethralled by performing the surgery on where their
brain is, in this case their chest. This will also work for any species
that has a brain anywhere else in their body.
This commit does the following:
- Replaces all instances of magic intent words, like "harm" and
"help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM
- Fixes a few manual grab instances left over in attack_alien, they
will now used grabbedby()
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.
Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard
Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds
Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.
Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.
This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
- Adds the ability to construct Syndicate Medbots, which were previously
in the code but unable to be constructed. These bots will only heal
Syndicate Nukeops, and can only be made from the medikit box that
Nukeops can purchase.
- Fixed recharging in energy crossbows and laser tag guns, they were
recharging 10x slower than they were meant to.
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
Conflicts:
code/__HELPERS/unsorted.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/projectiles/gun.dm
code/modules/reagents/reagent_containers/syringes.dm
code/modules/surgery/eye.dm
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.
Conflicts:
code/game/gamemodes/wizard/artefact.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/melee/misc.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/weapons.dm
code/modules/hydroponics/hydroitemdefines.dm
code/modules/surgery/tools.dm
I got about half-way through changing these when SuperSayu came up and said he fixed this a while ago but never posted the fix. So technically half of these were fixed by me and half by him. Credit to both of us!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5564 316c924e-a436-60f5-8080-3fe189b3f50e
