phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment ...

Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm

2016-05-05 21:57:10 +02:00

..

blood_pack.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

borghydro.dm

Switched out Teslium for Lexorin

2016-03-11 14:38:14 -07:00

bottle.dm

better be gpd da,m gicco at thos [pomt

2015-12-28 01:33:59 +00:00

dropper.dm

Forgot to close the span

2016-04-08 18:26:58 -05:00

glass.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

hypospray.dm

better be gpd da,m gicco at thos [pomt

2015-12-28 01:33:59 +00:00

patch.dm

and adds the actual delay

2016-03-25 15:00:35 -04:00

pill.dm

OOPS

2016-04-02 23:49:27 -04:00

spray.dm

Lavaland Ruin update (#17348)

2016-05-03 20:38:44 -05:00

syringes.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00