shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070

Browse Source 
[MIRROR] Beacons are no longer radios
This commit is contained in:
deathride58
2018-03-09 18:41:05 +00:00
committed by GitHub
parent c615d9e6a0 d0118a6598
commit aa0dbb5603
24 changed files with 132 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
+1 -1
View File
@@ -77,7 +77,7 @@
/area/ruin/space/abandoned_tele)
"r" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plating/airless,
/area/ruin/space/abandoned_tele)
"s" = (
_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+1 -1
View File
@@ -2375,7 +2375,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/workroom)
"hr" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/dock)
"hs" = (
_maps/RandomZLevels/moonoutpost19.dmm
+1 -1
View File
@@ -6091,7 +6091,7 @@
"mJ" = (
/obj/structure/sign/warning/vacuum{
desc = "A beacon used by a teleporter.";
icon = 'icons/obj/radio.dmi';
icon = 'icons/obj/device.dmi';
icon_state = "beacon";
name = "tracking beacon"
},
_maps/RandomZLevels/undergroundoutpost45.dmm
+1 -1
View File
@@ -158,7 +158,7 @@
"az" = (
/obj/structure/sign/warning/vacuum{
desc = "A beacon used by a teleporter.";
icon = 'icons/obj/radio.dmi';
icon = 'icons/obj/device.dmi';
icon_state = "beacon";
name = "tracking beacon"
},
_maps/map_files/BoxStation/BoxStation.dmm
+7 -7
View File
@@ -4951,7 +4951,7 @@
},
/area/security/courtroom)
"alJ" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"alK" = (
@@ -15734,7 +15734,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"aOe" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/camera{
c_tag = "Arrivals Bay 1 South"
},
@@ -18275,7 +18275,7 @@
/turf/open/floor/plasteel,
/area/bridge)
"aVp" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -27533,7 +27533,7 @@
pixel_y = 1
},
/obj/structure/table,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
@@ -35817,7 +35817,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bLp" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plating/airless,
/area/science/test_area)
"bLq" = (
@@ -39689,7 +39689,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUN" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUO" = (
@@ -42137,7 +42137,7 @@
/turf/open/floor/engine,
/area/science/misc_lab)
"caY" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/engine,
/area/science/misc_lab)
"caZ" = (
_maps/map_files/Deltastation/DeltaStation2.dmm
+13 -13
View File
@@ -1411,7 +1411,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"afV" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -35803,7 +35803,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -45367,7 +45367,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
@@ -46419,7 +46419,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -47204,7 +47204,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bXz" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -53509,7 +53509,7 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"cjY" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/neutral/side{
dir = 8
},
@@ -58315,7 +58315,7 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -60985,7 +60985,7 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"czU" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/neutral,
/area/ai_monitored/storage/eva)
"czV" = (
@@ -77285,7 +77285,7 @@
/turf/open/floor/plasteel/neutral,
/area/science/research)
"dhZ" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -77523,7 +77523,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/whiteblue,
/area/medical/medbay/central)
@@ -89856,7 +89856,7 @@
icon_state = "1-2"
},
/obj/effect/landmark/blobstart,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -91546,7 +91546,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"dLF" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/science/test_area)
@@ -93916,7 +93916,7 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/aft)
"dQR" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/aft)
"dQU" = (
_maps/map_files/MetaStation/MetaStation.dmm
+13 -13
View File
@@ -15531,7 +15531,7 @@
},
/area/hallway/primary/fore)
"aGo" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/red/corner{
dir = 2
},
@@ -18968,7 +18968,7 @@
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"aOj" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/neutral/side,
/area/security/courtroom)
"aOk" = (
@@ -29713,7 +29713,7 @@
},
/area/bridge)
"bkF" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -32153,7 +32153,7 @@
icon_state = "4-8"
},
/obj/machinery/holopad,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"bpL" = (
@@ -33584,7 +33584,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bsm" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -36683,7 +36683,7 @@
/area/ai_monitored/storage/satellite)
"byP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/caution{
dir = 8
},
@@ -40970,7 +40970,7 @@
"bIe" = (
/obj/structure/table,
/obj/item/hand_tele,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -41775,7 +41775,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/neutral/side{
dir = 2
},
@@ -42088,7 +42088,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKy" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
@@ -53766,7 +53766,7 @@
/turf/open/floor/engine,
/area/science/explab)
"ciT" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
@@ -63841,7 +63841,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cDx" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plating/airless,
/area/science/test_area)
"cDy" = (
@@ -70061,7 +70061,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -72325,7 +72325,7 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"daH" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/engine,
/area/science/xenobiology)
"daI" = (
_maps/map_files/Mining/Lavaland.dmm
+1 -1
View File
@@ -587,7 +587,7 @@
/turf/open/floor/plating,
/area/mine/production)
"bO" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/purple/corner{
dir = 8
},
_maps/map_files/OmegaStation/OmegaStation.dmm
+1 -1
View File
@@ -30295,7 +30295,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bkC" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
_maps/map_files/PubbyStation/PubbyStation.dmm
+13 -13
View File
@@ -1455,7 +1455,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"afy" = (
/obj/effect/landmark/start/cyborg,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"afz" = (
@@ -7515,7 +7515,7 @@
},
/area/bridge)
"atU" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/darkblue/side{
dir = 1
},
@@ -9537,7 +9537,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"ayQ" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"ayR" = (
@@ -16444,7 +16444,7 @@
/area/storage/eva)
"aPM" = (
/obj/structure/table,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/darkblue/side{
dir = 10
@@ -25240,7 +25240,7 @@
/area/science/server)
"blP" = (
/obj/effect/landmark/event_spawn,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/light{
dir = 8
},
@@ -25811,7 +25811,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bnq" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
@@ -36370,7 +36370,7 @@
dir = 4
},
/obj/effect/landmark/event_spawn,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bKA" = (
@@ -39635,7 +39635,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/dark,
/area/storage/tech)
"bSG" = (
@@ -39751,7 +39751,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSS" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bST" = (
@@ -46037,7 +46037,7 @@
/turf/closed/mineral/random/low_chance,
/area/asteroid/nearstation/bomb_site)
"ckL" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plating/airless,
/area/asteroid/nearstation/bomb_site)
"ckM" = (
@@ -46316,7 +46316,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"clS" = (
@@ -47185,7 +47185,7 @@
/turf/open/floor/plasteel/neutral/corner,
/area/hallway/secondary/exit/departure_lounge)
"coT" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"coV" = (
@@ -47339,7 +47339,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"cpt" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/vault{
dir = 5
},
code/game/machinery/Beacon.dm
+1 -1
View File
@@ -9,7 +9,7 @@
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 0
var/obj/item/device/radio/beacon/Beacon
var/obj/item/device/beacon/Beacon
/obj/machinery/bluespace_beacon/Initialize()
. = ..()
code/game/machinery/computer/teleporter.dm
+1 -1
View File
@@ -160,7 +160,7 @@
var/list/L = list()
var/list/areaindex = list()
if(regime_set == "Teleporter")
for(var/obj/item/device/radio/beacon/R in GLOB.teleportbeacons)
for(var/obj/item/device/beacon/R in GLOB.teleportbeacons)
if(is_eligible(R))
var/area/A = get_area(R)
L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
code/game/machinery/syndicatebeacon.dm
+1 -1
View File
@@ -104,7 +104,7 @@
// SINGULO BEACON SPAWNER
/obj/item/device/sbeacondrop
name = "suspicious beacon"
icon = 'icons/obj/radio.dmi'
icon = 'icons/obj/device.dmi'
icon_state = "beacon"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
code/game/objects/effects/anomalies.dm
+3 -3
View File
@@ -193,9 +193,9 @@
var/turf/T = safepick(get_area_turfs(impact_area))
if(T)
// Calculate new position (searches through beacons in world)
var/obj/item/device/radio/beacon/chosen
var/obj/item/device/beacon/chosen
var/list/possible = list()
for(var/obj/item/device/radio/beacon/W in GLOB.teleportbeacons)
for(var/obj/item/device/beacon/W in GLOB.teleportbeacons)
possible += W
if(possible.len > 0)
@@ -218,7 +218,7 @@
var/y_distance = TO.y - FROM.y
var/x_distance = TO.x - FROM.x
for (var/atom/movable/A in urange(12, FROM )) // iterate thru list of mobs in the area
if(istype(A, /obj/item/device/radio/beacon))
if(istype(A, /obj/item/device/beacon))
continue // don't teleport beacons because that's just insanely stupid
if(A.anchored)
continue
code/game/objects/items/devices/beacon.dm
+44
View File
@@ -0,0 +1,44 @@
/obj/item/device/beacon
name = "\improper tracking beacon"
desc = "A beacon used by a teleporter."
icon = 'icons/obj/device.dmi'
icon_state = "beacon"
item_state = "beacon"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
var/enabled = TRUE
var/renamed = FALSE
/obj/item/device/beacon/Initialize()
. = ..()
if (enabled)
GLOB.teleportbeacons += src
else
icon_state = "beacon-off"
/obj/item/device/beacon/Destroy()
GLOB.teleportbeacons.Remove(src)
return ..()
/obj/item/device/beacon/attack_self(mob/user)
enabled = !enabled
if (enabled)
icon_state = "beacon"
GLOB.teleportbeacons += src
else
icon_state = "beacon-off"
GLOB.teleportbeacons.Remove(src)
to_chat(user, "<span class='notice'>You [enabled ? "enable" : "disable"] the beacon.</span>")
return
/obj/item/device/beacon/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/pen)) // needed for things that use custom names like the locator
var/new_name = stripped_input(user, "What would you like the name to be?")
if(!user.canUseTopic(src, BE_CLOSE))
return
if(new_name)
name = new_name
renamed = TRUE
return
else
return ..()
code/game/objects/items/devices/radio/beacon.dm
-32
View File
@@ -1,32 +0,0 @@
/obj/item/device/radio/beacon
name = "tracking beacon"
desc = "A beacon used by a teleporter."
icon_state = "beacon"
item_state = "beacon"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
var/code = "electronic"
dog_fashion = null
/obj/item/device/radio/beacon/Initialize()
. = ..()
GLOB.teleportbeacons += src
/obj/item/device/radio/beacon/Destroy()
GLOB.teleportbeacons.Remove(src)
return ..()
/obj/item/device/radio/beacon/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode)
return
/obj/item/device/radio/beacon/verb/alter_signal(t as text)
set name = "Alter Beacon's Signal"
set category = "Object"
set src in usr
if ((usr.canmove && !( usr.restrained() )))
src.code = t
if (!( src.code ))
src.code = "beacon"
src.add_fingerprint(usr)
return
code/game/objects/items/teleportation.dm
+25 -38
View File
@@ -17,9 +17,6 @@
icon = 'icons/obj/device.dmi'
icon_state = "locator"
var/temp = null
var/frequency = FREQ_LOCATOR_IMPLANT
var/broadcasting = null
var/listening = 1
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
@@ -32,17 +29,11 @@
/obj/item/locator/attack_self(mob/user)
user.set_machine(src)
var/dat
if (src.temp)
dat = "[src.temp]<BR><BR><A href='byond://?src=[REF(src)];temp=1'>Clear</A>"
if (temp)
dat = "[temp]<BR><BR><A href='byond://?src=[REF(src)];temp=1'>Clear</A>"
else
dat = {"
<B>Persistent Signal Locator</B><HR>
Frequency:
<A href='byond://?src=[REF(src)];freq=-10'>-</A>
<A href='byond://?src=[REF(src)];freq=-2'>-</A> [format_frequency(src.frequency)]
<A href='byond://?src=[REF(src)];freq=2'>+</A>
<A href='byond://?src=[REF(src)];freq=10'>+</A><BR>
<A href='?src=[REF(src)];refresh=1'>Refresh</A>"}
user << browse(dat, "window=radio")
onclose(user, "radio")
@@ -59,30 +50,30 @@ Frequency:
if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)))
usr.set_machine(src)
if (href_list["refresh"])
src.temp = "<B>Persistent Signal Locator</B><HR>"
temp = "<B>Persistent Signal Locator</B><HR>"
var/turf/sr = get_turf(src)
if (sr)
src.temp += "<B>Located Beacons:</B><BR>"
for(var/obj/item/device/radio/beacon/W in GLOB.teleportbeacons)
if (W.frequency == src.frequency)
var/turf/tr = get_turf(W)
if (tr.z == sr.z && tr)
var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
if (direct < 5)
direct = "very strong"
temp += "<B>Beacon Signals:</B><BR>"
for(var/obj/item/device/beacon/W in GLOB.teleportbeacons)
if (!W.renamed)
continue
var/turf/tr = get_turf(W)
if (tr.z == sr.z && tr)
var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
if (direct < 5)
direct = "very strong"
else
if (direct < 10)
direct = "strong"
else
if (direct < 10)
direct = "strong"
if (direct < 20)
direct = "weak"
else
if (direct < 20)
direct = "weak"
else
direct = "very weak"
src.temp += "[W.code]-[dir2text(get_dir(sr, tr))]-[direct]<BR>"
direct = "very weak"
temp += "[W.name]-[dir2text(get_dir(sr, tr))]-[direct]<BR>"
src.temp += "<B>Extranneous Signals:</B><BR>"
temp += "<B>Implant Signals:</B><BR>"
for (var/obj/item/implant/tracking/W in GLOB.tracked_implants)
if (!W.imp_in || !isliving(W.loc))
continue
@@ -103,18 +94,14 @@ Frequency:
direct = "strong"
else
direct = "weak"
src.temp += "[W.imp_in.name]-[dir2text(get_dir(sr, tr))]-[direct]<BR>"
temp += "[W.imp_in.name]-[dir2text(get_dir(sr, tr))]-[direct]<BR>"
src.temp += "<B>You are at \[[sr.x],[sr.y],[sr.z]\]</B> in orbital coordinates.<BR><BR><A href='byond://?src=[REF(src)];refresh=1'>Refresh</A><BR>"
temp += "<B>You are at \[[sr.x],[sr.y],[sr.z]\]</B> in orbital coordinates.<BR><BR><A href='byond://?src=[REF(src)];refresh=1'>Refresh</A><BR>"
else
src.temp += "<B><FONT color='red'>Processing Error:</FONT></B> Unable to locate orbital position.<BR>"
temp += "<B><FONT color='red'>Processing Error:</FONT></B> Unable to locate orbital position.<BR>"
else
if (href_list["freq"])
src.frequency += text2num(href_list["freq"])
src.frequency = sanitize_frequency(src.frequency)
else
if (href_list["temp"])
src.temp = null
if (href_list["temp"])
temp = null
if (ismob(src.loc))
attack_self(src.loc)
else
code/modules/mining/equipment/wormhole_jaunter.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/item/device/wormhole_jaunter/proc/get_destinations(mob/user)
var/list/destinations = list()
for(var/obj/item/device/radio/beacon/B in GLOB.teleportbeacons)
for(var/obj/item/device/beacon/B in GLOB.teleportbeacons)
var/turf/T = get_turf(B)
if(is_station_level(T.z))
destinations += B
code/modules/projectiles/projectile/energy/net_snare.dm
+1 -1
View File
@@ -31,7 +31,7 @@
/obj/effect/nettingportal/Initialize()
. = ..()
var/obj/item/device/radio/beacon/teletarget = null
var/obj/item/device/beacon/teletarget = null
for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
if(com.target)
if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
code/modules/research/designs/bluespace_designs.dm
+1 -1
View File
@@ -9,7 +9,7 @@
id = "beacon"
build_type = PROTOLATHE
materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/device/radio/beacon
build_path = /obj/item/device/beacon
category = list("Bluespace Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SECURITY
code/modules/shuttle/supply.dm
+1 -1
View File
@@ -5,7 +5,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/obj/structure/spider/spiderling,
/obj/item/disk/nuclear,
/obj/machinery/nuclearbomb,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/obj/singularity,
/obj/machinery/teleport/station,
/obj/machinery/teleport/hub,
icons/obj/device.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

icons/obj/radio.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

tgstation.dme
+1 -1
View File
@@ -769,6 +769,7 @@
#include "code\game\objects\items\circuitboards\computer_circuitboards.dm"
#include "code\game\objects\items\circuitboards\machine_circuitboards.dm"
#include "code\game\objects\items\devices\aicard.dm"
#include "code\game\objects\items\devices\beacon.dm"
#include "code\game\objects\items\devices\camera_bug.dm"
#include "code\game\objects\items\devices\chameleonproj.dm"
#include "code\game\objects\items\devices\dogborg_sleeper.dm"
@@ -798,7 +799,6 @@
#include "code\game\objects\items\devices\PDA\PDA_types.dm"
#include "code\game\objects\items\devices\PDA\radio.dm"
#include "code\game\objects\items\devices\PDA\virus_cart.dm"
#include "code\game\objects\items\devices\radio\beacon.dm"
#include "code\game\objects\items\devices\radio\electropack.dm"
#include "code\game\objects\items\devices\radio\encryptionkey.dm"
#include "code\game\objects\items\devices\radio\headset.dm"