Cheridan ba20b8a265 Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine ...

Resolves #1358, /code/defines/obj.dm reorganization

2015-05-13 09:23:56 -05:00

..

admin

Merge pull request #9451 from Xhuis/whyAreThereFortyShadowlings

2015-05-13 19:46:12 +10:00

assembly

Prevents golems and skeletons from dropping due to shards and mousetraps

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

awaymissions

reorganizing stray objs in /defines

2015-05-05 21:18:21 +10:00

client

Merge pull request #9264 from phil235/BundleFix6

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

clothing

KEEP YOUR HOES IN LINE

2015-05-11 15:58:18 -05: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

…

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 #9352 from Jordie0608/redefiningwhatitmeanstobeadefine

2015-05-13 09:23:56 -05: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 branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem

2015-05-13 20:01:27 +10: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 #9352 from Jordie0608/redefiningwhatitmeanstobeadefine

2015-05-13 09:23:56 -05:00

procedural mapping

minor correction.

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

projectiles

caps horrid icon operation to 100

2015-05-10 15:12:23 +10:00

reagents

Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere

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

recycling

further reorganization, elimination of old defines folder

2015-05-09 23:16:57 +10:00

research

Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine

2015-05-10 14:48:35 +10:00

scripting

…

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

KEEP YOUR HOES IN LINE

2015-05-11 15:58:18 -05:00

telesci

span fixes

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