diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 5848289b95..805a71af23 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -164,7 +164,8 @@ message = "chirps!" playsound(src.loc, 'sound/misc/nymphchirp.ogg', 50, 0, preference = /datum/client_preference/emote_noises) m_type = 2 - if ("hooh") + // CHOMP Removal: Begone demons + /*if ("hooh") message = "lets out a hooh!" playsound(src.loc, 'sound/items/hooh.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) m_type = 2 @@ -176,6 +177,7 @@ message = "makes a weird noise!" playsound(src.loc, 'sound/misc/ough.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) m_type = 2 //End of Yawn Addtion + */ if ("howl") // YW add begins m_type = 2 message = "lets out a howl." @@ -192,7 +194,7 @@ message = "does a flip!" m_type = 1 if("vhelp") //Help for Virgo-specific emotes. - to_chat(src, "vwag, vflap, mlem, blep, awoo, awoo2, growl, nya, peep, chirp, hoot, weh, merp, myarp, bark, bork, mrow, mrowl, hypno, hiss, rattle, squeak, geck, baa, baa2, mar, wurble, snort, meow, moo, croak, gao, cackle, nsay, nme, flip") + to_chat(src, "vwag, vflap, mlem, blep, awoo, awoo2, growl, nya, peep, chirp, hoot, weh, merp, myarp, bark, bork, mrow, mrowl, hypno, howl, hiss, rattle, squeak, geck, baa, baa2, mar, wurble, snort, meow, moo, croak, gao, cackle, nsay, nme, flip") //CHOMP Addition: adds howl to list since YW didn't return TRUE if(message) diff --git a/maps/submaps/surface_submaps/plains/plains.dm b/maps/submaps/surface_submaps/plains/plains.dm index 3f51385c1c..f29a686091 100644 --- a/maps/submaps/surface_submaps/plains/plains.dm +++ b/maps/submaps/surface_submaps/plains/plains.dm @@ -6,7 +6,7 @@ #include "construction1.dmm" #include "camp1.dmm" #include "house1.dmm" -#include "beacons.dmm" +// #include "beacons.dmm" // CHOMP Removal #include "Epod.dmm" #include "Epod2.dmm" #include "PascalB.dmm" @@ -73,12 +73,14 @@ mappath = 'maps/submaps/surface_submaps/plains/house1_vr.dmm' //VOREStation Edit cost = 10 +/* Chomp Removal /datum/map_template/surface/plains/beacons name = "Collection of Marker Beacons" desc = "A bunch of marker beacons, scattered in a strange pattern." mappath = 'maps/submaps/surface_submaps/plains/beacons.dmm' cost = 5 fixed_orientation = TRUE +*/ /datum/map_template/surface/plains/Epod name = "Emergency Pod"