Merge branch 'master' into shiro-clothing

MrMelbert · May 19, 2024 · 717280a · 717280a
2 parents e691e5f + 54659eb
commit 717280a
Show file tree

Hide file tree

Showing 426 changed files with 26,491 additions and 21,387 deletions.
diff --git a/.github/alternate_byond_versions.txt b/.github/alternate_byond_versions.txt
@@ -5,3 +5,4 @@
 # Format is version: map
 # Example:
 # 500.1337: runtimestation
+515.1626: runtimestation
diff --git a/.github/workflows/has_515_compatibility.yml b/.github/workflows/has_515_compatibility.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,6 +13,7 @@
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,
+	"git.branchProtection": ["master"],
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"[javascript]": {

diff --git a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
@@ -130,7 +130,7 @@
 /turf/open/floor/iron/smooth_edge,
 /area/ruin/space/has_grav/derelictsulaco)
 "eF" = (
-/obj/effect/decal/cleanable/blood/xtracks,
+/obj/effect/decal/cleanable/xenoblood/xtracks,
 /turf/open/floor/plating/airless,
 /area/ruin/space)
 "eU" = (
@@ -163,7 +163,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "fI" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -652,7 +652,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "vl" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -692,7 +692,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "wR" = (
 /obj/effect/mapping_helpers/burnt_floor,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1018,7 +1018,7 @@
 /area/ruin/space)
 "Ie" = (
 /obj/effect/mapping_helpers/burnt_floor,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1322,7 +1322,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "QR" = (
 /obj/structure/alien/weeds,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 5
 	},
 /obj/item/trash/flare,
@@ -1432,7 +1432,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "TL" = (
 /obj/structure/alien/weeds,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1630,7 +1630,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "ZA" = (
 /obj/effect/mapping_helpers/broken_floor,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,

diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -4494,7 +4494,7 @@
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
 "rC" = (
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/glass,
@@ -4760,7 +4760,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/item/shard,
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 6
 	},
 /obj/effect/turf_decal/tile/purple/half/contrasted,
@@ -4946,7 +4946,7 @@
 /obj/machinery/door/airlock/highsecurity,
 /obj/structure/alien/weeds,
 /obj/structure/cable,
-/obj/effect/decal/cleanable/blood/xtracks,
+/obj/effect/decal/cleanable/xenoblood/xtracks,
 /obj/effect/decal/cleanable/blood/tracks,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
 	cycle_id = "oldstation-aisat"
@@ -7208,7 +7208,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/ancientstation/beta/supermatter)
 "Np" = (
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 10
 	},
 /turf/open/floor/engine,
@@ -8235,7 +8235,7 @@
 /turf/open/floor/engine,
 /area/ruin/space/ancientstation/delta/biolab)
 "Wd" = (
-/obj/effect/decal/cleanable/blood/xtracks{
+/obj/effect/decal/cleanable/xenoblood/xtracks{
 	dir = 5
 	},
 /turf/open/floor/engine,

diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -28337,6 +28337,7 @@
 	pixel_x = 4
 	},
 /obj/machinery/light/small/red/directional/south,
+/obj/item/storage/photo_album/chapel,
 /obj/item/book/granter/action/spell/smoke/lesser{
 	name = "Book of Cloud Chasing";
 	pixel_y = 3;
@@ -48191,6 +48192,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/newscaster/directional/east,
 /obj/effect/turf_decal/bot_white,
+/obj/item/storage/photo_album/library,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
 "kRX" = (
@@ -50000,6 +50002,7 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
+/obj/item/storage/photo_album/bar,
 /turf/open/floor/iron/dark,
 /area/station/service/bar/backroom)
 "lxS" = (
@@ -67904,6 +67907,7 @@
 	},
 /obj/structure/chair/comfy,
 /obj/item/radio/intercom/command/directional/north,
+/obj/effect/landmark/start/noble_ambassador,
 /turf/open/floor/iron,
 /area/station/security/courtroom)
 "rFc" = (

diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm
@@ -895,6 +895,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"apP" = (
+/obj/effect/landmark/start/noble_ambassador,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
 "apV" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -2303,6 +2307,8 @@
 "aRw" = (
 /obj/structure/table,
 /obj/machinery/computer/security/telescreen/entertainment/directional/east,
+/obj/item/pen,
+/obj/item/paper_bin,
 /turf/open/floor/iron,
 /area/station/security/prison)
 "aRC" = (
@@ -22970,6 +22976,7 @@
 /obj/machinery/light_switch/directional/north{
 	pixel_x = -6
 	},
+/obj/item/storage/photo_album/chapel,
 /obj/item/storage/crayons{
 	pixel_x = 6
 	},
@@ -30956,6 +30963,7 @@
 /obj/machinery/light_switch/directional/west{
 	pixel_y = 4
 	},
+/obj/item/storage/photo_album/library,
 /obj/item/key/displaycase,
 /turf/open/floor/iron/grimy,
 /area/station/service/library)
@@ -48939,6 +48947,7 @@
 "qwd" = (
 /obj/structure/table,
 /obj/item/radio/intercom/prison/directional/east,
+/obj/item/storage/photo_album/prison,
 /turf/open/floor/iron,
 /area/station/security/prison)
 "qwf" = (
@@ -60348,6 +60357,7 @@
 /obj/structure/cable,
 /obj/machinery/light/directional/west,
 /obj/structure/table/wood,
+/obj/item/storage/photo_album/bar,
 /turf/open/floor/mineral/plastitanium{
 	name = "black plastitanium floor"
 	},
@@ -178598,7 +178608,7 @@ kwg
 hbQ
 pBO
 pBO
-kyk
+apP
 pBO
 pBO
 jAm