Anewbe 7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things ...

# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm

2017-04-01 12:45:45 -05:00

..

bed.dm

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

2017-04-01 12:45:45 -05:00

chairs.dm

Sorta implements armor soak, very WIP

2017-03-10 20:26:37 -06:00

stools.dm

Centralizes weight class definitions

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

wheelchair.dm

Sorta implements armor soak, very WIP

2017-03-10 20:26:37 -06:00