Merge branch 'Monkestation:master' into Code-Bounties

Monkestation · Dec 5, 2024 · 1f0c4ee · 1f0c4ee
2 parents 45d2eee + ba80adf
commit 1f0c4ee
Show file tree

Hide file tree

Showing 237 changed files with 19,387 additions and 5,008 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -240,9 +240,9 @@
 "fv" = (
 /obj/effect/turf_decal/bot_white,
 /obj/structure/closet/crate/secure/engineering,
-/obj/item/organ/internal/cyberimp/arm/item_set,
 /obj/item/organ/internal/cyberimp/eyes/hud/medical,
 /obj/item/organ/internal/cyberimp/brain/anti_stun,
+/obj/item/organ/internal/cyberimp/arm/item_set/toolset,
 /turf/open/floor/iron/dark/airless,
 /area/shuttle/ruin/caravan/freighter3)
 "fy" = (