cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds in traitorous music verb, single use, local sound, as well as removing some debugging info.

Browse Source
This commit is contained in:
SkyMarshal
2012-04-01 16:58:21 -07:00
parent aece74cdf3
commit cefd345840
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/gamemodes/traitor/traitor.dm
View File

@@ -289,4 +289,15 @@
traitor_mob << "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe."
spawn(30)
traitor_mob << sound('syndicate intro.ogg',volume=50)
traitor_mob.client.verbs += /client/proc/play_traitor_music
//End code phrase.
/client/proc/play_traitor_music()
set category = "Traitor"
set name = "Play Traitorous Music"
log_admin("[key_name(src)] played traitorous music.")
message_admins("[key_name_admin(src)] played traitorous music.", 1)
playsound(get_turf_loc(src.mob), 'traitor.ogg', 50, 0, 0)
verbs -= /client/proc/play_traitor_music
return

5
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -232,7 +232,7 @@
if (src.getBrainLoss() >= 60 && !stat)
msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
if (!src.client)
if (!src.client && !admin_observing)
msg += "[t_He] [t_has] a vacant, braindead stare...\n"
var/list/wound_descriptions = list()
@@ -424,12 +424,11 @@
for(var/text = 1, text <= flavor_text.len, text++)
if(text == flavor_text.len && flavor_text.len > 1)
flavor_text_string += ", and"
else if(flavor_text.len > 1)
else if(flavor_text.len > 1 && text > 1)
flavor_text_string += ","
flavor_text_string += flavor_text[text]
flavor_text_string += " on [t_his] [named].</span><br>"
wound_flavor_text["[named]"] = flavor_text_string
world << "[named] + [flavor_text_string]"
if(wound_flavor_text["head"] && !skipmask && !(wear_mask && istype(wear_mask, /obj/item/clothing/mask/gas)))
msg += wound_flavor_text["head"]
else if(is_bleeding["head"])

2
code/modules/mob/living/carbon/human/life.dm
View File

@@ -533,7 +533,7 @@
if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit
Paralyse(3) // 3 gives them one second to wake up and run away a bit!
if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
sleeping = max(sleeping, 2)
sleeping = max(sleeping, 4)
else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
if(prob(20) && isbreathing)
spawn(0) emote(pick("giggle", "laugh"))