Anonymous 11ff7802bb Merge branch 'master' into assu ...

# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

2019-10-26 18:06:56 +03:00

..

__HELPERS

…

_globalvars/lists

…

_onclick

Tones down some items attack stamina costs. kills hypereutactic blades copypasta.

2019-07-19 20:09:16 +02:00

controllers

s

2019-08-07 13:18:45 -07:00

datums

Defib fixes and chem effects stuff

2019-10-23 13:45:57 +02:00

game

Merge pull request #9603 from Ghommie/Ghommie-cit267

2019-10-25 20:12:35 -07:00

modules

Merge branch 'master' into assu

2019-10-26 18:06:56 +03:00

init.dm

Heck

2019-09-19 01:45:21 +01:00