Whitellama 71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame ...

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm

2014-09-01 18:31:26 -07:00

..

admin

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

assembly

…

awaymissions

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

client

Fix for #6131.

2014-08-23 11:19:15 -05:00

clothing

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

customitems

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

destilery

…

detectivework

Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag)

2014-08-01 17:05:54 -07:00

economy

Fixes Runtime Error, doesn't query for PIN on lowest account security level

2014-07-21 12:08:50 +02:00

events

Various grammar and spelling fixes in ion laws

2014-08-24 23:40:25 +01:00

ext_scripts

…

flufftext

…

food

…

games

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

genetics

…

hydroponics

…

icon generation

…

library

Made arcane tomes a subtype of books, fixes #5838

2014-08-10 02:23:36 -07:00

liquid

…

maps

…

mining

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

mob

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame

2014-09-01 18:31:26 -07:00

nano

…

organs

Merge pull request #5962 from mwerezak/wound-fixes

2014-08-14 07:55:17 +04:00

paperwork

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

power

Removed debug statements

2014-08-26 01:43:54 +01:00

projectiles

Fixes xbow tension not being rest when fired

2014-08-07 17:06:01 -04:00

reagents

Changes some messages to make more sense

2014-08-24 14:09:39 -05:00

recycling

…

research

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame

2014-09-01 18:31:26 -07:00

scripting

…

security levels

…

shuttles

Fixes shuttle ETA given before arrive_time is set

2014-08-24 22:43:19 -04:00

supermatter

Is a little convoluted but this removes the last X: use in supermatter.dm

2014-07-31 14:24:39 +02:00

surgery

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

vehicles

Fixes runtime in train/explode()

2014-08-10 18:37:39 -04:00

virus2

Fixes human internal organs list

2014-07-12 16:15:37 -04:00