phil235 1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm

2015-04-06 19:38:51 +02:00

..

admin

Merge pull request #8624 from Cheridan/day42_betsoff

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

assembly

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

awaymissions

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

client

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

clothing

Merge pull request #8723 from kingofkosmos/grammarfixes

2015-04-04 20:00:21 +02:00

crafting

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

detectivework

resprites forensic scanner, cargo tagger, and rped

2015-03-22 11:54:26 -05:00

emoji

…

events

Look at all these bugs that no longer exist!

2015-03-30 03:36:24 +01:00

flufftext

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

food&drinks

Fixes alien and simple animal being unable to attack porta_turret (like the AI turrets). Making a take_damage() proc to update the turret's health.

2015-03-31 00:09:55 +02:00

holiday

Fix-it-Phil

2015-03-29 06:17:25 +11:00

hydroponics

Merge pull request #8624 from Cheridan/day42_betsoff

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

library

Adds a verb_exclaim var. Fixes #8478.

2015-03-22 18:55:59 +01:00

mining

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

mob

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

2015-04-06 19:38:51 +02:00

nano

Auto load required nanoui files on client login

2015-02-25 12:25:21 +13:00

ninja

Merge pull request #8737 from RemieRichards/NinjaCleanup2

2015-04-05 21:54:33 -05:00

paperwork

Change select holiday names to #defines

2015-03-25 15:01:06 -07:00

power

Effect pooling

2015-03-24 11:44:49 -07:00

procedural mapping

Removes 2 commented out lines.

2015-02-15 14:01:45 +00:00

projectiles

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

reagents

Merge pull request #8634 from sawu-tg/master

2015-03-31 19:40:33 +02:00

recycling

resprites forensic scanner, cargo tagger, and rped

2015-03-22 11:54:26 -05:00

research

Merge pull request #8723 from kingofkosmos/grammarfixes

2015-04-04 20:00:21 +02:00

scripting

NTSL Expansion

2015-03-25 16:22:21 -05:00

security levels

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

shuttle

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

surgery

Better sprites for chest cyber implants.

2015-04-04 20:06:10 +01:00

telesci

Effect pooling

2015-03-24 11:44:49 -07:00