Merge branch 'CeladonSS13:beta-dev' into irp-qol

CeladonSS13 · May 28, 2024 · 9a2a7da · 9a2a7da
2 parents cf79a16 + 15cc467
commit 9a2a7da
Show file tree

Hide file tree

Showing 335 changed files with 30,297 additions and 31,790 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -101,9 +101,6 @@
 "la" = (
 /obj/effect/decal/cleanable/blood/gibs/up,
 /obj/effect/mob_spawn/human/corpse/assistant,
-/mob/living/simple_animal/hostile/skeleton/eskimo{
-	name = "Village Hunter"
-	},
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/overmap_encounter/planetoid/cave/explored)
 "lg" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -7195,7 +7195,7 @@
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/starport)
 "WR" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -368,7 +368,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/jungle/cavecrew/hallway)
 "ei" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 8
 	},
 /obj/effect/turf_decal/techfloor{

diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -1711,7 +1711,7 @@
 /turf/open/floor/mineral/titanium/white,
 /area/overmap_encounter/planetoid/cave/explored)
 "kk" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 4
 	},
 /turf/open/floor/mineral/titanium/blue,