Chinsky b45c04fdd6 Merge pull request #7009 from mwerezak/coffee ...

Makes vending machine coffee price in line with other items

2014-11-14 11:19:16 +03:00

..

__HELPERS

Merge pull request #6983 from PsiOmegaDelta/Event

2014-11-12 23:45:02 +03:00

_onclick

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

ATMOSPHERICS

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

controllers

Fixes and event end estimations.

2014-11-12 09:39:54 +01:00

datums

Merge remote-tracking branch 'upstream/dev' into StateLaws

2014-11-07 09:42:53 +01:00

defines

Logging of event changes.

2014-11-10 16:19:51 +01:00

FEA

…

game

Merge pull request #7009 from mwerezak/coffee

2014-11-14 11:19:16 +03:00

js

…

modules

Merge pull request #7012 from mwerezak/slime-hear

2014-11-14 11:18:57 +03:00

TriDimension

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

unused

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

WorkInProgress

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

ZAS

…

global.dm

Merge remote-tracking branch 'upstream/dev' into TheGreatEvents

2014-11-08 10:26:45 +01:00

hub.dm

…

names.dm

…

setup.dm

…

stylesheet.dm

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

world.dm

…