Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates Talos and Scarab maints. #3658

Merged
merged 27 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
00ace33
maybe
Sadhorizon Oct 27, 2024
adc73bd
doesn't work
Sadhorizon Oct 27, 2024
4267432
that doesn't work either
Sadhorizon Oct 27, 2024
bd0b659
yea
Sadhorizon Oct 27, 2024
62e5dea
idk what's going on
Sadhorizon Oct 27, 2024
9f164cc
I still dont understand
Sadhorizon Oct 27, 2024
fa97eaf
Merge remote-tracking branch 'upstream/master' into hardline_maints
Sadhorizon Nov 9, 2024
b36d2ce
airlock
Sadhorizon Nov 9, 2024
10c9e49
Merge remote-tracking branch 'upstream/master' into hardline_maints
Sadhorizon Dec 23, 2024
f689342
updates
Sadhorizon Dec 23, 2024
d3a8730
unrusts this wall
Sadhorizon Dec 23, 2024
906e44f
three is too much imo
Sadhorizon Dec 23, 2024
bbba6bc
airlocks work now kinda
Sadhorizon Dec 23, 2024
8eda8d2
fixes the matrix
Sadhorizon Dec 23, 2024
3ce8345
forgot area + minor stuff
Sadhorizon Dec 23, 2024
9c2532b
moves these pipes
Sadhorizon Dec 23, 2024
83d1084
also the decals
Sadhorizon Dec 23, 2024
3b1847c
some minor upkeep while I'm here
Sadhorizon Dec 24, 2024
6844fcb
this shouldn't be that
Sadhorizon Dec 24, 2024
8051eb2
talos desc
Sadhorizon Dec 24, 2024
9f37eaa
tweak
Sadhorizon Dec 24, 2024
314e446
tweak
Sadhorizon Dec 24, 2024
47c2c5d
Merge remote-tracking branch 'upstream/master' into hardline_maints
Sadhorizon Jan 4, 2025
6e36779
Merge remote-tracking branch 'upstream/master' into hardline_maints
Sadhorizon Jan 4, 2025
8a80ca3
Merge remote-tracking branch 'upstream/master' into hardline_maints
Sadhorizon Jan 6, 2025
81c23b3
directional AACs
Sadhorizon Jan 6, 2025
6a2097c
Merge remote-tracking branch 'upstream/master' into hardline_maints
Sadhorizon Jan 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/configs/inteq_talos.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"map_name": "Talos-class Command Clipper",
"faction": "/datum/faction/inteq",
"prefix": "IRMV",
"description": "The Talos is a command and support ship, and a rare example of a purpose-built Inteq ship. Outfitted with an abundance of construction and engineering equipment and a private bluespace communications suite capable of networking IRMG ships across any given system, Taloses are often the lynchpin of coordinated IRMG operations in a system, and offer construction and repair services as part of IRMG’s mercenary offerings. As Talos crews place a larger emphasis on support personnel, they tend to be less well-armed than other Inteq crews. One unusual feature of the Talos is its “wings” filled with redundant baffles, intended to provide extra durability in the case of impacts or weapons fire. They also offer auxiliary storage space and potential room for modification by their enterprising Artificer crews.",
"manufacturer": "Hardline Salvage and Mining",
"description": "The Talos is a command and support ship, and a rare example of a purpose-built Inteq ship. Outfitted with an abundance of construction and engineering equipment and a private bluespace communications suite capable of networking IRMG ships across any given system, Taloses are often the lynchpin of coordinated IRMG operations in a system, and offer construction and repair services as part of IRMG’s mercenary offerings. As Talos crews place a larger emphasis on support personnel, they tend to be less well-armed than other Inteq crews. One unusual feature of the Talos is its depressurized “wings” filled with redundant baffles, intended to provide extra durability in the case of impacts or weapons fire. They also double as auxiliary storage space and potential room for modification by their enterprising Artificer crews.",
"tags": [
"Engineer",
"Telecomms"
Expand Down
Loading
Loading