Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix

Browse Source

...

This commit is contained in:

Fermi

2019-09-19 01:46:32 +01:00

parent 08eeda97f5 18ce46d7ec

commit df4da58ce8

3 changed files with 670 additions and 643 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

code/modules/jobs/job_types/captain.dm

Executable → Regular

code/modules/mob/dead/new_player/new_player.dm

+623 -623

File diff suppressed because it is too large Load Diff