+
21 August 2019
+
Atermonera updated:
+
+ - Atmospherics is now bigger, with more room for fun and sanity-destroying spaghetti!
+
+
Mechoid updated:
+
+ - Exosuits are now targetted by turrets again.
+ - Mining charge strength lowered, price increased. Can be upgraded through R&D laser components.
+ - Searing damage type added. Energy axe now uses searing damage.
+ - Survey points added. Vendor added for explorer use. Costs are universally 'lower' compared to the mining vendor due to the rarity of points.
+ - Swiping an ID card on a cataloguer will transfer the points to the card.
+ - Any melee energy weapon can now be made to use a cell and charge.
+ - Energy Axe prototype added to R&D.
+ - Anomalous 'hunting trap' added to R&D. Useful for an initial stun on mobs for explorer scanning.
+ - Beartraps now stun for a quarter of a second, so they are actually useful again, due to resistability.
+ - Emergency welding pack added. Incredibly slow, but requires no protection.
+ - Random turf modifier added for mapping use. Random humanoid remains spawner added for mapping use.
+ - Plants under obj/structure/flora now can be made to be harvestable / forage-able.
+ - Sif trees now occasionally have fruit containing useful microbes. Microbes slow blood flow resulting in slower chemical absorption and blood loss.
+ - Flora by default are now under mobs, on the same layer as turf decals. Flora can now also randomize their size, previously only codified in Sivian trees.
+ - Moss tendrils added to Sif, making eye-plants more rare.
+ - Multiple PoIs added. 'Blue shuttle down' variant, 'UFO Frigate', multiple geysers, cliffs, and two variants of SFR which take drastically different approaches to the SFR standard. A vault was added, too.
+ - Vault PoIs are now in a template group.
+ - Generic AI-controlled humanoids added. Subtype made for use on Sif, clad in weak armor and temperature resistance, used as 'mindless clones'.
+ - More artifice added.
+ - Fultons made to be [somewhat] sane. Now only useable planetside.
+ - Graviton Visor moved to R&D from the mining equipment vendor. Silver and Diamond pickaxes removed.
+ - Added multiple new organs for Prometheans. Removing them will cause them to take large amounts of Toxloss untill they are Regenerated using the active regeneration verb.
+ - Organ: pneumatic network, a series of skeletal tubes with high pressure used to move nutrients and waste.
+ - Organs: -regenesis systems, different 'networks' of clumped cellular matter that allow Prometheans to recover rapidly from small injuries. Large or numerous injuries cause un-needed stress, and pain.
+ - Internal organs now properly add themselves to the internal organ-by-name list, the one referenced 99.9% of the time.
+ - Active regeneration will now replace internal organs if they are nonexistant, as it does for limbs.
+
+
Nalarac updated:
+
+ - Mech cable layer works again.
+ - Added setting for turrets to fire upon downed/laying targets.
+
+
TheFurryFeline updated:
+
+ - New orange jumpsuit for loadout that doesn't get locked to tracking.
+ - Prison jumpsuit filepath changed accordingly and closets with obj updated.
+
+
Woodrat updated:
+
+ - Made the solgov uniforms use accessories for denoting department instead of having several different sprites in the uniform dmi folder.
+ - Removed redundant solgov uniforms from uniform.dmi and moved the sprites for the solgov uniforms to their own dmi.
+ - Fixed storage vests and drop pouches disappearing when one rolls down a uniform.
+
+
08 August 2019
Mechoid updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4b1d6be2b8..fe2730f067 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4680,3 +4680,66 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Updates the Supermatter Engine Operating Manual.
mistyLuminescence:
- tweak: Serenity mech can now be built by robotics.
+2019-08-21:
+ Atermonera:
+ - tweak: Atmospherics is now bigger, with more room for fun and sanity-destroying
+ spaghetti!
+ Mechoid:
+ - bugfix: Exosuits are now targetted by turrets again.
+ - tweak: Mining charge strength lowered, price increased. Can be upgraded through
+ R&D laser components.
+ - rscadd: Searing damage type added. Energy axe now uses searing damage.
+ - rscadd: Survey points added. Vendor added for explorer use. Costs are universally
+ 'lower' compared to the mining vendor due to the rarity of points.
+ - rscadd: Swiping an ID card on a cataloguer will transfer the points to the card.
+ - tweak: Any melee energy weapon can now be made to use a cell and charge.
+ - rscadd: Energy Axe prototype added to R&D.
+ - rscadd: Anomalous 'hunting trap' added to R&D. Useful for an initial stun on mobs
+ for explorer scanning.
+ - tweak: Beartraps now stun for a quarter of a second, so they are actually useful
+ again, due to resistability.
+ - rscadd: Emergency welding pack added. Incredibly slow, but requires no protection.
+ - rscadd: Random turf modifier added for mapping use. Random humanoid remains spawner
+ added for mapping use.
+ - rscadd: Plants under obj/structure/flora now can be made to be harvestable / forage-able.
+ - rscadd: Sif trees now occasionally have fruit containing useful microbes. Microbes
+ slow blood flow resulting in slower chemical absorption and blood loss.
+ - tweak: Flora by default are now under mobs, on the same layer as turf decals.
+ Flora can now also randomize their size, previously only codified in Sivian
+ trees.
+ - rscadd: Moss tendrils added to Sif, making eye-plants more rare.
+ - rscadd: Multiple PoIs added. 'Blue shuttle down' variant, 'UFO Frigate', multiple
+ geysers, cliffs, and two variants of SFR which take drastically different approaches
+ to the SFR standard. A vault was added, too.
+ - tweak: Vault PoIs are now in a template group.
+ - rscadd: Generic AI-controlled humanoids added. Subtype made for use on Sif, clad
+ in weak armor and temperature resistance, used as 'mindless clones'.
+ - rscadd: More artifice added.
+ - tweak: Fultons made to be [somewhat] sane. Now only useable planetside.
+ - tweak: Graviton Visor moved to R&D from the mining equipment vendor. Silver and
+ Diamond pickaxes removed.
+ - rscadd: Added multiple new organs for Prometheans. Removing them will cause them
+ to take large amounts of Toxloss untill they are Regenerated using the active
+ regeneration verb.
+ - rscadd: 'Organ: pneumatic network, a series of skeletal tubes with high pressure
+ used to move nutrients and waste.'
+ - rscadd: 'Organs: -regenesis systems, different ''networks'' of clumped cellular
+ matter that allow Prometheans to recover rapidly from small injuries. Large
+ or numerous injuries cause un-needed stress, and pain.'
+ - bugfix: Internal organs now properly add themselves to the internal organ-by-name
+ list, the one referenced 99.9% of the time.
+ - tweak: Active regeneration will now replace internal organs if they are nonexistant,
+ as it does for limbs.
+ Nalarac:
+ - bugfix: Mech cable layer works again.
+ - rscadd: Added setting for turrets to fire upon downed/laying targets.
+ TheFurryFeline:
+ - rscadd: New orange jumpsuit for loadout that doesn't get locked to tracking.
+ - tweak: Prison jumpsuit filepath changed accordingly and closets with obj updated.
+ Woodrat:
+ - tweak: Made the solgov uniforms use accessories for denoting department instead
+ of having several different sprites in the uniform dmi folder.
+ - tweak: Removed redundant solgov uniforms from uniform.dmi and moved the sprites
+ for the solgov uniforms to their own dmi.
+ - bugfix: Fixed storage vests and drop pouches disappearing when one rolls down
+ a uniform.
diff --git a/html/changelogs/Atermonera - atmos remap.yml b/html/changelogs/Atermonera - atmos remap.yml
deleted file mode 100644
index 94bdbfde76..0000000000
--- a/html/changelogs/Atermonera - atmos remap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Atermonera
-delete-after: True
-changes:
- - tweak: "Atmospherics is now bigger, with more room for fun and sanity-destroying spaghetti!"
\ No newline at end of file
diff --git a/html/changelogs/Mechoid - ExplorerExpansion.yml b/html/changelogs/Mechoid - ExplorerExpansion.yml
deleted file mode 100644
index 25c5488d00..0000000000
--- a/html/changelogs/Mechoid - ExplorerExpansion.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# maptweak
-# spellcheck (typo fixes)
-# experiment
-#################################
-
-# Your name.
-author: Mechoid
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
- - bugfix: "Exosuits are now targetted by turrets again."
- - tweak: "Mining charge strength lowered, price increased. Can be upgraded through R&D laser components."
- - rscadd: "Searing damage type added. Energy axe now uses searing damage."
- - rscadd: "Survey points added. Vendor added for explorer use. Costs are universally 'lower' compared to the mining vendor due to the rarity of points."
- - rscadd: "Swiping an ID card on a cataloguer will transfer the points to the card."
- - tweak: "Any melee energy weapon can now be made to use a cell and charge."
- - rscadd: "Energy Axe prototype added to R&D."
- - rscadd: "Anomalous 'hunting trap' added to R&D. Useful for an initial stun on mobs for explorer scanning."
- - tweak: "Beartraps now stun for a quarter of a second, so they are actually useful again, due to resistability."
- - rscadd: "Emergency welding pack added. Incredibly slow, but requires no protection."
- - rscadd: "Random turf modifier added for mapping use. Random humanoid remains spawner added for mapping use."
- - rscadd: "Plants under obj/structure/flora now can be made to be harvestable / forage-able."
- - rscadd: "Sif trees now occasionally have fruit containing useful microbes. Microbes slow blood flow resulting in slower chemical absorption and blood loss."
- - tweak: "Flora by default are now under mobs, on the same layer as turf decals. Flora can now also randomize their size, previously only codified in Sivian trees."
- - rscadd: "Moss tendrils added to Sif, making eye-plants more rare."
- - rscadd: "Multiple PoIs added. 'Blue shuttle down' variant, 'UFO Frigate', multiple geysers, cliffs, and two variants of SFR which take drastically different approaches to the SFR standard. A vault was added, too."
- - tweak: "Vault PoIs are now in a template group."
- - rscadd: "Generic AI-controlled humanoids added. Subtype made for use on Sif, clad in weak armor and temperature resistance, used as 'mindless clones'."
- - rscadd: "More artifice added."
- - tweak: "Fultons made to be [somewhat] sane. Now only useable planetside."
- - tweak: "Graviton Visor moved to R&D from the mining equipment vendor. Silver and Diamond pickaxes removed."
diff --git a/html/changelogs/Mechoid - Promethean Organs.yml b/html/changelogs/Mechoid - Promethean Organs.yml
deleted file mode 100644
index c579478d5a..0000000000
--- a/html/changelogs/Mechoid - Promethean Organs.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# maptweak
-# spellcheck (typo fixes)
-# experiment
-#################################
-
-# Your name.
-author: Mechoid
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "Added multiple new organs for Prometheans. Removing them will cause them to take large amounts of Toxloss untill they are Regenerated using the active regeneration verb."
- - rscadd: "Organ: pneumatic network, a series of skeletal tubes with high pressure used to move nutrients and waste."
- - rscadd: "Organs: -regenesis systems, different 'networks' of clumped cellular matter that allow Prometheans to recover rapidly from small injuries. Large or numerous injuries cause un-needed stress, and pain."
- - bugfix: "Internal organs now properly add themselves to the internal organ-by-name list, the one referenced 99.9% of the time."
- - tweak: "Active regeneration will now replace internal organs if they are nonexistant, as it does for limbs."
diff --git a/html/changelogs/Nalarac - Cable Layer.yml b/html/changelogs/MisterLayne - conductivity_fix.yml
similarity index 93%
rename from html/changelogs/Nalarac - Cable Layer.yml
rename to html/changelogs/MisterLayne - conductivity_fix.yml
index 041f0d033e..5d8d4a06b7 100644
--- a/html/changelogs/Nalarac - Cable Layer.yml
+++ b/html/changelogs/MisterLayne - conductivity_fix.yml
@@ -22,7 +22,7 @@
#################################
# Your name.
-author: Nalarac
+author: MisterLayne
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
@@ -33,4 +33,4 @@ delete-after: True
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- - bugfix: "Mech cable layer works again."
+ - tweak: "Material weapons that should not conduct, do not conduct."
diff --git a/html/changelogs/Nalarac - Turret Shooting Downed People.yml b/html/changelogs/MisterLayne - glass_shard_self_harm.yml
similarity index 90%
rename from html/changelogs/Nalarac - Turret Shooting Downed People.yml
rename to html/changelogs/MisterLayne - glass_shard_self_harm.yml
index f950bbe9a1..dd0c47bf85 100644
--- a/html/changelogs/Nalarac - Turret Shooting Downed People.yml
+++ b/html/changelogs/MisterLayne - glass_shard_self_harm.yml
@@ -22,7 +22,7 @@
#################################
# Your name.
-author: Nalarac
+author: MisterLayne
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
@@ -33,4 +33,4 @@ delete-after: True
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- - rscadd: "Added setting for turrets to fire upon downed/laying targets."
+ - tweak: "Glass shards now do damage when you attack with them, based on the type of gloves you are wearing."
diff --git a/html/changelogs/Woodrat - Uniform Fix.yml b/html/changelogs/Woodrat - Uniform Fix.yml
deleted file mode 100644
index e3bdaa68e9..0000000000
--- a/html/changelogs/Woodrat - Uniform Fix.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# maptweak
-# spellcheck (typo fixes)
-# experiment
-#################################
-
-# Your name.
-author: Woodrat
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
- - tweak: "Made the solgov uniforms use accessories for denoting department instead of having several different sprites in the uniform dmi folder."
- - tweak: "Removed redundant solgov uniforms from uniform.dmi and moved the sprites for the solgov uniforms to their own dmi."
- - bugfix: "Fixed storage vests and drop pouches disappearing when one rolls down a uniform."
\ No newline at end of file
diff --git a/html/changelogs/TheFurryFeline - Orange Is The New Orange.yml b/html/changelogs/chaoko99 - stomach_pump.yml
similarity index 84%
rename from html/changelogs/TheFurryFeline - Orange Is The New Orange.yml
rename to html/changelogs/chaoko99 - stomach_pump.yml
index 41df57e47f..ff753858eb 100644
--- a/html/changelogs/TheFurryFeline - Orange Is The New Orange.yml
+++ b/html/changelogs/chaoko99 - stomach_pump.yml
@@ -1,37 +1,36 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# maptweak
-# spellcheck (typo fixes)
-# experiment
-#################################
-
-# Your name.
-author: TheFurryFeline
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "New orange jumpsuit for loadout that doesn't get locked to tracking."
- - tweak: "Prison jumpsuit filepath changed accordingly and closets with obj updated."
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+################################# hey can we PLEASE get a changelog bot already
+
+# Your name.
+author: chaoko99
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Ported Bay's stomach pump."
\ No newline at end of file
diff --git a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm
index 956eb21ac1..aab0b0eb08 100644
--- a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm
+++ b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm
@@ -64,23 +64,27 @@
"j" = (
/obj/structure/table/steel,
/obj/item/weapon/beartrap,
+/obj/item/device/survivalcapsule,
/turf/simulated/floor/outdoors/dirt{
outdoors = 0
},
/area/submap/Thiefc)
"k" = (
/obj/vehicle/train/trolley,
-/obj/item/weapon/storage/firstaid/combat,
+/obj/random/firstaid,
+/obj/random/firstaid,
+/obj/random/firstaid,
+/obj/random/firstaid,
+/obj/random/firstaid,
/turf/simulated/floor/outdoors/dirt{
outdoors = 0
},
/area/submap/Thiefc)
"l" = (
/obj/structure/closet/crate,
-/obj/item/weapon/folder/blue,
-/obj/item/weapon/folder/red,
-/obj/item/weapon/folder/white,
-/obj/item/weapon/folder/yellow,
+/obj/item/device/nif,
+/obj/item/device/nif/bad,
+/obj/item/device/nif/bad,
/turf/simulated/floor/outdoors/dirt{
outdoors = 0
},
@@ -97,6 +101,9 @@
/area/submap/Thiefc)
"n" = (
/obj/vehicle/train/trolley,
+/obj/random/multiple/voidsuit,
+/obj/random/multiple/voidsuit,
+/obj/random/multiple/voidsuit,
/turf/simulated/floor/outdoors/dirt{
outdoors = 0
},
@@ -105,6 +112,9 @@
/obj/structure/closet/crate,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
+/obj/item/weapon/cell/device/weapon,
+/obj/item/weapon/cell/device/weapon,
+/obj/item/device/perfect_tele/one_beacon,
/turf/simulated/floor/outdoors/dirt{
outdoors = 0
},
@@ -113,12 +123,19 @@
/obj/structure/closet/crate,
/obj/item/weapon/storage/box/shotgunammo,
/obj/item/weapon/storage/box/practiceshells,
+/obj/item/weapon/grenade/spawnergrenade/manhacks/station,
/turf/simulated/floor/outdoors/dirt{
outdoors = 0
},
/area/submap/Thiefc)
-"I" = (
-/mob/living/simple_mob/humanoid/merc/melee/sword/space,
+"u" = (
+/mob/living/simple_mob/humanoid/merc/ranged/virgo,
+/turf/simulated/floor/outdoors/dirt{
+ outdoors = 0
+ },
+/area/submap/Thiefc)
+"P" = (
+/obj/machinery/door/airlock,
/turf/simulated/floor/outdoors/dirt{
outdoors = 0
},
@@ -269,7 +286,7 @@ c
c
c
c
-h
+P
c
c
b
@@ -305,7 +322,7 @@ a
c
c
c
-h
+u
h
h
h
@@ -371,7 +388,7 @@ a
c
e
h
-I
+u
h
h
h
@@ -397,7 +414,7 @@ i
h
h
h
-h
+u
c
c
c
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 41a48c7e8a..394dbcdc46 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -5685,6 +5685,9 @@
/obj/effect/floor_decal/corner/mauve/bordercorner2{
dir = 10
},
+/obj/item/modular_computer/console/preset/command{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"md" = (
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 2127ee7d9d..f325ca6d4b 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -1069,6 +1069,15 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
+"cj" = (
+/obj/structure/table/woodentable,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/obj/machinery/portable_atmospherics/powered/reagent_distillery,
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/bar_backroom)
"ck" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -1104,6 +1113,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_three)
+"cm" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether/surface)
"cn" = (
/obj/machinery/atm{
pixel_y = 31
@@ -20261,11 +20275,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
-"HG" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether/surface)
"HH" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
@@ -21321,14 +21330,6 @@
/obj/item/weapon/storage/briefcase/inflatable,
/turf/simulated/floor/plating,
/area/maintenance/lower/atrium)
-"OV" = (
-/obj/structure/table/woodentable,
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/simulated/floor/wood,
-/area/tether/surfacebase/bar_backroom)
"Pe" = (
/obj/structure/table,
/turf/simulated/floor/carpet,
@@ -36777,7 +36778,7 @@ Jr
Js
Wh
JE
-HG
+cm
IY
bg
RO
@@ -36919,7 +36920,7 @@ Js
Js
Jz
JE
-HG
+cm
IY
bg
RO
@@ -37061,7 +37062,7 @@ Jt
Js
Jz
JE
-HG
+cm
IY
bg
RO
@@ -37905,7 +37906,7 @@ Tv
Hw
TP
NO
-OV
+cj
RB
ac
ac
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index 745de78959..4eda0973a8 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -17153,7 +17153,7 @@
/turf/simulated/floor/carpet,
/area/engineering/foyer)
"bft" = (
-/obj/machinery/computer/atmos_alert{
+/obj/item/modular_computer/console/preset/command{
dir = 4
},
/turf/simulated/floor/tiled,
@@ -22328,6 +22328,10 @@
},
/turf/simulated/floor/tiled,
/area/bridge_hallway)
+"gkC" = (
+/obj/machinery/status_display,
+/turf/simulated/wall/r_wall,
+/area/bridge)
"hPi" = (
/obj/machinery/light/small,
/turf/simulated/floor,
@@ -31538,7 +31542,7 @@ awy
awy
awy
awy
-awy
+gkC
awy
awy
awy
@@ -32958,7 +32962,7 @@ awA
awE
awE
awy
-awy
+gkC
boL
awy
bqR
diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index 6b845eafc1..251de4e3f1 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -15085,6 +15085,9 @@
"wR" = (
/obj/structure/table/woodentable,
/obj/machinery/chemical_dispenser/bar_soft/full,
+/obj/machinery/keycard_auth{
+ pixel_y = 28
+ },
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"wS" = (
@@ -20152,6 +20155,12 @@
},
/turf/simulated/floor,
/area/maintenance/station/sec_lower)
+"HU" = (
+/obj/machinery/keycard_auth{
+ pixel_y = -28
+ },
+/turf/simulated/floor/wood,
+/area/bridge/meeting_room)
"Ik" = (
/obj/machinery/light/small{
dir = 8
@@ -35883,7 +35892,7 @@ wV
ys
wV
wV
-wV
+HU
wo
ac
ac
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index a4c0f9cd6e..cebc944428 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -1984,7 +1984,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/tether)
"dj" = (
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"dk" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -2682,12 +2682,9 @@
/turf/simulated/floor/tiled/dark,
/area/security/security_lockerroom)
"er" = (
-/obj/machinery/shuttle_sensor{
- dir = 5;
- id_tag = "shuttlesens_exp";
- pixel_y = -6
- },
-/turf/simulated/wall/thull,
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/excursion/tether)
"es" = (
/obj/effect/decal/cleanable/dirt,
@@ -2934,10 +2931,16 @@
/turf/simulated/floor,
/area/maintenance/station/ai)
"eN" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/excursion/tether)
+/obj/structure/table/reinforced,
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/powered/reagent_distillery,
+/turf/simulated/floor/tiled/white,
+/area/medical/chemistry)
"eS" = (
/obj/item/frame,
/obj/effect/floor_decal/rust,
@@ -3120,7 +3123,7 @@
/obj/machinery/light/spot{
pixel_y = 32
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"fi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -5541,13 +5544,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 6
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"iY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 4
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"iZ" = (
/obj/effect/floor_decal/borderfloorblack/full,
@@ -6342,12 +6345,6 @@
},
/turf/simulated/floor/bluegrid,
/area/ai)
-"kn" = (
-/obj/machinery/cryopod{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion/tether)
"ko" = (
/turf/simulated/wall/r_wall,
/area/security/security_equiptment_storage)
@@ -9267,6 +9264,13 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/item/device/taperecorder{
+ pixel_y = 0
+ },
+/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{
+ pixel_x = -4;
+ pixel_y = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
"oX" = (
@@ -12492,13 +12496,15 @@
/turf/simulated/wall,
/area/quartermaster/office)
"tC" = (
-/obj/structure/table/standard,
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/white/border,
/obj/machinery/button/windowtint{
id = "surgery_2";
pixel_y = -26
},
+/obj/item/weapon/reagent_containers/blood/OMinus,
+/obj/item/weapon/reagent_containers/blood/OMinus,
+/obj/structure/closet/crate/freezer,
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
"tD" = (
@@ -14103,6 +14109,7 @@
pixel_x = -20;
pixel_y = -25
},
+/obj/structure/flora/pottedplant/stoutbush,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/cmo)
"wg" = (
@@ -19164,16 +19171,6 @@
/obj/item/weapon/reagent_containers/dropper,
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
-"DX" = (
-/obj/structure/table/reinforced,
-/obj/effect/floor_decal/borderfloorwhite{
- dir = 1
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 1
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
"DY" = (
/obj/machinery/chemical_dispenser/full,
/obj/structure/table/reinforced,
@@ -21014,7 +21011,6 @@
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
"Hn" = (
-/obj/structure/table/standard,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
@@ -21027,6 +21023,7 @@
pixel_x = 0;
pixel_y = 26
},
+/obj/structure/closet/crate/freezer,
/obj/item/weapon/reagent_containers/blood/OMinus,
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
@@ -23632,7 +23629,6 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
"Lv" = (
-/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/blood/OMinus,
/obj/item/weapon/reagent_containers/blood/OMinus,
/obj/item/weapon/reagent_containers/blood/OMinus,
@@ -23648,6 +23644,7 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
dir = 8
},
+/obj/structure/closet/crate/freezer,
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"Lw" = (
@@ -24218,7 +24215,6 @@
/turf/simulated/floor/tiled/white,
/area/medical/exam_room)
"Mp" = (
-/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/blood/AMinus,
/obj/item/weapon/reagent_containers/blood/APlus,
/obj/item/weapon/reagent_containers/blood/BMinus,
@@ -24230,6 +24226,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 8
},
+/obj/structure/closet/crate/freezer,
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"Mq" = (
@@ -24335,7 +24332,6 @@
/turf/simulated/open,
/area/medical/surgery_hallway)
"My" = (
-/obj/structure/flora/pottedplant/stoutbush,
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
},
@@ -24351,6 +24347,7 @@
/obj/machinery/camera/network/medbay{
dir = 4
},
+/obj/item/modular_computer/console/preset/command,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/cmo)
"Mz" = (
@@ -25115,8 +25112,6 @@
/obj/structure/table/standard,
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/white/border,
-/obj/item/weapon/reagent_containers/blood/OMinus,
-/obj/item/weapon/reagent_containers/blood/OMinus,
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
"Nt" = (
@@ -27745,7 +27740,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 10
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"Rw" = (
/obj/structure/catwalk,
@@ -28429,13 +28424,8 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/tether)
"SP" = (
-/obj/structure/table/woodentable,
-/obj/item/device/taperecorder{
- pixel_y = 0
- },
-/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{
- pixel_x = -4;
- pixel_y = 8
+/obj/item/modular_computer/console/preset/command{
+ dir = 1
},
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
@@ -28788,7 +28778,7 @@
dir = 8;
icon_state = "pipe-c"
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"UK" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -28846,7 +28836,7 @@
dir = 6;
icon_state = "intact"
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"US" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -28982,7 +28972,7 @@
dir = 2;
id_tag = "shuttlesens_exp_psg"
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"Vm" = (
/obj/structure/bed/chair/shuttle{
@@ -29105,7 +29095,7 @@
dir = 8;
icon_state = "map"
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"VR" = (
/obj/machinery/atmospherics/binary/pump{
@@ -29163,7 +29153,7 @@
dir = 5;
id_tag = "shuttlesens_exp_int"
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"Wo" = (
/obj/structure/bed/chair/shuttle,
@@ -29174,7 +29164,7 @@
/area/shuttle/excursion/tether)
"Ws" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"Wx" = (
/obj/structure/grille,
@@ -29254,7 +29244,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"Xc" = (
/obj/structure/grille,
@@ -29343,7 +29333,7 @@
/area/tether/exploration)
"Xr" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/yellow,
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"XA" = (
/obj/structure/shuttle/engine/heater,
@@ -29369,7 +29359,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 5
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"XE" = (
/obj/machinery/conveyor_switch/oneway{
@@ -29611,13 +29601,13 @@
dir = 5;
id_tag = "shuttlesens_exp"
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"ZD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 9
},
-/turf/simulated/wall/thull,
+/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
"ZE" = (
/obj/machinery/door/airlock/glass_external{
@@ -35052,12 +35042,12 @@ ab
ab
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+ad
+ad
+ae
+ad
+ad
+ae
aa
aa
aa
@@ -35196,10 +35186,10 @@ ab
ab
aa
aa
+ae
aa
aa
-aa
-aa
+ad
aa
aa
aa
@@ -35338,10 +35328,10 @@ ab
ab
aa
aa
+ae
aa
aa
-aa
-aa
+ad
aa
aa
aa
@@ -35481,9 +35471,9 @@ Me
uK
uK
Me
-aa
-aa
-aa
+ae
+ae
+ad
aa
aa
aa
@@ -35625,7 +35615,7 @@ wf
xh
aa
aa
-aa
+ae
aa
aa
aa
@@ -35767,7 +35757,7 @@ NP
xh
aa
aa
-aa
+ad
aa
aa
aa
@@ -35909,7 +35899,7 @@ NP
xh
aa
aa
-aa
+ad
aa
aa
aa
@@ -36051,7 +36041,7 @@ NQ
Me
ab
aa
-aa
+ad
aa
aa
aa
@@ -38587,7 +38577,7 @@ Aq
Aw
Ck
Dq
-DX
+eN
ES
FH
Gx
@@ -40546,7 +40536,7 @@ Zy
WG
dj
XA
-eN
+er
ms
Oz
be
@@ -40688,7 +40678,7 @@ UJ
Xb
dj
XN
-eN
+er
ms
Xq
be
@@ -40826,11 +40816,11 @@ Um
dj
iK
jY
-kn
+iW
WS
dj
XN
-eN
+er
ms
Vb
be
@@ -41113,7 +41103,7 @@ jZ
WR
Xo
XN
-eN
+er
cK
ms
Xq
@@ -41527,7 +41517,7 @@ cG
VB
WD
dE
-er
+dj
TY
dj
dj
@@ -41681,7 +41671,7 @@ ea
kx
dj
XN
-eN
+er
cK
ms
mq
@@ -41966,7 +41956,7 @@ kQ
TG
dj
XN
-eN
+er
ms
nA
be
@@ -42108,7 +42098,7 @@ kR
Vd
dj
XN
-eN
+er
ms
QL
be
@@ -42250,7 +42240,7 @@ ZE
ZB
dj
XB
-eN
+er
ms
Sq
be
diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm
index 9ced842fdb..517c9d7b21 100644
--- a/maps/tether/tether-10-colony.dmm
+++ b/maps/tether/tether-10-colony.dmm
@@ -16848,6 +16848,24 @@
icon_state = "dark"
},
/area/centcom/specops)
+"Hv" = (
+/obj/machinery/telecomms/relay/preset/centcom/tether/station_mid,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
+"HL" = (
+/obj/machinery/telecomms/relay/preset/centcom/tether/midpoint,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
+"JB" = (
+/obj/machinery/telecomms/relay/preset/centcom/tether/station_low,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
"JC" = (
/obj/machinery/power/thermoregulator,
/turf/unsimulated/floor{
@@ -16860,6 +16878,18 @@
icon_state = "dark"
},
/area/centcom/specops)
+"JW" = (
+/obj/machinery/telecomms/relay/preset/centcom/tether/base_low,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
+"Lb" = (
+/obj/machinery/telecomms/relay/preset/centcom/tether/base_high,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
"Nt" = (
/obj/structure/reagent_dispensers/watertank,
/turf/unsimulated/floor{
@@ -16893,6 +16923,18 @@
icon_state = "dark"
},
/area/centcom/specops)
+"Rx" = (
+/obj/machinery/telecomms/relay/preset/centcom/underdark,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
+"Sp" = (
+/obj/machinery/telecomms/relay/preset/centcom/tether/station_high,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
"UC" = (
/obj/structure/table/steel_reinforced,
/obj/item/stack/cable_coil,
@@ -16911,6 +16953,12 @@
icon_state = "dark"
},
/area/centcom/specops)
+"Xi" = (
+/obj/machinery/telecomms/relay/preset/centcom/tether/base_mid,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
"XA" = (
/obj/structure/table/steel_reinforced,
/obj/item/weapon/smes_coil,
@@ -16922,6 +16970,12 @@
icon_state = "dark"
},
/area/centcom/specops)
+"YM" = (
+/obj/machinery/telecomms/relay/preset/centcom/tether/sci_outpost,
+/turf/unsimulated/floor{
+ icon_state = "steel"
+ },
+/area/centcom/command)
(1,1,1) = {"
aa
@@ -34372,7 +34426,7 @@ ac
nK
nK
nK
-nK
+CZ
nK
nK
ac
@@ -34511,12 +34565,12 @@ Cg
ho
ho
ac
-ac
-ac
-ac
-ac
-ac
-ac
+nK
+JW
+CE
+CE
+JB
+nK
ac
ac
ac
@@ -34653,12 +34707,12 @@ Ch
Ct
ho
ac
-ac
-ac
-ac
-ac
-ac
-ac
+nK
+Xi
+CE
+CE
+Hv
+nK
ac
ac
ac
@@ -34795,12 +34849,12 @@ Ch
BW
ho
ac
-ac
-ac
-ac
-ac
-ac
-ac
+nK
+Lb
+CE
+CE
+Sp
+nK
ac
ac
ac
@@ -34937,12 +34991,12 @@ Ch
Ct
ho
ac
-ac
-ac
-ac
-ac
-ac
-ac
+nK
+CE
+CE
+CE
+YM
+nK
ac
ac
ac
@@ -35079,12 +35133,12 @@ Ch
BW
ho
ac
-ac
-ac
-ac
-ac
-ac
-ac
+nK
+HL
+CE
+CE
+Rx
+nK
ac
ac
ac
@@ -35221,12 +35275,12 @@ Ch
Ct
ho
ac
-ac
-ac
-ac
-ac
-ac
-ac
+nK
+nK
+nK
+nK
+nK
+nK
ac
ac
ac
diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm
index 23e80a6404..2cf0a3f141 100644
--- a/maps/tether/tether_areas2.dm
+++ b/maps/tether/tether_areas2.dm
@@ -300,7 +300,57 @@
name = "\improper Research Bathroom"
icon_state = "research"
+//TFF 28/8/19 - cleanup of areas placement
+/area/rnd/research/testingrange
+ name = "\improper Weapons Testing Range"
+ icon_state = "firingrange"
+
+/area/rnd/research/researchdivision
+ name = "\improper Research Division"
+ icon_state = "research"
+
+
//Outpost areas
+//TFF 28/8/19 - cleanup of areas placement
+/area/rnd/outpost
+ name = "\improper Research Outpost Hallway"
+ icon_state = "research"
+
+/area/rnd/outpost/airlock
+ name = "\improper Research Outpost Airlock"
+ icon_state = "green"
+
+/area/rnd/outpost/eva
+ name = "Research Outpost EVA Storage"
+ icon_state = "eva"
+
+/area/rnd/outpost/chamber
+ name = "\improper Research Outpost Burn Chamber"
+ icon_state = "engine"
+
+/area/rnd/outpost/atmos
+ name = "Research Outpost Atmospherics"
+ icon_state = "atmos"
+
+/area/rnd/outpost/storage
+ name = "\improper Research Outpost Gas Storage"
+ icon_state = "toxstorage"
+
+/area/rnd/outpost/mixing
+ name = "\improper Research Outpost Gas Mixing"
+ icon_state = "toxmix"
+
+/area/rnd/outpost/heating
+ name = "\improper Research Outpost Gas Heating"
+ icon_state = "toxmix"
+
+/area/rnd/outpost/testing
+ name = "\improper Research Outpost Testing"
+ icon_state = "toxtest"
+
+/area/maintenance/substation/outpost
+ name = "Research Outpost Substation"
+
/area/rnd/outpost/anomaly_lab
name = "\improper Research Outpost Anomaly Lab"
icon_state = "research"
@@ -316,6 +366,7 @@
/area/rnd/outpost/xenoarch_storage
name = "\improper Research Outpost Xenoarch Storage"
icon_state = "research"
+
// Misc
/area/hallway/lower/third_south
name = "\improper Hallway Third Floor South"
@@ -343,7 +394,14 @@
name = "\improper Panic Shelter"
flags = RAD_SHIELDED //It just makes sense
-
+/area/tether/station/public_meeting_room
+ name = "Public Meeting Room"
+ icon_state = "blue"
+ sound_env = SMALL_SOFTFLOOR
+//TFF 28/8/19 - cleanup of areas placement
+/area/chapel/observation
+ name = "\improper Chapel Observation"
+ icon_state = "chapel"
//
// Station Z Levels
@@ -390,6 +448,73 @@
icon_state = "Sleep"
flags = RAD_SHIELDED
+//TFF 28/8/19 - cleanup of areas placement
+/area/crew_quarters/sleep/vistor_room_1
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_2
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_3
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_4
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_5
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_6
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_7
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_8
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_9
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_10
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_11
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/vistor_room_12
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_1
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_2
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_3
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_4
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_5
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_6
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_7
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_8
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_9
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/crew_quarters/sleep/Dorm_10
+ flags = RAD_SHIELDED | BLUE_SHIELDED
+
/area/crew_quarters/sleep/Dorm_1/holo
name = "\improper Dorm 1 Holodeck"
icon_state = "dk_yellow"
@@ -530,11 +655,6 @@
/area/maintenance/station/exploration
name = "\improper Exploration Maintenance"
-/area/tether/station/public_meeting_room
- name = "Public Meeting Room"
- icon_state = "blue"
- sound_env = SMALL_SOFTFLOOR
-
/area/shuttle/tether/crash1
name = "\improper Crash Site 1"
icon_state = "shuttle2"
@@ -649,6 +769,142 @@
base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b
+//TFF 28/8/19 - cleanup of areas placement
+/area/teleporter/departing
+ name = "\improper Long-Range Teleporter"
+ icon_state = "teleporter"
+ music = "signal"
+
+// Override telescience shielding on some areas
+/area/security/armoury
+ flags = BLUE_SHIELDED
+
+/area/security/tactical
+ flags = BLUE_SHIELDED
+
+/area/security/nuke_storage
+ flags = BLUE_SHIELDED
+
+/area/supply
+ flags = BLUE_SHIELDED
+
+// Add rad shielding to maintenance and construction sites
+/area/vacant
+ flags = RAD_SHIELDED
+
+/area/maintenance
+ flags = RAD_SHIELDED
+
+/area/rnd/research_storage //Located entirely in maint under public access, so why not that too
+ flags = RAD_SHIELDED
+
+// New shuttles
+/area/shuttle/administration/transit
+ name = "Deep Space (AS)"
+ icon_state = "shuttle"
+
+/area/shuttle/administration/away_mission
+ name = "Away Mission (AS)"
+ icon_state = "shuttle"
+
+/area/shuttle/awaymission/home
+ name = "NSB Adephagia (AM)"
+ icon_state = "shuttle2"
+
+/area/shuttle/awaymission/warp
+ name = "Deep Space (AM)"
+ icon_state = "shuttle"
+
+/area/shuttle/awaymission/away
+ name = "Away Mission (AM)"
+ icon_state = "shuttle2"
+
+/area/shuttle/awaymission/oldengbase
+ name = "Old Construction Site (AM)"
+ icon_state = "shuttle2"
+
+/area/medical/resleeving
+ name = "Resleeving Lab"
+ icon_state = "genetics"
+
+/area/bigship
+ name = "Bigship"
+ requires_power = 0
+ flags = RAD_SHIELDED
+ sound_env = SMALL_ENCLOSED
+ base_turf = /turf/space
+ icon_state = "red2"
+
+/area/bigship/teleporter
+ name = "Bigship Teleporter Room"
+
+//////// Small Cruiser Areas ////////
+/area/houseboat
+ name = "Small Cruiser"
+ requires_power = 0
+ flags = RAD_SHIELDED
+ base_turf = /turf/space
+ icon_state = "red2"
+ lightswitch = TRUE
+
+/area/houseboat/holodeck_area
+ name = "Small Cruiser - Holodeck"
+ icon_state = "blue2"
+
+/area/houseboat/holodeck/off
+ name = "Small Cruiser Holo - Off"
+ icon_state = "blue2"
+/area/houseboat/holodeck/beach
+ name = "Small Cruiser Holo - Beach"
+ icon_state = "blue2"
+/area/houseboat/holodeck/snow
+ name = "Small Cruiser Holo - Snow"
+ icon_state = "blue2"
+/area/houseboat/holodeck/desert
+ name = "Small Cruiser Holo - Desert"
+ icon_state = "blue2"
+/area/houseboat/holodeck/picnic
+ name = "Small Cruiser Holo - Picnic"
+ icon_state = "blue2"
+/area/houseboat/holodeck/thunderdome
+ name = "Small Cruiser Holo - Thunderdome"
+ icon_state = "blue2"
+/area/houseboat/holodeck/basketball
+ name = "Small Cruiser Holo - Basketball"
+ icon_state = "blue2"
+/area/houseboat/holodeck/gaming
+ name = "Small Cruiser Holo - Gaming Table"
+ icon_state = "blue2"
+/area/houseboat/holodeck/space
+ name = "Small Cruiser Holo - Space"
+ icon_state = "blue2"
+/area/houseboat/holodeck/bunking
+ name = "Small Cruiser Holo - Bunking"
+ icon_state = "blue2"
+
+/area/shuttle/cruiser/cruiser
+ name = "Small Cruiser Shuttle - Cruiser"
+ icon_state = "blue2"
+ base_turf = /turf/simulated/floor/tiled/techfloor
+/area/shuttle/cruiser/station
+ name = "Small Cruiser Shuttle - Station"
+ icon_state = "blue2"
+
+
+// Tether Map has this shuttle
+/area/shuttle/tether/surface
+ name = "Tether Shuttle Landed"
+ icon_state = "shuttle"
+ base_turf = /turf/simulated/floor/reinforced
+
+/area/shuttle/tether/station
+ name = "Tether Shuttle Dock"
+ icon_state = "shuttle2"
+
+/area/shuttle/tether/transit
+ name = "Tether Shuttle Transit"
+ icon_state = "shuttle2"
+
// Exclude some more areas from the atmos leak event so people don't get trapped when spawning.
/datum/event/atmos_leak/setup()
diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm
index d60188b834..e64a33d40c 100644
--- a/maps/tether/tether_telecomms.dm
+++ b/maps/tether/tether_telecomms.dm
@@ -8,48 +8,75 @@
listening_level = Z_LEVEL_SURFACE_LOW
autolinkers = list("tbl_relay")
+/obj/machinery/telecomms/relay/preset/centcom/tether/base_low
+ listening_level = Z_LEVEL_SURFACE_LOW
+
/obj/machinery/telecomms/relay/preset/tether/base_mid
id = "Base Relay 2"
listening_level = Z_LEVEL_SURFACE_MID
autolinkers = list("tbm_relay")
+/obj/machinery/telecomms/relay/preset/centcom/tether/base_mid
+ listening_level = Z_LEVEL_SURFACE_MID
+
/obj/machinery/telecomms/relay/preset/tether/base_high
id = "Base Relay 3"
listening_level = Z_LEVEL_SURFACE_HIGH
autolinkers = list("tbh_relay")
+/obj/machinery/telecomms/relay/preset/centcom/tether/base_high
+ listening_level = Z_LEVEL_SURFACE_HIGH
+
//Some coverage for midpoint
/obj/machinery/telecomms/relay/preset/tether/midpoint
id = "Midpoint Relay"
listening_level = Z_LEVEL_TRANSIT
autolinkers = list("tmp_relay")
+/obj/machinery/telecomms/relay/preset/centcom/tether/midpoint
+ listening_level = Z_LEVEL_TRANSIT
+
// The station of course needs relays fluff-wise to connect to ground station. But again, no multi-z so, we need one for each z level.
/obj/machinery/telecomms/relay/preset/tether/station_low
id = "Station Relay 1"
listening_level = Z_LEVEL_SPACE_LOW
autolinkers = list("tsl_relay")
+/obj/machinery/telecomms/relay/preset/centcom/tether/station_low
+ listening_level = Z_LEVEL_SPACE_LOW
+
/obj/machinery/telecomms/relay/preset/tether/station_mid
id = "Station Relay 2"
listening_level = Z_LEVEL_SPACE_MID
autolinkers = list("tsm_relay")
+/obj/machinery/telecomms/relay/preset/centcom/tether/station_mid
+ listening_level = Z_LEVEL_SPACE_MID
+
/obj/machinery/telecomms/relay/preset/tether/station_high
id = "Station Relay 3"
listening_level = Z_LEVEL_SPACE_HIGH
autolinkers = list("tsh_relay")
+/obj/machinery/telecomms/relay/preset/centcom/tether/station_high
+ listening_level = Z_LEVEL_SPACE_HIGH
+
/obj/machinery/telecomms/relay/preset/tether/sci_outpost
id = "Science Outpost Relay"
listening_level = Z_LEVEL_SOLARS
autolinkers = list("sci_o_relay")
+/obj/machinery/telecomms/relay/preset/centcom/tether/sci_outpost
+ listening_level = Z_LEVEL_SOLARS
+
/obj/machinery/telecomms/relay/preset/underdark
id = "Mining Underground Relay"
listening_level = Z_LEVEL_UNDERDARK
autolinkers = list("ud_relay")
+/obj/machinery/telecomms/relay/preset/centcom/underdark
+ listening_level = Z_LEVEL_UNDERDARK
+
// #### Hub ####
/obj/machinery/telecomms/hub/preset/tether
id = "Hub"
diff --git a/nano/templates/sleeper.tmpl b/nano/templates/sleeper.tmpl
index a0e9da787c..885a1c025c 100644
--- a/nano/templates/sleeper.tmpl
+++ b/nano/templates/sleeper.tmpl
@@ -51,6 +51,9 @@
{{:helper.link(data.filtering ? "Dialysis active" : "Dialysis inactive", null, {'sleeper_filter' : !data.filtering})}}
+
+ {{:helper.link(data.pump ? "Stomach pump active" : "Stomach pump inactive", null, {'pump' : !data.pump})}}
+
{{:helper.link("Eject occupant", null, {'eject' : 0})}}
diff --git a/vorestation.dme b/vorestation.dme
index c6b6697d5f..354003ff55 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -491,6 +491,7 @@
#include "code\game\antagonist\station\traitor.dm"
#include "code\game\area\ai_monitored.dm"
#include "code\game\area\areas.dm"
+#include "code\game\area\areas_vr.dm"
#include "code\game\area\asteroid_areas.dm"
#include "code\game\area\Away Mission areas.dm"
#include "code\game\area\Space Station 13 areas.dm"
@@ -2725,6 +2726,7 @@
#include "code\modules\planet\time.dm"
#include "code\modules\planet\weather.dm"
#include "code\modules\power\apc.dm"
+#include "code\modules\power\apc_vr.dm"
#include "code\modules\power\batteryrack.dm"
#include "code\modules\power\breaker_box.dm"
#include "code\modules\power\cable.dm"