LetterJay 15109ad50a Merge pull request #6029 from Citadel-Station-13/LetterJay-shockcollar ...

Fixes autolathes not building shockcollars

2018-03-20 10:10:36 -05:00

..

__HELPERS

[READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)

2018-03-11 13:32:44 -07:00

_globalvars/lists

Mentor System (#5235)

2018-02-05 04:09:56 -06:00

_onclick

Small combat balancing: Small crawling nerf, Esword buff (#5937)

2018-03-16 03:27:30 -07:00

controllers

Delete cit_nightshift.dm

2018-02-21 13:09:54 -05:00

datums

Merge branch 'master' into cit_mood

2018-03-16 17:09:57 +03:00

game

Update shockcollar.dm

2018-03-19 23:44:13 -05:00

modules

fixes runtime in donator

2018-03-20 09:34:22 -05:00

init.dm

Mentor System (#5235)

2018-02-05 04:09:56 -06:00