Skip to content

Commit 6dc4b28

Browse files
authored
Some Atlas Fixes + Virology Morgue (#7069)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes an assortment of things, adds a morgue to virology, adds intercomms to surface 1 Please keep this open a while, free to testmerge <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Recently while playing we've come across the dilema that we had to go across the whole of medical, including leaving the seal of virology to dispose of a body properly. This fixes that. Removing needless things from walls, making stuff accessible, it's always good. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog Adds virology morgue and an area for it Removes random wires, sensors, a sign? and adds three intercomms to surface 1 <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: added intercoms add: added a new riftmap area tweak: moved stuff in engine maps /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
1 parent 351af0b commit 6dc4b28

File tree

8 files changed

+289
-124
lines changed

8 files changed

+289
-124
lines changed

code/game/area/rift_areas.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,10 @@
781781
name = "\improper Virology Isolation"
782782
icon_state = "virology"
783783

784+
/area/medical/virologymorgue
785+
name = "\improper Virology Morgue"
786+
icon_state = "virology"
787+
784788
/area/medical/recoveryrestroom
785789
name = "\improper Recovery Room Restroom"
786790
icon_state = "virology"

maps/rift/engines/burn.dmm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
/area/engineering/engine_room)
4444
"bZ" = (
4545
/obj/machinery/computer/general_air_control/supermatter_core{
46-
dir = 1;
46+
dir = 4;
4747
frequency = 1438;
4848
input_tag = "cooling_in";
4949
name = "Engine Pressure Control";
@@ -1797,7 +1797,7 @@ Zn
17971797
WA
17981798
kh
17991799
It
1800-
Zn
1800+
bZ
18011801
Zn
18021802
Zn
18031803
Zn
@@ -1822,7 +1822,7 @@ Zn
18221822
Zn
18231823
Zn
18241824
Zn
1825-
bZ
1825+
Zn
18261826
Zn
18271827
Zn
18281828
Zn

maps/rift/engines/rust.dmm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
/area/engineering/engine_room)
4747
"cZ" = (
4848
/obj/machinery/computer/general_air_control/supermatter_core{
49-
dir = 1;
49+
dir = 4;
5050
frequency = 1438;
5151
input_tag = "cooling_in";
5252
name = "Engine Cooling Control";
@@ -1794,7 +1794,7 @@ Ym
17941794
kz
17951795
zF
17961796
Cu
1797-
ZO
1797+
cZ
17981798
ZO
17991799
ZO
18001800
ZO
@@ -1819,7 +1819,7 @@ ZO
18191819
ZO
18201820
ZO
18211821
ZO
1822-
cZ
1822+
ZO
18231823
ZO
18241824
ZO
18251825
ZO

maps/rift/engines/sme.dmm

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,19 @@
289289
},
290290
/turf/simulated/floor,
291291
/area/engineering/engine_room)
292-
"ni" = (
292+
"ne" = (
293293
/obj/machinery/computer/general_air_control/supermatter_core{
294-
dir = 1;
294+
dir = 4;
295295
frequency = 1438;
296296
input_tag = "cooling_in";
297297
name = "Engine Cooling Control";
298298
output_tag = "cooling_out";
299299
pressure_setting = 100;
300300
sensors = list("engine_sensor"="Engine Core")
301301
},
302+
/turf/template_noop,
303+
/area/template_noop)
304+
"ni" = (
302305
/obj/structure/sign/securearea{
303306
pixel_x = 0;
304307
pixel_y = -32;
@@ -1929,7 +1932,7 @@ DO
19291932
Aj
19301933
nL
19311934
us
1932-
fS
1935+
ne
19331936
fS
19341937
fS
19351938
fS

maps/rift/levels/rift-02-underground2.dmm

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,12 +1531,6 @@
15311531
/obj/effect/floor_decal/borderfloor,
15321532
/turf/simulated/floor/tiled/steel,
15331533
/area/hallway/primary/undertwo)
1534-
"gd" = (
1535-
/obj/structure/table/steel_reinforced,
1536-
/obj/item/storage/firstaid/toxin,
1537-
/obj/item/storage/single_use/med_pouch/radiation,
1538-
/turf/simulated/floor/tiled/monotile,
1539-
/area/engineering/engine_monitoring)
15401534
"ge" = (
15411535
/obj/effect/floor_decal/borderfloor,
15421536
/obj/machinery/light,
@@ -10536,6 +10530,8 @@
1053610530
/obj/machinery/fire_alarm/north_mount{
1053710531
pixel_y = 22
1053810532
},
10533+
/obj/item/storage/firstaid/toxin,
10534+
/obj/item/storage/single_use/med_pouch/radiation,
1053910535
/turf/simulated/floor/tiled/monotile,
1054010536
/area/engineering/engine_monitoring)
1054110537
"Nk" = (
@@ -11859,13 +11855,6 @@
1185911855
},
1186011856
/turf/simulated/floor/tiled/white,
1186111857
/area/crew_quarters/sleep/engi_wash)
11862-
"Su" = (
11863-
/obj/machinery/airlock_sensor{
11864-
id_tag = "eng_al_c_snsr";
11865-
pixel_x = -25
11866-
},
11867-
/turf/simulated/mineral/icerock/lythios43c,
11868-
/area/rift/surfacebase/underground/under2)
1186911858
"Sw" = (
1187011859
/obj/structure/bed/chair/bay/chair/padded/yellow,
1187111860
/obj/machinery/fire_alarm/north_mount,
@@ -28078,7 +28067,7 @@ Nj
2807828067
zG
2807928068
zG
2808028069
zG
28081-
gd
28070+
zG
2808228071
zJ
2808328072
jB
2808428073
sx
@@ -37406,7 +37395,7 @@ aa
3740637395
aa
3740737396
aa
3740837397
aa
37409-
Su
37398+
aa
3741037399
aa
3741137400
aa
3741237401
aa

0 commit comments

Comments
 (0)