Zuhayr 2b4cd94650 Merge resolution.

2014-11-19 23:28:09 +10:30

..

closets

No more sleeping in closets

2014-11-11 11:07:05 +01:00

effects

Merge resolution.

2014-11-19 23:28:09 +10:30

items

Merge resolution.

2014-11-19 23:28:09 +10:30

random

Cables are now stacks

2014-08-25 18:54:35 +04:00

structures

Merge resolution.

2014-11-19 23:28:09 +10:30

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

items.dm

Manual merge of head.dmi.

2014-11-14 23:02:16 +10:30

objs.dm

AI and Topic fixes.

2014-11-07 11:10:32 +01:00

structures.dm

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

weapons.dm

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00