VOREStation

mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-13 10:22:01 +01:00

Files

T

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

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02:00

__defines

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

_helpers

Merge pull request #9694 from PsiOmegaDelta/150605-Meteors

2015-06-08 14:17:57 +03:00

_onclick

Merge pull request #9862 from Zuhayr/dev

2015-06-20 17:27:26 +01:00

ATMOSPHERICS

…