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

Fixes a few runtimes

Browse Source
This commit is contained in:
Casey
2022-10-23 14:54:28 -04:00
committed by CHOMPStation2
parent 35b0db8c4d
commit 41994a7920
4 changed files with 1053 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/instruments/songs/play_legacy.dm
View File

@@ -86,5 +86,8 @@
var/mob/living/L = M var/mob/living/L = M
L.apply_status_effect(STATUS_EFFECT_GOOD_MUSIC) 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) 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 // Could do environment and echo later but not for now

1047
code/modules/mob/dead/observer/observer.dm
View File

File diff suppressed because it is too large Load Diff

4
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -402,7 +402,7 @@ emp_act
return return
// PERSON BEING HIT: CAN BE DROP PRED, ALLOWS THROW VORE. // PERSON BEING HIT: CAN BE DROP PRED, ALLOWS THROW VORE.
// PERSON BEING THROWN: DEVOURABLE, ALLOWS THROW VORE, CAN BE DROP PREY. // 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!!! 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>") visible_message("<span class='warning'>[thrown_mob] is thrown right into [src]'s [lowertext(vore_selected.name)]!</span>")
if(thrown_mob.loc != vore_selected) 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 HIT: CAN BE DROP PREY, ALLOWS THROW VORE, AND IS DEVOURABLE.
// PERSON BEING THROWN: CAN BE DROP PRED, ALLOWS THROW VORE. // 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>") 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!!! thrown_mob.vore_selected.nom_mob(src) //Eat them!!!
if(src.loc != thrown_mob.vore_selected) if(src.loc != thrown_mob.vore_selected)

2
code/modules/vore/eating/living_vr.dm
View File

@@ -796,7 +796,7 @@
if(istype(I, /obj/item/device/paicard)) if(istype(I, /obj/item/device/paicard))
var/obj/item/device/paicard/palcard = I var/obj/item/device/paicard/palcard = I
var/mob/living/silicon/pai/pocketpal = palcard.pai 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>") to_chat(src, "<span class='warning'>\The [pocketpal] doesn't allow you to eat it.</span>")
return return