xxalpha 4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium ...

Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm

2015-07-02 18:49:41 +01:00

..

organs

Fixed reviver implant EMP resetting cooldown time.

2015-06-24 15:36:40 +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

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01: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

Cleaned some clothing flags. Ported turf/Entered optimization from vg.

2015-06-23 01:52:14 +01:00

implant_removal.dm

Gang Update: Implants Edition

2015-06-29 23:50:06 -06:00

limb augmentation.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +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

…

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

Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2

2015-06-09 03:23:18 -07:00

surgery_step.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics

2015-06-23 12:54:26 -07:00

surgery.dm

animated foam pistol shoots proper darts, no generic surgery, augmented eyesight gives nightvision and reagents in admincookie

2015-05-31 18:25:34 +10:00

tools.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

xenomorph_removal.dm

KEEP YOUR HOES IN LINE

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