Skip to content

Commit

Permalink
Merge branch 'master' into kilomaint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KnigTheThrasher
KnigTheThrasher committed Oct 28, 2024
2 parents 7d43f83 + e0aca34 commit f449833
Show file tree
Hide file tree
Showing 3,556 changed files with 22,141 additions and 22,355 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion _maps/map_files/BoxStation/BoxStation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21967,7 +21967,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/freezer{
name = "Coldroom"
},
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32304,7 +32304,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/door/firedoor,
/obj/machinery/duct,
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/turf/open/floor/iron/freezer,
Expand Down
Loading

0 comments on commit f449833

Please sign in to comment.