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

code/modules/cargo/packs/goodies.dm

@@ -52,8 +52,8 @@
 	cost = 300
 	contains = list(/obj/item/storage/toolbox/mechanical)
 
-/datum/supply_pack/goody/electrical_toolbox // mostly just to water down coupon probability
-	name = "Mechanical Toolbox"
+/datum/supply_pack/goody/electrical_toolbox
+	name = "Electrical Toolbox"
 	desc = "A fully stocked electrical toolbox, for when you're too lazy to just print them out."
 	cost = 300
 	contains = list(/obj/item/storage/toolbox/electrical)

code/modules/clothing/under/costume.dm

@@ -267,7 +267,7 @@
 	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON|USE_TAUR_CLIP_MASK
 
 /obj/item/clothing/under/costume/christmas/croptop/green
-	name = "green feminine christmas suit"
+	name = "green croptop christmas suit"
 	desc = "A simple green christmas suit. Smells minty!"
 	icon_state = "christmasfemaleg"
 	item_state = "christmasfemaleg"

code/modules/mob/living/silicon/ai/ai.dm

@@ -23,6 +23,7 @@
 	a_intent = INTENT_HARM //so we always get pushed instead of trying to swap
 	sight = SEE_TURFS | SEE_MOBS | SEE_OBJS
 	see_in_dark = 8
+	deathsound = 'sound/voice/scream/android_scream.ogg'
 	hud_type = /datum/hud/ai
 	med_hud = DATA_HUD_MEDICAL_BASIC
 	sec_hud = DATA_HUD_SECURITY_BASIC

code/modules/mob/living/silicon/silicon.dm

@@ -13,6 +13,7 @@
 	mob_biotypes = MOB_ROBOTIC
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 	speech_span = SPAN_ROBOT
+	deathsound = 'sound/voice/borg_deathsound.ogg'
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1 | HEAR_1
 
 	var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS