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

Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm

2014-06-19 02:27:10 +04:00

..

admin

Merge pull request #3916 from hornygranny/rip_wip

2014-06-16 10:40:40 +01:00

assembly

Merge pull request #3906 from Malkevin/sparklesparkle

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

awaymissions

Removes hacky code in favour of a process() check for the nuke disk's location

2014-05-30 22:01:20 -06:00

client

…

clothing

Merge pull request #3903 from phil235/HardHatUpdateFix

2014-06-12 19:29:14 -05:00

detectivework

Merge pull request #3572 from Aranclanos/evidencebags

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

events

Merge pull request #3831 from CollenN/bogemagchance

2014-06-05 21:38:43 +01:00

flufftext

…

food

Merge pull request #3718 from hornygranny/cheeseallthewaydown

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

hydroponics

One big update for stacks.

2014-06-10 20:36:08 +04: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

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

2014-06-19 02:27:10 +04:00

nano

…

paperwork

Fixed indentations.

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

power

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

2014-06-19 02:27:10 +04:00

projectiles

Span class.

2014-06-14 22:29:37 +02:00

reagents

Merge pull request #3923 from phil235/EatMessageFix

2014-06-16 10:39:12 +01: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

…

security levels

…

shuttle

…

surgery

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

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

telesci

…