Whitellama 6b1ba1b6a3 Fixed #5870: Glasses being labeled both 'glass' and 'Drinking glass' inconsistently ...

Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

2014-08-03 15:28:20 -04:00

..

__HELPERS

Tidy up and use more sane defaults.

2014-08-01 01:04:12 -04:00

_hooks

…

_onclick

Added vampire HUD

2014-08-03 01:27:36 -04:00

ATMOSPHERICS

…

controllers

Removed deprecated power generation stuff (AM, RUST) to free up more procs

2014-07-25 11:33:37 -04:00

datums

Merged getFlatIcon rendering from tgstation

2014-07-31 17:03:05 -04:00

defines

Let's stay up to date with Zuzu's PR shall we?

2014-07-26 12:04:54 -04:00

FEA

…

game

Fixes siemens_coefficent not affecting shock damage

2014-08-03 15:24:53 -04:00

js

…

modules

Fixed #5870: Glasses being labeled both 'glass' and 'Drinking glass' inconsistently

2014-08-03 15:28:20 -04:00

TriDimension

…

unused

…

WorkInProgress

computer3 ntos topic exploit prevention

2014-08-03 15:00:56 -04:00

ZAS

Plasmen bogfix

2014-07-31 19:03:35 -04:00

ZAS - oldbs12

…

ZAS - vg

…

global.dm

Removed stupid MELT genetic power that was broken anyways

2014-07-18 13:39:02 -04:00

hub.dm

…

names.dm

…

setup.dm

Added portable_atmospherics to hydroponics machine path, couple of other tweaks.

2014-07-26 14:03:46 -04:00

stylesheet.dm

…

test.dm

…

world.dm

…