cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-10-27 18:23:30 -04:00
committed by GitHub
parent d7872d7fd8
commit 4b843798de
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/verbs/suicide.dm
View File

@@ -92,12 +92,6 @@
M.show_message("<span class='notice'>[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"</span>", 3, "<span class='notice'>[src] bleeps electronically.</span>", 2)
death(0)
else
<<<<<<< HEAD
to_chat(src, "Aborting suicide attempt.")
*/
||||||| parent of 44eb5dd30b... Merge pull request #11608 from VOREStation/upstream-merge-8304
to_chat(src, "Aborting suicide attempt.")
=======
to_chat(src, "Aborting suicide attempt.")
>>>>>>> 44eb5dd30b... Merge pull request #11608 from VOREStation/upstream-merge-8304