xxalpha 662af7174f Merge remote-tracking branch 'upstream/master' into fixfixfix ...

Conflicts:
	icons/obj/storage.dmi

2015-05-29 21:45:18 +01:00

..

organs

Tweaked uplink prices.

2015-05-15 21:54:08 +01:00

appendectomy.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

brain_removal.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

cavity_implant.dm

Fixed being able to insert NODROP items into people with cavity implant.

2015-05-16 01:06:51 +01:00

core_removal.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

cybernetic_implants.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

eye_surgery.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

gender_reassignment.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

generic_steps.dm

Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.

2015-04-27 23:54:28 +02:00

helpers.dm

Merge pull request #9115 from AnturK/abduction_udpate_dos

2015-04-26 15:38:19 +01:00

implant_removal.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

limb augmentation.dm

Fixed using the wrong robotic limbs for augmentations.

2015-05-16 12:44:53 +01:00

lipoplasty.dm

Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.

2015-04-27 23:54:28 +02:00

multiple_location_example.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

plastic_surgery.dm

Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.

2015-04-27 23:54:28 +02:00

remove_embedded_object.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

surgery_step.dm

Merge pull request #9185 from AnturK/aliens_stole_my_branch_name

2015-05-02 23:59:48 +10:00

surgery.dm

Abduction Update Two:

2015-04-26 01:30:59 +02:00

tools.dm

Removed an unused suicide_act proc belonging to the scalpel.

2014-07-02 09:27:06 +10:00

xenomorph_removal.dm

KEEP YOUR HOES IN LINE

2015-05-11 15:58:18 -05:00