Skip to content

Commit

Permalink
Merge pull request tgstation#19746 from Bawhoppen/okey
Browse files Browse the repository at this point in the history
My civic duty v2
  • Loading branch information
ChangelingRain authored Aug 8, 2016
2 parents c59c0fc + cbd0aab commit 242b6ff
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 31 deletions.
36 changes: 24 additions & 12 deletions _maps/map_files/MiniStation/MiniStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8201,6 +8201,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/telecomms/server/presets/common/birdstation,
/turf/open/floor/plasteel/black{
name = "Mainframe Floor";
initial_gas_mix = "n2=100;TEMP=80"
Expand Down Expand Up @@ -8473,7 +8474,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay)
"sF" = (
/obj/machinery/telecomms/receiver/preset_left/ministation,
/obj/machinery/telecomms/receiver/preset_left/birdstation,
/turf/open/floor/plasteel/black{
name = "Mainframe Floor";
initial_gas_mix = "n2=100;TEMP=80"
Expand Down Expand Up @@ -14358,7 +14359,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/syndicate)
"GP" = (
/obj/machinery/telecomms/processor/preset_one,
/obj/machinery/telecomms/processor/preset_one/birdstation,
/turf/open/floor/plasteel/black{
name = "Mainframe Floor";
initial_gas_mix = "n2=100;TEMP=80"
Expand Down Expand Up @@ -14577,8 +14578,12 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"Ht" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/escape)
/obj/machinery/telecomms/broadcaster/preset_left/birdstation,
/turf/open/floor/plasteel/black{
name = "Mainframe Floor";
initial_gas_mix = "n2=100;TEMP=80"
},
/area/tcommsat/computer)
"Hu" = (
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/mineral/titanium,
Expand Down Expand Up @@ -14681,9 +14686,12 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"HJ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/shuttle/escape)
/obj/machinery/telecomms/bus/preset_one/birdstation,
/turf/open/floor/plasteel/black{
name = "Mainframe Floor";
initial_gas_mix = "n2=100;TEMP=80"
},
/area/tcommsat/computer)
"HK" = (
/obj/machinery/door/airlock/glass_medical{
id_tag = null;
Expand Down Expand Up @@ -14924,8 +14932,12 @@
/turf/open/floor/plating,
/area/shuttle/transport)
"Iw" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/transport)
/obj/machinery/telecomms/receiver/preset_left/birdstation,
/turf/open/floor/plasteel/black{
name = "Mainframe Floor";
initial_gas_mix = "n2=100;TEMP=80"
},
/area/tcommsat/computer)
"Ix" = (
/turf/open/floor/mineral/titanium/blue,
/turf/closed/wall/mineral/titanium/interior,
Expand Down Expand Up @@ -59249,11 +59261,11 @@ Eg
Ea
Eh
Ew
EV
Ht
Fk
Fy
FN
EV
Iw
Gr
Eh
Ea
Expand Down Expand Up @@ -60020,7 +60032,7 @@ Eh
Eu
Eh
Ew
EV
HJ
EV
EV
EV
Expand Down
18 changes: 0 additions & 18 deletions _maps/map_files/MiniStation/telecomms.dm

This file was deleted.

1 change: 0 additions & 1 deletion _maps/ministation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ Changes to the uplinks were made to discourage murderboning, the rest is the sam
#define MAP_OVERRIDE_FILES
#include "map_files\MiniStation\misc.dm"
#include "map_files\MiniStation\cargopacks.dm"
#include "map_files\MiniStation\telecomms.dm"
#include "map_files\MiniStation\uplink_item.dm"
#include "map_files\MiniStation\job\jobs.dm"
#include "map_files\MiniStation\job\removed.dm"
Expand Down

0 comments on commit 242b6ff

Please sign in to comment.