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

Conflicts:
	code/game/gamemodes/malfunction/Malf_Modules.dm

2015-06-15 12:26:28 -05:00

..

admin

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

assembly

Adds feedback gathering for a hell of a lot more things.

2015-06-09 21:52:46 -07:00

awaymissions

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

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

client

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

clothing

Merge pull request #9702 from KorPhaeron/armor

2015-06-15 17:49:40 +03:00

crafting

Adds feedback gathering for a hell of a lot more things.

2015-06-09 21:52:46 -07: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 #9802 from Miauw62/AyeEye

2015-06-11 14:13:52 -05:00

flufftext

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

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

food&drinks

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

holiday

Fixes #9257

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

hydroponics

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

library

overlays for computers

2015-06-13 20:07:48 +10:00

lighting

Changes how destroying turfs works

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

mining

Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit

2015-06-14 10:25:27 -05:00

mob

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

2015-06-15 12:26:28 -05:00

nano

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

ninja

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

paperwork

Squashed commit:

2015-06-13 22:13:01 -06:00

power

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

procedural mapping

Updates paths

2015-06-03 22:52:39 +02:00

projectiles

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

reagents

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

recycling

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

research

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02: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

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

surgery

Merge pull request #9053 from MrPerson/screen_alert_2

2015-06-15 01:00:20 +02:00

telesci

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00