Ikarrus d2ef043690 Resolved Conflicts: ...

code/modules/mob/living/living.dm

2015-06-11 23:46:59 -06:00

..

admin

Merge pull request #9588 from AnturK/build_area

2015-06-11 12:50:20 +01: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 #9139 from Xhuis/pray_4_fun

2015-06-11 02:58:46 +03:00

clothing

Merge pull request #9741 from palpatine213/SecHudEmag

2015-06-04 20:19:39 -05: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

…

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

Merge pull request #9806 from kingofkosmos/blendershake

2015-06-11 10:58:38 -05:00

holiday

Fixes #9257

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

hydroponics

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

2015-06-09 21:52:46 -07: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

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

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

mob

Resolved Conflicts:

2015-06-11 23:46:59 -06: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 #9779 from Cheridan/touching_linda

2015-06-07 04:57:52 +03:00

power

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

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

procedural mapping

Updates paths

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

projectiles

Resolved Conflicts:

2015-06-11 23:46:59 -06:00

reagents

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

2015-06-10 20:48:22 +03:00

recycling

Fixed hacking from inside machines and more.

2015-06-06 11:34:12 +01:00

research

fixes problems

2015-06-10 17:33:35 -07: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

Fixes shuttles taking turfs that aren't part of the shuttle itself.

2015-06-08 05:07:02 -03:00

surgery

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

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

telesci

span fixes

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