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

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

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

..

ears

…

glasses

Merge pull request #11830 from Ghommie/Ghommie-cit676

2020-04-14 01:34:18 -07:00

gloves

Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts

2020-04-15 19:00:01 +10:00

head

Final test, fixes and parent calls.

2020-04-14 01:23:26 +02:00

masks

Final test, fixes and parent calls.

2020-04-14 01:23:26 +02:00

neck

Final test, fixes and parent calls.

2020-04-14 01:23:26 +02:00

outfits

…

shoes

fixes magboots

2020-04-16 16:23:55 +08:00

spacesuits

Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4

2020-04-14 18:37:31 +00:00

suits

Update toggles.dm

2020-04-17 19:58:57 +02:00

under

Merge branch 'master' into trek_tmp

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

chameleon.dm

WIP

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

clothing.dm

Deleting poly clothes copypasta.

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