Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm

2017-03-22 17:29:01 -05:00

..

drinkingglass

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

food

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

2017-03-22 17:29:01 -05:00

glass

Gives reagents/reagent_containers the absolute pathing treatment

2016-05-16 21:07:20 +01:00

blood_pack.dm

Gives reagents/reagent_containers the absolute pathing treatment

2016-05-16 21:07:20 +01:00

borghydro.dm

Merge pull request #1592 from Anewbe/borg_changes

2016-05-28 12:44:27 -04:00

dropper.dm

More tweaks

2017-02-28 01:13:29 -05:00

food.dm

Fixes condiment placement

2016-02-26 12:24:36 +01:00

glass.dm

Not So Simple Animals (#3103)

2017-03-22 14:30:07 -05:00

hypospray.dm

Medical tweaks

2017-01-23 23:43:44 -06:00

pill.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

spray.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

syringes.dm

Fixes/adds reagent transferring to/from food

2017-03-10 16:39:57 +00:00