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

Browse Source

...

This commit is contained in:

Ghommie

2020-04-22 22:30:10 +02:00

parent 63870cc9d1 63362f74c9

commit 63f5e101a2

7 changed files with 14 additions and 6 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/mob/dead/new_player/sprite_accessories/pines.dm → code/modules/mob/dead/new_player/sprite_accessories/spines.dm