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
},