mwerezak 26f1d02bda Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 ...

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm

2015-09-11 18:13:14 -04:00

..

__defines

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-09-11 18:13:14 -04:00

_helpers

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

2015-09-11 08:54:03 +02:00

_onclick

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

ATMOSPHERICS

…

controllers

Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.

2015-09-08 08:32:09 +02:00

datums

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

2015-09-10 03:06:27 +01:00

defines

Added the Resomi.

2015-09-04 08:57:03 +09:30

FEA

…

game

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-09-11 18:13:14 -04:00

js

…

modules

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-09-11 18:13:14 -04:00

ZAS

Merge pull request #10420 from Kearel/sbike

2015-09-07 13:58:25 +09:30

global.dm

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

2015-09-07 11:31:19 +09:30

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

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

2015-08-22 15:44:02 +01:00