Skip to content

Commit

Permalink
does stuff to tether nobody asked for, and some stuff people asked for (
Browse files Browse the repository at this point in the history
#6386)

<!-- 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

1. make the garden stairs safer
2. makes xenobotany much smaller
3. makes hydroponics slightly smaller
4. makes the Medical treatment center a bit smaller
5. changes the surface airlocks to use proper machines instead of magic
energy creators and gas destroyers
	- Total cycle time (out and back in) is about 2 minutes

<!-- 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
We want tether
<!-- 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

<!-- 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:
tweak: tweaked tether map
/: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. -->
  • Loading branch information
TheLordME authored Apr 20, 2024
1 parent a2c6d47 commit 9ec4693
Show file tree
Hide file tree
Showing 16 changed files with 6,728 additions and 7,399 deletions.
1 change: 1 addition & 0 deletions code/game/machinery/embedded_controller/airlock_program.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
"tag" = tag,
"sigtype" = "command",
"power" = "[power]",
"expand" = "[1]",
)
post_signal(signal)

Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/suit_storage/suit_storage_prepared.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
boots_stored_TYPE = /obj/item/clothing/shoes/magboots

/obj/machinery/suit_storage_unit/search_and_rescue
suit_stored_TYPE = /obj/item/clothing/suit/space/void/medical
helmet_stored_TYPE = /obj/item/clothing/head/helmet/space/void/medical
suit_stored_TYPE = /obj/item/clothing/suit/space/void/exploration/alt
helmet_stored_TYPE = /obj/item/clothing/head/helmet/space/void/exploration/alt
mask_stored_TYPE = /obj/item/clothing/mask/breath
boots_stored_TYPE = /obj/item/clothing/shoes/magboots

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
var/radio_filter_out
var/radio_filter_in

/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power
name = "High power air scrubber"
power_rating = 15000
scrub_volume = 5000
expanded_power = 15000
expanded_scrub = 5000
scrub_boost = 100

/obj/machinery/atmospherics/component/unary/vent_scrubber/Initialize(mapload)
. = ..()
if(isnull(siphoning))
Expand Down
4 changes: 2 additions & 2 deletions code/modules/maps/overmap/planets/_virgo3b.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

/datum/atmosphere/planet/virgo3b
base = list(
/datum/gas/nitrogen = 0.16,
/datum/gas/phoron = 0.72,
/datum/gas/nitrogen = 0.36,
/datum/gas/phoron = 0.52,
/datum/gas/carbon_dioxide = 0.12,
)
pressure_low = 82.4
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/tesla/coil.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

circuit = /obj/item/circuitboard/tesla_coil

var/power_loss = 2
var/power_loss = 1.2
var/input_power_multiplier = 1
var/zap_cooldown = 100
var/last_zap = 0
Expand Down
Binary file modified icons/obj/atmos.dmi
Binary file not shown.
4 changes: 2 additions & 2 deletions maps/tether/engines/rust.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/blast/regular{
id = "EngineEmitterPortWest";
id = "EngineEmitterPortWest2";
name = "Engine Gas Storage"
},
/turf/simulated/floor/tiled/steel_grid,
Expand All @@ -1268,7 +1268,7 @@
icon_state = "1-2"
},
/obj/machinery/door/blast/regular{
id = "EngineEmitterPortWest";
id = "EngineEmitterPortWest2";
name = "Engine Gas Storage"
},
/obj/machinery/button/remote/blast_door{
Expand Down
43 changes: 15 additions & 28 deletions maps/tether/levels/mining.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1055,9 +1055,7 @@
/turf/simulated/floor/tiled,
/area/outpost/mining_main/hangar)
"As" = (
/turf/simulated/mineral/floor/virgo3b{
color = "#AAAAAA"
},
/turf/simulated/open/virgo3b,
/area/mine/explored)
"Ay" = (
/obj/effect/floor_decal/industrial/outline/yellow,
Expand Down Expand Up @@ -1850,13 +1848,6 @@
},
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"WM" = (
/obj/effect/step_trigger/teleporter/to_underdark{
dir = 4;
pixel_x = -16
},
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"Xe" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
Expand Down Expand Up @@ -1940,10 +1931,6 @@
/obj/spawner/window/low_wall/borosillicate/full,
/turf/simulated/floor/plating,
/area/outpost/mining_main/secondary_gear_storage)
"ZF" = (
/obj/effect/step_trigger/teleporter/from_mining,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/outpost/mining_main/passage)
"ZO" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
Expand Down Expand Up @@ -26607,7 +26594,7 @@ OH
us
us
us
ZF
us
"}
(128,1,1) = {"
Se
Expand Down Expand Up @@ -26801,7 +26788,7 @@ OH
us
us
us
ZF
us
"}
(129,1,1) = {"
Se
Expand Down Expand Up @@ -26995,7 +26982,7 @@ mk
us
us
us
ZF
us
"}
(130,1,1) = {"
Se
Expand Down Expand Up @@ -27189,7 +27176,7 @@ mk
us
us
us
ZF
us
"}
(131,1,1) = {"
Se
Expand Down Expand Up @@ -27383,7 +27370,7 @@ OH
us
us
us
ZF
us
"}
(132,1,1) = {"
Se
Expand Down Expand Up @@ -27577,7 +27564,7 @@ mk
us
us
us
ZF
us
"}
(133,1,1) = {"
Se
Expand Down Expand Up @@ -27771,7 +27758,7 @@ OH
us
us
us
ZF
us
"}
(134,1,1) = {"
Se
Expand Down Expand Up @@ -27965,7 +27952,7 @@ mk
us
us
us
ZF
us
"}
(135,1,1) = {"
Se
Expand Down Expand Up @@ -28159,7 +28146,7 @@ OH
us
us
us
ZF
us
"}
(136,1,1) = {"
Se
Expand Down Expand Up @@ -28353,7 +28340,7 @@ OH
us
us
us
ZF
us
"}
(137,1,1) = {"
Se
Expand Down Expand Up @@ -37288,8 +37275,8 @@ OH
OH
OH
jz
WM
WM
As
As
SD
OH
OH
Expand Down Expand Up @@ -37482,8 +37469,8 @@ OH
OH
OH
jz
OH
OH
As
As
SD
OH
OH
Expand Down
23 changes: 9 additions & 14 deletions maps/tether/levels/plains.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,6 @@
"A" = (
/turf/unsimulated/wall/planetary/virgo3b,
/area/tether/outpost/exploration_shed)
"B" = (
/obj/effect/floor_decal/rust,
/obj/effect/step_trigger/teleporter/from_plains,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/tether/outpost/exploration_shed)
"D" = (
/mob/living/simple_mob/animal/passive/gaslamp,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
Expand Down Expand Up @@ -22845,7 +22840,7 @@ u
b
"}
(118,1,1) = {"
B
O
O
E
O
Expand Down Expand Up @@ -23039,7 +23034,7 @@ u
b
"}
(119,1,1) = {"
B
O
O
O
O
Expand Down Expand Up @@ -23233,7 +23228,7 @@ u
b
"}
(120,1,1) = {"
B
O
O
O
O
Expand Down Expand Up @@ -23427,7 +23422,7 @@ u
b
"}
(121,1,1) = {"
B
O
O
O
O
Expand Down Expand Up @@ -23621,7 +23616,7 @@ u
b
"}
(122,1,1) = {"
B
O
O
O
O
Expand Down Expand Up @@ -23815,7 +23810,7 @@ u
b
"}
(123,1,1) = {"
B
O
O
O
O
Expand Down Expand Up @@ -24009,7 +24004,7 @@ u
b
"}
(124,1,1) = {"
B
O
O
O
O
Expand Down Expand Up @@ -24203,7 +24198,7 @@ u
b
"}
(125,1,1) = {"
B
O
O
O
O
Expand Down Expand Up @@ -24397,7 +24392,7 @@ u
b
"}
(126,1,1) = {"
B
O
O
m
G
Expand Down
Loading

0 comments on commit 9ec4693

Please sign in to comment.