Skip to content

Commit

Permalink
Bluespace locker no longer has infinite power (yogstation13#17517)
Browse files Browse the repository at this point in the history
* Bluespace locker no longer has infinite power

* Make it not autoname
  • Loading branch information
ThatLing committed Jan 22, 2023
1 parent df7fb2f commit deb685e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
20 changes: 14 additions & 6 deletions _maps/map_files/generic/CentCom.dmm
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
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

0 comments on commit deb685e

Please sign in to comment.