PsiOmegaDelta cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm

2015-06-30 08:24:43 +02:00

..

__HELPERS

changes time to never go higher than 23:59

2015-06-28 01:34:57 +01:00

_defines

Chemistry commit

2015-03-25 19:09:10 +03:00

_onclick

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-22 21:01:26 +02:00

ATMOSPHERICS

Wrenching times no longer runtime.

2015-06-28 18:17:53 +02:00

controllers

Fixed a list being qdel'd when radio is deleted.

2015-06-25 23:04:04 +03:00

datums

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

defines

Adjusts w_class of beach ball and scroll

2015-06-21 01:46:10 -04:00

FEA

Adds Destroys.

2015-04-24 17:11:14 +02:00

game

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

2015-06-30 08:24:43 +02:00

js

…

modules

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

2015-06-30 08:24:43 +02:00

TriDimension

Fixes misleading path and proc name

2015-06-26 00:40:31 -04:00

ZAS

Merge pull request #9936 from mwerezak/fire

2015-06-26 13:34:21 +02:00

global.dm

Merge pull request #9202 from Zuhayr/customitems

2015-05-14 21:47:04 +03:00

hub.dm

…

names.dm

…

setup.dm

Fixes drone runtime.

2015-06-28 19:02:23 +02:00

stylesheet.dm

Makes reflex shooting more obvious

2015-04-02 21:54:35 -04:00

world.dm

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

2015-06-26 19:22:31 +02:00