Xhuis 7f6871c233 Fixes conflicts and commits

2015-03-21 12:47:25 -04:00

..

admin

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

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

assembly

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

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

awaymissions

Makes the message when you're attacked slightly bigger for better visibility."

2015-03-12 23:15:54 +01:00

client

Merge pull request #8377 from Miauw62/AAAAA

2015-03-16 19:26:26 +00:00

clothing

Merge pull request #8257 from phil235/ReflectFix

2015-03-14 16:15:52 -05:00

crafting

Merge pull request #8274 from Thunder12345/techshellening

2015-03-16 18:30:14 +11:00

detectivework

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

emoji

…

events

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

2015-03-15 12:30:27 +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 pull request #8309 from phil235/BurgerSpriteFix

2015-03-16 01:40:15 +03:00

holiday

…

hydroponics

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

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

library

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

mining

Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.

2015-03-10 20:30:46 +01:00

mob

Fixes conflicts and commits

2015-03-21 12:47:25 -04: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

A restructure/removal/cleanup of Ninja Code

2015-03-09 20:43:56 +00:00

procedural mapping

Removes 2 commented out lines.

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

projectiles

Merge pull request #8274 from Thunder12345/techshellening

2015-03-16 18:30:14 +11:00

reagents

Merge pull request #8315 from phil235/BigUserdanger

2015-03-16 18:30:21 +11:00

recycling

Merge pull request #8334 from MrPerson/cleanup_crew_comin_through

2015-03-15 01:55:39 -05:00

research

Merge pull request #8237 from GunHog/CherryFlavoredPins

2015-03-13 12:57:28 -05:00

scripting

…

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

…

surgery

Merge pull request #8235 from Incoming5643/you_wouldnt_download_a_car

2015-03-13 12:23:44 +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