phil235 f8bd5a4259 Adds a temporary fix to the conflict with metastation map. ...

Small fix in simple_animal life subproc.

2015-03-26 18:55:05 +01:00

..

admin

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

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

assembly

Adds a verb_exclaim var. Fixes #8478.

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

awaymissions

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

2015-03-20 19:32:16 +01:00

client

Added a preference toggle for hearing musical instruments

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

clothing

Merge pull request #8427 from Cheridan/day3_collars

2015-03-22 19:37:12 +01: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 branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal

2015-03-23 16:51:03 +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

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

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

holiday

Yet more work on slime procs and life subprocs.

2015-03-21 20:44:32 +01: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

Adds a temporary fix to the conflict with metastation map.

2015-03-26 18:55:05 +01: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

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

2015-03-15 12:30:27 +01:00

power

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

2015-03-20 17:02:00 +00: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 branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal

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

Updates/fixes to NTSL

2015-01-03 17:43:43 -08: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

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