mwerezak deb215d262 Refactors bottle smashing, apply_hit_effect() now returns the blocked status. ...

Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm

2016-04-22 04:57:23 -04:00

..

__defines

Merge pull request #1287 from Kelenius/unitTests

2016-04-04 10:34:12 -04:00

_compatibility/509

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

_helpers

Fixes an error

2016-04-20 15:36:13 +01:00

_onclick

Refactors bottle smashing, apply_hit_effect() now returns the blocked status.

2016-04-22 04:57:23 -04:00

ATMOSPHERICS

Construction Update

2016-03-25 16:02:36 -04:00

controllers

Round start timer now remains at 0 until the round actually starts.

2016-04-20 15:27:59 +01:00

datums

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

defines

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

game

Refactors bottle smashing, apply_hit_effect() now returns the blocked status.

2016-04-22 04:57:23 -04:00

js

…

modules

Refactors bottle smashing, apply_hit_effect() now returns the blocked status.

2016-04-22 04:57:23 -04:00

unit_tests

Adds color to unit tests

2016-04-04 11:46:39 +03:00

ZAS

Construction Update

2016-03-25 16:02:36 -04:00

_macros.dm

Changes types of ghosts and eyes

2016-02-20 15:36:05 +03:00

_unit_tests.dm

Adds unit tests

2016-03-29 17:42:22 +03:00

global.dm

Fixes #755

2016-01-13 23:51:45 +10:30

hub.dm

…

names.dm

…

stylesheet.dm

Removed the Vox Pox.

2016-02-20 11:24:19 +10:30

world.dm

Fixes an error

2016-04-20 15:36:13 +01:00