Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
MrRomainzZ committed Nov 12, 2023
2 parents 8f952da + a58ef67 commit 36c1ee0
Show file tree
Hide file tree
Showing 7 changed files with 223 additions and 568 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto_translate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ jobs:
run: |
git checkout translate
git config --local user.email "[email protected]"
git config --local user.name "SS220Manager"
git config --local user.name "ss220bot"
git commit -m "Generate translation file"
git push origin translate:translate
10 changes: 6 additions & 4 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20643,6 +20643,7 @@
/area/station/medical/chemistry)
"bCX" = (
/obj/machinery/light/directional/south,
/obj/structure/railing/cap/reversed,
/turf/simulated/floor/plasteel{
icon_state = "green"
},
Expand Down Expand Up @@ -20765,6 +20766,7 @@
"bDp" = (
/obj/machinery/status_display/directional/south,
/obj/machinery/light/directional/south,
/obj/structure/railing/cap/normal,
/turf/simulated/floor/plasteel{
icon_state = "green"
},
Expand Down Expand Up @@ -36309,10 +36311,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cOn" = (
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/railing{
dir = 1
},
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass,
/area/station/hallway/secondary/exit)
"cOq" = (
Expand Down Expand Up @@ -67990,11 +67992,11 @@
},
/area/station/service/kitchen)
"lSz" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/railing{
dir = 1
},
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/ywflowers,
/turf/simulated/floor/grass,
/area/station/hallway/secondary/exit)
"lSU" = (
Expand Down Expand Up @@ -97743,10 +97745,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral2)
"wKx" = (
/obj/structure/flora/ausbushes/brflowers,
/obj/structure/railing{
dir = 1
},
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass,
/area/station/hallway/secondary/exit)
"wKB" = (
Expand Down
Loading

0 comments on commit 36c1ee0

Please sign in to comment.