pAI and emote tweaks and upgrades

code/modules/client/verbs/suicide.dm

@@ -78,7 +78,11 @@
 		adjustOxyLoss(max(getMaxHealth() * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
 		updatehealth()
 
+<<<<<<< HEAD
 /* CHOMP EDIT START: Removing PAI suicide, literally no one needs this.
+=======
+/*
+>>>>>>> 337b7e903f... Merge pull request #13031 from Very-Soft/master
 /mob/living/silicon/pai/verb/suicide()
 	set category = "pAI Commands"
 	set desc = "Kill yourself and become a ghost (You will receive a confirmation prompt)"
@@ -93,5 +97,9 @@
 		death(0)
 	else
 		to_chat(src, "Aborting suicide attempt.")
+<<<<<<< HEAD
 
 */
+=======
+*/
+>>>>>>> 337b7e903f... Merge pull request #13031 from Very-Soft/master