mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-03 14:04:41 +00:00
[MIRROR] fix observer tracking (#10460)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
7441b23621
commit
55123ab3d3
@@ -48723,12 +48723,6 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"oir" = (
|
||||
/obj/machinery/exonet_node/map,
|
||||
/turf/simulated/fitness{
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/survivalpod)
|
||||
"oiD" = (
|
||||
/obj/item/clothing/suit/storage/hooded/wintercoat/solgov/fleet,
|
||||
/turf/simulated/fitness{
|
||||
@@ -92075,7 +92069,7 @@ hhZ
|
||||
bSW
|
||||
huP
|
||||
bSW
|
||||
oir
|
||||
hih
|
||||
bSW
|
||||
nHW
|
||||
bSW
|
||||
|
||||
@@ -3751,7 +3751,7 @@
|
||||
/turf/simulated/floor/outdoors/dirt,
|
||||
/area/space)
|
||||
"cAO" = (
|
||||
/obj/machinery/exonet_node/map,
|
||||
/obj/machinery/exonet_node,
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/area/space)
|
||||
"cBF" = (
|
||||
@@ -28912,7 +28912,7 @@
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/space)
|
||||
"tjy" = (
|
||||
/obj/machinery/exonet_node/map,
|
||||
/obj/machinery/exonet_node,
|
||||
/turf/simulated/floor/outdoors/dirt,
|
||||
/area/space)
|
||||
"tjB" = (
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// Proc: New()
|
||||
// Parameters: None
|
||||
// Description: Adds components to the machine for deconstruction.
|
||||
/obj/machinery/exonet_node/map/Initialize(mapload)
|
||||
/obj/machinery/exonet_node/Initialize(mapload)
|
||||
// CHOMPAdd: Exonet Machinery humming
|
||||
soundloop = new(list(src), FALSE)
|
||||
if(prob(60)) // 60% chance to change the midloop
|
||||
@@ -40,12 +40,9 @@
|
||||
// CHOMPAdd End
|
||||
. = ..()
|
||||
default_apply_parts()
|
||||
|
||||
/obj/machinery/exonet_node/map/Initialize(mapload)
|
||||
. = ..()
|
||||
//default_apply_parts() //CHOMPEdit
|
||||
desc = "This machine is one of many, many nodes inside [using_map.starsys_name]'s section of the Exonet, connecting the [using_map.station_short] to the rest of the system, at least \
|
||||
electronically."
|
||||
if(mapload)
|
||||
desc = "This machine is one of many, many nodes inside [using_map.starsys_name]'s section of the Exonet, connecting the [using_map.station_short] to the rest of the system, at least \
|
||||
electronically."
|
||||
|
||||
/obj/machinery/exonet_node/Destroy() // CHOMPAdd: Just in case.
|
||||
QDEL_NULL(soundloop) // CHOMPAdd: Exonet noises
|
||||
|
||||
@@ -140,7 +140,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
|
||||
var/id_tag = null
|
||||
var/fire_sounds = list('sound/weapons/frigate_turret/frigate_turret_fire1.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire2.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire3.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire4.ogg') // CHOMPEdit: Pew
|
||||
|
||||
/obj/machinery/power/pointdefense/Initialize(mapload)
|
||||
/obj/machinery/pointdefense/Initialize(mapload)
|
||||
. = ..()
|
||||
default_apply_parts()
|
||||
update_icon()
|
||||
|
||||
@@ -71,17 +71,21 @@
|
||||
|
||||
for(var/mob/M as anything in m_viewers)
|
||||
if(M)
|
||||
var/final_message = message
|
||||
if(isobserver(M))
|
||||
message = span_emote(span_bold("[src]") + " ([ghost_follow_link(src, M)]) [input]")
|
||||
final_message = span_emote(span_bold("[src]") + " ([ghost_follow_link(src, M)]) [input]")
|
||||
if(src.client && M && !(get_z(src) == get_z(M)))
|
||||
message = span_multizsay("[message]")
|
||||
final_message = span_multizsay("[final_message]")
|
||||
// If you are in the same tile, right next to, or being held by a person doing an emote, you should be able to see it while blind
|
||||
if(m_type != AUDIBLE_MESSAGE && (src.Adjacent(M) || (istype(src.loc, /obj/item/holder) && src.loc.loc == M)))
|
||||
M.show_message(message)
|
||||
M.show_message(final_message)
|
||||
else
|
||||
M.show_message(message, m_type)
|
||||
M.show_message(final_message, m_type)
|
||||
M.create_chat_message(src, "[runemessage]", FALSE, list("emote"), (m_type == AUDIBLE_MESSAGE))
|
||||
|
||||
for(var/obj/O as anything in o_viewers)
|
||||
if(O)
|
||||
O.see_emote(src, message, m_type)
|
||||
var/final_message = message
|
||||
if(src.client && O && !(get_z(src) == get_z(O)))
|
||||
final_message = span_multizsay("[final_message]")
|
||||
O.see_emote(src, final_message, m_type)
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
/obj/machinery/chem_master/Initialize(mapload)
|
||||
. = ..()
|
||||
default_apply_parts()
|
||||
var/datum/reagents/R = new/datum/reagents(900) //Just a huge random number so the buffer should (probably) never dump your reagents.
|
||||
reagents = R //There should be a nano ui thingy to warn of this.
|
||||
R.my_atom = src
|
||||
|
||||
@@ -7338,7 +7338,7 @@
|
||||
},
|
||||
/area/vr/outdoors/powered)
|
||||
"fRJ" = (
|
||||
/obj/machinery/exonet_node/map,
|
||||
/obj/machinery/exonet_node,
|
||||
/turf/simulated/floor/tiled/asteroid_steel,
|
||||
/area/vr/powered/space/mechfactory)
|
||||
"fSg" = (
|
||||
|
||||
Reference in New Issue
Block a user