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

2019-11-10 23:17:58 +01:00
parent 29daa0c908 c4849ead74
commit e977ba6729
1123 changed files with 5708 additions and 6725 deletions
@@ -9,7 +9,7 @@
 	alternate_screams = list('modular_citadel/sound/voice/scream_silicon.ogg')

 /obj/item/clothing/head/ushanka
-	alternate_screams = list('modular_citadel/sound/misc/cyka1.ogg', 'modular_citadel/sound/misc/cheekibreeki.ogg')
+	alternate_screams = list('sound/voice/human/cyka1.ogg', 'sound/voice/human/cheekibreeki.ogg')

 /obj/item/proc/grenade_prime_react(obj/item/grenade/nade)
 	return
@@ -1,4 +0,0 @@
-/obj/item/aicard/potato
-	name = "Potat-OS"
-	desc = "A storage device for possibly malfunctioning AIs. Go on. Get a big fat eyeful. With your big fat eyes."
-	icon = 'modular_citadel/icons/aicards.dmi'