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

Replaces the Hyena with the Derecho #3693

Merged
merged 37 commits into from
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
089e86a
draft 1
Apogee-dev Oct 26, 2024
0eb0d10
draft 2
Apogee-dev Oct 26, 2024
b05588f
workshop area
Apogee-dev Oct 26, 2024
554274d
draft 3
Apogee-dev Oct 26, 2024
f8e568e
more
Apogee-dev Oct 26, 2024
80f24a4
more.
Apogee-dev Oct 27, 2024
83c4344
even more
Apogee-dev Oct 27, 2024
425ed43
more tweaks
Apogee-dev Oct 27, 2024
bc47c86
again
Apogee-dev Oct 27, 2024
f49691b
more
Apogee-dev Oct 27, 2024
d0943a2
starting pipes
Apogee-dev Oct 27, 2024
9bc6b73
turrets and json
Apogee-dev Oct 27, 2024
99ca840
atmos finished
Apogee-dev Oct 27, 2024
fb2286f
lights
Apogee-dev Oct 27, 2024
145dd61
home stretch
Apogee-dev Oct 27, 2024
979ed66
bathroom lock
Apogee-dev Oct 27, 2024
6eb762f
punch that bag
Apogee-dev Oct 27, 2024
e6a3ca7
more
Apogee-dev Oct 28, 2024
e815a28
trashify
Apogee-dev Oct 29, 2024
7d97814
radio closet
Apogee-dev Oct 29, 2024
39531e5
button tweaks
Apogee-dev Oct 30, 2024
92fa49c
implementing new stuff
Apogee-dev Nov 2, 2024
ae779b5
actually removes the hyena
Apogee-dev Nov 2, 2024
540a29c
mask paths
Apogee-dev Nov 3, 2024
9a83234
ship tag
Apogee-dev Nov 3, 2024
245e704
Merge remote-tracking branch 'upstream/master' into hyena-replacement
Apogee-dev Nov 9, 2024
f12ce22
updates
Apogee-dev Nov 9, 2024
ae35fdd
more updates
Apogee-dev Nov 9, 2024
68ee3f9
rogue extinguisher extinguished
Apogee-dev Nov 9, 2024
44ff463
mixer fixer
Apogee-dev Nov 9, 2024
f205a62
button.
Apogee-dev Nov 9, 2024
81944cb
button. again.
Apogee-dev Nov 9, 2024
84c87f8
review
Apogee-dev Nov 10, 2024
1a282a0
no smoking
Apogee-dev Nov 10, 2024
6cd4355
Merge remote-tracking branch 'upstream/master' into hyena-replacement
Apogee-dev Nov 16, 2024
4114236
platform fix
Apogee-dev Nov 16, 2024
637bb65
final fixes
Apogee-dev Nov 17, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"GORLEX",
"NATURAL_AGGRESSIVE",
"BEASTS",
"WEAPONS",
"ACLF"
"WEAPONS"
],
"map_name": "Hyena-class Wrecking Tug",
"description": "The Hyena is a common salvage tug, frequently operated by the Gorlex Marauders for “salvage” missions on ICW-era Nanotrasen derelicts (and occasionally occupied outposts and ships). The Hyena features a fairly compact floor plan with a dedicated secure armory space and a fairly large cargo bay for its size, as well as a complement of high-grade hardsuits and mining equipment. The Hyena’s low cost and high demand in its niche has made it a very common sight on the Frontier in the years following the ICW, and despite their tight finances nearly all Gorlex Marauder splinter factions continue to acquire more.",
"map_name": "Derecho-class Wrecking Tug",
"description": "The Derecho-class is a series of salvage ships commissioned by the New Gorlex Republic almost as soon as the Republic was founded for the prodigious task of cleaning the space around New Gorlex of countless ICW-era shipwrecks. In recent years, Derechos are operated as auxiliary ships typically tasked with surveying, assessment, and their original mission of salvaging in space controlled or contested by the NGR.",
"tags": [
"Mining",
"Salvage",
"Combat"
],
"map_short_name": "Hyena-class",
"map_path": "_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm",
"map_short_name": "Derecho-class",
"map_path": "_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm",
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain/ngr",
Expand Down
Loading
Loading