GunHog b655ade95e Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE ...

Conflicts:
	code/game/mecha/mecha.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-06-04 08:40:42 -05:00

..

admin

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

assembly

Merge pull request #9715 from Firecage/datumspaths

2015-06-02 23:04:51 -05:00

awaymissions

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

client

merge conflict fix

2015-05-31 02:45:46 +02:00

clothing

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

crafting

more spans

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

detectivework

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

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

events

Merge pull request #9699 from KorPhaeron/turf

2015-06-02 23:15:42 -05:00

flufftext

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

food&drinks

Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome

2015-06-03 09:49:51 -05:00

holiday

Fixes #9257

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

hydroponics

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

library

Changes alot of datum/ to /datum/

2015-05-31 02:40:54 +02:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

Merge pull request #9699 from KorPhaeron/turf

2015-06-02 23:15:42 -05:00

mob

Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE

2015-06-04 08:40:42 -05:00

nano

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

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

ninja

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

paperwork

Merge pull request #9725 from MrStonedOne/patch-15

2015-06-02 23:34:54 -05:00

power

Merge pull request #9699 from KorPhaeron/turf

2015-06-02 23:15:42 -05:00

procedural mapping

Removes unsimulated turfs.

2015-06-01 23:24:18 -03:00

projectiles

Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome

2015-06-03 09:49:51 -05:00

reagents

Merge pull request #9699 from KorPhaeron/turf

2015-06-02 23:15:42 -05:00

recycling

Added allow_drop() on machinery.

2015-05-16 02:36:02 +01:00

research

Merge pull request #9715 from Firecage/datumspaths

2015-06-02 23:04:51 -05:00

scripting

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

security levels

more spans

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

shuttle

Removes unsimulated turfs.

2015-06-01 23:24:18 -03:00

surgery

Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome

2015-06-03 09:49:51 -05:00

telesci

span fixes

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