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

modular_citadel/code/game/objects/items.dm

@@ -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

modular_citadel/code/game/objects/items/devices/aicard.dm

@@ -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'

modular_citadel/code/game/turfs/cit_turfs.dm

@@ -1,24 +0,0 @@
-//Yes, hi. This is the file that handles Citadel's turf modifications.
-
-/*
-/turf/open/floor/Entered(atom/obj, atom/oldloc)
-	. = ..()
-	CitDirtify(obj, oldloc)*/
-
-//Baystation-styled tile dirtification.
-/turf/open/floor/proc/CitDirtify(atom/obj, atom/oldloc)
-	if(prob(50))
-		if(has_gravity(src) && !isobserver(obj))
-			var/dirtamount
-			var/obj/effect/decal/cleanable/dirt/dirt = locate(/obj/effect/decal/cleanable/dirt, src)
-			if(!dirt)
-				dirt = new/obj/effect/decal/cleanable/dirt(src)
-				dirt.alpha = 0
-				dirtamount = 0
-			dirtamount = dirt.alpha + 1
-			if(oldloc && istype(oldloc, /turf/open/floor))
-				var/obj/effect/decal/cleanable/dirt/spreadindirt = locate(/obj/effect/decal/cleanable/dirt, oldloc)
-				if(spreadindirt && spreadindirt.alpha)
-					dirtamount += round(spreadindirt.alpha * 0.05)
-			dirt.alpha = min(dirtamount,255)
-	return TRUE