cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [speedmerge] Repairs A Handful Of Issues With Icebox [MDB IGNORE] (#12600)

Browse Source 
* [speedmerge] Repairs A Handful Of Issues With Icebox (#65927)

* [speedmerge] Repairs A Handful Of Issues With Icebox

Co-authored-by: BluBerry016 <50649185+unit0016@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-04-08 23:13:39 +01:00
committed by GitHub
co-authored by BluBerry016 Gandalf
parent bd6cf07f90
commit 2252b75bfc
4 changed files with 2288 additions and 2376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+1094 -1060
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm
+1181 -1294
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/IceBoxStation/IcemoonUnderground_Below.dmm
+12 -21
View File
@@ -30,13 +30,13 @@
/turf/open/floor/iron/dark,
/area/mine/mechbay)
"an" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/west,
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/door/poddoor/shutters/preopen{
id = "Lakeview_Bathroom";
name = "Privacy Shutters"
},
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 4
},
/turf/open/floor/plating,
/area/mine/eva)
"at" = (
@@ -725,9 +725,7 @@
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
"lZ" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/north,
/obj/structure/window/reinforced/spawner,
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/turf/open/floor/plating,
/area/mine/mechbay)
"md" = (
@@ -929,9 +927,7 @@
/turf/open/floor/iron,
/area/mine/laborcamp)
"pj" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/north,
/obj/structure/window/reinforced/spawner,
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
/turf/open/floor/plating,
/area/mine/eva)
"pm" = (
@@ -1374,7 +1370,6 @@
},
/obj/machinery/button/door/directional/north{
id = "Lakeview_Bathroom";
name = "Mech Bay Door Control";
pixel_x = 22;
pixel_y = -10;
req_access_txt = "29"
@@ -1618,10 +1613,9 @@
/turf/open/floor/stone,
/area/mine/eva)
"BT" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/west,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/north,
/obj/effect/spawner/structure/window/hollow/reinforced/end{
dir = 1
},
/turf/open/floor/plating,
/area/mine/eva)
"BV" = (
@@ -2621,10 +2615,7 @@
/turf/open/floor/iron,
/area/mine/laborcamp)
"Rn" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/west,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner,
/obj/effect/spawner/structure/window/hollow/reinforced/end,
/turf/open/floor/plating,
/area/mine/eva)
"Ro" = (
@@ -2965,9 +2956,9 @@
/turf/open/floor/iron,
/area/mine/laborcamp/security)
"Wj" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/west,
/obj/effect/spawner/structure/window/hollow/reinforced/middle{
dir = 4
},
/turf/open/floor/plating,
/area/mine/eva)
"Wl" = (
code/modules/shuttle/syndicate.dm
+1 -1
View File
@@ -66,7 +66,7 @@
view_range = 5.5
x_offset = -7
y_offset = -1
whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/closed/mineral, /turf/open/openspace)
whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/closed/mineral, /turf/open/openspace, /turf/open/misc)
see_hidden = TRUE
#undef SYNDICATE_CHALLENGE_TIMER