Mervill c2e2440953 Merge branch 'master' into w_class ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2016-12-02 21:44:24 -08:00

..

bodyparts

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

organs

w_class now uses defines

2016-12-01 21:33:14 -08:00

amputation.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

cavity_implant.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

core_removal.dm

…

dental_implant.dm

Fixes dental implant runtime (#21256)

2016-10-31 19:51:54 +01:00

eye_surgery.dm

…

generic_steps.dm

You can cauterize with a laser gun now.

2016-10-30 17:21:39 -07:00

helpers.dm

corrects some defs without leading slash (#21843)

2016-11-30 20:05:14 +13:00

implant_removal.dm

Contents_explosion() tweaks (#20934)

2016-10-16 10:01:37 +13:00

limb_augmentation.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

lipoplasty.dm

…

organ_manipulation.dm

Cortical Borers (#21118)

2016-11-10 09:25:41 +13:00

plastic_surgery.dm

Makes the pronoun helper proc names less horrifyingly long (#20780)

2016-10-10 12:28:25 +13:00

prosthetic_replacement.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

remove_embedded_object.dm

Cortical Borers (#21118)

2016-11-10 09:25:41 +13:00

surgery_step.dm

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

surgery.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

tail_modification.dm

Adding var/list/atom_colours to /atom .

2016-10-19 01:51:30 +02:00

tools.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00