almost done, aaaa

This commit is contained in:
Killian
2020-09-08 13:00:41 +01:00
parent c98a6f8c58
commit e29c434c87
2 changed files with 13 additions and 6 deletions
+5 -2
View File
@@ -1,6 +1,6 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "mercship.dmm"
#include "ert.dmm"
#endif
@@ -192,13 +192,16 @@ Point is they're fairly expensive and probably prototypes or something, so for t
/obj/item/weapon/paper/vonbraun_shields
name = "NRV Von Braun Shield Configuration Documentation"
info = {"To All Current ERT Members,<br>\
Be advised that use of the NRV Von Braun's shield generator (located adjacent to this document) is strongly recommended when responding to calls, but also that it is not impervious, nor is the ship's point defense system flawless. Recommended settings as follows:<br>\
Be advised that use of the NRV Von Braun's shield generator (located adjacent to this document) is strongly recommended when responding to calls, but also that it is not impervious, nor is the ship's point defense system flawless.<br>\
<br>\
Recommended settings as follows:<br>\
Photonic: Off (PD will not work with it enabled!)<br>\
EM: On<br>\
Humanoids: Off<br>\
Atmospheric: Off<br>\
Hull Shield: On<br>\
Radius: 26<br>\
<br>\
The shield generator will tax the Von Braun's reserves greatly so try to use it sparingly. Do not be afraid to use it however, as the Von Braun represents the Company making a <i>significant</i> investment in this sector's future. I can bail you out if the occasional intern goes missing or you break something minor, but if you go flying this thing through an asteroid belt and get massive holes blown in it Central <b>will</b> make <u>everyone</u> involved disappear <b><u>permanently</b></u>.<br>\
<br>\
<i>Lt. Cmdr. Sykes</i>"}
+8 -4
View File
@@ -21,9 +21,11 @@
/obj/machinery/door/airlock/external,
/obj/effect/map_helper/airlock/door/ext_door,
/obj/machinery/airlock_sensor/airlock_exterior{
dir = 1;
pixel_x = 24;
pixel_y = 9
pixel_y = 11
},
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/dock_port)
"af" = (
@@ -3282,6 +3284,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/shield_diffuser,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/ert_ship_boat)
"yi" = (
@@ -4608,14 +4611,15 @@
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/ert_ship_boat)
"HK" = (
/obj/machinery/door/blast/regular{
id = "ERT_Shuttle_Fore"
},
/obj/machinery/door/blast/regular/open{
dir = 2;
id = "ERT_Blast_Windows";
name = "Blast Shield"
},
/obj/machinery/shield_diffuser,
/obj/machinery/door/blast/regular{
id = "ERT_Shuttle_Fore"
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/ert_ship_boat)
"HO" = (