mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 15:37:36 +01:00
Fix jukeboxes needing reset after shuttle movement, [CLASSIFIED], warning fix.
Conflicts: code/__HELPERS/unsorted.dm code/game/atoms_movable.dm code/modules/mob/living/silicon/ai/freelook/eye.dm code/modules/nano/nanomapgen.dm
This commit is contained in:
@@ -21,15 +21,19 @@ var/global/media_broadcasters=list()
|
||||
update_music()
|
||||
|
||||
/obj/machinery/media/receiver/proc/connect_frequency()
|
||||
// This is basically media_receivers[media_frequency] += src
|
||||
var/list/receivers=list()
|
||||
if(media_frequency in media_receivers)
|
||||
receivers = media_receivers[media_frequency]
|
||||
receivers.Add(src)
|
||||
media_receivers[media_frequency]=receivers
|
||||
|
||||
// Check if there's a broadcast to tune into.
|
||||
if(media_frequency in media_broadcasters)
|
||||
// Pick a random broadcast in that frequency.
|
||||
var/obj/machinery/media/broadcaster/B = pick(media_broadcasters[media_frequency])
|
||||
receive_broadcast(B.media_url,B.media_start_time)
|
||||
if(B.media_crypto == media_crypto) // Crypto-key check, if needed.
|
||||
receive_broadcast(B.media_url,B.media_start_time)
|
||||
|
||||
/obj/machinery/media/receiver/proc/disconnect_frequency()
|
||||
var/list/receivers=list()
|
||||
@@ -71,8 +75,9 @@ var/global/media_broadcasters=list()
|
||||
/obj/machinery/media/broadcaster/update_music()
|
||||
..()
|
||||
if(media_frequency in media_receivers)
|
||||
var/obj/machinery/media/receiver/R = pick(media_receivers[media_frequency])
|
||||
R.receive_broadcast(media_url,media_start_time)
|
||||
for(var/obj/machinery/media/receiver/R in media_receivers[media_frequency])
|
||||
if(R.media_crypto == media_crypto)
|
||||
R.receive_broadcast(media_url,media_start_time)
|
||||
|
||||
/obj/machinery/media/broadcaster/proc/disconnect_frequency()
|
||||
var/list/broadcasters=list()
|
||||
|
||||
@@ -59,7 +59,12 @@
|
||||
|
||||
/obj/machinery/media/Move()
|
||||
..()
|
||||
if(anchored)
|
||||
update_music()
|
||||
|
||||
/obj/machinery/media/setLoc(var/turf/T, var/teleported=0)
|
||||
disconnect_media_source()
|
||||
..(T)
|
||||
if(anchored)
|
||||
update_music()
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
// Use this when setting the aiEye's location.
|
||||
// It will also stream the chunk that the new loc is in.
|
||||
|
||||
/mob/aiEye/proc/setLoc(var/T)
|
||||
/mob/aiEye/setLoc(var/T)
|
||||
if(ai)
|
||||
if(!isturf(ai.loc))
|
||||
return
|
||||
|
||||
@@ -8,7 +8,7 @@ mob/spirit/proc/Spirit_Move(direct)
|
||||
|
||||
var/initial = initial(sprint)
|
||||
var/max_sprint = 50
|
||||
|
||||
|
||||
// if we haven't moved in a while, we stop sprinting
|
||||
if(cooldown && cooldown < world.timeofday) // 3 seconds
|
||||
sprint = initial
|
||||
@@ -19,25 +19,25 @@ mob/spirit/proc/Spirit_Move(direct)
|
||||
setLoc(step)
|
||||
|
||||
dir = direct // update our sprite
|
||||
|
||||
|
||||
cooldown = world.timeofday + 5
|
||||
if(acceleration)
|
||||
sprint = min(sprint + 0.5, max_sprint)
|
||||
else
|
||||
sprint = initial
|
||||
|
||||
|
||||
// if we're trying to move, we want to stop following our target
|
||||
follow_target = null
|
||||
|
||||
|
||||
|
||||
|
||||
/mob/spirit/proc/follow_cultist(mob/living/target as mob)
|
||||
if(!istype(target)) return
|
||||
var/obj/cult_viewpoint/currentView = getCultViewpoint(target)
|
||||
var/mob/spirit/U = usr
|
||||
|
||||
|
||||
if (!currentView)
|
||||
U << "As a spirit, you may only track cultists."
|
||||
|
||||
|
||||
U.follow_target = target
|
||||
U << "Now following [currentView.get_cult_name()]."
|
||||
|
||||
@@ -47,9 +47,9 @@ mob/spirit/proc/Spirit_Move(direct)
|
||||
return
|
||||
U.setLoc(get_turf(target))
|
||||
sleep(10)
|
||||
|
||||
|
||||
mob/spirit/proc/setLoc(var/T)
|
||||
|
||||
|
||||
mob/spirit/setLoc(var/T)
|
||||
T = get_turf(T)
|
||||
loc = T
|
||||
cultNetwork.visibility(src)
|
||||
|
||||
Reference in New Issue
Block a user