Skip to content

Commit

Permalink
TGS Test Merge (#6676)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevinz authored and Kevinz committed Aug 23, 2024
2 parents 2dc00ba + 920b213 commit b3016ec
Show file tree
Hide file tree
Showing 13 changed files with 97 additions and 1 deletion.
98 changes: 97 additions & 1 deletion code/modules/mob/living/carbon/human/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,102 @@
message = "roars!"
m_type = 2

if("xhiss2")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xhiss2.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xhiss3")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xhiss3.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xhiss4")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xhiss4.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xhiss5")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xhiss5.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xhiss6")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xhiss6.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xroar1")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xroar1.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xroar2")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xroar2.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xroar3")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xroar3.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xtalk1")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xtalk1.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xtalk2")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xtalk2.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xtalk3")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/xtalk3.ogg', 50, 0)
message = "hisses!"
m_type = 2

if("xroar")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
return
playsound(src.loc, 'sound/voice/xenos/alien_roar1.ogg', 50, 0)
message = "roars!"
m_type = 2

if("xgrowl")
if(src.species.get_species_id() != SPECIES_ID_XENOHYBRID)
to_chat(src, "<span class='warning'>You aren't alien enough!</span>")
Expand Down Expand Up @@ -1089,7 +1185,7 @@
if (length(pose)>0 && pose != old_pose)
visible_emote("adjusts [T.his] posture.")
addtimer(CALLBACK(src,PROC_REF(set_pose),""),time SECONDS)


/mob/living/carbon/human/verb/silent_pose()
set name = "Set Pose (Stealth)"
Expand Down
Binary file added sound/voice/xenos/xhiss1.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xhiss2.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xhiss3.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xhiss4.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xhiss5.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xhiss6.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xroar1.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xroar2.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xroar3.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xtalk1.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xtalk2.ogg
Binary file not shown.
Binary file added sound/voice/xenos/xtalk3.ogg
Binary file not shown.

0 comments on commit b3016ec

Please sign in to comment.