cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes Sound and Message Dup Codes to Procs

Browse Source 
By request of Crazylemon. Doing this also removed the need to have the
check for passengers and pilots from the health checks of the pod, as
they are no longer necessary and unified inside the new procs.
This commit is contained in:
Twinmold
2016-11-26 23:06:55 -06:00
parent ada80ec529
commit e99996c725
1 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spacepods/spacepod.dm
+24 -40
View File
@@ -229,39 +229,15 @@
health = max(0, health - damage)
var/percentage = (health / initial(health)) * 100
occupant_sanity_check()
if(passengers | pilot && oldhealth > health && percentage <= 25 && percentage > 0)
var/sound/S = sound('sound/effects/engine_alert2.ogg')
S.wait = 0 //No queue
S.channel = 0 //Any channel
S.volume = 50
if(pilot)
pilot << S
if(passengers)
for(var/mob/M in passengers)
M << S
if(passengers | pilot && oldhealth > health && !health)
var/sound/S = sound('sound/effects/engine_alert1.ogg')
S.wait = 0
S.channel = 0
S.volume = 50
if(pilot)
pilot << S
if(passengers)
for(var/mob/M in passengers)
M << S
if(oldhealth > health && percentage <= 25 && percentage > 0)
play_sound_to_riders('sound/effects/engine_alert2.ogg')
else if(oldhealth > health)
play_sound_to_riders('sound/effects/engine_alert1.ogg')
if(!health)
spawn(0)
if(pilot)
to_chat(pilot, "<span class='userdanger'>Critical damage to the vessel detected, core explosion imminent!</span>")
if(passengers)
for(var/mob/M in passengers)
to_chat(M, "<span class='userdanger'>Critical damage to the vessel detected, core explosion imminent!</span>")
message_to_riders("<span class='userdanger'>Critical damage to the vessel detected, core explosion imminent!</span>")
for(var/i = 10, i >= 0; --i)
if(pilot)
to_chat(pilot, "<span class='warning'>[i]</span>")
if(passengers)
for(var/mob/M in passengers)
to_chat(M, "<span class='warning'>[i]</span>")
message_to_riders("<span class='warning'>[i]</span>")
if(i == 0)
explosion(loc, 2, 4, 8)
qdel(src)
@@ -307,17 +283,25 @@
switch(severity)
if(1)
if(pilot)
to_chat(pilot, "<span class='warning'>The pod console flashes 'Heavy EMP WAVE DETECTED'.</span>")
if(passengers)
for(var/mob/M in passengers)
to_chat(M, "<span class='warning'>The pod console flashes 'Heavy EMP WAVE DETECTED'.</span>")
message_to_riders("<span class='warning'>The pod console flashes 'Heavy EMP WAVE DETECTED'.</span>")
if(2)
if(pilot)
to_chat(pilot, "<span class='warning'>The pod console flashes 'EMP WAVE DETECTED'.</span>")
if(passengers)
for(var/mob/M in passengers)
to_chat(M, "<span class='warning'>The pod console flashes 'EMP WAVE DETECTED'.</span>")
message_to_riders("<span class='warning'>The pod console flashes 'EMP WAVE DETECTED'.</span>")
/obj/spacepod/proc/play_sound_to_riders(mysound)
if(length(passengers | pilot) == 0)
return
var/sound/S = sound(mysound)
S.wait = 0 //No queue
S.channel = 0 //Any channel
S.volume = 50
for(var/mob/M in passengers | pilot)
M << S
/obj/spacepod/proc/message_to_riders(mymessage)
if(length(passengers | pilot) == 0)
return
for(var/mob/M in passengers | pilot)
to_chat(M, mymessage)
/obj/spacepod/attackby(obj/item/W as obj, mob/user as mob, params)
if(user.a_intent == I_HARM)