cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes all playsounds use bools for vary (#26183)

Browse Source 
* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
This commit is contained in:
DGamerL
2024-07-09 01:54:38 +02:00
committed by GitHub
parent c1e97f712c
commit 4cf6595d12
136 changed files with 233 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/alien_death.dm
+1 -1
View File
@@ -69,6 +69,6 @@
if(!gibbed)
if(death_sound)
playsound(loc, death_sound, 80, 1, 1)
playsound(loc, death_sound, 80, TRUE, 1)
visible_message("<B>[src]</B> [death_message]")
update_icons()
code/modules/mob/living/carbon/alien/alien_defense.dm
+1 -1
View File
@@ -26,7 +26,7 @@ This code could certainly use with a touch of TLC, but it functions alright. Bit
else
if(health > 0)
M.do_attack_animation(src, ATTACK_EFFECT_BITE)
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/bite.ogg', 50, TRUE, -1)
visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
"<span class='userdanger'>[M.name] bites [src]!</span>")
adjustBruteLoss(1)
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+1 -1
View File
@@ -88,7 +88,7 @@
else if(A.density && !A.CanPass(src))
visible_message("<span class ='danger'>[src] smashes into [A]!</span>", "<span class ='alertalien'>[src] smashes into [A]!</span>")
Weaken(2 SECONDS, TRUE)
playsound(get_turf(src), 'sound/effects/bang.ogg', 50, 0, 0) // owwie
playsound(get_turf(src), 'sound/effects/bang.ogg', 50, FALSE, 0) // owwie
..()
if(leaping)
leaping = FALSE
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+1 -1
View File
@@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
. += alien_movement_delay
/mob/living/carbon/alien/humanoid/resist_restraints(attempt_breaking)
playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when starting to break free
playsound(src, 'sound/voice/hiss5.ogg', 40, TRUE, 1) //Alien roars when starting to break free
attempt_breaking = TRUE
return ..()
code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+6 -6
View File
@@ -10,7 +10,7 @@
Stun(2 SECONDS)
throw_at(get_edge_target_turf(user, get_dir(user, src)), 3, 7)
hitverb = "slammed"
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
visible_message("<span class='danger'>[user] has [hitverb] [src]!</span>", "<span class='userdanger'>[user] has [hitverb] [src]!</span>")
return TRUE
@@ -20,7 +20,7 @@
if(INTENT_HARM)
var/damage = rand(1, 9)
if(prob(90))
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
visible_message("<span class='danger'>[M] has punched [src]!</span>", \
"<span class='userdanger'>[M] has punched [src]!</span>")
if((stat != DEAD) && (damage > 9||prob(5)))//Regular humans have a very small chance of weakening an alien.
@@ -31,25 +31,25 @@
adjustBruteLoss(damage)
add_attack_logs(M, src, "Melee attacked with fists")
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has attempted to punch [src]!</span>")
if(INTENT_DISARM)
if(!IS_HORIZONTAL(src))
if(prob(5))//Very small chance to push an alien down.
Paralyse(4 SECONDS)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
add_attack_logs(M, src, "Pushed over")
visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
"<span class='userdanger'>[M] has pushed down [src]!</span>")
else
if(prob(50))
drop_item()
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
"<span class='userdanger'>[M] has disarmed [src]!</span>")
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has attempted to disarm [src]!</span>")
/mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+2 -2
View File
@@ -2,7 +2,7 @@
if(..())
var/damage = rand(1, 9)
if(prob(90))
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
add_attack_logs(M, src, "Melee attacked with fists")
visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
"<span class='userdanger'>[M] has kicked [src]!</span>")
@@ -12,7 +12,7 @@
adjustBruteLoss(damage)
updatehealth()
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has attempted to kick [src]!</span>", \
"<span class='userdanger'>[M] has attempted to kick [src]!</span>")
code/modules/mob/living/carbon/carbon_procs.dm
+3 -3
View File
@@ -223,7 +223,7 @@
adjustStaminaLoss(-10)
resting = FALSE
stand_up() // help them up if possible
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(!player_logged)
M.visible_message( \
"<span class='notice'>[M] shakes [src] trying to wake [p_them()] up!</span>",\
@@ -236,7 +236,7 @@
M.apply_status_effect(effect.type)
return
// BEGIN HUGCODE - N3X
playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(M.zone_selected == "head")
M.visible_message(\
"<span class='notice'>[M] pats [src] on the head.</span>",\
@@ -1067,7 +1067,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
stop_pulling()
to_chat(src, "<span class='notice'>You [slipVerb]ped on [description]!</span>")
playsound(loc, 'sound/misc/slip.ogg', 50, 1, -3)
playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -3)
// Something something don't run with scissors
moving_diagonally = 0 //If this was part of diagonal move slipping will stop it.
KnockDown(knockdown)
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -698,10 +698,10 @@ emp_act
if(M.a_intent == INTENT_DISARM) //If not absorbed, you get disarmed, knocked down, and hit with stamina damage.
if(absorb_stun(0))
visible_message("<span class='warning'>[src] is not affected by [M]'s disarm attempt!</span>")
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
return FALSE
var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/pierce.ogg', 25, TRUE, -1)
apply_effect(10 SECONDS, KNOCKDOWN, run_armor_check(affecting, MELEE))
M.changeNext_move(1.6 SECONDS)
apply_damage(M.alien_disarm_damage, STAMINA)
code/modules/mob/living/carbon/human/human_inventory.dm
+1 -1
View File
@@ -443,4 +443,4 @@
return
if(thing && equipped_item.can_be_inserted(thing)) // put thing in belt or bag
equipped_item.handle_item_insertion(thing, src)
playsound(loc, "rustle", 50, 1, -5)
playsound(loc, "rustle", 50, TRUE, -5)
code/modules/mob/living/carbon/human/human_mob.dm
+1 -1
View File
@@ -807,7 +807,7 @@
if(!src.xylophone)
visible_message("<span class='warning'>[src] begins playing [p_their()] ribcage like a xylophone. It's quite spooky.</span>","<span class='notice'>You begin to play a spooky refrain on your ribcage.</span>","<span class='warning'>You hear a spooky xylophone melody.</span>")
var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg')
playsound(loc, song, 50, 1, -1)
playsound(loc, song, 50, TRUE, -1)
xylophone = 1
spawn(1200)
xylophone=0
code/modules/mob/living/carbon/human/species/_species.dm
+2 -2
View File
@@ -574,7 +574,7 @@
if(target.absorb_stun(0))
target.visible_message("<span class='warning'>[target] is not affected by [user]'s disarm attempt!</span>")
user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
return FALSE
if(attacker_style && attacker_style.disarm_act(user, target) == MARTIAL_ARTS_ACT_SUCCESS)
return TRUE
@@ -590,7 +590,7 @@
var/shove_dir = get_dir(user.loc, target.loc)
var/turf/shove_to = get_step(target.loc, shove_dir)
playsound(shove_to, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(shove_to, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(shove_to == user.loc)
return FALSE
code/modules/mob/living/living_defense.dm
+4 -4
View File
@@ -96,7 +96,7 @@
"<span class='danger'>[src] was arc flashed by \the [source]!</span>",
"<span class='userdanger'>\The [source] arc flashes and electrocutes you!</span>",
"<span class='italics'>You hear a lightning-like crack!</span>")
playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1)
playsound(loc, 'sound/effects/eleczap.ogg', 50, TRUE, -1)
explosion(loc, -1, 0, 2, 2)
else
apply_damage(shock_damage, STAMINA)
@@ -311,7 +311,7 @@
G.synch()
LAssailant = user
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
/*if(user.dir == src.dir)
G.state = GRAB_AGGRESSIVE
G.last_upgrade = world.time
@@ -353,7 +353,7 @@
return FALSE
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
playsound(loc, M.attack_sound, 50, TRUE, 1)
M.do_attack_animation(src)
visible_message("<span class='danger'>\The [M] [M.attacktext] [src]!</span>", \
"<span class='userdanger'>\The [M] [M.attacktext] [src]!</span>")
@@ -376,7 +376,7 @@
add_attack_logs(L, src, "Larva attacked")
visible_message("<span class='danger'>[L.name] bites [src]!</span>", \
"<span class='userdanger'>[L.name] bites [src]!</span>")
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/bite.ogg', 50, TRUE, -1)
return 1
else
visible_message("<span class='danger'>[L.name] has attempted to bite [src]!</span>", \
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -320,7 +320,7 @@
return
if(user.a_intent == INTENT_HELP)
user.visible_message("<span class='notice'>[user] pets [src].</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
else
visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
spawn(1)
code/modules/mob/living/silicon/silicon_defense.dm
+4 -4
View File
@@ -5,7 +5,7 @@
if(..()) //if harm or disarm intent
var/damage = 20
if(prob(90))
playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/slash.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] has slashed at [src]!</span>", "<span class='userdanger'>[M] has slashed at [src]!</span>")
if(prob(8))
flash_eyes(affect_silicon = 1)
@@ -14,7 +14,7 @@
adjustBruteLoss(damage)
updatehealth()
else
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] took a swipe at [src]!</span>", \
"<span class='userdanger'>[M] took a swipe at [src]!</span>")
return
@@ -50,7 +50,7 @@
return FALSE
..(user, TRUE)
adjustBruteLoss(run_armor(rand(10, 15), BRUTE, MELEE))
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
visible_message("<span class='danger'>[user] has punched [src]!</span>", "<span class='userdanger'>[user] has punched [src]!</span>")
return TRUE
return FALSE
@@ -60,7 +60,7 @@
if(INTENT_HELP)
M.visible_message("<span class='notice'>[M] pets [src]!</span>", \
"<span class='notice'>You pet [src]!</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if("grab")
grabbedby(M)
else
code/modules/mob/living/simple_animal/animal_defense.dm
+4 -4
View File
@@ -12,7 +12,7 @@
if(INTENT_HELP)
if(health > 0)
visible_message("<span class='notice'>[M] [response_help] [src].</span>", "<span class='notice'>[M] [response_help] you.</span>")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(INTENT_GRAB)
grabbedby(M)
@@ -23,7 +23,7 @@
return
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
visible_message("<span class='danger'>[M] [response_harm] [src]!</span>", "<span class='userdanger'>[M] [response_harm] you!</span>")
playsound(loc, attacked_sound, 25, 1, -1)
playsound(loc, attacked_sound, 25, TRUE, -1)
attack_threshold_check(harm_intent_damage)
add_attack_logs(M, src, "Melee attacked with fists")
updatehealth()
@@ -35,7 +35,7 @@
to_chat(user, "<span class='warning'>You don't want to hurt [src]!</span>")
return FALSE
..(user, TRUE)
playsound(loc, "punch", 25, 1, -1)
playsound(loc, "punch", 25, TRUE, -1)
visible_message("<span class='danger'>[user] has punched [src]!</span>", "<span class='userdanger'>[user] has punched [src]!</span>")
adjustBruteLoss(15)
return TRUE
@@ -50,7 +50,7 @@
var/damage = rand(15, 30)
visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
"<span class='userdanger'>[M] has slashed at [src]!</span>")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1)
add_attack_logs(M, src, "Alien attacked")
attack_threshold_check(damage)
return TRUE
code/modules/mob/living/simple_animal/bot/bot.dm
+1 -1
View File
@@ -363,7 +363,7 @@
user.do_attack_animation(src)
apply_damage(rand(15,30), BRUTE)
visible_message("<span class='danger'>[user] has slashed [src]!</span>")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1)
if(prob(10))
new /obj/effect/decal/cleanable/blood/oil(loc)
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+1 -1
View File
@@ -575,7 +575,7 @@
/mob/living/simple_animal/bot/ed209/proc/cuff(mob/living/carbon/C)
mode = BOT_ARREST
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
C.visible_message("<span class='danger'>[src] is trying to put zipties on [C]!</span>",\
"<span class='userdanger'>[src] is trying to put zipties on you!</span>")
code/modules/mob/living/simple_animal/bot/griefsky.dm
+5 -5
View File
@@ -42,7 +42,7 @@
/mob/living/simple_animal/bot/secbot/griefsky/back_to_idle()
..()
playsound(loc, 'sound/weapons/saberoff.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/saberoff.ogg', 50, TRUE, -1)
/mob/living/simple_animal/bot/secbot/griefsky/emag_act(mob/user)
..()
@@ -74,13 +74,13 @@
retaliate(P.firer)
if((icon_state == spin_icon) && (prob(block_chance_ranged))) //only when the eswords are on
visible_message("[src] deflects [P] with its energy swords!")
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, 0)
playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, 0)
else
..()
/mob/living/simple_animal/bot/secbot/griefsky/proc/sword_attack(mob/living/carbon/C) // esword attack
do_attack_animation(C)
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, -1)
addtimer(CALLBACK(src, PROC_REF(do_sword_attack), C), 2)
/mob/living/simple_animal/bot/secbot/griefsky/proc/do_sword_attack(mob/living/carbon/C)
@@ -119,7 +119,7 @@
mode = BOT_START_PATROL // switch to patrol mode
if(BOT_HUNT) // hunting for perp
icon_state = spin_icon
playsound(loc,'sound/effects/spinsabre.ogg',50,1,-1)
playsound(loc,'sound/effects/spinsabre.ogg',50, TRUE,-1)
if(frustration >= frustration_number) // general beepsky doesn't give up so easily, jedi scum
walk_to(src,0)
set_path(null)
@@ -211,7 +211,7 @@
retaliate(P.firer)
if((icon_state == spin_icon) && (prob(block_chance_ranged))) //only when the eswords are on
visible_message("[src] deflects [P] with its energy swords!")
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, 0)
playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, 0)
else
..()
code/modules/mob/living/simple_animal/bot/honkbot.dm
+3 -3
View File
@@ -127,7 +127,7 @@
to_chat(user, "<span class='warning'>You short out [src]'s target assessment circuits. It gives out an evil laugh!!</span>")
oldtarget_name = user.name
audible_message("<span class='danger'>[src] gives out an evil laugh!</span>")
playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 75, 1, -1) // evil laughter
playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 75, TRUE, -1) // evil laughter
update_icon()
/mob/living/simple_animal/bot/honkbot/cmag_act(mob/user)
@@ -270,7 +270,7 @@
// if can't reach perp for long enough, go idle
if(frustration >= 5) //gives up easier than beepsky
walk_to(src, 0)
playsound(loc, 'sound/misc/sadtrombone.ogg', 25, 1, -1)
playsound(loc, 'sound/misc/sadtrombone.ogg', 25, TRUE, -1)
back_to_idle()
return
@@ -386,7 +386,7 @@
"[C] topples over [src]!", \
"[C] leaps out of [src]'s way!")]</span>")
C.KnockDown(10 SECONDS)
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 1, -1)
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, TRUE, -1)
if(!client)
speak("Honk!")
sensor_blink()
code/modules/mob/living/simple_animal/bot/secbot.dm
+1 -1
View File
@@ -241,7 +241,7 @@
/mob/living/simple_animal/bot/secbot/proc/cuff(mob/living/carbon/C)
mode = BOT_ARREST
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
C.visible_message("<span class='danger'>[src] is trying to put zipties on [C]!</span>",\
"<span class='userdanger'>[src] is trying to put zipties on you!</span>")
INVOKE_ASYNC(src, PROC_REF(cuff_callback), C)
code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
+1 -1
View File
@@ -219,7 +219,7 @@
else
if(do_after_once(src, 20, target = G))
visible_message("[src] ravenously consumes [G].", "You ravenously devour [G].")
playsound(loc, 'sound/items/eatfood.ogg', 30, 0, frequency = 1.5)
playsound(loc, 'sound/items/eatfood.ogg', 30, FALSE, frequency = 1.5)
if(G.reagents.get_reagent_amount("nutriment") + G.reagents.get_reagent_amount("plantmatter") < 1)
adjust_nutrition(2)
else
code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
+2 -2
View File
@@ -338,7 +338,7 @@
if(do_after(src, 10, target = H))
step_towards(H, src)
playsound(H, pick('sound/effects/bodyscrape-01.ogg', 'sound/effects/bodyscrape-02.ogg'), 20, 1, -4)
playsound(H, pick('sound/effects/bodyscrape-01.ogg', 'sound/effects/bodyscrape-02.ogg'), 20, TRUE, -4)
H.emote("scream")
if(prob(25))
playsound(src, pick('sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg', 'sound/items/bikehorn.ogg'), 50, 1)
@@ -402,7 +402,7 @@
if(prob(2))
switch_stage = max(switch_stage * 0.75, switch_stage_min) //he gets a chance to be faster after each feast
if(smiting)
playsound(loc, 'sound/spookoween/scary_horn2.ogg', 100, 0, -4)
playsound(loc, 'sound/spookoween/scary_horn2.ogg', 100, FALSE, -4)
qdel(src)
else
Acquire_Victim()
code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
+1 -1
View File
@@ -487,7 +487,7 @@ Difficulty: Hard
say(pick("OTZKMXOZE LGORAXK, YKRL JKYZXAIZ GIZOBK", "RUYY IKXZGOT, KTMGMKOTM XKIUBKXE JKTOGR", "VUCKX IUXKY 8-12 HXKGINKJ, UBKXRUGJOTM XKSGOTOTM IUXKY", "KXXUX KXXUX KXXUX KXXUX KXX-", "-ROQK ZKGXY OT XGOT- - -ZOSK ZU JOK"))
visible_message("<span class='biggerdanger'>[src] begins to overload it's core. It is going to explode!</span>")
walk(src, 0)
playsound(src,'sound/machines/alarm.ogg',100,0,5)
playsound(src,'sound/machines/alarm.ogg', 100, FALSE, 5)
addtimer(CALLBACK(src, PROC_REF(kaboom)), 10 SECONDS)
/mob/living/simple_animal/hostile/megafauna/ancient_robot/proc/kaboom()
code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+2 -2
View File
@@ -265,14 +265,14 @@ Difficulty: Medium
new /obj/effect/temp_visual/small_smoke/halfsecond(step_forward_turf)
var/obj/effect/temp_visual/decoy/fading/halfsecond/D = new (own_turf, src)
forceMove(step_back_turf)
playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, TRUE, -1)
dashing = TRUE
alpha = 0
animate(src, alpha = 255, time = 5)
SLEEP_CHECK_DEATH(2)
D.forceMove(step_forward_turf)
forceMove(target_turf)
playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, TRUE, -1)
SLEEP_CHECK_DEATH(1)
dashing = FALSE
return TRUE
code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
+6 -6
View File
@@ -232,7 +232,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
var/selectedspawn = pick(potentialspawns)
mychild = new selectedspawn(loc)
visible_message("<span class='userdanger'>[mychild] emerges from [src]!</span>")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
if(boosted)
mychild.key = elitemind.key
mychild.sentience_act()
@@ -246,7 +246,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
/obj/structure/elite_tumor/proc/return_elite()
mychild.forceMove(loc)
visible_message("<span class='userdanger'>[mychild] emerges from [src]!</span>")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
mychild.revive()
if(boosted)
mychild.maxHealth = mychild.maxHealth * 2.5
@@ -339,11 +339,11 @@ While using this makes the system rely on OnFire, it still gives options for tim
if(activator != null && get_dist(src, activator) >= ARENA_RADIUS)
activator.forceMove(loc)
visible_message("<span class='warning'>[activator] suddenly reappears above [src]!</span>")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
if(mychild != null && get_dist(src, mychild) >= ARENA_RADIUS)
mychild.forceMove(loc)
visible_message("<span class='warning'>[mychild] suddenly reappears above [src]!</span>")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
/obj/structure/elite_tumor/HasProximity(atom/movable/AM)
if(!ishuman(AM) && !isrobot(AM))
@@ -360,11 +360,11 @@ While using this makes the system rely on OnFire, it still gives options for tim
invaders += M
var/list/valid_turfs = RANGE_EDGE_TURFS(ARENA_RADIUS + 2, src) // extra safety
M.forceMove(pick(valid_turfs)) //Doesn't check for lava. Don't cheese it.
playsound(M, 'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
playsound(M, 'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE)
/obj/structure/elite_tumor/proc/onEliteLoss()
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, TRUE, TRUE)
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
visible_message("<span class='warning'>[src] begins to convulse violently before beginning to dissipate.</span>")
visible_message("<span class='warning'>As [src] closes, something is forced up from down below.</span>")
var/obj/structure/closet/crate/necropolis/tendril/lootbox = new /obj/structure/closet/crate/necropolis/tendril(loc)
code/modules/mob/mob_grab.dm
+1 -1
View File
@@ -402,7 +402,7 @@
if(istype(hat))
damage += hat.force * 3
affecting.apply_damage(damage*rand(90, 110)/100, BRUTE, "head", affected.run_armor_check(affecting, MELEE))
playsound(assailant.loc, "swing_hit", 25, 1, -1)
playsound(assailant.loc, "swing_hit", 25, TRUE, -1)
add_attack_logs(assailant, affecting, "Headbutted")
return