Markolie acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz ...

# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm

2017-03-08 10:45:16 +01:00

..

subtypes

conflict resolution

2017-02-05 17:13:34 -05:00

augments_eyes.dm

Fixes vision updates such as implants and similar

2016-12-21 17:59:08 -08:00

augments_internal.dm

Replaces the APC attack_hand code with a power cord organ

2017-02-25 00:41:18 -08:00

autoimplanter.dm

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

blood.dm

podmen fix

2017-01-23 08:05:55 -05:00

body_egg.dm

Makes IPC surgery much more reliable, object insertion surgery

2016-08-14 18:12:23 -07:00

helpers.dm

Uses the Disabilities system more correctly

2017-01-26 04:10:55 -05:00

organ_external.dm

Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it.

2017-02-14 21:39:40 -05:00

organ_icon.dm

Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it.

2017-02-14 21:39:40 -05:00

organ_internal.dm

Replaces the APC attack_hand code with a power cord organ

2017-02-25 00:41:18 -08:00

organ_stump.dm

Makes IPC surgery much more reliable, object insertion surgery

2016-08-14 18:12:23 -07:00

organ.dm

conflict resolution

2017-02-05 17:13:34 -05:00

pain.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

parasites.dm

Rebalances/buffs white spider

2017-02-17 23:34:35 -08:00

robolimbs.dm

Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)

2016-06-19 11:35:36 -04:00

skeleton.dm

…

vocal_cords.dm

Fixes some sounds not being cached properly

2017-02-17 02:37:26 -05:00

wound.dm

Mass replace

2016-07-07 19:34:02 -07:00