Poojawa 62273a3867 Merge branch 'master' into upstream-merge-31737

2017-10-21 07:18:14 -05:00

..

combat.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

death.dm

[MIRROR] Stops dead monkeys from moving (#2780)

2017-09-15 03:23:40 -05:00

inventory.dm

…

life.dm

Radiation makes you vomit blood and more balance changes (#31753)

2017-10-18 09:25:11 -05:00

monkey_defense.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

monkey.dm

Adds defines for organ slots

2017-10-15 19:34:42 -05:00

punpun.dm

[MIRROR] Fixes adjust config (#2723)

2017-09-22 23:02:09 -05:00

update_icons.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00