cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-17 10:05:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13961 from Heroman3003/runtimefixes

Browse Source 
Fixes a few runtimes
This commit is contained in:
Casey
2022-10-23 14:54:28 -04:00
committed by GitHub
parent c4556814cb a24f2dc188
commit 49239b7f64
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/instruments/songs/play_legacy.dm
+3
View File
@@ -86,5 +86,8 @@
var/mob/living/L = M
L.apply_status_effect(STATUS_EFFECT_GOOD_MUSIC)
*/
if(!M)
hearing_mobs -= M
continue
M.playsound_local(source, null, volume * using_instrument.volume_multiplier, S = music_played, preference = /datum/client_preference/instrument_toggle, volume_channel = VOLUME_CHANNEL_INSTRUMENTS)
// Could do environment and echo later but not for now
code/modules/mob/dead/observer/observer.dm
+6 -2
View File
@@ -455,7 +455,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(usr, "<span class='warning'>You cannot follow a mob standing on holy grounds!</span>")
return
if(get_z(target) in using_map?.secret_levels)
to_chat(src, SPAN_WARNING("Sorry, that target is in an area that ghosts aren't allowed to go."))
to_chat(src, "<span class='warning'>Sorry, that target is in an area that ghosts aren't allowed to go.</span>")
return
if(target != src)
if(following && following == target)
@@ -463,7 +463,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
following = target
to_chat(src, "<span class='notice'>Now following [target]</span>")
if(ismob(target))
forceMove(get_turf(target))
var/target_turf = get_turf(target)
if(!target_turf)
to_chat(usr, "<span class='warning'>This mob does not seem to exist in the tangible world.</span>")
return
forceMove(target_turf)
var/mob/M = target
M.following_mobs += src
else
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -402,7 +402,7 @@ emp_act
return
// PERSON BEING HIT: CAN BE DROP PRED, ALLOWS THROW VORE.
// PERSON BEING THROWN: DEVOURABLE, ALLOWS THROW VORE, CAN BE DROP PREY.
if((can_be_drop_pred && throw_vore) && (thrown_mob.devourable && thrown_mob.throw_vore && thrown_mob.can_be_drop_prey)) //Prey thrown into pred.
if((can_be_drop_pred && throw_vore && vore_selected) && (thrown_mob.devourable && thrown_mob.throw_vore && thrown_mob.can_be_drop_prey)) //Prey thrown into pred.
vore_selected.nom_mob(thrown_mob) //Eat them!!!
visible_message("<span class='warning'>[thrown_mob] is thrown right into [src]'s [lowertext(vore_selected.name)]!</span>")
if(thrown_mob.loc != vore_selected)
@@ -412,7 +412,7 @@ emp_act
// PERSON BEING HIT: CAN BE DROP PREY, ALLOWS THROW VORE, AND IS DEVOURABLE.
// PERSON BEING THROWN: CAN BE DROP PRED, ALLOWS THROW VORE.
else if((can_be_drop_prey && throw_vore && devourable) && (thrown_mob.can_be_drop_pred && thrown_mob.throw_vore)) //Pred thrown into prey.
else if((can_be_drop_prey && throw_vore && devourable) && (thrown_mob.can_be_drop_pred && thrown_mob.throw_vore && thrown_mob.vore_selected)) //Pred thrown into prey.
visible_message("<span class='warning'>[src] suddenly slips inside of [thrown_mob]'s [lowertext(thrown_mob.vore_selected.name)] as [thrown_mob] flies into them!</span>")
thrown_mob.vore_selected.nom_mob(src) //Eat them!!!
if(src.loc != thrown_mob.vore_selected)
code/modules/vore/eating/living_vr.dm
+1 -1
View File
@@ -776,7 +776,7 @@
if(istype(I, /obj/item/device/paicard))
var/obj/item/device/paicard/palcard = I
var/mob/living/silicon/pai/pocketpal = palcard.pai
if(!pocketpal.devourable)
if(pocketpal && (!pocketpal.devourable))
to_chat(src, "<span class='warning'>\The [pocketpal] doesn't allow you to eat it.</span>")
return