Skip to content

Commit

Permalink
Merge pull request #222 from Durandaal/Ghost-Vorebelly-Fixes
Browse files Browse the repository at this point in the history
Bugfixes for Ghost Remaining in Vorebellies Port
  • Loading branch information
Very-Soft authored Apr 19, 2024
2 parents c282f75 + 4794c4d commit 1e3f1bf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/modules/vore/eating/belly_obj_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
to_chat(owner,"<span class='notice'>[thing] slides into your [lowertext(name)].</span>")

//Sound w/ antispam flag setting
if(vore_sound && !recent_sound && !istype(thing, /mob/observer)) //RSEdit: Ports VOREStation PR15918 || does not play vorebelly insertion sound upon ghost entering
if(vore_sound && !recent_sound && !istype(thing, /mob/observer)) //RSEdit: Ports VOREStation PR15918 || does not play vorebelly insertion sound upon ghost entering
var/soundfile
if(!fancy_vore)
soundfile = classic_vore_sounds[vore_sound]
Expand Down Expand Up @@ -563,7 +563,7 @@
privacy_volume = 25

//Print notifications/sound if necessary
if(!silent)
if(!silent && !isobserver(M)) //RSEdit: Ports VOREStation PR15918 | Don't display release message for ghosts
owner.visible_message("<font color='green'><b>[owner] [release_verb] [M] from their [lowertext(name)]!</b></font>",range = privacy_range)
var/soundfile
if(!fancy_vore)
Expand Down Expand Up @@ -1219,7 +1219,7 @@
if(!(content in src) || !istype(target))
return
content.forceMove(target)
if(ismob(content))
if(ismob(content) && !isobserver(content)) //RSEdit: Ports VOREStation PR15918 | Fixes bug where camera is not set to follow the ghost
var/mob/ourmob = content
ourmob.reset_view(owner)
if(isitem(content))
Expand Down

0 comments on commit 1e3f1bf

Please sign in to comment.