cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1946 from CHOMPStationBot/upstream-merge-10304

Browse Source 
[MIRROR] Fix wrong radio path for talon
This commit is contained in:
Nadyr
2021-05-12 17:51:56 -04:00
committed by GitHub
parent 7c0b267c5b c8e8bf65e6
commit 2888eed0c0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/offmap_vr/talon/talon_v2.dmm
+9
View File
@@ -11113,9 +11113,18 @@
pixel_y = 24
},
/obj/structure/table/rack/shelf/steel,
<<<<<<< HEAD
/obj/item/device/radio/off{
channels = list("Talon" = 1)
},
||||||| parent of 270364da74... Merge pull request #10304 from Very-Soft/talontweak
/obj/item/device/radio/off/talon,
=======
/obj/item/device/radio/off{
channels = list("Talon" = 1);
pixel_y = 6
},
>>>>>>> 270364da74... Merge pull request #10304 from Very-Soft/talontweak
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/armory)
"Nw" = (