tkdrg 4291df8918 Merge pull request #6887 from Incoming5643/MyLittleSlimeCannotBeThisCute ...

Allows player slimes to use the slime faces that npc slimes can uses

2015-01-09 18:00:47 -03:00

..

admin

Merge pull request #6747 from paprka/gunchangesv2baby

2015-01-08 16:09:37 -08:00

assembly

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

2015-01-04 01:52:14 +00:00

awaymissions

Fixes conflicts

2014-12-30 15:12:09 +03:00

client

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

2015-01-04 01:52:14 +00:00

clothing

Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit."

2015-01-07 09:12:39 -08:00

crafting

…

detectivework

…

emoji

…

events

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

2015-01-04 01:52:14 +00:00

flufftext

further changes to the ranged stun system

2015-01-01 22:22:03 -08:00

food&drinks

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

holiday

…

hydroponics

Merge pull request #6818 from Ergovisavi/more_pod_cloning

2015-01-06 22:53:41 -03:00

library

Defines allowed books in main bookcase define

2014-12-31 23:08:23 -05:00

mining

Fixes the holosign projector making signs when put into storage, generalizes can_be_placed_into and improves the check in objects that use it.

2015-01-07 01:09:58 -07:00

mob

Merge pull request #6887 from Incoming5643/MyLittleSlimeCannotBeThisCute

2015-01-09 18:00:47 -03:00

nano

SubSystem rewrite

2014-12-31 13:25:41 +00:00

paperwork

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

2015-01-04 01:52:14 +00:00

power

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

2015-01-04 01:52:14 +00:00

projectiles

changes syndicate borg equipment

2015-01-05 19:42:31 -08:00

reagents

Merge pull request #6836 from Boggart/holosignfix

2015-01-08 16:04:49 -03:00

recycling

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

research

Merge pull request #6747 from paprka/gunchangesv2baby

2015-01-08 16:09:37 -08:00

scripting

Updates/fixes to NTSL

2015-01-03 17:43:43 -08:00

security levels

…

shuttle

Map Update

2015-01-04 01:45:02 +00:00

surgery

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

telesci

SubSystem rewrite

2014-12-31 13:25:41 +00:00