Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rhials committed Dec 1, 2024
2 parents 279bae8 + c1136cd commit 64aa065
Show file tree
Hide file tree
Showing 524 changed files with 4,993 additions and 360,040 deletions.
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
/code/game/area/ @san7890
/icons/area/ @san7890

# SmArtKar

/code/modules/projectiles/projectile.dm @SmArtKar

# stylemistake

/code/__DEFINES/chat.dm @stylemistake
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
touch dmdoc/.nojekyll
echo codedocs.tgstation13.org > dmdoc/CNAME
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.6.9
uses: JamesIves/github-pages-deploy-action@v4.7.1
with:
branch: gh-pages
clean: true
Expand Down
1 change: 0 additions & 1 deletion _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "map_files\IceBoxStation\IceBoxStation.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\NorthStar\north_star.dmm"
#include "map_files\tramstation\tramstation.dmm"
#include "map_files\NebulaStation\NebulaStation.dmm"
#include "map_files\wawastation\wawastation.dmm"
Expand Down
11 changes: 9 additions & 2 deletions _maps/map_files/NebulaStation/NebulaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -23929,6 +23929,13 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
"dAP" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/mecha_part_fabricator{
drop_direction = 1
},
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"dAT" = (
/obj/effect/spawner/random/entertainment/toy_figure{
pixel_y = 37;
Expand Down Expand Up @@ -141153,7 +141160,7 @@
/area/station/hallway/primary/central)
"uYT" = (
/obj/machinery/mecha_part_fabricator{
dir = 1
drop_direction = 1
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
Expand Down Expand Up @@ -263701,7 +263708,7 @@ juD
iZk
vqW
jyY
uYT
dAP
xGM
mVH
xGM
Expand Down
Loading

0 comments on commit 64aa065

Please sign in to comment.