Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bluespace locker no longer has infinite power #17517

Merged
merged 2 commits into from
Jan 22, 2023
Merged

Bluespace locker no longer has infinite power #17517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8a4efe
Bluespace locker no longer has infinite power
ThatLing Jan 16, 2023
baa2865
Make it not autoname
ThatLing Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18929,7 +18929,7 @@
dir = 4
},
/obj/machinery/door/airlock/centcom{
armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 90);
armor = list("melee"=90,"bullet"=90,"laser"=90,"energy"=90,"bomb"=90,"bio"=100,"rad"=100,"fire"=100,"acid"=90);
name = "Test Chamber Blast Doors"
},
/obj/structure/fans/tiny,
Expand Down Expand Up @@ -19943,7 +19943,7 @@
dir = 8
},
/obj/machinery/door/airlock/centcom{
armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 90);
armor = list("melee"=90,"bullet"=90,"laser"=90,"energy"=90,"bomb"=90,"bio"=100,"rad"=100,"fire"=100,"acid"=90);
name = "Test Chamber Blast Doors"
},
/obj/structure/fans/tiny,
Expand Down Expand Up @@ -20580,7 +20580,7 @@
dir = 8
},
/obj/machinery/door/airlock/centcom{
armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 90);
armor = list("melee"=90,"bullet"=90,"laser"=90,"energy"=90,"bomb"=90,"bio"=100,"rad"=100,"fire"=100,"acid"=90);
name = "Test Chamber Blast Doors"
},
/obj/structure/fans/tiny,
Expand Down Expand Up @@ -22794,7 +22794,7 @@
/area/holodeck/rec_center/chapelcourt)
"aTW" = (
/obj/machinery/door/airlock/centcom{
armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 90);
armor = list("melee"=90,"bullet"=90,"laser"=90,"energy"=90,"bomb"=90,"bio"=100,"rad"=100,"fire"=100,"acid"=90);
name = "Test Chamber Blast Doors"
},
/obj/structure/fans/tiny,
Expand Down Expand Up @@ -25862,6 +25862,14 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
/area/ctf)
"eiz" = (
/obj/machinery/power/apc{
areastring = "/area/bluespace_locker";
name = "Bluespace Locker APC";
pixel_y = -24
},
/turf/open/floor/plasteel/dark,
/area/bluespace_locker)
"eDa" = (
/turf/open/indestructible/wiki/title{
icon_state = "title1"
Expand Down Expand Up @@ -26444,7 +26452,7 @@
/area/centcom/testchamber)
"xuU" = (
/obj/machinery/door/airlock/centcom{
armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 90);
armor = list("melee"=90,"bullet"=90,"laser"=90,"energy"=90,"bomb"=90,"bio"=100,"rad"=100,"fire"=100,"acid"=90);
name = "Test Chamber Blast Doors"
},
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -46001,7 +46009,7 @@ aVa
aVa
aOw
aVa
aVa
eiz
aGa
aOQ
aOQ
Expand Down
2 changes: 0 additions & 2 deletions yogstation/code/game/area/Space_Station_13_areas.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
/area/bluespace_locker
name = "Bluespace Locker"
icon_state = "away"
requires_power = FALSE
has_gravity = STANDARD_GRAVITY
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
noteleport = TRUE

/area/vacant_room/office/office_b
Expand Down