MrStonedOne f06abf3e2f fixes compile error ...

One pr added a path to an item(#10018) but another pr changed that path(#9932).

2015-06-26 16:06:37 -07:00

..

admin

Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours

2015-06-26 15:34:24 -05:00

assembly

Remove optimization code.

2015-06-24 01:14:20 +01:00

awaymissions

code improvement and overlays for fancy storage, dropper, syringe and lighter

2015-06-10 18:58:19 +10:00

client

fixes schema and send2irc message

2015-06-24 16:54:59 +10:00

clothing

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

2015-06-23 21:50:16 +01:00

crafting

BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH

2015-06-13 13:58:08 -07:00

detectivework

BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH

2015-06-13 13:58:08 -07:00

emoji

…

events

Merge pull request #10072 from Ikarrus/shuttleloanclarity

2015-06-22 23:50:37 -05:00

flufftext

Pray pray pray

2015-06-18 18:07:57 +01:00

food&drinks

Update bottle.dm

2015-06-24 10:32:55 -07:00

holiday

…

hydroponics

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

2015-06-23 12:54:26 -07:00

library

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

2015-06-23 12:54:26 -07:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

fixes compile error

2015-06-26 16:06:37 -07:00

mob

Merge pull request #10020 from phil235/HiveloardCoreSmearing

2015-06-26 15:45:31 -05:00

nano

Merge pull request #9466 from Fayrik/TheNanoing

2015-06-22 14:24:20 +02:00

ninja

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

2015-06-23 12:54:26 -07:00

paperwork

Fixes sleepy pen having enough morphine to trigger the overdose message, making it not stealthy. morphine amount reduced from 30 to 20u.

2015-06-25 00:30:09 +02:00

power

Merge pull request #10097 from phil235/SomeFixes

2015-06-26 15:24:46 -05:00

procedural mapping

Updates paths

2015-06-03 22:52:39 +02:00

projectiles

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

2015-06-23 12:54:26 -07:00

reagents

Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours

2015-06-26 15:34:24 -05:00

recycling

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

2015-06-23 12:54:26 -07:00

research

Merge pull request #9971 from KorPhaeron/newfloors

2015-06-23 03:43:28 +01:00

scripting

remove duplicate empty message checks and replace with !message

2015-06-09 19:29:37 +02:00

security levels

…

shuttle

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

2015-06-16 17:24:20 +10:00

surgery

Merge pull request #10105 from xxalpha/chief

2015-06-26 19:03:13 +02:00

telesci

Pray pray pray

2015-06-18 18:07:57 +01:00