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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-07-11 21:05:35 -04:00
committed by GitHub
parent 26dce1db7b
commit eae946fdb8
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/organs/organ_external.dm
View File

@@ -1064,24 +1064,14 @@ Note that amputating the affected organ does in fact remove the infection from t
if((status & ORGAN_BROKEN) || cannot_break)
return
<<<<<<< HEAD
if(owner)
//CHOMPEdit Begin
owner.custom_pain(pick(\
"<span class='danger'>You hear a loud cracking sound coming from \the [owner].</span>",\
"<span class='danger'>Something feels like it shattered in your [name]!</span>",\
"<span class='danger'>You hear a sickening crack.</span>"),brokenpain)
//CHOMPEdit End
jostle_bone()
if(organ_can_feel_pain() && !isbelly(owner.loc))
=======
if(owner) //VOREStation Edit Start
if(organ_can_feel_pain() && !isbelly(owner.loc) && !isliving(owner.loc))
owner.visible_message(\
//CHOMPEdit Begin
owner.custom_pain(pick(\
"<span class='danger'>You hear a loud cracking sound coming from \the [owner].</span>",\
"<span class='danger'>Something feels like it shattered in your [name]!</span>",\
"<span class='danger'>You hear a sickening crack.</span>")
>>>>>>> 9b7e3a34f6... Merge pull request #13294 from Very-Soft/mouseray
"<span class='danger'>You hear a sickening crack.</span>"),brokenpain)
//CHOMPEdit End
owner.emote("scream")
jostle_bone() //VOREStation Edit End