Skip to content

Commit

Permalink
Upstream conflict fix: update paths
Browse files Browse the repository at this point in the history
  • Loading branch information
Furrior committed Sep 20, 2023
1 parent ff64114 commit dd0941d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -89862,7 +89862,7 @@
"sEl" = (
/obj/structure/bed,
/obj/effect/landmark/spawner/nukedisc_respawn,
/obj/effect/mob_spawn/human/skeleton,
/obj/effect/mob_spawn/human/corpse/skeleton,
/mob/living/simple_animal/hostile/scarybat,
/turf/simulated/floor/plasteel{
icon_state = "vault"
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/generic/centcomm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5030,7 +5030,7 @@
/area/centcom220/admin1)
"pe" = (
/obj/structure/lattice,
/obj/effect/mob_spawn/human/clown/corpse,
/obj/effect/mob_spawn/human/corpse/clown,
/turf/space,
/area/space)
"pf" = (
Expand Down

0 comments on commit dd0941d

Please sign in to comment.