Merge branch 'master' into master

This commit is contained in:
Keila-coon
2019-11-29 13:07:46 -04:00
committed by GitHub
378 changed files with 207755 additions and 161420 deletions
@@ -160,13 +160,13 @@
// C CKEYS
//cheekycrenando
//Srusu Rskuzu
//Srusu Rskuzu-Ahslru
/datum/gear/fluff/srususovietuniform
path = /obj/item/clothing/under/fluff/srususoviet
display_name = "Soviet Uniform"
description = "Standard issue soviet dress uniform"
ckeywhitelist = list("cheekycrenando")
character_name = list("Srusu Rskuzu")
character_name = list("Srusu Rskuzu-Ahslru")
//captmatt4
//Payton Joghs