Cheridan bf36e8d040 Merge pull request #8615 from sawu-tg/npcpool ...

Updates the NPCPool to current branch.

2015-03-29 15:10:15 -05:00

..

admin

Merge pull request #8549 from tedward1337/Ohgodthisishard

2015-03-30 01:20:45 +11:00

assembly

Adds a verb_exclaim var. Fixes #8478.

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

awaymissions

Merge remote-tracking branch 'upstream/master' into hardjet

2015-03-27 19:35:10 +00:00

client

Added a preference toggle for hearing musical instruments

2015-03-22 01:54:30 -07:00

clothing

Merge pull request #8392 from xxalpha/hardjet

2015-03-30 01:21:05 +11:00

crafting

Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights

2015-03-22 16:56:11 +11:00

detectivework

resprites forensic scanner, cargo tagger, and rped

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

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge pull request #8566 from Incoming5643/literal_fun_removal

2015-03-30 01:25:52 +11: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

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

2015-03-26 02:31:06 +01:00

holiday

Fix-it-Phil

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

hydroponics

Merge pull request #8414 from phil235/TablecraftVarietyFix

2015-03-22 05:32:43 +03:00

library

Adds a verb_exclaim var. Fixes #8478.

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

mining

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

2015-03-23 16:51:03 +01:00

mob

Merge pull request #8615 from sawu-tg/npcpool

2015-03-29 15:10:15 -05:00

nano

Auto load required nanoui files on client login

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

ninja

Moves ninja shoes into the ninja folder

2015-03-09 23:02:26 +00: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

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

2015-03-26 02:31:06 +01:00

reagents

Merge pull request #8520 from MrPerson/effect_cleanup

2015-03-30 01:21:40 +11:00

recycling

resprites forensic scanner, cargo tagger, and rped

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

research

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

2015-03-26 02:31:06 +01: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

Improves shuttle corner fix to use actual appearance data of the turf, so it takes transform into consideration.

2015-01-19 18:48:52 +00:00

surgery

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

2015-03-26 02:31:06 +01:00

telesci

Effect pooling

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