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

Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm

2015-10-25 20:28:48 +01:00

..

devices

Merge pull request #10287 from mwerezak/attack-cleanup2

2015-10-25 08:43:47 +01:00

robot

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

2015-09-09 13:58:45 -04:00

stacks

Merge pull request #11204 from Hubblenaut/medical

2015-10-19 16:17:16 +02:00

weapons

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

2015-10-25 20:28:48 +01:00

apc_frame.dm

…

blueprints.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

bodybag.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

contraband.dm

…

crayons.dm

Adds the ability to draw arrows with crayon

2015-07-09 23:35:06 -04:00

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

Added get_bodytype() species proc as groundwork for subspecies.

2015-08-22 02:53:16 +09:30

shooting_range.dm

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

2015-07-30 10:49:37 +02:00

toys.dm

Merge pull request #10340 from comma/russian_roulette

2015-09-03 19:40:01 +02:00

trash.dm

…