Seris02 9761d68f4b more merge conflict fixes

2020-01-24 10:14:31 +08:00

..

buffs.dm

getting limb crippled is a 4head bruh

2019-12-31 00:14:52 -06:00

debuffs.dm

more merge conflict fixes

2020-01-24 10:14:31 +08:00

gas.dm

Porting components updates and fixing phantom thief component.

2019-10-23 13:01:31 +02:00

neutral.dm

New traumas and some other things.

2019-10-08 03:53:01 -04:00

status_effect.dm

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

2019-11-22 15:24:15 -05:00