Merge branch 'Skyrat-SS13:master' into master

SpessManCN · Dec 27, 2023 · 8b51459 · 8b51459
2 parents 2fb3bc8 + 410dbce
commit 8b51459
Show file tree

Hide file tree

Showing 120 changed files with 20,522 additions and 15,064 deletions.
diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_icewalker_lower.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_icewalker_lower.dmm
@@ -159,6 +159,18 @@
 	},
 /turf/open/floor/wood/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
+"cT" = (
+/obj/structure/closet/crate/wooden/storage_barrel,
+/obj/item/seeds/watermelon,
+/obj/item/seeds/watermelon,
+/obj/item/seeds/grass,
+/obj/item/seeds/grass,
+/obj/item/seeds/lavaland/polypore,
+/obj/item/seeds/lavaland/polypore,
+/obj/item/seeds/lavaland/ember,
+/obj/item/seeds/lavaland/ember,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/ruin/unpowered/primitive_catgirl_den)
 "cW" = (
 /obj/effect/turf_decal/weather/snow/corner,
 /obj/effect/turf_decal/weather/snow/corner{
@@ -2477,7 +2489,7 @@ jw
 ZJ
 ZJ
 Ug
-oJ
+cT
 pa
 pa
 oJ