xxalpha 79c96e1bf1 Fixed emitter beam esword reflection runtime error.

2015-05-13 21:16:52 +01:00

..

admin

Merge pull request #9356 from Firecage/Kudzulogs

2015-05-11 23:58:38 +10:00

assembly

Prevents golems and skeletons from dropping due to shards and mousetraps

2015-05-07 15:44:17 +02:00

awaymissions

…

client

Merge pull request #9264 from phil235/BundleFix6

2015-05-04 09:41:01 -05:00

clothing

fixes white crayons making nitrile gloves

2015-05-08 18:20:43 +10:00

crafting

…

detectivework

Fixes span in wiping with rag.

2015-05-03 08:11:31 +03:00

emoji

…

events

Merge pull request #9129 from Incoming5643/begone_ye_jellies

2015-05-02 23:59:15 +10:00

flufftext

…

food&drinks

More

2015-05-07 11:20:14 +12:00

holiday

Fixes #9257

2015-05-05 18:50:30 +02:00

hydroponics

Merge pull request #9356 from Firecage/Kudzulogs

2015-05-11 23:58:38 +10:00

library

…

lighting

…

mining

Conflict resolution

2015-05-09 11:49:11 -05:00

mob

Merge pull request #9359 from GunHog/Posibrain_Change

2015-05-11 08:32:15 -05:00

nano

…

ninja

…

paperwork

- Fixed nettle soup recipe says abstract nettle.

2015-05-02 01:34:38 +02:00

power

Merge pull request #9436 from MrStonedOne/powerfixes

2015-05-10 08:23:20 +01:00

procedural mapping

minor correction.

2015-05-03 23:39:04 +01:00

projectiles

Fixed emitter beam esword reflection runtime error.

2015-05-13 21:16:52 +01:00

reagents

Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere

2015-05-09 16:23:46 +02:00

recycling

Fixes borg modules other than the trash bag not being able to work on disposal bins.

2015-04-30 16:42:25 -06:00

research

Removes mining drill power mechanic.

2015-05-08 10:12:22 -05:00

scripting

…

security levels

…

shuttle

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

surgery

Merge pull request #9185 from AnturK/aliens_stole_my_branch_name

2015-05-02 23:59:48 +10:00

telesci

…