Remie Richards 7e0e50302a Merge pull request #9436 from MrStonedOne/powerfixes ...

Merges power subsystem into machine subsystem.

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

..

admin

Merge pull request #9436 from MrStonedOne/powerfixes

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

assembly

Prevents golems and skeletons from dropping due to shards and mousetraps

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

awaymissions

sets hardset_dna to clear exotic blood on race changes

2015-04-23 12:35:37 -04:00

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

more spans

2015-04-24 20:52:00 +03:00

detectivework

Fixes span in wiping with rag.

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

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge pull request #9129 from Incoming5643/begone_ye_jellies

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

flufftext

Fixes #9066, removes description on Noslips

2015-04-27 14:03:51 -05:00

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 #9347 from SamuelRowe/master

2015-05-09 20:31:54 +10:00

library

Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.

2015-04-27 23:54:28 +02:00

lighting

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

mining

Conflict resolution

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

mob

Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere

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

nano

Air alarm template still needs a tweak, but it's functional now.

2015-04-25 05:22:00 +01:00

ninja

More visible.message span classes removed.

2015-04-24 21:24:21 +03:00

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

Merge pull request #9129 from Incoming5643/begone_ye_jellies

2015-05-02 23:59:15 +10: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

NTSL Expansion

2015-03-25 16:22:21 -05:00

security levels

more spans

2015-04-24 20:52:00 +03:00

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

span fixes

2015-04-24 20:52:01 +03:00