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

modular_citadel/code/datums/components/souldeath.dm

@@ -29,7 +29,7 @@
 	if(!wearer)
 		return //idfk
 	new/obj/effect/temp_visual/souldeath(wearer.loc, wearer)
-	playsound(wearer, 'modular_citadel/sound/misc/souldeath.ogg', 100, FALSE)
+	playsound(wearer, 'sound/misc/souldeath.ogg', 100, FALSE)
 
 /datum/component/souldeath/neck
 	equip_slot = SLOT_NECK

modular_citadel/code/datums/mood_events/moodular.dm

@@ -18,7 +18,7 @@
 // Jack the Ripper starring plush
 /obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params)
 	. = ..()
-	if(I.is_sharp())
+	if(I.get_sharpness())
 		if(!grenade)
 			SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushjack", /datum/mood_event/plushjack)