Anonymous 043950a3ee Merge branch 'master' into trek_tmp ...

# Conflicts Resolved:
#	icons/obj/clothing/uniforms.dmi

2020-04-19 09:51:21 +03:00

..

jobs

I'm a bit busy handling multiple issues.

2020-04-17 20:47:02 +02:00

_under.dm

Deleting poly clothes copypasta.

2020-04-13 22:51:46 +02:00

accessories.dm

WIP

2020-03-30 05:29:39 +02:00

color.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

costume.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

miscellaneous.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

pants.dm

WIP

2020-03-30 05:29:39 +02:00

shorts.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

skirt_dress.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

suits.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

sweaters.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

syndicate.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

trek.dm

Fixes pre-tmp trek suit on-mob icons

2020-04-17 14:04:47 +03:00