ikarrus d3ec4dbf72 Resolving Conflicts: ...

_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm

2014-06-27 09:30:43 -06:00

..

admin

Resolving Conflicts:

2014-06-27 09:30:43 -06:00

assembly

Merge pull request #3906 from Malkevin/sparklesparkle

2014-06-13 09:16:30 +01:00

awaymissions

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

client

OKAY WHOOPS I LIED

2014-06-22 20:31:21 -04:00

clothing

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

detectivework

Merge pull request #3572 from Aranclanos/evidencebags

2014-05-02 17:46:04 +01:00

events

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

flufftext

Fixes the bug where players get deleted because of hallucinations. How the fuck did I screw this up so badly...

2014-03-22 21:55:52 -07:00

food

Merge pull request #3718 from hornygranny/cheeseallthewaydown

2014-05-31 13:56:03 +02:00

hydroponics

Merge pull request #3959 from CollenN/mutrace-final

2014-06-20 21:47:54 -05:00

library

carved books now turn into storage items

2014-05-16 14:30:04 -07:00

mining

One big update for stacks.

2014-06-10 20:36:08 +04:00

mob

Resolving Conflicts:

2014-06-27 09:30:43 -06:00

nano

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

paperwork

Fixed indentations.

2014-05-14 09:02:53 -06:00

power

Fixes _make_pownernets_ proc not adding the first cable found to its cable list.

2014-06-25 15:49:50 +02:00

projectiles

Override emp_act on the ionrifle

2014-06-24 20:37:27 +12:00

reagents

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

recycling

The Loggening: Admin Edition

2014-06-02 23:13:33 -06:00

research

One big update for stacks.

2014-06-10 20:36:08 +04:00

scripting

fixes shit

2014-03-09 18:31:43 +01:00

security levels

Emergency Access Override Update

2014-03-15 14:59:39 -06:00

shuttle

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

surgery

Moved item_heal_robotic out of obj/item and into mob_helpers.dm

2014-06-05 19:25:08 -05:00

telesci

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00