LetterJay 359d31238d Merge branch 'master' into upstream-merge-37486

2018-05-21 11:59:57 -05:00

..

combat.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

death.dm

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

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

inventory.dm

modular_citadel

2018-05-20 23:04:13 -05:00

life.dm

Update life.dm

2018-04-29 18:42:17 -04:00

monkey_defense.dm

[MIRROR] Replaced body zone magic strings with defines (#6004)

2018-03-19 21:18:57 -05:00

monkey.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

punpun.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

update_icons.dm

[MIRROR] Replaced body zone magic strings with defines (#6004)

2018-03-19 21:18:57 -05:00