Hubblenaut a89c066905 Fixes onmob icons for holders ...

Conflicts:
	code/game/objects/items.dm

2016-01-08 14:47:08 +01:00

..

__defines

Merge pull request #11808 from Ccomp5950/unit_tests

2016-01-06 07:38:50 +03:00

_helpers

Unit Tests

2015-12-31 11:18:15 -05:00

_onclick

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-20 11:55:53 +01:00

ATMOSPHERICS

Removes oxygen_agent_b and volatile_fuel gases

2016-01-01 00:34:59 +01:00

controllers

Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

2016-01-01 23:58:29 -05:00

datums

Scheduler, observation, and New() tweaks.

2015-12-27 17:44:53 +01:00

defines

Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

2016-01-01 23:58:29 -05:00

FEA

…

game

Fixes onmob icons for holders

2016-01-08 14:47:08 +01:00

js

…

modules

Fixes onmob icons for holders

2016-01-08 14:47:08 +01:00

unit_tests

Unit Tests: Disables asteroid generation.

2016-01-08 01:27:47 -05:00

ZAS

Merge pull request #11696 from Baystation12/dev-freeze

2015-12-16 11:01:41 +01:00

_macros.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2

2015-12-10 13:04:52 -06:00

world.dm

Converts unit testing checks into #ifdef and #ifndef.

2016-01-06 22:09:33 +01:00